Add Candidate Page and Claim Highlights Feature

backend/make/apps/owasp.mk

@@ -2,9 +2,9 @@
 	owasp-aggregate-member-contributions owasp-aggregate-projects owasp-create-project-metadata-file \
 	owasp-enrich-chapters owasp-enrich-committees owasp-enrich-events owasp-enrich-projects \
 	owasp-generate-community-snapshot-video owasp-process-snapshots owasp-scrape-chapters \
-	owasp-scrape-committees owasp-scrape-projects owasp-sync-posts owasp-update-events \
-	owasp-update-leaders owasp-update-project-health-metrics owasp-update-project-health-requirements \
-	owasp-update-project-health-scores owasp-update-sponsors
+	owasp-scrape-committees owasp-scrape-projects owasp-sync-board-candidates owasp-sync-posts \
+	owasp-update-events owasp-update-leaders owasp-update-project-health-metrics \
+	owasp-update-project-health-requirements owasp-update-project-health-scores owasp-update-sponsors
 
 owasp-add-project-custom-tags:
 	@echo "Adding project custom tags from $(FILE)"
@@ -77,6 +77,10 @@ owasp-scrape-projects:
 owasp-sync-posts:
 	@CMD="python manage.py owasp_sync_posts" $(MAKE) backend-exec-command
 
+owasp-sync-board-candidates:
+	@echo "Sync OWASP board candidates"
+	@CMD="python manage.py owasp_sync_board_candidates $(ARGS)" $(MAKE) backend-exec-command
+
 owasp-update-events:
 	@echo "Getting OWASP events data"
 	@CMD="python manage.py owasp_update_events" $(MAKE) backend-exec-command

backend/src/apps/owasp/admin/__init__.py

@@ -7,6 +7,7 @@
 from .board_candidate_claim import BoardCandidateClaimAdmin
 from .board_candidate_claim_evidence import BoardCandidateClaimEvidenceAdmin
 from .board_candidate_claim_review import BoardCandidateClaimReviewAdmin
+from .board_candidate_profile import BoardCandidateProfileAdmin
 from .board_of_directors import BoardOfDirectorsAdmin
 from .chapter import ChapterAdmin
 from .committee import CommitteeAdmin

backend/src/apps/owasp/admin/board_candidate_profile.py

@@ -0,0 +1,41 @@
+"""Django admin configuration for BoardCandidateProfile model."""
+
+from django.contrib import admin
+from django.db import models
+
+from apps.owasp.models.board_candidate_profile import BoardCandidateProfile
+
+
+class BoardCandidateProfileAdmin(admin.ModelAdmin):
+    """Admin for BoardCandidateProfile model."""
+
+    autocomplete_fields = ("candidate",)
+    list_display = (
+        "__str__",
+        "nest_created_at",
+        "nest_updated_at",
+    )
+    search_fields = (
+        "candidate__member_name",
+        "candidate__member__login",
+        "raw_markdown",
+    )
+    readonly_fields = (
+        "nest_created_at",
+        "nest_updated_at",
+    )
+
+    def get_queryset(self, request) -> models.QuerySet:
+        """Retrieve optimized queryset with related candidate.
+
+        Args:
+            request: The HTTP request object.
+
+        Returns:
+            QuerySet: BoardCandidateProfile queryset with prefetched candidate.
+
+        """
+        return super().get_queryset(request).select_related("candidate__member")
+
+
+admin.site.register(BoardCandidateProfile, BoardCandidateProfileAdmin)

backend/src/apps/owasp/api/internal/mutations/board_candidate_claim.py

@@ -27,6 +27,7 @@ class CreateClaimInput:
 
     description: str
     name: str
+    source_text: str = ""
     year: int
 
 
@@ -37,6 +38,7 @@ class UpdateClaimInput:
     description: str | None = None
     key: str
     name: str | None = None
+    source_text: str | None = None
     year: int
 
 
@@ -173,6 +175,7 @@ def create_board_candidate_claim(
                 candidate=candidate,
                 description=input_data.description,
                 name=input_data.name,
+                source_text=input_data.source_text,
             )
         except IntegrityError:
             logger.warning(
@@ -232,6 +235,9 @@ def update_board_candidate_claim(
         if input_data.description:
             claim.description = input_data.description
             update_fields.append("description")
+        if input_data.source_text is not None:
+            claim.source_text = input_data.source_text
+            update_fields.append("source_text")
 
         try:
             claim.save(update_fields=update_fields)

backend/src/apps/owasp/api/internal/nodes/board_candidate_claim.py

@@ -21,6 +21,7 @@
         "key",
         "name",
         "order",
+        "source_text",
         "withdrawn_at",
         "withdrawn_reason",
     ],

backend/src/apps/owasp/api/internal/nodes/board_candidate_profile.py

@@ -0,0 +1,34 @@
+"""OWASP Board Candidate Profile GraphQL node."""
+
+from datetime import datetime
+
+import strawberry
+import strawberry_django
+
+from apps.owasp.api.internal.nodes.entity_member import EntityMemberNode
+from apps.owasp.models.board_candidate_profile import BoardCandidateProfile
+
+
+@strawberry_django.type(
+    BoardCandidateProfile,
+    fields=[
+        "raw_markdown",
+    ],
+)
+class BoardCandidateProfileNode(strawberry.relay.Node):
+    """Board Candidate Profile node."""
+
+    @strawberry_django.field
+    def candidate(self, root: BoardCandidateProfile) -> EntityMemberNode:
+        """Resolve candidate."""
+        return root.candidate
+
+    @strawberry_django.field
+    def created_at(self, root: BoardCandidateProfile) -> datetime:
+        """Resolve profile creation date."""
+        return root.nest_created_at
+
+    @strawberry_django.field
+    def updated_at(self, root: BoardCandidateProfile) -> datetime:
+        """Resolve profile last update date."""
+        return root.nest_updated_at

backend/src/apps/owasp/api/internal/queries/__init__.py

@@ -4,6 +4,7 @@
 from apps.owasp.api.internal.queries.board_candidate_claim_evidence import (
     BoardCandidateClaimEvidenceQuery,
 )
+from apps.owasp.api.internal.queries.board_candidate_profile import BoardCandidateProfileQuery
 
 from .board_of_directors import BoardOfDirectorsQuery
 from .chapter import ChapterQuery
@@ -21,6 +22,7 @@
 class OwaspQuery(
     BoardCandidateClaimEvidenceQuery,
     BoardCandidateClaimQuery,
+    BoardCandidateProfileQuery,
     BoardOfDirectorsQuery,
     ChapterQuery,
     CommitteeQuery,

backend/src/apps/owasp/api/internal/queries/board_candidate_claim.py

@@ -47,12 +47,18 @@ def board_candidate_claims(
             claims = claims.filter(candidate__member__login=login)
 
             if not is_self and not is_reviewer:
-                claims = claims.filter(status=BoardCandidateClaim.Status.APPROVED)
+                claims = claims.filter(
+                    status__in=[
+                        BoardCandidateClaim.Status.APPROVED,
+                        BoardCandidateClaim.Status.REJECTED,
+                    ]
+                )
             elif is_reviewer and not is_self:
                 claims = claims.filter(
                     status__in=[
                         BoardCandidateClaim.Status.SUBMITTED,
                         BoardCandidateClaim.Status.APPROVED,
+                        BoardCandidateClaim.Status.REJECTED,
                     ]
                 )
         elif is_reviewer:
@@ -62,16 +68,27 @@ def board_candidate_claims(
                     status__in=[
                         BoardCandidateClaim.Status.SUBMITTED,
                         BoardCandidateClaim.Status.APPROVED,
+                        BoardCandidateClaim.Status.REJECTED,
                     ]
                 )
             )
         elif user.is_authenticated and user.github_user:
             claims = claims.filter(
                 Q(candidate__member=user.github_user)
-                | Q(status=BoardCandidateClaim.Status.APPROVED)
+                | Q(
+                    status__in=[
+                        BoardCandidateClaim.Status.APPROVED,
+                        BoardCandidateClaim.Status.REJECTED,
+                    ]
+                )
             )
         else:
-            claims = claims.filter(status=BoardCandidateClaim.Status.APPROVED)
+            claims = claims.filter(
+                status__in=[
+                    BoardCandidateClaim.Status.APPROVED,
+                    BoardCandidateClaim.Status.REJECTED,
+                ]
+            )
 
         return (
             claims.annotate(
@@ -133,7 +150,11 @@ def board_candidate_claim(
             if (
                 is_self
                 or (is_reviewer and claim.status == BoardCandidateClaim.Status.SUBMITTED)
-                or claim.status == BoardCandidateClaim.Status.APPROVED
+                or claim.status
+                in {
+                    BoardCandidateClaim.Status.APPROVED,
+                    BoardCandidateClaim.Status.REJECTED,
+                }
             )
             else None
         )

backend/src/apps/owasp/api/internal/queries/board_candidate_claim_evidence.py

@@ -52,7 +52,11 @@ def get_claim_evidence(
         if (
             is_self
             or (is_reviewer and evidence.claim.status == BoardCandidateClaim.Status.SUBMITTED)
-            or evidence.claim.status == BoardCandidateClaim.Status.APPROVED
+            or evidence.claim.status
+            in {
+                BoardCandidateClaim.Status.APPROVED,
+                BoardCandidateClaim.Status.REJECTED,
+            }
         )
         else None
     )
@@ -99,7 +103,11 @@ def board_candidate_claim_evidences(
             if (
                 is_self
                 or (is_reviewer and claim.status == BoardCandidateClaim.Status.SUBMITTED)
-                or claim.status == BoardCandidateClaim.Status.APPROVED
+                or claim.status
+                in {
+                    BoardCandidateClaim.Status.APPROVED,
+                    BoardCandidateClaim.Status.REJECTED,
+                }
             )
             else []
         )

backend/src/apps/owasp/api/internal/queries/board_candidate_profile.py

@@ -0,0 +1,44 @@
+"""OWASP Board Candidate Profile GraphQL queries."""
+
+import strawberry
+import strawberry_django
+from django.contrib.contenttypes.models import ContentType
+
+from apps.owasp.api.internal.nodes.board_candidate_profile import BoardCandidateProfileNode
+from apps.owasp.models.board_candidate_profile import BoardCandidateProfile
+from apps.owasp.models.board_of_directors import BoardOfDirectors
+from apps.owasp.models.entity_member import EntityMember
+
+
+@strawberry.type
+class BoardCandidateProfileQuery:
+    """GraphQL queries for Board Candidate Profile model."""
+
+    @strawberry_django.field
+    def board_candidate_profile(
+        self, info: strawberry.Info, login: str, year: int
+    ) -> BoardCandidateProfileNode | None:
+        """Resolve Board Candidate Profile.
+
+        Args:
+            info (Info): Strawberry Info.
+            login (str): The login of the candidate.
+            year (int): The year of the election.
+
+        Returns:
+            BoardCandidateProfileNode object if found, None otherwise.
+
+        """
+        try:
+            board = BoardOfDirectors.objects.get(year=year)
+            content_type = ContentType.objects.get_for_model(BoardOfDirectors)
+            return BoardCandidateProfile.objects.select_related("candidate__member").get(
+                candidate__member__login=login,
+                candidate__entity_type=content_type,
+                candidate__entity_id=board.id,
+                candidate__role=EntityMember.Role.CANDIDATE,
+                candidate__is_active=True,
+                candidate__is_reviewed=True,
+            )
+        except (BoardOfDirectors.DoesNotExist, BoardCandidateProfile.DoesNotExist):
+            return None

backend/src/apps/owasp/management/commands/owasp_sync_board_candidates.py

@@ -9,9 +9,12 @@
 from django.core.management.base import BaseCommand
 
 from apps.github.utils import get_repository_file_content
+from apps.owasp.models.board_candidate_profile import BoardCandidateProfile
 from apps.owasp.models.board_of_directors import BoardOfDirectors
 from apps.owasp.models.entity_member import EntityMember
 
+YAML_FRONTMATTER_PATTERN = r"^---\s*\n((?:(?!^---\s*$).*\n)+)^---\s*$"
+
 
 class Command(BaseCommand):
     help = "Sync board election candidates from www-board-candidates repository"
@@ -52,7 +55,7 @@ def parse_candidate_metadata(self, content: str) -> dict:
             dict: Parsed metadata dictionary.
 
         """
-        yaml_pattern = re.compile(r"^---\s*\n((?:(?!^---\s*$).*\n)+)^---\s*$", re.MULTILINE)
+        yaml_pattern = re.compile(YAML_FRONTMATTER_PATTERN, re.MULTILINE)
 
         if not content.startswith("---"):
             return {}
@@ -66,6 +69,23 @@ def parse_candidate_metadata(self, content: str) -> dict:
 
         return {}
 
+    def parse_candidate_profile(self, content: str) -> str:
+        """Parse profile raw text content without YAML frontmatter from candidate markdown file.
+
+        Args:
+            content (str): The markdown file content.
+
+        Returns:
+            str: Parsed profile raw text.
+
+        """
+        yaml_pattern = re.compile(YAML_FRONTMATTER_PATTERN, re.MULTILINE)
+
+        if not content.startswith("---"):
+            return content.strip()
+
+        return yaml_pattern.sub("", content, count=1).strip()
+
     def sync_year_candidates(self, year: int) -> int:
         """Sync candidates for a specific year.
 
@@ -128,7 +148,13 @@ def sync_year_candidates(self, year: int) -> int:
                 "order": 0,
             }
 
-            EntityMember.update_data(data, save=True)
+            member = EntityMember.update_data(data, save=True)
+            raw_markdown = self.parse_candidate_profile(file_content)
+            BoardCandidateProfile.objects.update_or_create(
+                candidate=member,
+                defaults={"raw_markdown": raw_markdown},
+            )
+
             synced_count += 1
 
         return synced_count