Fix NestBot calendar events feature branch merge conflicts

.github/workflows/label-pull-requests.yaml

@@ -10,11 +10,7 @@ jobs:
       pull-requests: write
     runs-on: ubuntu-latest
     steps:
-<<<<<<< HEAD
       - uses: actions/labeler@f1a63e87db0c6baf19c5713083f8d00d789ca184
-=======
-      - uses: actions/labeler@634933edcd8ababfe52f92936142cc22ac488b1b
->>>>>>> main
         with:
           configuration-path: .github/labeler.yml
           sync-labels: true

.github/workflows/run-ci-cd.yaml

@@ -346,7 +346,8 @@ jobs:
           platforms: linux/amd64
           push: true
           secrets: |
-            SENTRY_AUTH_TOKEN: ${{ secrets.SENTRY_AUTH_TOKEN }}
+            RELEASE_VERSION=${{ needs.set-release-version.outputs.release_version }}
+            SENTRY_AUTH_TOKEN=${{ secrets.SENTRY_AUTH_TOKEN }}
           tags: owasp/nest:frontend-staging
 
       - name: Get frontend image size
@@ -665,7 +666,8 @@ jobs:
           platforms: linux/amd64
           push: true
           secrets: |
-            SENTRY_AUTH_TOKEN: ${{ secrets.SENTRY_AUTH_TOKEN }}
+            RELEASE_VERSION=${{ needs.set-release-version.outputs.release_version }}
+            SENTRY_AUTH_TOKEN=${{ secrets.SENTRY_AUTH_TOKEN }}
           tags: owasp/nest:frontend-production
 
       - name: Get frontend image size

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/github/api/internal/queries/repository_contributor.py

@@ -54,7 +54,7 @@ def top_contributors(
             RepositoryContributorNode(
                 avatar_url=tc["avatar_url"],
                 contributions_count=tc["contributions_count"],
-                id=tc["id"],
+                id=tc["login"],
                 login=tc["login"],
                 name=tc["name"],
                 project_key=tc.get("project_key"),

backend/apps/github/api/rest/v1/member.py

@@ -88,13 +88,8 @@ def list_members(
         HTTPStatus.NOT_FOUND: MemberErrorResponse,
         HTTPStatus.OK: MemberSchema,
     },
-<<<<<<< HEAD:backend/apps/github/api/rest/v1/user.py
-    summary="Get user by login",
-    tags=["github"],
-=======
     summary="Get member by login",
     tags=["Community"],
->>>>>>> main:backend/apps/github/api/rest/v1/member.py
 )
 def get_member(request: HttpRequest, login: str) -> MemberSchema | MemberErrorResponse:
     """Get user by login."""

backend/apps/github/models/repository_contributor.py

@@ -183,7 +183,6 @@ def get_top_contributors(
                 "user__avatar_url",
                 "user__login",
                 "user__name",
-                "id",
             )
             .annotate(
                 total_contributions=Sum("contributions_count"),
@@ -195,7 +194,6 @@ def get_top_contributors(
             {
                 "avatar_url": tc["user__avatar_url"],
                 "contributions_count": tc["total_contributions"],
-                "id": tc["id"],
                 "login": tc["user__login"],
                 "name": tc["user__name"],
             }

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/management/commands/nest_update_badges.py

@@ -41,8 +41,10 @@ def update_owasp_staff_badge(self):
             self.stdout.write(f"Created badge: {badge.name}")
 
         # Assign badge to employees who don't have it.
-        employees_without_badge = User.objects.filter(is_owasp_staff=True).exclude(
-            badges__badge=badge
+        employees_without_badge = User.objects.filter(
+            is_owasp_staff=True,
+        ).exclude(
+            user_badges__badge=badge,
         )
         count = employees_without_badge.count()
 
@@ -59,7 +61,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/migrations/0005_alter_userbadge_user.py

@@ -0,0 +1,24 @@
+# Generated by Django 5.2.5 on 2025-09-06 09:41
+
+import django.db.models.deletion
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+    dependencies = [
+        ("github", "0035_alter_user_bio_alter_user_is_owasp_staff"),
+        ("nest", "0004_userbadge"),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name="userbadge",
+            name="user",
+            field=models.ForeignKey(
+                on_delete=django.db.models.deletion.CASCADE,
+                related_name="user_badges",
+                to="github.user",
+                verbose_name="User",
+            ),
+        ),
+    ]

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",
     )