[NL-58] 오늘의 운세 리소스/유저 오늘의 운세 관계 테이블 추가, 관리자용 오늘의 운세 CRUD/유저용 오늘의 운세 조회 API 구현 (#12)

* feat: daily fortune resources table 생성 및 API 구현

* feat: user daily fortune summary 테이블 생성 및 API 구현

* Update src/fortune/admin_router.py

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

* Update migrations/env.py

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

* Update src/fortune/service.py

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

* fix: user daily fortune summary 마이그레이션 재생성

* refactor: session 주입 코드 Repository 계층으로 이동, 유저 오늘의 운세 API Users 라우터에 작성

---------

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

Author: swa07016

migrations/env.py

@@ -30,6 +30,7 @@
 # 모든 도메인 모델을 import하여 메타데이터에 포함해야 함
 from src.users.entities.models import User
 from src.lotto.entities.models import LottoStatistics, LottoDraws
+from src.fortune.entities.models import DailyFortuneResource, UserDailyFortuneSummary
 
 # 모델 메타데이터 설정
 target_metadata = Base.metadata

migrations/versions/5f0e5c266c72_add_daily_fortune_resources.py

@@ -0,0 +1,43 @@
+"""add daily fortune resources
+
+Revision ID: 5f0e5c266c72
+Revises: 05818a33a6e5
+Create Date: 2025-08-09 13:17:47.255785
+
+"""
+from typing import Sequence, Union
+
+from alembic import op
+import sqlalchemy as sa
+
+
+# revision identifiers, used by Alembic.
+revision: str = '5f0e5c266c72'
+down_revision: Union[str, Sequence[str], None] = '05818a33a6e5'
+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.create_table('daily_fortune_resources',
+    sa.Column('id', sa.Integer(), autoincrement=True, nullable=False, comment='운세 고유 ID'),
+    sa.Column('publish_date', sa.Date(), nullable=False, comment='운세 발행 날짜'),
+    sa.Column('fortune_type', sa.Enum('GUIIN_INITIAL', 'LUCKY_OBJECT', 'PERFECT_TIMING', 'TABOO_OF_DAY', name='fortunetype'), nullable=False, comment='운세 항목 종류 (귀인의 초성 등)'),
+    sa.Column('image_url', sa.String(length=1000), nullable=False, comment='이미지 URL 또는 경로'),
+    sa.Column('description', sa.String(length=1000), nullable=False, comment='운세 설명'),
+    sa.Column('created_at', sa.DateTime(), nullable=False),
+    sa.Column('updated_at', sa.DateTime(), nullable=False),
+    sa.CheckConstraint('length(description) > 0', name='ck_fortune_description_len'),
+    sa.CheckConstraint('length(image_url) > 0', name='ck_fortune_image_url_len'),
+    sa.PrimaryKeyConstraint('id')
+    )
+    # ### end Alembic commands ###
+
+
+def downgrade() -> None:
+    """Downgrade schema."""
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.drop_table('daily_fortune_resources')
+    # ### end Alembic commands ###

migrations/versions/e082b238c1e3_add_user_daily_fortune_summary.py

@@ -0,0 +1,42 @@
+"""add user daily fortune summary
+
+Revision ID: e082b238c1e3
+Revises: 5f0e5c266c72
+Create Date: 2025-08-12 16:15:00.678563
+
+"""
+from typing import Sequence, Union
+
+from alembic import op
+import sqlalchemy as sa
+
+
+# revision identifiers, used by Alembic.
+revision: str = 'e082b238c1e3'
+down_revision: Union[str, Sequence[str], None] = '5f0e5c266c72'
+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.create_table('user_daily_fortune_summary',
+    sa.Column('id', sa.Integer(), autoincrement=True, nullable=False, comment='운세 기록 고유 ID'),
+    sa.Column('user_id', sa.String(length=255), nullable=False, comment='유저 ID'),
+    sa.Column('daily_fortune_resource_id', sa.Integer(), nullable=False, comment='운세 리소스 ID'),
+    sa.Column('fortune_date', sa.Date(), nullable=False, comment='운세 날짜'),
+    sa.Column('created_at', sa.DateTime(), nullable=False),
+    sa.Column('updated_at', sa.DateTime(), nullable=False),
+    sa.ForeignKeyConstraint(['daily_fortune_resource_id'], ['daily_fortune_resources.id'], ),
+    sa.ForeignKeyConstraint(['user_id'], ['users.id'], ),
+    sa.PrimaryKeyConstraint('id')
+    )
+    # ### end Alembic commands ###
+
+
+def downgrade() -> None:
+    """Downgrade schema."""
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.drop_table('user_daily_fortune_summary')
+    # ### end Alembic commands ###

src/fortune/__init__.py

@@ -0,0 +1,10 @@
+# src/fortune/entities/enums.py
+from enum import Enum
+
+
+class FortuneType(str, Enum):
+    """운세 항목 종류"""
+    GUIIN_INITIAL = "귀인의 초성"
+    LUCKY_OBJECT = "행운의 오브제"
+    PERFECT_TIMING = "절호의 타이밍"
+    TABOO_OF_DAY = "오늘의 금기"

src/fortune/entities/enums.py

@@ -0,0 +1,28 @@
+# src/fortune/entities/models.py
+from sqlalchemy import Column, Integer, Date, Enum as SAEnum, String, CheckConstraint, ForeignKey
+from sqlalchemy.orm import relationship
+from src.config.database import Base
+from src.fortune.entities.enums import FortuneType
+
+
+class DailyFortuneResource(Base):
+    __tablename__ = "daily_fortune_resources"
+
+    id = Column(Integer, primary_key=True, autoincrement=True, comment="운세 고유 ID")
+    publish_date = Column(Date, nullable=False, comment="운세 발행 날짜")
+    fortune_type = Column(SAEnum(FortuneType), nullable=False, comment="운세 항목 종류 (귀인의 초성 등)")
+    image_url = Column(String(1000), nullable=False, comment="이미지 URL 또는 경로")
+    description = Column(String(1000), nullable=False, comment="운세 설명")
+
+    __table_args__ = (
+        CheckConstraint("length(image_url) > 0", name="ck_fortune_image_url_len"),
+        CheckConstraint("length(description) > 0", name="ck_fortune_description_len"),
+    )
+
+class UserDailyFortuneSummary(Base):
+    __tablename__ = "user_daily_fortune_summary"
+
+    id = Column(Integer, primary_key=True, autoincrement=True, comment="운세 기록 고유 ID")
+    user_id = Column(String(255), ForeignKey("users.id"), nullable=False, comment="유저 ID")
+    daily_fortune_resource_id = Column(Integer, ForeignKey("daily_fortune_resources.id"), nullable=False, comment="운세 리소스 ID")
+    fortune_date = Column(Date, nullable=False, comment="운세 날짜")

src/fortune/entities/models.py

@@ -0,0 +1,40 @@
+# src/fortune/entities/schemas.py
+from datetime import date
+from typing import List, Optional
+from src.config.schemas import CommonBase
+from src.fortune.entities.enums import FortuneType
+
+
+class DailyFortuneResource(CommonBase):
+    id: int
+    publish_date: date
+    fortune_type: FortuneType
+    image_url: str
+    description: str
+
+
+class DailyFortuneResourceList(CommonBase):
+    items: List[DailyFortuneResource]
+    next_cursor: Optional[int] = None
+
+
+class DailyFortuneResourceCreate(CommonBase):
+    publish_date: date
+    fortune_type: FortuneType
+    image_url: str
+    description: str
+
+
+class DailyFortuneResourceUpdate(CommonBase):
+    publish_date: Optional[date] = None
+    fortune_type: Optional[FortuneType] = None
+    image_url: Optional[str] = None
+    description: Optional[str] = None
+
+class UserDailyFortuneSummary(CommonBase):
+    id: int
+    user_id: str
+    fortune_date: date
+    fortune_type: FortuneType
+    image_url: str
+    description: str

src/fortune/entities/schemas.py

@@ -0,0 +1,129 @@
+# src/fortune/repository.py
+from datetime import date
+from typing import List, Optional, Tuple
+from fastapi import Depends
+from sqlalchemy import select, desc, and_
+from sqlalchemy.ext.asyncio import AsyncSession
+from src.common.dependencies import get_db_session
+from src.fortune.entities.models import UserDailyFortuneSummary as UserDailyFortuneSummaryModel, DailyFortuneResource as DailyFortuneResourceModel
+from src.fortune.entities.enums import FortuneType
+from src.fortune.entities.schemas import UserDailyFortuneSummary
+
+
+class FortuneRepository:
+    def __init__(self, session: AsyncSession = Depends(get_db_session)):
+        self.session = session
+
+    async def create_fortune(
+        self,
+        publish_date: date,
+        fortune_type: FortuneType,
+        image_url: str,
+        description: str
+    ) -> DailyFortuneResourceModel:
+        model = DailyFortuneResourceModel(
+            publish_date=publish_date,
+            fortune_type=fortune_type,
+            image_url=image_url,
+            description=description,
+        )
+        self.session.add(model)
+        await self.session.commit()
+        await self.session.refresh(model)
+        return model  # DB 모델 반환
+
+    async def update_fortune(
+        self,
+        resource_id: int,
+        publish_date: Optional[date],
+        fortune_type: Optional[FortuneType],
+        image_url: Optional[str],
+        description: Optional[str]
+    ) -> DailyFortuneResourceModel:
+        model = await self.get_fortune_by_id(resource_id)
+        if not model:
+            raise ValueError("리소스를 찾을 수 없습니다.")
+
+        if publish_date is not None:
+            model.publish_date = publish_date
+        if fortune_type is not None:
+            model.fortune_type = fortune_type
+        if image_url is not None:
+            model.image_url = image_url
+        if description is not None:
+            model.description = description
+
+        await self.session.commit()
+        await self.session.refresh(model)
+        return model
+
+    async def delete_fortune(self, resource_id: int) -> None:
+        model = await self.get_fortune_by_id(resource_id)
+        if not model:
+            raise ValueError("리소스를 찾을 수 없습니다.")
+        await self.session.delete(model)
+        await self.session.commit()
+
+    async def get_fortunes(
+        self,
+        cursor: Optional[int] = None,
+        limit: int = 10,
+        publish_date: Optional[date] = None,
+        fortune_type: Optional[FortuneType] = None,
+    ) -> Tuple[List[DailyFortuneResourceModel], Optional[int]]:
+        query = select(DailyFortuneResourceModel).order_by(desc(DailyFortuneResourceModel.id))
+
+        conditions = []
+        if cursor:
+            conditions.append(DailyFortuneResourceModel.id < cursor)
+        if publish_date:
+            conditions.append(DailyFortuneResourceModel.publish_date == publish_date)
+        if fortune_type:
+            conditions.append(DailyFortuneResourceModel.fortune_type == fortune_type)
+
+        if conditions:
+            query = query.where(and_(*conditions))
+
+        query = query.limit(limit)
+        result = await self.session.execute(query)
+        items = result.scalars().all()
+
+        next_cursor = items[-1].id if len(items) == limit else None
+        return items, next_cursor
+
+    async def get_fortune_by_id(self, resource_id: int) -> Optional[DailyFortuneResourceModel]:
+        return await self.session.get(DailyFortuneResourceModel, resource_id)
+
+    async def get_user_daily_fortune_summaries(
+            self, user_id: str, fortune_date: date
+    ) -> List[UserDailyFortuneSummary]:
+        query = select(
+            UserDailyFortuneSummaryModel.id,
+            UserDailyFortuneSummaryModel.user_id,
+            UserDailyFortuneSummaryModel.fortune_date,
+            DailyFortuneResourceModel.fortune_type,
+            DailyFortuneResourceModel.image_url,
+            DailyFortuneResourceModel.description
+        ).join(
+            DailyFortuneResourceModel,
+            UserDailyFortuneSummaryModel.daily_fortune_resource_id == DailyFortuneResourceModel.id
+        ).filter(
+            UserDailyFortuneSummaryModel.user_id == user_id,
+            UserDailyFortuneSummaryModel.fortune_date == fortune_date
+        )
+
+        result = await self.session.execute(query)
+        summaries = result.fetchall()
+
+        # 반환할 데이터를 Pydantic 모델로 변환하여 반환
+        return [
+            UserDailyFortuneSummary(
+                id=summary[0],
+                user_id=summary[1],
+                fortune_date=summary[2],
+                fortune_type=summary[3],
+                image_url=summary[4],
+                description=summary[5]
+            )
+            for summary in summaries
+        ]

src/fortune/repository.py

@@ -0,0 +1,67 @@
+# src/fortune/router.py
+from datetime import date
+from typing import Optional
+from fastapi import APIRouter, Depends, Query, Path, HTTPException, status
+from src.fortune.entities.schemas import (
+    DailyFortuneResource,
+    DailyFortuneResourceCreate,
+    DailyFortuneResourceUpdate,
+    DailyFortuneResourceList,
+)
+from src.fortune.service import FortuneService
+from src.fortune.entities.enums import FortuneType
+
+fortune_router = APIRouter(prefix="/admin/fortune", tags=["fortune-admin"])
+
+@fortune_router.get(
+    "/resources",
+    response_model=DailyFortuneResourceList,
+    summary="운세 리소스 목록 조회 (관리자)",
+)
+async def list_fortune_resources(
+    cursor: Optional[int] = Query(None, description="다음 페이지 조회를 위한 cursor 값 (id)"),
+    limit: int = Query(10, ge=1, le=100, description="한 페이지 크기"),
+    publish_date: Optional[date] = Query(None, description="발행일 필터"),
+    fortune_type: Optional[FortuneType] = Query(None, description="유형 필터"),
+    service: FortuneService = Depends(),
+):
+    return await service.list_fortunes(cursor, limit, publish_date, fortune_type)
+
+
+@fortune_router.post(
+    "/resources",
+    response_model=DailyFortuneResource,
+    status_code=status.HTTP_201_CREATED,
+    summary="운세 리소스 등록 (관리자)",
+)
+async def create_fortune_resource(
+    body: DailyFortuneResourceCreate,
+    service: FortuneService = Depends(),
+):
+    return await service.create_fortune(body)
+
+
+@fortune_router.patch(
+    "/resources/{resource_id}",
+    response_model=DailyFortuneResource,
+    summary="운세 리소스 수정 (관리자)",
+)
+async def update_fortune_resource(
+    body: DailyFortuneResourceUpdate,
+    resource_id: int = Path(..., description="운세 리소스 ID"),
+    service: FortuneService = Depends(),
+):
+    return await service.update_fortune(resource_id, body)
+
+
+@fortune_router.delete(
+    "/resources/{resource_id}",
+    status_code=status.HTTP_204_NO_CONTENT,
+    summary="운세 리소스 삭제 (관리자)",
+)
+async def delete_fortune_resource(
+    resource_id: int = Path(..., description="운세 리소스 ID"),
+    service: FortuneService = Depends(),
+):
+    await service.delete_fortune(resource_id)
+    # 204 No Content