Merge pull request #191 from Pseudo-Lab/feat/team-dissolve

feat(getcloser): Team disbandment function after 2 failures

Author: hu6r1s

getcloser/backend/app/models/teams.py

@@ -1,13 +1,14 @@
 from core.database import Base
-from sqlalchemy import Column, Integer, UniqueConstraint
+from sqlalchemy import Column, Integer, Boolean, UniqueConstraint
 
 
 class Team(Base):
   __tablename__ = "teams"
 
   id = Column(Integer, primary_key=True, index=True)
   team_id = Column(Integer, index=True)
-  user_id = Column(Integer, unique=True, index=True)
+  user_id = Column(Integer, index=True)
+  is_active = Column(Boolean, default=True)
 
   __table_args__ = (
         UniqueConstraint('team_id', 'user_id', name='_team_user_uc'),

getcloser/backend/app/services/challenge_service.py

@@ -1,3 +1,4 @@
+from services import team_service
 import random
 from sqlalchemy.orm import Session
 from fastapi import HTTPException
@@ -58,14 +59,17 @@ def retry_challenge(db: Session, user_id: int):
     raise HTTPException(status=404, detail="User not found")
   if user_status.is_correct:
     raise HTTPException(status_code=400, detail="Already solved correctly")
-  if user_status.retry_count >= 1:
-    raise HTTPException(status_code=400, detail="Retry limit reached")
 
-  user_status.retry_count += 1
-  db.commit()
-  db.refresh(user_status)
-  
-  return {
-    "message": "Retry granted",
-    "retry_count": user_status.retry_count
-  }
+  if user_status.retry_count == 0:
+    user_status.retry_count += 1
+    db.commit()
+    return {
+      "message": "Retry granted",
+      "retry_count": user_status.retry_count
+    }
+  elif user_status.retry_count >= 1:
+    team_service.dissolve_team_by_user(db, user_id)
+    return {
+      "message": "Team dissolved due to repeated failure",
+      "retry_count": user_status.retry_count
+    }

getcloser/backend/app/services/team_service.py

@@ -1,3 +1,5 @@
+from models.challenges import UserChallengeStatus
+from sqlalchemy import func
 from sqlalchemy.orm import Session
 from models.teams import Team
 from schemas.team_schema import TeamCreateRequest, TeamResponse
@@ -6,22 +8,51 @@
 def create_team(db: Session, req: TeamCreateRequest) -> TeamResponse:
     all_ids = [req.my_id] + req.member_ids
 
-    existing = db.query(Team).filter(Team.user_id.in_(all_ids)).all()
-    if existing:
-        raise HTTPException(status_code=400, detail="Some users are already in a team.")
-
-    last_team = (
-        db.query(Team)
-        .order_by(Team.team_id.desc())
-        .with_for_update()
-        .first()
+    records = (
+        db.query(Team.user_id, Team.is_active, UserChallengeStatus.is_correct)
+        .outerjoin(UserChallengeStatus, Team.user_id == UserChallengeStatus.user_id)
+        .filter(Team.user_id.in_(all_ids))
+        .all()
     )
+    
+    active_ids = [r.user_id for r in records if r.is_active]
+    corrected_ids = [r.user_id for r in records if r.is_correct]
+    
+    if active_ids:
+        raise HTTPException(
+            status_code=400,
+            detail=f"Users already in active team: {active_ids}",
+        )
+
+    if corrected_ids:
+        raise HTTPException(
+            status_code=400,
+            detail=f"Users already corrected: {corrected_ids}",
+        )
 
-    new_team_id = (last_team.team_id + 1) if last_team else 1
+    last_team_id = db.query(func.max(Team.team_id)).scalar()
+    new_team_id = (last_team_id or 0) + 1
 
-    for uid in all_ids:
-        db.add(Team(team_id=new_team_id, user_id=uid))
+    teams_to_add = [
+      {"team_id": new_team_id, "user_id": uid, "is_active": True}
+      for uid in all_ids
+    ]
 
+    db.bulk_insert_mappings(Team, teams_to_add)
     db.commit()
 
     return TeamResponse(team_id=new_team_id, members_ids=all_ids)
+
+def dissolve_team_by_user(db: Session, user_id: int):
+  team_entry = db.query(Team).filter(Team.user_id == user_id, Team.is_active == True).first()
+  if not team_entry:
+      raise HTTPException(status_code=400, detail="User not in active team")
+
+  team_id = team_entry.team_id
+  team_members = db.query(Team).filter(Team.team_id == team_id, Team.is_active == True).all()
+
+  for member in team_members:
+      member.is_active = False
+
+  db.commit()
+  return {"message": f"Team {team_id} dissolved", "team_id": team_id}