clean up the logic for update plan

Author: ajay-sentry

api/internal/tests/views/test_account_viewset.py

@@ -126,7 +126,7 @@ def setUp(self):
                     "description": "(10) users-pr-inappm",
                     "amount": 120,
                     "currency": "usd",
-                    "plan_name": "users-pr-inappm",
+                    "plan_name": PlanName.CODECOV_PRO_MONTHLY.value,
                     "quantity": 1,
                     "period": {"end": 1521326190, "start": 1518906990},
                 }
@@ -235,7 +235,6 @@ def test_retrieve_account_gets_account_fields_when_there_are_scheduled_details(
             kwargs={"service": owner.service, "owner_username": owner.username}
         )
         assert response.status_code == status.HTTP_200_OK
-        print(response.data)
         assert response.data == {
             "integration_id": owner.integration_id,
             "activated_student_count": 0,
@@ -250,7 +249,7 @@ def test_retrieve_account_gets_account_fields_when_there_are_scheduled_details(
             "plan_provider": owner.plan_provider,
             "plan": {
                 "marketing_name": "Developer",
-                "value": "users-basic",
+                "value": PlanName.BASIC_PLAN_NAME.value,
                 "billing_rate": None,
                 "base_unit_price": 0,
                 "benefits": [
@@ -489,13 +488,13 @@ def test_retrieve_account_gets_account_students(self):
         }
 
     def test_account_with_free_user_plan(self):
-        self.current_owner.plan = "users-free"
+        self.current_owner.plan = PlanName.BASIC_PLAN_NAME.value
         self.current_owner.save()
         response = self._retrieve()
         assert response.status_code == status.HTTP_200_OK
         assert response.data["plan"] == {
             "marketing_name": "Developer",
-            "value": "users-free",
+            "value": PlanName.BASIC_PLAN_NAME.value,
             "billing_rate": None,
             "base_unit_price": 0,
             "benefits": [
@@ -507,13 +506,13 @@ def test_account_with_free_user_plan(self):
         }
 
     def test_account_with_paid_user_plan_billed_monthly(self):
-        self.current_owner.plan = "users-pr-inappm"
+        self.current_owner.plan = PlanName.CODECOV_PRO_MONTHLY.value
         self.current_owner.save()
         response = self._retrieve()
         assert response.status_code == status.HTTP_200_OK
         assert response.data["plan"] == {
             "marketing_name": "Pro",
-            "value": "users-pr-inappm",
+            "value": PlanName.CODECOV_PRO_MONTHLY.value,
             "billing_rate": "monthly",
             "base_unit_price": 12,
             "benefits": [
@@ -1581,7 +1580,7 @@ def test_update_apply_cancellation_discount(
     ):
         coupon_create_mock.return_value = MagicMock(id="test-coupon-id")
 
-        self.current_owner.plan = "users-pr-inappm"
+        self.current_owner.plan = PlanName.CODECOV_PRO_MONTHLY.value
         self.current_owner.stripe_customer_id = "flsoe"
         self.current_owner.stripe_subscription_id = "djfos"
         self.current_owner.save()

services/billing.py

@@ -795,26 +795,32 @@ def update_plan(self, owner, desired_plan):
         on current state, might create a stripe checkout session and return
         the checkout session's ID, which is a string. Otherwise returns None.
         """
-        if desired_plan["value"] in Plan.objects.filter(paid_plan=False).values_list(
-            "name", flat=True
-        ):
+        try:
+            plan = Plan.objects.get(name=desired_plan["value"])
+        except Plan.DoesNotExist:
+            log.warning(
+                f"Unable to find plan {desired_plan['value']} for owner {owner.ownerid}"
+            )
+            return None
+
+        if not plan.is_active:
+            log.warning(
+                f"Attempted to transition to non-existent or legacy plan: "
+                f"owner {owner.ownerid}, plan: {desired_plan}"
+            )
+            return None
+
+        if plan.paid_plan is False:
             if owner.stripe_subscription_id is not None:
                 self.payment_service.delete_subscription(owner)
             else:
                 plan_service = PlanService(current_org=owner)
                 plan_service.set_default_plan_data()
-        elif desired_plan["value"] in Plan.objects.filter(
-            paid_plan=True, is_active=True
-        ).values_list("name", flat=True):
+        else:
             if owner.stripe_subscription_id is not None:
                 self.payment_service.modify_subscription(owner, desired_plan)
             else:
                 return self.payment_service.create_checkout_session(owner, desired_plan)
-        else:
-            log.warning(
-                f"Attempted to transition to non-existent or legacy plan: "
-                f"owner {owner.ownerid}, plan: {desired_plan}"
-            )
 
     def update_payment_method(self, owner, payment_method):
         """