[server] Treat "no CostCenter found" the same as "spending limit reached"

Author: geropl

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

@@ -29,11 +29,15 @@ export class BillingService {
 
     async checkSpendingLimitReached(user: User): Promise<SpendingLimitReachedResult> {
         const attributionId = await this.userService.getWorkspaceUsageAttributionId(user);
-        const costCenter = !!attributionId && (await this.costCenterDB.findById(AttributionId.render(attributionId)));
+        const costCenter = await this.costCenterDB.findById(AttributionId.render(attributionId));
         if (!costCenter) {
             const err = new Error("No CostCenter found");
             log.error({ userId: user.id }, err.message, err, { attributionId });
-            throw err;
+            // Technially we do not have any spending limit set, yet. But sending users down the "reached" path will fix this issues as well.
+            return {
+                reached: true,
+                attributionId,
+            };
         }
 
         const allSessions = await this.listBilledUsage({

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

@@ -203,9 +203,12 @@ export class UserService {
         return subscription?.id;
     }
 
-    protected async validateUsageAttributionId(user: User, usageAttributionId: string): Promise<void> {
+    protected async validateUsageAttributionId(user: User, usageAttributionId: string): Promise<AttributionId> {
         const attribution = AttributionId.parse(usageAttributionId);
-        if (attribution?.kind === "team") {
+        if (!attribution) {
+            throw new ResponseError(ErrorCodes.INVALID_COST_CENTER, "The billing team id configured is invalid.");
+        }
+        if (attribution.kind === "team") {
             const team = await this.teamDB.findTeamById(attribution.teamId);
             if (!team) {
                 throw new ResponseError(
@@ -228,6 +231,7 @@ export class UserService {
                 );
             }
         }
+        return attribution;
     }
 
     protected async findSingleTeamWithUsageBasedBilling(user: User): Promise<Team | undefined> {
@@ -268,14 +272,14 @@ export class UserService {
      *
      * @param user
      * @param projectId
+     * @returns The validated AttributionId
      */
-    async getWorkspaceUsageAttributionId(user: User, projectId?: string): Promise<AttributionId | undefined> {
+    async getWorkspaceUsageAttributionId(user: User, projectId?: string): Promise<AttributionId> {
         // A. Billing-based attribution
         if (this.config.enablePayment) {
             if (user.usageAttributionId) {
-                await this.validateUsageAttributionId(user, user.usageAttributionId);
                 // Return the user's explicit attribution ID.
-                return AttributionId.parse(user.usageAttributionId);
+                return await this.validateUsageAttributionId(user, user.usageAttributionId);
             }
             const billingTeam = await this.findSingleTeamWithUsageBasedBilling(user);
             if (billingTeam) {