Merge branch 'feature/nest-zappa-migration' into pr/rudransh-shrivastava/2431

Author: arkid15r

.pre-commit-config.yaml

@@ -18,7 +18,7 @@ repos:
         files: ^infrastructure/.*\.tf$
 
   - repo: https://github.com/astral-sh/ruff-pre-commit
-    rev: v0.14.1
+    rev: v0.14.2
     hooks:
       - id: ruff
         args:

backend/apps/api/rest/v0/__init__.py

@@ -11,6 +11,7 @@
 from apps.api.rest.v0.event import router as event_router
 from apps.api.rest.v0.issue import router as issue_router
 from apps.api.rest.v0.member import router as member_router
+from apps.api.rest.v0.milestone import router as milestone_router
 from apps.api.rest.v0.organization import router as organization_router
 from apps.api.rest.v0.project import router as project_router
 from apps.api.rest.v0.release import router as release_router
@@ -23,6 +24,7 @@
     "/events": event_router,
     "/issues": issue_router,
     "/members": member_router,
+    "/milestones": milestone_router,
     "/organizations": organization_router,
     "/projects": project_router,
     "/releases": release_router,

backend/apps/api/rest/v0/milestone.py

@@ -0,0 +1,124 @@
+"""Milestone API."""
+
+from datetime import datetime
+from http import HTTPStatus
+from typing import Literal
+
+from django.http import HttpRequest
+from ninja import Field, FilterSchema, Path, Query, Schema
+from ninja.decorators import decorate_view
+from ninja.pagination import RouterPaginated
+from ninja.responses import Response
+
+from apps.api.decorators.cache import cache_response
+from apps.github.models.generic_issue_model import GenericIssueModel
+from apps.github.models.milestone import Milestone as MilestoneModel
+
+router = RouterPaginated(tags=["Milestones"])
+
+
+class MilestoneBase(Schema):
+    """Base schema for Milestone (used in list endpoints)."""
+
+    created_at: datetime
+    number: int
+    state: GenericIssueModel.State
+    title: str
+    updated_at: datetime
+    url: str
+
+
+class Milestone(MilestoneBase):
+    """Schema for Milestone (minimal fields for list display)."""
+
+
+class MilestoneDetail(MilestoneBase):
+    """Detail schema for Milestone (used in single item endpoints)."""
+
+    body: str
+    closed_issues_count: int
+    due_on: datetime | None
+    open_issues_count: int
+
+
+class MilestoneError(Schema):
+    """Milestone error schema."""
+
+    message: str
+
+
+class MilestoneFilter(FilterSchema):
+    """Filter for Milestone."""
+
+    organization: str | None = Field(
+        None,
+        description="Organization that milestones belong to (filtered by repository owner)",
+        example="OWASP",
+    )
+    repository: str | None = Field(
+        None,
+        description="Repository that milestones belong to",
+        example="Nest",
+    )
+    state: GenericIssueModel.State | None = Field(
+        None,
+        description="Milestone state",
+    )
+
+
+@router.get(
+    "/",
+    description="Retrieve a paginated list of GitHub milestones.",
+    operation_id="list_milestones",
+    response=list[Milestone],
+    summary="List milestones",
+)
+@decorate_view(cache_response())
+def list_milestones(
+    request: HttpRequest,
+    filters: MilestoneFilter = Query(...),
+    ordering: Literal["created_at", "-created_at", "updated_at", "-updated_at"] | None = None,
+) -> list[Milestone]:
+    """Get all milestones."""
+    milestones = MilestoneModel.objects.select_related("repository", "repository__organization")
+
+    if filters.organization:
+        milestones = milestones.filter(
+            repository__organization__login__iexact=filters.organization
+        )
+    if filters.repository:
+        milestones = milestones.filter(repository__name__iexact=filters.repository)
+    if filters.state:
+        milestones = milestones.filter(state=filters.state)
+
+    return milestones.order_by(ordering or "-created_at", "-updated_at")
+
+
+@router.get(
+    "/{str:organization_id}/{str:repository_id}/{int:milestone_id}",
+    description=(
+        "Retrieve a specific GitHub milestone by organization, repository, and milestone number."
+    ),
+    operation_id="get_milestone",
+    response={
+        HTTPStatus.NOT_FOUND: MilestoneError,
+        HTTPStatus.OK: MilestoneDetail,
+    },
+    summary="Get milestone",
+)
+@decorate_view(cache_response())
+def get_milestone(
+    request: HttpRequest,
+    organization_id: str = Path(example="OWASP"),
+    repository_id: str = Path(example="Nest"),
+    milestone_id: int = Path(example=1),
+) -> MilestoneDetail | MilestoneError:
+    """Get milestone."""
+    try:
+        return MilestoneModel.objects.get(
+            repository__organization__login__iexact=organization_id,
+            repository__name__iexact=repository_id,
+            number=milestone_id,
+        )
+    except MilestoneModel.DoesNotExist:
+        return Response({"message": "Milestone not found"}, status=HTTPStatus.NOT_FOUND)

backend/apps/github/admin/user.py

@@ -14,6 +14,7 @@ class MemberProfileInline(admin.StackedInline):
     verbose_name_plural = "OWASP Member Profile"
     fields = (
         "owasp_slack_id",
+        "linkedin_page_id",
         "first_contribution_at",
         "is_owasp_board_member",
         "is_former_owasp_staff",

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

@@ -88,6 +88,13 @@ def issues_count(self) -> int:
         """Resolve issues count."""
         return self.idx_issues_count
 
+    @strawberry.field
+    def linkedin_page_id(self) -> str:
+        """Resolve LinkedIn page ID."""
+        if hasattr(self, "owasp_profile") and self.owasp_profile.linkedin_page_id:
+            return self.owasp_profile.linkedin_page_id
+        return ""
+
     @strawberry.field
     def releases_count(self) -> int:
         """Resolve releases count."""

backend/apps/owasp/admin/member_profile.py

@@ -40,6 +40,7 @@ class MemberProfileAdmin(admin.ModelAdmin):
             {
                 "fields": (
                     "github_user",
+                    "linkedin_page_id",
                     "owasp_slack_id",
                 )
             },

backend/apps/owasp/migrations/0065_memberprofile_linkedin_page_id.py

@@ -0,0 +1,31 @@
+# Generated by Django 5.2.7 on 2025-10-25 00:24
+
+import django.core.validators
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+    dependencies = [
+        ("owasp", "0064_memberprofile_is_gsoc_mentor_and_more"),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name="memberprofile",
+            name="linkedin_page_id",
+            field=models.CharField(
+                blank=True,
+                default="",
+                help_text="LinkedIn username or custom URL ID (e.g., 'john-doe-123')",
+                max_length=100,
+                validators=[
+                    django.core.validators.RegexValidator(
+                        code="invalid_linkedin_id",
+                        message="LinkedIn ID must be 3-100 characters and contain only letters, numbers, and hyphens",
+                        regex="^[a-zA-Z0-9\\-]{3,100}$",
+                    )
+                ],
+                verbose_name="LinkedIn Page ID",
+            ),
+        ),
+    ]

backend/apps/owasp/models/member_profile.py

@@ -2,6 +2,7 @@
 
 from __future__ import annotations
 
+from django.core.validators import RegexValidator
 from django.db import models
 
 from apps.common.models import TimestampedModel
@@ -52,6 +53,23 @@ class Meta:
         verbose_name="Is GSoC Mentor",
         help_text="Whether the member is a Google Summer of Code mentor",
     )
+    linkedin_page_id = models.CharField(
+        max_length=100,
+        blank=True,
+        default="",
+        validators=[
+            RegexValidator(
+                regex=r"^[a-zA-Z0-9\-]{3,100}$",
+                message=(
+                    "LinkedIn ID must be 3-100 characters and contain only "
+                    "letters, numbers, and hyphens"
+                ),
+                code="invalid_linkedin_id",
+            ),
+        ],
+        verbose_name="LinkedIn Page ID",
+        help_text="LinkedIn username or custom URL ID (e.g., 'john-doe-123')",
+    )
 
     def __str__(self) -> str:
         """Return human-readable representation."""

backend/apps/owasp/models/post.py

@@ -3,6 +3,7 @@
 from datetime import UTC, datetime
 
 from django.db import models
+from django.utils import timezone
 from django.utils.dateparse import parse_datetime
 
 from apps.common.models import BulkSaveModel, TimestampedModel
@@ -36,7 +37,11 @@ def bulk_save(posts, fields=None) -> None:  # type: ignore[override]
     @staticmethod
     def recent_posts():
         """Get recent posts."""
-        return Post.objects.order_by("-published_at")
+        return Post.objects.filter(
+            published_at__lte=timezone.now(),
+        ).order_by(
+            "-published_at",
+        )
 
     @staticmethod
     def update_data(data, *, save: bool = True) -> "Post":