chore: cleanup codes

packages/backend/server/schema.prisma

@@ -214,7 +214,7 @@ model WorkspaceFeature {
   workspaceId String @map("workspace_id") @db.VarChar
   featureId   Int    @map("feature_id") @db.Integer
 
-  // override feature's configs
+  // override quota's configs
   configs   Json      @default("{}") @db.Json
   // we will record the reason why the feature is enabled/disabled
   // for example:

packages/backend/server/src/core/quota/index.ts

@@ -3,7 +3,6 @@ import { Module } from '@nestjs/common';
 import { FeatureModule } from '../features';
 import { PermissionModule } from '../permission';
 import { StorageModule } from '../storage';
-import { QuotaOverrideService } from './override';
 import { QuotaManagementResolver } from './resolver';
 import { QuotaService } from './service';
 import { QuotaManagementService } from './storage';
@@ -16,19 +15,12 @@ import { QuotaManagementService } from './storage';
  */
 @Module({
   imports: [FeatureModule, StorageModule, PermissionModule],
-  providers: [
-    QuotaService,
-    QuotaOverrideService,
-    QuotaManagementResolver,
-    QuotaManagementService,
-  ],
-  exports: [QuotaService, QuotaOverrideService, QuotaManagementService],
+  providers: [QuotaService, QuotaManagementResolver, QuotaManagementService],
+  exports: [QuotaService, QuotaManagementService],
 })
 export class QuotaModule {}
 
 export { QuotaManagementService, QuotaService };
-export { OneDay, OneGB, OneMB } from './constant';
-export { QuotaOverride, QuotaOverrideService } from './override';
 export { Quota_FreePlanV1_1, Quota_ProPlanV1 } from './schema';
 export {
   formatDate,

packages/backend/server/src/core/quota/quota.ts

@@ -61,11 +61,17 @@ export class QuotaConfig {
   }
 
   withOverride(override: any) {
-    return new QuotaConfig(this.config, override);
+    if (override) {
+      return new QuotaConfig(this.config, override);
+    }
+    return this;
   }
 
   checkOverride(override: any) {
-    return QuotaSchema.safeParse(Object.assign({}, this.config, override));
+    return QuotaSchema.safeParse({
+      ...this.config,
+      configs: Object.assign({}, this.config.configs, override),
+    });
   }
 
   get version() {
@@ -84,8 +90,8 @@ export class QuotaConfig {
   get businessBlobLimit() {
     return (
       this.override?.businessBlobLimit ||
-      this.override?.blobLimit ||
       this.config.configs.businessBlobLimit ||
+      this.override?.blobLimit ||
       this.config.configs.blobLimit
     );
   }

packages/backend/server/src/core/quota/schema.ts

@@ -174,7 +174,6 @@ export const Quotas: Quota[] = [
       copilotActionLimit: 10,
     },
   },
-
   {
     feature: QuotaType.TeamPlanV1,
     type: FeatureKind.Quota,
@@ -183,7 +182,7 @@ export const Quotas: Quota[] = [
       // quota name
       name: 'Team Workspace',
       // single blob limit 100MB
-      blobLimit: 100 * OneMB,
+      blobLimit: 500 * OneMB,
       // total blob limit 100GB
       storageQuota: 100 * OneGB,
       // seat quota 20GB per seat

packages/backend/server/src/core/quota/service.ts

@@ -1,6 +1,5 @@
 import { Injectable } from '@nestjs/common';
 import { PrismaClient } from '@prisma/client';
-import { JsonObject } from '@prisma/client/runtime/library';
 
 import type { EventPayload } from '../../fundamentals';
 import { OnEvent, PrismaTransaction } from '../../fundamentals';
@@ -17,9 +16,12 @@ export class QuotaService {
   ) {}
 
   async getQuota<Q extends QuotaType>(
-    quota: Q
+    quota: Q,
+    tx?: PrismaTransaction
   ): Promise<QuotaConfig | undefined> {
-    const data = await this.prisma.feature.findFirst({
+    const executor = tx ?? this.prisma;
+
+    const data = await executor.feature.findFirst({
       where: { feature: quota, type: FeatureKind.Quota },
       select: { id: true },
       orderBy: { version: 'desc' },
@@ -38,9 +40,7 @@ export class QuotaService {
     const quota = await this.prisma.userFeature.findFirst({
       where: {
         userId,
-        feature: {
-          type: FeatureKind.Quota,
-        },
+        feature: { type: FeatureKind.Quota },
         activated: true,
       },
       select: {
@@ -65,9 +65,7 @@ export class QuotaService {
     const quotas = await this.prisma.userFeature.findMany({
       where: {
         userId,
-        feature: {
-          type: FeatureKind.Quota,
-        },
+        feature: { type: FeatureKind.Quota },
       },
       select: {
         activated: true,
@@ -76,9 +74,7 @@ export class QuotaService {
         expiredAt: true,
         featureId: true,
       },
-      orderBy: {
-        id: 'asc',
-      },
+      orderBy: { id: 'asc' },
     });
     const configs = await Promise.all(
       quotas.map(async quota => {
@@ -107,11 +103,7 @@ export class QuotaService {
   ) {
     await this.prisma.$transaction(async tx => {
       const hasSameActivatedQuota = await this.hasUserQuota(userId, quota, tx);
-
-      if (hasSameActivatedQuota) {
-        // don't need to switch
-        return;
-      }
+      if (hasSameActivatedQuota) return; // don't need to switch
 
       const featureId = await tx.feature
         .findFirst({
@@ -175,12 +167,11 @@ export class QuotaService {
     const quota = await this.prisma.workspaceFeature.findFirst({
       where: {
         workspaceId,
-        feature: {
-          type: FeatureKind.Quota,
-        },
+        feature: { type: FeatureKind.Quota },
         activated: true,
       },
       select: {
+        configs: true,
         reason: true,
         createdAt: true,
         expiredAt: true,
@@ -190,7 +181,7 @@ export class QuotaService {
 
     if (quota) {
       const feature = await QuotaConfig.get(this.prisma, quota.featureId);
-      return { ...quota, feature };
+      return { ...quota, feature: feature.withOverride(quota.configs) };
     }
     return null;
   }
@@ -209,24 +200,13 @@ export class QuotaService {
         quota,
         tx
       );
-
-      if (hasSameActivatedQuota) {
-        // don't need to switch
-        return;
-      }
+      if (hasSameActivatedQuota) return; // don't need to switch
 
       const featureId = await tx.feature
         .findFirst({
-          where: {
-            feature: quota,
-            type: FeatureKind.Quota,
-          },
-          select: {
-            id: true,
-          },
-          orderBy: {
-            version: 'desc',
-          },
+          where: { feature: quota, type: FeatureKind.Quota },
+          select: { id: true },
+          orderBy: { version: 'desc' },
         })
         .then(f => f?.id);
 
@@ -294,18 +274,17 @@ export class QuotaService {
     type: Q
   ): Promise<QuotaConfig | undefined> {
     const quota = await this.getQuota(type);
-    const configs = await this.prisma.workspaceFeature
-      .findFirst({
-        where: {
-          workspaceId,
-          feature: { feature: type, type: FeatureKind.Feature },
-          activated: true,
-        },
-        select: { configs: true },
-      })
-      .then(q => q?.configs);
-
-    if (quota && configs) {
+    if (quota) {
+      const configs = await this.prisma.workspaceFeature
+        .findFirst({
+          where: {
+            workspaceId,
+            feature: { feature: type, type: FeatureKind.Feature },
+            activated: true,
+          },
+          select: { configs: true },
+        })
+        .then(q => q?.configs);
       return quota.withOverride(configs);
     }
     return undefined;
@@ -314,7 +293,7 @@ export class QuotaService {
   async updateWorkspaceConfig(
     workspaceId: string,
     quota: QuotaType,
-    configs: JsonObject
+    configs: any
   ) {
     const current = await this.getWorkspaceConfig(workspaceId, quota);
 
@@ -327,7 +306,7 @@ export class QuotaService {
     const r = await this.prisma.workspaceFeature.updateMany({
       where: {
         workspaceId,
-        feature: { feature: quota, type: FeatureKind.Feature },
+        feature: { feature: quota, type: FeatureKind.Quota },
         activated: true,
       },
       data: { configs },

packages/backend/server/src/core/quota/storage.ts

@@ -4,7 +4,6 @@ import { FeatureService, FeatureType } from '../features';
 import { PermissionService } from '../permission';
 import { WorkspaceBlobStorage } from '../storage';
 import { OneGB } from './constant';
-import { QuotaOverrideService } from './override';
 import { QuotaConfig } from './quota';
 import { QuotaService } from './service';
 import { formatSize, Quota, type QuotaBusinessType, QuotaType } from './types';
@@ -17,8 +16,7 @@ export class QuotaManagementService {
     private readonly feature: FeatureService,
     private readonly quota: QuotaService,
     private readonly permissions: PermissionService,
-    private readonly storage: WorkspaceBlobStorage,
-    private readonly override: QuotaOverrideService
+    private readonly storage: WorkspaceBlobStorage
   ) {}
 
   async getUserQuota(userId: string) {
@@ -147,6 +145,12 @@ export class QuotaManagementService {
     );
   }
 
+  private async getWorkspaceQuota(userId: string, workspaceId: string) {
+    const workspaceQuota = await this.quota.getWorkspaceQuota(workspaceId);
+    if (workspaceQuota) return workspaceQuota;
+    return await this.quota.getUserQuota(userId);
+  }
+
   // get workspace's owner quota and total size of used
   // quota was apply to owner's account
   async getWorkspaceUsage(workspaceId: string): Promise<QuotaBusinessType> {
@@ -164,7 +168,7 @@ export class QuotaManagementService {
         copilotActionLimit,
         humanReadable,
       },
-    } = await this.quota.getUserQuota(owner.id);
+    } = await this.getWorkspaceQuota(owner.id, workspaceId);
     // get all workspaces size of owner used
     const usedSize = await this.getUserUsage(owner.id);
     // relax restrictions if workspace has unlimited feature
@@ -192,7 +196,7 @@ export class QuotaManagementService {
       return this.mergeUnlimitedQuota(quota);
     }
 
-    return await this.override.overrideQuota(owner.id, workspaceId, quota);
+    return quota;
   }
 
   private mergeUnlimitedQuota(orig: QuotaBusinessType): QuotaBusinessType {