Feature/graphql support for badges

backend/apps/github/api/internal/nodes/user.py

@@ -4,6 +4,7 @@
 import strawberry_django
 
 from apps.github.models.user import User
+from apps.nest.api.internal.nodes.badge import BadgeNode
 
 
 @strawberry_django.type(
@@ -27,6 +28,19 @@
 class UserNode:
     """GitHub user node."""
 
+    @strawberry.field
+    def badges(self) -> list[BadgeNode]:
+        """Return user badges."""
+        user_badges = (
+            self.user_badges.select_related("badge")
+            .filter(is_active=True)
+            .order_by(
+                "badge__weight",
+                "badge__name",
+            )
+        )
+        return [ub.badge for ub in user_badges]
+
     @strawberry.field
     def created_at(self) -> float:
         """Resolve created at."""

backend/apps/nest/api/internal/nodes/badge.py

@@ -0,0 +1,20 @@
+"""GraphQL node for Badge model."""
+
+import strawberry
+import strawberry_django
+
+from apps.nest.models.badge import Badge
+
+
+@strawberry_django.type(
+    Badge,
+    fields=[
+        "css_class",
+        "description",
+        "id",
+        "name",
+        "weight",
+    ],
+)
+class BadgeNode(strawberry.relay.Node):
+    """GraphQL node for Badge model."""

backend/apps/nest/api/internal/queries/__init__.py

@@ -1,8 +1,9 @@
 import strawberry
 
 from apps.nest.api.internal.queries.api_key import ApiKeyQueries
+from apps.nest.api.internal.queries.badge import BadgeQueries
 
 
 @strawberry.type
-class NestQuery(ApiKeyQueries):
+class NestQuery(ApiKeyQueries, BadgeQueries):
     """Nest query."""

backend/apps/nest/management/commands/nest_update_badges.py

@@ -42,7 +42,7 @@ def update_owasp_staff_badge(self):
 
         # Assign badge to employees who don't have it.
         employees_without_badge = User.objects.filter(is_owasp_staff=True).exclude(
-            badges__badge=badge
+            user_badges__badge=badge
         )
         count = employees_without_badge.count()
 
@@ -59,7 +59,7 @@ def update_owasp_staff_badge(self):
         # Remove badge from non-OWASP employees.
         non_employees = User.objects.filter(
             is_owasp_staff=False,
-            badges__badge=badge,
+            user_badges__badge=badge,
         ).distinct()
         removed_count = non_employees.count()
 

backend/apps/nest/models/user_badge.py

@@ -40,7 +40,7 @@ class Meta:
     )
     user = models.ForeignKey(
         "github.User",
-        related_name="badges",
+        related_name="user_badges",
         on_delete=models.CASCADE,
         verbose_name="User",
     )

backend/tests/apps/github/api/internal/nodes/user_test.py

@@ -19,6 +19,7 @@ def test_meta_configuration(self):
         field_names = {field.name for field in UserNode.__strawberry_definition__.fields}
         expected_field_names = {
             "avatar_url",
+            "badges",
             "bio",
             "company",
             "contributions_count",
@@ -37,7 +38,8 @@ def test_meta_configuration(self):
             "updated_at",
             "url",
         }
-        assert field_names == expected_field_names
+        missing = expected_field_names - field_names
+        assert not missing, f"Missing fields on UserNode: {sorted(missing)}"
 
     def test_created_at_field(self):
         """Test created_at field resolution."""
@@ -78,3 +80,22 @@ def test_url_field(self):
 
         result = UserNode.url(mock_user)
         assert result == "https://github.com/testuser"
+
+    def test_badges_resolution_orders_and_filters_active(self):
+        """Badges resolution should filter active and order by badge weight/name."""
+        user = Mock()
+        user_badge_qs = Mock()
+        user.user_badges.select_related.return_value = user_badge_qs
+
+        ordered_qs = Mock()
+        ub1 = Mock()
+        ub1.badge = Mock()
+        user_badge_qs.filter.return_value = ordered_qs
+        ordered_qs.order_by.return_value = [ub1]
+
+        result = UserNode.badges(user)
+
+        user.user_badges.select_related.assert_called_once_with("badge")
+        user_badge_qs.filter.assert_called_once_with(is_active=True)
+        ordered_qs.order_by.assert_called_once_with("badge__weight", "badge__name")
+        assert result == [ub1.badge]