Merge pull request #29 from 9git9git/SCRUM-141-BE-프로필-API-연동

Scrum 141 be 프로필 api 연동

Author: GideokKim

app/api/v1/endpoints/user.py

@@ -1,6 +1,6 @@
 from fastapi import APIRouter, Depends, HTTPException, status
 from sqlalchemy.ext.asyncio import AsyncSession
-from app.schemas.user import UserResponse, UserUpdate
+from app.schemas.user import UserResponse, UserUpdate, UserInformationResponse
 from app.schemas.base import ResponseBase
 from app.services.user import (
     select_users,
@@ -33,16 +33,14 @@ async def get_users(
         )
 
 
-@router.get("/{user_id}", response_model=ResponseBase[UserResponse])
-async def get_user_by_id(
-    user_id: UUID,
-    db: AsyncSession = Depends(get_db),
-) -> ResponseBase[UserResponse]:
+# 프론트엔드에서 사용할 유저 정보 조회 API
+@router.get("/{user_id}", response_model=ResponseBase[UserInformationResponse])
+async def get_user_by_id(user_id: UUID, db: AsyncSession = Depends(get_db)):
     try:
-        user = await select_user_by_id(db, user_id)
-        return ResponseBase(status_code=status.HTTP_200_OK, data=user)
+        user_info = await select_user_by_id(db, user_id)
+        return ResponseBase(status_code=status.HTTP_200_OK, data=user_info)
     except HTTPException as e:
-        return ResponseBase(status_code=e.status_code, error=e.detail)
+        raise 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/schemas/user.py

@@ -30,3 +30,7 @@ class UserUpdate(BaseModel):
     level: int
     exp: int
     character_count: int
+
+
+class UserInformationResponse(UserResponse):
+    completed_todo_count: int

app/services/user.py

@@ -1,6 +1,8 @@
 from fastapi import HTTPException, status
 from app.utils.hashed import get_password_hash
 from sqlalchemy.ext.asyncio import AsyncSession
+from sqlalchemy import select
+from sqlalchemy.orm import selectinload
 from app.crud.user import (
     read_users,
     create_user,
@@ -9,18 +11,38 @@
     read_user_by_id,
     read_user_by_email,
 )
-from app.schemas.user import UserCreate, UserResponse, UserUpdate
+from app.schemas.user import (
+    UserCreate,
+    UserResponse,
+    UserUpdate,
+    UserInformationResponse,
+)
 from typing import List
 from uuid import UUID
+from app.models.user import User
 
 
-async def select_user_by_id(db: AsyncSession, user_id: UUID) -> UserResponse:
-    user = await read_user_by_id(db, user_id)
+async def select_user_by_id(db: AsyncSession, user_id: UUID) -> UserInformationResponse:
+    result = await db.execute(
+        select(User).options(selectinload(User.todos)).where(User.id == user_id)
+    )
+    user = result.scalars().first()
     if not user:
         raise HTTPException(
             status_code=status.HTTP_404_NOT_FOUND, detail="사용자를 찾을 수 없습니다."
         )
-    return user
+
+    completed_todo_count = sum(1 for todo in user.todos if todo.is_completed)
+
+    return UserInformationResponse(
+        id=user.id,
+        name=user.name,
+        email=user.email,
+        level=user.level,
+        exp=user.exp,
+        character_count=user.character_count,
+        completed_todo_count=completed_todo_count,
+    )
 
 
 async def select_user_by_email(db: AsyncSession, email: str) -> UserResponse: