Update routes/stylist.py

routes/stylist.py

@@ -44,85 +44,79 @@ def verify_token(user_token: str) -> str:
     else:
         raise HTTPException(status_code=401, detail="Invalid or expired token")
 
-def get_total_followers(user_id: str) -> int:
-    response = requests.get(
-        f"{SUPABASE_URL}/rest/v1/followers?following_id=eq.{user_id}&select=id",
-        headers=SUPABASE_HEADERS
-    )
-    if response.status_code == 200:
-        return len(response.json())
-    return 0
-
-def get_total_subscribers(user_id: str) -> int:
-    response = requests.get(
-        f"{SUPABASE_URL}/rest/v1/Subscriptions?stylist_id=eq.{user_id}&active=eq.true&select=id",
-        headers=SUPABASE_HEADERS
-    )
-    if response.status_code == 200:
-        return len(response.json())
-    return 0
-
-def calculate_growth(current: int, previous: int) -> Dict[str, Any]:
-    if previous == 0:
-        growth = 100 if current > 0 else 0
-    else:
-        growth = ((current - previous) / previous) * 100
-    return {
-        "trend": "up" if growth > 0 else "down" if growth < 0 else "neutral",
-        "percentage": round(growth, 1),
-        "formatted": f"{round(growth, 1)}%"
-    }
-
 def get_monthly_revenue(account_id: str) -> List[Dict[str, Any]]:
     ny_timezone = pytz.timezone('America/New_York')
     now_ny = datetime.now(ny_timezone)
     current_month = now_ny.month
     current_year = now_ny.year
-    monthly_data = []
+    monthly_data = {}
     for i in range(6):
         target_date = now_ny - relativedelta(months=i)
         month_num = target_date.month
         month_name = target_date.strftime('%b')
         year = target_date.year
-        monthly_data.append({"month": month_num, "name": month_name, "current": (month_num == current_month and year == current_year), "amount": 0})
+        month_key = f"{year}-{month_num}"
+        is_current = (month_num == current_month and year == current_year)
+        monthly_data[month_key] = {
+            "month": month_num,
+            "name": month_name,
+            "current": is_current,
+            "amount": 0,
+            "growth": {"direction": "", "percentage": 0, "formatted": "0%"}
+        }
     start_date = now_ny - relativedelta(months=6)
     start_timestamp = int(start_date.timestamp())
     try:
-        transfers = stripe.Transfer.list(destination=account_id, created={"gte": start_timestamp}, limit=100)
+        transfers = stripe.Transfer.list(
+            destination=account_id,
+            created={"gte": start_timestamp},
+            limit=100
+        )
         for transfer in transfers.data:
             transfer_date = datetime.fromtimestamp(transfer.created, ny_timezone)
             month_num = transfer_date.month
-            for month in monthly_data:
-                if month["month"] == month_num:
-                    month["amount"] += transfer.amount
-                    break
-        for i in range(1, len(monthly_data)):
-            growth_data = calculate_growth(monthly_data[i-1]["amount"], monthly_data[i]["amount"])
-            monthly_data[i-1]["growth"] = growth_data
-        monthly_data[-1]["growth"] = {"trend": "neutral", "percentage": 0, "formatted": "0%"}
-        return monthly_data
+            year = transfer_date.year
+            month_key = f"{year}-{month_num}"
+            if month_key in monthly_data:
+                monthly_data[month_key]["amount"] += transfer.amount
+        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"]
+            if prev_amount > 0:
+                growth_percentage = ((curr_amount - prev_amount) / prev_amount) * 100
+            else:
+                growth_percentage = 100 if curr_amount > 0 else 0
+            direction = "up" if growth_percentage > 0 else "down"
+            result[i]["growth"] = {
+                "direction": direction,
+                "percentage": round(abs(growth_percentage), 2),
+                "formatted": f"{abs(growth_percentage):.1f}%"
+            }
+        return result
     except Exception as e:
         logger.error(f"❌ Error getting monthly revenue: {str(e)}")
-        return monthly_data
+        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 = 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(stylist_id: str) -> List[Dict[str, Any]]:
+    url = f"{SUPABASE_URL}/rest/v1/Subscriptions?stylist_id=eq.{stylist_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()]
+    return []
 
 @router.get("/dashboard")
 def get_dashboard(user_token: str = Header(None, alias="User-key")):
@@ -132,20 +126,39 @@ def get_dashboard(user_token: str = Header(None, alias="User-key")):
         user_id = verify_token(user_token)
         logger.info(f"🔹 User verified. user_id: {user_id}")
         user_data_url = f"{SUPABASE_URL}/rest/v1/User?id=eq.{user_id}"
-        response = requests.get(user_data_url, headers={"Authorization": f"Bearer {user_token}", "apikey": SUPABASE_KEY, "Content-Type": "application/json"})
+        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")
-        total_followers = get_total_followers(user_id)
-        total_subscribers = get_total_subscribers(user_id)
         if not stripe_id:
-            return {"stripe_id": None, "available_balance": 0, "pending_balance": 0, "currency": "BRL", "monthly_revenue": [], "total_followers": total_followers, "total_subscribers": total_subscribers}
+            return {
+                "stripe_id": None,
+                "available_balance": 0,
+                "pending_balance": 0,
+                "currency": "BRL",
+                "monthly_revenue": [],
+                "total_followers": 0,
+                "total_subscribers": 0,
+                "active_subscribers": []
+            }
         balance_info = get_account_balance(stripe_id)
         monthly_revenue = get_monthly_revenue(stripe_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}
+        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
+        }
     except HTTPException as http_err:
         raise http_err
     except Exception as e:
         logger.error(f"❌ Error: {str(e)}")
-        raise HTTPException(status_code=500, detail=str(e))
+        raise HTTPException(status_code=500, detail=str(e))