Merge pull request #277 from Pseudo-Lab/feat/getcloser/status

feat(getcloser): user status response

Author: hu6r1s

getcloser/backend/app/api/v1/users/users.py

@@ -2,16 +2,31 @@
 from core.dependencies import get_current_user
 from fastapi import APIRouter, Depends
 from models.users import User
-from services.user_service import  get_user, parse_user_id
+from services.user_service import  get_user, parse_user_id, progress_status
 from sqlalchemy.orm import Session
+from schemas.user_schema import MeResponse
 
 router = APIRouter()
 
 @router.get("/me")
 def get_my_info(
+  db: Session = Depends(get_db),
   current_user: User = Depends(get_current_user),
 ):
-  return current_user
+  team_id, challenge_id, status = progress_status(
+        db=db,
+        user_id=current_user["sub"],
+    )
+  return MeResponse(
+        sub=str(current_user["sub"]),
+        email=current_user["email"],
+        name=current_user["name"],
+        exp=current_user["exp"],
+
+        team_id=team_id,
+        challenge_id=challenge_id,
+        progress_status=status,
+    )
 
 
 @router.get("/{id}")

getcloser/backend/app/core/enums.py

@@ -0,0 +1,9 @@
+import enum
+
+class ProgressStatus(str, enum.Enum):
+    NONE_TEAM = "NONE_TEAM"                                # 팀 없음
+    TEAM_WAITING = "TEAM_WAITING"                          # 팀 생성됨, 대기
+    CHALLENGE_ASSIGNED = "CHALLENGE_ASSIGNED"              # 문제 할당됨
+    CHALLENGE_SUCCESS = "CHALLENGE_SUCCESS"                # 문제 성공
+    CHALLENGE_FAILED = "CHALLENGE_FAILED"                  # 재시도 초과
+    REDEEMED = "REDEEMED"                                  # 굿즈 수령 완료

getcloser/backend/app/schemas/user_schema.py

@@ -1,4 +1,6 @@
 from pydantic import BaseModel, EmailStr
+from typing import Optional
+from core.enums import ProgressStatus
 
 class UserAuth(BaseModel):
   email: EmailStr
@@ -12,6 +14,16 @@ class Config:
 
 class UserResponse(BaseModel):
   accessToken: str
-  
+
+class MeResponse(BaseModel):
+    sub: str
+    email: str
+    name: str
+    exp: int
+
+    team_id: Optional[int]
+    challenge_id: Optional[int]
+    progress_status: ProgressStatus
+
 class Config:
   orm_mode = True

getcloser/backend/app/services/user_service.py

@@ -1,7 +1,10 @@
 from core.security import create_access_token
 from exceptions.user_exceptions import UserNotFoundException
 from models.users import User
+from models.teams import Team, TeamMember, TeamStatus
+from models.challenges import UserChallengeStatus
 from sqlalchemy.orm import Session
+from core.enums import ProgressStatus
 
 
 def auth_user(db: Session, email: str):
@@ -31,3 +34,48 @@ def parse_user_id(tag: str):
     return {"id": user_id}
   except ValueError:
     return {"error": "올바른 형식의 유저 태그가 아닙니다. 예: 김민준#0001"}
+
+
+def progress_status(
+    db: Session,
+    user_id: int,
+):
+    # 1. 유저 팀 조회
+    team_member = (
+        db.query(TeamMember)
+        .filter(TeamMember.user_id == user_id)
+        .first()
+    )
+
+    if not team_member:
+        return None, None, ProgressStatus.NONE_TEAM
+
+    team = db.query(Team).get(team_member.team_id)
+
+    # 2. 팀 상태
+    if team.status == TeamStatus.PENDING:
+        return team.id, None, ProgressStatus.TEAM_WAITING
+
+    if team.status == TeamStatus.FAILED:
+        return team.id, None, ProgressStatus.FAILED
+
+    # 3. 문제 상태
+    ucs = (
+        db.query(UserChallengeStatus)
+        .filter(UserChallengeStatus.user_id == user_id)
+        .first()
+    )
+
+    if not ucs:
+        return team.id, None, ProgressStatus.CHALLENGE_ASSIGNED
+
+    if ucs.is_redeemed:
+        return team.id, ucs.challenge_id, ProgressStatus.REDEEMED
+
+    if ucs.is_correct:
+        return team.id, ucs.challenge_id, ProgressStatus.CHALLENGE_SUCCESS
+
+    if ucs.retry_count >= 2:
+        return team.id, ucs.challenge_id, ProgressStatus.CHALLENGE_FAILED
+
+    return team.id, ucs.challenge_id, ProgressStatus.CHALLENGE_ASSIGNED