fix: Raid issues (#596)

- Fix team number

---------

Co-authored-by: Armand Didierjean <[email protected]>

Author: maximeroucher

app/modules/raid/cruds_raid.py

@@ -1,7 +1,7 @@
 from collections.abc import Sequence
 from datetime import UTC, datetime
 
-from sqlalchemy import delete, func, or_, select, update
+from sqlalchemy import delete, or_, select, update
 from sqlalchemy.ext.asyncio import AsyncSession
 from sqlalchemy.orm import selectinload
 
@@ -105,7 +105,7 @@ async def get_all_teams(
 
 async def get_all_validated_teams(
     db: AsyncSession,
-) -> list[models_raid.Team]:
+) -> Sequence[models_raid.Team]:
     teams = await db.execute(
         select(models_raid.Team).options(
             # Since there is nested classes in the Team model, we need to load all the related data
@@ -542,9 +542,21 @@ async def get_number_of_team_by_difficulty(
     db: AsyncSession,
 ) -> int:
     result = await db.execute(
-        select(func.count()).where(models_raid.Team.difficulty == difficulty),
+        select(models_raid.Team).where(models_raid.Team.difficulty == difficulty),
     )
-    return result.scalar() or 0
+    teams_found = result.scalars().all()
+    # We can not use a where clause because the validation_progress is a Python property
+    # and is not usable in a SQL query
+    team_numbers = [
+        team.number if team.number is not None and team.number >= 0 else 0
+        for team in filter(
+            lambda team: team.validation_progress == 100
+            and team.number is not None
+            and team.number >= 0,
+            teams_found,
+        )
+    ]
+    return max(team_numbers) if team_numbers else 0
 
 
 async def create_participant_checkout(

app/modules/raid/endpoints_raid.py

@@ -24,6 +24,7 @@
 from app.modules.raid.raid_type import DocumentType, DocumentValidation, Size
 from app.modules.raid.utils.drive.drive_file_manager import DriveFileManager
 from app.modules.raid.utils.utils_raid import (
+    generate_teams_pdf_util,
     get_participant,
     post_update_actions,
     save_security_file,
@@ -215,12 +216,13 @@ async def update_participant(
 
     await cruds_raid.update_participant(participant_id, participant, is_minor, db)
     team = await cruds_raid.get_team_by_participant_id(participant_id, db)
-    await post_update_actions(
-        team,
-        db,
-        drive_file_manager,
-        settings=settings,
-    )
+    if team:
+        await post_update_actions(
+            team,
+            db,
+            drive_file_manager,
+            settings=settings,
+        )
 
 
 @module.router.post(
@@ -257,18 +259,19 @@ async def create_team(
     await cruds_raid.create_team(db_team, db)
     # We need to get the team from the db to have access to relationships
     created_team = await cruds_raid.get_team_by_id(team_id=db_team.id, db=db)
-    await post_update_actions(
-        created_team,
-        db,
-        drive_file_manager,
-        settings=settings,
-    )
+    if created_team:
+        await post_update_actions(
+            created_team,
+            db,
+            drive_file_manager,
+            settings=settings,
+        )
     return created_team
 
 
 @module.router.post(
     "/raid/teams/generate-pdf",
-    status_code=204,
+    status_code=200,
 )
 async def generate_teams_pdf(
     user: models_users.CoreUser = Depends(is_user_in(GroupType.raid_admin)),
@@ -280,15 +283,13 @@ async def generate_teams_pdf(
     PDF are automatically generated when a team is created or updated.
     This endpoint is used to regenerate all the PDFs.
     """
-    teams = await cruds_raid.get_all_teams(db)
+    await generate_teams_pdf_util(
+        db=db,
+        drive_file_manager=drive_file_manager,
+        settings=settings,
+    )
 
-    for team in teams:
-        await post_update_actions(
-            team,
-            db,
-            drive_file_manager,
-            settings=settings,
-        )
+    return "PDF generation started"
 
 
 @module.router.get(
@@ -371,12 +372,13 @@ async def update_team(
         raise HTTPException(status_code=403, detail="You can only edit your own team.")
     await cruds_raid.update_team(team_id, team, db)
     updated_team = await cruds_raid.get_team_by_id(team_id, db)
-    await post_update_actions(
-        updated_team,
-        db,
-        drive_file_manager,
-        settings=settings,
-    )
+    if updated_team:
+        await post_update_actions(
+            updated_team,
+            db,
+            drive_file_manager,
+            settings=settings,
+        )
 
 
 @module.router.delete(
@@ -578,12 +580,13 @@ async def validate_document(
     """
     await cruds_raid.update_document_validation(document_id, validation, db)
     team = await cruds_raid.get_team_by_participant_id(user.id, db)
-    await post_update_actions(
-        team,
-        db,
-        drive_file_manager,
-        settings=settings,
-    )
+    if team:
+        await post_update_actions(
+            team,
+            db,
+            drive_file_manager,
+            settings=settings,
+        )
 
 
 @module.router.post(
@@ -680,12 +683,13 @@ async def confirm_payment(
         participant_id,
         db,
     )
-    await post_update_actions(
-        team,
-        db,
-        drive_file_manager,
-        settings=settings,
-    )
+    if team:
+        await post_update_actions(
+            team,
+            db,
+            drive_file_manager,
+            settings=settings,
+        )
 
 
 @module.router.post(
@@ -711,12 +715,13 @@ async def confirm_t_shirt_payment(
         raise HTTPException(status_code=400, detail="T shirt size not set.")
     await cruds_raid.confirm_t_shirt_payment(participant_id, db)
     team = await cruds_raid.get_team_by_participant_id(participant_id, db)
-    await post_update_actions(
-        team,
-        db,
-        drive_file_manager,
-        settings=settings,
-    )
+    if team:
+        await post_update_actions(
+            team,
+            db,
+            drive_file_manager,
+            settings=settings,
+        )
 
 
 @module.router.post(
@@ -737,12 +742,13 @@ async def validate_attestation_on_honour(
         raise HTTPException(status_code=403, detail="You are not the participant")
     await cruds_raid.validate_attestation_on_honour(participant_id, db)
     team = await cruds_raid.get_team_by_participant_id(participant_id, db)
-    await post_update_actions(
-        team,
-        db,
-        drive_file_manager,
-        settings=settings,
-    )
+    if team:
+        await post_update_actions(
+            team,
+            db,
+            drive_file_manager,
+            settings=settings,
+        )
 
 
 @module.router.post(

app/modules/raid/utils/pdf/pdf_writer.py

@@ -150,7 +150,11 @@ def write_participant_document(self, participant: Participant):
             participant.parent_authorization,
         ]:
             if document:
-                pdf = get_file_path_from_data("raid", document.id, "documents")
+                pdf = get_file_path_from_data(
+                    "raid",
+                    document.id,
+                    "assets/pdf/default_PDF.pdf",
+                )
                 extension = pdf.absolute().suffix[1:]
                 if extension in ["jpg", "jpeg", "png"]:
                     self.write_document(document, participant)

app/modules/raid/utils/utils_raid.py

@@ -11,15 +11,14 @@
 from app.core.payment import schemas_payment
 from app.core.utils.config import Settings
 from app.modules.raid import coredata_raid, cruds_raid, models_raid, schemas_raid
+from app.modules.raid.raid_type import Difficulty
 from app.modules.raid.schemas_raid import (
     ParticipantBase,
     ParticipantUpdate,
 )
 from app.modules.raid.utils.drive.drive_file_manager import DriveFileManager
 from app.modules.raid.utils.pdf.pdf_writer import HTMLPDFWriter, PDFWriter
-from app.utils.tools import (
-    get_core_data,
-)
+from app.utils.tools import get_core_data
 
 hyperion_error_logger = logging.getLogger("hyperion.error")
 
@@ -135,10 +134,20 @@ async def write_teams_csv(
 async def set_team_number(team: models_raid.Team, db: AsyncSession) -> None:
     if team.difficulty is None:
         return
-    new_team_number = await cruds_raid.get_number_of_team_by_difficulty(
+    number_of_team = await cruds_raid.get_number_of_team_by_difficulty(
         team.difficulty,
         db,
     )
+    difficulty_separator = {
+        Difficulty.discovery: 0,
+        Difficulty.sports: 100,
+        Difficulty.expert: 200,
+    }
+    new_team_number = (
+        difficulty_separator[team.difficulty] + 1
+        if number_of_team == 0
+        else number_of_team + 1
+    )
     updated_team: schemas_raid.TeamUpdate = schemas_raid.TeamUpdate(
         number=new_team_number,
     )
@@ -184,31 +193,36 @@ async def save_team_info(
 
 
 async def post_update_actions(
-    team: models_raid.Team | None,
+    team: models_raid.Team,
     db: AsyncSession,
     drive_file_manager: DriveFileManager,
     settings: Settings,
+    should_generate_all_teams_csv: bool = True,
 ) -> None:
     try:
-        if team:
-            if team.validation_progress == 100:
-                await set_team_number(team, db)
+        if team.validation_progress == 100 and (
+            team.number is None or team.number == -1
+        ):
+            await set_team_number(team, db)
+
+            # Usually we want to update the csv file each team a team is updated
+            # but when we batch update teams we only want to update the csv file once, at the end
+            if should_generate_all_teams_csv:
                 all_teams = await cruds_raid.get_all_validated_teams(db)
-                if all_teams:
-                    await write_teams_csv(
-                        all_teams,
-                        db,
-                        drive_file_manager,
-                        settings=settings,
-                    )
-            await save_team_info(
-                team,
-                db,
-                drive_file_manager,
-                settings=settings,
-            )
+                await write_teams_csv(
+                    all_teams,
+                    db,
+                    drive_file_manager,
+                    settings=settings,
+                )
+        await save_team_info(
+            team,
+            db,
+            drive_file_manager,
+            settings=settings,
+        )
     except Exception:
-        hyperion_error_logger.exception("Error while creating pdf")
+        hyperion_error_logger.exception(f"Error while creating pdf for team {team.id}")
         return
 
 
@@ -269,3 +283,38 @@ async def get_participant(
     if not participant:
         raise HTTPException(status_code=404, detail="Participant not found.")
     return participant
+
+
+async def generate_teams_pdf_util(
+    db: AsyncSession,
+    drive_file_manager: DriveFileManager,
+    settings: Settings,
+):
+    teams = await cruds_raid.get_all_teams(db)
+
+    hyperion_error_logger.warning(f"RAID: Generating PDF for {len(teams)} teams")
+
+    for index, team in enumerate(teams):
+        hyperion_error_logger.info(f"RAID: team {index}/{len(teams)}")
+
+        # We reset the team number to -1 to force the update of the team number
+        await cruds_raid.update_team(team.id, schemas_raid.TeamUpdate(number=-1), db)
+        await post_update_actions(
+            team,
+            db,
+            drive_file_manager,
+            settings=settings,
+            should_generate_all_teams_csv=False,
+        )
+
+    all_teams = await cruds_raid.get_all_validated_teams(db)
+    await write_teams_csv(
+        all_teams,
+        db,
+        drive_file_manager,
+        settings=settings,
+    )
+
+    hyperion_error_logger.warning(
+        f"RAID: Successfully generated PDF for {len(teams)} teams",
+    )