Merge pull request #27 from 9git9git/SCRUM-139-main-일정-페이지-서비스-API-개발

[Scrum-139]-[BE]-main-일정-페이지-서비스-API-개발

Author: GideokKim

app/api/v1/endpoints/chat.py

@@ -52,7 +52,7 @@ async def get_chats_by_storage(
         )
 
 
-@router.get("/category/{category_id}", response_model=ResponseBase[List[ChatResponse]])
+@router.get("/", response_model=ResponseBase[List[ChatResponse]])
 async def get_chats_by_category(
     user_id: UUID,
     category_id: UUID,

app/api/v1/endpoints/main.py

@@ -0,0 +1,49 @@
+from http.client import HTTPException
+from app.schemas.main import TodosAndMemosResponse
+from app.services.main import select_todos_and_memos_by_period
+from app.schemas.base import ResponseBase
+from fastapi import APIRouter, Depends, status
+from sqlalchemy.ext.asyncio import AsyncSession
+from uuid import UUID
+from datetime import date
+from app.db.session import get_db
+from app.schemas.progress import TodayProgressResponse
+from app.services.main import select_today_progresses
+
+router = APIRouter()
+
+
+@router.get("/todos-and-memos", response_model=ResponseBase[TodosAndMemosResponse])
+async def get_todos_and_memos(
+    user_id: UUID,
+    start_date: date,
+    end_date: date,
+    db: AsyncSession = Depends(get_db),
+) -> ResponseBase[TodosAndMemosResponse]:
+    try:
+        todos_and_memos = await select_todos_and_memos_by_period(
+            db, user_id, start_date, end_date
+        )
+        return ResponseBase(status_code=status.HTTP_200_OK, data=todos_and_memos)
+    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("/today-progresses", response_model=ResponseBase[TodayProgressResponse])
+async def get_today_progresses(
+    user_id: UUID,
+    db: AsyncSession = Depends(get_db),
+) -> ResponseBase[TodayProgressResponse]:
+    try:
+        today_progresses = await select_today_progresses(db, user_id)
+        return ResponseBase(status_code=status.HTTP_200_OK, data=today_progresses)
+    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)
+        )

app/api/v1/endpoints/memo.py

@@ -1,9 +1,7 @@
 from app.schemas.base import ResponseBase
 from app.schemas.memo import MemoCreate, MemoResponse, MemoUpdate
 from app.services.memo import (
-    select_today_memos_service,
-    select_month_memos_service,
-    select_month_memos_by_category_id_service,
+    select_memos_by_period,
     add_memo_service,
     edit_memo_service,
     delete_memo_service,
@@ -13,52 +11,20 @@
 from sqlalchemy.ext.asyncio import AsyncSession
 from typing import List
 from uuid import UUID
+from datetime import date
 
 router = APIRouter()
 
 
 @router.get("/", response_model=ResponseBase[List[MemoResponse]])
-async def get_today_memos(
-    user_id: UUID, db: AsyncSession = Depends(get_db)
-) -> ResponseBase[List[MemoResponse]]:
-    try:
-        memos = await select_today_memos_service(db, user_id)
-        return ResponseBase(status_code=status.HTTP_200_OK, data=memos)
-    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[MemoResponse]])
-async def get_month_memos(
-    user_id: UUID, year: int, month: int, db: AsyncSession = Depends(get_db)
-) -> ResponseBase[List[MemoResponse]]:
-    try:
-        memos = await select_month_memos_service(db, user_id, year, month)
-        return ResponseBase(status_code=status.HTTP_200_OK, data=memos)
-    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[MemoResponse]])
-async def get_month_memos_by_category(
+async def get_memos_by_period(
     user_id: UUID,
-    category_id: UUID,
-    year: int,
-    month: int,
+    start_date: date,
+    end_date: date,
     db: AsyncSession = Depends(get_db),
 ) -> ResponseBase[List[MemoResponse]]:
     try:
-        memos = await select_month_memos_by_category_id_service(
-            db, user_id, category_id, year, month
-        )
+        memos = await select_memos_by_period(db, user_id, start_date, end_date)
         return ResponseBase(status_code=status.HTTP_200_OK, data=memos)
     except HTTPException as e:
         return ResponseBase(status_code=e.status_code, error=e.detail)

app/api/v1/endpoints/progress.py

@@ -36,10 +36,11 @@ async def post_progress(
 
 @router.get("/", response_model=ResponseBase[List[ProgressResponse]])
 async def get_all_progresses(
+    user_id: UUID,
     db: AsyncSession = Depends(get_db),
 ) -> ResponseBase[List[ProgressResponse]]:
     try:
-        progresses = await select_all_progresses(db)
+        progresses = await select_all_progresses(db, user_id)
         return ResponseBase(status_code=status.HTTP_200_OK, data=progresses)
     except HTTPException as e:
         return ResponseBase(status_code=e.status_code, error=e.detail)

app/api/v1/endpoints/todo.py

@@ -1,4 +1,5 @@
-from fastapi import APIRouter, Depends, HTTPException, status
+from datetime import date
+from fastapi import APIRouter, Depends, HTTPException, status, Query
 from sqlalchemy.ext.asyncio import AsyncSession
 from typing import List
 from uuid import UUID
@@ -8,6 +9,7 @@
     add_todo,
     select_all_todos,
     select_todo_by_id,
+    select_todos_by_period,
     update_todo_by_id,
     delete_todo_service,
 )
@@ -54,6 +56,26 @@ async def get_all_todos(
         )
 
 
+# 날짜 범위로 할 일 조회
+@router.get("/period", response_model=ResponseBase[List[TodoResponse]])
+async def get_todos_by_period(
+    user_id: UUID,
+    startDate: date = Query(..., description="시작 날짜 (YYYY-MM-DD)"),
+    endDate: date = Query(..., description="종료 날짜 (YYYY-MM-DD)"),
+    db: AsyncSession = Depends(get_db),
+) -> ResponseBase[List[TodoResponse]]:
+    try:
+        todos = await select_todos_by_period(db, user_id, startDate, endDate)
+        return ResponseBase(status_code=status.HTTP_200_OK, data=todos)
+    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("/{todo_id}", response_model=ResponseBase[TodoResponse])
 async def get_todo_by_id(

app/api/v1/router.py

@@ -1,3 +1,4 @@
+from uuid import main
 from fastapi import APIRouter
 from app.api.v1.endpoints import (
     auth,
@@ -13,6 +14,7 @@
     chat,
     progress,
     todo,
+    main,
 )
 
 router = APIRouter()
@@ -53,15 +55,16 @@
 )
 router.include_router(
     chat.router,
-    prefix="/users/{user_id}",
+    prefix="/users/{user_id}/categories/{category_id}/chats",
     tags=["chats"],
 )
 router.include_router(
-    progress.router, prefix="/ users/{user_id}/progresses", tags=["Progress"]
+    progress.router, prefix="/users/{user_id}/progresses", tags=["Progress"]
 )
-router.include_router(todo.router, prefix="/todos", tags=["todos"])
+router.include_router(todo.router, prefix="/users/{user_id}/todos", tags=["todos"])
 router.include_router(
     todo.router,
     prefix="/users/{user_id}/categories/{category_id}/todos",
     tags=["todos"],
 )
+router.include_router(main.router, prefix="/users/{user_id}", tags=["main"])

app/crud/memo.py

@@ -1,7 +1,8 @@
 from sqlalchemy import select, delete
 from sqlalchemy.ext.asyncio import AsyncSession
+from sqlalchemy.orm import selectinload
 from uuid import UUID
-from datetime import datetime
+from datetime import date
 from typing import List
 from app.models.category import Memo
 from app.schemas.memo import MemoCreate, MemoResponse, MemoUpdate
@@ -41,28 +42,19 @@ async def read_memo_by_id(
     return db_memo.scalars().first()
 
 
-async def read_memos_by_date(
-    db: AsyncSession, user_id: UUID, date: datetime
-) -> List[MemoResponse]:
-    db_memo = await db.execute(
-        select(Memo).where(
-            Memo.user_id == user_id, Memo.start_date <= date, date <= Memo.end_date
-        )
-    )
-    return db_memo.scalars().all()
-
-
 async def read_memos_by_period(
-    db: AsyncSession, user_id: UUID, start_date: datetime, end_date: datetime
+    db: AsyncSession, user_id: UUID, start_date: date, end_date: date
 ) -> List[MemoResponse]:
     db_memo = await db.execute(
-        select(Memo).where(
+        select(Memo)
+        .options(selectinload(Memo.category))
+        .where(
             Memo.user_id == user_id,
-            Memo.start_date >= start_date,
-            Memo.end_date <= end_date,
+            Memo.start_date <= end_date,
+            Memo.end_date >= start_date,
         )
     )
-    return db_memo.scalars().all()
+    return db_memo.unique().scalars().all()
 
 
 async def read_memos_by_category_id(
@@ -74,24 +66,6 @@ async def read_memos_by_category_id(
     return db_memo.scalars().all()
 
 
-async def read_memos_by_period_and_category_id(
-    db: AsyncSession,
-    user_id: UUID,
-    category_id: UUID,
-    start_date: datetime,
-    end_date: datetime,
-) -> List[MemoResponse]:
-    db_memo = await db.execute(
-        select(Memo).where(
-            Memo.user_id == user_id,
-            Memo.category_id == category_id,
-            Memo.start_date >= start_date,
-            Memo.end_date <= end_date,
-        )
-    )
-    return db_memo.scalars().all()
-
-
 async def update_memo(
     db: AsyncSession, user_id: UUID, memo_id: UUID, memo_data: MemoUpdate
 ) -> MemoResponse:

app/crud/progress.py

@@ -2,7 +2,7 @@
 from sqlalchemy import select, delete
 from sqlalchemy.ext.asyncio import AsyncSession
 from uuid import UUID
-
+from sqlalchemy.orm import selectinload
 from app.models.category import Progress
 from app.schemas.progress import ProgressCreate, ProgressUpdate, ProgressResponse
 
@@ -27,15 +27,23 @@ async def create_progress(
 async def read_all_progresses(
     db: AsyncSession, user_id: UUID
 ) -> List[ProgressResponse]:
-    result = await db.execute(select(Progress).where(Progress.user_id == user_id))
+    result = await db.execute(
+        select(Progress)
+        .options(selectinload(Progress.category))
+        .where(Progress.user_id == user_id)
+    )
     return result.scalars().all()
 
 
 # ID로 진행 조회
 async def read_progress_by_id(
     db: AsyncSession, progress_id: UUID
 ) -> Optional[ProgressResponse]:
-    result = await db.execute(select(Progress).where(Progress.id == progress_id))
+    result = await db.execute(
+        select(Progress)
+        .options(selectinload(Progress.category))
+        .where(Progress.id == progress_id)
+    )
     return result.scalars().first()
 
 

app/crud/todo.py

@@ -1,12 +1,13 @@
 from app.models.week import Week
-from sqlalchemy import select, delete
+from sqlalchemy import select, delete, and_
 from sqlalchemy.ext.asyncio import AsyncSession
 from uuid import UUID
 from typing import List, Optional
 from app.models.category import Todo
 from app.schemas.todo import TodoCreate, TodoUpdate, TodoResponse
 from sqlalchemy.orm import selectinload
 from app.utils.to_snake_case import camel_to_snake
+from datetime import date
 
 
 # 할 일 생성
@@ -87,6 +88,29 @@ async def read_raw_todo_by_id(
     return result.scalars().first()
 
 
+# 날짜 범위로 할 일 조회 (기본)
+async def read_todos_by_period(
+    db: AsyncSession, user_id: UUID, start_date: date, end_date: date
+) -> List[Todo]:
+
+    # 해당 기간과 겹치는 모든 Todo 가져오기 (간소화된 조건)
+    query = (
+        select(Todo)
+        .options(selectinload(Todo.weeks), selectinload(Todo.category))
+        .where(
+            Todo.user_id == user_id,
+            # 모든 겹침 케이스를 처리하는 단일 조건
+            Todo.start_date <= end_date,
+            Todo.end_date >= start_date,
+        )
+    )
+
+    result = await db.execute(query)
+
+    # unique -> 조인 쿼리 시 중복 데이터 제거
+    return result.unique().scalars().all()
+
+
 # 특정 유저의 특정 카테고리에 속한 할 일 목록 조회
 async def read_todos_by_user_and_category(
     db: AsyncSession, user_id: UUID, category_id: UUID

app/schemas/main.py

@@ -0,0 +1,9 @@
+from app.schemas.todo import TodoResponse
+from app.schemas.memo import MemoResponse
+from app.schemas.base import BaseModel
+from typing import List
+
+
+class TodosAndMemosResponse(BaseModel):
+    todos: List[TodoResponse]
+    memos: List[MemoResponse]