Update BoD candidates page (#2458)

* Update BoD candidates page

* Update code

* Update code

* Update tests

Author: arkid15r

backend/apps/github/admin/user.py

@@ -12,7 +12,13 @@ class MemberProfileInline(admin.StackedInline):
     model = MemberProfile
     can_delete = False
     verbose_name_plural = "OWASP Member Profile"
-    fields = ("owasp_slack_id", "first_contribution_at")
+    fields = (
+        "owasp_slack_id",
+        "first_contribution_at",
+        "is_owasp_board_member",
+        "is_former_owasp_staff",
+        "is_gsoc_mentor",
+    )
     readonly_fields = ("first_contribution_at",)
 
 

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

@@ -62,6 +62,27 @@ def first_owasp_contribution_at(self) -> float | None:
             return self.owasp_profile.first_contribution_at.timestamp()
         return None
 
+    @strawberry.field
+    def is_owasp_board_member(self) -> bool:
+        """Resolve if member is currently on OWASP Board of Directors."""
+        if hasattr(self, "owasp_profile"):
+            return self.owasp_profile.is_owasp_board_member
+        return False
+
+    @strawberry.field
+    def is_former_owasp_staff(self) -> bool:
+        """Resolve if member is a former OWASP staff member."""
+        if hasattr(self, "owasp_profile"):
+            return self.owasp_profile.is_former_owasp_staff
+        return False
+
+    @strawberry.field
+    def is_gsoc_mentor(self) -> bool:
+        """Resolve if member is a Google Summer of Code mentor."""
+        if hasattr(self, "owasp_profile"):
+            return self.owasp_profile.is_gsoc_mentor
+        return False
+
     @strawberry.field
     def issues_count(self) -> int:
         """Resolve issues count."""

backend/apps/github/management/commands/github_sync_user.py

@@ -470,11 +470,11 @@ def handle(self, *args, **options):
                     f"{len(commits_data)} commits for {username}"
                 )
             )
-
-            # Always populate first contribution date if not already set
-            self.populate_first_contribution_only(username, user, gh)
         else:
             self.stdout.write(
                 self.style.WARNING(f"No PRs, issues, or commits found for {username}")
             )
             logger.warning("No PRs, issues, or commits found for %s", username)
+
+        # Always populate first contribution date if not already set
+        self.populate_first_contribution_only(username, user, gh)

backend/apps/owasp/admin/__init__.py

@@ -10,6 +10,7 @@
 from .entity_channel import EntityChannelAdmin
 from .entity_member import EntityMemberAdmin
 from .event import EventAdmin
+from .member_profile import MemberProfileAdmin
 from .member_snapshot import MemberSnapshotAdmin
 from .post import PostAdmin
 from .project import ProjectAdmin

backend/apps/owasp/admin/member_profile.py

@@ -0,0 +1,79 @@
+"""Django admin configuration for MemberProfile model."""
+
+from django.contrib import admin
+
+from apps.owasp.models.member_profile import MemberProfile
+
+
+class MemberProfileAdmin(admin.ModelAdmin):
+    """Admin for MemberProfile model."""
+
+    autocomplete_fields = ("github_user",)
+    list_display = (
+        "github_user",
+        "owasp_slack_id",
+        "first_contribution_at",
+        "is_owasp_board_member",
+        "is_former_owasp_staff",
+        "is_gsoc_mentor",
+        "nest_created_at",
+    )
+    list_filter = (
+        "is_owasp_board_member",
+        "is_former_owasp_staff",
+        "is_gsoc_mentor",
+        "nest_created_at",
+    )
+    search_fields = (
+        "github_user__login",
+        "github_user__name",
+        "owasp_slack_id",
+    )
+    readonly_fields = (
+        "nest_created_at",
+        "nest_updated_at",
+    )
+
+    fieldsets = (
+        (
+            "User Information",
+            {
+                "fields": (
+                    "github_user",
+                    "owasp_slack_id",
+                )
+            },
+        ),
+        (
+            "Contribution Information",
+            {"fields": ("first_contribution_at",)},
+        ),
+        (
+            "Membership Flags",
+            {
+                "fields": (
+                    "is_owasp_board_member",
+                    "is_former_owasp_staff",
+                    "is_gsoc_mentor",
+                )
+            },
+        ),
+        (
+            "Timestamps",
+            {
+                "fields": (
+                    "nest_created_at",
+                    "nest_updated_at",
+                ),
+                "classes": ("collapse",),
+            },
+        ),
+    )
+
+    def get_queryset(self, request):
+        """Optimize queryset with select_related."""
+        queryset = super().get_queryset(request)
+        return queryset.select_related("github_user")
+
+
+admin.site.register(MemberProfile, MemberProfileAdmin)

backend/apps/owasp/admin/member_snapshot.py

@@ -13,6 +13,7 @@ class MemberSnapshotAdmin(admin.ModelAdmin):
         "commits",
         "pull_requests",
         "issues",
+        "messages",
     )
     list_display = (
         "github_user",
@@ -21,6 +22,7 @@ class MemberSnapshotAdmin(admin.ModelAdmin):
         "commits_count",
         "pull_requests_count",
         "issues_count",
+        "messages_count",
         "total_contributions",
         "nest_created_at",
     )
@@ -37,10 +39,14 @@ class MemberSnapshotAdmin(admin.ModelAdmin):
         "commits_count",
         "pull_requests_count",
         "issues_count",
+        "messages_count",
         "total_contributions",
         "contribution_heatmap_data",
+        "communication_heatmap_data",
         "chapter_contributions",
         "project_contributions",
+        "repository_contributions",
+        "channel_communications",
         "nest_created_at",
         "nest_updated_at",
     )
@@ -58,7 +64,7 @@ class MemberSnapshotAdmin(admin.ModelAdmin):
             },
         ),
         (
-            "Contributions",
+            "GitHub Contributions",
             {
                 "fields": (
                     "commits",
@@ -67,17 +73,25 @@ class MemberSnapshotAdmin(admin.ModelAdmin):
                 )
             },
         ),
+        (
+            "Slack Communications",
+            {"fields": ("messages",)},
+        ),
         (
             "Statistics",
             {
                 "fields": (
                     "commits_count",
                     "pull_requests_count",
                     "issues_count",
+                    "messages_count",
                     "total_contributions",
                     "contribution_heatmap_data",
+                    "communication_heatmap_data",
                     "chapter_contributions",
                     "project_contributions",
+                    "repository_contributions",
+                    "channel_communications",
                 )
             },
         ),

backend/apps/owasp/api/internal/nodes/member_snapshot.py

@@ -13,8 +13,11 @@
         "start_at",
         "end_at",
         "contribution_heatmap_data",
+        "communication_heatmap_data",
         "chapter_contributions",
         "project_contributions",
+        "repository_contributions",
+        "channel_communications",
     ],
 )
 class MemberSnapshotNode(strawberry.relay.Node):
@@ -40,6 +43,11 @@ def pull_requests_count(self) -> int:
         """Resolve pull requests count."""
         return self.pull_requests_count
 
+    @strawberry.field
+    def messages_count(self) -> int:
+        """Resolve Slack messages count."""
+        return self.messages_count
+
     @strawberry.field
     def total_contributions(self) -> int:
         """Resolve total contributions."""