fix a couple instances... still need to fix availablePlans

codecov · Jan 20, 2025 · 5050704 · 5050704
1 parent 1f2e63b
commit 5050704
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/api/internal/owner/serializers.py b/api/internal/owner/serializers.py
@@ -337,7 +337,9 @@ def update(self, instance: Owner, validated_data: Dict[str, Any]) -> object:
                 instance, desired_plan
             )
 
-            sentry_plans = Plan.objects.filter(tier=TierName.Sentry.value)
+            sentry_plans = Plan.objects.filter(
+                tier=TierName.SENTRY.value, is_active=True
+            )
 
             if desired_plan["value"] in sentry_plans:
                 current_owner = self.context["view"].request.current_owner

diff --git a/codecov_auth/admin.py b/codecov_auth/admin.py
@@ -608,7 +608,10 @@ 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 Plan.objects.values_list("name", flat=True)]
+        PLANS_CHOICES = [
+            (x, x)
+            for x in Plan.objects.filter(is_active=True).values_list("name", flat=True)
+        ]
         form.base_fields["plan"].widget = Select(
             choices=BLANK_CHOICE_DASH + PLANS_CHOICES
         )