Feature/daily badge sync job 1763

backend/Makefile

@@ -1,5 +1,6 @@
 include backend/apps/ai/Makefile
 include backend/apps/github/Makefile
+include backend/apps/nest/Makefile
 include backend/apps/owasp/Makefile
 include backend/apps/slack/Makefile
 

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

@@ -0,0 +1,26 @@
+# Generated by Django 5.2.5 on 2025-08-16 02:30
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+    dependencies = [
+        ("github", "0034_merge_20250804_1817"),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name="user",
+            name="bio",
+            field=models.TextField(blank=True, default="", max_length=1000, verbose_name="Bio"),
+        ),
+        migrations.AlterField(
+            model_name="user",
+            name="is_owasp_staff",
+            field=models.BooleanField(
+                default=False,
+                help_text="Indicates if the user is OWASP Foundation staff.",
+                verbose_name="Is OWASP Staff",
+            ),
+        ),
+    ]

backend/apps/github/models/user.py

@@ -27,7 +27,7 @@ class Meta:
         ]
         verbose_name_plural = "Users"
 
-    bio = models.TextField(verbose_name="Bio", max_length=1000, default="")
+    bio = models.TextField(verbose_name="Bio", max_length=1000, blank=True, default="")
     is_hireable = models.BooleanField(verbose_name="Is hireable", default=False)
     twitter_username = models.CharField(
         verbose_name="Twitter username", max_length=50, default="", blank=True
@@ -37,8 +37,8 @@ class Meta:
 
     is_owasp_staff = models.BooleanField(
         default=False,
-        verbose_name="OWASP Staff",
-        help_text="Indicates if the user is an OWASP staff member.",
+        verbose_name="Is OWASP Staff",
+        help_text="Indicates if the user is OWASP Foundation staff.",
     )
 
     contributions_count = models.PositiveIntegerField(

backend/apps/nest/Makefile

@@ -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/admin/__init__.py

@@ -3,3 +3,4 @@
 from .api_key import ApiKeyAdmin
 from .badge import BadgeAdmin
 from .user import UserAdmin
+from .user_badge import UserBadgeAdmin

backend/apps/nest/admin/user_badge.py

@@ -0,0 +1,47 @@
+"""Admin configuration for the user badge model in the OWASP app."""
+
+from django.contrib import admin
+
+from apps.nest.models.user_badge import UserBadge
+
+
+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",
+                )
+            },
+        ),
+    )
+    list_display = (
+        "user",
+        "badge",
+        "note",
+        "nest_created_at",
+        "nest_updated_at",
+    )
+    readonly_fields = (
+        "nest_created_at",
+        "nest_updated_at",
+    )
+    search_fields = ("user__login", "badge__name", "note")
+
+
+admin.site.register(UserBadge, UserBadgeAdmin)

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

@@ -0,0 +1,70 @@
+"""Management command to sync badges for users based on their roles/attributes."""
+
+import logging
+
+from django.core.management.base import BaseCommand
+
+from apps.github.models.user import User
+from apps.nest.models.badge import Badge
+from apps.nest.models.user_badge import UserBadge
+
+logger = logging.getLogger(__name__)
+
+OWASP_STAFF_BADGE_NAME = "OWASP Staff"
+
+
+class Command(BaseCommand):
+    """Sync badges for users based on their roles and attributes."""
+
+    help = "Sync badges for users based on their roles and attributes"
+
+    def handle(self, *args, **options):
+        """Execute the command."""
+        self.stdout.write("Syncing user badges...")
+        self.update_owasp_staff_badge()
+        self.stdout.write(self.style.SUCCESS("User badges sync completed"))
+
+    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(
+            name=OWASP_STAFF_BADGE_NAME,
+            defaults={
+                "description": "Official OWASP Staff",
+                "css_class": "fa-user-shield",
+                "weight": 100,  # High weight for importance
+            },
+        )
+
+        if created:
+            logger.info("Created '%s' badge", OWASP_STAFF_BADGE_NAME)
+            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
+        )
+        count = employees_without_badge.count()
+
+        if count:
+            for user in employees_without_badge:
+                UserBadge.objects.get_or_create(user=user, badge=badge)
+
+        logger.info("Added '%s' badge to %s users", OWASP_STAFF_BADGE_NAME, count)
+        self.stdout.write(f"Added badge to {count} employees")
+
+        # Remove badge from non-OWASP employees.
+        non_employees = User.objects.filter(
+            is_owasp_staff=False,
+            badges__badge=badge,
+        ).distinct()
+        removed_count = non_employees.count()
+
+        if removed_count:
+            UserBadge.objects.filter(
+                user_id__in=non_employees.values_list("id", flat=True),
+                badge=badge,
+            ).delete()
+
+        logger.info("Removed '%s' badge from %s users", OWASP_STAFF_BADGE_NAME, removed_count)
+        self.stdout.write(f"Removed badge from {removed_count} non-employees")

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

@@ -0,0 +1,65 @@
+# 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",
+                "constraints": [
+                    models.UniqueConstraint(
+                        fields=["user", "badge"],
+                        name="uq_userbadge_user_badge",
+                    )
+                ],
+            },
+        ),
+    ]

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

@@ -0,0 +1,16 @@
+# Generated by Django 5.2.5 on 2025-08-18 13:27
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+    dependencies = [
+        ("nest", "0004_userbadge"),
+    ]
+
+    operations = [
+        migrations.RemoveConstraint(
+            model_name="userbadge",
+            name="uq_userbadge_user_badge",
+        ),
+    ]

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

@@ -0,0 +1,19 @@
+# Generated by Django 5.2.5 on 2025-08-18 17:35
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+    dependencies = [
+        ("github", "0035_alter_user_bio_alter_user_is_owasp_staff"),
+        ("nest", "0005_remove_userbadge_uq_userbadge_user_badge"),
+    ]
+
+    operations = [
+        migrations.AddConstraint(
+            model_name="userbadge",
+            constraint=models.UniqueConstraint(
+                fields=("user", "badge"), name="uq_userbadge_user_badge"
+            ),
+        ),
+    ]

backend/apps/nest/models/__init__.py

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

backend/apps/nest/models/user_badge.py

@@ -0,0 +1,47 @@
+"""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"
+        constraints = [
+            models.UniqueConstraint(
+                fields=["user", "badge"],
+                name="uq_userbadge_user_badge",
+            ),
+        ]
+
+    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.login} - {self.badge.name}"