[NL-72] 운세 목록 조회 API 수정 (#19)

* feat: /users/{user_id}/daily-fortunes API 응답 수정

* feat: User DailyFortunes 없으면 생성

Author: swa07016

src/fortune/entities/schemas.py

@@ -39,6 +39,10 @@ class UserDailyFortuneSummary(CommonBase):
     image_url: str
     description: str
 
+class UserDailyFortuneSummaries(CommonBase):
+    title: str
+    content: List[UserDailyFortuneSummary]
+
 
 class FortuneDetailItem(CommonBase):
     """운세 상세 항목"""

src/fortune/repository.py

@@ -1,5 +1,5 @@
 from datetime import date
-from typing import List, Optional, Tuple
+from typing import List, Optional, Tuple, Iterable
 
 from fastapi import Depends
 from sqlalchemy import select, desc, and_
@@ -173,3 +173,77 @@ async def create_user_daily_fortune_detail(
         await self.session.flush()
         await self.session.refresh(model)
         return model
+
+
+    async def get_user_daily_fortune_resources(
+            self,
+            ref_date: Optional[date] = None,
+    ) -> List[DailyFortuneResourceModel]:
+        if ref_date is None:
+            ref_date = date.today()
+        dfr = DailyFortuneResourceModel
+
+        types_in_order = [
+            FortuneType.GUIIN_INITIAL,
+            FortuneType.LUCKY_OBJECT,
+            FortuneType.PERFECT_TIMING,
+            FortuneType.TABOO_OF_DAY,
+        ]
+
+        items: List[DailyFortuneResourceModel] = []
+        for t in types_in_order:
+            stmt = (
+                select(dfr)
+                .where(
+                    dfr.fortune_type == t,
+                    dfr.publish_date <= ref_date,
+                )
+                .order_by(dfr.publish_date.desc(), dfr.id.desc())
+                .limit(1)
+            )
+            res = await self.session.execute(stmt)
+            row = res.scalar_one_or_none()
+            if row:
+                items.append(row)
+
+        return items
+
+    async def bulk_upsert_user_daily_fortune_summaries(
+            self,
+            user_id: str,
+            fortune_date: date,
+            resource_ids: Iterable[int],
+    ) -> None:
+        """해당 user_id/fortune_date에 대해 주어진 resource_ids를 중복 없이 삽입."""
+        if not resource_ids:
+            return
+
+        Summary = UserDailyFortuneSummaryModel
+
+        # 이미 존재하는 것 조회
+        exists_q = (
+            select(Summary.daily_fortune_resource_id)
+            .where(
+                Summary.user_id == user_id,
+                Summary.fortune_date == fortune_date,
+                Summary.daily_fortune_resource_id.in_(list(resource_ids)),
+            )
+        )
+        res = await self.session.execute(exists_q)
+        existing_ids = set(res.scalars().all())
+
+        to_create = [rid for rid in resource_ids if rid not in existing_ids]
+        if not to_create:
+            return
+
+        # 새로 추가
+        for rid in to_create:
+            self.session.add(
+                Summary(
+                    user_id=user_id,
+                    fortune_date=fortune_date,
+                    daily_fortune_resource_id=rid,
+                )
+            )
+
+        await self.session.flush()

src/fortune/service.py

@@ -12,7 +12,7 @@
     UserDailyFortuneDetail,
     FortuneDetailItem,
 )
-from src.fortune.entities.schemas import UserDailyFortuneSummary
+from src.fortune.entities.schemas import UserDailyFortuneSummaries
 from src.fortune.repository import FortuneRepository
 from src.fortune.entities.constants import DAILY_FORTUNE_FALLBACK_DATA
 from src.hcx_client.client import HCXClient
@@ -87,16 +87,41 @@ async def delete_fortune(self, resource_id: int) -> None:
 
     async def get_user_daily_fortune_summaries(
         self, user_id: str, fortune_date: date
-    ) -> List[UserDailyFortuneSummary]:
+    ) -> UserDailyFortuneSummaries:
+        # 1) 먼저 조회
         summaries = await self.repository.get_user_daily_fortune_summaries(
             user_id, fortune_date
         )
+
         if not summaries:
-            raise HTTPException(
-                status_code=status.HTTP_404_NOT_FOUND,
-                detail="오늘의 운세 데이터를 찾을 수 없습니다.",
+            # 2) 타입별 최신 리소스(오늘 포함 과거) 가져와서 요약 4건 생성
+            resources = await self.repository.get_user_daily_fortune_resources(
+                ref_date=fortune_date
+            )
+            if not resources:
+                # 생성할 리소스 자체가 없으면 이때만 404
+                raise HTTPException(
+                    status_code=status.HTTP_404_NOT_FOUND,
+                    detail="오늘 기준으로 생성 가능한 운세 리소스가 없습니다.",
+                )
+
+            resource_ids = [r.id for r in resources]
+            await self.repository.bulk_upsert_user_daily_fortune_summaries(
+                user_id=user_id,
+                fortune_date=fortune_date,
+                resource_ids=resource_ids,
             )
-        return summaries  # Return the list directly
+
+            # 3) 다시 조회해서 반환 데이터 구성
+            summaries = await self.repository.get_user_daily_fortune_summaries(
+                user_id, fortune_date
+            )
+
+        # 4) 래핑해서 리턴 (스키마에 맞게)
+        return UserDailyFortuneSummaries(
+            title="잘 되면 꼭 기억해 주시오",
+            content=summaries,
+        )
 
     async def get_user_daily_fortune_detail(
         self, user_id: str, fortune_date: date

src/users/router.py

@@ -6,7 +6,7 @@
 from src.lotto.entities.schemas import LottoRecommendation
 from src.lotto.service import LottoService
 from src.users.entities.schemas import UserCreate, UserDetail, UserList, UserUpdate
-from src.fortune.entities.schemas import UserDailyFortuneSummary, UserDailyFortuneDetail
+from src.fortune.entities.schemas import UserDailyFortuneSummaries, UserDailyFortuneDetail
 from src.users.service import UserService
 from src.fortune.service import FortuneService
 from typing import List
@@ -116,7 +116,7 @@ async def get_lotto_recommendation(
 
 
 @user_router.get(
-    "/{user_id}/daily-fortunes", response_model=List[UserDailyFortuneSummary]
+    "/{user_id}/daily-fortunes", response_model=UserDailyFortuneSummaries
 )
 async def get_user_daily_fortunes(
     user_id: str,