Update routes/dashboard_home.py

routes/dashboard_home.py

@@ -6,7 +6,7 @@ import pytz
 from fastapi import APIRouter, HTTPException, Header, Query
 from datetime import datetime, timedelta
 from dateutil.relativedelta import relativedelta
-from typing import List, Dict, Any, Optional
+from typing import Dict, Any, Optional
 from pydantic import BaseModel
 
 router = APIRouter()
@@ -53,7 +53,7 @@ def verify_admin_token(user_token: str) -> str:
     if not user_id:
         raise HTTPException(status_code=400, detail="ID do usuário não encontrado")
     
-    # Agora verifica se o usuário é um administrador
+    # Verifica se o usuário é um administrador
     user_data_url = f"{SUPABASE_URL}/rest/v1/User?id=eq.{user_id}"
     response = requests.get(user_data_url, headers=SUPABASE_HEADERS)
     
@@ -71,16 +71,11 @@ def verify_admin_token(user_token: str) -> str:
 def get_total_platform_revenue(start_timestamp: int = None, end_timestamp: int = None) -> Dict[str, Any]:
     """Obtém o faturamento total da plataforma no Stripe"""
     try:
-        query_params = {
-            "limit": 100
-        }
+        query_params = {"limit": 100}
         
         # Adicionar filtros de data se fornecidos
         if start_timestamp and end_timestamp:
-            query_params["created"] = {
-                "gte": start_timestamp,
-                "lte": end_timestamp
-            }
+            query_params["created"] = {"gte": start_timestamp, "lte": end_timestamp}
         elif start_timestamp:
             query_params["created"] = {"gte": start_timestamp}
         elif end_timestamp:
@@ -95,7 +90,6 @@ def get_total_platform_revenue(start_timestamp: int = None, end_timestamp: int =
             if last_id:
                 query_params["starting_after"] = last_id
                 
-            # Obter pagamentos (charges)
             payment_list = stripe.Charge.list(**query_params)
             payments.extend(payment_list.data)
             
@@ -112,11 +106,8 @@ def get_total_platform_revenue(start_timestamp: int = None, end_timestamp: int =
         
         for payment in payments:
             amount = payment.amount
-            
-            # Contar todas as tentativas para o valor bruto
             total_revenue += amount
             
-            # Separar por status
             if payment.status == 'succeeded':
                 successful_revenue += amount
             elif payment.status == 'failed':
@@ -144,16 +135,11 @@ def get_total_platform_revenue(start_timestamp: int = None, end_timestamp: int =
 def get_platform_transfers(start_timestamp: int = None, end_timestamp: int = None) -> Dict[str, Any]:
     """Obtém o total transferido para estilistas"""
     try:
-        query_params = {
-            "limit": 100
-        }
+        query_params = {"limit": 100}
         
         # Adicionar filtros de data se fornecidos
         if start_timestamp and end_timestamp:
-            query_params["created"] = {
-                "gte": start_timestamp,
-                "lte": end_timestamp
-            }
+            query_params["created"] = {"gte": start_timestamp, "lte": end_timestamp}
         elif start_timestamp:
             query_params["created"] = {"gte": start_timestamp}
         elif end_timestamp:
@@ -168,7 +154,6 @@ def get_platform_transfers(start_timestamp: int = None, end_timestamp: int = Non
             if last_id:
                 query_params["starting_after"] = last_id
                 
-            # Obter transferências
             transfer_list = stripe.Transfer.list(**query_params)
             transfers.extend(transfer_list.data)
             
@@ -215,153 +200,45 @@ def get_app_revenue_share(total_revenue: int, total_transferred: int) -> Dict[st
         "currency": "BRL"
     }
 
-def get_monthly_revenue_breakdown(months: int = 12) -> List[Dict[str, Any]]:
-    """Obtém o faturamento mensal nos últimos X meses"""
+def get_monthly_revenue(target_date) -> Dict[str, Any]:
+    """Obtém o faturamento de um mês específico"""
     ny_timezone = pytz.timezone('America/New_York')
-    now_ny = datetime.now(ny_timezone)
-    monthly_data = []
+    if not isinstance(target_date, datetime):
+        target_date = datetime.now(ny_timezone)
     
-    for i in range(months):
-        # Calcular início e fim do mês
-        target_date = now_ny - relativedelta(months=i)
-        month_start = datetime(target_date.year, target_date.month, 1, tzinfo=ny_timezone)
-        if target_date.month == 12:
-            month_end = datetime(target_date.year + 1, 1, 1, tzinfo=ny_timezone) - timedelta(seconds=1)
-        else:
-            month_end = datetime(target_date.year, target_date.month + 1, 1, tzinfo=ny_timezone) - timedelta(seconds=1)
-        
-        # Converter para timestamps
-        start_timestamp = int(month_start.timestamp())
-        end_timestamp = int(month_end.timestamp())
-        
-        # Obter dados do mês
-        revenue_data = get_total_platform_revenue(start_timestamp, end_timestamp)
-        transfer_data = get_platform_transfers(start_timestamp, end_timestamp)
-        
-        # Calcular divisão app/estilistas
-        total_revenue = revenue_data["successful_revenue"]
-        total_transferred = transfer_data["total_transferred_to_stylists"]
-        app_revenue = total_revenue - total_transferred
-        
-        # Calcular percentual de crescimento (comparado ao mês anterior)
-        growth_percentage = 0
-        growth_status = "neutral"
-        
-        if i < months - 1 and len(monthly_data) > 0:
-            prev_month = monthly_data[0]
-            prev_revenue = prev_month["total_revenue"]
-            
-            if prev_revenue > 0:
-                growth_percentage = ((total_revenue - prev_revenue) / prev_revenue) * 100
-                growth_status = "up" if growth_percentage > 0 else "down" if growth_percentage < 0 else "neutral"
-        
-        monthly_data.insert(0, {
-            "year": target_date.year,
-            "month": target_date.month,
-            "name": target_date.strftime("%b"),
-            "total_revenue": total_revenue,
-            "app_revenue": app_revenue,
-            "stylists_revenue": total_transferred,
-            "payment_count": revenue_data["payment_count"],
-            "transfer_count": transfer_data["transfer_count"],
-            "growth": {
-                "percentage": round(growth_percentage, 2),
-                "status": growth_status,
-                "formatted": f"{round(growth_percentage, 2)}%"
-            }
-        })
+    # Calcular início e fim do mês
+    month_start = datetime(target_date.year, target_date.month, 1, tzinfo=ny_timezone)
+    if target_date.month == 12:
+        month_end = datetime(target_date.year + 1, 1, 1, tzinfo=ny_timezone) - timedelta(seconds=1)
+    else:
+        month_end = datetime(target_date.year, target_date.month + 1, 1, tzinfo=ny_timezone) - timedelta(seconds=1)
     
-    return monthly_data
-
-def get_top_earning_stylists(limit: int = 10, start_timestamp: int = None, end_timestamp: int = None) -> List[Dict[str, Any]]:
-    """Obtém os estilistas com maior faturamento no período"""
-    try:
-        query_params = {
-            "limit": 100,
-            "expand": ["destination"]
-        }
-        
-        # Adicionar filtros de data se fornecidos
-        if start_timestamp and end_timestamp:
-            query_params["created"] = {
-                "gte": start_timestamp,
-                "lte": end_timestamp
-            }
-        elif start_timestamp:
-            query_params["created"] = {"gte": start_timestamp}
-        elif end_timestamp:
-            query_params["created"] = {"lte": end_timestamp}
-        
-        transfers = []
-        has_more = True
-        last_id = None
-        
-        # Paginar resultados para obter todas as transferências
-        while has_more:
-            if last_id:
-                query_params["starting_after"] = last_id
-                
-            # Obter transferências
-            transfer_list = stripe.Transfer.list(**query_params)
-            transfers.extend(transfer_list.data)
-            
-            has_more = transfer_list.has_more
-            if transfer_list.data:
-                last_id = transfer_list.data[-1].id
-            else:
-                has_more = False
-        
-        # Agrupar transferências por conta de destino (estilista)
-        stylist_earnings = {}
-        for transfer in transfers:
-            destination = transfer.destination
-            if destination not in stylist_earnings:
-                stylist_earnings[destination] = {
-                    "account_id": destination,
-                    "total_earnings": 0,
-                    "transfer_count": 0,
-                    "name": None
-                }
-            
-            stylist_earnings[destination]["total_earnings"] += transfer.amount
-            stylist_earnings[destination]["transfer_count"] += 1
-        
-        # Obter informações adicionais dos estilistas do Supabase
-        stylist_accounts = list(stylist_earnings.keys())
-        
-        # Consultar informações de usuário para cada estilista
-        for account_id in stylist_accounts:
-            try:
-                user_data_url = f"{SUPABASE_URL}/rest/v1/User?stripe_id=eq.{account_id}"
-                response = requests.get(user_data_url, headers=SUPABASE_HEADERS)
-                
-                if response.status_code == 200 and response.json():
-                    user_info = response.json()[0]
-                    stylist_earnings[account_id]["name"] = user_info.get("name", "Unknown")
-                    stylist_earnings[account_id]["id"] = user_info.get("id")
-                    stylist_earnings[account_id]["avatar"] = user_info.get("avatar")
-                else:
-                    # Tentar obter dados direto do Stripe como fallback
-                    account = stripe.Account.retrieve(account_id)
-                    stylist_earnings[account_id]["name"] = account.business_profile.name if hasattr(account, 'business_profile') else "Unknown"
-            except Exception as e:
-                logger.error(f"❌ Erro ao obter informações do estilista {account_id}: {str(e)}")
-        
-        # Ordenar por faturamento e limitar ao número solicitado
-        top_stylists = sorted(
-            stylist_earnings.values(), 
-            key=lambda x: x["total_earnings"], 
-            reverse=True
-        )[:limit]
-        
-        return top_stylists
-        
-    except Exception as e:
-        logger.error(f"❌ Erro ao obter top estilistas: {str(e)}")
-        return []
+    # Converter para timestamps
+    start_timestamp = int(month_start.timestamp())
+    end_timestamp = int(month_end.timestamp())
+    
+    # Obter dados do mês
+    revenue_data = get_total_platform_revenue(start_timestamp, end_timestamp)
+    transfer_data = get_platform_transfers(start_timestamp, end_timestamp)
+    
+    # Calcular divisão app/estilistas
+    total_revenue = revenue_data["successful_revenue"]
+    total_transferred = transfer_data["total_transferred_to_stylists"]
+    app_revenue = total_revenue - total_transferred
+    
+    return {
+        "year": target_date.year,
+        "month": target_date.month,
+        "name": target_date.strftime("%b"),
+        "total_revenue": total_revenue,
+        "app_revenue": app_revenue,
+        "stylists_revenue": total_transferred,
+        "payment_count": revenue_data["payment_count"],
+        "transfer_count": transfer_data["transfer_count"]
+    }
 
-def get_platform_metrics() -> Dict[str, Any]:
-    """Obtém métricas gerais da plataforma"""
+def get_platform_users() -> Dict[str, Any]:
+    """Obtém informações sobre usuários e estilistas da plataforma"""
     try:
         # Obter número total de usuários
         users_url = f"{SUPABASE_URL}/rest/v1/User?select=count"
@@ -377,7 +254,7 @@ def get_platform_metrics() -> Dict[str, Any]:
                 total_users = int(count_header.split("/")[1])
         
         # Obter número total de estilistas
-        stylists_url = f"{SUPABASE_URL}/rest/v1/User?is_stylist=eq.true&select=count"
+        stylists_url = f"{SUPABASE_URL}/rest/v1/User?role=eq.stylist&select=count"
         stylists_response = requests.get(
             stylists_url, 
             headers={**SUPABASE_HEADERS, "Prefer": "count=exact"}
@@ -389,59 +266,23 @@ def get_platform_metrics() -> Dict[str, Any]:
             if count_header:
                 total_stylists = int(count_header.split("/")[1])
         
-        # Obter número total de assinaturas ativas
-        subscriptions_url = f"{SUPABASE_URL}/rest/v1/Subscriptions?active=eq.true&select=count"
-        subscriptions_response = requests.get(
-            subscriptions_url, 
-            headers={**SUPABASE_HEADERS, "Prefer": "count=exact"}
-        )
-        
-        total_active_subscriptions = 0
-        if subscriptions_response.status_code == 200:
-            count_header = subscriptions_response.headers.get("Content-Range", "")
-            if count_header:
-                total_active_subscriptions = int(count_header.split("/")[1])
-        
-        # Calcular taxa de conversão (assinaturas ativas / usuários totais)
-        conversion_rate = (total_active_subscriptions / total_users) * 100 if total_users > 0 else 0
-        
-        # Obter número total de consultas
-        schedules_url = f"{SUPABASE_URL}/rest/v1/schedules?select=count"
-        schedules_response = requests.get(
-            schedules_url, 
-            headers={**SUPABASE_HEADERS, "Prefer": "count=exact"}
-        )
-        
-        total_consultations = 0
-        if schedules_response.status_code == 200:
-            count_header = schedules_response.headers.get("Content-Range", "")
-            if count_header:
-                total_consultations = int(count_header.split("/")[1])
-        
         return {
             "total_users": total_users,
-            "total_stylists": total_stylists,
-            "total_active_subscriptions": total_active_subscriptions,
-            "conversion_rate": round(conversion_rate, 2),
-            "total_consultations": total_consultations
+            "total_stylists": total_stylists
         }
         
     except Exception as e:
-        logger.error(f"❌ Erro ao obter métricas da plataforma: {str(e)}")
+        logger.error(f"❌ Erro ao obter informações de usuários: {str(e)}")
         return {
             "total_users": 0,
             "total_stylists": 0,
-            "total_active_subscriptions": 0,
-            "conversion_rate": 0,
-            "total_consultations": 0,
             "error": str(e)
         }
 
 @router.get("/admin/dashboard")
 def get_admin_dashboard(
     user_token: str = Header(None, alias="User-key"),
-    period: str = Query("all_time", description="Período: all_time, last_month, last_year"),
-    top_stylists_limit: int = Query(10, ge=1, le=50)
+    period: str = Query("all_time", description="Período: all_time, last_month, last_year")
 ):
     """
     Endpoint para dashboard administrativo com métricas de faturamento
@@ -475,16 +316,11 @@ def get_admin_dashboard(
             transfer_data["total_transferred_to_stylists"]
         )
         
-        # Obter detalhamento mensal dos últimos 12 meses
-        monthly_revenue = get_monthly_revenue_breakdown(12)
-        
-        # Obter top estilistas por faturamento
-        top_stylists = get_top_earning_stylists(top_stylists_limit, start_timestamp, end_timestamp)
+        # Obter dados de usuários
+        user_data = get_platform_users()
         
-        # Obter métricas gerais da plataforma
-        platform_metrics = get_platform_metrics()
-        
-        return {
+        # Preparar resposta
+        response = {
             "total_revenue": revenue_data["successful_revenue"],
             "failed_revenue": revenue_data["failed_revenue"],
             "total_transferred_to_stylists": transfer_data["total_transferred_to_stylists"],
@@ -495,11 +331,17 @@ def get_admin_dashboard(
             "transfer_count": transfer_data["transfer_count"],
             "currency": "BRL",
             "period": period,
-            "monthly_revenue": monthly_revenue,
-            "top_earning_stylists": top_stylists,
-            "platform_metrics": platform_metrics
+            "users": user_data
         }
         
+        # Adicionar dados específicos de mês apenas para período last_month
+        if period == "last_month":
+            target_date = now_ny - relativedelta(months=1)
+            monthly_data = get_monthly_revenue(target_date)
+            response["monthly_data"] = monthly_data
+        
+        return response
+        
     except HTTPException as he:
         raise he
         
@@ -510,8 +352,7 @@ def get_admin_dashboard(
 @router.post("/admin/dashboard/custom_period")
 def get_custom_period_dashboard(
     date_range: DateRangeRequest,
-    user_token: str = Header(None, alias="User-key"),
-    top_stylists_limit: int = Query(10, ge=1, le=50)
+    user_token: str = Header(None, alias="User-key")
 ):
     """
     Endpoint para dashboard administrativo com métricas de faturamento
@@ -545,8 +386,8 @@ def get_custom_period_dashboard(
             transfer_data["total_transferred_to_stylists"]
         )
         
-        # Obter top estilistas por faturamento
-        top_stylists = get_top_earning_stylists(top_stylists_limit, start_timestamp, end_timestamp)
+        # Obter dados de usuários
+        user_data = get_platform_users()
         
         return {
             "total_revenue": revenue_data["successful_revenue"],
@@ -562,7 +403,7 @@ def get_custom_period_dashboard(
                 "start_date": date_range.start_date,
                 "end_date": date_range.end_date
             },
-            "top_earning_stylists": top_stylists
+            "users": user_data
         }
         
     except HTTPException as he: