[NL-50] 유저 모델 생성 및 API 구현 (#4)

* fix: user model migration

* fix: four pillar test 용 schema, router 제거

* feat: 유저 생성(+ 사주명식 설정) 및 조회 API

* fix: 불필요 response field 제거 및 조회 시 active 상태 검증

---------

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

Author: 9keyyyy

migrations/versions/ec45a4f91988_add_user_field.py

@@ -0,0 +1,48 @@
+"""add user field
+
+Revision ID: ec45a4f91988
+Revises: 41c657cd9376
+Create Date: 2025-07-29 23:46:58.201303
+
+"""
+from typing import Sequence, Union
+
+from alembic import op
+import sqlalchemy as sa
+from sqlalchemy.dialects import mysql
+
+# revision identifiers, used by Alembic.
+revision: str = 'ec45a4f91988'
+down_revision: Union[str, Sequence[str], None] = '41c657cd9376'
+branch_labels: Union[str, Sequence[str], None] = None
+depends_on: Union[str, Sequence[str], None] = None
+
+
+def upgrade() -> None:
+    """Upgrade schema."""
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.add_column('users', sa.Column('birth_date', sa.DateTime(), nullable=False))
+    op.add_column('users', sa.Column('gender', sa.Enum('F', 'M', name='gender'), nullable=False))
+    op.add_column('users', sa.Column('four_pillar', sa.JSON(), nullable=True))
+    op.alter_column('users', 'id',
+               existing_type=mysql.INTEGER(),
+               type_=sa.String(length=255),
+               existing_nullable=False)
+    op.drop_index(op.f('ix_users_email'), table_name='users')
+    op.drop_column('users', 'email')
+    # ### end Alembic commands ###
+
+
+def downgrade() -> None:
+    """Downgrade schema."""
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.add_column('users', sa.Column('email', mysql.VARCHAR(length=255), nullable=False))
+    op.create_index(op.f('ix_users_email'), 'users', ['email'], unique=True)
+    op.alter_column('users', 'id',
+               existing_type=sa.String(length=255),
+               type_=mysql.INTEGER(),
+               existing_nullable=False)
+    op.drop_column('users', 'four_pillar')
+    op.drop_column('users', 'gender')
+    op.drop_column('users', 'birth_date')
+    # ### end Alembic commands ###

src/config/schemas.py

@@ -0,0 +1,5 @@
+from pydantic import BaseModel, ConfigDict
+
+
+class CommonBase(BaseModel):
+    model_config = ConfigDict(from_attributes=True, use_enum_values=True)

src/four_pillars/common/calculator.py

@@ -2,6 +2,8 @@
 from pathlib import Path
 from typing import List, Tuple, Dict
 
+from src.four_pillars.entities.schemas import FourPillar
+
 
 class FourPillarsCalculator:
     # 천간 (天干)
@@ -113,7 +115,7 @@ def _calculate_kanshi(
 
         return [year_pillar, month_pillar, day_pillar, time_pillar]
 
-    def calculate_four_pillars(self, birth_date: datetime) -> Dict[str, str]:
+    def calculate_four_pillars(self, birth_date: datetime) -> FourPillar:
         """사주 계산 메인 함수"""
         year = birth_date.year
         month = birth_date.month
@@ -127,7 +129,7 @@ def calculate_four_pillars(self, birth_date: datetime) -> Dict[str, str]:
             minute = None
 
         pillars = self._calculate_kanshi(year, month, day, hour, minute)
-        result = {
+        result: FourPillar = {
             "year_pillar": pillars[0],  # 년주
             "month_pillar": pillars[1],  # 월주
             "day_pillar": pillars[2],  # 일주

src/four_pillars/entities/schemas.py

@@ -1,17 +1,9 @@
-from datetime import datetime
 from typing import Optional
 
-from pydantic import BaseModel, Field
+from typing_extensions import TypedDict
 
 
-# ========= 테스트 용 요청/응답 모델 ==========
-class FourPillarRequest(BaseModel):
-    name: str
-    gender: str = Field(..., pattern="^[mf]$")  # m 또는 f만 허용
-    birth_date: datetime
-
-
-class FourPillarResponse(BaseModel):
+class FourPillar(TypedDict):
     year_pillar: str
     month_pillar: str
     day_pillar: str

src/four_pillars/router.py

@@ -4,7 +4,6 @@
 from src.config.config import app_config
 from src.config.lifespan import lifespan
 from src.config.middleware import DBMiddleware
-from src.four_pillars.router import four_pillar_router
 from src.users.router import user_router
 
 app = FastAPI(lifespan=lifespan, root_path="/api/v1")
@@ -19,4 +18,3 @@
 app.add_middleware(DBMiddleware)
 
 app.include_router(user_router)
-app.include_router(four_pillar_router)

src/main.py

@@ -0,0 +1,6 @@
+from enum import Enum
+
+
+class Gender(str, Enum):
+    F = "F"
+    M = "M"

src/users/entities/enums.py

@@ -1,12 +1,15 @@
-from sqlalchemy import Column, Integer, String, Boolean
+from sqlalchemy import Column, String, Boolean, DateTime, Enum, JSON
 
 from src.config.database import Base
+from src.users.entities.enums import Gender
 
 
 class User(Base):
     __tablename__ = "users"
 
-    id = Column(Integer, primary_key=True, index=True)
+    id = Column(String(255), primary_key=True, index=True)
     name = Column(String(255), nullable=False)
-    email = Column(String(255), unique=True, index=True, nullable=False)
+    birth_date = Column(DateTime, nullable=False)
+    gender = Column(Enum(Gender), nullable=False)
+    four_pillar = Column(JSON, nullable=True)
     is_active = Column(Boolean, default=True, nullable=False)

src/users/entities/models.py

@@ -1,24 +1,34 @@
 from pydantic import BaseModel, EmailStr
-from typing import List
+from typing import List, Optional
+from datetime import datetime
 
+from src.config.schemas import CommonBase
+from src.four_pillars.entities.schemas import FourPillar
+from src.users.entities.enums import Gender
 
-class UserBase(BaseModel):
+
+class UserBase(CommonBase):
     name: str
-    email: EmailStr
+    birth_date: datetime
+    gender: Gender
     is_active: bool = True
 
 
-class UserCreateRequest(UserBase):
-    pass
-
+class UserCreate(CommonBase):
+    id: str
+    name: str
+    birth_date: datetime
+    gender: Gender
 
-class UserResponse(UserBase):
-    id: int
 
-    class Config:
-        from_attributes = True
+class UserDetail(CommonBase):
+    id: str
+    name: str
+    birth_date: datetime
+    gender: Gender
+    four_pillar: FourPillar
 
 
-class UserListResponse(BaseModel):
-    users: List[UserResponse]
+class UserList(CommonBase):
+    users: List[UserDetail]
     total: int

src/users/entities/schemas.py

@@ -1,29 +1,43 @@
-from typing import List
+from typing import List, Optional
 
 from fastapi import Depends
 from sqlalchemy import select
 from sqlalchemy.ext.asyncio import AsyncSession
 
 from src.common.dependencies import get_db_session
+from src.four_pillars.entities.schemas import FourPillar
 from src.users.entities.models import User
+from src.users.entities.schemas import UserCreate
 
 
 class UserRepository:
     def __init__(self, session: AsyncSession = Depends(get_db_session)):
         self.session = session
 
     async def get_users(self, skip: int = 0, limit: int = 100) -> List[User]:
-        query = select(User).offset(skip).limit(limit)
+        query = select(User).where(User.is_active == True).offset(skip).limit(limit)
         result = await self.session.execute(query)
         return result.scalars().all()
 
-    async def get_user_by_email(self, email: str) -> User:
-        query = select(User).where(User.email == email)
+    async def get_user_by_id(self, user_id: str) -> Optional[User]:
+        query = select(User).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: User) -> User:
+    async def create_user(
+        self, user_create: UserCreate, four_pillar: FourPillar
+    ) -> User:
+        user = User(
+            id=user_create.id,
+            name=user_create.name,
+            birth_date=user_create.birth_date,
+            gender=user_create.gender,
+            four_pillar=four_pillar,
+            is_active=True,
+        )
+
         self.session.add(user)
-        await self.session.commit()
+        await self.session.flush()
         await self.session.refresh(user)
+
         return user