Merge branch 'TASK-934-update-canceled-sub-handling' into TASK-934-update-canceled-sub-handling-frontend

Author: jamesrkiger

kobo/apps/organizations/utils.py

@@ -12,8 +12,8 @@ def get_monthly_billing_dates(organization: Union[Organization, None]):
 
     now = timezone.now().replace(tzinfo=pytz.UTC)
     first_of_this_month = now.replace(day=1)
-    # Using `days=31` gets the last day of the month
-    last_of_this_month = first_of_this_month + relativedelta(days=31)
+    # Using `day=31` gets the last day of the month
+    last_of_this_month = first_of_this_month + relativedelta(day=31)
 
     # If no organization, just use the calendar month
     if not organization:

kobo/apps/stripe/tests/test_organization_usage.py

@@ -172,8 +172,8 @@ def tearDown(self):
 
     def test_plan_canceled_this_month(self):
         """
-        When a user canceld their plan, they revert to the default community plan
-        and the start date should be 
+        When a user cancels their subscription, they revert to the default community plan
+        with a billing cycle anchored to the end date of their canceled subscription
         """
 
         subscription = generate_plan_subscription(self.organization, age_days=30)
@@ -198,11 +198,6 @@ def test_plan_canceled_this_month(self):
         assert response.data['current_month_end'] == current_billing_period_end.isoformat()
 
     def test_plan_canceled_last_month(self):
-        """
-        When a user cancels their plan, they revert to the default community plan
-        with a billing cycle anchored to the end of date of their canceled plan
-        """
-
         subscription = generate_plan_subscription(self.organization, age_days=60)
 
         num_submissions = 5