Update routes/stylist.py

routes/stylist.py

@@ -62,20 +62,29 @@ def get_total_subscribers(user_id: str) -> int:
         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
-        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}
+        monthly_data.append({"month": month_num, "name": month_name, "current": (month_num == current_month and year == current_year), "amount": 0})
     start_date = now_ny - relativedelta(months=6)
     start_timestamp = int(start_date.timestamp())
     try:
@@ -83,16 +92,18 @@ 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}"
-            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)
-        return result
+            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
     except Exception as e:
         logger.error(f"❌ Error getting monthly revenue: {str(e)}")
-        return list(monthly_data.values())
+        return monthly_data
 
 def get_account_balance(account_id: str) -> Dict[str, Any]:
     try:
@@ -136,6 +147,5 @@ def get_dashboard(user_token: str = Header(None, alias="User-key")):
     except HTTPException as http_err:
         raise http_err
     except Exception as e:
-        error_message = str(e) if str(e) else "An unknown error occurred"
-        logger.error(f"❌ Error: {error_message}")
-        raise HTTPException(status_code=500, detail=error_message)
+        logger.error(f"❌ Error: {str(e)}")
+        raise HTTPException(status_code=500, detail=str(e))