[server] When deleting a team with an active usage-based subscription, also cancel the subscription

Author: jankeromnes

components/server/ee/src/user/stripe-service.ts

@@ -125,6 +125,10 @@ export class StripeService {
         return result.data[0];
     }
 
+    async cancelSubscription(subscriptionId: string): Promise<void> {
+        await this.getStripe().subscriptions.del(subscriptionId);
+    }
+
     async createSubscriptionForCustomer(customerId: string, currency: Currency): Promise<void> {
         const priceId = this.config?.stripeConfig?.usageProductPriceIds[currency];
         if (!priceId) {

components/server/ee/src/workspace/gitpod-server-impl.ts

@@ -1455,17 +1455,22 @@ export class GitpodServerEEImpl extends GitpodServerImpl {
 
     protected async onTeamDeleted(teamId: string): Promise<void> {
         const now = new Date();
-        const teamSubscription = await this.teamSubscription2DB.findForTeam(teamId, now.toISOString());
-        if (!teamSubscription) {
-            // No team subscription, nothing to do 🌴
-            return;
+        const ts2 = await this.teamSubscription2DB.findForTeam(teamId, now.toISOString());
+        if (ts2) {
+            const chargebeeSubscriptionId = ts2.paymentReference;
+            await this.chargebeeService.cancelSubscription(
+                chargebeeSubscriptionId,
+                {},
+                { teamId, chargebeeSubscriptionId },
+            );
+        }
+        const teamCustomer = await this.stripeService.findCustomerByTeamId(teamId);
+        if (teamCustomer) {
+            const subsciption = await this.stripeService.findUncancelledSubscriptionByCustomer(teamCustomer.id);
+            if (subsciption) {
+                await this.stripeService.cancelSubscription(subsciption.id);
+            }
         }
-        const chargebeeSubscriptionId = teamSubscription.paymentReference;
-        await this.chargebeeService.cancelSubscription(
-            chargebeeSubscriptionId,
-            {},
-            { teamId, chargebeeSubscriptionId },
-        );
     }
 
     protected async updateTeamSubscriptionQuantity(teamSubscription: TeamSubscription2): Promise<void> {