Update routes/stylist.py

routes/stylist.py

@@ -47,8 +47,6 @@ def verify_token(user_token: str) -> str:
 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 = {}
     
     for i in range(6):
@@ -57,16 +55,17 @@ def get_monthly_revenue(account_id: str) -> List[Dict[str, Any]]:
         month_name = target_date.strftime('%b')
         year = target_date.year
         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,
+            "current": (month_num == now_ny.month and year == now_ny.year),
             "amount": 0,
             "growth": {"status": "", "percentage": 0, "formatted": "0.0%"}
         }
-    start_date = now_ny - relativedelta(months=6)
+    
+    start_date = now_ny - relativedelta(months=12)
     start_timestamp = int(start_date.timestamp())
+    
     try:
         transfers = stripe.Transfer.list(
             destination=account_id,
@@ -75,25 +74,30 @@ def get_monthly_revenue(account_id: str) -> List[Dict[str, Any]]:
         )
         for transfer in transfers.data:
             transfer_date = datetime.fromtimestamp(transfer.created, ny_timezone)
-            month_num = transfer_date.month
-            year = transfer_date.year
-            month_key = f"{year}-{month_num}"
+            month_key = f"{transfer_date.year}-{transfer_date.month}"
             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"]
-            current_amount = result[i]["amount"]
-            if prev_amount > 0:
-                growth_percentage = ((current_amount - prev_amount) / prev_amount) * 100
+        result.sort(key=lambda x: (now_ny.month - x["month"]) % 12)
+        
+        for i in range(len(result)):
+            current_month_data = result[i]
+            prev_year_month_key = f"{now_ny.year - 1}-{current_month_data['month']}"
+            previous_amount = monthly_data.get(prev_year_month_key, {}).get("amount", 0)
+            current_amount = current_month_data["amount"]
+            
+            if previous_amount > 0:
+                growth_percentage = ((current_amount - previous_amount) / previous_amount) * 100
             else:
                 growth_percentage = 100 if current_amount > 0 else 0
-            result[i]["growth"] = {
+            
+            current_month_data["growth"] = {
                 "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)}")
@@ -102,29 +106,16 @@ def get_monthly_revenue(account_id: str) -> List[Dict[str, Any]]:
 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
+        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": currency
+            "currency": "BRL"
         }
     except Exception as e:
         logger.error(f"❌ Error getting account balance: {str(e)}")
-        return {
-            "available_balance": 0,
-            "pending_balance": 0,
-            "currency": "BRL"
-        }
+        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"
@@ -153,24 +144,12 @@ def get_dashboard(user_token: str = Header(None, alias="User-key")):
         if not user_token:
             raise HTTPException(status_code=401, detail="Missing User-key header")
         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=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")
-        if not stripe_id:
-            return {
-                "stripe_id": None,
-                "available_balance": 0,
-                "pending_balance": 0,
-                "currency": "BRL",
-                "monthly_revenue": [],
-                "total_followers": 0,
-                "total_subscribers": 0,
-                "subscribers": []
-            }
         return {
             "stripe_id": stripe_id,
             "available_balance": get_account_balance(stripe_id)["available_balance"],
@@ -179,8 +158,6 @@ def get_dashboard(user_token: str = Header(None, alias="User-key")):
             "monthly_revenue": get_monthly_revenue(stripe_id),
             "subscribers": get_active_subscribers(user_id)
         }
-    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))