From 66c9251348cf7cab672969de42dadaa87bb83998 Mon Sep 17 00:00:00 2001
From: Erik Vroon <erik.vroon22@gmail.com>
Date: Tue, 10 Sep 2024 20:37:42 +0200
Subject: [PATCH] Small readability fixes (#905)

---
 backend/bracket/routes/teams.py        | 7 +++----
 backend/bracket/sql/users.py           | 9 +++------
 backend/tests/unit_tests/swiss_test.py | 2 +-
 3 files changed, 7 insertions(+), 11 deletions(-)

diff --git a/backend/bracket/routes/teams.py b/backend/bracket/routes/teams.py
index ae4113209..8ffed397a 100644
--- a/backend/bracket/routes/teams.py
+++ b/backend/bracket/routes/teams.py
@@ -119,8 +119,7 @@ async def update_team_logo(
     _: UserPublic = Depends(user_authenticated_for_tournament),
     team: Team = Depends(team_dependency),
 ) -> SingleTeamResponse:
-    team_id = team.id
-    old_logo_path = await get_team_logo_path(tournament_id, team_id)
+    old_logo_path = await get_team_logo_path(tournament_id, team.id)
     filename: str | None = None
     new_logo_path: str | None = None
 
@@ -144,10 +143,10 @@ async def update_team_logo(
             logger.error(f"Could not remove logo that should still exist: {old_logo_path}\n{exc}")
 
     await database.execute(
-        teams.update().where(teams.c.id == team_id),
+        teams.update().where(teams.c.id == team.id),
         values={"logo_path": filename},
     )
-    return SingleTeamResponse(data=assert_some(await get_team_by_id(team_id, tournament_id)))
+    return SingleTeamResponse(data=assert_some(await get_team_by_id(team.id, tournament_id)))
 
 
 @router.delete("/tournaments/{tournament_id}/teams/{team_id}", response_model=SuccessResponse)
diff --git a/backend/bracket/sql/users.py b/backend/bracket/sql/users.py
index 0c3cf33d2..114b22807 100644
--- a/backend/bracket/sql/users.py
+++ b/backend/bracket/sql/users.py
@@ -130,12 +130,9 @@ async def get_user(email: str) -> UserInDB | None:
 
 async def delete_user_and_owned_clubs(user_id: UserId) -> None:
     for club in await get_clubs_for_user_id(user_id):
-        club_id = club.id
+        for tournament in await sql_get_tournaments((club.id,), None):
+            await sql_delete_tournament_completely(tournament.id)
 
-        for tournament in await sql_get_tournaments((club_id,), None):
-            tournament_id = tournament.id
-            await sql_delete_tournament_completely(tournament_id)
-
-        await sql_delete_club(club_id)
+        await sql_delete_club(club.id)
 
     await delete_user(user_id)
diff --git a/backend/tests/unit_tests/swiss_test.py b/backend/tests/unit_tests/swiss_test.py
index c6db1fc26..a6802bf0d 100644
--- a/backend/tests/unit_tests/swiss_test.py
+++ b/backend/tests/unit_tests/swiss_test.py
@@ -74,7 +74,7 @@ def test_constraints() -> None:
             created=MOCK_NOW,
         ),
         RoundWithMatches(
-            id=RoundId(-1),
+            id=RoundId(-2),
             matches=[],
             is_draft=True,
             stage_item_id=StageItemId(-1),