Merge pull request #38 from 9git9git/hotfix

[HOTFIX] 테이블 변경 대응 및 프론트엔드 필요한 데이터 추가

Author: GideokKim

app/crud/progress.py

@@ -14,8 +14,6 @@ async def create_progress(
     progress = Progress(
         user_id=user_id,
         category_id=progress_data.categoryId,
-        start_date=progress_data.startDate,
-        end_date=progress_data.endDate,
     )
     db.add(progress)
     await db.commit()
@@ -25,8 +23,6 @@ async def create_progress(
         user_id=progress.user_id,
         category_id=progress.category_id,
         progress_rate=progress.progress_rate,
-        start_date=progress.start_date,
-        end_date=progress.end_date,
         category=None,
     )
 

app/crud/storage.py

@@ -4,6 +4,7 @@
 from app.models.chat import Storage
 from sqlalchemy.ext.asyncio import AsyncSession
 from sqlalchemy import select, delete
+from sqlalchemy.orm import selectinload
 
 
 async def create_storage(
@@ -19,16 +20,22 @@ async def create_storage(
     await db.commit()
     await db.refresh(db_storage)
 
-    return db_storage
+    return StorageResponse(
+        id=db_storage.id,
+        title=db_storage.title,
+        created_at=db_storage.created_at,
+        updated_at=db_storage.updated_at,
+        category=None,
+    )
 
 
 async def read_storages(
     db: AsyncSession, user_id: UUID, category_id: UUID
 ) -> List[StorageResponse]:
     result = await db.execute(
-        select(Storage).where(
-            Storage.user_id == user_id, Storage.category_id == category_id
-        )
+        select(Storage)
+        .options(selectinload(Storage.category))
+        .where(Storage.user_id == user_id, Storage.category_id == category_id)
     )
     return result.scalars().all()
 
@@ -37,7 +44,9 @@ async def read_storage_by_id(
     db: AsyncSession, user_id: UUID, category_id: UUID, storage_id: UUID
 ) -> Optional[StorageResponse]:
     result = await db.execute(
-        select(Storage).where(
+        select(Storage)
+        .options(selectinload(Storage.category))
+        .where(
             Storage.user_id == user_id,
             Storage.category_id == category_id,
             Storage.id == storage_id,

app/models/category.py

@@ -48,8 +48,6 @@ class Progress(Base):
         ForeignKey("categories.id"), nullable=False
     )
     progress_rate: Mapped[DECIMAL] = mapped_column(DECIMAL(5, 2), default=0.00)
-    start_date: Mapped[Date] = mapped_column(Date, nullable=False)
-    end_date: Mapped[Date] = mapped_column(Date, nullable=False)
 
     # 관계: Progress N : 1 User
     user: Mapped["app.models.user.User"] = relationship(

app/schemas/progress.py

@@ -8,17 +8,13 @@
 
 class ProgressCreate(BaseModel):
     categoryId: UUID
-    startDate: date
-    endDate: date
 
 
 class ProgressResponse(BaseModel):
     id: UUID
     user_id: UUID
     category_id: UUID
     progress_rate: Decimal
-    start_date: date
-    end_date: date
     category: Optional[CategoryResponse] = None
 
 
@@ -30,5 +26,3 @@ class TodayProgressResponse(BaseModel):
 
 class ProgressUpdate(BaseModel):
     progressRate: Decimal | None = None
-    startDate: date | None = None
-    endDate: date | None = None

app/schemas/storage.py

@@ -1,3 +1,6 @@
+from datetime import datetime
+from typing import Optional
+from app.schemas.category import CategoryResponse
 from pydantic import BaseModel
 from uuid import UUID
 
@@ -9,6 +12,9 @@ class StorageCreate(BaseModel):
 class StorageResponse(BaseModel):
     id: UUID
     title: str
+    created_at: datetime
+    updated_at: datetime
+    category: Optional[CategoryResponse] = None
 
 
 class StorageUpdate(BaseModel):