Update routes/stylist.py

routes/stylist.py

@@ -3,7 +3,7 @@ import stripe
 import requests
 import logging
 import pytz
-from fastapi import APIRouter, HTTPException, Header
+from fastapi import APIRouter, HTTPException, Header, Query
 from datetime import datetime, timedelta
 from dateutil.relativedelta import relativedelta
 from typing import List, Dict, Any
@@ -44,6 +44,20 @@ def verify_token(user_token: str) -> str:
     else:
         raise HTTPException(status_code=401, detail="Invalid or expired token")
 
+def get_account_balance(account_id: str) -> Dict[str, Any]:
+    try:
+        balance = stripe.Balance.retrieve(stripe_account=account_id)
+        available_balance = next((b.amount for b in balance.available if b.currency.upper() == "BRL"), 0)
+        pending_balance = next((b.amount for b in balance.pending if b.currency.upper() == "BRL"), 0)
+        return {
+            "available_balance": available_balance,
+            "pending_balance": pending_balance,
+            "currency": "BRL"
+        }
+    except Exception as e:
+        logger.error(f"❌ Error getting account balance: {str(e)}")
+        return {"available_balance": 0, "pending_balance": 0, "currency": "BRL"}
+
 def get_monthly_revenue(account_id: str) -> List[Dict[str, Any]]:
     ny_timezone = pytz.timezone('America/New_York')
     now_ny = datetime.now(ny_timezone)
@@ -103,22 +117,10 @@ def get_monthly_revenue(account_id: str) -> List[Dict[str, Any]]:
         logger.error(f"❌ Error getting monthly revenue: {str(e)}")
         return list(monthly_data.values())
 
-def get_account_balance(account_id: str) -> Dict[str, Any]:
-    try:
-        balance = stripe.Balance.retrieve(stripe_account=account_id)
-        available_balance = next((b.amount for b in balance.available if b.currency.upper() == "BRL"), 0)
-        pending_balance = next((b.amount for b in balance.pending if b.currency.upper() == "BRL"), 0)
-        return {
-            "available_balance": available_balance,
-            "pending_balance": pending_balance,
-            "currency": "BRL"
-        }
-    except Exception as e:
-        logger.error(f"❌ Error getting account balance: {str(e)}")
-        return {"available_balance": 0, "pending_balance": 0, "currency": "BRL"}
-
-def get_active_subscribers(user_id: str) -> List[Dict[str, Any]]:
-    url = f"{SUPABASE_URL}/rest/v1/Subscriptions?stylist_id=eq.{user_id}&active=eq.true&limit=30"
+def get_active_subscribers(user_id: str, page: int) -> Dict[str, Any]:
+    limit = 30
+    offset = page * limit
+    url = f"{SUPABASE_URL}/rest/v1/Subscriptions?stylist_id=eq.{user_id}&active=eq.true&limit={limit}&offset={offset}"
     response = requests.get(url, headers=SUPABASE_HEADERS)
     if response.status_code == 200:
         subscribers = response.json()
@@ -135,28 +137,26 @@ def get_active_subscribers(user_id: str) -> List[Dict[str, Any]]:
                     "avatar": user_info.get("avatar"),
                     "blurhash": user_info.get("blurhash")
                 })
-        return subscriber_list
-    return []
+        
+        has_next_page = len(subscribers) == limit
+        return {"subscribers": subscriber_list, "has_next_page": has_next_page}
+    
+    return {"subscribers": [], "has_next_page": False}
 
 @router.get("/dashboard")
-def get_dashboard(user_token: str = Header(None, alias="User-key")):
+def get_dashboard(user_token: str = Header(None, alias="User-key"), page: int = Query(0, ge=0)):
     try:
-        if not user_token:
-            raise HTTPException(status_code=401, detail="Missing User-key header")
         user_id = verify_token(user_token)
         user_data_url = f"{SUPABASE_URL}/rest/v1/User?id=eq.{user_id}"
         response = requests.get(user_data_url, headers=SUPABASE_HEADERS)
-        if response.status_code != 200 or not response.json():
-            raise HTTPException(status_code=404, detail="User not found")
         user_data = response.json()[0]
         stripe_id = user_data.get("stripe_id")
+        
         return {
             "stripe_id": stripe_id,
-            "available_balance": get_account_balance(stripe_id)["available_balance"],
-            "pending_balance": get_account_balance(stripe_id)["pending_balance"],
-            "currency": get_account_balance(stripe_id)["currency"],
+            "available_balance": get_account_balance(stripe_id),
             "monthly_revenue": get_monthly_revenue(stripe_id),
-            "subscribers": get_active_subscribers(user_id)
+            **get_active_subscribers(user_id, page)
         }
     except Exception as e:
         logger.error(f"❌ Error: {str(e)}")