Update code

Author: arkid15r

backend/apps/owasp/admin/chapter.py

@@ -11,7 +11,7 @@ class ChapterAdmin(admin.ModelAdmin, GenericEntityAdminMixin):
     """Admin for Chapter model."""
 
     autocomplete_fields = ("owasp_repository",)
-    inlines = [EntityMemberInline]
+    inlines = (EntityMemberInline,)
     list_display = (
         "name",
         "created_at",

backend/apps/owasp/admin/committee.py

@@ -11,7 +11,7 @@ class CommitteeAdmin(admin.ModelAdmin, GenericEntityAdminMixin):
     """Admin for Committee model."""
 
     autocomplete_fields = ("owasp_repository",)
-    inlines = [EntityMemberInline]
+    inlines = (EntityMemberInline,)
     search_fields = ("name",)
 
 

backend/apps/owasp/admin/entity_member.py

@@ -8,24 +8,32 @@
 class EntityMemberAdmin(admin.ModelAdmin):
     """Admin for EntityMember records (generic link to any OWASP entity)."""
 
-    list_display = (
+    autocomplete_fields = ("member",)
+    fields = (
+        "entity_type",
+        "entity_id",
         "member",
         "kind",
-        "is_reviewed",
         "order",
+        "is_reviewed",
+        "description",
     )
-    list_filter = ("kind", "is_reviewed")
-    search_fields = ("member__login", "member__name", "description", "object_id")
-    fields = (
-        "content_type",
-        "object_id",
+    list_display = (
         "member",
         "kind",
+        "is_reviewed",
         "order",
+    )
+    list_filter = (
+        "kind",
         "is_reviewed",
+    )
+    search_fields = (
+        "member__login",
+        "member__name",
         "description",
+        "entity_id",
     )
-    autocomplete_fields = ("member",)
 
 
 admin.site.register(EntityMember, EntityMemberAdmin)

backend/apps/owasp/admin/mixins.py

@@ -7,16 +7,6 @@
 from apps.owasp.models.entity_member import EntityMember
 
 
-class EntityMemberInline(GenericTabularInline):
-    """EntityMember inline for admin."""
-
-    model = EntityMember
-    fields = ("member", "kind", "description", "order", "is_reviewed")
-    raw_id_fields = ("member",)
-    extra = 1
-    ordering = ("order", "member__login")
-
-
 class BaseOwaspAdminMixin:
     """Base mixin for OWASP admin classes providing common patterns."""
 
@@ -44,6 +34,27 @@ def get_base_search_fields(self, *additional_fields):
         return self.search_field_names + additional_fields
 
 
+class EntityMemberInline(GenericTabularInline):
+    """EntityMember inline for admin."""
+
+    ct_field = "entity_type"
+    ct_fk_field = "entity_id"
+    extra = 1
+    fields = (
+        "member",
+        "kind",
+        "description",
+        "order",
+        "is_reviewed",
+    )
+    model = EntityMember
+    ordering = (
+        "order",
+        "member__login",
+    )
+    raw_id_fields = ("member",)
+
+
 class GenericEntityAdminMixin(BaseOwaspAdminMixin):
     """Mixin for generic entity admin with common entity functionality."""
 

backend/apps/owasp/admin/project.py

@@ -16,7 +16,7 @@ class ProjectAdmin(admin.ModelAdmin, GenericEntityAdminMixin):
         "owners",
         "repositories",
     )
-    inlines = [EntityMemberInline]
+    inlines = (EntityMemberInline,)
     list_display = (
         "custom_field_name",
         "created_at",

backend/apps/github/management/commands/github_match_users.py renamed to backend/apps/owasp/management/commands/owasp_update_leaders.py

@@ -62,7 +62,7 @@ def process_entities(self, model_class, users_list, threshold):
 
         new_members_to_create = []
 
-        content_type = ContentType.objects.get_for_model(model_class)
+        entity_type = ContentType.objects.get_for_model(model_class)
 
         for entity in model_class.objects.all():
             if not entity.leaders_raw:
@@ -78,8 +78,8 @@ def process_entities(self, model_class, users_list, threshold):
             new_members_to_create.extend(
                 [
                     EntityMember(
-                        content_type=content_type,
-                        object_id=entity.pk,
+                        entity_type=entity_type,
+                        entity_id=entity.pk,
                         member_id=user["id"],
                         kind=EntityMember.MemberKind.LEADER,
                         is_reviewed=False,

backend/apps/owasp/migrations/0047_remove_chapter_leaders_and_more.py renamed to backend/apps/owasp/migrations/0048_entitymember.py

@@ -1,4 +1,4 @@
-# Generated by Django 5.2.5 on 2025-08-13 06:33
+# Generated by Django 5.2.5 on 2025-08-14 23:53
 
 import django.db.models.deletion
 from django.db import migrations, models
@@ -8,34 +8,10 @@ class Migration(migrations.Migration):
     dependencies = [
         ("contenttypes", "0002_remove_content_type_name"),
         ("github", "0034_merge_20250804_1817"),
-        ("owasp", "0046_merge_0045_badge_0045_project_audience"),
+        ("owasp", "0047_delete_badge"),
     ]
 
     operations = [
-        migrations.RemoveField(
-            model_name="chapter",
-            name="leaders",
-        ),
-        migrations.RemoveField(
-            model_name="chapter",
-            name="suggested_leaders",
-        ),
-        migrations.RemoveField(
-            model_name="committee",
-            name="leaders",
-        ),
-        migrations.RemoveField(
-            model_name="committee",
-            name="suggested_leaders",
-        ),
-        migrations.RemoveField(
-            model_name="project",
-            name="leaders",
-        ),
-        migrations.RemoveField(
-            model_name="project",
-            name="suggested_leaders",
-        ),
         migrations.CreateModel(
             name="EntityMember",
             fields=[
@@ -45,31 +21,33 @@ class Migration(migrations.Migration):
                         auto_created=True, primary_key=True, serialize=False, verbose_name="ID"
                     ),
                 ),
-                ("object_id", models.PositiveIntegerField()),
                 (
                     "description",
-                    models.TextField(blank=True, help_text="Optional role or description"),
+                    models.TextField(
+                        blank=True, default="", help_text="Optional role or description"
+                    ),
                 ),
+                ("entity_id", models.PositiveIntegerField()),
                 (
                     "is_reviewed",
                     models.BooleanField(
                         default=False, help_text="Indicates if the membership is verified"
                     ),
                 ),
                 (
-                    "order",
-                    models.PositiveIntegerField(
-                        default=0, help_text="Display order/priority of members"
+                    "kind",
+                    models.CharField(
+                        choices=[("leader", "Leader")], default="leader", max_length=6
                     ),
                 ),
                 (
-                    "kind",
-                    models.CharField(
-                        choices=[("leader", "Leader")], default="leader", max_length=20
+                    "order",
+                    models.PositiveIntegerField(
+                        default=0, help_text="Display order/priority of members"
                     ),
                 ),
                 (
-                    "content_type",
+                    "entity_type",
                     models.ForeignKey(
                         on_delete=django.db.models.deletion.CASCADE, to="contenttypes.contenttype"
                     ),
@@ -78,21 +56,21 @@ class Migration(migrations.Migration):
                     "member",
                     models.ForeignKey(
                         on_delete=django.db.models.deletion.CASCADE,
-                        related_name="entity_memberships",
+                        related_name="+",
                         to="github.user",
                     ),
                 ),
             ],
             options={
-                "verbose_name_plural": "Entity Members",
+                "verbose_name_plural": "Entity members",
                 "db_table": "owasp_entity_members",
                 "indexes": [
                     models.Index(
-                        fields=["content_type", "object_id"], name="owasp_entit_content_969a6f_idx"
+                        fields=["entity_type", "entity_id"], name="owasp_entit_entity__dda41b_idx"
                     ),
                     models.Index(fields=["member"], name="owasp_entit_member__6e516f_idx"),
                 ],
-                "unique_together": {("content_type", "object_id", "member", "kind")},
+                "unique_together": {("entity_type", "entity_id", "member", "kind")},
             },
         ),
     ]

backend/apps/owasp/models/chapter.py

@@ -64,7 +64,7 @@ class Meta:
     latitude = models.FloatField(verbose_name="Latitude", blank=True, null=True)
     longitude = models.FloatField(verbose_name="Longitude", blank=True, null=True)
 
-    # Virtual fields
+    # GRs.
     members = GenericRelation("owasp.EntityMember")
 
     def __str__(self) -> str:

backend/apps/owasp/models/committee.py

@@ -28,7 +28,7 @@ class Meta:
         db_table = "owasp_committees"
         verbose_name_plural = "Committees"
 
-    # Virtual fields
+    # GRs.
     members = GenericRelation("owasp.EntityMember")
 
     def __str__(self) -> str:

backend/apps/owasp/models/common.py

@@ -72,6 +72,20 @@ class Meta:
         related_name="+",
     )
 
+    # M2Ms.
+    leaders = models.ManyToManyField(
+        "github.User",
+        verbose_name="Leaders",
+        related_name="assigned_%(class)s",
+        blank=True,
+    )
+    suggested_leaders = models.ManyToManyField(
+        "github.User",
+        verbose_name="Suggested leaders",
+        related_name="matched_%(class)s",
+        blank=True,
+    )
+
     @property
     def github_url(self) -> str:
         """Get GitHub URL."""
@@ -88,7 +102,7 @@ def index_md_url(self) -> str | None:
         )
 
     @property
-    def leaders(self) -> models.QuerySet[User]:
+    def entity_leaders(self) -> models.QuerySet[User]:
         """Return entity's leaders."""
         return User.objects.filter(
             pk__in=self.members.filter(kind=EntityMember.MemberKind.LEADER).values_list(