Merge branch 'main' into 342-migration

Author: arthanson

netbox_custom_objects/forms.py

@@ -88,6 +88,7 @@ class Meta:
         model = CustomObjectType
         fields = (
             "name",
+            "slug",
             "description",
             "comments",
             "tags",
@@ -182,6 +183,10 @@ def __init__(self, *args, **kwargs):
             if "related_object_type" in self.fields:
                 self.fields["related_object_type"].disabled = True
 
+        # Multi-object fields may not be set unique
+        if self.initial["type"] == CustomFieldTypeChoices.TYPE_MULTIOBJECT:
+            self.fields["unique"].disabled = True
+
     def clean_primary(self):
         primary_fields = self.cleaned_data["custom_object_type"].fields.filter(
             primary=True

netbox_custom_objects/models.py

@@ -199,7 +199,7 @@ class CustomObjectType(NetBoxModel):
     version = models.CharField(max_length=10, blank=True)
     verbose_name = models.CharField(max_length=100, blank=True)
     verbose_name_plural = models.CharField(max_length=100, blank=True)
-    slug = models.SlugField(max_length=100, unique=True, db_index=True)
+    slug = models.SlugField(max_length=100, unique=True, db_index=True, blank=False)
     cache_timestamp = models.DateTimeField(
         auto_now=True,
         help_text=_("Timestamp used for cache invalidation")
@@ -232,6 +232,11 @@ def __str__(self):
     def clean(self):
         super().clean()
 
+        if not self.slug:
+            raise ValidationError(
+                {"slug": _("Slug field cannot be empty.")}
+            )
+
         # Enforce max number of COTs that may be created (max_custom_object_types)
         if not self.pk:
             max_cots = get_plugin_config("netbox_custom_objects", "max_custom_object_types")

netbox_custom_objects/tests/test_api.py

@@ -237,3 +237,58 @@ def test_graphql_list_objects(self):
 
     def test_graphql_get_object(self):
         ...
+
+
+class CustomObjectTypeAPITest(CustomObjectsTestCase):
+    """
+    Test CustomObjectType API endpoint validation.
+    """
+
+    def setUp(self):
+        """Set up test data."""
+        # Create a user
+        self.user = create_test_user('testuser')
+
+        # Create token for API access
+        self.token = Token.objects.create(user=self.user)
+        self.header = {'HTTP_AUTHORIZATION': f'Token {self.token.key}'}
+
+        # Add object-level permission
+        obj_perm = ObjectPermission(
+            name='Test permission',
+            actions=['add']
+        )
+        obj_perm.save()
+        obj_perm.users.add(self.user)
+        obj_perm.object_types.add(ObjectType.objects.get_for_model(CustomObjectType))
+
+    def test_create_custom_object_type_with_blank_slug(self):
+        """
+        Test that creating a CustomObjectType with a blank slug returns a validation error.
+        """
+        # Test with empty string slug
+        data = {
+            'name': 'test_blank_slug',
+            'slug': '',
+        }
+
+        url = reverse('plugins-api:netbox_custom_objects-api:customobjecttype-list')
+        response = self.client.post(url, data, format='json', **self.header)
+
+        self.assertEqual(response.status_code, status.HTTP_400_BAD_REQUEST)
+        self.assertIn('slug', response.data)
+
+    def test_create_custom_object_type_without_slug(self):
+        """
+        Test that creating a CustomObjectType without a slug field returns a validation error.
+        """
+        # Test without slug field at all
+        data = {
+            'name': 'test_no_slug',
+        }
+
+        url = reverse('plugins-api:netbox_custom_objects-api:customobjecttype-list')
+        response = self.client.post(url, data, format='json', **self.header)
+
+        self.assertEqual(response.status_code, status.HTTP_400_BAD_REQUEST)
+        self.assertIn('slug', response.data)

netbox_custom_objects/views.py

@@ -66,6 +66,11 @@ class CustomJournalEntryEditView(generic.ObjectEditView):
     queryset = JournalEntry.objects.all()
     form = CustomJournalEntryForm
 
+    def alter_object(self, obj, request, args, kwargs):
+        if not obj.pk:
+            obj.created_by = request.user
+        return obj
+
     def get_return_url(self, request, instance):
         """
         Override to return the correct URL for custom objects.