revert trial status changes, update other instances of plan stuff

Author: ajay-sentry

api/internal/owner/serializers.py

@@ -9,7 +9,6 @@
 from shared.plan.constants import (
     PAID_PLANS,
     TEAM_PLAN_MAX_USERS,
-    TEAM_PLAN_REPRESENTATIONS,
     TierName,
 )
 from shared.plan.service import PlanService
@@ -173,7 +172,8 @@ def validate(self, plan: Dict[str, Any]) -> Dict[str, Any]:
                     "Quantity or plan for paid plan must be different from the existing one"
                 )
             if (
-                plan["value"] in TEAM_PLAN_REPRESENTATIONS
+                plan["value"]
+                in Plan.objects.filter(tier=TierName.TEAM.value, is_active=True)
                 and plan["quantity"] > TEAM_PLAN_MAX_USERS
             ):
                 raise serializers.ValidationError(

codecov_auth/management/commands/set_trial_status_values.py

@@ -2,11 +2,13 @@
 from typing import Any
 
 from django.core.management.base import BaseCommand, CommandParser
-from django.db.models import Q, Subquery
+from django.db.models import Q
 from shared.plan.constants import (
     FREE_PLAN_REPRESENTATIONS,
     PLANS_THAT_CAN_TRIAL,
-    TierName,
+    PR_AUTHOR_PAID_USER_PLAN_REPRESENTATIONS,
+    SENTRY_PAID_USER_PLAN_REPRESENTATIONS,
+    PlanName,
     TrialStatus,
 )
 
@@ -30,12 +32,10 @@ def handle(self, *args: Any, **options: Any) -> None:
                 stripe_customer_id=None,
             ).update(trial_status=TrialStatus.NOT_STARTED.value)
 
-        sentry_plans = Plan.objects.filter(tier=TierName.SENTRY.value)
-        pro_plans = Plan.objects.filter(tier=TierName.PRO.value, paid_plan=True)
         # ONGOING
         if trial_status_type == "all" or trial_status_type == "ongoing":
             Owner.objects.filter(
-                plan__in=Subquery(sentry_plans.values_list("name", flat=True)),
+                plan__in=SENTRY_PAID_USER_PLAN_REPRESENTATIONS,
                 trial_end_date__gt=datetime.now(),
             ).update(trial_status=TrialStatus.ONGOING.value)
 
@@ -44,22 +44,22 @@ def handle(self, *args: Any, **options: Any) -> None:
             Owner.objects.filter(
                 # Currently paying sentry customer with trial_end_date
                 Q(
-                    plan__in=Subquery(sentry_plans.values_list("name", flat=True)),
+                    plan__in=SENTRY_PAID_USER_PLAN_REPRESENTATIONS,
                     stripe_customer_id__isnull=False,
                     stripe_subscription_id__isnull=False,
                     trial_end_date__lte=datetime.now(),
                 )
                 # Currently paying sentry customer without trial_end_date
                 | Q(
-                    plan__in=Subquery(sentry_plans.values_list("name", flat=True)),
+                    plan__in=SENTRY_PAID_USER_PLAN_REPRESENTATIONS,
                     stripe_customer_id__isnull=False,
                     stripe_subscription_id__isnull=False,
                     trial_start_date__isnull=True,
                     trial_end_date__isnull=True,
                 )
                 # Previously paid but now back to basic with trial start/end dates
                 | Q(
-                    plan="users-basic",
+                    plan=PlanName.BASIC_PLAN_NAME.value,
                     stripe_customer_id__isnull=False,
                     trial_start_date__isnull=False,
                     trial_end_date__isnull=False,
@@ -73,20 +73,20 @@ def handle(self, *args: Any, **options: Any) -> None:
                 ~Q(plan__in=PLANS_THAT_CAN_TRIAL)
                 # Previously paid but now back to basic without trial start/end dates
                 | Q(
-                    plan="users-basic",
+                    plan=PlanName.BASIC_PLAN_NAME.value,
                     stripe_customer_id__isnull=False,
                     trial_start_date__isnull=True,
                     trial_end_date__isnull=True,
                 )
                 # Currently paying customer that isn't a sentry plan (they would be expired)
                 | Q(
-                    ~Q(plan__in=Subquery(sentry_plans.values_list("name", flat=True))),
+                    ~Q(plan__in=SENTRY_PAID_USER_PLAN_REPRESENTATIONS),
                     stripe_subscription_id__isnull=False,
                     stripe_customer_id__isnull=False,
                 )
                 # Invoiced customers without stripe info
                 | Q(
-                    Q(plan__in=Subquery(pro_plans.values_list("name", flat=True))),
+                    Q(plan__in=PR_AUTHOR_PAID_USER_PLAN_REPRESENTATIONS),
                     stripe_subscription_id__isnull=True,
                     stripe_customer_id__isnull=True,
                 )

graphql_api/types/owner/owner.py

@@ -8,7 +8,7 @@
 from ariadne import ObjectType
 from django.conf import settings
 from graphql import GraphQLResolveInfo
-from shared.plan.constants import FREE_PLAN_REPRESENTATIONS, PlanData, PlanName
+from shared.plan.constants import PlanData, PlanName
 from shared.plan.service import PlanService
 
 import services.activation as activation
@@ -112,7 +112,7 @@ def resolve_plan(owner: Owner, info: GraphQLResolveInfo) -> PlanService:
 @require_part_of_org
 def resolve_plan_representation(owner: Owner, info: GraphQLResolveInfo) -> PlanData:
     info.context["plan_service"] = PlanService(current_org=owner)
-    free_plan = FREE_PLAN_REPRESENTATIONS[PlanName.BASIC_PLAN_NAME.value]
+    free_plan = Plan.objects.get(name=PlanName.BASIC_PLAN_NAME.value)
     return free_plan.convert_to_DTO()
 
 

services/billing.py

@@ -7,7 +7,6 @@
 from dateutil.relativedelta import relativedelta
 from django.conf import settings
 from shared.plan.constants import (
-    FREE_PLAN_REPRESENTATIONS,
     PAID_PLANS,
     TEAM_PLANS,
     PlanBillingRate,
@@ -736,7 +735,9 @@ 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 FREE_PLAN_REPRESENTATIONS:
+        if desired_plan["value"] in Plan.objects.filter(paid_plan=False).values_list(
+            "name", flat=True
+        ):
             if owner.stripe_subscription_id is not None:
                 self.payment_service.delete_subscription(owner)
             else: