db update from id to user_id

main.py

@@ -91,7 +91,7 @@ def is_token_expired(expiration_time: datetime) -> bool:
 # Initialize system user
 async def init_system_user():
     system_user_data = {
-        "id": str(uuid.uuid4()),
+        "user_id": str(uuid.uuid4()),
         "username": SYSTEM_USER,
         "password": hash_password(SYSTEM_PASSWORD),
         "email": None,
@@ -121,7 +121,7 @@ async def signup(request: SignupRequest):
         )
 
     user_data = {
-        "id": str(uuid.uuid4()),
+        "user_id": str(uuid.uuid4()),
         "username": request.username,
         "password": hash_password(request.password),
         "email": request.email,
@@ -154,7 +154,7 @@ async def login(request: LoginRequest, user_agent: str = Header(...)):
 
     # Prepare session data with the expiration time in ISO 8601 format (UTC)
     session_data = {
-        "user_id": user["id"],
+        "user_id": user["user_id"],
         "token": token,
         "expires": expiration_time.isoformat(),  # ISO 8601 format ensures the timezone is stored
         "device": user_agent
@@ -165,7 +165,7 @@ async def login(request: LoginRequest, user_agent: str = Header(...)):
 
     # Return the login response with relevant user details
     return LoginResponse(
-        user_id=user["id"],
+        user_id=user["user_id"],
         username=user["username"],
         email=user["email"],
         access_level=user["access_level"],
@@ -243,7 +243,7 @@ async def search_users(query: str):
 
 @auth_router.get("/get-user-id", response_model=str)
 async def get_user_id(username: str):
-    user_query = supabase.table("users").select("id").eq("username", username).execute()
+    user_query = supabase.table("users").select("user_id").eq("username", username).execute()
     
     if not user_query.data:
         raise HTTPException(
@@ -251,14 +251,14 @@ async def get_user_id(username: str):
             detail="Username not found"
         )
     
-    return user_query.data[0]["id"]
+    return user_query.data[0]["user_id"]
 
 # Admin Routes
 @admin_router.get("/users", response_model=List[UserResponse])
 async def get_all_users(user_id: str, token: str, user_agent: str = Header(...)):
     await validate_token(user_id, token, user_agent)
 
-    admin_query = supabase.table("users").select("access_level").eq("id", user_id).execute()
+    admin_query = supabase.table("users").select("access_level").eq("user_id", user_id).execute()
     if not admin_query.data or admin_query.data[0]["access_level"] != "hush":
         raise HTTPException(
             status_code=status.HTTP_403_FORBIDDEN, detail="Insufficient permissions"
@@ -279,13 +279,13 @@ async def get_all_users(user_id: str, token: str, user_agent: str = Header(...))
 async def get_user(admin_id: str, token: str, user_id: str, user_agent: str = Header(...)):
     await validate_token(admin_id, token, user_agent)
 
-    admin_query = supabase.table("users").select("access_level").eq("id", admin_id).execute()
+    admin_query = supabase.table("users").select("access_level").eq("user_id", admin_id).execute()
     if not admin_query.data or admin_query.data[0]["access_level"] != "hush":
         raise HTTPException(
             status_code=status.HTTP_403_FORBIDDEN, detail="Insufficient permissions"
         )
 
-    user_query = supabase.table("users").select("*").eq("id", user_id).execute()
+    user_query = supabase.table("users").select("*").eq("user_id", user_id).execute()
     if not user_query.data:
         raise HTTPException(
             status_code=status.HTTP_404_NOT_FOUND, detail="User not found"
@@ -303,7 +303,7 @@ async def get_user(admin_id: str, token: str, user_id: str, user_agent: str = He
 async def update_user(admin_id: str, token: str, user_id: str, request: UpdateUserRequest, user_agent: str = Header(...)):
     await validate_token(admin_id, token, user_agent)
 
-    admin_query = supabase.table("users").select("access_level").eq("id", admin_id).execute()
+    admin_query = supabase.table("users").select("access_level").eq("user_id", admin_id).execute()
     if not admin_query.data or admin_query.data[0]["access_level"] != "hush":
         raise HTTPException(
             status_code=status.HTTP_403_FORBIDDEN, detail="Insufficient permissions"
@@ -317,7 +317,7 @@ async def update_user(admin_id: str, token: str, user_id: str, request: UpdateUs
     if request.username:
         update_data["username"] = request.username
 
-    updated_user = supabase.table("users").update(update_data).eq("id", user_id).execute()
+    updated_user = supabase.table("users").update(update_data).eq("user_id", user_id).execute()
     if not updated_user.data:
         raise HTTPException(
             status_code=status.HTTP_404_NOT_FOUND, detail="User not found"
@@ -335,13 +335,13 @@ async def update_user(admin_id: str, token: str, user_id: str, request: UpdateUs
 async def update_access_level(admin_id: str, token: str, user_id: str, request: UpdateAccessLevelRequest, user_agent: str = Header(...)):
     await validate_token(admin_id, token, user_agent)
 
-    admin_query = supabase.table("users").select("access_level").eq("id", admin_id).execute()
+    admin_query = supabase.table("users").select("access_level").eq("user_id", admin_id).execute()
     if not admin_query.data or admin_query.data[0]["access_level"] != "hush":
         raise HTTPException(
             status_code=status.HTTP_403_FORBIDDEN, detail="Insufficient permissions"
         )
 
-    user_query = supabase.table("users").select("*").eq("id", user_id).execute()
+    user_query = supabase.table("users").select("*").eq("user_id", user_id).execute()
     if not user_query.data:
         raise HTTPException(
             status_code=status.HTTP_404_NOT_FOUND, detail="User not found"
@@ -356,7 +356,7 @@ async def update_access_level(admin_id: str, token: str, user_id: str, request:
             detail="Cannot downgrade a user or change to the same level",
         )
 
-    updated_user = supabase.table("users").update({"access_level": new_access_level}).eq("id", user_id).execute()
+    updated_user = supabase.table("users").update({"access_level": new_access_level}).eq("user_id", user_id).execute()
     user = updated_user.data[0]
     return UserResponse(
         username=user["username"],
@@ -377,7 +377,7 @@ async def update_own_data(user_id: str, request: UpdateUserRequest, token: str =
     if request.username:
         update_data["username"] = request.username
 
-    updated_user = supabase.table("users").update(update_data).eq("id", user_id).execute()
+    updated_user = supabase.table("users").update(update_data).eq("user_id", user_id).execute()
     if not updated_user.data:
         raise HTTPException(
             status_code=status.HTTP_404_NOT_FOUND, detail="User not found"