update logic a bit to work with new plan, and types as well, start fixing tests

Author: ajay-sentry

shared/django_apps/codecov_auth/models.py

@@ -598,8 +598,9 @@ def pretty_plan(self):
         # by modifying the "plan", sidestepping
         # some iffy data modeling
 
-        plan_details.update({"quantity": self.plan_user_count})
-        return plan_details
+        if plan_details:
+            plan_details.update({"quantity": self.plan_user_count})
+            return plan_details
 
     def can_activate_user(self, owner_user: Self) -> bool:
         owner_org = self

shared/django_apps/codecov_auth/tests/factories.py

@@ -23,7 +23,7 @@
     UserToken,
 )
 from shared.encryption.oauth import get_encryptor_from_configuration
-from shared.plan.constants import TrialStatus
+from shared.plan.constants import PlanName, TierName, TrialStatus
 
 encryptor = get_encryptor_from_configuration()
 
@@ -177,20 +177,26 @@ class TierFactory(DjangoModelFactory):
     class Meta:
         model = Tier
 
-    tier_name = factory.Faker("name")
+    tier_name = TierName.BASIC.value
+    bundle_analysis = False
+    test_analytics = False
+    flaky_test_detection = False
+    project_coverage = False
+    private_repo_support = False
 
 
 class PlanFactory(DjangoModelFactory):
     class Meta:
         model = Plan
 
-    base_unit_price = factory.Faker("pyint")
-    benefits = []
+    tier = factory.SubFactory(TierFactory)
+    base_unit_price = 0
+    benefits = factory.LazyFunction(lambda: ["Benefit 1", "Benefit 2", "Benefit 3"])
     billing_rate = None
     is_active = True
-    marketing_name = factory.Faker("name")
-    max_seats = None
+    marketing_name = factory.Faker("catch_phrase")
+    max_seats = 1
     monthly_uploads_limit = None
-    paid_plan = True
-    name = factory.Faker("name")
-    tier = factory.SubFactory(TierFactory)
+    name = PlanName.BASIC_PLAN_NAME.value
+    paid_plan = False
+    stripe_id = None

shared/plan/constants.py

@@ -2,8 +2,6 @@
 from dataclasses import dataclass
 from typing import List, Optional
 
-from shared.django_apps.codecov_auth.models import Plan, Tier
-
 
 class MonthlyUploadLimits(enum.Enum):
     CODECOV_BASIC_PLAN = 250
@@ -90,7 +88,7 @@ class PlanData:
     billing_rate: Optional[PlanBillingRate]
     base_unit_price: PlanPrice
     benefits: List[str]
-    tier: Tier
+    tier_name: TierName
     monthly_uploads_limit: Optional[MonthlyUploadLimits]
     trial_days: Optional[TrialDaysAmount]
 
@@ -101,20 +99,19 @@ def convert_to_DTO(self) -> dict:
             "billing_rate": self.billing_rate,
             "base_unit_price": self.base_unit_price,
             "benefits": self.benefits,
-            "tier_name": self.tier.tier_name,
+            "tier_name": self.tier_name,
             "monthly_uploads_limit": self.monthly_uploads_limit,
             "trial_days": self.trial_days,
-            "is_free_plan": not self.paid_plan,
-            "is_pro_plan": self.tier.tier_name == TierName.PRO.value,
-            "is_team_plan": self.tier.tier_name == TierName.TEAM.value,
-            "is_enterprise_plan": self.tier.tier_name == TierName.ENTERPRISE.value,
-            "is_trial_plan": self.value
-            == PlanName.TRIAL_PLAN_NAME.value,  # This could also use the trial "Tier" if we want to make one for that...
-            "is_sentry_plan": self.tier.tier_name == TierName.SENTRY.value,
+            "is_free_plan": self.tier_name == TierName.BASIC.value,
+            "is_pro_plan": self.tier_name == TierName.PRO.value,
+            "is_team_plan": self.tier_name == TierName.TEAM.value,
+            "is_enterprise_plan": self.tier_name == TierName.ENTERPRISE.value,
+            "is_trial_plan": self.value == PlanName.TRIAL_PLAN_NAME.value,
+            "is_sentry_plan": self.value in SENTRY_PAID_USER_PLAN_REPRESENTATIONS,
         }
 
 
-def convert_to_DTO(plan: Plan) -> dict:
+def convert_to_DTO(plan) -> dict:
     return {
         "marketing_name": plan.marketing_name,
         "value": plan.name,

shared/plan/service.py

@@ -100,7 +100,7 @@ def plan_data(self, plan_data: Optional[Plan]) -> None:
     @property
     def plan_name(self) -> str:
         """Returns the name of the organization's current plan."""
-        return self.plan_data.value
+        return self.plan_data.name
 
     @property
     def plan_user_count(self) -> int:
@@ -325,7 +325,7 @@ def has_seats_left(self) -> bool:
 
     @property
     def is_enterprise_plan(self) -> bool:
-        return self.plan_data.tier_name == TierName.ENTERPRISE.value
+        return self.plan_data.tier.tier_name == TierName.ENTERPRISE.value
 
     @property
     def is_free_plan(self) -> bool:
@@ -334,21 +334,21 @@ def is_free_plan(self) -> bool:
     @property
     def is_pro_plan(self) -> bool:
         return (
-            self.plan_data.tier_name == TierName.PRO.value
-            or self.plan_data.tier_name == TierName.SENTRY.value
+            self.plan_data.tier.tier_name == TierName.PRO.value
+            or self.plan_data.tier.tier_name == TierName.SENTRY.value
         )
 
     @property
     def is_sentry_plan(self) -> bool:
-        return self.plan_data.tier_name == TierName.SENTRY.value
+        return self.plan_data.tier.tier_name == TierName.SENTRY.value
 
     @property
     def is_team_plan(self) -> bool:
-        return self.plan_data.tier_name == TierName.TEAM.value
+        return self.plan_data.tier.tier_name == TierName.TEAM.value
 
     @property
     def is_trial_plan(self) -> bool:
-        return self.plan_data.tier_name == TierName.TRIAL.value
+        return self.plan_data.tier.tier_name == TierName.TRIAL.value
 
     @property
     def is_pr_billing_plan(self) -> bool: