Merge pull request #46 from 9git9git/hotfix

🩹 카테고리 id 안받는 부분 수정 및 chat endpoints 정리

Author: trivialcoding6

app/api/v1/endpoints/chat.py

@@ -19,7 +19,7 @@
 router = APIRouter()
 
 
-@router.get("/", response_model=ResponseBase[List[ChatResponse]])
+@router.get("/all", response_model=ResponseBase[List[ChatResponse]])
 async def get_chats_by_user(
     user_id: UUID,
     db: AsyncSession = Depends(get_db),
@@ -35,31 +35,16 @@ async def get_chats_by_user(
         )
 
 
-@router.get("/storage/{storage_id}", response_model=ResponseBase[List[ChatResponse]])
-async def get_chats_by_storage(
-    user_id: UUID,
-    storage_id: UUID,
-    db: AsyncSession = Depends(get_db),
-) -> ResponseBase[List[ChatResponse]]:
-    try:
-        chats = await select_chats_by_storage(db, user_id, storage_id)
-        return ResponseBase(status_code=status.HTTP_200_OK, data=chats)
-    except HTTPException as e:
-        return ResponseBase(status_code=e.status_code, error=e.detail)
-    except Exception as e:
-        return ResponseBase(
-            status_code=status.HTTP_500_INTERNAL_SERVER_ERROR, error=str(e)
-        )
-
-
 @router.get("/", response_model=ResponseBase[List[ChatResponse]])
-async def get_chats_by_category(
+async def get_chats_by_storage_and_category(
     user_id: UUID,
+    storage_id: UUID,
     category_id: UUID,
     db: AsyncSession = Depends(get_db),
 ) -> ResponseBase[List[ChatResponse]]:
     try:
-        chats = await select_chats_by_category(db, user_id, category_id)
+        # 스토리지 ID 기준으로 조회 (storage_id가 URL 접두사에 이미 포함되어 있음)
+        chats = await select_chats_by_storage(db, user_id, storage_id, category_id)
         return ResponseBase(status_code=status.HTTP_200_OK, data=chats)
     except HTTPException as e:
         return ResponseBase(status_code=e.status_code, error=e.detail)

app/api/v1/router.py

@@ -56,7 +56,7 @@
 )
 router.include_router(
     chat.router,
-    prefix="/users/{user_id}/categories/{category_id}/chats",
+    prefix="/users/{user_id}/categories/{category_id}/storages/{storage_id}/chats",
     tags=["chats"],
 )
 router.include_router(

app/crud/chat.py

@@ -110,9 +110,14 @@ async def read_chats_by_storage(
     db: AsyncSession,
     user_id: UUID,
     storage_id: UUID,
+    category_id: UUID,
 ) -> List[ChatResponse]:
     result = await db.execute(
-        select(Chat).where(Chat.user_id == user_id, Chat.storage_id == storage_id)
+        select(Chat).where(
+            Chat.user_id == user_id,
+            Chat.storage_id == storage_id,
+            Chat.category_id == category_id,
+        )
     )
     return result.scalars().all()
 

app/schemas/chat.py

@@ -19,6 +19,7 @@ class ChatResponse(BaseModel):
     category_id: UUID
     role: RoleEnum
     content: str
+    created_at: datetime
 
 
 class ModelResponse(BaseModel):

app/services/chat.py

@@ -43,8 +43,9 @@ async def select_chats_by_storage(
     db: AsyncSession,
     user_id: UUID,
     storage_id: UUID,
+    category_id: UUID,
 ) -> List[ChatResponse]:
-    return await read_chats_by_storage(db, user_id, storage_id)
+    return await read_chats_by_storage(db, user_id, storage_id, category_id)
 
 
 # category_id 기준 조회