Merge branch 'dev' of https://github.com/SKT-FlyAI-BoraMettugi/BE into dev

Author: SeoYeomm

crud/theme.py

@@ -1,4 +1,5 @@
 from sqlalchemy.orm import Session
+from fastapi import HTTPException
 from typing import List
 from models.theme import Theme
 from schemas.theme import Theme_list, Theme_per
@@ -12,15 +13,17 @@ def get_themes(db: Session) -> List[Theme_list]:
         Theme.theme_id,
         Theme.theme_name,
         Theme.theme_ex, # None 허용
-        Theme.profile_img
+        Theme.profile_img,
+        Theme.background_img
     ).all()
 
     return [ # 튜플을 ThemeList로 변환
         Theme_list(
             theme_id=row[0],
             theme_name=row[1],
             theme_ex=row[2],
-            profile_img=row[3]
+            profile_img=row[3],
+            background_img=row[4]
         )
         for row in themes
     ] 
@@ -46,7 +49,7 @@ def get_per_theme(theme_id: int, user_id: int, db: Session) -> List[Theme_per]:
     # 1) Theme 정보 가져오기
     theme = db.query(Theme).filter(Theme.theme_id == theme_id).one_or_none()
     if not theme:
-        return []
+        raise HTTPException(status_code=404, detail="Theme not found")
 
     # 2) 문제 리스트(stage ASC)
     questions = (
@@ -122,10 +125,8 @@ def get_per_theme(theme_id: int, user_id: int, db: Session) -> List[Theme_per]:
             theme_id=q.theme_id,
             user_id=user_id,
             stage=stage_val,
-
             theme_name=theme.theme_name,
-            background_img=theme.background_img,
-
+            question_id=q.question_id,
             high_succ_color=high_succ_color,
             high_fail_color=high_fail_color,
             mid_succ_color=mid_succ_color,

models/badges.py

@@ -9,6 +9,6 @@ class Badges(Base):
     user_id = Column(BigInteger, ForeignKey("users.user_id"), autoincrement=True, nullable=False) # 사용자 번호
     theme_id = Column(BigInteger, ForeignKey("theme.theme_id"), autoincrement=True, nullable=False) # 테마 번호
 
-    grade = Column(Enum("금","은","동", name="badge_grade"), nullable=True) # 배지 등급
+    grade = Column(Enum("gold","silver","copper", name="badge_grade"), nullable=True) # 배지 등급
     created_date = Column(DateTime, server_default=func.now()) # 배지 생성 시간
     updated_date = Column(DateTime, onupdate=func.now()) # 배지 수정 시간

schemas/theme.py

@@ -6,17 +6,15 @@ class Theme_list(BaseModel):
     theme_name: str
     theme_ex: Optional[str]
     profile_img: str
+    background_img: str
 
 class Theme_per(BaseModel):
     theme_id: int
     user_id: int
     stage: int
-    
-    theme_id: int
+    question_id: int
     theme_name: str
 
-    background_img: str
-
     # 1~4
     high_succ_color: Optional[str] = None
     high_fail_color: Optional[str] = None