Allow organizations to delete if in odd Stripe state (#20651)

* allow cancelling if not in bad state list

* test new org bill cancel checks

Author: JacobCoffee

tests/unit/manage/views/test_organizations.py

@@ -1218,24 +1218,41 @@ def test_delete_organization_with_active_projects(
         assert organization_service.delete_organization.calls == []
         assert db_request.route_path.calls == []
 
+    @pytest.mark.parametrize(
+        ("subscription_status", "should_cancel"),
+        [
+            ("active", True),
+            ("past_due", True),
+            ("canceled", False),
+            ("incomplete_expired", False),
+        ],
+    )
     def test_delete_organization_with_subscriptions(
         self,
         db_request,
         pyramid_user,
+        billing_service,
         organization_service,
         user_service,
         monkeypatch,
+        subscription_status,
+        should_cancel,
     ):
         organization = OrganizationFactory.create()
         stripe_customer = StripeCustomerFactory.create()
         OrganizationStripeCustomerFactory.create(
             organization=organization, customer=stripe_customer
         )
-        subscription = StripeSubscriptionFactory.create(customer=stripe_customer)
+        subscription = StripeSubscriptionFactory.create(
+            customer=stripe_customer, status=subscription_status
+        )
         OrganizationStripeSubscriptionFactory.create(
             organization=organization, subscription=subscription
         )
 
+        cancel_subscription = pretend.call_recorder(lambda *a, **kw: None)
+        monkeypatch.setattr(billing_service, "cancel_subscription", cancel_subscription)
+
         db_request.POST = {"confirm_organization_name": organization.name}
         db_request.route_path = pretend.call_recorder(
             lambda *a, **kw: "/manage/organizations/"
@@ -1265,6 +1282,9 @@ def test_delete_organization_with_subscriptions(
 
         assert isinstance(result, HTTPSeeOther)
         assert result.headers["Location"] == "/manage/organizations/"
+        assert cancel_subscription.calls == (
+            [pretend.call(subscription.subscription_id)] if should_cancel else []
+        )
         assert organization_service.delete_organization.calls == [
             pretend.call(organization.id)
         ]

warehouse/locale/messages.pot

@@ -86,6 +86,7 @@
 from warehouse.packaging.models import JournalEntry, ProjectFactory
 from warehouse.rate_limiting.interfaces import RateLimiterException
 from warehouse.subscriptions import IBillingService, ISubscriptionService
+from warehouse.subscriptions.models import StripeSubscriptionStatus
 from warehouse.subscriptions.services import MockStripeBillingService
 from warehouse.utils.http import is_safe_url
 from warehouse.utils.organization import confirm_organization
@@ -513,9 +514,12 @@ def delete_organization(self):
         # Get owners before deleting organization.
         owner_users = set(organization_owners(self.request, self.organization))
 
-        # Cancel any subscriptions tied to this organization.
-        if self.organization.subscriptions:
-            for subscription in self.organization.subscriptions:
+        # Cancel subscriptions that are not already in a terminal state.
+        for subscription in self.organization.subscriptions:
+            if subscription.status not in (
+                StripeSubscriptionStatus.Canceled.value,
+                StripeSubscriptionStatus.IncompleteExpired.value,
+            ):
                 self.billing_service.cancel_subscription(subscription.subscription_id)
 
         self.organization_service.delete_organization(self.organization.id)