Update code

Author: arkid15r

backend/apps/nest/admin/user_badge.py

@@ -8,27 +8,9 @@
 class UserBadgeAdmin(admin.ModelAdmin):
     """Admin for UserBadge model."""
 
-    autocomplete_fields = ("user", "badge")
-    fieldsets = (
-        (
-            "User and Badge",
-            {
-                "fields": (
-                    "user",
-                    "badge",
-                )
-            },
-        ),
-        ("Note", {"fields": ("note",)}),
-        (
-            "Timestamps",
-            {
-                "fields": (
-                    "nest_created_at",
-                    "nest_updated_at",
-                )
-            },
-        ),
+    autocomplete_fields = (
+        "badge",
+        "user",
     )
     list_display = (
         "user",
@@ -37,11 +19,17 @@ class UserBadgeAdmin(admin.ModelAdmin):
         "nest_created_at",
         "nest_updated_at",
     )
+    list_filter = ("is_active", "badge__name")
     readonly_fields = (
         "nest_created_at",
         "nest_updated_at",
     )
-    search_fields = ("user__login", "badge__name", "note")
+    search_fields = (
+        "badge__name",
+        "note",
+        "user__login",
+        "user__name",
+    )
 
 
 admin.site.register(UserBadge, UserBadgeAdmin)

backend/apps/nest/migrations/0004_userbadge.py

@@ -1,4 +1,4 @@
-# Generated by Django 5.2.5 on 2025-08-16 02:30
+# Generated by Django 5.2.5 on 2025-08-28 01:15
 
 import django.db.models.deletion
 from django.db import migrations, models
@@ -22,6 +22,14 @@ class Migration(migrations.Migration):
                 ),
                 ("nest_created_at", models.DateTimeField(auto_now_add=True)),
                 ("nest_updated_at", models.DateTimeField(auto_now=True)),
+                (
+                    "is_active",
+                    models.BooleanField(
+                        default=True,
+                        help_text="Indicates if the badge assignment is active.",
+                        verbose_name="Is active",
+                    ),
+                ),
                 (
                     "note",
                     models.CharField(
@@ -54,12 +62,7 @@ class Migration(migrations.Migration):
             options={
                 "verbose_name_plural": "User badges",
                 "db_table": "nest_user_badges",
-                "constraints": [
-                    models.UniqueConstraint(
-                        fields=["user", "badge"],
-                        name="uq_userbadge_user_badge",
-                    )
-                ],
+                "unique_together": {("badge", "user")},
             },
         ),
     ]

backend/apps/nest/migrations/0005_remove_userbadge_uq_userbadge_user_badge.py

@@ -12,20 +12,17 @@ class UserBadge(BulkSaveModel, TimestampedModel):
 
     class Meta:
         db_table = "nest_user_badges"
+        unique_together = (
+            "badge",
+            "user",
+        )
         verbose_name_plural = "User badges"
-        constraints = [
-            models.UniqueConstraint(
-                fields=["user", "badge"],
-                name="uq_userbadge_user_badge",
-            ),
-        ]
 
     is_active = models.BooleanField(
         default=True,
         verbose_name="Is active",
         help_text="Indicates if the badge assignment is active.",
     )
-
     note = models.CharField(
         verbose_name="Note",
         max_length=255,

backend/apps/nest/migrations/0006_userbadge_uq_userbadge_user_badge.py

@@ -77,8 +77,8 @@ def test_sync_owasp_staff_badge(
         self,
         mock_user_filter,
         mock_badge_get_or_create,
-        mock_userbadge_filter,
-        mock_userbadge_get_or_create,
+        mock_user_badge_filter,
+        mock_user_badge_get_or_create,
     ):
         # Set up badge mock
         mock_badge = MagicMock()
@@ -98,14 +98,14 @@ def test_sync_owasp_staff_badge(
             mock_employees, mock_former_employees
         )
 
-        mock_userbadge_get_or_create.return_value = (MagicMock(), True)
+        mock_user_badge_get_or_create.return_value = (MagicMock(), True)
 
         out = StringIO()
         call_command("nest_update_badges", stdout=out)
 
         # Assert correct badge assignment and removal calls
-        mock_userbadge_get_or_create.assert_any_call(user=mock_employee, badge=mock_badge)
-        mock_userbadge_filter.assert_any_call(
+        mock_user_badge_get_or_create.assert_any_call(user=mock_employee, badge=mock_badge)
+        mock_user_badge_filter.assert_any_call(
             user_id__in=mock_former_employees.values_list.return_value, badge=mock_badge
         )
 

backend/apps/nest/migrations/0007_userbadge_is_active.py

@@ -121,7 +121,6 @@ tsc
 turbopack
 unhover
 usefixtures
-userbadge
 winsrdf
 wsgi
 xapp