Merge pull request #306 from Pseudo-Lab/refactor/getcloser/dissolve-team

refactor(getcloser): dissolve team

Author: hu6r1s

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

@@ -17,7 +17,7 @@ def challenge_retry_controller(request: ChallengeRetryRequest, db: Session = Dep
 @router.post("/assign", response_model=ChallengeResponse)
 def assign_challenges(request: ChallengeRequest, db: Session = Depends(get_db)):
     try:
-        assigned = assign_challenges_logic(request.my_id, request.members_ids, db)
+        assigned = assign_challenges_logic(request.my_id, request.members_ids, request.team_id, db)
         return ChallengeResponse(team_id=request.team_id, my_assigned=assigned)
 
     except ValueError as e:

getcloser/backend/app/services/challenge_service.py

@@ -8,7 +8,7 @@
 from models.challenges import UserChallengeStatus
 
 
-def assign_challenges_logic(my_id: str, members: list, db: Session) -> list:
+def assign_challenges_logic(my_id: str, members: list, team_id: int, db: Session) -> list:
     # 현재 사용자 retry_count 조회
     status = db.query(UserChallengeStatus).filter(UserChallengeStatus.user_id == my_id).first()
 
@@ -26,7 +26,8 @@ def assign_challenges_logic(my_id: str, members: list, db: Session) -> list:
 
     # retry_count 검사
     if status.retry_count >= 2:
-        return {"message": "retry_count가 2 이상입니다. 팀을 다시 구성해주세요."}
+        team_service.dissolve_team_by_user(db, my_id, team_id)
+        raise HTTPException(status_code=500, detail="over retry count")
 
     # 팀원들이 만든 문제 조회
     team_questions = db.query(ChallengeQuestion).filter(ChallengeQuestion.user_id.in_(members)).all()

getcloser/backend/app/services/team_service.py

@@ -176,24 +176,45 @@ def get_team_status(db: Session, team_id: int, user_id: int):
         "members_ready": [m.user_id for m in team.members if m.confirmed]
     }
 
-def dissolve_team_by_user(db: Session, user_id: int):
+def dissolve_team_by_user(db: Session, user_id: int, team_id: int):
   team_entry = (
-        db.query(Team)
-        .join(TeamMember)
+        db.query(TeamMember)
         .filter(
             TeamMember.user_id == user_id, 
-            Team.status == TeamStatus.ACTIVE
+            TeamMember.team_id  == team_id
         ).first()
     )
 
   if not team_entry:
-      raise HTTPException(status_code=400, detail="User is not in an active team")
+      raise HTTPException(status_code=404, detail="User is not in a team")
+
+  db.delete(team_entry)
 
-  team_entry.status = TeamStatus.FAILED
+  status = (
+        db.query(UserChallengeStatus)
+        .filter(UserChallengeStatus.user_id == user_id)
+        .first()
+  )
 
+  if status:
+        status.retry_count = 0
+        status.is_correct = False
+        status.is_redeemed = False
+        db.add(status)
+
   db.commit()
-  
-  return {"message": f"Team {team_entry.id} dissolved due to quiz failure.", "team_id": team_entry.id}
+
+  remaining = (
+        db.query(TeamMember)
+        .filter(TeamMember.team_id == team_id)
+        .count()
+  )
+
+  if remaining == 0:
+        team = db.query(Team).get(team_id)
+        team.status = TeamStatus.CANCELLED
+        db.commit()
+
 
 def get_team_info(db: Session, user_id: int):
   team_member = (