Added is_reviewed field to Award model and update admin and badge logic

Author: trucodd

backend/apps/owasp/admin/award.py

@@ -15,12 +15,14 @@ class AwardAdmin(admin.ModelAdmin):
         "year",
         "winner_name",
         "user",
+        "is_reviewed",
         "nest_created_at",
         "nest_updated_at",
     )
     list_filter = (
         "category",
         "year",
+        "is_reviewed",
     )
     search_fields = (
         "name",
@@ -41,7 +43,13 @@ class AwardAdmin(admin.ModelAdmin):
         (
             "Winner Information",
             {
-                "fields": ("winner_name", "winner_info", "winner_image", "user"),
+                "fields": (
+                    "winner_name",
+                    "winner_info",
+                    "winner_image_url",
+                    "user",
+                    "is_reviewed",
+                ),
                 "classes": ("collapse",),
             },
         ),

backend/apps/owasp/management/commands/owasp_update_badges.py

@@ -27,17 +27,21 @@ def handle(self, *args, **options):
         if created:
             self.stdout.write(f"Created badge: {waspy_badge.name}")
 
-        # Get users with WASPY awards
-        waspy_winners = Award.get_waspy_award_winners()
+        # Get users with reviewed WASPY awards only
+        waspy_winners = User.objects.filter(
+            awards__category=Award.Category.WASPY, awards__is_reviewed=True
+        ).distinct()
 
         # Add badge to WASPY winners
         for user in waspy_winners:
             user.badges.add(waspy_badge)
 
-        # Remove badge from users without WASPY awards
+        # Remove badge from users without reviewed WASPY awards
         users_with_badge = User.objects.filter(badges=waspy_badge)
         for user in users_with_badge:
-            if not Award.get_user_waspy_awards(user).exists():
+            if not Award.objects.filter(
+                user=user, category=Award.Category.WASPY, is_reviewed=True
+            ).exists():
                 user.badges.remove(waspy_badge)
 
         self.stdout.write(f"Updated badges for {waspy_winners.count()} WASPY winners")

backend/apps/owasp/migrations/0045_award.py

@@ -81,13 +81,12 @@ class Migration(migrations.Migration):
                     ),
                 ),
                 (
-                    "winner_image",
-                    models.CharField(
+                    "winner_image_url",
+                    models.URLField(
                         blank=True,
                         default="",
-                        help_text="Path to winner's image",
-                        max_length=500,
-                        verbose_name="Winner Image",
+                        help_text="URL to winner's image",
+                        verbose_name="Winner Image URL",
                     ),
                 ),
                 (
@@ -102,6 +101,14 @@ class Migration(migrations.Migration):
                         verbose_name="User",
                     ),
                 ),
+                (
+                    "is_reviewed",
+                    models.BooleanField(
+                        default=False,
+                        help_text="Whether the user matching has been verified by a human",
+                        verbose_name="Is Reviewed",
+                    ),
+                ),
             ],
             options={
                 "verbose_name": "Award",

backend/apps/owasp/models/award.py

@@ -77,6 +77,11 @@ class Meta:
         verbose_name="User",
         help_text="Associated GitHub user (if matched)",
     )
+    is_reviewed = models.BooleanField(
+        verbose_name="Is Reviewed",
+        default=False,
+        help_text="Whether the user matching has been verified by a human",
+    )
 
     def __str__(self) -> str:
         """Return string representation of the award."""