Check billingMode in onTeamDeleted method

Don't attempt to look up Stripe subscription information if the deleted team is not using usage based billing.
gitpod-io · Sep 28, 2022 · 54b0724 · 54b0724
1 parent 18bd74a
commit 54b0724
Showing 1 changed file with 8 additions and 5 deletions.
diff --git a/components/server/ee/src/workspace/gitpod-server-impl.ts b/components/server/ee/src/workspace/gitpod-server-impl.ts
@@ -1596,11 +1596,14 @@ export class GitpodServerEEImpl extends GitpodServerImpl {
                 { teamId, chargebeeSubscriptionId },
             );
         }
-        const subscriptionId = await this.stripeService.findUncancelledSubscriptionByAttributionId(
-            AttributionId.render({ kind: "team", teamId: teamId }),
-        );
-        if (subscriptionId) {
-            await this.stripeService.cancelSubscription(subscriptionId);
+        const billingMode = await this.billingModes.getBillingMode({ kind: "team", teamId: teamId }, now);
+        if (billingMode.mode === "usage-based") {
+            const subscriptionId = await this.stripeService.findUncancelledSubscriptionByAttributionId(
+                AttributionId.render({ kind: "team", teamId: teamId }),
+            );
+            if (subscriptionId) {
+                await this.stripeService.cancelSubscription(subscriptionId);
+            }
         }
     }