Improve performance on metadata computation

packages/twenty-server/src/database/commands/command-runners/active-or-suspended-workspaces-migration.command-runner.ts

@@ -140,7 +140,6 @@ export abstract class ActiveOrSuspendedWorkspacesMigrationCommandRunner<
         const dataSource =
           await this.twentyORMGlobalManager.getDataSourceForWorkspace({
             workspaceId,
-            shouldFailIfMetadataNotFound: false,
           });
 
         await this.runOnWorkspace({

packages/twenty-server/src/database/typeorm/core/migrations/common/1750673748111-remove-relation-metadata.ts

@@ -0,0 +1,30 @@
+import { MigrationInterface, QueryRunner } from 'typeorm';
+
+export class RemoveRelationMetadata1750673748111 implements MigrationInterface {
+  name = 'RemoveRelationMetadata1750673748111';
+
+  public async up(queryRunner: QueryRunner): Promise<void> {
+    await queryRunner.query(
+      `CREATE INDEX "IDX_DATA_SOURCE_WORKSPACE_ID_CREATED_AT" ON "core"."dataSource" ("workspaceId", "createdAt") `,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "core"."relationMetadata" DROP CONSTRAINT IF EXISTS "FK_9dea8f90d04edbbf9c541a95c3b"`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "core"."relationMetadata" DROP CONSTRAINT IF EXISTS "FK_3deb257254145a3bdde9575e7d6"`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "core"."relationMetadata" DROP CONSTRAINT IF EXISTS "FK_0f781f589e5a527b8f3d3a4b824"`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "core"."relationMetadata" DROP CONSTRAINT IF EXISTS "FK_f2a0acd3a548ee446a1a35df44d"`,
+    );
+    await queryRunner.query(`DROP TABLE IF EXISTS "core"."relationMetadata"`);
+  }
+
+  public async down(queryRunner: QueryRunner): Promise<void> {
+    await queryRunner.query(
+      `DROP INDEX "core"."IDX_DATA_SOURCE_WORKSPACE_ID_CREATED_AT"`,
+    );
+  }
+}

packages/twenty-server/src/engine/api/graphql/graphql-query-runner/interfaces/base-resolver-service.ts

@@ -26,6 +26,7 @@ import { workspaceQueryRunnerGraphqlApiExceptionHandler } from 'src/engine/api/g
 import { WorkspaceQueryHookService } from 'src/engine/api/graphql/workspace-query-runner/workspace-query-hook/workspace-query-hook.service';
 import { RESOLVER_METHOD_NAMES } from 'src/engine/api/graphql/workspace-resolver-builder/constants/resolver-method-names';
 import { FeatureFlagKey } from 'src/engine/core-modules/feature-flag/enums/feature-flag-key.enum';
+import { workspaceValidator } from 'src/engine/core-modules/workspace/workspace.validate';
 import { SettingPermissionType } from 'src/engine/metadata-modules/permissions/constants/setting-permission-type.constants';
 import {
   PermissionsException,
@@ -37,7 +38,6 @@ import { UserRoleService } from 'src/engine/metadata-modules/user-role/user-role
 import { WorkspaceDataSource } from 'src/engine/twenty-orm/datasource/workspace.datasource';
 import { WorkspaceRepository } from 'src/engine/twenty-orm/repository/workspace.repository';
 import { TwentyORMGlobalManager } from 'src/engine/twenty-orm/twenty-orm-global.manager';
-import { workspaceValidator } from 'src/engine/core-modules/workspace/workspace.validate';
 
 export type GraphqlQueryResolverExecutionArgs<Input extends ResolverArgs> = {
   args: Input;
@@ -93,7 +93,6 @@ export abstract class GraphqlQueryBaseResolverService<
       const workspaceDataSource =
         await this.twentyORMGlobalManager.getDataSourceForWorkspace({
           workspaceId: workspace.id,
-          shouldFailIfMetadataNotFound: false,
         });
 
       const featureFlagsMap = workspaceDataSource.featureFlagMap;

packages/twenty-server/src/engine/api/graphql/workspace-schema.factory.ts

@@ -3,26 +3,18 @@ import { Injectable } from '@nestjs/common';
 import { makeExecutableSchema } from '@graphql-tools/schema';
 import { GraphQLSchema, printSchema } from 'graphql';
 import { gql } from 'graphql-tag';
-import { isDefined } from 'twenty-shared/utils';
 
 import { ScalarsExplorerService } from 'src/engine/api/graphql/services/scalars-explorer.service';
 import { workspaceResolverBuilderMethodNames } from 'src/engine/api/graphql/workspace-resolver-builder/factories/factories';
 import { WorkspaceResolverFactory } from 'src/engine/api/graphql/workspace-resolver-builder/workspace-resolver.factory';
 import { WorkspaceGraphQLSchemaFactory } from 'src/engine/api/graphql/workspace-schema-builder/workspace-graphql-schema.factory';
 import { AuthContext } from 'src/engine/core-modules/auth/types/auth-context.type';
-import { FeatureFlagService } from 'src/engine/core-modules/feature-flag/services/feature-flag.service';
-import { TwentyConfigService } from 'src/engine/core-modules/twenty-config/twenty-config.service';
 import { DataSourceService } from 'src/engine/metadata-modules/data-source/data-source.service';
-import { ObjectMetadataMaps } from 'src/engine/metadata-modules/types/object-metadata-maps';
 import {
   WorkspaceMetadataCacheException,
   WorkspaceMetadataCacheExceptionCode,
 } from 'src/engine/metadata-modules/workspace-metadata-cache/exceptions/workspace-metadata-cache.exception';
 import { WorkspaceMetadataCacheService } from 'src/engine/metadata-modules/workspace-metadata-cache/services/workspace-metadata-cache.service';
-import {
-  WorkspaceMetadataVersionException,
-  WorkspaceMetadataVersionExceptionCode,
-} from 'src/engine/metadata-modules/workspace-metadata-version/exceptions/workspace-metadata-version.exception';
 import { WorkspaceCacheStorageService } from 'src/engine/workspace-cache-storage/workspace-cache-storage.service';
 
 @Injectable()
@@ -34,8 +26,6 @@ export class WorkspaceSchemaFactory {
     private readonly workspaceResolverFactory: WorkspaceResolverFactory,
     private readonly workspaceCacheStorageService: WorkspaceCacheStorageService,
     private readonly workspaceMetadataCacheService: WorkspaceMetadataCacheService,
-    private readonly featureFlagService: FeatureFlagService,
-    private readonly twentyConfigService: TwentyConfigService,
   ) {}
 
   async createGraphQLSchema(authContext: AuthContext): Promise<GraphQLSchema> {
@@ -52,38 +42,10 @@ export class WorkspaceSchemaFactory {
       return new GraphQLSchema({});
     }
 
-    let currentCacheVersion =
-      await this.workspaceCacheStorageService.getMetadataVersion(
-        authContext.workspace.id,
-      );
-
-    let objectMetadataMaps: ObjectMetadataMaps | undefined;
-
-    if (currentCacheVersion === undefined) {
-      const recomputed =
-        await this.workspaceMetadataCacheService.recomputeMetadataCache({
-          workspaceId: authContext.workspace.id,
-        });
-
-      objectMetadataMaps = recomputed?.recomputedObjectMetadataMaps;
-      currentCacheVersion = recomputed?.recomputedMetadataVersion;
-    } else {
-      objectMetadataMaps =
-        await this.workspaceCacheStorageService.getObjectMetadataMaps(
-          authContext.workspace.id,
-          currentCacheVersion,
-        );
-
-      if (!isDefined(objectMetadataMaps)) {
-        const recomputed =
-          await this.workspaceMetadataCacheService.recomputeMetadataCache({
-            workspaceId: authContext.workspace.id,
-          });
-
-        objectMetadataMaps = recomputed?.recomputedObjectMetadataMaps;
-        currentCacheVersion = recomputed?.recomputedMetadataVersion;
-      }
-    }
+    const { objectMetadataMaps, metadataVersion } =
+      await this.workspaceMetadataCacheService.getFreshObjectMetadataMaps({
+        workspaceId: authContext.workspace.id,
+      });
 
     if (!objectMetadataMaps) {
       throw new WorkspaceMetadataCacheException(
@@ -92,13 +54,6 @@ export class WorkspaceSchemaFactory {
       );
     }
 
-    if (!currentCacheVersion) {
-      throw new WorkspaceMetadataVersionException(
-        'Metadata cache version not found',
-        WorkspaceMetadataVersionExceptionCode.METADATA_VERSION_NOT_FOUND,
-      );
-    }
-
     const objectMetadataCollection = Object.values(objectMetadataMaps.byId).map(
       (objectMetadataItem) => ({
         ...objectMetadataItem,
@@ -110,12 +65,12 @@ export class WorkspaceSchemaFactory {
     // Get typeDefs from cache
     let typeDefs = await this.workspaceCacheStorageService.getGraphQLTypeDefs(
       authContext.workspace.id,
-      currentCacheVersion,
+      metadataVersion,
     );
     let usedScalarNames =
       await this.workspaceCacheStorageService.getGraphQLUsedScalarNames(
         authContext.workspace.id,
-        currentCacheVersion,
+        metadataVersion,
       );
 
     // If typeDefs are not cached, generate them
@@ -133,12 +88,12 @@ export class WorkspaceSchemaFactory {
 
       await this.workspaceCacheStorageService.setGraphQLTypeDefs(
         authContext.workspace.id,
-        currentCacheVersion,
+        metadataVersion,
         typeDefs,
       );
       await this.workspaceCacheStorageService.setGraphQLUsedScalarNames(
         authContext.workspace.id,
-        currentCacheVersion,
+        metadataVersion,
         usedScalarNames,
       );
     }

packages/twenty-server/src/engine/core-modules/auth/token/services/access-token.service.ts

@@ -21,13 +21,13 @@ import {
 import { JwtWrapperService } from 'src/engine/core-modules/jwt/services/jwt-wrapper.service';
 import { TwentyConfigService } from 'src/engine/core-modules/twenty-config/twenty-config.service';
 import { UserWorkspace } from 'src/engine/core-modules/user-workspace/user-workspace.entity';
+import { userWorkspaceValidator } from 'src/engine/core-modules/user-workspace/user-workspace.validate';
 import { User } from 'src/engine/core-modules/user/user.entity';
 import { userValidator } from 'src/engine/core-modules/user/user.validate';
 import { Workspace } from 'src/engine/core-modules/workspace/workspace.entity';
 import { workspaceValidator } from 'src/engine/core-modules/workspace/workspace.validate';
 import { TwentyORMGlobalManager } from 'src/engine/twenty-orm/twenty-orm-global.manager';
 import { WorkspaceMemberWorkspaceEntity } from 'src/modules/workspace-member/standard-objects/workspace-member.workspace-entity';
-import { userWorkspaceValidator } from 'src/engine/core-modules/user-workspace/user-workspace.validate';
 
 @Injectable()
 export class AccessTokenService {
@@ -78,9 +78,6 @@ export class AccessTokenService {
         await this.twentyORMGlobalManager.getRepositoryForWorkspace<WorkspaceMemberWorkspaceEntity>(
           workspaceId,
           'workspaceMember',
-          {
-            shouldFailIfMetadataNotFound: false,
-          },
         );
 
       const workspaceMember = await workspaceMemberRepository.findOne({

packages/twenty-server/src/engine/core-modules/feature-flag/services/feature-flag.service.ts

@@ -75,15 +75,12 @@ export class FeatureFlagService {
 
       if (keys.includes(FeatureFlagKey.IS_PERMISSIONS_V2_ENABLED)) {
         await this.workspacePermissionsCacheService.recomputeRolesPermissionsCache(
-          { workspaceId, ignoreLock: true },
+          { workspaceId },
         );
       }
 
       await this.workspaceFeatureFlagsMapCacheService.recomputeFeatureFlagsMapCache(
-        {
-          workspaceId,
-          ignoreLock: true,
-        },
+        { workspaceId },
       );
     }
   }
@@ -138,15 +135,12 @@ export class FeatureFlagService {
     const result = await this.featureFlagRepository.save(featureFlagToSave);
 
     await this.workspaceFeatureFlagsMapCacheService.recomputeFeatureFlagsMapCache(
-      {
-        workspaceId,
-        ignoreLock: true,
-      },
+      { workspaceId },
     );
 
     if (featureFlag === FeatureFlagKey.IS_PERMISSIONS_V2_ENABLED) {
       await this.workspacePermissionsCacheService.recomputeRolesPermissionsCache(
-        { workspaceId, ignoreLock: true },
+        { workspaceId },
       );
     }
 

packages/twenty-server/src/engine/metadata-modules/data-source/data-source.entity.ts

@@ -1,18 +1,20 @@
 import {
   Column,
   CreateDateColumn,
+  DataSourceOptions,
   Entity,
+  Index,
+  OneToMany,
   PrimaryGeneratedColumn,
   UpdateDateColumn,
-  DataSourceOptions,
-  OneToMany,
 } from 'typeorm';
 
 import { ObjectMetadataEntity } from 'src/engine/metadata-modules/object-metadata/object-metadata.entity';
 
 export type DataSourceType = DataSourceOptions['type'];
 
 @Entity('dataSource')
+@Index('IDX_DATA_SOURCE_WORKSPACE_ID_CREATED_AT', ['workspaceId', 'createdAt'])
 export class DataSourceEntity {
   @PrimaryGeneratedColumn('uuid')
   id: string;

packages/twenty-server/src/engine/metadata-modules/object-metadata/object-metadata.module.ts

@@ -26,6 +26,7 @@ import { PermissionsModule } from 'src/engine/metadata-modules/permissions/permi
 import { PermissionsGraphqlApiExceptionFilter } from 'src/engine/metadata-modules/permissions/utils/permissions-graphql-api-exception.filter';
 import { RemoteTableRelationsModule } from 'src/engine/metadata-modules/remote-server/remote-table/remote-table-relations/remote-table-relations.module';
 import { SearchVectorModule } from 'src/engine/metadata-modules/search-vector/search-vector.module';
+import { WorkspaceMetadataCacheModule } from 'src/engine/metadata-modules/workspace-metadata-cache/workspace-metadata-cache.module';
 import { WorkspaceMetadataVersionModule } from 'src/engine/metadata-modules/workspace-metadata-version/workspace-metadata-version.module';
 import { WorkspaceMigrationModule } from 'src/engine/metadata-modules/workspace-migration/workspace-migration.module';
 import { WorkspacePermissionsCacheModule } from 'src/engine/metadata-modules/workspace-permissions-cache/workspace-permissions-cache.module';
@@ -59,6 +60,7 @@ import { UpdateObjectPayload } from './dtos/update-object.input';
         PermissionsModule,
         WorkspacePermissionsCacheModule,
         WorkspaceCacheStorageModule,
+        WorkspaceMetadataCacheModule,
       ],
       services: [
         ObjectMetadataService,