Update routes/stylist.py

routes/stylist.py

@@ -50,6 +50,7 @@ def get_monthly_revenue(account_id: str) -> List[Dict[str, Any]]:
     current_month = now_ny.month
     current_year = now_ny.year
     monthly_data = {}
+    
     for i in range(6):
         target_date = now_ny - relativedelta(months=i)
         month_num = target_date.month
@@ -62,7 +63,7 @@ def get_monthly_revenue(account_id: str) -> List[Dict[str, Any]]:
             "name": month_name,
             "current": is_current,
             "amount": 0,
-            "growth": {"direction": "", "percentage": 0, "formatted": "0%"}
+            "growth": {"status": "", "percentage": 0, "formatted": "0.0%"}
         }
     start_date = now_ny - relativedelta(months=6)
     start_timestamp = int(start_date.timestamp())
@@ -82,40 +83,68 @@ def get_monthly_revenue(account_id: str) -> List[Dict[str, Any]]:
         result = list(monthly_data.values())
         result.sort(key=lambda x: (current_month - x["month"]) % 12)
         for i in range(1, len(result)):
-            prev_amount = result[i-1]["amount"]
-            curr_amount = result[i]["amount"]
+            prev_amount = result[i - 1]["amount"]
+            current_amount = result[i]["amount"]
             if prev_amount > 0:
-                growth_percentage = ((curr_amount - prev_amount) / prev_amount) * 100
+                growth_percentage = ((current_amount - prev_amount) / prev_amount) * 100
             else:
-                growth_percentage = 100 if curr_amount > 0 else 0
-            direction = "up" if growth_percentage > 0 else "down"
+                growth_percentage = 100 if current_amount > 0 else 0
             result[i]["growth"] = {
-                "direction": direction,
-                "percentage": round(abs(growth_percentage), 2),
-                "formatted": f"{abs(growth_percentage):.1f}%"
+                "status": "up" if growth_percentage > 0 else "down",
+                "percentage": round(growth_percentage, 1),
+                "formatted": f"{round(growth_percentage, 1)}%"
             }
         return result
     except Exception as e:
         logger.error(f"❌ Error getting monthly revenue: {str(e)}")
         return list(monthly_data.values())
 
-def get_active_subscribers(stylist_id: str) -> List[Dict[str, Any]]:
-    url = f"{SUPABASE_URL}/rest/v1/Subscriptions?stylist_id=eq.{stylist_id}&active=eq.true&limit=30"
+def get_account_balance(account_id: str) -> Dict[str, Any]:
+    try:
+        balance = stripe.Balance.retrieve(stripe_account=account_id)
+        available_balance = 0
+        pending_balance = 0
+        currency = "BRL"
+        for balance_item in balance.available:
+            if balance_item.currency.upper() == "BRL":
+                available_balance = balance_item.amount
+                break
+        for balance_item in balance.pending:
+            if balance_item.currency.upper() == "BRL":
+                pending_balance = balance_item.amount
+                break
+        return {
+            "available_balance": available_balance,
+            "pending_balance": pending_balance,
+            "currency": currency
+        }
+    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"
     response = requests.get(url, headers=SUPABASE_HEADERS)
     if response.status_code == 200:
-        subscriptions = response.json()
-        subscriber_ids = [sub["customer_id"] for sub in subscriptions]
-        if not subscriber_ids:
-            return []
-        user_data_url = f"{SUPABASE_URL}/rest/v1/User?id=in.({','.join(subscriber_ids)})"
-        user_response = requests.get(user_data_url, headers=SUPABASE_HEADERS)
-        if user_response.status_code == 200:
-            return [{
-                "id": user["id"],
-                "name": user["name"],
-                "avatar": user["avatar"],
-                "blurhash": user.get("blurhash", "")
-            } for user in user_response.json()]
+        subscribers = response.json()
+        subscriber_list = []
+        for sub in subscribers:
+            customer_id = sub.get("customer_id")
+            user_data_url = f"{SUPABASE_URL}/rest/v1/User?id=eq.{customer_id}"
+            user_response = requests.get(user_data_url, headers=SUPABASE_HEADERS)
+            if user_response.status_code == 200 and user_response.json():
+                user_info = user_response.json()[0]
+                subscriber_list.append({
+                    "id": user_info.get("id"),
+                    "name": user_info.get("name"),
+                    "avatar": user_info.get("avatar"),
+                    "blurhash": user_info.get("blurhash")
+                })
+        return subscriber_list
     return []
 
 @router.get("/dashboard")
@@ -140,22 +169,15 @@ def get_dashboard(user_token: str = Header(None, alias="User-key")):
                 "monthly_revenue": [],
                 "total_followers": 0,
                 "total_subscribers": 0,
-                "active_subscribers": []
+                "subscribers": []
             }
-        balance_info = get_account_balance(stripe_id)
-        monthly_revenue = get_monthly_revenue(stripe_id)
-        total_followers = get_total_followers(user_id)
-        total_subscribers = get_total_subscribers(user_id)
-        active_subscribers = get_active_subscribers(user_id)
         return {
             "stripe_id": stripe_id,
-            "available_balance": balance_info["available_balance"],
-            "pending_balance": balance_info["pending_balance"],
-            "currency": balance_info["currency"],
-            "monthly_revenue": monthly_revenue,
-            "total_followers": total_followers,
-            "total_subscribers": total_subscribers,
-            "active_subscribers": active_subscribers
+            "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"],
+            "monthly_revenue": get_monthly_revenue(stripe_id),
+            "subscribers": get_active_subscribers(user_id)
         }
     except HTTPException as http_err:
         raise http_err