[server] Ignore old FREE/FREE_50 when evaluating BillingMode

gitpod-io · Feb 8, 2023 · 23ee852 · 23ee852
1 parent d2fa18a
commit 23ee852
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 1 deletion.
diff --git a/components/server/ee/src/billing/billing-mode.spec.db.ts b/components/server/ee/src/billing/billing-mode.spec.db.ts
@@ -281,6 +281,18 @@ class BillingModeSpec {
                 },
             },
             // user: usage-based
+            {
+                name: "user: stripe free, chargebee FREE (old)",
+                subject: user(),
+                config: {
+                    enablePayment: true,
+                    usageBasedPricingEnabled: true,
+                    subscriptions: [subscription(Plans.FREE)],
+                },
+                expectation: {
+                    mode: "usage-based",
+                },
+            },
             {
                 name: "user: stripe free, chargebee paid personal (inactive) + team seat (inactive)",
                 subject: user(),

diff --git a/components/server/ee/src/billing/billing-mode.ts b/components/server/ee/src/billing/billing-mode.ts
@@ -127,7 +127,11 @@ export class BillingModesImpl implements BillingModes {
         const cbSubscriptions = await this.subscriptionSvc.getActivePaidSubscription(user.id, now);
         const cbTeamSubscriptions = cbSubscriptions.filter((s) => isOldTeamSubscription(s));
         const cbPersonalSubscriptions = cbSubscriptions.filter(
-            (s) => isPersonalSubscription(s) && s.planId !== Plans.FREE_OPEN_SOURCE.chargebeeId,
+            (s) =>
+                isPersonalSubscription(s) &&
+                ![Plans.FREE_OPEN_SOURCE.chargebeeId, Plans.FREE.chargebeeId, Plans.FREE_50.chargebeeId].includes(
+                    s.planId!,
+                ),
         );
         const cbOwnedTeamSubscriptions = (
             await this.teamSubscriptionDb.findTeamSubscriptions({ userId: user.id })