start BillingPlan deprecation

shared/billing/__init__.py

@@ -1,23 +1,28 @@
 from enum import Enum
 
 from django.conf import settings
+from typing_extensions import deprecated
 
 from shared.license import get_current_license
+from shared.plan.constants import PlanName
 
 
+@deprecated("Use PlanService")
 class BillingPlan(Enum):
-    users_ghm = "users"
-    users_monthly = "users-inappm"  # not pr_billing_plan
-    users_yearly = "users-inappy"  # not pr_billing_plan
-    users_free = "users-free"
-    users_basic = "users-basic"
-    users_trial = "users-trial"
-    pr_monthly = "users-pr-inappm"
-    pr_yearly = "users-pr-inappy"
-    enterprise_cloud_yearly = "users-enterprisey"
-    enterprise_cloud_monthly = "users-enterprisem"
-    team_monthly = "users-teamm"
-    team_yearly = "users-teamy"
+    users_basic = PlanName.BASIC_PLAN_NAME.value
+    users_trial = PlanName.TRIAL_PLAN_NAME.value
+    pr_monthly = PlanName.CODECOV_PRO_MONTHLY.value
+    pr_yearly = PlanName.CODECOV_PRO_YEARLY.value
+    SENTRY_MONTHLY = PlanName.SENTRY_MONTHLY.value
+    SENTRY_YEARLY = PlanName.SENTRY_YEARLY.value
+    team_monthly = PlanName.TEAM_MONTHLY.value
+    team_yearly = PlanName.TEAM_YEARLY.value
+    users_ghm = PlanName.GHM_PLAN_NAME.value
+    users_free = PlanName.FREE_PLAN_NAME.value
+    users_monthly = PlanName.CODECOV_PRO_MONTHLY_LEGACY.value
+    users_yearly = PlanName.CODECOV_PRO_YEARLY_LEGACY.value
+    enterprise_cloud_monthly = PlanName.ENTERPRISE_CLOUD_MONTHLY.value
+    enterprise_cloud_yearly = PlanName.ENTERPRISE_CLOUD_YEARLY.value
 
     def __init__(self, db_name):
         self.db_name = db_name
@@ -29,27 +34,20 @@ def from_str(cls, plan_name: str):
                 return plan
 
 
+@deprecated("use is_enterprise_plan() in PlanService")
 def is_enterprise_cloud_plan(plan: BillingPlan) -> bool:
     return plan in [
         BillingPlan.enterprise_cloud_monthly,
         BillingPlan.enterprise_cloud_yearly,
     ]
 
 
+@deprecated("use is_pr_billing_plan() in PlanService")
 def is_pr_billing_plan(plan: str) -> bool:
-    # use is_pr_billing_plan() in PlanService instead of accessing this directly
     if not settings.IS_ENTERPRISE:
-        return plan in [
-            BillingPlan.pr_monthly.value,
-            BillingPlan.pr_yearly.value,
-            BillingPlan.users_free.value,
-            BillingPlan.users_basic.value,
-            BillingPlan.users_trial.value,
-            BillingPlan.enterprise_cloud_monthly.value,
-            BillingPlan.enterprise_cloud_yearly.value,
-            BillingPlan.team_monthly.value,
-            BillingPlan.team_yearly.value,
-            BillingPlan.users_ghm.value,
+        return plan not in [
+            PlanName.CODECOV_PRO_MONTHLY_LEGACY.value,
+            PlanName.CODECOV_PRO_YEARLY_LEGACY.value,
         ]
     else:
         return get_current_license().is_pr_billing

shared/django_apps/codecov_auth/models.py

@@ -1,12 +1,12 @@
-import binascii
 import logging
 import os
 import uuid
 from dataclasses import asdict
 from datetime import datetime
 from hashlib import md5
-from typing import Self
+from typing import Self, Optional
 
+import binascii
 from django.contrib.postgres.fields import ArrayField, CITextField
 from django.contrib.sessions.models import Session as DjangoSession
 from django.db import models
@@ -425,7 +425,7 @@ def repo_total_credits(self):
             return int(self.plan[:-1])
 
     @property
-    def root_organization(self):
+    def root_organization(self: "Owner") -> Optional["Owner"]:
         """
         Find the root organization of Gitlab, by using the root_parent_service_id
         if it exists, otherwise iterating through the parents and caches it in root_parent_service_id

shared/plan/constants.py

@@ -29,8 +29,8 @@ class PlanName(enum.Enum):
     TRIAL_PLAN_NAME = "users-trial"
     CODECOV_PRO_MONTHLY = "users-pr-inappm"
     CODECOV_PRO_YEARLY = "users-pr-inappy"
-    SENTRY_MONTHLY = "users-sentrym"  # not in BillingPlan
-    SENTRY_YEARLY = "users-sentryy"  # not in BillingPlan
+    SENTRY_MONTHLY = "users-sentrym"
+    SENTRY_YEARLY = "users-sentryy"
     TEAM_MONTHLY = "users-teamm"
     TEAM_YEARLY = "users-teamy"
     GHM_PLAN_NAME = "users"

tests/unit/plan/test_plan.py

@@ -896,7 +896,7 @@ def test_is_sentry_plan(self):
         assert self.plan_service.is_free_plan == False
         assert self.plan_service.is_pro_plan == True
         assert self.plan_service.is_enterprise_plan == False
-        assert self.plan_service.is_pr_billing_plan == False
+        assert self.plan_service.is_pr_billing_plan == True
 
     def test_is_free_plan(self):
         self.current_org = OwnerFactory(