Update code

Author: arkid15r

backend/apps/github/migrations/0035_alter_user_bio_alter_user_is_owasp_staff.py

@@ -1,4 +1,4 @@
-# Generated by Django 5.2.5 on 2025-08-12 18:32
+# Generated by Django 5.2.5 on 2025-08-16 02:30
 
 from django.db import migrations, models
 
@@ -19,7 +19,7 @@ class Migration(migrations.Migration):
             name="is_owasp_staff",
             field=models.BooleanField(
                 default=False,
-                help_text="Indicates if the user is an OWASP Foundation employee.",
+                help_text="Indicates if the user is OWASP Foundation staff.",
                 verbose_name="Is OWASP Staff",
             ),
         ),

backend/apps/github/migrations/0035_user_badges_alter_user_is_owasp_staff.py

@@ -14,7 +14,6 @@
 from apps.github.models.common import GenericUserModel, NodeModel
 from apps.github.models.mixins.user import UserIndexMixin
 from apps.github.models.organization import Organization
-from apps.owasp.models.badge import Badge
 
 
 class User(NodeModel, GenericUserModel, TimestampedModel, UserIndexMixin):
@@ -46,14 +45,6 @@ class Meta:
         verbose_name="Contributions count", default=0
     )
 
-    badges = models.ManyToManyField(
-        Badge,
-        related_name="users",
-        blank=True,
-        verbose_name="Badges",
-        help_text="Badges assigned to this user.",
-    )
-
     def __str__(self) -> str:
         """Return a human-readable representation of the user.
 

backend/apps/github/models/user.py

@@ -0,0 +1,3 @@
+nest-update-badges:
+	@echo "Updating Nest user badges"
+	@CMD="python manage.py nest_update_badges" $(MAKE) exec-backend-command

backend/apps/nest/Makefile

@@ -5,7 +5,7 @@
 from django.core.management.base import BaseCommand
 
 from apps.github.models.user import User
-from apps.owasp.models.badge import Badge
+from apps.nest.models.badge import Badge
 
 logger = logging.getLogger(__name__)
 
@@ -20,10 +20,10 @@ class Command(BaseCommand):
     def handle(self, *args, **options):
         """Execute the command."""
         self.stdout.write("Syncing user badges...")
-        self.sync_owasp_staff_badge()
+        self.update_owasp_staff_badge()
         self.stdout.write(self.style.SUCCESS("User badges sync completed"))
 
-    def sync_owasp_staff_badge(self):
+    def update_owasp_staff_badge(self):
         """Sync OWASP Staff badge for users."""
         # Get or create the OWASP Staff badge
         badge, created = Badge.objects.get_or_create(

backend/apps/nest/management/__init__.py

@@ -0,0 +1,59 @@
+# Generated by Django 5.2.5 on 2025-08-16 02:30
+
+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", "0003_badge"),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name="UserBadge",
+            fields=[
+                (
+                    "id",
+                    models.BigAutoField(
+                        auto_created=True, primary_key=True, serialize=False, verbose_name="ID"
+                    ),
+                ),
+                ("nest_created_at", models.DateTimeField(auto_now_add=True)),
+                ("nest_updated_at", models.DateTimeField(auto_now=True)),
+                (
+                    "note",
+                    models.CharField(
+                        blank=True,
+                        default="",
+                        help_text="Optional note of the user badge.",
+                        max_length=255,
+                        verbose_name="Note",
+                    ),
+                ),
+                (
+                    "badge",
+                    models.ForeignKey(
+                        on_delete=django.db.models.deletion.CASCADE,
+                        related_name="users",
+                        to="nest.badge",
+                        verbose_name="Badge",
+                    ),
+                ),
+                (
+                    "user",
+                    models.ForeignKey(
+                        on_delete=django.db.models.deletion.CASCADE,
+                        related_name="badges",
+                        to="github.user",
+                        verbose_name="User",
+                    ),
+                ),
+            ],
+            options={
+                "verbose_name_plural": "User badges",
+                "db_table": "nest_user_badges",
+            },
+        ),
+    ]

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

@@ -1,3 +1,4 @@
 from .api_key import ApiKey
 from .badge import Badge
 from .user import User
+from .user_badges import UserBadge

backend/apps/owasp/management/commands/owasp_update_badges.py renamed to backend/apps/nest/management/commands/nest_update_badges.py

@@ -0,0 +1,41 @@
+"""A model representing badges linked to users (GitHub user entity)."""
+
+from __future__ import annotations
+
+from django.db import models
+
+from apps.common.models import BulkSaveModel, TimestampedModel
+
+
+class UserBadge(BulkSaveModel, TimestampedModel):
+    """Represents a user badge relation."""
+
+    class Meta:
+        db_table = "nest_user_badges"
+        verbose_name_plural = "User badges"
+
+    note = models.CharField(
+        verbose_name="Note",
+        max_length=255,
+        blank=True,
+        default="",
+        help_text="Optional note of the user badge.",
+    )
+
+    # FKs.
+    badge = models.ForeignKey(
+        "nest.Badge",
+        related_name="users",
+        on_delete=models.CASCADE,
+        verbose_name="Badge",
+    )
+    user = models.ForeignKey(
+        "github.User",
+        related_name="badges",
+        on_delete=models.CASCADE,
+        verbose_name="User",
+    )
+
+    def __str__(self) -> str:
+        """Return a human-readable representation of the user badge."""
+        return f"{self.user.username} - {self.badge.name}"