Merge branch 'feature/nestbot-assistant' into MVP

Author: Dishant1804

.pre-commit-config.yaml

@@ -10,7 +10,7 @@ repos:
         exclude: (.github|pnpm-lock.yaml)
 
   - repo: https://github.com/astral-sh/ruff-pre-commit
-    rev: v0.13.0
+    rev: v0.13.1
     hooks:
       - id: ruff
         args:
@@ -38,7 +38,7 @@ repos:
         exclude: (.github|pnpm-lock.yaml)
 
   - repo: https://github.com/pre-commit/mirrors-mypy
-    rev: v1.18.1
+    rev: v1.18.2
     hooks:
       - id: mypy
         additional_dependencies:

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

@@ -13,6 +13,7 @@
 from apps.api.rest.v0.project import router as project_router
 from apps.api.rest.v0.release import router as release_router
 from apps.api.rest.v0.repository import router as repository_router
+from apps.api.rest.v0.sponsor import router as sponsor_router
 
 from .chapter import router as chapter_router
 
@@ -34,6 +35,8 @@
     "/releases": release_router,
     # Repositories.
     "/repositories": repository_router,
+    # Sponsors.
+    "/sponsors": sponsor_router,
 }
 
 
@@ -43,7 +46,7 @@
     "docs": Swagger(settings={"persistAuthorization": True}),
     "throttle": [AuthRateThrottle("10/s")],
     "title": "OWASP Nest",
-    "version": "0.2.1",
+    "version": "0.2.3",
 }
 
 api_settings_customization = {}

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

@@ -40,32 +40,10 @@ class ChapterSchema(Schema):
     updated_at: datetime
 
 
-@router.get(
-    "/",
-    description="Retrieve a paginated list of OWASP chapters.",
-    operation_id="list_chapters",
-    response={200: list[ChapterSchema]},
-    summary="List chapters",
-    tags=["Chapters"],
-)
-@decorate_view(cache_page(settings.API_CACHE_TIME_SECONDS))
-@paginate(PageNumberPagination, page_size=settings.API_PAGE_SIZE)
-def list_chapters(
-    request: HttpRequest,
-    filters: ChapterFilterSchema = Query(...),
-    ordering: Literal["created_at", "-created_at", "updated_at", "-updated_at"] | None = Query(
-        None,
-        description="Ordering field",
-    ),
-) -> list[ChapterSchema]:
-    """Get chapters."""
-    return filters.filter(Chapter.active_chapters.order_by(ordering or "-created_at"))
-
-
 @router.get(
     "/{str:chapter_id}",
     description="Retrieve chapter details.",
-    operation_id="get_chapter",
+    operation_id="get",
     response={
         HTTPStatus.NOT_FOUND: ChapterErrorResponse,
         HTTPStatus.OK: ChapterSchema,
@@ -86,3 +64,25 @@ def get_chapter(
         return chapter
 
     return Response({"message": "Chapter not found"}, status=HTTPStatus.NOT_FOUND)
+
+
+@router.get(
+    "/",
+    description="Retrieve a paginated list of OWASP chapters.",
+    operation_id="list",
+    response={200: list[ChapterSchema]},
+    summary="List chapters",
+    tags=["Chapters"],
+)
+@decorate_view(cache_page(settings.API_CACHE_TIME_SECONDS))
+@paginate(PageNumberPagination, page_size=settings.API_PAGE_SIZE)
+def list_chapters(
+    request: HttpRequest,
+    filters: ChapterFilterSchema = Query(...),
+    ordering: Literal["created_at", "-created_at", "updated_at", "-updated_at"] | None = Query(
+        None,
+        description="Ordering field",
+    ),
+) -> list[ChapterSchema]:
+    """Get chapters."""
+    return filters.filter(Chapter.active_chapters.order_by(ordering or "-created_at"))

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

@@ -32,31 +32,10 @@ class CommitteeSchema(Schema):
     updated_at: datetime
 
 
-@router.get(
-    "/",
-    description="Retrieve a paginated list of OWASP committees.",
-    operation_id="list_committees",
-    response={200: list[CommitteeSchema]},
-    summary="List committees",
-    tags=["Committees"],
-)
-@decorate_view(cache_page(settings.API_CACHE_TIME_SECONDS))
-@paginate(PageNumberPagination, page_size=settings.API_PAGE_SIZE)
-def list_committees(
-    request: HttpRequest,
-    ordering: Literal["created_at", "-created_at", "updated_at", "-updated_at"] | None = Query(
-        None,
-        description="Ordering field",
-    ),
-) -> list[CommitteeSchema]:
-    """Get committees."""
-    return Committee.active_committees.order_by(ordering or "-created_at")
-
-
 @router.get(
     "/{str:committee_id}",
     description="Retrieve committee details.",
-    operation_id="get_committee",
+    operation_id="get",
     response={
         HTTPStatus.NOT_FOUND: CommitteeErrorResponse,
         HTTPStatus.OK: CommitteeSchema,
@@ -80,3 +59,24 @@ def get_chapter(
         return committee
 
     return Response({"message": "Committee not found"}, status=HTTPStatus.NOT_FOUND)
+
+
+@router.get(
+    "/",
+    description="Retrieve a paginated list of OWASP committees.",
+    operation_id="list",
+    response={200: list[CommitteeSchema]},
+    summary="List committees",
+    tags=["Committees"],
+)
+@decorate_view(cache_page(settings.API_CACHE_TIME_SECONDS))
+@paginate(PageNumberPagination, page_size=settings.API_PAGE_SIZE)
+def list_committees(
+    request: HttpRequest,
+    ordering: Literal["created_at", "-created_at", "updated_at", "-updated_at"] | None = Query(
+        None,
+        description="Ordering field",
+    ),
+) -> list[CommitteeSchema]:
+    """Get committees."""
+    return Committee.active_committees.order_by(ordering or "-created_at")

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

@@ -28,7 +28,7 @@ class EventSchema(Schema):
 @router.get(
     "/",
     description="Retrieve a paginated list of OWASP events.",
-    operation_id="list_events",
+    operation_id="list",
     summary="List events",
     tags=["Events"],
     response={200: list[EventSchema]},
@@ -42,5 +42,5 @@ def list_events(
         description="Ordering field",
     ),
 ) -> list[EventSchema]:
-    """Get all events."""
+    """Get events."""
     return Event.objects.order_by(ordering or "-start_date")

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

@@ -39,7 +39,7 @@ class IssueSchema(Schema):
 @router.get(
     "/",
     description="Retrieve a paginated list of GitHub issues.",
-    operation_id="list_issues",
+    operation_id="list",
     response={200: list[IssueSchema]},
     summary="List issues",
     tags=["Issues"],
@@ -54,7 +54,7 @@ def list_issues(
         description="Ordering field",
     ),
 ) -> list[IssueSchema]:
-    """Get all issues."""
+    """Get issues."""
     issues = filters.filter(Issue.objects.all())
 
     if ordering:

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

@@ -35,7 +35,7 @@ class LabelSchema(Schema):
 @router.get(
     "/",
     description="Retrieve a paginated list of GitHub labels.",
-    operation_id="list_labels",
+    operation_id="list",
     response={200: list[LabelSchema]},
     summary="List labels",
     tags=["Labels"],
@@ -51,7 +51,7 @@ def list_label(
         description="Ordering field",
     ),
 ) -> list[LabelSchema]:
-    """Get all labels."""
+    """Get labels."""
     labels = filters.filter(Label.objects.all())
 
     if ordering:

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

@@ -1,4 +1,4 @@
-"""User API."""
+"""Member API."""
 
 from datetime import datetime
 from http import HTTPStatus
@@ -52,32 +52,10 @@ class MemberErrorResponse(Schema):
     message: str
 
 
-@router.get(
-    "/",
-    description="Retrieve a paginated list of OWASP community members.",
-    operation_id="list_members",
-    response={HTTPStatus.OK: list[MemberSchema]},
-    summary="List members",
-    tags=["Community"],
-)
-@decorate_view(cache_page(settings.API_CACHE_TIME_SECONDS))
-@paginate(PageNumberPagination, page_size=settings.API_PAGE_SIZE)
-def list_members(
-    request: HttpRequest,
-    filters: MemberFilterSchema = Query(...),
-    ordering: Literal["created_at", "-created_at", "updated_at", "-updated_at"] | None = Query(
-        None,
-        description="Ordering field",
-    ),
-) -> list[MemberSchema]:
-    """Get all members."""
-    return filters.filter(User.objects.order_by(ordering or "-created_at"))
-
-
 @router.get(
     "/{str:member_id}",
     description="Retrieve member details.",
-    operation_id="get_member",
+    operation_id="get",
     response={
         HTTPStatus.NOT_FOUND: MemberErrorResponse,
         HTTPStatus.OK: MemberSchema,
@@ -94,3 +72,25 @@ def get_member(
         return user
 
     return Response({"message": "Member not found"}, status=HTTPStatus.NOT_FOUND)
+
+
+@router.get(
+    "/",
+    description="Retrieve a paginated list of OWASP community members.",
+    operation_id="list",
+    response={HTTPStatus.OK: list[MemberSchema]},
+    summary="List members",
+    tags=["Community"],
+)
+@decorate_view(cache_page(settings.API_CACHE_TIME_SECONDS))
+@paginate(PageNumberPagination, page_size=settings.API_PAGE_SIZE)
+def list_members(
+    request: HttpRequest,
+    filters: MemberFilterSchema = Query(...),
+    ordering: Literal["created_at", "-created_at", "updated_at", "-updated_at"] | None = Query(
+        None,
+        description="Ordering field",
+    ),
+) -> list[MemberSchema]:
+    """Get members."""
+    return filters.filter(User.objects.order_by(ordering or "-created_at"))

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

@@ -47,7 +47,7 @@ class OrganizationSchema(Schema):
 @router.get(
     "/",
     description="Retrieve a paginated list of GitHub organizations.",
-    operation_id="list_organizations",
+    operation_id="list",
     response={200: list[OrganizationSchema]},
     summary="List organizations",
     tags=["Community"],
@@ -73,7 +73,7 @@ def list_organization(
 @router.get(
     "/{str:organization_id}",
     description="Retrieve project details.",
-    operation_id="get_organization",
+    operation_id="get",
     response={
         HTTPStatus.NOT_FOUND: OrganizationErrorResponse,
         HTTPStatus.OK: OrganizationSchema,

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

@@ -43,33 +43,10 @@ class ProjectSchema(Schema):
     updated_at: datetime
 
 
-@router.get(
-    "/",
-    description="Retrieve a paginated list of OWASP projects.",
-    operation_id="list_projects",
-    response={200: list[ProjectSchema]},
-    summary="List projects",
-    tags=["Projects"],
-)
-@decorate_view(cache_page(settings.API_CACHE_TIME_SECONDS))
-@paginate(PageNumberPagination, page_size=settings.API_PAGE_SIZE)
-def list_projects(
-    request: HttpRequest,
-    filters: ProjectFilterSchema = Query(...),
-    ordering: Literal["created_at", "-created_at", "updated_at", "-updated_at"] | None = Query(
-        None,
-        description="Ordering field",
-        example="-created_at",
-    ),
-) -> list[ProjectSchema]:
-    """Get projects."""
-    return filters.filter(Project.active_projects.order_by(ordering or "-created_at"))
-
-
 @router.get(
     "/{str:project_id}",
     description="Retrieve project details.",
-    operation_id="get_project",
+    operation_id="get",
     response={
         HTTPStatus.NOT_FOUND: ProjectErrorResponse,
         HTTPStatus.OK: ProjectSchema,
@@ -90,3 +67,26 @@ def get_project(
         return project
 
     return Response({"message": "Project not found"}, status=HTTPStatus.NOT_FOUND)
+
+
+@router.get(
+    "/",
+    description="Retrieve a paginated list of OWASP projects.",
+    operation_id="list",
+    response={200: list[ProjectSchema]},
+    summary="List projects",
+    tags=["Projects"],
+)
+@decorate_view(cache_page(settings.API_CACHE_TIME_SECONDS))
+@paginate(PageNumberPagination, page_size=settings.API_PAGE_SIZE)
+def list_projects(
+    request: HttpRequest,
+    filters: ProjectFilterSchema = Query(...),
+    ordering: Literal["created_at", "-created_at", "updated_at", "-updated_at"] | None = Query(
+        None,
+        description="Ordering field",
+        example="-created_at",
+    ),
+) -> list[ProjectSchema]:
+    """Get projects."""
+    return filters.filter(Project.active_projects.order_by(ordering or "-created_at"))