Merge pull request #204 from Pseudo-Lab/feat/submit-challenge

feat(getcloser): submit challenge

Author: HanNayeoniee

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

@@ -1,8 +1,8 @@
 from fastapi import APIRouter, Depends, HTTPException
 from sqlalchemy.orm import Session
 from core.database import get_db
-from schemas.challenge_schema import ChallengeRequest, ChallengeResponse, ChallengeRetryRequest, ChallengeRetryResponse, GoodsRedeemRequest, GoodsRedeemResponse
-from services.challenge_service import assign_challenges_logic, redeem_goods, retry_challenge
+from schemas.challenge_schema import ChallengeRequest, ChallengeResponse, ChallengeRetryRequest, ChallengeRetryResponse, GoodsRedeemRequest, GoodsRedeemResponse, AnswerSubmitRequest, AnswerSubmitResponse
+from services.challenge_service import assign_challenges_logic, submit_challenges_logic, redeem_goods, retry_challenge
 
 router = APIRouter()
 
@@ -17,20 +17,18 @@ 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:
-        # my_id = parse_user_id(request.my_id).get("id")
-        # if not my_id:
-        #     raise HTTPException(status_code=400, detail="올바른 형식의 유저 태그가 아닙니다. 예: 김민준#0001")
-        
-        # members_ids = [request.my_id]  # 팀원에 자기 자신 포함
-        # for tag in request.members_ids:
-        #     parsed = parse_user_id(tag)
-        #     if "error" in parsed:
-        #         raise HTTPException(status_code=400, detail=parsed["error"])
-        #     members_ids.append(parsed["id"])
-
         members_ids = [request.my_id] + request.members_ids
         assigned = assign_challenges_logic(request.my_id, members_ids, db)
         return ChallengeResponse(team_id=request.team_id, my_assigned=assigned)
 
     except ValueError as e:
         raise HTTPException(status_code=400, detail=str(e))
+    
+@router.post("/submit", response_model=AnswerSubmitResponse)
+def submit_challenges(request: AnswerSubmitRequest, db: Session = Depends(get_db)):
+    try:
+        is_correct = submit_challenges_logic(request.user_id, request.challenge_id, request.submitted_answer, db)
+        return AnswerSubmitResponse(is_correct=is_correct)
+    
+    except ValueError as e:
+        raise HTTPException(status_code=400, detail=str(e))

getcloser/backend/app/schemas/challenge_schema.py

@@ -1,23 +1,50 @@
+from datetime import datetime
 from pydantic import BaseModel
-from typing import List
+from typing import List, Optional
 
 class ChallengeRequest(BaseModel):
-    team_id: int
-    my_id: int
-    members_ids: List[int]
+  team_id: int
+  my_id: int
+  members_ids: List[int]
 
 class AssignedChallenge(BaseModel):
-    user_id: int
-    assigned_challenge_id: int
-    from_user_id: int
-    category: str
-    answer: str
+  user_id: int
+  assigned_challenge_id: int
+  from_user_id: int
+  category: str
+  answer: str
+
+  class Config:
+    json_schema_extra = {
+      "example": {
+        "team_id": 0,
+        "my_id": 1,
+        "members_ids": [
+          2, 3, 4, 5
+        ]
+      }
+    }
+
+class AnswerSubmitRequest(BaseModel):
+  user_id: int
+  challenge_id: int
+  submitted_answer: str
+
+  class Config:
+    json_schema_extra = {
+      "example": {
+        "user_id": 1,
+        "challenge_id": 1,
+        "submitted_answer": "LLM"
+      }
+    }
+
+class AnswerSubmitResponse(BaseModel):
+  is_correct: bool
 
 class ChallengeResponse(BaseModel):
-    team_id: int
-    my_assigned: AssignedChallenge
-from datetime import datetime
-from typing import Optional
+  team_id: int
+  my_assigned: AssignedChallenge
 
 class GoodsRedeemRequest(BaseModel):
   user_id: int

getcloser/backend/app/scripts/challenge_question.py

@@ -13,7 +13,7 @@ def seed_challenge_questions_from_csv(file_path: str):
             reader = csv.DictReader(csvfile)
             for row in reader:
                 challenge = ChallengeQuestion(
-                    id=int(row["challenge_id"]),
+                    id=int(row["id"]),
                     user_id=int(row["user_id"]),
                     category=row["category"],
                     answer=row["answer"]

getcloser/backend/app/services/challenge_service.py

@@ -38,6 +38,36 @@ def assign_challenges_logic(my_id: str, members: list, db: Session) -> list:
     return assigned_list[0]
 
 
+def submit_challenges_logic(user_id: str, challenge_id: int, submitted_answer: str, db: Session) -> bool:
+    # 1. 사용자가 푼 문제 찾기
+    challenge = db.query(ChallengeQuestion).filter(
+        ChallengeQuestion.user_id == user_id,
+        ChallengeQuestion.id == challenge_id
+    ).first()
+
+    if not challenge:
+        raise ValueError("해당 사용자의 할당된 문제가 없습니다.")
+
+    # 2. 원본 문제에서 정답 확인
+    question = db.query(ChallengeQuestion).filter(
+        ChallengeQuestion.id == challenge.id
+    ).first()
+
+    if not question:
+        raise ValueError("문제 정보를 찾을 수 없습니다.")
+
+    # 3. 정답 판별
+    is_correct = (submitted_answer.strip().lower() == question.answer.strip().lower())
+
+    # 4. 결과 저장
+    challenge.is_correct = is_correct
+    challenge.submitted_answer = submitted_answer
+    db.commit()
+
+    # 5. 결과 반환
+    return is_correct
+
+   
 def redeem_goods(db: Session, user_id: int):
     user = db.query(UserChallengeStatus).filter(UserChallengeStatus.user_id == user_id).first()
     if not user or not user.is_correct: