param type and style normalization across all repos

osuAkatsuki · Feb 9, 2024 · 09c2499 · 09c2499
1 parent f2d1972
commit 09c2499
Show file tree

Hide file tree

Showing 11 changed files with 65 additions and 34 deletions.
diff --git a/app/repositories/achievements.py b/app/repositories/achievements.py
@@ -70,7 +70,7 @@ async def create(
           FROM achievements
          WHERE id = :id
     """
-    params = {
+    params: dict[str, Any] = {
         "id": rec_id,
     }
     rec = await app.state.services.database.fetch_one(query, params)
@@ -176,8 +176,10 @@ async def update(
            SET {",".join(f"{k} = COALESCE(:{k}, {k})" for k in update_fields)}
          WHERE id = :id
     """
-    values = {"id": id} | update_fields
-    await app.state.services.database.execute(query, values)
+    params: dict[str, Any] = {
+        "id": id,
+    } | update_fields
+    await app.state.services.database.execute(query, params)
 
     query = f"""\
         SELECT {READ_PARAMS}
@@ -215,7 +217,7 @@ async def delete(
         DELETE FROM achievements
               WHERE id = :id
     """
-    params = {
+    params: dict[str, Any] = {
         "id": id,
     }
     await app.state.services.database.execute(query, params)

diff --git a/app/repositories/channels.py b/app/repositories/channels.py
@@ -71,7 +71,7 @@ async def create(
           FROM channels
          WHERE id = :id
     """
-    params = {
+    params: dict[str, Any] = {
         "id": rec_id,
     }
 
@@ -185,8 +185,10 @@ async def update(
            SET {",".join(f"{k} = COALESCE(:{k}, {k})" for k in update_fields)}
          WHERE name = :name
     """
-    values = {"name": name} | update_fields
-    await app.state.services.database.execute(query, values)
+    params: dict[str, Any] = {
+        "name": name,
+    } | update_fields
+    await app.state.services.database.execute(query, params)
 
     query = f"""\
         SELECT {READ_PARAMS}
@@ -220,7 +222,7 @@ async def delete(
         DELETE FROM channels
               WHERE name = :name
     """
-    params = {
+    params: dict[str, Any] = {
         "name": name,
     }
     channel = await app.state.services.database.execute(query, params)

diff --git a/app/repositories/clans.py b/app/repositories/clans.py
@@ -63,7 +63,7 @@ async def create(
           FROM clans
          WHERE id = :id
     """
-    params = {
+    params: dict[str, Any] = {
         "id": rec_id,
     }
     clan = await app.state.services.database.fetch_one(query, params)
@@ -90,7 +90,12 @@ async def fetch_one(
            AND tag = COALESCE(:tag, tag)
            AND owner = COALESCE(:owner, owner)
     """
-    params: dict[str, Any] = {"id": id, "name": name, "tag": tag, "owner": owner}
+    params: dict[str, Any] = {
+        "id": id,
+        "name": name,
+        "tag": tag,
+        "owner": owner,
+    }
     clan = await app.state.services.database.fetch_one(query, params)
 
     return cast(Clan, dict(clan._mapping)) if clan is not None else None
@@ -150,8 +155,10 @@ async def update(
            SET {",".join(f"{k} = :{k}" for k in update_fields)}
          WHERE id = :id
     """
-    values = {"id": id} | update_fields
-    await app.state.services.database.execute(query, values)
+    params: dict[str, Any] = {
+        "id": id,
+    } | update_fields
+    await app.state.services.database.execute(query, params)
 
     query = f"""\
         SELECT {READ_PARAMS}
@@ -183,6 +190,6 @@ async def delete(id: int) -> Clan | None:
         DELETE FROM clans
          WHERE id = :id
     """
-    params = {"id": id}
+    params: dict[str, Any] = {"id": id}
     clan = await app.state.services.database.execute(query, params)
     return cast(Clan, dict(clan._mapping)) if clan is not None else None
diff --git a/app/repositories/comments.py b/app/repositories/comments.py
@@ -56,7 +56,7 @@ async def create(
         INSERT INTO comments (target_id, target_type, userid, time, comment, colour)
              VALUES (:target_id, :target_type, :userid, :time, :comment, :colour)
     """
-    params = {
+    params: dict[str, Any] = {
         "target_id": target_id,
         "target_type": target_type,
         "userid": userid,
@@ -71,7 +71,7 @@ async def create(
           FROM comments c
          WHERE id = :id
     """
-    params = {
+    params: dict[str, Any] = {
         "id": rec_id,
     }
     _comment = await app.state.services.database.fetch_one(query, params)

diff --git a/app/repositories/ingame_logins.py b/app/repositories/ingame_logins.py
@@ -67,7 +67,7 @@ async def create(
           FROM ingame_logins
          WHERE id = :id
     """
-    params = {
+    params: dict[str, Any] = {
         "id": rec_id,
     }
     ingame_login = await app.state.services.database.fetch_one(query, params)

diff --git a/app/repositories/logs.py b/app/repositories/logs.py
@@ -59,7 +59,7 @@ async def create(
           FROM logs
          WHERE id = :id
     """
-    params = {
+    params: dict[str, Any] = {
         "id": rec_id,
     }
     rec = await app.state.services.database.fetch_one(query, params)

diff --git a/app/repositories/maps.py b/app/repositories/maps.py
@@ -165,7 +165,7 @@ async def create(
           FROM maps
          WHERE id = :id
     """
-    params = {
+    params: dict[str, Any] = {
         "id": rec_id,
     }
     map = await app.state.services.database.fetch_one(query, params)
@@ -364,8 +364,10 @@ async def update(
            SET {",".join(f"{k} = COALESCE(:{k}, {k})" for k in update_fields)}
          WHERE id = :id
     """
-    values = {"id": id} | update_fields
-    await app.state.services.database.execute(query, values)
+    params: dict[str, Any] = {
+        "id": id,
+    } | update_fields
+    await app.state.services.database.execute(query, params)
 
     query = f"""\
         SELECT {READ_PARAMS}
@@ -397,7 +399,7 @@ async def delete(id: int) -> Map | None:
         DELETE FROM maps
               WHERE id = :id
     """
-    params = {
+    params: dict[str, Any] = {
         "id": id,
     }
     map = await app.state.services.database.execute(query, params)

diff --git a/app/repositories/players.py b/app/repositories/players.py
@@ -109,7 +109,7 @@ async def create(
           FROM users
          WHERE id = :id
     """
-    params = {
+    params: dict[str, Any] = {
         "id": rec_id,
     }
     player = await app.state.services.database.fetch_one(query, params)
@@ -278,8 +278,10 @@ async def update(
            SET {",".join(f"{k} = COALESCE(:{k}, {k})" for k in update_fields)}
          WHERE id = :id
     """
-    values = {"id": id} | update_fields
-    await app.state.services.database.execute(query, values)
+    params: dict[str, Any] = {
+        "id": id,
+    } | update_fields
+    await app.state.services.database.execute(query, params)
 
     query = f"""\
         SELECT {READ_PARAMS}

diff --git a/app/repositories/scores.py b/app/repositories/scores.py
@@ -157,7 +157,9 @@ async def create(
           FROM scores
          WHERE id = :id
     """
-    params = {"id": rec_id}
+    params: dict[str, Any] = {
+        "id": rec_id,
+    }
     rec = await app.state.services.database.fetch_one(query, params)
 
     assert rec is not None
@@ -170,7 +172,9 @@ async def fetch_one(id: int) -> Score | None:
           FROM scores
          WHERE id = :id
     """
-    params: dict[str, Any] = {"id": id}
+    params: dict[str, Any] = {
+        "id": id,
+    }
     rec = await app.state.services.database.fetch_one(query, params)
 
     return cast(Score, dict(rec._mapping)) if rec is not None else None
@@ -258,15 +262,19 @@ async def update(
            SET {",".join(f"{k} = COALESCE(:{k}, {k})" for k in update_fields)}
          WHERE id = :id
     """
-    values = {"id": id} | update_fields
-    await app.state.services.database.execute(query, values)
+    params: dict[str, Any] = {
+        "id": id,
+    } | update_fields
+    await app.state.services.database.execute(query, params)
 
     query = f"""\
         SELECT {READ_PARAMS}
           FROM scores
          WHERE id = :id
     """
-    params: dict[str, Any] = {"id": id}
+    params: dict[str, Any] = {
+        "id": id,
+    }
     rec = await app.state.services.database.fetch_one(query, params)
     return cast(Score, dict(rec._mapping)) if rec is not None else None
 

diff --git a/app/repositories/stats.py b/app/repositories/stats.py
@@ -95,7 +95,7 @@ async def create(
           FROM stats
          WHERE id = :id
     """
-    params = {
+    params: dict[str, Any] = {
         "id": rec_id,
     }
     stat = await app.state.services.database.fetch_one(query, params)
@@ -257,8 +257,11 @@ async def update(
          WHERE id = :id
            AND mode = :mode
     """
-    values = {"id": player_id, "mode": mode} | update_fields
-    await app.state.services.database.execute(query, values)
+    params: dict[str, Any] = {
+        "id": player_id,
+        "mode": mode,
+    } | update_fields
+    await app.state.services.database.execute(query, params)
 
     query = f"""\
         SELECT {READ_PARAMS}

diff --git a/app/repositories/user_achievements.py b/app/repositories/user_achievements.py
@@ -34,7 +34,10 @@ async def create(user_id: int, achievement_id: int) -> UserAchievement:
         INSERT INTO user_achievements (userid, achid)
                 VALUES (:user_id, :achievement_id)
     """
-    params: dict[str, Any] = {"user_id": user_id, "achievement_id": achievement_id}
+    params: dict[str, Any] = {
+        "user_id": user_id,
+        "achievement_id": achievement_id,
+    }
     await app.state.services.database.execute(query, params)
 
     query = f"""\
@@ -60,7 +63,9 @@ async def fetch_many(
           FROM user_achievements
           WHERE userid = :user_id
     """
-    params: dict[str, Any] = {"user_id": user_id}
+    params: dict[str, Any] = {
+        "user_id": user_id,
+    }
 
     if not isinstance(page, _UnsetSentinel) and not isinstance(
         page_size,