[server] Review comments: EntitlementServiceChargebee

Author: geropl

components/gitpod-protocol/src/plans.ts

@@ -482,6 +482,10 @@ export namespace Plans {
         );
     }
 
+    export function isFreeTier(chargebeeId: string | undefined): boolean {
+        return chargebeeId === Plans.FREE.chargebeeId || chargebeeId === Plans.FREE_50.chargebeeId;
+    }
+
     export function isFreeNonTransientPlan(chargebeeId: string | undefined): boolean {
         return chargebeeId === Plans.FREE_OPEN_SOURCE.chargebeeId;
     }

components/server/ee/src/billing/entitlement-service-chargebee.ts

@@ -196,8 +196,7 @@ export class EntitlementServiceChargebee implements EntitlementService {
      */
     async limitNetworkConnections(user: User, date: Date = new Date()): Promise<boolean> {
         const subscriptions = await this.subscriptionService.getNotYetCancelledSubscriptions(user, date.toISOString());
-        const freePlans = [Plans.FREE, Plans.FREE_50].map((p) => p.chargebeeId);
-
-        return subscriptions.filter((s) => !freePlans.includes(s.planId!)).length > 0;
+        const hasPaidPlan = subscriptions.some((s) => !Plans.isFreeTier(s.planId));
+        return !hasPaidPlan;
     }
 }

components/server/ee/src/billing/entitlement-service-ubp.ts

@@ -102,7 +102,8 @@ export class EntitlementServiceUBP implements EntitlementService {
      * @param user
      */
     async limitNetworkConnections(user: User, date: Date): Promise<boolean> {
-        return !this.hasPaidSubscription(user, date);
+        const hasPaidPlan = await this.hasPaidSubscription(user, date);
+        return !hasPaidPlan;
     }
 
     protected async hasPaidSubscription(user: User, date: Date): Promise<boolean> {