Fix parsing of roster queries

src/data_storage.py

@@ -10,12 +10,26 @@ TOKENS_TABLE = "npcs_tokens"
 
 
 def update_selection(user_id: str | int, position_id: str, player_id: str):
-    (
+    existing_record = (
         supabase_client.table(USER_ROSTERS_TABLE)
-        .update({"user_id": user_id, "position_id": position_id, "player_id": player_id})
+        .select("*")
         .match({"user_id": user_id, "position_id": position_id})
         .execute()
+        .data
     )
+    if existing_record:
+        (
+            supabase_client.table(USER_ROSTERS_TABLE)
+            .update({"user_id": user_id, "position_id": position_id, "player_id": player_id})
+            .match({"user_id": user_id, "position_id": position_id})
+            .execute()
+        )
+    else:
+        (
+            supabase_client.table(USER_ROSTERS_TABLE)
+            .insert({"user_id": user_id, "position_id": position_id, "player_id": player_id})
+            .execute()
+        )
 
 
 def get_user_team(user_id):
@@ -86,13 +100,19 @@ def get_all_users(columns_included: list[str] = ["user_id", "name", "email"]):
     return all_users
 
 
-def get_all_rosters() -> list[tuple[int, str, str]]:
-    all_rosters = supabase_client.table(USER_ROSTERS_TABLE).select("*").execute().data
+def get_all_rosters() -> list[dict[str, int | str]]:
+    all_rosters = supabase_client.table(USER_ROSTERS_TABLE).select("user_id", "position_id", "player_id").execute().data
     return all_rosters
 
 
-def get_all_rosters_week(week: int) -> list[tuple[int, str, str]]:
-    week_rosters = supabase_client.table(USER_ROSTERS_TABLE).select("*").like("position_id", f"{week}%").execute().data
+def get_all_rosters_week(week: int) -> list[dict[str, int | str]]:
+    week_rosters = (
+        supabase_client.table(USER_ROSTERS_TABLE)
+        .select("user_id", "position_id", "player_id")
+        .like("position_id", f"{week}%")
+        .execute()
+        .data
+    )
     return week_rosters
 
 
@@ -101,6 +121,9 @@ def migrate_players_from_week(migrate_from_week: int):
     Migrate players from the week = migrate_from_week to the week = migrate_from_week + 1
     """
     rosters = get_all_rosters_week(migrate_from_week)
-    for user_id, position_id, player_id in rosters:
+    for roster_slot_map in rosters:
+        position_id = str(roster_slot_map["position_id"])
+        player_id = str(roster_slot_map["player_id"])
+        user_id = int(roster_slot_map["user_id"])
         new_position_id = f"""{migrate_from_week + 1}-{position_id.split("-", 1)[1]}"""
         update_selection(user_id, new_position_id, player_id)

src/pages/11_Scoreboard.py

@@ -32,7 +32,10 @@ def get_users_df():
 def load_masked_rosters() -> dict[int, dict[str, PlayerOption]]:
     options_map = get_map_week_player_id_option()
     roster_user_position_map: dict[int, dict[str, PlayerOption]] = {}
-    for user_id, position_id, player_id in get_all_rosters():
+    for roster_slot_map in get_all_rosters():
+        position_id = str(roster_slot_map["position_id"])
+        player_id = str(roster_slot_map["player_id"])
+        user_id = int(roster_slot_map["user_id"])
         if user_id not in roster_user_position_map:
             roster_user_position_map[user_id] = {}
         week = int(position_id[0])