[fixes]: coderabbit suggested fixes

Author: smokeyScraper

backend/app/db/supabase/users_service.py

@@ -12,7 +12,9 @@
 
 SESSION_EXPIRY_MINUTES = 5
 
-async def get_or_create_user_by_discord(discord_id: str, display_name: str, discord_username: str, avatar_url: Optional[str]) -> User:
+async def get_or_create_user_by_discord(
+    discord_id: str, display_name: str, discord_username: str, avatar_url: Optional[str]
+) -> User:
     """
     Get or create a user by Discord ID.
     """
@@ -22,22 +24,21 @@ async def get_or_create_user_by_discord(discord_id: str, display_name: str, disc
     if existing_user_res.data:
         logger.info(f"Found existing user for Discord ID: {discord_id}")
         return User(**existing_user_res.data[0])
-    else:
-        logger.info(f"No user found for Discord ID: {discord_id}. Creating new user.")
-        new_user_data = {
-            "id": str(uuid.uuid4()),
-            "discord_id": discord_id,
-            "display_name": display_name,
-            "discord_username": discord_username,
-            "avatar_url": avatar_url,
-            "preferred_languages": [],
-            "created_at": datetime.now().isoformat(),
-            "updated_at": datetime.now().isoformat()
-        }
-        insert_res = await supabase.table("users").insert(new_user_data).execute()
-        if not insert_res.data:
-            raise Exception("Failed to create new user in database.")
-        return User(**insert_res.data[0])
+    logger.info(f"No user found for Discord ID: {discord_id}. Creating new user.")
+    new_user_data = {
+        "id": str(uuid.uuid4()),
+        "discord_id": discord_id,
+        "display_name": display_name,
+        "discord_username": discord_username,
+        "avatar_url": avatar_url,
+        "preferred_languages": [],
+        "created_at": datetime.now().isoformat(),
+        "updated_at": datetime.now().isoformat()
+    }
+    insert_res = await supabase.table("users").insert(new_user_data).execute()
+    if not insert_res.data:
+        raise Exception("Failed to create new user in database.")
+    return User(**insert_res.data[0])
 
 def _cleanup_expired_sessions():
     """
@@ -81,14 +82,15 @@ async def create_verification_session(discord_id: str) -> Optional[str]:
             logger.info(
                 f"Created verification session {session_id} for Discord user {discord_id}, expires at {expiry_time}")
             return session_id
-        else:
-            logger.error(f"Failed to set verification token for Discord ID: {discord_id}. User not found.")
-            return None
+        logger.error(f"Failed to set verification token for Discord ID: {discord_id}. User not found.")
+        return None
     except Exception as e:
         logger.error(f"Error creating verification session for Discord ID {discord_id}: {str(e)}")
         return None
 
-async def find_user_by_session_and_verify(session_id: str, github_id: str, github_username: str, email: Optional[str]) -> Optional[User]:
+async def find_user_by_session_and_verify(
+    session_id: str, github_id: str, github_username: str, email: Optional[str]
+) -> Optional[User]:
     """
     Find and verify user using session ID with expiry validation.
     """
@@ -104,23 +106,28 @@ async def find_user_by_session_and_verify(session_id: str, github_id: str, githu
 
         discord_id, expiry_time = session_data
 
-        if datetime.now() > expiry_time:
-            logger.warning(f"Verification session {session_id} has expired")
-            del _verification_sessions[session_id]
-            return None
-
-        del _verification_sessions[session_id]
-
         current_time = datetime.now().isoformat()
-        user_res = await supabase.table("users").select("*").eq("discord_id", discord_id).neq("verification_token", None).gt("verification_token_expires_at", current_time).limit(1).execute()
+        user_res = await supabase.table("users").select("*").eq(
+            "discord_id", discord_id
+        ).neq(
+            "verification_token", None
+        ).gt(
+            "verification_token_expires_at", current_time
+        ).limit(1).execute()
 
         if not user_res.data:
-            logger.warning(f"No valid pending verification found for Discord ID: {discord_id}")
+            logger.warning(f"No valid pending verification found for Discord ID: {discord_id} (token may have expired)")
+            del _verification_sessions[session_id]
             return None
 
+        # Delete the session after successful validation
+        del _verification_sessions[session_id]
+
         user_to_verify = user_res.data[0]
 
-        existing_github_user = await supabase.table("users").select("*").eq("github_id", github_id).neq("id", user_to_verify['id']).limit(1).execute()
+        existing_github_user = await supabase.table("users").select("*").eq(
+            "github_id", github_id
+        ).neq("id", user_to_verify['id']).limit(1).execute()
         if existing_github_user.data:
             logger.warning(f"GitHub account {github_username} is already linked to another user")
             await supabase.table("users").update({

backend/app/scripts/supabase/create_db.sql

@@ -40,7 +40,7 @@ CREATE TABLE users (
     last_active_slack TIMESTAMPTZ,
 
     total_interactions_count INTEGER NOT NULL DEFAULT 0,
-    preferred_languages TEXT[],
+    preferred_languages TEXT[]
 );
 
 -- Create index for efficient cleanup queries