Replace all refs to old db with supabase client

src/data_storage.py

@@ -4,48 +4,41 @@ import streamlit as st
 from queries.supabase_db.client import supabase_client
 
 
+USERS_TABLE = "npcs_users"
+USER_ROSTERS_TABLE = "npcs_user_rosters"
+TOKENS_TABLE = "npcs_tokens"
+
+
 def update_selection(user_id: str | int, position_id: str, player_id: str):
-    pass
-    # with get_db_connection() as con:
-    #     cur = con.cursor()
-    #     cur.execute(
-    #         f"""DELETE FROM user_rosters where user_id = {user_id} and position_id = '{position_id}'
-    #                 """
-    #     )
-    #     cur.execute(
-    #         f"""INSERT INTO user_rosters (user_id, position_id, player_id )
-    #                 VALUES({user_id}, '{position_id}', '{player_id}')
-    #                 """
-    #     )
+    (
+        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()
+    )
 
 
 def get_user_team(user_id):
-    with get_db_connection() as con:
-        cur = con.cursor()
-        team = cur.execute(f"select * from user_rosters where user_id = {user_id}").fetchall()
+    team = (
+        supabase_client.table(USER_ROSTERS_TABLE)
+        .select("position_id", "player_id")
+        .eq("user_id", user_id)
+        .execute()
+        .data
+    )
     if team:
-        return {x[1]: x[2] for x in team}
+        return {x["position_id"]: x["player_id"] for x in team}
     else:
         return {}
 
 
 def add_new_user(email: str, name: str):
-    with get_db_connection() as con:
-        cur = con.cursor()
-        cur.execute(
-            f"""INSERT INTO users (email, name )
-                    VALUES('{email.lower()}', '{name}')
-                    """
-        )
+    (supabase_client.table(USERS_TABLE).insert({"email": email.lower(), "name": name}).execute())
 
 
 def get_user(user_id: int):
     user_data = (
-        supabase_client.table("npcs_users")
-        .select("user_id", "email", "name")
-        .eq("user_id", user_id)
-        .execute()
-        .data
+        supabase_client.table("npcs_users").select("user_id", "email", "name").eq("user_id", user_id).execute().data
     )
     if not user_data:
         return {}
@@ -53,13 +46,11 @@ def get_user(user_id: int):
 
 
 def get_user_id_if_email_exists(email: str) -> int | None:
-    with get_db_connection() as con:
-        cur = con.cursor()
-        query_result = cur.execute(f"select user_id from users where email = '{email.lower()}'").fetchone()
-        if query_result:
-            user_id = query_result[0]
-        else:
-            user_id = None
+    query_result = supabase_client.table(USERS_TABLE).select("user_id").eq("email", email.lower()).execute().data
+    if query_result:
+        user_id = query_result[0]["user_id"]
+    else:
+        user_id = None
     return user_id
 
 
@@ -71,58 +62,35 @@ def is_admin(user_id: int):
 
 def login_by_token(token: str):
     # returns true if logged in successfully
-    with get_db_connection() as con:
-        cur = con.cursor()
-        query_result = cur.execute(f"select user_id from tokens where token = '{token}'").fetchone()
-        if query_result:
-            user_id = query_result[0]
-            st.session_state["logged_in_user"] = user_id
-        else:
-            user_id = None
+    query_result = supabase_client.table(TOKENS_TABLE).select("user_id").eq("token", token).execute().data
+    if query_result:
+        user_id = query_result[0]["user_id"]
+        st.session_state["logged_in_user"] = user_id
+    else:
+        user_id = None
     return user_id
 
 
 def create_new_token_for_user(user_id: int, existing_user: bool = False):
-    return {}
     # returns true if logged in successfully
     token = token_urlsafe(32)
-    with get_db_connection() as con:
-        cur = con.cursor()
-        if existing_user:
-            cur.execute(
-                f"""DELETE FROM tokens where user_id = {user_id}
-                        """
-            )
-
-        cur.execute(
-            f"""INSERT INTO tokens (user_id, token )
-                    VALUES({user_id}, '{token}')
-                    """
-        )
+    (supabase_client.table(TOKENS_TABLE).upsert({"user_id": user_id, "token": token}))
     return token
 
 
-
 def get_all_users(columns_included: list[str] = ["user_id", "name", "email"]):
-    columns_as_str = ",".join(columns_included)
-    with get_db_connection() as con:
-        cur = con.cursor()
-        all_users = cur.execute(f"select {columns_as_str} from users").fetchall()
+    all_users = supabase_client.table(USERS_TABLE).select(*columns_included).execute().data
     return all_users
 
 
 def get_all_rosters() -> list[tuple[int, str, str]]:
-    with get_db_connection() as con:
-        cur = con.cursor()
-        all_rosters = cur.execute("select * from user_rosters").fetchall()
+    all_rosters = supabase_client.table(USER_ROSTERS_TABLE).select("*").execute().data
     return all_rosters
 
 
 def get_all_rosters_week(week: int) -> list[tuple[int, str, str]]:
-    with get_db_connection() as con:
-        cur = con.cursor()
-        all_rosters = cur.execute(f"select * from user_rosters where position_id like '{week}%'").fetchall()
-    return all_rosters
+    week_rosters = supabase_client.table(USER_ROSTERS_TABLE).select("*").like("position_id", f"{week}%").execute().data
+    return week_rosters
 
 
 def migrate_players_from_week(migrate_from_week: int):