[NL-63] 유저 정보 수정 API, 오늘 운세 > 사주 정보 조회 API (#11)

* fix: github action deploy image prune 명령 추가

* fix: 스크립트 실행 오류 수정

* feat: 로또 번호 추천 프롬프트 추가

* fix: 사주명식 - 가장 강한/약한 오행 계산 및 저장 추가

* fix: parser 오류 수정

* fix: 프롬프트 수정

* feat: 사용자별 로또 번호 추천/조회 API 생성

* feat: alembic migration

* fix: typeddict -> base model

* Update src/lotto/service.py

Co-authored-by: Copilot <[email protected]>

* Update src/lotto/service.py

Co-authored-by: Copilot <[email protected]>

* feat: 강한/상충되는 기운 필드 추가

* feat: 유저 수정 API

* feat: 오늘 운세 - 사주 정보 조회 API

---------

Co-authored-by: Gukhee Jo <[email protected]>
Co-authored-by: Copilot <[email protected]>

Author: 3 people

migrations/scripts/insert_lotto_data.py

@@ -26,7 +26,8 @@
 
 from src.config.database import Mysql
 from src.config.config import db_config
-from src.lotto.entities.models import LottoDraws, LottoStatistics
+from src.lotto.entities.models import LottoDraws, LottoStatistics, LottoRecommendations
+from src.users.entities.models import User
 
 
 class LottoDataImporter:

src/four_pillars/common/calculator.py

@@ -3,8 +3,24 @@
 
 class FiveElements(str, Enum):
     """오행 (五行)"""
-    WOOD = "목(木)"  # 목
-    FIRE = "화(火)"  # 화
-    EARTH = "토(土)"  # 토
-    METAL = "금(金)"  # 금
-    WATER = "수(水)"  # 수
+
+    WOOD = "목(木)"
+    FIRE = "화(火)"
+    EARTH = "토(土)"
+    METAL = "금(金)"
+    WATER = "수(水)"
+
+
+class TenGods(str, Enum):
+    """십신 (十神)"""
+
+    COMPARISON = "비견"
+    COMPETITOR = "겁재"
+    EATING = "식신"
+    HURTING = "상관"
+    PARTIAL_WEALTH = "편재"
+    DIRECT_WEALTH = "정재"
+    PARTIAL_OFFICIAL = "편관"
+    DIRECT_OFFICIAL = "정관"
+    PARTIAL_PRINT = "편인"
+    DIRECT_PRINT = "정인"

src/four_pillars/entities/enums.py

@@ -1,6 +1,19 @@
 from typing import Optional, List
+
+from pydantic import BaseModel
 from typing_extensions import TypedDict
 
+from src.config.schemas import CommonBase
+from src.four_pillars.entities.enums import FiveElements, TenGods
+
+
+class PillarInfo(BaseModel):
+    stem: str  # 천간 (첫 번째 글자)
+    branch: str  # 지지 (두 번째 글자)
+    stem_ten_god: TenGods  # 천간의 십신
+    branch_ten_god: TenGods  # 지지의 십신
+    stem_element: FiveElements  # 천간의 오행
+    branch_element: FiveElements  # 지지의 오행
 
 class FourPillar(TypedDict, total=False):
     year_pillar: str  # 년주
@@ -9,3 +22,13 @@ class FourPillar(TypedDict, total=False):
     time_pillar: Optional[str]  # 시주
     strong_elements: Optional[List[str]]  # 가장 많은 오행
     weak_elements: Optional[List[str]]  # 가장 적은 오행
+
+class FourPillarDetail(CommonBase):
+    strong_element: FiveElements  # 가장 많은 오행
+    weak_element: FiveElements  # 가장 적은 오행
+    description: str  # 종합 설명
+
+    year_pillar_detail: Optional[PillarInfo]  # 년주 상세
+    month_pillar_detail: Optional[PillarInfo]  # 월주 상세
+    day_pillar_detail: Optional[PillarInfo]  # 일주 상세
+    time_pillar_detail: Optional[PillarInfo]  # 시주 상세

src/four_pillars/entities/schemas.py

@@ -2,7 +2,7 @@
 from typing import List, Optional
 
 from src.config.schemas import CommonBase
-from src.four_pillars.entities.schemas import FourPillar
+from src.four_pillars.entities.schemas import FourPillarDetail
 from src.users.entities.enums import Gender
 
 
@@ -20,12 +20,18 @@ class UserCreate(CommonBase):
     gender: Gender
 
 
+class UserUpdate(CommonBase):
+    name: Optional[str] = None
+    birth_date: Optional[datetime] = None
+    gender: Optional[Gender] = None
+
+
 class UserDetail(CommonBase):
     id: str
     name: str
     birth_date: datetime
     gender: Gender
-    four_pillar: Optional[FourPillar] = None
+    four_pillar: Optional[FourPillarDetail] = None
 
 
 class UserList(CommonBase):

src/users/entities/schemas.py

@@ -5,9 +5,9 @@
 from sqlalchemy.ext.asyncio import AsyncSession
 
 from src.common.dependencies import get_db_session
-from src.four_pillars.entities.schemas import FourPillar
+from src.four_pillars.entities.schemas import FourPillarDetail
 from src.users.entities.models import User
-from src.users.entities.schemas import UserCreate
+from src.users.entities.schemas import UserCreate, UserUpdate
 
 
 class UserRepository:
@@ -24,15 +24,23 @@ async def get_user_by_id(self, user_id: str) -> Optional[User]:
         result = await self.session.execute(query)
         return result.scalar_one_or_none()
 
+    async def get_user_four_pillar(self, user_id: str) -> Optional[dict]:
+        """사용자의 사주 정보만 조회"""
+        query = select(User.four_pillar).where(User.id == user_id, User.is_active == True)
+        result = await self.session.execute(query)
+        return result.scalar_one_or_none()
+
     async def create_user(
-        self, user_create: UserCreate, four_pillar: FourPillar
+        self, user_create: UserCreate, four_pillar: FourPillarDetail
     ) -> User:
+        four_pillar_dict = four_pillar.model_dump()
+
         user = User(
             id=user_create.id,
             name=user_create.name,
             birth_date=user_create.birth_date,
             gender=user_create.gender,
-            four_pillar=four_pillar,
+            four_pillar=four_pillar_dict,
             is_active=True,
         )
 
@@ -41,3 +49,20 @@ async def create_user(
         await self.session.refresh(user)
 
         return user
+
+    async def update_user(self, user_id: str, user_update: UserUpdate, four_pillar: Optional[FourPillar] = None) -> Optional[User]:
+        user = await self.get_user_by_id(user_id)
+        if not user:
+            return None
+
+        update_data = user_update.model_dump(exclude_unset=True)
+        if four_pillar is not None:
+            update_data["four_pillar"] = four_pillar
+
+        for field, value in update_data.items():
+            setattr(user, field, value)
+        
+        await self.session.flush()
+        await self.session.refresh(user)
+        
+        return user

src/users/repository.py

@@ -2,9 +2,10 @@
 
 from fastapi import APIRouter, Depends, Query, HTTPException
 
+from src.four_pillars.entities.schemas import FourPillarDetail
 from src.lotto.entities.schemas import LottoRecommendation
 from src.lotto.service import LottoService
-from src.users.entities.schemas import UserCreate, UserDetail, UserList
+from src.users.entities.schemas import UserCreate, UserDetail, UserList, UserUpdate
 from src.fortune.entities.schemas import UserDailyFortuneSummary
 from src.users.service import UserService
 from src.fortune.service import FortuneService
@@ -35,6 +36,32 @@ async def create_user(user_create: UserCreate, user_service: UserService = Depen
     """새로운 사용자를 생성합니다."""
     return await user_service.create_user(user_create)
 
+
+@user_router.get("/{user_id}/four-pillar", response_model=FourPillarDetail)
+async def get_user_four_pillar(user_id: str, user_service: UserService = Depends()):
+    """
+    사용자의 사주 정보를 조회합니다.
+
+    Returns:
+    - strong_element: 가장 강한 오행
+    - weak_element: 가장 약한 오행
+    - description: 사주 종합 설명
+    - year_pillar_detail: 년주 상세 정보 (천간, 지지, 십신, 오행)
+    - month_pillar_detail: 월주 상세 정보 (천간, 지지, 십신, 오행)
+    - day_pillar_detail: 일주 상세 정보 (천간, 지지, 십신, 오행)
+    - time_pillar_detail: 시주 상세 정보 (천간, 지지, 십신, 오행)
+    """
+    return await user_service.get_user_four_pillar(user_id)
+
+@user_router.put("/{user_id}", response_model=UserDetail)
+async def update_user(
+    user_id: str,
+    user_update: UserUpdate,
+    user_service: UserService = Depends()
+):
+    """사용자 정보를 수정합니다."""
+    return await user_service.update_user(user_id, user_update)
+
 @user_router.post("/{user_id}/lotto-recommendation", response_model=LottoRecommendation)
 async def create_lotto_recommendation(
     user_id: str,
@@ -50,7 +77,6 @@ async def create_lotto_recommendation(
             status_code=500, detail=f"로또 추천 생성 중 오류가 발생했습니다: {str(e)}"
         )
 
-
 @user_router.get(
     "/{user_id}/lotto-recommendation", response_model=Optional[LottoRecommendation]
 )

src/users/router.py

@@ -1,8 +1,9 @@
 from fastapi import Depends, HTTPException
 
 from src.four_pillars.common.calculator import FourPillarsCalculator
-from src.users.entities.schemas import UserCreate, UserDetail, UserList
+from src.users.entities.schemas import UserCreate, UserDetail, UserList, UserUpdate
 from src.users.repository import UserRepository
+from src.four_pillars.entities.schemas import FourPillarDetail
 
 
 class UserService:
@@ -30,9 +31,32 @@ async def create_user(self, user_create: UserCreate) -> UserDetail:
         if existing_user:
             raise HTTPException(status_code=400, detail="User ID already exists")
 
-        four_pillar = self.four_pillar_calculator.calculate_four_pillars(
+        four_pillar = self.four_pillar_calculator.calculate_four_pillars_detailed(
             user_create.birth_date
         )
         created_user = await self.repository.create_user(user_create, four_pillar)
 
         return UserDetail.model_validate(created_user)
+
+    async def get_user_four_pillar(self, user_id: str) -> FourPillarDetail:
+        """사용자의 사주 정보만 조회"""
+        four_pillar_dict = await self.repository.get_user_four_pillar(user_id)
+        if not four_pillar_dict:
+            raise HTTPException(status_code=404, detail="User not found")
+
+        return FourPillarDetail.model_validate(four_pillar_dict)
+
+    async def update_user(self, user_id: str, user_update: UserUpdate) -> UserDetail:
+        four_pillar = None
+        if user_update.birth_date:
+            four_pillar = self.four_pillar_calculator.calculate_four_pillars_detailed(
+                user_update.birth_date
+            )
+
+        updated_user = await self.repository.update_user(
+            user_id, user_update, four_pillar
+        )
+        if not updated_user:
+            raise HTTPException(status_code=404, detail="User not found")
+
+        return UserDetail.model_validate(updated_user)