handle plan upgrade flow

Author: suejung-sentry

billing/views.py

@@ -296,6 +296,12 @@ def customer_created(self, customer: stripe.Customer) -> None:
 
     # handler for Stripe event customer.subscription.created
     def customer_subscription_created(self, subscription: stripe.Subscription) -> None:
+        log.info(
+            "Customer subscription created",
+            extra=dict(
+                customer_id=subscription["customer"], subscription_id=subscription["id"]
+            ),
+        )
         sub_item_plan_id = subscription.plan.id
 
         if not sub_item_plan_id:
@@ -332,11 +338,31 @@ def customer_subscription_created(self, subscription: stripe.Subscription) -> No
                 quantity=subscription.quantity,
             ),
         )
+        # add the subscription_id and customer_id to the owner
         owner = Owner.objects.get(ownerid=subscription.metadata.get("obo_organization"))
         owner.stripe_subscription_id = subscription.id
         owner.stripe_customer_id = subscription.customer
         owner.save()
 
+        # check if the subscription has a pending_update attribute, if so, don't upgrade the plan yet
+        print("subscription what are you", subscription)
+        # Check if subscription has a default payment method
+        has_default_payment = subscription.default_payment_method is not None
+
+        # If no default payment, check for any pending verification methods
+        if not has_default_payment:
+            payment_methods = get_unverified_payment_methods(subscription.customer)
+            if payment_methods:
+                log.info(
+                    "Subscription has pending payment verification",
+                    extra=dict(
+                        subscription_id=subscription.id,
+                        customer_id=subscription.customer,
+                        payment_methods=payment_methods,
+                    ),
+                )
+                return
+
         plan_service = PlanService(current_org=owner)
         plan_service.expire_trial_when_upgrading()
 
@@ -356,6 +382,13 @@ def customer_subscription_created(self, subscription: stripe.Subscription) -> No
 
     # handler for Stripe event customer.subscription.updated
     def customer_subscription_updated(self, subscription: stripe.Subscription) -> None:
+        log.info(
+            "Customer subscription updated",
+            extra=dict(
+                customer_id=subscription["customer"], subscription_id=subscription["id"]
+            ),
+        )
+
         owners: QuerySet[Owner] = Owner.objects.filter(
             stripe_subscription_id=subscription.id,
             stripe_customer_id=subscription.customer,
@@ -371,6 +404,25 @@ def customer_subscription_updated(self, subscription: stripe.Subscription) -> No
             )
             return
 
+        # check if the subscription has a pending_update attribute, if so, don't upgrade the plan yet
+        print("subscription what are you", subscription)
+        # Check if subscription has a default payment method
+        has_default_payment = subscription.default_payment_method is not None
+
+        # If no default payment, check for any pending verification methods
+        if not has_default_payment:
+            payment_methods = get_unverified_payment_methods(subscription.customer)
+            if payment_methods:
+                log.info(
+                    "Subscription has pending payment verification",
+                    extra=dict(
+                        subscription_id=subscription.id,
+                        customer_id=subscription.customer,
+                        payment_methods=payment_methods,
+                    ),
+                )
+                return
+
         indication_of_payment_failure = getattr(subscription, "pending_update", None)
         if indication_of_payment_failure:
             # payment failed, raise this to user by setting as delinquent

services/billing.py

@@ -887,6 +887,51 @@ def update_plan(self, owner, desired_plan):
                 plan_service.set_default_plan_data()
         elif desired_plan["value"] in PAID_PLANS:
             if owner.stripe_subscription_id is not None:
+                # If there's already a pending subscription, return its checkout session
+                subscription = self.payment_service.get_subscription(owner)
+                if subscription and subscription.status == "incomplete":
+                    # Get the latest invoice and payment intent for this subscription
+                    latest_invoice = subscription.latest_invoice
+                    if latest_invoice and latest_invoice.payment_intent:
+                        payment_intent = stripe.PaymentIntent.retrieve(
+                            latest_invoice.payment_intent
+                        )
+                        # Check if payment intent requires verification
+                        if payment_intent.status == "requires_action":
+                            log.info(
+                                "Subscription has pending payment verification",
+                                extra=dict(
+                                    subscription_id=subscription.id,
+                                    payment_intent_id=payment_intent.id,
+                                    payment_intent_status=payment_intent.status,
+                                ),
+                            )
+
+                            # Delete the existing subscription and payment intent
+                            try:
+                                stripe.PaymentIntent.cancel(payment_intent.id)
+                                stripe.Subscription.delete(subscription.id)
+                                log.info(
+                                    "Deleted incomplete subscription and payment intent",
+                                    extra=dict(
+                                        subscription_id=subscription.id,
+                                        payment_intent_id=payment_intent.id,
+                                    ),
+                                )
+                            except Exception as e:
+                                log.error(
+                                    "Failed to delete subscription and payment intent",
+                                    extra=dict(
+                                        subscription_id=subscription.id,
+                                        payment_intent_id=payment_intent.id,
+                                        error=str(e),
+                                    ),
+                                )
+
+                            return self.payment_service.create_checkout_session(
+                                owner, desired_plan
+                            )
+
                 self.payment_service.modify_subscription(owner, desired_plan)
             else:
                 return self.payment_service.create_checkout_session(owner, desired_plan)