feat: Modify billing for Team plan (#637)

api/internal/owner/serializers.py

@@ -8,7 +8,12 @@
 
 from billing.helpers import available_plans
 from codecov_auth.models import Owner
-from plan.constants import PRO_PLANS, SENTRY_PAID_USER_PLAN_REPRESENTATIONS
+from plan.constants import (
+    PAID_PLANS,
+    SENTRY_PAID_USER_PLAN_REPRESENTATIONS,
+    TEAM_PLAN_MAX_USERS,
+    TEAM_PLAN_REPRESENTATIONS,
+)
 from plan.service import PlanService
 from services.billing import BillingService
 from services.sentry import send_user_webhook as send_sentry_webhook
@@ -134,7 +139,7 @@
         owner = self.context["view"].owner
 
         # Validate quantity here because we need access to whole plan object
-        if plan["value"] in PRO_PLANS:
+        if plan["value"] in PAID_PLANS:
             if "quantity" not in plan:
                 raise serializers.ValidationError(
                     f"Field 'quantity' required for updating to paid plans"
@@ -159,6 +164,13 @@
                 raise serializers.ValidationError(
                     f"Quantity or plan for paid plan must be different from the existing one"
                 )
+            if (
+                plan["value"] in TEAM_PLAN_REPRESENTATIONS
+                and plan["quantity"] > TEAM_PLAN_MAX_USERS
+            ):
+                raise serializers.ValidationError(
+                    f"Quantity for Team plan cannot exceed {TEAM_PLAN_MAX_USERS}"
+                )
         return plan
 
 
@@ -185,7 +197,7 @@
         plan_name = list(stripe_plan_dict.keys())[
             list(stripe_plan_dict.values()).index(plan_id)
         ]
-        marketing_plan_name = PRO_PLANS[plan_name].billing_rate
+        marketing_plan_name = PAID_PLANS[plan_name].billing_rate
         return marketing_plan_name
 
     def get_quantity(self, phase):

api/internal/tests/views/test_account_viewset.py

@@ -1109,7 +1109,7 @@ def test_update_sentry_plan_non_sentry_user(
         assert res.json() == {
             "plan": {
                 "value": [
-                    "Invalid value for plan: users-sentrym; must be one of ['users-free', 'users-basic', 'users-pr-inappm', 'users-pr-inappy']"
+                    "Invalid value for plan: users-sentrym; must be one of ['users-free', 'users-basic', 'users-pr-inappm', 'users-pr-inappy', 'users-teamm', 'users-teamy']"
                 ]
             }
         }

api/internal/tests/views/test_plans_viewset.py

@@ -77,6 +77,36 @@ def test_list_plans_returns_200_and_plans(self):
                 "monthly_uploads_limit": None,
                 "trial_days": None,
             },
+            {
+                "marketing_name": "Team",
+                "value": "users-teamm",
+                "billing_rate": "monthly",
+                "base_unit_price": 6,
+                "benefits": [
+                    "Up to 10 users",
+                    "Unlimited repositories",
+                    "2500 repositories",
+                    "Patch coverage analysis",
+                ],
+                "tier_name": "team",
+                "monthly_uploads_limit": 2500,
+                "trial_days": None,
+            },
+            {
+                "marketing_name": "Team",
+                "value": "users-teamy",
+                "billing_rate": "annually",
+                "base_unit_price": 5,
+                "benefits": [
+                    "Up to 10 users",
+                    "Unlimited repositories",
+                    "2500 repositories",
+                    "Patch coverage analysis",
+                ],
+                "tier_name": "team",
+                "monthly_uploads_limit": 2500,
+                "trial_days": None,
+            },
         ]
 
     @patch("services.sentry.is_sentry_user")
@@ -144,6 +174,36 @@ def test_list_plans_sentry_user(self, is_sentry_user):
                 "monthly_uploads_limit": None,
                 "trial_days": None,
             },
+            {
+                "marketing_name": "Team",
+                "value": "users-teamm",
+                "billing_rate": "monthly",
+                "base_unit_price": 6,
+                "benefits": [
+                    "Up to 10 users",
+                    "Unlimited repositories",
+                    "2500 repositories",
+                    "Patch coverage analysis",
+                ],
+                "tier_name": "team",
+                "monthly_uploads_limit": 2500,
+                "trial_days": None,
+            },
+            {
+                "marketing_name": "Team",
+                "value": "users-teamy",
+                "billing_rate": "annually",
+                "base_unit_price": 5,
+                "benefits": [
+                    "Up to 10 users",
+                    "Unlimited repositories",
+                    "2500 repositories",
+                    "Patch coverage analysis",
+                ],
+                "tier_name": "team",
+                "monthly_uploads_limit": 2500,
+                "trial_days": None,
+            },
             {
                 "marketing_name": "Pro Team for Sentry",
                 "value": "users-sentrym",
@@ -243,4 +303,34 @@ def test_list_plans_anonymous_user(self):
                 "monthly_uploads_limit": None,
                 "trial_days": None,
             },
+            {
+                "marketing_name": "Team",
+                "value": "users-teamm",
+                "billing_rate": "monthly",
+                "base_unit_price": 6,
+                "benefits": [
+                    "Up to 10 users",
+                    "Unlimited repositories",
+                    "2500 repositories",
+                    "Patch coverage analysis",
+                ],
+                "tier_name": "team",
+                "monthly_uploads_limit": 2500,
+                "trial_days": None,
+            },
+            {
+                "marketing_name": "Team",
+                "value": "users-teamy",
+                "billing_rate": "annually",
+                "base_unit_price": 5,
+                "benefits": [
+                    "Up to 10 users",
+                    "Unlimited repositories",
+                    "2500 repositories",
+                    "Patch coverage analysis",
+                ],
+                "tier_name": "team",
+                "monthly_uploads_limit": 2500,
+                "trial_days": None,
+            },
         ]

billing/helpers.py

@@ -32,6 +32,7 @@ def available_plans(owner: Optional[Owner]) -> List[dict]:
     plans: List[PlanData] = []
     plans += list(FREE_PLAN_REPRESENTATIONS.values())
     plans += list(PR_AUTHOR_PAID_USER_PLAN_REPRESENTATIONS.values())
+    plans += list(TEAM_PLAN_REPRESENTATIONS.values())
 
     if owner and sentry.is_sentry_user(owner):
         # these are only available to Sentry users

billing/views.py

@@ -8,7 +8,7 @@
 from rest_framework.views import APIView
 
 from codecov_auth.models import Owner
-from plan.constants import PRO_PLANS
+from plan.constants import PAID_PLANS
 from plan.service import PlanService
 from services.billing import BillingService
 
@@ -147,7 +147,7 @@ def customer_subscription_created(self, subscription):
             )
             return
 
-        if subscription.plan.name not in PRO_PLANS:
+        if subscription.plan.name not in PAID_PLANS:
             log.warning(
                 f"Subscription creation requested for invalid plan "
                 f"'{subscription.plan.name}' -- doing nothing",
@@ -210,8 +210,8 @@ def customer_subscription_updated(self, subscription):
                 # from the owner
                 owner.repository_set.update(active=False, activated=False)
                 return
-            # TODO: we can delete this if statement if we confirm there aren't any PRO_PLANS out there
-            if subscription.plan.name not in PRO_PLANS:
+            # TODO: we can delete this if statement if we confirm there aren't any PAID_PLANS out there
+            if subscription.plan.name not in PAID_PLANS:
                 log.warning(
                     f"Subscription update requested with invalid plan "
                     f"{subscription.plan.name} -- doing nothing",

codecov/settings_dev.py

@@ -18,6 +18,8 @@
     "users-pr-inappy": "plan_H6P16wij3lUuxg",
     "users-sentrym": "price_1Mj1kYGlVGuVgOrk7jucaZAa",
     "users-sentryy": "price_1Mj1mMGlVGuVgOrkC0ORc6iW",
+    "users-teamm": "TBD",
+    "users-teamy": "TBD",
 }
 
 CORS_ALLOW_CREDENTIALS = True

codecov/settings_prod.py

@@ -28,6 +28,8 @@
     "users-sentryy": "price_1MlYAYGlVGuVgOrke9SdbBUn",
     "users-enterprisey": "price_1LmjzwGlVGuVgOrkIwlM46EU",
     "users-enterprisem": "price_1LmjypGlVGuVgOrkzKtNqhwW",
+    "users-teamm": "TBD",
+    "users-teamy": "TBD",
 }
 
 CORS_ALLOW_HEADERS += ["sentry-trace", "baggage"]

codecov/settings_staging.py

@@ -23,6 +23,8 @@
     "users-pr-inappy": "plan_H6P16wij3lUuxg",
     "users-sentrym": "price_1Mj1kYGlVGuVgOrk7jucaZAa",
     "users-sentryy": "price_1Mj1mMGlVGuVgOrkC0ORc6iW",
+    "users-teamm": "TBD",
+    "users-teamy": "TBD",
 }
 
 CORS_ALLOW_HEADERS += ["sentry-trace", "baggage"]

plan/constants.py

@@ -288,7 +288,7 @@ class PlanData:
         ],
         tier_name=TierName.TEAM.value,
         trial_days=None,
-        monthly_uploads_limit=1000,
+        monthly_uploads_limit=MonthlyUploadLimits.CODECOV_TEAM_PLAN.value,
     ),
     PlanName.TEAM_YEARLY.value: PlanData(
         marketing_name=PlanMarketingName.TEAM.value,
@@ -303,7 +303,7 @@ class PlanData:
         ],
         tier_name=TierName.TEAM.value,
         trial_days=None,
-        monthly_uploads_limit=1000,
+        monthly_uploads_limit=MonthlyUploadLimits.CODECOV_TEAM_PLAN.value,
     ),
 }
 
@@ -325,10 +325,11 @@ class PlanData:
     ),
 }
 
-PRO_PLANS = {
+PAID_PLANS = {
     **PR_AUTHOR_PAID_USER_PLAN_REPRESENTATIONS,
     **SENTRY_PAID_USER_PLAN_REPRESENTATIONS,
     **ENTERPRISE_CLOUD_USER_PLAN_REPRESENTATIONS,
+    **TEAM_PLAN_REPRESENTATIONS,
 }
 
 TRIAL_PLANS = {**TRIAL_PLAN_REPRESENTATION}
@@ -340,7 +341,7 @@ class PlanData:
     **FREE_PLAN_REPRESENTATIONS,
     **NON_PR_AUTHOR_PAID_USER_PLAN_REPRESENTATIONS,
     **GHM_PLAN_REPRESENTATION,
-    **PRO_PLANS,
+    **PAID_PLANS,
     **TRIAL_PLANS,
     **TEAM_PLANS,
 }

services/billing.py

@@ -8,7 +8,7 @@
 from codecov_auth.models import Owner
 from plan.constants import (
     FREE_PLAN_REPRESENTATIONS,
-    PRO_PLANS,
+    PAID_PLANS,
     USER_PLAN_REPRESENTATIONS,
     PlanBillingRate,
 )
@@ -514,7 +514,7 @@ def update_plan(self, owner, desired_plan):
             else:
                 plan_service = PlanService(current_org=owner)
                 plan_service.set_default_plan_data()
-        elif desired_plan["value"] in PRO_PLANS:
+        elif desired_plan["value"] in PAID_PLANS:
             if owner.stripe_subscription_id is not None:
                 self.payment_service.modify_subscription(owner, desired_plan)
             else: