starting transition, need the other PR merged to do imports and test updates

Author: ajay-sentry

api/internal/owner/serializers.py

@@ -8,9 +8,9 @@
 from rest_framework.exceptions import PermissionDenied
 from shared.plan.constants import (
     PAID_PLANS,
-    SENTRY_PAID_USER_PLAN_REPRESENTATIONS,
     TEAM_PLAN_MAX_USERS,
     TEAM_PLAN_REPRESENTATIONS,
+    TierName,
 )
 from shared.plan.service import PlanService
 
@@ -131,11 +131,6 @@ def validate_value(self, value: str) -> str:
             plan["value"] for plan in plan_service.available_plans(current_owner)
         ]
         if value not in plan_values:
-            if value in SENTRY_PAID_USER_PLAN_REPRESENTATIONS:
-                log.warning(
-                    "Non-Sentry user attempted to transition to Sentry plan",
-                    extra=dict(owner_id=current_owner.pk, plan=value),
-                )
             raise serializers.ValidationError(
                 f"Invalid value for plan: {value}; must be one of {plan_values}"
             )
@@ -336,7 +331,9 @@ def update(self, instance: Owner, validated_data: Dict[str, Any]) -> object:
                 instance, desired_plan
             )
 
-            if desired_plan["value"] in SENTRY_PAID_USER_PLAN_REPRESENTATIONS:
+            sentry_plans = Plan.objects.filter(tier=TierName.Sentry.value)
+
+            if desired_plan["value"] in sentry_plans:
                 current_owner = self.context["view"].request.current_owner
                 send_sentry_webhook(current_owner, instance)
 

billing/helpers.py

@@ -1,13 +1,16 @@
 from django.conf import settings
 from django.db.models import QuerySet
-from shared.plan.constants import ENTERPRISE_CLOUD_USER_PLAN_REPRESENTATIONS
+from shared.plan.constants import TierName
 
 from codecov_auth.models import Owner
 
 
 def on_enterprise_plan(owner: Owner) -> bool:
     return settings.IS_ENTERPRISE or (
-        owner.plan in ENTERPRISE_CLOUD_USER_PLAN_REPRESENTATIONS.keys()
+        owner.plan
+        in Plan.objects.filter(tier=TierName.ENTERPRISE.value).values_list(
+            "name", flat=True
+        )
     )
 
 

codecov_auth/admin.py

@@ -19,7 +19,6 @@
     InvoiceBilling,
     StripeBilling,
 )
-from shared.plan.constants import USER_PLAN_REPRESENTATIONS
 from shared.plan.service import PlanService
 
 from codecov.admin import AdminMixin
@@ -607,7 +606,7 @@ class OwnerAdmin(AdminMixin, admin.ModelAdmin):
 
     def get_form(self, request, obj=None, change=False, **kwargs):
         form = super().get_form(request, obj, change, **kwargs)
-        PLANS_CHOICES = [(x, x) for x in USER_PLAN_REPRESENTATIONS.keys()]
+        PLANS_CHOICES = [(x, x) for x in Plan.objects.values_list("name", flat=True)]
         form.base_fields["plan"].widget = Select(
             choices=BLANK_CHOICE_DASH + PLANS_CHOICES
         )

upload/helpers.py

@@ -15,7 +15,6 @@
 from redis import Redis
 from rest_framework.exceptions import NotFound, Throttled, ValidationError
 from shared.github import InvalidInstallationError
-from shared.plan.constants import USER_PLAN_REPRESENTATIONS
 from shared.plan.service import PlanService
 from shared.reports.enums import UploadType
 from shared.torngit.base import TorngitBaseAdapter
@@ -637,7 +636,10 @@ def validate_upload(
         owner = _determine_responsible_owner(repository)
 
         # If author is on per repo billing, check their repo credits
-        if owner.plan not in USER_PLAN_REPRESENTATIONS and owner.repo_credits <= 0:
+        if (
+            owner.plan not in Plan.object.values_list("name", flat=True)
+            and owner.repo_credits <= 0
+        ):
             raise ValidationError(
                 "Sorry, but this team has no private repository credits left."
             )