Merge pull request #34 from 9git9git/SCRUM-146-BE-캐릭터-도감-API-연동

Scrum 146 be 캐릭터 도감 api 연동

Author: GideokKim

app/api/v1/endpoints/character.py

@@ -7,6 +7,7 @@
     select_character_by_id,
     delete_character_by_id,
     update_character_by_id,
+    get_character_collection,
 )
 from sqlalchemy.ext.asyncio import AsyncSession
 from app.db.session import get_db
@@ -94,3 +95,23 @@ async def delete_character(
         return ResponseBase(
             status_code=status.HTTP_500_INTERNAL_SERVER_ERROR, error=str(e)
         )
+
+
+# 서비스 로직
+
+
+@router.get("/characters", response_model=ResponseBase[List[CharacterResponse]])
+async def get_user_character_collection(
+    user_id: UUID,
+    db: AsyncSession = Depends(get_db),
+) -> ResponseBase[List[CharacterResponse]]:
+    try:
+        characters = await get_character_collection(db, user_id)
+        return ResponseBase(status_code=status.HTTP_200_OK, data=characters)
+    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="캐릭터 도감 조회 중 서버 오류가 발생했습니다.",
+        )

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, UserInformationResponse
+from app.schemas.user import UserResponse, UserUpdate
 from app.schemas.base import ResponseBase
 from app.services.user import (
     select_users,
@@ -34,7 +34,7 @@ async def get_users(
 
 
 # 프론트엔드에서 사용할 유저 정보 조회 API
-@router.get("/{user_id}", response_model=ResponseBase[UserInformationResponse])
+@router.get("/{user_id}", response_model=ResponseBase[UserResponse])
 async def get_user_by_id(user_id: UUID, db: AsyncSession = Depends(get_db)):
     try:
         user_info = await select_user_by_id(db, user_id)

app/api/v1/router.py

@@ -21,7 +21,6 @@
 
 router.include_router(auth.router, prefix="/auth", tags=["auth"])
 router.include_router(user.router, prefix="/users", tags=["users"])
-router.include_router(character.router, prefix="/characters", tags=["characters"])
 router.include_router(
     user_character.router, prefix="/user_characters", tags=["user_characters"]
 )
@@ -68,3 +67,13 @@
     tags=["todos"],
 )
 router.include_router(main.router, prefix="/users/{user_id}", tags=["main"])
+
+# 일반 캐릭터 CRUD
+router.include_router(character.router, prefix="/characters", tags=["characters"])
+
+# 유저 도감 전용 API (GET /users/{user_id}/characters)
+router.include_router(
+    character.router,
+    prefix="/users/{user_id}",
+    tags=["user_characters"],  # or "characters" if you want to group together
+)

app/crud/character.py

@@ -1,22 +1,18 @@
-from fastapi import HTTPException
-from uuid import UUID
-from app.schemas.character import CharacterCreate, CharacterResponse, CharacterUpdate
-from app.models.user import Character
 from sqlalchemy import select, delete
 from sqlalchemy.ext.asyncio import AsyncSession
-from typing import List, Optional
+from app.schemas.character import CharacterCreate, CharacterUpdate
+from app.models.user import Character
+from uuid import UUID
+from typing import Optional, List
 
 
 async def create_character(
     db: AsyncSession, character_data: CharacterCreate
-) -> CharacterResponse:
-    if await read_character_by_character_name(db, character_data.characterName):
-        raise HTTPException(status_code=400, detail="이미 존재하는 캐릭터 이름입니다.")
-
+) -> Character:
     db_character = Character(
-        character_name=character_data.characterName,
+        character_name=character_data.character_name,
         level=character_data.level,
-        image_link=character_data.imageLink,
+        image_link=character_data.image_link,
     )
 
     db.add(db_character)
@@ -26,36 +22,39 @@ async def create_character(
     return db_character
 
 
-async def read_characters(db: AsyncSession) -> List[CharacterResponse]:
+async def read_characters(db: AsyncSession) -> List[Character]:
     result = await db.execute(select(Character))
-    return result.scalars().all()
+    characters = result.scalars().all()
+    return characters
 
 
 async def read_character_by_id(
     db: AsyncSession, character_id: UUID
-) -> Optional[CharacterResponse]:
+) -> Optional[Character]:
     result = await db.execute(select(Character).where(Character.id == character_id))
-    return result.scalars().first()
+    character = result.scalars().first()
+    return character
 
 
-async def read_character_by_character_name(
+async def read_character_by_name(
     db: AsyncSession, character_name: str
-) -> Optional[CharacterResponse]:
+) -> Optional[Character]:
     result = await db.execute(
         select(Character).where(Character.character_name == character_name)
     )
-    return result.scalars().first()
+    character = result.scalars().first()
+    return character
 
 
 async def update_character(
     db: AsyncSession, character_id: UUID, character_data: CharacterUpdate
-) -> Optional[CharacterResponse]:
-    db_character = await read_character_by_id(db, character_id)
+) -> Optional[Character]:
+    result = await db.execute(select(Character).where(Character.id == character_id))
+    db_character = result.scalars().first()
     if not db_character:
-        raise HTTPException(status_code=404, detail="캐릭터를 찾을 수 없습니다.")
+        return None
 
     update_data = character_data.model_dump()
-
     for key, value in update_data.items():
         setattr(db_character, key, value)
 
@@ -66,13 +65,11 @@ async def update_character(
 
 
 async def delete_character(db: AsyncSession, character_id: UUID) -> bool:
-    db_character = await read_character_by_id(db, character_id)
-    if not db_character:
-        raise HTTPException(status_code=404, detail="캐릭터를 찾을 수 없습니다.")
-
-    delete_statement = delete(Character).where(Character.id == character_id)
-
-    await db.execute(delete_statement)
-    await db.commit()
-
+    try:
+        delete_statement = delete(Character).where(Character.id == character_id)
+        await db.execute(delete_statement)
+        await db.commit()
+    except Exception as e:
+        await db.rollback()
+        raise e
     return True