Fixes

Author: stsewd

readthedocs/organizations/querysets.py

@@ -51,14 +51,11 @@ def subscription_trial_plan_ended(self):
             stripe_subscription__items__price__id=settings.RTD_ORG_DEFAULT_STRIPE_SUBSCRIPTION_PRICE,
         )
 
-    def disable_soon(self, days, exact=False):
+    def subscription_ended(self, days, exact=False):
         """
-        Filter organizations that will eventually be marked as disabled.
+        Filter organizations which their subscription has ended.
 
-        This will return organizations that the paid/trial subscription has
-        ended ``days`` ago.
-
-        Organizations to be disabled are which their subscription has been canceled,
+        This will return organizations which their subscription has been canceled,
         or hasn't been paid for ``days``.
 
         :param days: Days after the subscription has ended
@@ -102,16 +99,27 @@ def disable_soon(self, days, exact=False):
                 )
             )
 
-        orgs = (
-            subscription_ended
+        return subscription_ended.distinct()
+
+    def disable_soon(self, days, exact=False):
+        """
+        Filter organizations that will eventually be marked as disabled.
+
+        These are organizations which their subscription has ended,
+        excluding organizations that can't be disabled, or are already disabled.
+
+        :param days: Days after the subscription has ended
+        :param exact: Make the ``days`` date to match exactly that day after the
+            subscription has ended (useful to send emails only once)
+        """
+        return (
+            self.subscription_ended(days=days, exact=exact)
             # Exclude organizations that can't be disabled.
             .exclude(never_disable=True)
             # Exclude organizations that are already disabled
             .exclude(disabled=True)
         )
 
-        return orgs.distinct()
-
     def clean_artifacts(self):
         """
         Filter organizations which their artifacts can be cleaned up.
@@ -120,13 +128,11 @@ def clean_artifacts(self):
         are disabled and their artifacts weren't cleaned already. We should be
         safe to cleanup all their artifacts at this point.
         """
-        end_date = timezone.now().date() - timedelta(days=3 * DISABLE_AFTER_DAYS)
-        orgs = self.filter(
+        return self.subscription_ended(days=3 * DISABLE_AFTER_DAYS, exact=True).filter(
             disabled=True,
-            subscription__end_date__lt=end_date,
             artifacts_cleaned=False,
         )
-        return orgs.distinct()
+
 
     def single_owner(self, user):
         """Returns organizations where `user` is the only owner."""

readthedocs/organizations/signals.py

@@ -1,5 +1,6 @@
 """Organization signals."""
 
+from djstripe.enums import SubscriptionStatus
 import structlog
 from allauth.account.signals import user_signed_up
 from django.db.models import Count
@@ -10,7 +11,7 @@
 from readthedocs.builds.models import Build
 from readthedocs.builds.signals import build_complete
 from readthedocs.organizations.models import Organization, Team, TeamMember
-from readthedocs.payments.utils import delete_customer
+from readthedocs.payments.utils import cancel_subscription
 from readthedocs.projects.models import Project
 
 from .tasks import (
@@ -52,11 +53,12 @@ def remove_organization_completely(sender, instance, using, **kwargs):
     stripe_customer = organization.stripe_customer
     if stripe_customer:
         log.info(
-            "Removing Stripe customer",
+            "Canceling subscriptions",
             organization_slug=organization.slug,
             stripe_customer_id=stripe_customer.id,
         )
-        delete_customer(stripe_customer.id)
+        for subscription in stripe_customer.subscriptions.exclude(status=SubscriptionStatus.canceled):
+            cancel_subscription(subscription.id)
 
     log.info("Removing organization completely", organization_slug=organization.slug)