Update routes/subscription.py

routes/subscription.py

@@ -217,22 +217,27 @@ async def subscription_details(data: SubscriptionRequest):
             subscription_status = "active"
         elif status == "canceled" and subscription["current_period_end"] > datetime.utcnow().timestamp():
             subscription_status = "canceled"
+        elif status == "canceled" and subscription["current_period_end"] <= datetime.utcnow().timestamp():
+            subscription_status = "canceled"
         else:
             subscription_status = "terminated"
 
         # Pegando os detalhes do preço atual
         current_price = subscription["items"]["data"][0]["price"]["unit_amount"] / 100
         currency = subscription["items"]["data"][0]["price"]["currency"].upper()
-        
+
         # Data da próxima cobrança
-        next_billing_date = datetime.utcfromtimestamp(subscription["current_period_end"]).isoformat()
-        
-        # Preço da próxima cobrança
-        upcoming_invoice = await async_stripe_request(
-            stripe.Invoice.upcoming,
-            subscription=subscription_id
-        )
-        next_invoice_amount = upcoming_invoice["amount_due"] / 100 if upcoming_invoice else None
+        try:
+            upcoming_invoice = await async_stripe_request(
+                stripe.Invoice.upcoming,
+                subscription=subscription_id
+            )
+            next_invoice_amount = upcoming_invoice["amount_due"] / 100 if upcoming_invoice else None
+        except stripe.error.StripeError:
+            next_invoice_amount = None
+
+        if next_invoice_amount is None:
+            next_invoice_amount = "N/A"
 
         # Método de pagamento utilizado
         payment_method = subscription.get("default_payment_method")
@@ -277,8 +282,8 @@ async def subscription_details(data: SubscriptionRequest):
             "status": subscription_status,
             "subscription_id": subscription_id,
             "current_price": f"{current_price} {currency}",
-            "next_invoice_amount": f"{next_invoice_amount} {currency}" if next_invoice_amount else "N/A",
-            "next_billing_date": next_billing_date,
+            "next_invoice_amount": f"{next_invoice_amount} {currency}" if next_invoice_amount != "N/A" else "N/A",
+            "next_billing_date": datetime.utcfromtimestamp(subscription["current_period_end"]).isoformat(),
             "payment_method": payment_info,
             "stylist_id": stylist_id,
             "stylist_avatar": stylist_avatar,