Update routes/stylist.py

routes/stylist.py

@@ -58,7 +58,7 @@ def get_account_balance(account_id: str) -> Dict[str, Any]:
         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]]:
+def get_monthly_revenue(account_id: str) -> Dict[str, Any]:
     ny_timezone = pytz.timezone('America/New_York')
     now_ny = datetime.now(ny_timezone)
     monthly_data = {}
@@ -92,8 +92,8 @@ def get_monthly_revenue(account_id: str) -> List[Dict[str, Any]]:
             month_key = f"{transfer_date.year}-{transfer_date.month}"
             if month_key in monthly_data:
                 monthly_data[month_key]["amount"] += transfer.amount
-                if now_ny - transfer_date <= relativedelta(months=6):
-                    total_revenue_last_6_months += transfer.amount
+                # Adiciona ao total dos últimos 6 meses
+                total_revenue_last_6_months += transfer.amount
 
         result = list(monthly_data.values())
         result.sort(key=lambda x: (now_ny.month - x["month"]) % 12)
@@ -115,10 +115,81 @@ def get_monthly_revenue(account_id: str) -> List[Dict[str, Any]]:
                 "formatted": f"{round(growth_percentage, 1)}%"
             }
         
-        return result, total_revenue_last_6_months
+        return {
+            "monthly_data": result,
+            "total_last_6_months": total_revenue_last_6_months
+        }
     except Exception as e:
         logger.error(f"❌ Error getting monthly revenue: {str(e)}")
-        return list(monthly_data.values()), total_revenue_last_6_months
+        return {
+            "monthly_data": list(monthly_data.values()),
+            "total_last_6_months": 0
+        }
+
+def format_subscription_date(created_at_str: str) -> str:
+    """Format the subscription date to the requested format: e.g. '13th January 2025'"""
+    try:
+        created_at = datetime.fromisoformat(created_at_str.replace('Z', '+00:00'))
+        
+        # Add suffix to day
+        day = created_at.day
+        if 4 <= day <= 20 or 24 <= day <= 30:
+            suffix = "th"
+        else:
+            suffix = {1: "st", 2: "nd", 3: "rd"}.get(day % 10, "th")
+        
+        # Format the date
+        return f"{day}{suffix} {created_at.strftime('%B %Y')}"
+    except Exception as e:
+        logger.error(f"❌ Error formatting subscription date: {str(e)}")
+        return "Unknown date"
+
+def get_active_subscribers(user_id: str, page: int) -> Dict[str, Any]:
+    limit = 30
+    offset = page * limit
+    
+    # Ordenar por created_at em ordem decrescente (mais recente primeiro)
+    url = f"{SUPABASE_URL}/rest/v1/Subscriptions?stylist_id=eq.{user_id}&active=eq.true&order=created_at.desc&limit={limit}&offset={offset}"
+    
+    response = requests.get(url, headers=SUPABASE_HEADERS)
+    if response.status_code == 200:
+        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]
+                subscription_date = format_subscription_date(sub.get("created_at", ""))
+                subscriber_list.append({
+                    "id": user_info.get("id"),
+                    "name": user_info.get("name"),
+                    "avatar": user_info.get("avatar"),
+                    "blurhash": user_info.get("blurhash"),
+                    "subscription_date": subscription_date
+                })
+        
+        has_next_page = len(subscribers) == limit
+        return {"subscribers": subscriber_list, "has_next_page": has_next_page}
+    
+    return {"subscribers": [], "has_next_page": False}
+
+def get_total_followers(user_id: str) -> int:
+    url = f"{SUPABASE_URL}/rest/v1/followers?following_id=eq.{user_id}"
+    response = requests.get(url, headers=SUPABASE_HEADERS)
+    if response.status_code == 200:
+        followers = response.json()
+        return len(followers)
+    return 0
+
+def get_total_subscribers(user_id: str) -> int:
+    url = f"{SUPABASE_URL}/rest/v1/Subscriptions?stylist_id=eq.{user_id}&active=eq.true"
+    response = requests.get(url, headers=SUPABASE_HEADERS)
+    if response.status_code == 200:
+        subscribers = response.json()
+        return len(subscribers)
+    return 0
 
 @router.get("/dashboard")
 def get_dashboard(user_token: str = Header(None, alias="User-key"), page: int = Query(0, ge=0)):
@@ -129,13 +200,14 @@ def get_dashboard(user_token: str = Header(None, alias="User-key"), page: int =
         user_data = response.json()[0]
         stripe_id = user_data.get("stripe_id")
         
-        monthly_revenue, total_revenue_last_6_months = get_monthly_revenue(stripe_id)
+        # Obter dados de receita mensal e total dos últimos 6 meses
+        revenue_data = get_monthly_revenue(stripe_id)
         
         return {
             "stripe_id": stripe_id,
             "available_balance": get_account_balance(stripe_id),
-            "monthly_revenue": monthly_revenue,
-            "total_revenue_last_6_months": total_revenue_last_6_months,
+            "monthly_revenue": revenue_data["monthly_data"],
+            "total_revenue_last_6_months": revenue_data["total_last_6_months"],
             "total_followers": get_total_followers(user_id),
             "total_subscribers": get_total_subscribers(user_id),
             **get_active_subscribers(user_id, page)