Merge pull request #194 from moevm/dev

Dev

Author: pitatir

backend/src/api/cleanday.py

@@ -9,7 +9,7 @@
 from data.query import GetCleandaysParams, CleandayListResponse, GetCleanday, UserListResponse, GetMembersParams, \
     PaginationParams, CleandayLogListResponse, CommentListResponse, UpdateCleanday, CreateCleanday, CreateImages, \
     ImageListResponse, UpdateParticipation, CreateParticipation, CleandayResults, GetCleandayLogsParams, \
-    GetCommentsParams, CreateComment, GetMembersResponse
+    GetCommentsParams, CreateComment, GetMembersResponse, RequirementListResponse
 from repo.cleanday_repo import CleandayRepo
 from repo.client import database
 import repo.model as repo_model
@@ -400,3 +400,15 @@ async def end_cleanday(cleanday_id: str, results: CleandayResults,
     else:
         trans.commit_transaction()
     return
+
+
+@router.get("/{cleanday_id}/requirements")
+async def get_cleanday_requirements(cleanday_id: str) -> RequirementListResponse:
+    """
+    Получение списка требований для конкретного субботника
+    """
+    requirements = static_cleanday_repo.get_raw_requirements(cleanday_id)
+    if requirements is None:
+        raise HTTPException(status_code=404, detail="Cleanday not found")
+    
+    return RequirementListResponse(contents=requirements, total_count=len(requirements))

backend/src/data/query.py

@@ -1,6 +1,6 @@
 from datetime import datetime
 from enum import StrEnum, auto
-from typing import Optional
+from typing import Optional, List
 
 from pydantic import BaseModel, Field
 
@@ -378,3 +378,8 @@ class CreateComment(BaseModel):
 class GetMembersResponse(BaseModel):
     users: list[GetMember]
     total_count: int
+
+
+class RequirementListResponse(BaseModel):
+    contents: List[Requirement]
+    total_count: int

frontend/src/api/cleanday/endpoints.ts

@@ -18,6 +18,9 @@ export const CREATE_CLEANDAY_COMMENT: string = '/api/cleandays/{id}/comments';
 // Получение субботника по id - GET
 export const GET_CLEANDAY: string = '/api/cleandays/{id}';
 
+// Получение требований к участию в субботнике - GET
+export const GET_CLEANDAY_REQUIREMENTS: string = '/api/cleandays/{id}/requirements';
+
 // Получение массива субботников по id - GET
 //export const GET_CLEANDAYS_BY_ID: string = '';