Merge pull request #238 from Pseudo-Lab/feat/getcloser/team-member-info

feat(getcloser): get team info and member challenge info

Author: hu6r1s

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

@@ -4,15 +4,13 @@
 from api.v1.teams import teams
 from core.dependencies import get_current_user
 from fastapi import APIRouter, Depends
-import core.websocket as websocket
 
 private_router = APIRouter(
   dependencies=[Depends(get_current_user)]
 )
 private_router.include_router(users.router, prefix="/users", tags=["users"])
 private_router.include_router(challenges.router, prefix="/challenges", tags=["challenges"])
 private_router.include_router(teams.router, prefix="/teams", tags=["teams"])
-private_router.include_router(websocket.router, prefix="/ws", tags=["ws"])
 
 public_router = APIRouter()
 public_router.include_router(auth.router, prefix="/auth", tags=["auth"])

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

@@ -1,10 +1,9 @@
 from fastapi import APIRouter, Depends
 from sqlalchemy.orm import Session
 from core.database import get_db
-from schemas.team_schema import TeamCreateRequest, TeamCreateResponse, TeamStatusResponse
+from schemas.team_schema import TeamCreateRequest, TeamCreateResponse, TeamStatusResponse, MemberChallengeResponse
 from services.team_service import create_team
 from core.dependencies import get_current_user
-from core.websocket import notify_invitation
 
 router = APIRouter()
 
@@ -21,3 +20,20 @@ def cancel_route(team_id: int, db: Session = Depends(get_db), current_user=Depen
 def status_route(team_id: int, db: Session = Depends(get_db), current_user=Depends(get_current_user)):
     res = get_team_status(db, team_id, current_user["sub"])
     return TeamStatusResponse(**res)
+
+@router.get("/me")
+def get_my_team_info(
+  db: Session = Depends(get_db), 
+  current_user=Depends(get_current_user)
+):
+  return get_team_info(db, current_user["sub"])
+
+@router.get("/{team_id}/members/{user_id}/challenge",
+            response_model=MemberChallengeResponse)
+def get_member_challenge(
+    team_id: int,
+    user_id: int,
+    db: Session = Depends(get_db),
+    current_user=Depends(get_current_user)
+):
+    return get_team_member_challenge(db, current_user["sub"], team_id, user_id)

getcloser/backend/app/core/websocket.py

@@ -15,3 +15,22 @@ class TeamStatusResponse(BaseModel):
     team_id: int
     status: str
     members_ready: List[int]
+    members_ids: List[int]
+
+class TeamMemberInfo(BaseModel):
+    user_id: int
+    name: str
+    github: Optional[str] = None
+    linkedin: Optional[str] = None
+    
+class TeamInfoResponse(BaseModel):
+    team_id: int
+    status: str
+    members: List[TeamMemberInfo]
+    
+class MemberChallengeResponse(BaseModel):
+    user_id: int
+    question: str
+    user_answer: str
+    correct_answer: str
+    is_correct: bool

getcloser/backend/app/schemas/team_schema.py

@@ -2,7 +2,7 @@
 from sqlalchemy import func
 from sqlalchemy.orm import Session
 from models.teams import Team, TeamMember, TeamStatus
-from schemas.team_schema import TeamCreateRequest
+from schemas.team_schema import TeamCreateRequest, TeamInfoResponse, MemberChallengeResponse, TeamMemberInfo
 from fastapi import HTTPException
 from typing import List
 import os
@@ -184,3 +184,89 @@ def dissolve_team_by_user(db: Session, user_id: int):
   db.commit()
 
   return {"message": f"Team {team_entry.id} dissolved due to quiz failure.", "team_id": team_entry.id}
+
+def get_team_info(db: Session, user_id: int):
+  team_member = (
+    db.query(TeamMembers)
+    .join(Team)
+    .filter(
+      TeamMember.user_id == user_id,
+      Team.status.in_([TeamStatus.ACTIVE])
+    )
+    .order_by(Team.created_at.desc())
+    .first()
+  )
+    
+  if not team_member:
+    return {"message": "NOT ACTIVE TEAM"}
+      
+  team = team_member.team
+  
+  members = (
+    db.query(User)
+    .join(TeamMember, Team.user_id == User.id)
+    .filter(TeamMember.team_id == team.id)
+    .all()
+  )
+  
+  member_info = [
+    TeamMemberInfo(
+      user_id=member.id,
+      name=member.name,
+      github=member.github,
+      linkedin=member.linkedin
+    )
+    for member in members
+  ]
+  
+  return TeamInfoResponse(
+    team_id=team.id,
+    status=team.status.value,
+    members=member_info
+  )
+
+def get_team_member_challenge(
+    db: Session, requester_id: int, team_id: int, user_id: int
+) -> MemberChallengeResponse | dict:
+    
+  is_member = (
+      db.query(TeamMember)
+      .filter(
+          TeamMember.team_id == team_id,
+          TeamMember.user_id == requester_id
+      )
+      .first()
+  )
+  if not is_member:
+      raise HTTPException(status_code=403, detail="You are not in this team")
+
+  target = (
+      db.query(TeamMember)
+      .filter(
+          TeamMember.team_id == team_id,
+          TeamMember.user_id == user_id
+      )
+      .first()
+  )
+  
+  if not target:
+      raise HTTPException(status_code=404, detail="User not in this team")
+
+  record = (
+      db.query(UserChallengeStatus)
+      .join(Challenge, Challenge.id == UserChallengeStatus.challenge_id)
+      .filter(UserChallengeStatus.user_id == user_id)
+      .order_by(UserChallengeStatus.created_at.desc())
+      .first()
+  )
+
+  if not record:
+      return {"status": "NO_CHALLENGE"}
+
+  return MemberChallengeResponse(
+      user_id=user_id,
+      question=record.challenge.question,
+      user_answer=record.answer,
+      correct_answer=record.challenge.answer,
+      is_correct=record.is_correct
+  )