The open alternative to Salesforce, designed for AI.
TypeScript crmcrm-systemcustomergood-first-issuegraphqlhacktoberfestjavascriptmarketingmonoreponestjsopen-sourcepostgresqlreactreactjssalestypescriptweb
Remove the v1 TypeORM workspace ORM (#24718)
Charles Bochet7919d7bf9ac6
diff --git a/packages/twenty-server/src/app.module.ts b/packages/twenty-server/src/app.module.tsindex b68ccc3e4df..4d55acf720c 100644--- a/packages/twenty-server/src/app.module.ts+++ b/packages/twenty-server/src/app.module.ts@@ -34,7 +34,6 @@ import { JwtModule } from 'src/engine/core-modules/jwt/jwt.module';import { UserSessionModule } from 'src/engine/core-modules/user-session/user-session.module';import { RestCoreMiddleware } from 'src/engine/middlewares/rest-core.middleware';import { GlobalWorkspaceDataSourceModule } from 'src/engine/twenty-orm/global-workspace-datasource/global-workspace-datasource.module';-import { TwentyORMModule } from 'src/engine/twenty-orm/twenty-orm.module';import { WorkspaceCacheStorageModule } from 'src/engine/workspace-cache-storage/workspace-cache-storage.module';import { UnhandledExceptionFilter } from 'src/filters/unhandled-exception.filter';import { ModulesModule } from 'src/modules/modules.module';@@ -60,7 +59,6 @@ const MIGRATED_REST_METHODS = [imports: [GraphQLConfigModule, MetricsModule, DataloaderModule],useClass: GraphQLConfigService,}),- TwentyORMModule,GlobalWorkspaceDataSourceModule,ClickHouseModule,CoreEngineModule,diff --git a/packages/twenty-server/src/database/commands/command-runners/workspace-iterator.service.ts b/packages/twenty-server/src/database/commands/command-runners/workspace-iterator.service.tsindex 97992a3ef7e..6fe038f01d5 100644--- a/packages/twenty-server/src/database/commands/command-runners/workspace-iterator.service.ts+++ b/packages/twenty-server/src/database/commands/command-runners/workspace-iterator.service.ts@@ -1,5 +1,5 @@import { Injectable, Logger } from '@nestjs/common';-import { InjectRepository } from '@nestjs/typeorm';+import { InjectDataSource, InjectRepository } from '@nestjs/typeorm';import chalk from 'chalk';import { isNonEmptyString } from '@sniptt/guards';@@ -8,12 +8,11 @@ import {WorkspaceActivationStatus,} from 'twenty-shared/workspace';import { isDefined } from 'twenty-shared/utils';-import { MoreThanOrEqual, Repository } from 'typeorm';+import { DataSource, MoreThanOrEqual, Repository } from 'typeorm';import { CommandShutdownService } from 'src/database/commands/command-runners/command-shutdown.service';import { activationStatusIn } from 'src/database/commands/command-runners/utils/activation-status-in.util';import { WorkspaceEntity } from 'src/engine/core-modules/workspace/workspace.entity';-import { GlobalWorkspaceDataSource } from 'src/engine/twenty-orm/global-workspace-datasource/global-workspace-datasource';import { GlobalWorkspaceOrmManager } from 'src/engine/twenty-orm/global-workspace-datasource/global-workspace-orm.manager';import { buildSystemAuthContext } from 'src/engine/twenty-orm/utils/build-system-auth-context.util';import { WorkspaceMigrationRunnerException } from 'src/engine/workspace-manager/workspace-migration/workspace-migration-runner/exceptions/workspace-migration-runner.exception';@@ -29,7 +28,7 @@ export type WorkspaceIteratorArgs = {export type WorkspaceIteratorContext = {workspaceId: string;- dataSource?: GlobalWorkspaceDataSource;+ dataSource?: DataSource;index: number;total: number;};@@ -54,6 +53,8 @@ export class WorkspaceIteratorService {constructor(@InjectRepository(WorkspaceEntity)private readonly workspaceRepository: Repository<WorkspaceEntity>,+ @InjectDataSource()+ private readonly coreDataSource: DataSource,private readonly globalWorkspaceOrmManager: GlobalWorkspaceOrmManager,private readonly commandShutdownService: CommandShutdownService,) {}@@ -107,7 +108,7 @@ export class WorkspaceIteratorService {});const dataSource = isNonEmptyString(workspace?.databaseSchema)- ? await this.globalWorkspaceOrmManager.getGlobalWorkspaceDataSource()+ ? this.coreDataSource: undefined;if (!isDefined(dataSource)) {diff --git a/packages/twenty-server/src/database/commands/command-runners/workspace.command-runner.ts b/packages/twenty-server/src/database/commands/command-runners/workspace.command-runner.tsindex cbc5723e0ad..17d720f14da 100644--- a/packages/twenty-server/src/database/commands/command-runners/workspace.command-runner.ts+++ b/packages/twenty-server/src/database/commands/command-runners/workspace.command-runner.ts@@ -1,10 +1,10 @@import chalk from 'chalk';import { CommandRunner, Option } from 'nest-commander';import { WorkspaceActivationStatus } from 'twenty-shared/workspace';+import { type DataSource } from 'typeorm';import { WorkspaceIteratorService } from 'src/database/commands/command-runners/workspace-iterator.service';import { CommandLogger } from 'src/database/commands/logger';-import { GlobalWorkspaceDataSource } from 'src/engine/twenty-orm/global-workspace-datasource/global-workspace-datasource';export type WorkspaceCommandOptions = {workspaceId?: Set<string>;@@ -17,7 +17,7 @@ export type WorkspaceCommandOptions = {export type RunOnWorkspaceArgs = {options: WorkspaceCommandOptions;workspaceId: string;- dataSource?: GlobalWorkspaceDataSource;+ dataSource?: DataSource;index: number;total: number;};diff --git a/packages/twenty-server/src/database/commands/upgrade-version-command/1-21/1-21-workspace-command-1775500004000-backfill-message-thread-subject.command.ts b/packages/twenty-server/src/database/commands/upgrade-version-command/1-21/1-21-workspace-command-1775500004000-backfill-message-thread-subject.command.tsindex de3c451fa17..556f834a64d 100644--- a/packages/twenty-server/src/database/commands/upgrade-version-command/1-21/1-21-workspace-command-1775500004000-backfill-message-thread-subject.command.ts+++ b/packages/twenty-server/src/database/commands/upgrade-version-command/1-21/1-21-workspace-command-1775500004000-backfill-message-thread-subject.command.ts@@ -71,8 +71,6 @@ export class BackfillMessageThreadSubjectCommand extends ProvisionedWorkspaceComWHERE mt.id = sub."messageThreadId"AND mt."subject" IS NULL`,undefined,- undefined,- { shouldBypassPermissionChecks: true },);this.logger.log(diff --git a/packages/twenty-server/src/database/commands/upgrade-version-command/2-22/2-22-workspace-command-1783960128000-migrate-person-avatar-url-to-avatar-file.command.ts b/packages/twenty-server/src/database/commands/upgrade-version-command/2-22/2-22-workspace-command-1783960128000-migrate-person-avatar-url-to-avatar-file.command.tsindex 1d76e13a9c5..af9a61c665b 100644--- a/packages/twenty-server/src/database/commands/upgrade-version-command/2-22/2-22-workspace-command-1783960128000-migrate-person-avatar-url-to-avatar-file.command.ts+++ b/packages/twenty-server/src/database/commands/upgrade-version-command/2-22/2-22-workspace-command-1783960128000-migrate-person-avatar-url-to-avatar-file.command.ts@@ -15,7 +15,7 @@ import { findFlatEntityByUniversalIdentifier } from 'src/engine/metadata-modulesimport { type FlatFieldMetadata } from 'src/engine/metadata-modules/flat-field-metadata/types/flat-field-metadata.type';import { type FlatObjectMetadata } from 'src/engine/metadata-modules/flat-object-metadata/types/flat-object-metadata.type';import { GlobalWorkspaceOrmManager } from 'src/engine/twenty-orm/global-workspace-datasource/global-workspace-orm.manager';-import { type WorkspaceRepository } from 'src/engine/twenty-orm/repository/workspace.repository';+import { type WorkspaceRepositoryV2 } from 'src/engine/twenty-orm-v2/repository/workspace-repository-v2';import { fetchImageWithTypeFromUrl } from 'src/utils/image';import { WorkspaceCacheService } from 'src/engine/workspace-cache/services/workspace-cache.service';import { type PersonWorkspaceEntity } from 'src/modules/person/standard-objects/person.workspace-entity';@@ -171,7 +171,7 @@ export class MigratePersonAvatarUrlToAvatarFileCommand extends ProvisionedWorksppersonRepository,cursor,}: {- personRepository: WorkspaceRepository<PersonWorkspaceEntity>;+ personRepository: WorkspaceRepositoryV2<PersonWorkspaceEntity>;cursor: string;}): Promise<PersonWorkspaceEntity[]> {return personRepository.find({@@ -193,7 +193,7 @@ export class MigratePersonAvatarUrlToAvatarFileCommand extends ProvisionedWorkspavatarUrl: string;workspaceId: string;fieldMetadataUniversalIdentifier: string;- personRepository: WorkspaceRepository<PersonWorkspaceEntity>;+ personRepository: WorkspaceRepositoryV2<PersonWorkspaceEntity>;}): Promise<'migrated' | 'skipped' | 'failed'> {const imageData = await this.downloadImage({imageUrl: avatarUrl,@@ -291,7 +291,7 @@ export class MigratePersonAvatarUrlToAvatarFileCommand extends ProvisionedWorksppersonId: string;fileId: string;workspaceId: string;- personRepository: WorkspaceRepository<PersonWorkspaceEntity>;+ personRepository: WorkspaceRepositoryV2<PersonWorkspaceEntity>;}): Promise<boolean> {try {const person = await personRepository.findOne({diff --git a/packages/twenty-server/src/database/commands/upgrade-version-command/2-22/2-22-workspace-command-1784193207000-backfill-workflow-version-core-links.command.ts b/packages/twenty-server/src/database/commands/upgrade-version-command/2-22/2-22-workspace-command-1784193207000-backfill-workflow-version-core-links.command.tsindex adacf317c18..c31c26e85d9 100644--- a/packages/twenty-server/src/database/commands/upgrade-version-command/2-22/2-22-workspace-command-1784193207000-backfill-workflow-version-core-links.command.ts+++ b/packages/twenty-server/src/database/commands/upgrade-version-command/2-22/2-22-workspace-command-1784193207000-backfill-workflow-version-core-links.command.ts@@ -7,6 +7,8 @@ import { ProvisionedWorkspaceCommandRunner } from 'src/database/commands/commandimport { WorkspaceIteratorService } from 'src/database/commands/command-runners/workspace-iterator.service';import { type RunOnWorkspaceArgs } from 'src/database/commands/command-runners/workspace.command-runner';import { RegisteredWorkspaceCommand } from 'src/engine/core-modules/upgrade/decorators/registered-workspace-command.decorator';+import { GlobalWorkspaceOrmManager } from 'src/engine/twenty-orm/global-workspace-datasource/global-workspace-orm.manager';+import { buildSystemAuthContext } from 'src/engine/twenty-orm/utils/build-system-auth-context.util';import { WorkspaceCacheService } from 'src/engine/workspace-cache/services/workspace-cache.service';import { type WorkflowVersionWorkspaceEntity } from 'src/modules/workflow/common/standard-objects/workflow-version.workspace-entity';@@ -26,6 +28,7 @@ export class BackfillWorkflowVersionCoreLinksCommand extends ProvisionedWorkspacconstructor(protected readonly workspaceIteratorService: WorkspaceIteratorService,private readonly workspaceCacheService: WorkspaceCacheService,+ private readonly globalWorkspaceOrmManager: GlobalWorkspaceOrmManager,) {super(workspaceIteratorService);}@@ -46,13 +49,20 @@ export class BackfillWorkflowVersionCoreLinksCommand extends ProvisionedWorkspaclet workspaceWorkflowVersions: WorkflowVersionWorkspaceEntity[];try {- const workflowVersionRepository =- dataSource.getRepository<WorkflowVersionWorkspaceEntity>(- 'workflowVersion',- { shouldBypassPermissionChecks: true },+ workspaceWorkflowVersions =+ await this.globalWorkspaceOrmManager.executeInWorkspaceContext(+ async () => {+ const workflowVersionRepository =+ await this.globalWorkspaceOrmManager.getRepository<WorkflowVersionWorkspaceEntity>(+ workspaceId,+ 'workflowVersion',+ { shouldBypassPermissionChecks: true },+ );++ return workflowVersionRepository.find();+ },+ buildSystemAuthContext(workspaceId),);-- workspaceWorkflowVersions = await workflowVersionRepository.find();} catch (error) {if (isWorkspaceObjectNotFoundError(error)) {this.logger.log(diff --git a/packages/twenty-server/src/database/commands/upgrade-version-command/2-23/2-23-workspace-command-1784286707000-backfill-workflow-core-links.command.ts b/packages/twenty-server/src/database/commands/upgrade-version-command/2-23/2-23-workspace-command-1784286707000-backfill-workflow-core-links.command.tsindex 81263c46e23..11cee5ce91d 100644--- a/packages/twenty-server/src/database/commands/upgrade-version-command/2-23/2-23-workspace-command-1784286707000-backfill-workflow-core-links.command.ts+++ b/packages/twenty-server/src/database/commands/upgrade-version-command/2-23/2-23-workspace-command-1784286707000-backfill-workflow-core-links.command.ts@@ -7,6 +7,8 @@ import { ProvisionedWorkspaceCommandRunner } from 'src/database/commands/commandimport { WorkspaceIteratorService } from 'src/database/commands/command-runners/workspace-iterator.service';import { type RunOnWorkspaceArgs } from 'src/database/commands/command-runners/workspace.command-runner';import { RegisteredWorkspaceCommand } from 'src/engine/core-modules/upgrade/decorators/registered-workspace-command.decorator';+import { GlobalWorkspaceOrmManager } from 'src/engine/twenty-orm/global-workspace-datasource/global-workspace-orm.manager';+import { buildSystemAuthContext } from 'src/engine/twenty-orm/utils/build-system-auth-context.util';import { type WorkflowWorkspaceEntity } from 'src/modules/workflow/common/standard-objects/workflow.workspace-entity';// Full rebuild of the core workflow rows for a workspace once@@ -24,6 +26,7 @@ import { type WorkflowWorkspaceEntity } from 'src/modules/workflow/common/standaexport class BackfillWorkflowCoreLinksCommand extends ProvisionedWorkspaceCommandRunner {constructor(protected readonly workspaceIteratorService: WorkspaceIteratorService,+ private readonly globalWorkspaceOrmManager: GlobalWorkspaceOrmManager,) {super(workspaceIteratorService);}@@ -44,12 +47,20 @@ export class BackfillWorkflowCoreLinksCommand extends ProvisionedWorkspaceCommanlet workspaceWorkflows: WorkflowWorkspaceEntity[];try {- const workflowRepository =- dataSource.getRepository<WorkflowWorkspaceEntity>('workflow', {- shouldBypassPermissionChecks: true,- });-- workspaceWorkflows = await workflowRepository.find();+ workspaceWorkflows =+ await this.globalWorkspaceOrmManager.executeInWorkspaceContext(+ async () => {+ const workflowRepository =+ await this.globalWorkspaceOrmManager.getRepository<WorkflowWorkspaceEntity>(+ workspaceId,+ 'workflow',+ { shouldBypassPermissionChecks: true },+ );++ return workflowRepository.find();+ },+ buildSystemAuthContext(workspaceId),+ );} catch (error) {if (isWorkspaceObjectNotFoundError(error)) {this.logger.log(diff --git a/packages/twenty-server/src/database/commands/upgrade-version-command/2-28/2-28-workspace-command-1785600000000-repair-orphan-core-workflow-versions.command.ts b/packages/twenty-server/src/database/commands/upgrade-version-command/2-28/2-28-workspace-command-1785600000000-repair-orphan-core-workflow-versions.command.tsindex 40324240359..b3dc3c5a967 100644--- a/packages/twenty-server/src/database/commands/upgrade-version-command/2-28/2-28-workspace-command-1785600000000-repair-orphan-core-workflow-versions.command.ts+++ b/packages/twenty-server/src/database/commands/upgrade-version-command/2-28/2-28-workspace-command-1785600000000-repair-orphan-core-workflow-versions.command.ts@@ -6,6 +6,8 @@ import { ProvisionedWorkspaceCommandRunner } from 'src/database/commands/commandimport { WorkspaceIteratorService } from 'src/database/commands/command-runners/workspace-iterator.service';import { type RunOnWorkspaceArgs } from 'src/database/commands/command-runners/workspace.command-runner';import { RegisteredWorkspaceCommand } from 'src/engine/core-modules/upgrade/decorators/registered-workspace-command.decorator';+import { GlobalWorkspaceOrmManager } from 'src/engine/twenty-orm/global-workspace-datasource/global-workspace-orm.manager';+import { buildSystemAuthContext } from 'src/engine/twenty-orm/utils/build-system-auth-context.util';import { WorkspaceCacheService } from 'src/engine/workspace-cache/services/workspace-cache.service';import { getWorkspaceSchemaName } from 'src/engine/workspace-datasource/utils/get-workspace-schema-name.util';import { type WorkflowVersionWorkspaceEntity } from 'src/modules/workflow/common/standard-objects/workflow-version.workspace-entity';@@ -26,6 +28,7 @@ export class RepairOrphanCoreWorkflowVersionsCommand extends ProvisionedWorkspacconstructor(protected readonly workspaceIteratorService: WorkspaceIteratorService,private readonly workspaceCacheService: WorkspaceCacheService,+ private readonly globalWorkspaceOrmManager: GlobalWorkspaceOrmManager,) {super(workspaceIteratorService);}@@ -40,15 +43,23 @@ export class RepairOrphanCoreWorkflowVersionsCommand extends ProvisionedWorkspac}try {- // Resolve the workspace workflowVersion object; EntityMetadataNotFoundError+ // Resolve the workspace workflowVersion object; an object-not-found error// means it was never provisioned, so there is nothing to repair and the// orphan query below would fail to resolve its schema table. Skip cleanly// like the sibling backfill commands rather than aborting the upgrade.- await dataSource- .getRepository<WorkflowVersionWorkspaceEntity>('workflowVersion', {- shouldBypassPermissionChecks: true,- })- .count();+ await this.globalWorkspaceOrmManager.executeInWorkspaceContext(+ async () => {+ const workflowVersionRepository =+ await this.globalWorkspaceOrmManager.getRepository<WorkflowVersionWorkspaceEntity>(+ workspaceId,+ 'workflowVersion',+ { shouldBypassPermissionChecks: true },+ );++ return workflowVersionRepository.count();+ },+ buildSystemAuthContext(workspaceId),+ );} catch (error) {if (isWorkspaceObjectNotFoundError(error)) {return;diff --git a/packages/twenty-server/src/database/commands/upgrade-version-command/2-28/__tests__/2-28-workspace-command-1785600000000-repair-orphan-core-workflow-versions.command.spec.ts b/packages/twenty-server/src/database/commands/upgrade-version-command/2-28/__tests__/2-28-workspace-command-1785600000000-repair-orphan-core-workflow-versions.command.spec.tsindex 9b7e0ce9f1b..54e41751991 100644--- a/packages/twenty-server/src/database/commands/upgrade-version-command/2-28/__tests__/2-28-workspace-command-1785600000000-repair-orphan-core-workflow-versions.command.spec.ts+++ b/packages/twenty-server/src/database/commands/upgrade-version-command/2-28/__tests__/2-28-workspace-command-1785600000000-repair-orphan-core-workflow-versions.command.spec.ts@@ -1,8 +1,13 @@import { type DataSource, type QueryRunner } from 'typeorm';-import { EntityMetadataNotFoundError } from 'typeorm/error/EntityMetadataNotFoundError';++import {+ TwentyOrmV2Exception,+ TwentyOrmV2ExceptionCode,+} from 'src/engine/twenty-orm-v2/exceptions/twenty-orm-v2.exception';import { type WorkspaceIteratorService } from 'src/database/commands/command-runners/workspace-iterator.service';import { RepairOrphanCoreWorkflowVersionsCommand } from 'src/database/commands/upgrade-version-command/2-28/2-28-workspace-command-1785600000000-repair-orphan-core-workflow-versions.command';+import { type GlobalWorkspaceOrmManager } from 'src/engine/twenty-orm/global-workspace-datasource/global-workspace-orm.manager';import { type WorkspaceCacheService } from 'src/engine/workspace-cache/services/workspace-cache.service';const WORKSPACE_ID = '20202020-0000-0000-0000-000000000001';@@ -49,20 +54,28 @@ const setup = ({} as unknown as QueryRunner;const count = objectMissing- ? jest- .fn()- .mockRejectedValue(new EntityMetadataNotFoundError('workflowVersion'))+ ? jest.fn().mockRejectedValue(+ new TwentyOrmV2Exception(+ 'Object "workflowVersion" does not exist in this workspace',+ TwentyOrmV2ExceptionCode.UNKNOWN_OBJECT,+ ),+ ): jest.fn().mockResolvedValue(0);const dataSource = {- getRepository: () => ({ count }),createQueryRunner: () => queryRunner,} as unknown as DataSource;+ const globalWorkspaceOrmManager = {+ executeInWorkspaceContext: (fn: () => Promise<unknown>) => fn(),+ getRepository: () => ({ count }),+ } as unknown as GlobalWorkspaceOrmManager;+const recompute = jest.fn();const command = new RepairOrphanCoreWorkflowVersionsCommand({} as WorkspaceIteratorService,{ invalidateAndRecompute: recompute } as unknown as WorkspaceCacheService,+ globalWorkspaceOrmManager,);const run = (dryRun = false) =>diff --git a/packages/twenty-server/src/database/commands/upgrade-version-command/2-33/2-33-workspace-command-1787400001000-replace-timeline-activity-name-with-type.command.ts b/packages/twenty-server/src/database/commands/upgrade-version-command/2-33/2-33-workspace-command-1787400001000-replace-timeline-activity-name-with-type.command.tsindex 9b5768cb6af..6153d2ab1d0 100644--- a/packages/twenty-server/src/database/commands/upgrade-version-command/2-33/2-33-workspace-command-1787400001000-replace-timeline-activity-name-with-type.command.ts+++ b/packages/twenty-server/src/database/commands/upgrade-version-command/2-33/2-33-workspace-command-1787400001000-replace-timeline-activity-name-with-type.command.ts@@ -236,8 +236,6 @@ export class ReplaceTimelineActivityNameWithTypeCommand extends ProvisionedWorksconst result = await dataSource.query(backfillQuery.sql,backfillQuery.parameters,- undefined,- { shouldBypassPermissionChecks: true },);lastBatchRowCount = result?.[1] ?? 0;diff --git a/packages/twenty-server/src/database/commands/upgrade-version-command/2-34/2-34-workspace-command-1787471608317-configure-timeline-activity-routing.command.ts b/packages/twenty-server/src/database/commands/upgrade-version-command/2-34/2-34-workspace-command-1787471608317-configure-timeline-activity-routing.command.tsindex 786a3f53daa..72ce78275fe 100644--- a/packages/twenty-server/src/database/commands/upgrade-version-command/2-34/2-34-workspace-command-1787471608317-configure-timeline-activity-routing.command.ts+++ b/packages/twenty-server/src/database/commands/upgrade-version-command/2-34/2-34-workspace-command-1787471608317-configure-timeline-activity-routing.command.ts@@ -106,7 +106,6 @@ export class ConfigureTimelineActivityRoutingCommand extends ProvisionedWorkspacAND timeline_activity_type."universalIdentifier" = routing."universalIdentifier"`,[workspaceId, twentyStandardFlatApplication.id, ...routingParameters],queryRunner,- { shouldBypassPermissionChecks: true },);const junctionConditions = JUNCTION_TARGETS.map(@@ -135,7 +134,6 @@ export class ConfigureTimelineActivityRoutingCommand extends ProvisionedWorkspac),],queryRunner,- { shouldBypassPermissionChecks: true },);validateStandardMetadataUpdateCount({diff --git a/packages/twenty-server/src/database/commands/upgrade-version-command/2-34/2-34-workspace-command-1787471608318-configure-standard-timeline-renderers.command.ts b/packages/twenty-server/src/database/commands/upgrade-version-command/2-34/2-34-workspace-command-1787471608318-configure-standard-timeline-renderers.command.tsindex 3165568f9b9..5d8736cf3c0 100644--- a/packages/twenty-server/src/database/commands/upgrade-version-command/2-34/2-34-workspace-command-1787471608318-configure-standard-timeline-renderers.command.ts+++ b/packages/twenty-server/src/database/commands/upgrade-version-command/2-34/2-34-workspace-command-1787471608318-configure-standard-timeline-renderers.command.ts@@ -92,8 +92,6 @@ export class ConfigureStandardTimelineRenderersCommand extends ProvisionedWorkspAND timeline_activity_type."applicationId" = $2AND timeline_activity_type."universalIdentifier" = renderer."universalIdentifier"`,[workspaceId, twentyStandardFlatApplication.id, ...parameters],- undefined,- { shouldBypassPermissionChecks: true },);await this.workspaceCacheService.invalidateAndRecompute(workspaceId, [diff --git a/packages/twenty-server/src/database/commands/upgrade-version-command/2-34/2-34-workspace-command-1787471608319-add-timeline-activity-type-snapshot.command.ts b/packages/twenty-server/src/database/commands/upgrade-version-command/2-34/2-34-workspace-command-1787471608319-add-timeline-activity-type-snapshot.command.tsindex 03ec3f12395..d90361bb497 100644--- a/packages/twenty-server/src/database/commands/upgrade-version-command/2-34/2-34-workspace-command-1787471608319-add-timeline-activity-type-snapshot.command.ts+++ b/packages/twenty-server/src/database/commands/upgrade-version-command/2-34/2-34-workspace-command-1787471608319-add-timeline-activity-type-snapshot.command.ts@@ -193,8 +193,6 @@ export class AddTimelineActivityTypeSnapshotCommand extends ProvisionedWorkspaceconst result = await dataSource.query(backfillQuery.sql,backfillQuery.parameters,- undefined,- { shouldBypassPermissionChecks: true },);lastBatchRowCount = result?.[1] ?? 0;@@ -223,8 +221,6 @@ export class AddTimelineActivityTypeSnapshotCommand extends ProvisionedWorkspaceawait dataSource.query<[Array<{ id: string }>, number]>(backfillQuery.sql,backfillQuery.parameters,- undefined,- { shouldBypassPermissionChecks: true },);lastBatchRowCount = updatedRowCount;diff --git a/packages/twenty-server/src/database/commands/upgrade-version-command/2-5/2-5-workspace-command-1778000001000-normalize-composite-field-defaults.command.ts b/packages/twenty-server/src/database/commands/upgrade-version-command/2-5/2-5-workspace-command-1778000001000-normalize-composite-field-defaults.command.tsindex 43b330c74f1..bcee106bff4 100644--- a/packages/twenty-server/src/database/commands/upgrade-version-command/2-5/2-5-workspace-command-1778000001000-normalize-composite-field-defaults.command.ts+++ b/packages/twenty-server/src/database/commands/upgrade-version-command/2-5/2-5-workspace-command-1778000001000-normalize-composite-field-defaults.command.ts@@ -210,8 +210,6 @@ export class NormalizeCompositeFieldDefaultsCommand extends ProvisionedWorkspaceSET "${columnName}" = NULLWHERE "${columnName}"::text IN ('', '""')`,undefined,- undefined,- { shouldBypassPermissionChecks: true },);this.logger.log(diff --git a/packages/twenty-server/src/engine/api/common/common-query-runners/common-base-query-runner.service.ts b/packages/twenty-server/src/engine/api/common/common-query-runners/common-base-query-runner.service.tsindex 5ba13d4854a..dde0acdce65 100644--- a/packages/twenty-server/src/engine/api/common/common-query-runners/common-base-query-runner.service.ts+++ b/packages/twenty-server/src/engine/api/common/common-query-runners/common-base-query-runner.service.ts@@ -67,7 +67,6 @@ import {RelationNestedQueries,} from 'src/engine/twenty-orm/field-operations/relation-nested-queries/relation-nested-queries';import { GlobalWorkspaceOrmManager } from 'src/engine/twenty-orm/global-workspace-datasource/global-workspace-orm.manager';-import { type WorkspaceRepository } from 'src/engine/twenty-orm/repository/workspace.repository';import { getWorkspaceContext } from 'src/engine/twenty-orm/storage/orm-workspace-context.storage';import { resolveRolePermissionConfig } from 'src/engine/twenty-orm/utils/resolve-role-permission-config.util';import { WorkspaceDataSourceV2Service } from 'src/engine/twenty-orm-v2/datasource/workspace-data-source-v2.service';@@ -357,7 +356,7 @@ export abstract class CommonBaseQueryRunnerService<.getRepository(queryRunnerContext.flatObjectMetadata.nameSingular,rolePermissionConfig,- ) as unknown as WorkspaceRepository<ObjectLiteral>;+ ) as unknown as WorkspaceRepositoryV2<ObjectLiteral>;return {...queryRunnerContext,diff --git a/packages/twenty-server/src/engine/api/common/common-query-runners/common-create-many-query-runner/common-create-many-query-runner.service.ts b/packages/twenty-server/src/engine/api/common/common-query-runners/common-create-many-query-runner/common-create-many-query-runner.service.tsindex 1a79efd255e..066f2bf2dc0 100644--- a/packages/twenty-server/src/engine/api/common/common-query-runners/common-create-many-query-runner/common-create-many-query-runner.service.ts+++ b/packages/twenty-server/src/engine/api/common/common-query-runners/common-create-many-query-runner/common-create-many-query-runner.service.ts@@ -46,7 +46,7 @@ import { buildFieldMapsFromFlatObjectMetadata } from 'src/engine/metadata-moduleimport { type FlatIndexMetadata } from 'src/engine/metadata-modules/flat-index-metadata/types/flat-index-metadata.type';import { type FlatObjectMetadata } from 'src/engine/metadata-modules/flat-object-metadata/types/flat-object-metadata.type';import { assertMutationNotOnRemoteObject } from 'src/engine/metadata-modules/object-metadata/utils/assert-mutation-not-on-remote-object.util';-import { WorkspaceRepository } from 'src/engine/twenty-orm/repository/workspace.repository';+import { WorkspaceRepositoryV2 } from 'src/engine/twenty-orm-v2/repository/workspace-repository-v2';import { RolePermissionConfig } from 'src/engine/twenty-orm/types/role-permission-config';@Injectable()@@ -215,7 +215,7 @@ export class CommonCreateManyQueryRunnerService extends CommonBaseQueryRunnerSerworkspaceId,queryRunnerContext,}: {- repository: WorkspaceRepository<ObjectLiteral>;+ repository: WorkspaceRepositoryV2<ObjectLiteral>;flatObjectMetadata: FlatObjectMetadata;flatObjectMetadataMaps: FlatEntityMaps<FlatObjectMetadata>;flatFieldMetadataMaps: FlatEntityMaps<FlatFieldMetadata>;@@ -271,7 +271,7 @@ export class CommonCreateManyQueryRunnerService extends CommonBaseQueryRunnerSerworkspaceId,queryRunnerContext,}: {- repository: WorkspaceRepository<ObjectLiteral>;+ repository: WorkspaceRepositoryV2<ObjectLiteral>;flatObjectMetadata: FlatObjectMetadata;flatObjectMetadataMaps: FlatEntityMaps<FlatObjectMetadata>;flatFieldMetadataMaps: FlatEntityMaps<FlatFieldMetadata>;@@ -381,7 +381,7 @@ export class CommonCreateManyQueryRunnerService extends CommonBaseQueryRunnerSerargs,conflictingFieldGroups,}: {- repository: WorkspaceRepository<ObjectLiteral>;+ repository: WorkspaceRepositoryV2<ObjectLiteral>;flatObjectMetadata: FlatObjectMetadata;flatFieldMetadataMaps: FlatEntityMaps<FlatFieldMetadata>;args: CreateManyQueryArgs;@@ -526,7 +526,7 @@ export class CommonCreateManyQueryRunnerService extends CommonBaseQueryRunnerSerflatObjectMetadata: FlatObjectMetadata;flatObjectMetadataMaps: FlatEntityMaps<FlatObjectMetadata>;flatFieldMetadataMaps: FlatEntityMaps<FlatFieldMetadata>;- repository: WorkspaceRepository<ObjectLiteral>;+ repository: WorkspaceRepositoryV2<ObjectLiteral>;selectedFieldsResult: CommonSelectedFieldsResult;}): Promise<ObjectRecord[]> {const queryBuilder = repository.createQueryBuilder(diff --git a/packages/twenty-server/src/engine/api/common/types/common-extended-query-runner-context.type.ts b/packages/twenty-server/src/engine/api/common/types/common-extended-query-runner-context.type.tsindex 953bea74c9e..4b97427dad5 100644--- a/packages/twenty-server/src/engine/api/common/types/common-extended-query-runner-context.type.ts+++ b/packages/twenty-server/src/engine/api/common/types/common-extended-query-runner-context.type.ts@@ -4,7 +4,7 @@ import { type FeatureFlagKey } from 'twenty-shared/types';import { type WorkspaceAuthContext } from 'src/engine/core-modules/auth/types/workspace-auth-context.type';import { type CommonBaseQueryRunnerContext } from 'src/engine/api/common/types/common-base-query-runner-context.type';import { type GraphqlQueryParser } from 'src/engine/api/graphql/graphql-query-runner/graphql-query-parsers/graphql-query.parser';-import { type WorkspaceRepository } from 'src/engine/twenty-orm/repository/workspace.repository';+import { type WorkspaceRepositoryV2 } from 'src/engine/twenty-orm-v2/repository/workspace-repository-v2';import { type RolePermissionConfig } from 'src/engine/twenty-orm/types/role-permission-config';export type CommonExtendedQueryRunnerContext = Omit<@@ -13,7 +13,7 @@ export type CommonExtendedQueryRunnerContext = Omit<> & {authContext: WorkspaceAuthContext;rolePermissionConfig: RolePermissionConfig;- repository: WorkspaceRepository<ObjectLiteral>;+ repository: WorkspaceRepositoryV2<ObjectLiteral>;commonQueryParser: GraphqlQueryParser;featureFlagsMap: Record<FeatureFlagKey, boolean>;};diff --git a/packages/twenty-server/src/engine/api/graphql/graphql-query-runner/graphql-query-parsers/graphql-query-filter/__tests__/graphql-query-filter-condition.parser.spec.ts b/packages/twenty-server/src/engine/api/graphql/graphql-query-runner/graphql-query-parsers/graphql-query-filter/__tests__/graphql-query-filter-condition.parser.spec.tsindex f2216e36e6d..8604cb21ab4 100644--- a/packages/twenty-server/src/engine/api/graphql/graphql-query-runner/graphql-query-parsers/graphql-query-filter/__tests__/graphql-query-filter-condition.parser.spec.ts+++ b/packages/twenty-server/src/engine/api/graphql/graphql-query-runner/graphql-query-parsers/graphql-query-filter/__tests__/graphql-query-filter-condition.parser.spec.ts@@ -3,13 +3,12 @@ import {type RecordedWhereCall,} from 'test/utils/create-where-expression-recorder.util';import { FieldMetadataType } from 'twenty-shared/types';-import { type ObjectLiteral } from 'typeorm';+import { type RecordQueryBuilder } from 'src/engine/api/graphql/graphql-query-runner/types/record-query-builder.type';import { GraphqlQueryFilterConditionParser } from 'src/engine/api/graphql/graphql-query-runner/graphql-query-parsers/graphql-query-filter/graphql-query-filter-condition.parser';import { type FlatEntityMaps } from 'src/engine/metadata-modules/flat-entity/types/flat-entity-maps.type';import { type FlatFieldMetadata } from 'src/engine/metadata-modules/flat-field-metadata/types/flat-field-metadata.type';import { type FlatObjectMetadata } from 'src/engine/metadata-modules/flat-object-metadata/types/flat-object-metadata.type';-import { type WorkspaceSelectQueryBuilder } from 'src/engine/twenty-orm/repository/workspace-select-query-builder';const createFlatFieldMetadata = (overrides: Partial<FlatFieldMetadata>,@@ -58,7 +57,7 @@ const flatFieldMetadataMaps: FlatEntityMaps<FlatFieldMetadata> = {const outerQueryBuilder = {objectRecordsPermissions: {},-} as unknown as WorkspaceSelectQueryBuilder<ObjectLiteral>;+} as unknown as RecordQueryBuilder;const recordFilterEntries = (filter: Record<string, unknown>) => {const recorder = createWhereExpressionRecorder();diff --git a/packages/twenty-server/src/engine/api/graphql/workspace-query-runner/utils/find-conflicting-record.util.ts b/packages/twenty-server/src/engine/api/graphql/workspace-query-runner/utils/find-conflicting-record.util.tsdeleted file mode 100644index d3ea578dcff..00000000000--- a/packages/twenty-server/src/engine/api/graphql/workspace-query-runner/utils/find-conflicting-record.util.ts+++ /dev/null@@ -1,76 +0,0 @@-import { compositeTypeDefinitions } from 'twenty-shared/types';-import { capitalize } from 'twenty-shared/utils';--import { type WorkspaceInternalContext } from 'src/engine/twenty-orm/interfaces/workspace-internal-context.interface';--import { getFlatFieldsFromFlatObjectMetadata } from 'src/engine/api/graphql/workspace-schema-builder/utils/get-flat-fields-for-flat-object-metadata.util';-import { type FlatObjectMetadata } from 'src/engine/metadata-modules/flat-object-metadata/types/flat-object-metadata.type';-import { type WorkspaceEntityManager } from 'src/engine/twenty-orm/entity-manager/workspace-entity-manager';--export const findConflictingRecord = async (- columnName: string,- conflictingValue: string,- objectMetadata: FlatObjectMetadata,- internalContext: WorkspaceInternalContext,- entityManager: WorkspaceEntityManager,-): Promise<{ conflictingRecordId: string; fieldLabel: string } | null> => {- const flatFields = getFlatFieldsFromFlatObjectMetadata(- objectMetadata,- internalContext.flatFieldMetadataMaps,- );-- const uniqueFields = flatFields.filter((field) => field.isUnique);-- const matchingField = uniqueFields.find((field) => {- const compositeType = compositeTypeDefinitions.get(field.type);-- if (!compositeType) {- return field.name === columnName;- }-- const property = compositeType.properties.find(- (prop) => prop.isIncludedInUniqueConstraint,- );-- if (!property) {- return false;- }-- const expectedColumnName = `${field.name}${capitalize(property.name)}`;-- return expectedColumnName === columnName;- });-- if (!matchingField) {- return null;- }-- const queryBuilder = entityManager.createQueryBuilder(- objectMetadata.nameSingular,- objectMetadata.nameSingular,- undefined,- {- shouldBypassPermissionChecks: true,- },- );-- queryBuilder.where(`"${columnName}" = :value`, { value: conflictingValue });- queryBuilder.andWhere('"deletedAt" IS NULL');-- try {- const conflictingRecord = await queryBuilder.getOne();-- if (!conflictingRecord) {- return null;- }-- return {- conflictingRecordId: conflictingRecord.id,- fieldLabel: matchingField.label,- };- } catch {- // If query fails (e.g., permission denied, record not found), return null- // This allows the duplicate error to still be shown without conflicting record link- return null;- }-};diff --git a/packages/twenty-server/src/engine/api/graphql/workspace-query-runner/utils/handle-duplicate-key-error.util.ts b/packages/twenty-server/src/engine/api/graphql/workspace-query-runner/utils/handle-duplicate-key-error.util.tsdeleted file mode 100644index ca1640d7a5c..00000000000--- a/packages/twenty-server/src/engine/api/graphql/workspace-query-runner/utils/handle-duplicate-key-error.util.ts+++ /dev/null@@ -1,72 +0,0 @@-import { msg } from '@lingui/core/macro';--import {- DUPLICATE_ENTRY_DETECTED_MESSAGE,- DUPLICATE_ENTRY_USER_FRIENDLY_MESSAGE,-} from 'src/engine/api/graphql/workspace-query-runner/constants/postgres-error-messages.constants';-import { type WorkspaceInternalContext } from 'src/engine/twenty-orm/interfaces/workspace-internal-context.interface';--import { type FlatObjectMetadata } from 'src/engine/metadata-modules/flat-object-metadata/types/flat-object-metadata.type';-import { type WorkspaceEntityManager } from 'src/engine/twenty-orm/entity-manager/workspace-entity-manager';-import {- TwentyORMException,- TwentyORMExceptionCode,-} from 'src/engine/twenty-orm/exceptions/twenty-orm.exception';--import { findConflictingRecord } from './find-conflicting-record.util';-import {- parsePostgresConstraintError,- type PostgreSQLError,-} from './parse-postgres-constraint-error.util';--interface DuplicateKeyErrorWithMetadata extends TwentyORMException {- conflictingRecordId?: string;- conflictingObjectNameSingular?: string;-}--export const handleDuplicateKeyError = async (- error: PostgreSQLError,- objectMetadata: FlatObjectMetadata,- internalContext: WorkspaceInternalContext,- entityManager: WorkspaceEntityManager,-): Promise<DuplicateKeyErrorWithMetadata> => {- const parsedError = parsePostgresConstraintError(error);-- if (!parsedError) {- return new TwentyORMException(- DUPLICATE_ENTRY_DETECTED_MESSAGE,- TwentyORMExceptionCode.DUPLICATE_ENTRY_DETECTED,- {- userFriendlyMessage: DUPLICATE_ENTRY_USER_FRIENDLY_MESSAGE,- },- );- }-- const conflictingRecord = await findConflictingRecord(- parsedError.columnName,- parsedError.conflictingValue,- objectMetadata,- internalContext,- entityManager,- );-- const fieldLabel = conflictingRecord?.fieldLabel;- const userFriendlyMessage = fieldLabel- ? msg`This ${fieldLabel} value is already in use. Please check your data and try again.`- : DUPLICATE_ENTRY_USER_FRIENDLY_MESSAGE;-- const exception: DuplicateKeyErrorWithMetadata = new TwentyORMException(- DUPLICATE_ENTRY_DETECTED_MESSAGE,- TwentyORMExceptionCode.DUPLICATE_ENTRY_DETECTED,- {- userFriendlyMessage,- },- );-- if (conflictingRecord) {- exception.conflictingRecordId = conflictingRecord.conflictingRecordId;- exception.conflictingObjectNameSingular = objectMetadata.nameSingular;- }-- return exception;-};diff --git a/packages/twenty-server/src/engine/api/rest/core/rest-api-core.module.ts b/packages/twenty-server/src/engine/api/rest/core/rest-api-core.module.tsindex 7cb4199d40b..60c29c50d5b 100644--- a/packages/twenty-server/src/engine/api/rest/core/rest-api-core.module.ts+++ b/packages/twenty-server/src/engine/api/rest/core/rest-api-core.module.ts@@ -27,7 +27,6 @@ import { FeatureFlagModule } from 'src/engine/core-modules/feature-flag/feature-import { RecordTransformerModule } from 'src/engine/core-modules/record-transformer/record-transformer.module';import { WorkspaceManyOrAllFlatEntityMapsCacheModule } from 'src/engine/metadata-modules/flat-entity/services/workspace-many-or-all-flat-entity-maps-cache.module';import { UserRoleModule } from 'src/engine/metadata-modules/user-role/user-role.module';-import { TwentyORMModule } from 'src/engine/twenty-orm/twenty-orm.module';import { WorkspaceCacheStorageModule } from 'src/engine/workspace-cache-storage/workspace-cache-storage.module';import { WorkspaceCacheModule } from 'src/engine/workspace-cache/workspace-cache.module';@@ -56,7 +55,6 @@ const restApiCoreResolvers = [AuthModule,ApiKeyModule,UserRoleModule,- TwentyORMModule,RecordTransformerModule,WorkspaceManyOrAllFlatEntityMapsCacheModule,ActorModule,diff --git a/packages/twenty-server/src/engine/core-modules/imap-smtp-caldav-connection/imap-smtp-caldav-connection.module.ts b/packages/twenty-server/src/engine/core-modules/imap-smtp-caldav-connection/imap-smtp-caldav-connection.module.tsindex be4f82dd37b..f220ab3fffe 100644--- a/packages/twenty-server/src/engine/core-modules/imap-smtp-caldav-connection/imap-smtp-caldav-connection.module.ts+++ b/packages/twenty-server/src/engine/core-modules/imap-smtp-caldav-connection/imap-smtp-caldav-connection.module.ts@@ -7,7 +7,6 @@ import { MessageQueueModule } from 'src/engine/core-modules/message-queue/messagimport { ConnectedAccountMetadataModule } from 'src/engine/metadata-modules/connected-account/connected-account-metadata.module';import { ConnectedAccountTokenEncryptionModule } from 'src/engine/metadata-modules/connected-account/services/connected-account-token-encryption.module';import { PermissionsModule } from 'src/engine/metadata-modules/permissions/permissions.module';-import { TwentyORMModule } from 'src/engine/twenty-orm/twenty-orm.module';import { CalDavDriverModule } from 'src/modules/calendar/calendar-event-import-manager/drivers/caldav/caldav-driver.module';import { ConnectedAccountModule } from 'src/modules/connected-account/connected-account.module';import { IMAPAPIsModule } from 'src/modules/connected-account/imap-api/imap-apis.module';@@ -27,7 +26,6 @@ import { ImapSmtpCaldavService } from './services/imap-smtp-caldav-connection.seIMAPAPIsModule,MessagingImportManagerModule,MessageQueueModule,- TwentyORMModule,FeatureFlagModule,ImapSmtpCaldavValidatorModule,PermissionsModule,diff --git a/packages/twenty-server/src/engine/core-modules/messaging/services/timeline-messaging.service.ts b/packages/twenty-server/src/engine/core-modules/messaging/services/timeline-messaging.service.tsindex 3937fca16b2..9e947e49da0 100644--- a/packages/twenty-server/src/engine/core-modules/messaging/services/timeline-messaging.service.ts+++ b/packages/twenty-server/src/engine/core-modules/messaging/services/timeline-messaging.service.ts@@ -153,7 +153,7 @@ export class TimelineMessagingService {}).orderBy('message.messageThreadId').distinctOn(['message.messageThreadId', 'messageParticipant.handle'])- .getMany();+ .getMany<MessageParticipantWorkspaceEntity>();const orderedThreadParticipants = threadParticipants.sort((a, b) =>diff --git a/packages/twenty-server/src/engine/core-modules/record-position/record-position.module.ts b/packages/twenty-server/src/engine/core-modules/record-position/record-position.module.tsindex 9a4db5a699d..8165137494d 100644--- a/packages/twenty-server/src/engine/core-modules/record-position/record-position.module.ts+++ b/packages/twenty-server/src/engine/core-modules/record-position/record-position.module.ts@@ -1,11 +1,9 @@import { Module } from '@nestjs/common';-import { TwentyORMModule } from 'src/engine/twenty-orm/twenty-orm.module';-import { RecordPositionService } from './services/record-position.service';@Module({- imports: [TwentyORMModule],+ imports: [],providers: [RecordPositionService],exports: [RecordPositionService],})diff --git a/packages/twenty-server/src/engine/core-modules/related-person-ids/services/related-person-ids.service.ts b/packages/twenty-server/src/engine/core-modules/related-person-ids/services/related-person-ids.service.tsindex b71da64ee48..599046d8062 100644--- a/packages/twenty-server/src/engine/core-modules/related-person-ids/services/related-person-ids.service.ts+++ b/packages/twenty-server/src/engine/core-modules/related-person-ids/services/related-person-ids.service.ts@@ -1,7 +1,7 @@import { Injectable } from '@nestjs/common';import { isDefined } from 'twenty-shared/utils';-import { In, type FindOptionsSelect, type FindOptionsWhere } from 'typeorm';+import { In, type FindOptionsWhere } from 'typeorm';import { RelationType } from 'src/engine/metadata-modules/field-metadata/interfaces/relation-type.interface';import {@@ -98,9 +98,7 @@ export class RelatedPersonIdsService {if (hop.direction === RelationType.MANY_TO_ONE) {const records = await repository.find({where: { id: In(currentIds) } as FindOptionsWhere<RelationWalkRecord>,- select: {- [hop.joinColumnName]: true,- } as FindOptionsSelect<RelationWalkRecord>,+ select: [hop.joinColumnName],});currentIds = [diff --git a/packages/twenty-server/src/engine/core-modules/search/services/search.service.ts b/packages/twenty-server/src/engine/core-modules/search/services/search.service.tsindex e8fba2fe354..6356ec74401 100644--- a/packages/twenty-server/src/engine/core-modules/search/services/search.service.ts+++ b/packages/twenty-server/src/engine/core-modules/search/services/search.service.ts@@ -52,7 +52,7 @@ import { getEffectiveImageIdentifierFieldMetadataId } from 'src/engine/metadata-import { SEARCH_VECTOR_FIELD } from 'src/engine/metadata-modules/search-field-metadata/constants/search-vector-field.constants';import { resolveEffectiveEntityProperty } from 'src/engine/metadata-modules/utils/resolve-effective-entity-property.util';import { GlobalWorkspaceOrmManager } from 'src/engine/twenty-orm/global-workspace-datasource/global-workspace-orm.manager';-import { type WorkspaceRepository } from 'src/engine/twenty-orm/repository/workspace.repository';+import { type WorkspaceRepositoryV2 } from 'src/engine/twenty-orm-v2/repository/workspace-repository-v2';import { getWorkspaceContext } from 'src/engine/twenty-orm/storage/orm-workspace-context.storage';import { resolveRolePermissionConfig } from 'src/engine/twenty-orm/utils/resolve-role-permission-config.util';import { type RolePermissionConfig } from 'src/engine/twenty-orm/types/role-permission-config';@@ -217,7 +217,7 @@ export class SearchService {filter,after,}: {- entityManager: WorkspaceRepository<Entity>;+ entityManager: WorkspaceRepositoryV2<Entity>;rolePermissionConfig?: RolePermissionConfig;flatObjectMetadata: FlatObjectMetadata;flatFieldMetadataMaps: FlatEntityMaps<FlatFieldMetadata>;@@ -270,7 +270,7 @@ export class SearchService {filter,after,}: {- entityManager: WorkspaceRepository<Entity>;+ entityManager: WorkspaceRepositoryV2<Entity>;flatObjectMetadata: FlatObjectMetadata;flatFieldMetadataMaps: FlatEntityMaps<FlatFieldMetadata>;searchTerms: string;@@ -373,7 +373,7 @@ export class SearchService {.setParameter('searchTerms', searchTerms).setParameter('searchTermsOr', searchTermsOr).take(limit + 1) // We take one more to check if hasNextPage is true- .getRawMany();+ .getRawMany<ObjectRecord & { tsRank: number; tsRankCD: number }>();}private async buildIlikeFallbackQuery<Entity extends ObjectLiteral>({@@ -385,7 +385,7 @@ export class SearchService {limit,filter,}: {- entityManager: WorkspaceRepository<Entity>;+ entityManager: WorkspaceRepositoryV2<Entity>;rolePermissionConfig?: RolePermissionConfig;flatObjectMetadata: FlatObjectMetadata;flatFieldMetadataMaps: FlatEntityMaps<FlatFieldMetadata>;@@ -475,7 +475,7 @@ export class SearchService {const rawResults = await queryBuilder.orderBy(`"${flatObjectMetadata.nameSingular}"."id"`, 'ASC').take(limit)- .getRawMany();+ .getRawMany<ObjectRecord>();return rawResults.map((record) => ({...record,diff --git a/packages/twenty-server/src/engine/core-modules/user-workspace/user-workspace.module.ts b/packages/twenty-server/src/engine/core-modules/user-workspace/user-workspace.module.tsindex 8d83b761183..7da332cf88a 100644--- a/packages/twenty-server/src/engine/core-modules/user-workspace/user-workspace.module.ts+++ b/packages/twenty-server/src/engine/core-modules/user-workspace/user-workspace.module.ts@@ -20,7 +20,6 @@ import { RoleTargetEntity } from 'src/engine/metadata-modules/role-target/role-timport { provideWorkspaceScopedRepository } from 'src/engine/twenty-orm/workspace-scoped-repository/provide-workspace-scoped-repository';import { RoleValidationModule } from 'src/engine/metadata-modules/role-validation/role-validation.module';import { UserRoleModule } from 'src/engine/metadata-modules/user-role/user-role.module';-import { TwentyORMModule } from 'src/engine/twenty-orm/twenty-orm.module';import { WorkspaceDataSourceModule } from 'src/engine/workspace-datasource/workspace-datasource.module';@Module({@@ -36,7 +35,6 @@ import { WorkspaceDataSourceModule } from 'src/engine/workspace-datasource/worksApprovedAccessDomainModule,WorkspaceInvitationModule,WorkspaceDomainsModule,- TwentyORMModule,UserRoleModule,FileModule,TokenModule,diff --git a/packages/twenty-server/src/engine/core-modules/workflow/services/workflow-version-core-sync.service.ts b/packages/twenty-server/src/engine/core-modules/workflow/services/workflow-version-core-sync.service.tsindex 4c66d37c573..c752f444760 100644--- a/packages/twenty-server/src/engine/core-modules/workflow/services/workflow-version-core-sync.service.ts+++ b/packages/twenty-server/src/engine/core-modules/workflow/services/workflow-version-core-sync.service.ts@@ -14,7 +14,7 @@ import {import { WorkspaceEntity } from 'src/engine/core-modules/workspace/workspace.entity';import { GlobalWorkspaceOrmManager } from 'src/engine/twenty-orm/global-workspace-datasource/global-workspace-orm.manager';import { type WorkspaceTransactionScope } from 'src/engine/twenty-orm/global-workspace-datasource/types/workspace-transaction-scope.type';-import { WorkspaceRepository } from 'src/engine/twenty-orm/repository/workspace.repository';+import { WorkspaceRepositoryV2 } from 'src/engine/twenty-orm-v2/repository/workspace-repository-v2';import { InjectWorkspaceScopedRepository } from 'src/engine/twenty-orm/workspace-scoped-repository/inject-workspace-scoped-repository.decorator';import { WorkspaceScopedRepository } from 'src/engine/twenty-orm/workspace-scoped-repository/workspace-scoped-repository';import { buildSystemAuthContext } from 'src/engine/twenty-orm/utils/build-system-auth-context.util';@@ -276,7 +276,7 @@ export class WorkflowVersionCoreSyncService {async writeWorkflowVersionAndMirror(workspaceId: string,write: (- workflowVersionRepository: WorkspaceRepository<WorkflowVersionWorkspaceEntity>,+ workflowVersionRepository: WorkspaceRepositoryV2<WorkflowVersionWorkspaceEntity>,transactionScope: WorkspaceTransactionScope,) => Promise<string>,): Promise<void> {diff --git a/packages/twenty-server/src/engine/metadata-modules/ai/ai-chat/ai-chat.module.ts b/packages/twenty-server/src/engine/metadata-modules/ai/ai-chat/ai-chat.module.tsindex 6a87f9733c5..ba14864a303 100644--- a/packages/twenty-server/src/engine/metadata-modules/ai/ai-chat/ai-chat.module.ts+++ b/packages/twenty-server/src/engine/metadata-modules/ai/ai-chat/ai-chat.module.ts@@ -20,7 +20,6 @@ import { AiBillingModule } from 'src/engine/metadata-modules/ai/ai-billing/ai-biimport { AiGraphqlApiExceptionInterceptor } from 'src/engine/metadata-modules/ai/interceptors/ai-graphql-api-exception.interceptor';import { PermissionsModule } from 'src/engine/metadata-modules/permissions/permissions.module';import { SkillModule } from 'src/engine/metadata-modules/skill/skill.module';-import { TwentyORMModule } from 'src/engine/twenty-orm/twenty-orm.module';import { provideWorkspaceScopedRepository } from 'src/engine/twenty-orm/workspace-scoped-repository/provide-workspace-scoped-repository';import { WorkspaceCacheStorageModule } from 'src/engine/workspace-cache-storage/workspace-cache-storage.module';import { WorkspaceCacheModule } from 'src/engine/workspace-cache/workspace-cache.module';@@ -60,7 +59,6 @@ import { SystemPromptBuilderService } from './services/system-prompt-builder.serWorkspaceCacheStorageModule,WorkspaceCacheModule,WorkspaceDomainsModule,- TwentyORMModule,TokenModule,UserWorkspaceModule,AiBillingModule,diff --git a/packages/twenty-server/src/engine/metadata-modules/object-metadata/mostly-empty-fields.service.ts b/packages/twenty-server/src/engine/metadata-modules/object-metadata/mostly-empty-fields.service.tsindex 4672e30b410..da80c5799da 100644--- a/packages/twenty-server/src/engine/metadata-modules/object-metadata/mostly-empty-fields.service.ts+++ b/packages/twenty-server/src/engine/metadata-modules/object-metadata/mostly-empty-fields.service.ts@@ -1,4 +1,7 @@import { Injectable } from '@nestjs/common';+import { InjectDataSource } from '@nestjs/typeorm';++import { DataSource } from 'typeorm';import { WorkspaceManyOrAllFlatEntityMapsCacheService } from 'src/engine/metadata-modules/flat-entity/services/workspace-many-or-all-flat-entity-maps-cache.service';import { findFlatEntityByIdInFlatEntityMapsOrThrow } from 'src/engine/metadata-modules/flat-entity/utils/find-flat-entity-by-id-in-flat-entity-maps-or-throw.util';@@ -6,7 +9,6 @@ import { findManyFlatEntityByIdInFlatEntityMapsOrThrow } from 'src/engine/metadaimport { MOSTLY_EMPTY_MINIMUM_ROW_COUNT } from 'src/engine/metadata-modules/object-metadata/constants/mostly-empty-minimum-row-count.constant';import { ObjectRecordCountService } from 'src/engine/metadata-modules/object-metadata/object-record-count.service';import { computeMostlyEmptyFieldMetadataIds } from 'src/engine/metadata-modules/object-metadata/utils/compute-mostly-empty-field-metadata-ids.util';-import { GlobalWorkspaceOrmManager } from 'src/engine/twenty-orm/global-workspace-datasource/global-workspace-orm.manager';import { computeObjectTargetTable } from 'src/engine/utils/compute-object-target-table.util';import { getWorkspaceSchemaName } from 'src/engine/workspace-datasource/utils/get-workspace-schema-name.util';@@ -17,7 +19,8 @@ import { getWorkspaceSchemaName } from 'src/engine/workspace-datasource/utils/ge@Injectable()export class MostlyEmptyFieldsService {constructor(- private readonly globalWorkspaceOrmManager: GlobalWorkspaceOrmManager,+ @InjectDataSource()+ private readonly coreDataSource: DataSource,private readonly workspaceManyOrAllFlatEntityMapsCacheService: WorkspaceManyOrAllFlatEntityMapsCacheService,private readonly objectRecordCountService: ObjectRecordCountService,) {}@@ -57,9 +60,6 @@ export class MostlyEmptyFieldsService {return [];}- const dataSource =- await this.globalWorkspaceOrmManager.getGlobalWorkspaceDataSource();-// Per-column emptiness: null fraction plus the sampled frequency of the// column type's empty sentinel — '' for text columns (NOT NULL DEFAULT ''),// '{}' for arrays, '{}'/'[]' for json. Sentinels are matched per physical@@ -67,7 +67,7 @@ export class MostlyEmptyFieldsService {const columnStatisticsRows: {column_name: string;empty_fraction: number;- }[] = await dataSource.query(+ }[] = await this.coreDataSource.query(`SELECT s.attname AS column_name,(s.null_frac + COALESCE(empty_sentinel.frequency, 0))::float AS empty_fractionFROM pg_stats s@@ -92,8 +92,6 @@ export class MostlyEmptyFieldsService {AND s.tablename = $2AND NOT s.inherited`,[schemaName, tableName],- undefined,- { shouldBypassPermissionChecks: true },);const emptyFractionByColumnName = new Map(diff --git a/packages/twenty-server/src/engine/metadata-modules/object-metadata/object-record-count.service.ts b/packages/twenty-server/src/engine/metadata-modules/object-metadata/object-record-count.service.tsindex 7a3cbc8567a..974d5ddddbf 100644--- a/packages/twenty-server/src/engine/metadata-modules/object-metadata/object-record-count.service.ts+++ b/packages/twenty-server/src/engine/metadata-modules/object-metadata/object-record-count.service.ts@@ -1,17 +1,19 @@import { Injectable } from '@nestjs/common';+import { InjectDataSource } from '@nestjs/typeorm';import { isDefined } from 'twenty-shared/utils';+import { DataSource } from 'typeorm';import { WorkspaceManyOrAllFlatEntityMapsCacheService } from 'src/engine/metadata-modules/flat-entity/services/workspace-many-or-all-flat-entity-maps-cache.service';import { type ObjectRecordCountDTO } from 'src/engine/metadata-modules/object-metadata/dtos/object-record-count.dto';-import { GlobalWorkspaceOrmManager } from 'src/engine/twenty-orm/global-workspace-datasource/global-workspace-orm.manager';import { computeObjectTargetTable } from 'src/engine/utils/compute-object-target-table.util';import { getWorkspaceSchemaName } from 'src/engine/workspace-datasource/utils/get-workspace-schema-name.util';@Injectable()export class ObjectRecordCountService {constructor(- private readonly globalWorkspaceOrmManager: GlobalWorkspaceOrmManager,+ @InjectDataSource()+ private readonly coreDataSource: DataSource,private readonly workspaceManyOrAllFlatEntityMapsCacheService: WorkspaceManyOrAllFlatEntityMapsCacheService,) {}@@ -22,19 +24,14 @@ export class ObjectRecordCountService {): Promise<Map<string, number>> {const schemaName = getWorkspaceSchemaName(workspaceId);- const dataSource =- await this.globalWorkspaceOrmManager.getGlobalWorkspaceDataSource();-const rows: { relname: string; approximate_count: number }[] =- await dataSource.query(+ await this.coreDataSource.query(`SELECT relname, reltuples::bigint AS approximate_countFROM pg_class cJOIN pg_namespace n ON c.relnamespace = n.oidWHERE n.nspname = $1AND c.relkind = 'r'`,[schemaName],- undefined,- { shouldBypassPermissionChecks: true },);const countByTableName = new Map<string, number>();diff --git a/packages/twenty-server/src/engine/metadata-modules/page-layout-tab/page-layout-tab.module.ts b/packages/twenty-server/src/engine/metadata-modules/page-layout-tab/page-layout-tab.module.tsindex fecc92399fd..ed6580a73af 100644--- a/packages/twenty-server/src/engine/metadata-modules/page-layout-tab/page-layout-tab.module.ts+++ b/packages/twenty-server/src/engine/metadata-modules/page-layout-tab/page-layout-tab.module.ts@@ -13,7 +13,6 @@ import { PageLayoutTabEntity } from 'src/engine/metadata-modules/page-layout-tabimport { PageLayoutTabResolver } from 'src/engine/metadata-modules/page-layout-tab/resolvers/page-layout-tab.resolver';import { PageLayoutTabService } from 'src/engine/metadata-modules/page-layout-tab/services/page-layout-tab.service';import { PermissionsModule } from 'src/engine/metadata-modules/permissions/permissions.module';-import { TwentyORMModule } from 'src/engine/twenty-orm/twenty-orm.module';import { WorkspaceCacheStorageModule } from 'src/engine/workspace-cache-storage/workspace-cache-storage.module';import { WorkspaceMigrationGraphqlApiExceptionInterceptor } from 'src/engine/workspace-manager/workspace-migration/interceptors/workspace-migration-graphql-api-exception.interceptor';import { WorkspaceMigrationModule } from 'src/engine/workspace-manager/workspace-migration/workspace-migration.module';@@ -23,7 +22,6 @@ import { DashboardSyncModule } from 'src/modules/dashboard-sync/dashboard-sync.mimports: [ApplicationTranslationCatalogModule,TypeOrmModule.forFeature([PageLayoutTabEntity, WorkspaceEntity]),- TwentyORMModule,PermissionsModule,FeatureFlagModule,WorkspaceCacheStorageModule,diff --git a/packages/twenty-server/src/engine/metadata-modules/page-layout-widget/page-layout-widget.module.ts b/packages/twenty-server/src/engine/metadata-modules/page-layout-widget/page-layout-widget.module.tsindex 02a4f024abc..cf0a76226a8 100644--- a/packages/twenty-server/src/engine/metadata-modules/page-layout-widget/page-layout-widget.module.ts+++ b/packages/twenty-server/src/engine/metadata-modules/page-layout-widget/page-layout-widget.module.ts@@ -12,7 +12,6 @@ import { PageLayoutWidgetEntity } from 'src/engine/metadata-modules/page-layout-import { PageLayoutWidgetResolver } from 'src/engine/metadata-modules/page-layout-widget/resolvers/page-layout-widget.resolver';import { PageLayoutWidgetService } from 'src/engine/metadata-modules/page-layout-widget/services/page-layout-widget.service';import { PermissionsModule } from 'src/engine/metadata-modules/permissions/permissions.module';-import { TwentyORMModule } from 'src/engine/twenty-orm/twenty-orm.module';import { WorkspaceCacheStorageModule } from 'src/engine/workspace-cache-storage/workspace-cache-storage.module';import { WorkspaceMigrationGraphqlApiExceptionInterceptor } from 'src/engine/workspace-manager/workspace-migration/interceptors/workspace-migration-graphql-api-exception.interceptor';import { WorkspaceMigrationModule } from 'src/engine/workspace-manager/workspace-migration/workspace-migration.module';@@ -22,7 +21,6 @@ import { DashboardSyncModule } from 'src/modules/dashboard-sync/dashboard-sync.mimports: [ApplicationTranslationCatalogModule,TypeOrmModule.forFeature([PageLayoutWidgetEntity, WorkspaceEntity]),- TwentyORMModule,PermissionsModule,FeatureFlagModule,WorkspaceCacheStorageModule,diff --git a/packages/twenty-server/src/engine/metadata-modules/page-layout/page-layout.module.ts b/packages/twenty-server/src/engine/metadata-modules/page-layout/page-layout.module.tsindex 2a1b5805b1e..43fc90dedd5 100644--- a/packages/twenty-server/src/engine/metadata-modules/page-layout/page-layout.module.ts+++ b/packages/twenty-server/src/engine/metadata-modules/page-layout/page-layout.module.ts@@ -19,7 +19,6 @@ import { PageLayoutUpdateService } from 'src/engine/metadata-modules/page-layoutimport { PageLayoutService } from 'src/engine/metadata-modules/page-layout/services/page-layout.service';import { PermissionsModule } from 'src/engine/metadata-modules/permissions/permissions.module';import { ViewModule } from 'src/engine/metadata-modules/view/view.module';-import { TwentyORMModule } from 'src/engine/twenty-orm/twenty-orm.module';import { WorkspaceCacheStorageModule } from 'src/engine/workspace-cache-storage/workspace-cache-storage.module';import { WorkspaceMigrationGraphqlApiExceptionInterceptor } from 'src/engine/workspace-manager/workspace-migration/interceptors/workspace-migration-graphql-api-exception.interceptor';import { WorkspaceMigrationModule } from 'src/engine/workspace-manager/workspace-migration/workspace-migration.module';@@ -28,7 +27,6 @@ import { DashboardSyncModule } from 'src/modules/dashboard-sync/dashboard-sync.m@Module({imports: [TypeOrmModule.forFeature([PageLayoutEntity, WorkspaceEntity]),- TwentyORMModule,PermissionsModule,FeatureFlagModule,I18nModule,diff --git a/packages/twenty-server/src/engine/object-metadata-repository/object-metadata-repository.module.ts b/packages/twenty-server/src/engine/object-metadata-repository/object-metadata-repository.module.tsindex 6e4f643c580..9d34617666b 100644--- a/packages/twenty-server/src/engine/object-metadata-repository/object-metadata-repository.module.ts+++ b/packages/twenty-server/src/engine/object-metadata-repository/object-metadata-repository.module.ts@@ -9,7 +9,6 @@ import { capitalize } from 'twenty-shared/utils';import { metadataToRepositoryMapping } from 'src/engine/object-metadata-repository/metadata-to-repository.mapping';import { GlobalWorkspaceOrmManager } from 'src/engine/twenty-orm/global-workspace-datasource/global-workspace-orm.manager';-import { TwentyORMModule } from 'src/engine/twenty-orm/twenty-orm.module';import { WorkspaceDataSourceModule } from 'src/engine/workspace-datasource/workspace-datasource.module';import { convertClassNameToObjectMetadataName } from 'src/engine/workspace-manager/utils/convert-class-to-object-metadata-name.util';@@ -40,7 +39,7 @@ export class ObjectMetadataRepositoryModule {return {module: ObjectMetadataRepositoryModule,- imports: [WorkspaceDataSourceModule, TwentyORMModule],+ imports: [WorkspaceDataSourceModule],providers: [...providers],exports: providers,};diff --git a/packages/twenty-server/src/engine/subscriptions/object-record-event/__tests__/object-record-event-publisher.spec.ts b/packages/twenty-server/src/engine/subscriptions/object-record-event/__tests__/object-record-event-publisher.spec.tsindex ef61dd4235a..0b31f97e170 100644--- a/packages/twenty-server/src/engine/subscriptions/object-record-event/__tests__/object-record-event-publisher.spec.ts+++ b/packages/twenty-server/src/engine/subscriptions/object-record-event/__tests__/object-record-event-publisher.spec.ts@@ -21,7 +21,6 @@ import { type FlatObjectMetadata } from 'src/engine/metadata-modules/flat-objectimport { EventStreamService } from 'src/engine/subscriptions/event-stream.service';import { SubscriptionService } from 'src/engine/subscriptions/subscription.service';import { type EventStreamData } from 'src/engine/subscriptions/types/event-stream-data.type';-import { GlobalWorkspaceOrmManager } from 'src/engine/twenty-orm/global-workspace-datasource/global-workspace-orm.manager';import { WorkspaceCacheService } from 'src/engine/workspace-cache/services/workspace-cache.service';import { type WorkspaceEventBatch } from 'src/engine/workspace-event-emitter/types/workspace-event-batch.type';import { ObjectRecordEventPublisher } from 'src/engine/subscriptions/object-record-event/object-record-event-publisher';@@ -95,10 +94,6 @@ describe('ObjectRecordEventPublisher', () => {>>;- let mockGlobalWorkspaceOrmManager: jest.Mocked<- Pick<GlobalWorkspaceOrmManager, 'getGlobalWorkspaceDataSourceReplica'>- >;-const workspaceId = COMPANY_FLAT_OBJECT_MOCK.workspaceId;const streamChannelId = 'test-stream-channel-id';const userWorkspaceId = 'test-user-workspace-id';@@ -271,12 +266,6 @@ describe('ObjectRecordEventPublisher', () => {} as never),};- mockGlobalWorkspaceOrmManager = {- getGlobalWorkspaceDataSourceReplica: jest.fn().mockResolvedValue({- getRepository: jest.fn(),- }),- };-(buildRowLevelPermissionRecordFilter as jest.Mock).mockReturnValue({});(isRecordMatchingRLSRowLevelPermissionPredicate as jest.Mock@@ -305,10 +294,6 @@ describe('ObjectRecordEventPublisher', () => {provide: WorkspaceManyOrAllFlatEntityMapsCacheService,useValue: mockWorkspaceManyOrAllFlatEntityMapsCacheService,},- {- provide: GlobalWorkspaceOrmManager,- useValue: mockGlobalWorkspaceOrmManager,- },{provide: CommonSelectFieldsHelper,useValue: new CommonSelectFieldsHelper(),diff --git a/packages/twenty-server/src/engine/subscriptions/object-record-event/object-record-event-publisher.ts b/packages/twenty-server/src/engine/subscriptions/object-record-event/object-record-event-publisher.tsindex 99053aaa010..e5148e96dc4 100644--- a/packages/twenty-server/src/engine/subscriptions/object-record-event/object-record-event-publisher.ts+++ b/packages/twenty-server/src/engine/subscriptions/object-record-event/object-record-event-publisher.ts@@ -43,7 +43,6 @@ import {} from 'src/engine/subscriptions/types/event-stream-data.type';import { type EventStreamPayload } from 'src/engine/subscriptions/types/event-stream-payload.type';import { ObjectRecordSubscriptionEvent } from 'src/engine/subscriptions/types/object-record-subscription-event.type';-import { GlobalWorkspaceOrmManager } from 'src/engine/twenty-orm/global-workspace-datasource/global-workspace-orm.manager';import { RolePermissionConfig } from 'src/engine/twenty-orm/types/role-permission-config';import { buildRowLevelPermissionRecordFilter } from 'src/engine/twenty-orm/utils/build-row-level-permission-record-filter.util';import { computePermissionIntersection } from 'src/engine/twenty-orm/utils/compute-permission-intersection.util';@@ -72,7 +71,6 @@ export class ObjectRecordEventPublisher {private readonly workspaceCacheService: WorkspaceCacheService,private readonly processNestedRelationsHelper: ProcessNestedRelationsHelper,private readonly workspaceManyOrAllFlatEntityMapsCacheService: WorkspaceManyOrAllFlatEntityMapsCacheService,- private readonly globalWorkspaceOrmManager: GlobalWorkspaceOrmManager,private readonly commonSelectFieldsHelper: CommonSelectFieldsHelper,) {}diff --git a/packages/twenty-server/src/engine/trash-cleanup/services/trash-cleanup.service.ts b/packages/twenty-server/src/engine/trash-cleanup/services/trash-cleanup.service.tsindex eaafcb3613e..8d9e46ca467 100644--- a/packages/twenty-server/src/engine/trash-cleanup/services/trash-cleanup.service.ts+++ b/packages/twenty-server/src/engine/trash-cleanup/services/trash-cleanup.service.ts@@ -122,7 +122,6 @@ export class TrashCleanupService {},order: { deletedAt: 'ASC' },take,- loadEagerRelations: false,});if (recordsToDelete.length === 0) {diff --git a/packages/twenty-server/src/engine/twenty-orm-v2/query-builder/workspace-select-query-builder-v2.ts b/packages/twenty-server/src/engine/twenty-orm-v2/query-builder/workspace-select-query-builder-v2.tsindex 5c2aceaea16..1822c6ea098 100644--- a/packages/twenty-server/src/engine/twenty-orm-v2/query-builder/workspace-select-query-builder-v2.ts+++ b/packages/twenty-server/src/engine/twenty-orm-v2/query-builder/workspace-select-query-builder-v2.ts@@ -1,6 +1,6 @@import { type ObjectsPermissions } from 'twenty-shared/types';import { isDefined, pascalCase } from 'twenty-shared/utils';-import { FindOperator } from 'typeorm';+import { FindOperator, type ObjectLiteral } from 'typeorm';import { RelationType } from 'src/engine/metadata-modules/field-metadata/interfaces/relation-type.interface';@@ -557,7 +557,7 @@ export class WorkspaceSelectQueryBuilderV2 implements WhereExpressionLike {return [compiled.text, compiled.values];}- private materializeEntities<T extends Record<string, unknown>>(+ private materializeEntities<T extends ObjectLiteral>(rows: Record<string, unknown>[],): T[] {const columnNameByResultAlias = this.buildColumnNameByResultAlias();@@ -565,7 +565,7 @@ export class WorkspaceSelectQueryBuilderV2 implements WhereExpressionLike {return rows.map((row) => mapRowToEntity<T>(row, columnNameByResultAlias));}- async getMany<T extends Record<string, unknown>>(options?: {+ async getMany<T extends ObjectLiteral>(options?: {noFormatting?: boolean;}): Promise<T[]> {const entities = this.materializeEntities<T>(await this.executeSelect());@@ -589,7 +589,7 @@ export class WorkspaceSelectQueryBuilderV2 implements WhereExpressionLike {};}- async getOne<T extends Record<string, unknown>>(options?: {+ async getOne<T extends ObjectLiteral>(options?: {noFormatting?: boolean;}): Promise<T | null> {const previousLimit = this.limitValue;diff --git a/packages/twenty-server/src/engine/twenty-orm-v2/repository/workspace-repository-v2.ts b/packages/twenty-server/src/engine/twenty-orm-v2/repository/workspace-repository-v2.tsindex 252e40bb83e..0affb65b7f1 100644--- a/packages/twenty-server/src/engine/twenty-orm-v2/repository/workspace-repository-v2.ts+++ b/packages/twenty-server/src/engine/twenty-orm-v2/repository/workspace-repository-v2.ts@@ -6,7 +6,13 @@ import {type ObjectsPermissions,} from 'twenty-shared/types';import { isDefined } from 'twenty-shared/utils';-import { DeleteResult, In, InsertResult, UpdateResult } from 'typeorm';+import {+ DeleteResult,+ In,+ InsertResult,+ type ObjectLiteral,+ UpdateResult,+} from 'typeorm';import { DatabaseEventAction } from 'src/engine/api/graphql/graphql-query-runner/enums/database-event-action';import { type WorkspaceAuthContext } from 'src/engine/core-modules/auth/types/workspace-auth-context.type';@@ -102,11 +108,15 @@ type WorkspaceRepositoryV2Options = {) => WorkspaceRepositoryV2;isTransactional: boolean;runInNewTransaction: <T>(- work: (transactionalRepository: WorkspaceRepositoryV2) => Promise<T>,+ work: (+ transactionalRepository: WorkspaceRepositoryV2<ObjectLiteral>,+ ) => Promise<T>,) => Promise<T>;};-export class WorkspaceRepositoryV2 {+export class WorkspaceRepositoryV2<+ TEntity extends ObjectLiteral = ObjectRecord,+> {readonly objectRecordsPermissions: ObjectsPermissions;private readonly options: WorkspaceRepositoryV2Options;@@ -192,7 +202,7 @@ export class WorkspaceRepositoryV2 {return this.options.internalContext;}- async find(options?: FindOptionsV2): Promise<ObjectRecord[]> {+ async find(options?: FindOptionsV2): Promise<TEntity[]> {const records = await applyFindOptionsToQueryBuilder(this.createQueryBuilder(),options,@@ -208,18 +218,14 @@ export class WorkspaceRepositoryV2 {);}- return records;+ return records as unknown as TEntity[];}- async findBy(- where: ObjectWhereLike | ObjectWhereLike[],- ): Promise<ObjectRecord[]> {+ async findBy(where: ObjectWhereLike | ObjectWhereLike[]): Promise<TEntity[]> {return this.find({ where });}- async findAndCount(- options?: FindOptionsV2,- ): Promise<[ObjectRecord[], number]> {+ async findAndCount(options?: FindOptionsV2): Promise<[TEntity[], number]> {const records = await this.find(options);const totalCount = await this.count(options);@@ -228,11 +234,11 @@ export class WorkspaceRepositoryV2 {async findAndCountBy(where: ObjectWhereLike | ObjectWhereLike[],- ): Promise<[ObjectRecord[], number]> {+ ): Promise<[TEntity[], number]> {return this.findAndCount({ where });}- async findOne(options?: FindOptionsV2): Promise<ObjectRecord | null> {+ async findOne(options?: FindOptionsV2): Promise<TEntity | null> {if (!isDefined(options?.where)) {throw new TwentyOrmV2Exception('findOne requires a "where" condition',@@ -255,16 +261,16 @@ export class WorkspaceRepositoryV2 {);}- return record;+ return record as unknown as TEntity | null;}async findOneBy(where: ObjectWhereLike | ObjectWhereLike[],- ): Promise<ObjectRecord | null> {+ ): Promise<TEntity | null> {return this.findOne({ where });}- async findOneOrFail(options?: FindOptionsV2): Promise<ObjectRecord> {+ async findOneOrFail(options?: FindOptionsV2): Promise<TEntity> {const record = await this.findOne(options);if (!isDefined(record)) {@@ -279,7 +285,7 @@ export class WorkspaceRepositoryV2 {async findOneByOrFail(where: ObjectWhereLike | ObjectWhereLike[],- ): Promise<ObjectRecord> {+ ): Promise<TEntity> {return this.findOneOrFail({ where });}@@ -661,7 +667,7 @@ export class WorkspaceRepositoryV2 {}private runAtomically<T>(- work: (repository: WorkspaceRepositoryV2) => Promise<T>,+ work: (repository: WorkspaceRepositoryV2<ObjectLiteral>) => Promise<T>,): Promise<T> {return this.options.isTransactional? work(this)@@ -686,7 +692,7 @@ export class WorkspaceRepositoryV2 {async save(entityOrEntities: Partial<ObjectRecord> | Partial<ObjectRecord>[],- ): Promise<ObjectRecord[]> {+ ): Promise<TEntity[]> {const entities = Array.isArray(entityOrEntities)? entityOrEntities: [entityOrEntities];@@ -756,7 +762,7 @@ export class WorkspaceRepositoryV2 {: undefined;return isDefined(record) ? [record] : [];- });+ }) as unknown as TEntity[];});}diff --git a/packages/twenty-server/src/engine/twenty-orm-v2/sql/utils/build-select-statement.util.ts b/packages/twenty-server/src/engine/twenty-orm-v2/sql/utils/build-select-statement.util.tsindex 4cfc20ce984..a48b1d01baf 100644--- a/packages/twenty-server/src/engine/twenty-orm-v2/sql/utils/build-select-statement.util.ts+++ b/packages/twenty-server/src/engine/twenty-orm-v2/sql/utils/build-select-statement.util.ts@@ -1,4 +1,5 @@import { isDefined } from 'twenty-shared/utils';+import { type ObjectLiteral } from 'typeorm';import { RelationType } from 'src/engine/metadata-modules/field-metadata/interfaces/relation-type.interface';@@ -609,7 +610,7 @@ const buildRelationValue = (leaves: RelationColumnLeaf[]): unknown => {return relationValue;};-export const mapRowToEntity = <T extends Record<string, unknown>>(+export const mapRowToEntity = <T extends ObjectLiteral>(row: Record<string, unknown>,columnNameByResultAlias: Record<string, string>,): T => {diff --git a/packages/twenty-server/src/engine/twenty-orm/entity-manager/utils/get-entity-target.ts b/packages/twenty-server/src/engine/twenty-orm/entity-manager/utils/get-entity-target.tsdeleted file mode 100644index e6b68167539..00000000000--- a/packages/twenty-server/src/engine/twenty-orm/entity-manager/utils/get-entity-target.ts+++ /dev/null@@ -1,36 +0,0 @@-import { isDefined } from 'twenty-shared/utils';-import {- type EntityTarget,- InstanceChecker,- type ObjectLiteral,- type SaveOptions,-} from 'typeorm';--import { type DeepPartialWithNestedRelationFields } from 'src/engine/twenty-orm/entity-manager/types/deep-partial-entity-with-nested-relation-fields.type';--export const getEntityTarget = <- Entity extends ObjectLiteral,- T extends DeepPartialWithNestedRelationFields<Entity>,->(- targetOrEntity: EntityTarget<Entity> | Entity | Entity[],- entityOrMaybeOptions:- | T- | T[]- | SaveOptions- | (SaveOptions & { reload: false }),-) => {- const isEntityTarget =- (typeof targetOrEntity === 'function' ||- InstanceChecker.isEntitySchema(targetOrEntity) ||- typeof targetOrEntity === 'string') &&- isDefined(targetOrEntity);-- const entityTarget = isEntityTarget ? targetOrEntity : null;-- if (entityTarget) return entityTarget;-- const entityData = isEntityTarget ? entityOrMaybeOptions : targetOrEntity;- const isEntityArray = Array.isArray(entityData);-- return isEntityArray ? entityData[0]?.constructor : entityData.constructor;-};diff --git a/packages/twenty-server/src/engine/twenty-orm/entity-manager/workspace-entity-manager.spec.ts b/packages/twenty-server/src/engine/twenty-orm/entity-manager/workspace-entity-manager.spec.tsdeleted file mode 100644index aaccb18a3b9..00000000000--- a/packages/twenty-server/src/engine/twenty-orm/entity-manager/workspace-entity-manager.spec.ts+++ /dev/null@@ -1,596 +0,0 @@-import {- MetadataWritability,- ObjectOpenRecordIn,- type FieldMetadataType,- type ObjectsPermissions,-} from 'twenty-shared/types';-import { EntityManager } from 'typeorm';-import { EntityPersistExecutor } from 'typeorm/persistence/EntityPersistExecutor';-import { PlainObjectToDatabaseEntityTransformer } from 'typeorm/query-builder/transformer/PlainObjectToDatabaseEntityTransformer';--import { type WorkspaceInternalContext } from 'src/engine/twenty-orm/interfaces/workspace-internal-context.interface';--import { type WorkspaceAuthContext } from 'src/engine/core-modules/auth/types/workspace-auth-context.type';-import { type FlatEntityMaps } from 'src/engine/metadata-modules/flat-entity/types/flat-entity-maps.type';-import { type FlatFieldMetadata } from 'src/engine/metadata-modules/flat-field-metadata/types/flat-field-metadata.type';-import { type FlatObjectMetadata } from 'src/engine/metadata-modules/flat-object-metadata/types/flat-object-metadata.type';-import { type GlobalWorkspaceDataSource } from 'src/engine/twenty-orm/global-workspace-datasource/global-workspace-datasource';-import { validateOperationIsPermittedOrThrow } from 'src/engine/twenty-orm/repository/permissions.utils';-import {- setWorkspaceContext,- withWorkspaceContext,- type ORMWorkspaceContext,-} from 'src/engine/twenty-orm/storage/orm-workspace-context.storage';-import { formatResult } from 'src/engine/twenty-orm/utils/format-result.util';-import { getObjectMetadataFromEntityTarget } from 'src/engine/twenty-orm/utils/get-object-metadata-from-entity-target.util';--import { WorkspaceEntityManager } from './workspace-entity-manager';--jest.mock('src/engine/twenty-orm/repository/permissions.utils', () => ({- validateOperationIsPermittedOrThrow: jest.fn(),-}));--jest.mock(- 'src/engine/twenty-orm/utils/get-object-metadata-from-entity-target.util',- () => ({- getObjectMetadataFromEntityTarget: jest.fn(),- }),-);--jest.mock('src/engine/twenty-orm/utils/format-data.util', () => ({- formatData: jest.fn().mockReturnValue([]),-}));--jest.mock('src/engine/twenty-orm/utils/format-result.util', () => ({- formatResult: jest.fn().mockReturnValue([]),-}));--jest.mock(- 'src/engine/twenty-orm/entity-manager/workspace-entity-manager',- () => ({- ...jest.requireActual(- 'src/engine/twenty-orm/entity-manager/workspace-entity-manager',- ),- }),-);--const mockedWorkspaceUpdateQueryBuilder = {- set: jest.fn().mockImplementation(() => ({- where: jest.fn().mockReturnThis(),- whereInIds: jest.fn().mockReturnThis(),- execute: jest- .fn()- .mockResolvedValue({ affected: 1, raw: [], generatedMaps: [] }),- returning: jest.fn().mockReturnThis(),- })),- execute: jest- .fn()- .mockResolvedValue({ affected: 1, raw: [], generatedMaps: [] }),-};--jest.mock('../repository/workspace-select-query-builder', () => ({- WorkspaceSelectQueryBuilder: jest.fn().mockImplementation(() => ({- where: jest.fn().mockReturnThis(),- getMany: jest.fn().mockResolvedValue([]),- getOne: jest.fn().mockResolvedValue(null),- getManyAndCount: jest.fn().mockResolvedValue([[], 0]),- execute: jest- .fn()- .mockResolvedValue({ affected: 1, raw: [], generatedMaps: [] }),- setFindOptions: jest.fn().mockReturnThis(),- returning: jest.fn().mockReturnThis(),- update: jest.fn().mockReturnValue(mockedWorkspaceUpdateQueryBuilder),- insert: jest.fn().mockReturnThis(),- })),-}));--describe('WorkspaceEntityManager', () => {- let entityManager: WorkspaceEntityManager;- let mockDataSource: GlobalWorkspaceDataSource;- let mockPermissionOptions: {- shouldBypassPermissionChecks: boolean;- objectRecordsPermissions?: ObjectsPermissions;- };- let mockInternalContext: WorkspaceInternalContext;- let mockWorkspaceContext: ORMWorkspaceContext;-- beforeEach(() => {- const mockFlatObjectMetadata: FlatObjectMetadata = {- id: 'test-entity-id',- nameSingular: 'test-entity',- namePlural: 'test-entities',- labelSingular: 'Test Entity',- labelPlural: 'Test Entities',- workspaceId: 'test-workspace-id',- icon: 'test-icon',- color: null,- isRemote: false,- isAuditLogged: false,- isSearchable: false,- isSystem: false,- isActive: true,- targetTableName: 'test_entity',- fieldIds: ['field-id'],- indexMetadataIds: [],- searchFieldMetadataIds: [],- objectPermissionIds: [],- fieldPermissionIds: [],- viewIds: [],- pageLayoutIds: [],- universalIdentifier: 'test-entity-id',- description: null,- imageIdentifierFieldMetadataId: null,- labelIdentifierFieldMetadataId: null,- shortcut: null,- overrides: null,- applicationId: 'test-application-id',- isLabelSyncedWithName: false,- isUIEditable: true,- isUICreatable: true,- writability: MetadataWritability.OPEN,- openRecordIn: ObjectOpenRecordIn.USER_CHOICE,- duplicateCriteria: null,- createdAt: new Date().toISOString(),- updatedAt: new Date().toISOString(),- applicationUniversalIdentifier: 'test-application-id',- fieldUniversalIdentifiers: ['field-id'],- objectPermissionUniversalIdentifiers: [],- fieldPermissionUniversalIdentifiers: [],- viewUniversalIdentifiers: [],- pageLayoutUniversalIdentifiers: [],- indexMetadataUniversalIdentifiers: [],- searchFieldMetadataUniversalIdentifiers: [],- labelIdentifierFieldMetadataUniversalIdentifier: null,- imageIdentifierFieldMetadataUniversalIdentifier: null,- };-- (getObjectMetadataFromEntityTarget as jest.Mock).mockReturnValue(- mockFlatObjectMetadata,- );-- const mockFlatFieldMetadata: FlatFieldMetadata = {- id: 'field-id',- type: 'TEXT' as FieldMetadataType,- name: 'fieldName',- label: 'Field Name',- objectMetadataId: 'test-entity-id',- isNullable: true,- isSystemSideEffect: false,- isLabelSyncedWithName: false,- createdAt: new Date().toISOString(),- updatedAt: new Date().toISOString(),- universalIdentifier: 'field-id',- defaultValue: null,- description: null,- icon: null,- isActive: true,- isSystem: false,- isUIEditable: true,- writability: MetadataWritability.OPEN,- isUnique: false,- options: null,- settings: null,- overrides: null,- workspaceId: 'test-workspace-id',- viewFieldIds: [],- viewFilterIds: [],- fieldPermissionIds: [],- kanbanAggregateOperationViewIds: [],- calendarViewIds: [],- calendarEndViewIds: [],- mainGroupByFieldMetadataViewIds: [],- relationTargetFieldMetadataId: null,- relationTargetObjectMetadataId: null,- morphId: null,- applicationId: 'application-id',- applicationUniversalIdentifier: 'application-id',- objectMetadataUniversalIdentifier: 'test-entity-id',- relationTargetObjectMetadataUniversalIdentifier: null,- relationTargetFieldMetadataUniversalIdentifier: null,- viewFilterUniversalIdentifiers: [],- viewFieldUniversalIdentifiers: [],- kanbanAggregateOperationViewUniversalIdentifiers: [],- calendarViewUniversalIdentifiers: [],- calendarEndViewUniversalIdentifiers: [],- mainGroupByFieldMetadataViewUniversalIdentifiers: [],- fieldPermissionUniversalIdentifiers: [],- viewSortIds: [],- viewSortUniversalIdentifiers: [],- searchFieldMetadataIds: [],- searchFieldMetadataUniversalIdentifiers: [],- universalSettings: null,- };-- const flatObjectMetadataMaps: FlatEntityMaps<FlatObjectMetadata> = {- byUniversalIdentifier: {- 'test-entity-id': mockFlatObjectMetadata,- },- universalIdentifierById: {- 'test-entity-id': 'test-entity-id',- },- universalIdentifiersByApplicationId: {},- };-- const flatFieldMetadataMaps: FlatEntityMaps<FlatFieldMetadata> = {- byUniversalIdentifier: {- 'field-id': mockFlatFieldMetadata,- },- universalIdentifierById: {- 'field-id': 'field-id',- },- universalIdentifiersByApplicationId: {},- };-- mockInternalContext = {- workspaceId: 'test-workspace-id',- flatObjectMetadataMaps,- flatFieldMetadataMaps,- flatIndexMaps: {- byUniversalIdentifier: {},- universalIdentifierById: {},- universalIdentifiersByApplicationId: {},- },- flatRowLevelPermissionPredicateMaps: {- byUniversalIdentifier: {},- universalIdentifierById: {},- universalIdentifiersByApplicationId: {},- },- flatRowLevelPermissionPredicateGroupMaps: {- byUniversalIdentifier: {},- universalIdentifierById: {},- universalIdentifiersByApplicationId: {},- },- objectIdByNameSingular: {- 'test-entity': 'test-entity-id',- },- featureFlagsMap: {- IS_APP_CLAIMING_ENABLED: false,- IS_UNIQUE_INDEXES_ENABLED: false,- IS_JSON_FILTER_ENABLED: false,- IS_CALENDAR_WEEK_VIEW_ENABLED: false,- IS_EMAIL_GROUP_ENABLED: false,- IS_JUNCTION_RELATIONS_ENABLED: false,- IS_LIST_VIEW_ENABLED: false,- IS_REST_METADATA_API_NEW_FORMAT_DIRECT: false,- IS_LOGIC_FUNCTION_PREBUILT_MODE_ENABLED: false,- IS_WORKFLOW_VERSION_IN_CORE_ENABLED: false,- IS_WORKFLOW_CORE_INDEX_PAGE_ENABLED: false,- IS_WORKFLOW_DISPATCH_FROM_CORE_ENABLED: false,- IS_NATIVE_CALL_RECORDING_TABS_ENABLED: false,- },- userWorkspaceRoleMap: {},- apiKeyRoleMap: {},- eventEmitterService: {- emitMutationEvent: jest.fn(),- emitDatabaseBatchEvent: jest.fn(),- emitCustomBatchEvent: jest.fn(),- } as any,- coreDataSource: {- getRepository: jest.fn(() => ({- find: jest.fn(),- softDelete: jest.fn(),- })),- } as any,- } as unknown as WorkspaceInternalContext;-- mockDataSource = {- featureFlagMap: {- IS_UNIQUE_INDEXES_ENABLED: false,- IS_JSON_FILTER_ENABLED: false,- },- permissionsPerRoleId: {},- eventEmitterService: mockInternalContext.eventEmitterService,- coreDataSource: mockInternalContext.coreDataSource,- } as GlobalWorkspaceDataSource;-- mockPermissionOptions = {- shouldBypassPermissionChecks: false,- objectRecordsPermissions: {- 'test-entity': {- canReadObjectRecords: true,- canUpdateObjectRecords: false,- canSoftDeleteObjectRecords: false,- canDestroyObjectRecords: false,- restrictedFields: {},- rowLevelPermissionPredicates: [],- rowLevelPermissionPredicateGroups: [],- },- },- };-- const mockAuthContext = {- user: { id: 'user-id' },- workspace: { id: 'test-workspace-id' },- workspaceMemberId: 'workspace-member-id',- userWorkspaceId: 'user-workspace-id',- apiKey: null,- } as unknown as WorkspaceAuthContext;-- mockWorkspaceContext = {- authContext: mockAuthContext,- flatObjectMetadataMaps,- flatFieldMetadataMaps,- flatIndexMaps: mockInternalContext.flatIndexMaps,- flatRowLevelPermissionPredicateMaps:- mockInternalContext.flatRowLevelPermissionPredicateMaps,- flatRowLevelPermissionPredicateGroupMaps:- mockInternalContext.flatRowLevelPermissionPredicateGroupMaps,- objectIdByNameSingular: mockInternalContext.objectIdByNameSingular,- featureFlagsMap: mockInternalContext.featureFlagsMap,- permissionsPerRoleId: mockDataSource.permissionsPerRoleId,- entityMetadatas: [],- userWorkspaceRoleMap: {- 'user-workspace-id': 'role-id',- },- apiKeyRoleMap: {},- };-- setWorkspaceContext(mockWorkspaceContext);-- const mockWorkspaceDataSource = {- getMetadata: jest.fn().mockReturnValue({- name: 'test-entity',- columns: [],- relations: [],- findInheritanceMetadata: jest.fn(),- findColumnWithPropertyPath: jest.fn(),- }),- eventEmitterService: mockInternalContext.eventEmitterService,- coreDataSource: mockInternalContext.coreDataSource,- createQueryBuilder: jest.fn().mockReturnValue({- delete: jest.fn().mockReturnThis(),- from: jest.fn().mockReturnThis(),- where: jest.fn().mockReturnThis(),- execute: jest- .fn()- .mockResolvedValue({ affected: 1, raw: [], generatedMaps: [] }),- getMany: jest.fn().mockResolvedValue([]),- getOne: jest.fn().mockResolvedValue(null),- getManyAndCount: jest.fn().mockResolvedValue([[], 0]),- update: jest.fn().mockReturnThis(),- softDelete: jest.fn().mockReturnThis(),- restore: jest.fn().mockReturnThis(),- }),- createQueryRunner: jest.fn().mockReturnValue({- connect: jest.fn(),- startTransaction: jest.fn(),- commitTransaction: jest.fn(),- rollbackTransaction: jest.fn(),- release: jest.fn(),- clearTable: jest.fn(),- }),- createQueryRunnerForEntityPersistExecutor: jest.fn().mockReturnValue({- connect: jest.fn(),- startTransaction: jest.fn(),- commitTransaction: jest.fn(),- rollbackTransaction: jest.fn(),- release: jest.fn(),- clearTable: jest.fn(),- }),- };-- entityManager = new WorkspaceEntityManager(mockDataSource);-- Object.defineProperty(entityManager, 'connection', {- get: () => mockWorkspaceDataSource,- });-- jest.spyOn(entityManager as any, 'validatePermissions');- jest.spyOn(entityManager as any, 'createQueryBuilder');- jest- .spyOn(entityManager as any, 'getFormattedResultWithoutNonReadableFields')- .mockImplementation(- ({ formattedResult }: { formattedResult: string[] }) => formattedResult,- );-- jest- .spyOn(entityManager as any, 'extractTargetNameSingularFromEntityTarget')- .mockImplementation((entityName: string) => {- return entityName;- });-- jest- .spyOn(EntityManager.prototype, 'save')- .mockImplementation(() => Promise.resolve({}));- jest- .spyOn(EntityManager.prototype, 'update')- .mockImplementation(() =>- Promise.resolve({ affected: 1, raw: [], generatedMaps: [] }),- );- jest- .spyOn(EntityManager.prototype, 'restore')- .mockImplementation(() =>- Promise.resolve({ affected: 1, raw: [], generatedMaps: [] }),- );- jest- .spyOn(EntityManager.prototype, 'clear')- .mockImplementation(() => Promise.resolve());- jest- .spyOn(EntityManager.prototype, 'preload')- .mockImplementation(() => Promise.resolve({}));-- jest- .spyOn(EntityPersistExecutor.prototype, 'execute')- .mockImplementation(() => Promise.resolve());-- jest- .spyOn(PlainObjectToDatabaseEntityTransformer.prototype, 'transform')- .mockImplementation(() => Promise.resolve({}));-- const mockMetadata = {- hasAllPrimaryKeys: jest.fn().mockReturnValue(true),- columns: [],- relations: [],- findInheritanceMetadata: jest.fn(),- findColumnWithPropertyPath: jest.fn(),- };-- mockWorkspaceDataSource.getMetadata = jest- .fn()- .mockReturnValue(mockMetadata);-- jest.clearAllMocks();- });-- describe('Query Method', () => {- it('should call validatePermissions and validateOperationIsPermittedOrThrow for find', async () => {- await withWorkspaceContext(mockWorkspaceContext, () =>- entityManager.find('test-entity', {}, mockPermissionOptions),- );-- expect(entityManager.createQueryBuilder).toHaveBeenCalledWith(- 'test-entity',- undefined,- undefined,- mockPermissionOptions,- );- });- it('should throw error for query', async () => {- expect(() => entityManager.query('SELECT * FROM test')).toThrow(- 'Method not allowed.',- );- });- });-- describe('Save Methods', () => {- it('should call validatePermissions and validateOperationIsPermittedOrThrow for save', async () => {- await withWorkspaceContext(mockWorkspaceContext, () =>- entityManager.save(- 'test-entity',- {},- { reload: false },- mockPermissionOptions,- ),- );- expect(entityManager['validatePermissions']).toHaveBeenCalledWith({- target: 'test-entity',- operationType: 'update',- permissionOptions: mockPermissionOptions,- selectedColumns: [],- updatedColumns: [],- });- expect(validateOperationIsPermittedOrThrow).toHaveBeenCalledWith({- entityName: 'test-entity',- operationType: 'update',- flatObjectMetadataMaps: mockInternalContext.flatObjectMetadataMaps,- flatFieldMetadataMaps: mockInternalContext.flatFieldMetadataMaps,- objectIdByNameSingular: mockInternalContext.objectIdByNameSingular,- objectsPermissions: mockPermissionOptions.objectRecordsPermissions,- selectedColumns: [],- allFieldsSelected: false,- updatedColumns: [],- authContext: mockWorkspaceContext.authContext,- });- });-- it('should emit the update event with the record re-selected after the write', async () => {- const recordBefore = {- id: 'record-id',- fieldName: 'Old Name',- avatarUrl: 'http://localhost:3000/file/core-picture/abc',- };- const recordAfter = {- id: 'record-id',- fieldName: 'New Name',- avatarUrl: 'http://localhost:3000/file/core-picture/abc',- };- const persistedPayloadWithUntouchedColumnsNulled = {- id: 'record-id',- fieldName: 'New Name',- avatarUrl: '',- };-- (formatResult as jest.Mock).mockReturnValue([- persistedPayloadWithUntouchedColumnsNulled,- ]);-- const findSpy = jest- .spyOn(entityManager, 'find')- .mockResolvedValueOnce([recordBefore])- .mockResolvedValueOnce([recordAfter]);-- await withWorkspaceContext(mockWorkspaceContext, () =>- entityManager.save(- 'test-entity',- { id: 'record-id', fieldName: 'New Name' },- { reload: false },- mockPermissionOptions,- ),- );-- expect(findSpy).toHaveBeenCalledTimes(2);-- const emitDatabaseBatchEvent = mockInternalContext.eventEmitterService- .emitDatabaseBatchEvent as jest.Mock;- const updatedBatchEvent = emitDatabaseBatchEvent.mock.calls[0][0];-- expect(updatedBatchEvent.events[0].properties.after).toBe(recordAfter);- expect(updatedBatchEvent.events[0].properties.updatedFields).toEqual([- 'fieldName',- ]);- });-- it('should not re-select when the save only creates records', async () => {- (formatResult as jest.Mock).mockReturnValue([{ id: 'created-id' }]);-- const findSpy = jest.spyOn(entityManager, 'find').mockResolvedValue([]);-- await withWorkspaceContext(mockWorkspaceContext, () =>- entityManager.save(- 'test-entity',- { fieldName: 'New Name' },- { reload: false },- mockPermissionOptions,- ),- );-- expect(findSpy).toHaveBeenCalledTimes(1);- });- });-- describe('Update Methods', () => {- it('should call createQueryBuilder with permissionOptions for update', async () => {- await withWorkspaceContext(mockWorkspaceContext, () =>- entityManager.update(- 'test-entity',- {},- {},- undefined,- mockPermissionOptions,- ),- );- expect(entityManager['createQueryBuilder']).toHaveBeenCalledWith(- 'test-entity',- undefined,- undefined,- mockPermissionOptions,- );- });- });-- describe('Other Methods', () => {- it('should call validatePermissions and validateOperationIsPermittedOrThrow for clear', async () => {- await withWorkspaceContext(mockWorkspaceContext, () =>- entityManager.clear('test-entity', mockPermissionOptions),- );- expect(entityManager['validatePermissions']).toHaveBeenCalledWith({- target: 'test-entity',- operationType: 'delete',- permissionOptions: mockPermissionOptions,- selectedColumns: [],- });- expect(validateOperationIsPermittedOrThrow).toHaveBeenCalledWith({- entityName: 'test-entity',- operationType: 'delete',- flatObjectMetadataMaps: mockInternalContext.flatObjectMetadataMaps,- flatFieldMetadataMaps: mockInternalContext.flatFieldMetadataMaps,- objectIdByNameSingular: mockInternalContext.objectIdByNameSingular,- objectsPermissions: mockPermissionOptions.objectRecordsPermissions,- selectedColumns: [],- allFieldsSelected: false,- updatedColumns: [],- authContext: mockWorkspaceContext.authContext,- });- });- });-});diff --git a/packages/twenty-server/src/engine/twenty-orm/entity-manager/workspace-entity-manager.ts b/packages/twenty-server/src/engine/twenty-orm/entity-manager/workspace-entity-manager.tsdeleted file mode 100644index f526a85f75f..00000000000--- a/packages/twenty-server/src/engine/twenty-orm/entity-manager/workspace-entity-manager.ts+++ /dev/null@@ -1,1857 +0,0 @@-import isEmpty from 'lodash.isempty';-import {- type ObjectsPermissions,- type ObjectsPermissionsByRoleId,-} from 'twenty-shared/types';-import { isDefined, isNonEmptyArray } from 'twenty-shared/utils';-import {- type DeleteResult,- EntityManager,- type EntityTarget,- type FindManyOptions,- type FindOneOptions,- type FindOptionsWhere,- In,- type InsertResult,- type ObjectId,- type ObjectLiteral,- type QueryRunner,- type RemoveOptions,- type Repository,- type SaveOptions,- type SelectQueryBuilder,- TypeORMError,- type UpdateResult,-} from 'typeorm';-import { type DeepPartial } from 'typeorm/common/DeepPartial';-import { type PickKeysByType } from 'typeorm/common/PickKeysByType';-import { EntityNotFoundError } from 'typeorm/error/EntityNotFoundError';-import { FindOptionsUtils } from 'typeorm/find-options/FindOptionsUtils';-import { EntityPersistExecutor } from 'typeorm/persistence/EntityPersistExecutor';-import { type QueryDeepPartialEntity } from 'typeorm/query-builder/QueryPartialEntity';-import { PlainObjectToDatabaseEntityTransformer } from 'typeorm/query-builder/transformer/PlainObjectToDatabaseEntityTransformer';-import { type UpdateOptions } from 'typeorm/repository/UpdateOptions';-import { type UpsertOptions } from 'typeorm/repository/UpsertOptions';-import { InstanceChecker } from 'typeorm/util/InstanceChecker';--import { type FeatureFlagMap } from 'src/engine/core-modules/feature-flag/interfaces/feature-flag-map.interface';-import { type WorkspaceInternalContext } from 'src/engine/twenty-orm/interfaces/workspace-internal-context.interface';--import { DatabaseEventAction } from 'src/engine/api/graphql/graphql-query-runner/enums/database-event-action';-import { type WorkspaceAuthContext } from 'src/engine/core-modules/auth/types/workspace-auth-context.type';-import { InternalServerError } from 'src/engine/core-modules/graphql/utils/graphql-errors.util';-import { findFlatEntityByIdInFlatEntityMaps } from 'src/engine/metadata-modules/flat-entity/utils/find-flat-entity-by-id-in-flat-entity-maps.util';-import { type FlatObjectMetadata } from 'src/engine/metadata-modules/flat-object-metadata/types/flat-object-metadata.type';-import {- PermissionsException,- PermissionsExceptionCode,-} from 'src/engine/metadata-modules/permissions/permissions.exception';-import { type BaseWorkspaceEntity } from 'src/engine/twenty-orm/base.workspace-entity';-import { type DeepPartialWithNestedRelationFields } from 'src/engine/twenty-orm/entity-manager/types/deep-partial-entity-with-nested-relation-fields.type';-import { type QueryDeepPartialEntityWithNestedRelationFields } from 'src/engine/twenty-orm/entity-manager/types/query-deep-partial-entity-with-nested-relation-fields.type';-import { getEntityTarget } from 'src/engine/twenty-orm/entity-manager/utils/get-entity-target';-import { computeTwentyORMException } from 'src/engine/twenty-orm/error-handling/compute-twenty-orm-exception';-import { FilesFieldSync } from 'src/engine/twenty-orm/field-operations/files-field-sync/files-field-sync';-import { RelationNestedQueries } from 'src/engine/twenty-orm/field-operations/relation-nested-queries/relation-nested-queries';-import { type GlobalWorkspaceDataSource } from 'src/engine/twenty-orm/global-workspace-datasource/global-workspace-datasource';-import {- type OperationType,- validateOperationIsPermittedOrThrow,-} from 'src/engine/twenty-orm/repository/permissions.utils';-import { WorkspaceSelectQueryBuilder } from 'src/engine/twenty-orm/repository/workspace-select-query-builder';-import { WorkspaceRepository } from 'src/engine/twenty-orm/repository/workspace.repository';-import { getWorkspaceContext } from 'src/engine/twenty-orm/storage/orm-workspace-context.storage';-import { type RolePermissionConfig } from 'src/engine/twenty-orm/types/role-permission-config';-import { computePermissionIntersection } from 'src/engine/twenty-orm/utils/compute-permission-intersection.util';-import { formatData } from 'src/engine/twenty-orm/utils/format-data.util';-import { formatResult } from 'src/engine/twenty-orm/utils/format-result.util';-import { formatTwentyOrmEventToDatabaseBatchEvent } from 'src/engine/twenty-orm/utils/format-twenty-orm-event-to-database-batch-event.util';-import { getObjectMetadataFromEntityTarget } from 'src/engine/twenty-orm/utils/get-object-metadata-from-entity-target.util';-import { type WorkspaceEventEmitter } from 'src/engine/workspace-event-emitter/workspace-event-emitter';--type PermissionOptions = {- shouldBypassPermissionChecks?: boolean;- objectRecordsPermissions?: ObjectsPermissions;-};--export class WorkspaceEntityManager extends EntityManager {- // oxlint-disable-next-line typescript/no-explicit-any- readonly repositories: Map<string, Repository<any>>;- declare connection: GlobalWorkspaceDataSource;-- constructor(- connection: GlobalWorkspaceDataSource,- queryRunner?: QueryRunner,- ) {- super(connection, queryRunner);- this.repositories = new Map();- }-- private get eventEmitterService(): WorkspaceEventEmitter {- return this.connection.eventEmitterService;- }-- get authContext(): WorkspaceAuthContext {- const context = getWorkspaceContext();-- return context.authContext;- }-- get internalContext(): WorkspaceInternalContext {- const context = getWorkspaceContext();-- return {- workspaceId: context.authContext.workspace.id,- flatObjectMetadataMaps: context.flatObjectMetadataMaps,- flatFieldMetadataMaps: context.flatFieldMetadataMaps,- flatIndexMaps: context.flatIndexMaps,- flatRowLevelPermissionPredicateMaps:- context.flatRowLevelPermissionPredicateMaps,- flatRowLevelPermissionPredicateGroupMaps:- context.flatRowLevelPermissionPredicateGroupMaps,- objectIdByNameSingular: context.objectIdByNameSingular,- featureFlagsMap: context.featureFlagsMap,- userWorkspaceRoleMap: context.userWorkspaceRoleMap,- apiKeyRoleMap: context.apiKeyRoleMap,- eventEmitterService: this.eventEmitterService,- coreDataSource: this.connection.coreDataSource,- };- }-- getFeatureFlagMap(): FeatureFlagMap {- return this.connection.featureFlagMap;- }-- private getPermissionsForRole(- roleId: string,- permissionsPerRoleId: ObjectsPermissionsByRoleId,- ): ObjectsPermissions {- if (!isDefined(permissionsPerRoleId?.[roleId])) {- throw new PermissionsException(- `No permissions found for role in datasource (roleId: ${roleId})`,- PermissionsExceptionCode.NO_PERMISSIONS_FOUND_IN_DATASOURCE,- );- }-- return permissionsPerRoleId[roleId];- }-- override getRepository<Entity extends ObjectLiteral>(- target: EntityTarget<Entity>,- rolePermissionConfig?: RolePermissionConfig,- authContext?: WorkspaceAuthContext,- ): WorkspaceRepository<Entity> {- const dataSource = this.connection;-- let objectPermissions = {};- let shouldBypassPermissionChecks = false;- const objectPermissionsByRoleId = dataSource.permissionsPerRoleId;-- if (- rolePermissionConfig &&- 'shouldBypassPermissionChecks' in rolePermissionConfig- ) {- shouldBypassPermissionChecks =- rolePermissionConfig.shouldBypassPermissionChecks;- }-- if (rolePermissionConfig && 'unionOf' in rolePermissionConfig) {- if (rolePermissionConfig.unionOf.length === 1) {- objectPermissions = this.getPermissionsForRole(- rolePermissionConfig.unionOf[0],- objectPermissionsByRoleId,- );- } else {- // TODO: Implement union logic for combining permissions across multiple roles- throw new Error(- 'Union permission logic for multiple roles not yet implemented',- );- }- }-- if (rolePermissionConfig && 'intersectionOf' in rolePermissionConfig) {- const allRolePermissions = rolePermissionConfig.intersectionOf.map(- (roleId: string) => objectPermissionsByRoleId?.[roleId],- );-- // defaultRoleId has no foreign key and can dangle. A bound that cannot- // be resolved denies rather than letting the rest decide alone.- objectPermissions = allRolePermissions.every(isDefined)- ? computePermissionIntersection(allRolePermissions)- : {};- }-- const newRepository = new WorkspaceRepository<Entity>(- target,- this,- dataSource.featureFlagMap,- this.queryRunner,- objectPermissions,- shouldBypassPermissionChecks,- authContext,- );-- return newRepository;- }-- override createQueryBuilder<Entity extends ObjectLiteral>(- entityClassOrQueryRunner?: EntityTarget<Entity> | QueryRunner,- alias?: string,- queryRunner?: QueryRunner,- options: {- shouldBypassPermissionChecks?: boolean;- objectRecordsPermissions?: ObjectsPermissions;- } = {- shouldBypassPermissionChecks: false,- objectRecordsPermissions: {},- },- ): WorkspaceSelectQueryBuilder<Entity> {- let queryBuilder: SelectQueryBuilder<Entity>;-- if (alias) {- queryBuilder = this.connection.createQueryBuilder(- entityClassOrQueryRunner as EntityTarget<Entity>,- alias as string,- queryRunner as QueryRunner | undefined,- {- calledByWorkspaceEntityManager: true,- },- );- } else {- queryBuilder = this.connection.createQueryBuilder(- entityClassOrQueryRunner as QueryRunner,- {- calledByWorkspaceEntityManager: true,- },- );- }-- return new WorkspaceSelectQueryBuilder(- queryBuilder,- options?.objectRecordsPermissions ?? {},- this.internalContext,- options?.shouldBypassPermissionChecks ?? false,- this.authContext,- this.getFeatureFlagMap(),- );- }-- override async insert<Entity extends ObjectLiteral>(- target: EntityTarget<Entity>,- entity:- | QueryDeepPartialEntityWithNestedRelationFields<Entity>- | QueryDeepPartialEntityWithNestedRelationFields<Entity>[],- selectedColumns: string[] | '*' = '*',- permissionOptions?: PermissionOptions,- authContext?: WorkspaceAuthContext,- ): Promise<InsertResult> {- const metadata = this.connection.getMetadata(target);-- return this.createQueryBuilder(- target,- metadata.name,- undefined,- permissionOptions,- )- .insert()- .setWorkspaceAuthContext(authContext ?? this.authContext)- .values(entity)- .returning(selectedColumns)- .execute();- }-- override upsert<Entity extends ObjectLiteral>(- target: EntityTarget<Entity>,- entityOrEntities:- | QueryDeepPartialEntityWithNestedRelationFields<Entity>- | QueryDeepPartialEntityWithNestedRelationFields<Entity>[],- conflictPathsOrOptions: string[] | UpsertOptions<Entity>,- permissionOptions?: {- shouldBypassPermissionChecks?: boolean;- objectRecordsPermissions?: ObjectsPermissions;- },- selectedColumns: string[] | '*' = '*',- ): Promise<InsertResult> {- const metadata = this.connection.getMetadata(target);- let options;-- if (Array.isArray(conflictPathsOrOptions)) {- options = {- conflictPaths: conflictPathsOrOptions,- };- } else {- options = conflictPathsOrOptions;- }- let entities: QueryDeepPartialEntityWithNestedRelationFields<Entity>[];-- if (!Array.isArray(entityOrEntities)) {- entities = [entityOrEntities];- } else {- entities = entityOrEntities;- }- const conflictColumns = metadata.mapPropertyPathsToColumns(- Array.isArray(options.conflictPaths)- ? options.conflictPaths- : Object.keys(options.conflictPaths),- );- const overwriteColumns = metadata.columns.filter(- (col) =>- !conflictColumns.includes(col) &&- entities.some(- (entity) => typeof col.getEntityValue(entity) !== 'undefined',- ),- );-- const overwrites = [...conflictColumns, ...overwriteColumns].map(- (col) => col.databaseName,- );-- const conflictTargets = conflictColumns.map((col) => col.databaseName);-- const upsertOptions = {- skipUpdateIfNoValuesChanged: options.skipUpdateIfNoValuesChanged,- indexPredicate: options.indexPredicate,- upsertType:- options.upsertType || this.connection.driver.supportedUpsertTypes[0],- };-- const queryBuilder = this.createQueryBuilder(- undefined,- undefined,- undefined,- permissionOptions,- )- .insert()- .into(target)- .values(entities)- .orUpdate(overwrites, conflictTargets, upsertOptions)- .returning(options.returning ?? selectedColumns);-- return queryBuilder.execute();- }-- override update<Entity extends ObjectLiteral>(- target: EntityTarget<Entity>,- criteria:- | string- | string[]- | number- | number[]- | Date- | Date[]- | ObjectId- | ObjectId[]- | unknown,- partialEntity: QueryDeepPartialEntity<Entity>,- options?: UpdateOptions,- permissionOptions?: PermissionOptions,- selectedColumns: string[] | '*' = '*',- ): Promise<UpdateResult> {- const metadata = this.connection.getMetadata(target);-- if (- criteria === undefined ||- criteria === null ||- criteria === '' ||- (Array.isArray(criteria) && criteria.length === 0)- ) {- return Promise.reject(- new TypeORMError(- `Empty criteria(s) are not allowed for the update method.`,- ),- );- }- if (- typeof criteria === 'string' ||- typeof criteria === 'number' ||- criteria instanceof Date ||- Array.isArray(criteria)- ) {- return this.createQueryBuilder(- target,- metadata.name,- undefined,- permissionOptions,- )- .update()- .set(partialEntity)- .whereInIds(criteria)- .returning(options?.returning ?? selectedColumns)- .execute();- } else {- return this.createQueryBuilder(- target,- metadata.name,- undefined,- permissionOptions,- )- .update()- .set(partialEntity)- .where(criteria)- .returning(options?.returning ?? selectedColumns)- .execute();- }- }-- public updateMany<Entity extends ObjectLiteral>(- target: EntityTarget<Entity>,- inputs: {- criteria: string;- partialEntity: QueryDeepPartialEntity<Entity>;- }[],- permissionOptions?: PermissionOptions,- selectedColumns: string[] | '*' = '*',- ): Promise<UpdateResult> {- const metadata = this.connection.getMetadata(target);-- return this.createQueryBuilder(- target,- metadata.name,- undefined,- permissionOptions,- )- .update()- .setManyInputs(inputs)- .returning(selectedColumns ?? [])- .execute();- }-- override increment<Entity extends ObjectLiteral>(- target: EntityTarget<Entity>,- criteria: object,- propertyPath: string,- value: number | string,- permissionOptions?: PermissionOptions,- selectedColumns: string[] | '*' = '*',- ): Promise<UpdateResult> {- const metadata = this.connection.getMetadata(target);- const column = metadata.findColumnWithPropertyPath(propertyPath);-- if (!column)- throw new TypeORMError(- `Column ${propertyPath} was not found in ${metadata.targetName} entity.`,- );- if (isNaN(Number(value)))- throw new TypeORMError(`Value "${value}" is not a number.`);- // convert possible embeded path "social.likes" into object { social: { like: () => value } }- // oxlint-disable-next-line typescript/no-explicit-any- const values = propertyPath.split('.').reduceRight<any>(- (value, key) => ({ [key]: value }),- () => this.connection.driver.escape(column.databaseName) + ' + ' + value,- );-- return this.update(- target,- criteria,- values,- undefined,- permissionOptions,- selectedColumns,- );- }-- validatePermissions<Entity extends ObjectLiteral>({- target,- operationType,- permissionOptions,- selectedColumns,- updatedColumns = [],- }: {- target: EntityTarget<Entity> | Entity;- operationType: OperationType;- permissionOptions?: {- shouldBypassPermissionChecks?: boolean;- objectRecordsPermissions?: ObjectsPermissions;- };- selectedColumns: string[];- updatedColumns?: string[];- }): void {- if (permissionOptions?.shouldBypassPermissionChecks === true) {- return;- }-- const entityName =- typeof target === 'function' || typeof target === 'string'- ? this.extractTargetNameSingularFromEntityTarget(target)- : this.extractTargetNameSingularFromEntity(target);-- validateOperationIsPermittedOrThrow({- entityName,- operationType,- objectsPermissions: permissionOptions?.objectRecordsPermissions ?? {},- flatObjectMetadataMaps: this.internalContext.flatObjectMetadataMaps,- flatFieldMetadataMaps: this.internalContext.flatFieldMetadataMaps,- objectIdByNameSingular: this.internalContext.objectIdByNameSingular,- selectedColumns,- allFieldsSelected: false,- updatedColumns,- authContext: this.authContext,- });- }-- private extractTargetNameSingularFromEntityTarget(- target: EntityTarget<ObjectLiteral>,- ): string {- return this.connection.getMetadata(target).name;- }-- // oxlint-disable-next-line typescript/no-explicit-any- private extractTargetNameSingularFromEntity(entity: any): string {- return this.connection.getMetadata(entity.constructor).name;- }-- override find<Entity extends ObjectLiteral>(- entityClass: EntityTarget<Entity>,- options?: FindManyOptions<Entity>,- permissionOptions?: PermissionOptions,- ): Promise<Entity[]> {- const metadata = this.connection.getMetadata(entityClass);-- return this.createQueryBuilder(- entityClass,- FindOptionsUtils.extractFindManyOptionsAlias(options) || metadata.name,- this.queryRunner,- permissionOptions,- )- .setFindOptions(options || {})- .getMany();- }-- override findBy<Entity extends ObjectLiteral>(- entityClass: EntityTarget<Entity>,- where: FindOptionsWhere<Entity> | FindOptionsWhere<Entity>[],- permissionOptions?: PermissionOptions,- ): Promise<Entity[]> {- const metadata = this.connection.getMetadata(entityClass);-- return this.createQueryBuilder(- entityClass,- metadata.name,- this.queryRunner,- permissionOptions,- )- .setFindOptions({ where: where })- .getMany();- }-- override findOne<Entity extends ObjectLiteral>(- entityClass: EntityTarget<Entity>,- options: FindOneOptions<Entity>,- permissionOptions?: PermissionOptions,- ): Promise<Entity | null> {- const metadata = this.connection.getMetadata(entityClass);- let alias = metadata.name;-- if (options && options.join) {- alias = options.join.alias;- }- if (!options.where) {- throw new Error(- `You must provide selection conditions in order to find a single row.`,- );- }-- return this.createQueryBuilder(- entityClass,- alias,- this.queryRunner,- permissionOptions,- )- .setFindOptions({- ...options,- take: 1,- })- .getOne();- }-- override findOneBy<Entity extends ObjectLiteral>(- entityClass: EntityTarget<Entity>,- where: FindOptionsWhere<Entity> | FindOptionsWhere<Entity>[],- permissionOptions?: PermissionOptions,- ): Promise<Entity | null> {- const metadata = this.connection.getMetadata(entityClass);-- return this.createQueryBuilder(- entityClass,- metadata.name,- this.queryRunner,- permissionOptions,- )- .setFindOptions({- where,- take: 1,- })- .getOne();- }-- override findAndCount<Entity extends ObjectLiteral>(- entityClass: EntityTarget<Entity>,- options?: FindManyOptions<Entity>,- permissionOptions?: PermissionOptions,- ): Promise<[Entity[], number]> {- const metadata = this.connection.getMetadata(entityClass);-- return this.createQueryBuilder(- entityClass,- FindOptionsUtils.extractFindManyOptionsAlias(options) || metadata.name,- this.queryRunner,- permissionOptions,- )- .setFindOptions(options || {})- .getManyAndCount();- }-- override findAndCountBy<Entity extends ObjectLiteral>(- entityClass: EntityTarget<Entity>,- where: FindOptionsWhere<Entity> | FindOptionsWhere<Entity>[],- permissionOptions?: PermissionOptions,- ): Promise<[Entity[], number]> {- const metadata = this.connection.getMetadata(entityClass);-- return this.createQueryBuilder(- entityClass,- metadata.name,- this.queryRunner,- permissionOptions,- )- .setFindOptions({ where })- .getManyAndCount();- }-- override findOneOrFail<Entity extends ObjectLiteral>(- entityClass: EntityTarget<Entity>,- options: FindOneOptions<Entity>,- permissionOptions?: PermissionOptions,- ): Promise<Entity> {- return this.findOne(entityClass, options, permissionOptions).then(- (value) => {- if (value === null) {- return Promise.reject(new EntityNotFoundError(entityClass, options));- }-- return Promise.resolve(value);- },- );- }-- override findOneByOrFail<Entity extends ObjectLiteral>(- entityClass: EntityTarget<Entity>,- where: FindOptionsWhere<Entity> | FindOptionsWhere<Entity>[],- permissionOptions?: PermissionOptions,- ): Promise<Entity> {- return this.findOneBy(entityClass, where, permissionOptions).then(- (value) => {- if (value === null) {- return Promise.reject(new EntityNotFoundError(entityClass, where));- }-- return Promise.resolve(value);- },- );- }-- override delete<Entity extends ObjectLiteral>(- targetOrEntity: EntityTarget<Entity>,- criteria: unknown,- permissionOptions?: PermissionOptions,- selectedColumns: string[] | '*' = '*',- ): Promise<DeleteResult> {- if (- criteria === undefined ||- criteria === null ||- criteria === '' ||- (Array.isArray(criteria) && criteria.length === 0)- ) {- return Promise.reject(- new TypeORMError(- `Empty criteria(s) are not allowed for the delete method.`,- ),- );- }- if (- typeof criteria === 'string' ||- typeof criteria === 'number' ||- criteria instanceof Date ||- Array.isArray(criteria)- ) {- return this.createQueryBuilder(- undefined,- undefined,- undefined,- permissionOptions,- )- .delete()- .from(targetOrEntity)- .whereInIds(criteria)- .returning(selectedColumns)- .execute();- } else {- return this.createQueryBuilder(- undefined,- undefined,- undefined,- permissionOptions,- )- .delete()- .from(targetOrEntity)- .where(criteria)- .returning(selectedColumns)- .execute();- }- }-- override softDelete<Entity extends ObjectLiteral>(- targetOrEntity: EntityTarget<Entity>,- criteria: unknown,- permissionOptions?: PermissionOptions,- selectedColumns: string[] | '*' = '*',- ): Promise<UpdateResult> {- if (- criteria === undefined ||- criteria === null ||- criteria === '' ||- (Array.isArray(criteria) && criteria.length === 0)- ) {- return Promise.reject(- new TypeORMError(- `Empty criteria(s) are not allowed for the softDelete method.`,- ),- );- }- if (- typeof criteria === 'string' ||- typeof criteria === 'number' ||- criteria instanceof Date ||- Array.isArray(criteria)- ) {- return this.createQueryBuilder(- undefined,- undefined,- this.queryRunner,- permissionOptions,- )- .softDelete()- .from(targetOrEntity)- .whereInIds(criteria)- .returning(selectedColumns)- .execute();- } else {- return this.createQueryBuilder(- undefined,- undefined,- this.queryRunner,- permissionOptions,- )- .softDelete()- .from(targetOrEntity)- .where(criteria)- .returning(selectedColumns)- .execute();- }- }-- override restore<Entity extends ObjectLiteral>(- targetOrEntity: EntityTarget<Entity>,- criteria: unknown,- permissionOptions?: PermissionOptions,- selectedColumns: string[] | '*' = '*',- ): Promise<UpdateResult> {- if (- criteria === undefined ||- criteria === null ||- criteria === '' ||- (Array.isArray(criteria) && criteria.length === 0)- ) {- return Promise.reject(- new TypeORMError(- `Empty criteria(s) are not allowed for the restore method.`,- ),- );- }- if (- typeof criteria === 'string' ||- typeof criteria === 'number' ||- criteria instanceof Date ||- Array.isArray(criteria)- ) {- return this.createQueryBuilder(- undefined,- undefined,- this.queryRunner,- permissionOptions,- )- .restore()- .from(targetOrEntity)- .whereInIds(criteria)- .returning(selectedColumns)- .execute();- } else {- return this.createQueryBuilder(- undefined,- undefined,- this.queryRunner,- permissionOptions,- )- .restore()- .from(targetOrEntity)- .where(criteria)- .returning(selectedColumns)- .execute();- }- }-- override exists<Entity extends ObjectLiteral>(- entityClass: EntityTarget<Entity>,- options?: FindManyOptions<Entity>,- permissionOptions?: PermissionOptions,- ): Promise<boolean> {- const metadata = this.connection.getMetadata(entityClass);-- return this.createQueryBuilder(- entityClass,- FindOptionsUtils.extractFindManyOptionsAlias(options) || metadata.name,- this.queryRunner,- permissionOptions,- )- .setFindOptions(options || {})- .select('id')- .limit(1)- .getRawOne()- .then((result) => isDefined(result));- }-- override existsBy<Entity extends ObjectLiteral>(- entityClass: EntityTarget<Entity>,- where: FindOptionsWhere<Entity> | FindOptionsWhere<Entity>[],- permissionOptions?: PermissionOptions,- ): Promise<boolean> {- const metadata = this.connection.getMetadata(entityClass);-- return this.createQueryBuilder(- entityClass,- metadata.name,- this.queryRunner,- permissionOptions,- )- .setFindOptions({ where })- .select('id')- .limit(1)- .getRawOne()- .then((result) => isDefined(result));- }-- override count<Entity extends ObjectLiteral>(- entityClass: EntityTarget<Entity>,- options?: FindManyOptions<Entity>,- permissionOptions?: PermissionOptions,- ): Promise<number> {- const metadata = this.connection.getMetadata(entityClass);-- return this.createQueryBuilder(- entityClass,- FindOptionsUtils.extractFindManyOptionsAlias(options) || metadata.name,- this.queryRunner,- permissionOptions,- )- .setFindOptions(options || {})- .getCount();- }-- override countBy<Entity extends ObjectLiteral>(- entityClass: EntityTarget<Entity>,- where: FindOptionsWhere<Entity> | FindOptionsWhere<Entity>[],- permissionOptions?: PermissionOptions,- ): Promise<number> {- const metadata = this.connection.getMetadata(entityClass);-- return this.createQueryBuilder(- entityClass,- metadata.name,- this.queryRunner,- permissionOptions,- )- .setFindOptions({ where })- .getCount();- }-- async callAggregateFunCustom<Entity extends ObjectLiteral>(- entityClass: EntityTarget<Entity>,- fnName: string,- columnName: string,- where = {},- permissionOptions?: PermissionOptions,- ) {- const metadata = this.connection.getMetadata(entityClass);- const column = metadata.columns.find(- (item) => item.propertyPath === columnName,- );-- if (!column) {- throw new TypeORMError(- `Column "${columnName}" was not found in table "${metadata.name}"`,- );- }- const result = await this.createQueryBuilder(- entityClass,- metadata.name,- this.queryRunner,- permissionOptions,- )- .setFindOptions({ where })- .select(- `${fnName}(${this.connection.driver.escape(column.databaseName)})`,- fnName,- )- .getRawOne();-- return result[fnName] === null ? null : parseFloat(result[fnName]);- }-- override sum<Entity extends ObjectLiteral>(- entityClass: EntityTarget<Entity>,- columnName: PickKeysByType<Entity, number>,- where?: FindOptionsWhere<Entity> | FindOptionsWhere<Entity>[],- permissionOptions?: PermissionOptions,- ): Promise<number | null> {- return this.callAggregateFunCustom(- entityClass,- 'SUM',- columnName,- where,- permissionOptions,- );- }-- override average<Entity extends ObjectLiteral>(- entityClass: EntityTarget<Entity>,- columnName: PickKeysByType<Entity, number>,- where?: FindOptionsWhere<Entity> | FindOptionsWhere<Entity>[],- permissionOptions?: PermissionOptions,- ): Promise<number | null> {- return this.callAggregateFunCustom(- entityClass,- 'AVG',- columnName,- where,- permissionOptions,- );- }-- override minimum<Entity extends ObjectLiteral>(- entityClass: EntityTarget<Entity>,- columnName: PickKeysByType<Entity, number>,- where?: FindOptionsWhere<Entity> | FindOptionsWhere<Entity>[],- permissionOptions?: PermissionOptions,- ): Promise<number | null> {- return this.callAggregateFunCustom(- entityClass,- 'MIN',- columnName,- where,- permissionOptions,- );- }-- override maximum<Entity extends ObjectLiteral>(- entityClass: EntityTarget<Entity>,- columnName: PickKeysByType<Entity, number>,- where?: FindOptionsWhere<Entity> | FindOptionsWhere<Entity>[],- permissionOptions?: PermissionOptions,- ): Promise<number | null> {- return this.callAggregateFunCustom(- entityClass,- 'MAX',- columnName,- where,- permissionOptions,- );- }-- override clear<Entity>(- entityClass: EntityTarget<Entity>,- permissionOptions?: PermissionOptions,- ): Promise<void> {- this.validatePermissions({- target: entityClass,- operationType: 'delete',- permissionOptions,- selectedColumns: [], // TODO- });-- return super.clear(entityClass);- }-- override async preload<Entity extends ObjectLiteral>(- entityClass: EntityTarget<Entity>,- entityLike: DeepPartial<Entity>,- permissionOptions?: PermissionOptions,- ): Promise<Entity | undefined> {- const objectMetadataItem = getObjectMetadataFromEntityTarget(- entityClass,- this.internalContext,- );-- const formattedEntityLike = formatData(- entityLike,- objectMetadataItem,- this.internalContext.flatFieldMetadataMaps,- );-- const managerWithPermissionOptions = Object.assign(- Object.create(Object.getPrototypeOf(this)),- this,- {- findByIds: (entityClass: EntityTarget<Entity>, ids: string[]) => {- return this.findByIds(entityClass, ids, permissionOptions);- },- },- );-- const metadata = this.connection.getMetadata(entityClass);- const plainObjectToDatabaseEntityTransformer =- new PlainObjectToDatabaseEntityTransformer(managerWithPermissionOptions);- const transformedEntity =- await plainObjectToDatabaseEntityTransformer.transform(- formattedEntityLike,- metadata,- );-- if (transformedEntity)- return this.merge(- entityClass,- transformedEntity,- formattedEntityLike,- ) as Entity;-- return undefined;- }-- override decrement<Entity extends ObjectLiteral>(- target: EntityTarget<Entity>,- criteria: object,- propertyPath: string,- value: number | string,- permissionOptions?: PermissionOptions,- selectedColumns: string[] | '*' = '*',- ): Promise<UpdateResult> {- const metadata = this.connection.getMetadata(target);- const column = metadata.findColumnWithPropertyPath(propertyPath);-- if (!column)- throw new TypeORMError(- `Column ${propertyPath} was not found in ${metadata.targetName} entity.`,- );- if (isNaN(Number(value)))- throw new TypeORMError(`Value "${value}" is not a number.`);- // oxlint-disable-next-line typescript/no-explicit-any- const values = propertyPath.split('.').reduceRight<any>(- (value, key) => ({ [key]: value }),- () => this.connection.driver.escape(column.databaseName) + ' - ' + value,- );-- return this.update(- target,- criteria,- values,- undefined,- permissionOptions,- selectedColumns,- );- }-- override async findByIds<Entity extends ObjectLiteral>(- entityClass: EntityTarget<Entity>,- ids: string[],- permissionOptions?: PermissionOptions,- ): Promise<Entity[]> {- if (!ids.length) return Promise.resolve([]);- const metadata = this.connection.getMetadata(entityClass);-- return this.createQueryBuilder(- entityClass,- metadata.name,- undefined,- permissionOptions,- )- .andWhereInIds(ids)- .getMany();- }-- /**- * Functions duplicated from EntityManager but with a queryRunner that will bypass permissions- * because permissions cannot be passed on to the call to createQueryBuilder() done in SubjectExecutor called by EntityPersistExecutor- * queryBuilder checks are replaced by validatePermissions()- */-- override save<Entity extends ObjectLiteral>(- entities: Entity[],- options?: SaveOptions,- permissionOptions?: PermissionOptions,- ): Promise<Entity[]>;-- override save<Entity extends ObjectLiteral>(- entity: Entity,- options?: SaveOptions,- permissionOptions?: PermissionOptions,- ): Promise<Entity>;-- override save<Entity, T extends DeepPartialWithNestedRelationFields<Entity>>(- targetOrEntity: EntityTarget<Entity>,- entities: T[],- options: SaveOptions & {- reload: false;- },- permissionOptions?: PermissionOptions,- ): Promise<T[]>;-- override save<Entity, T extends DeepPartialWithNestedRelationFields<Entity>>(- targetOrEntity: EntityTarget<Entity>,- entities: T[],- options?: SaveOptions,- permissionOptions?: PermissionOptions,- ): Promise<(T & Entity)[]>;-- override save<Entity, T extends DeepPartialWithNestedRelationFields<Entity>>(- targetOrEntity: EntityTarget<Entity>,- entity: T,- options: SaveOptions & {- reload: false;- },- permissionOptions?: PermissionOptions,- ): Promise<T>;-- override save<Entity, T extends DeepPartialWithNestedRelationFields<Entity>>(- targetOrEntity: EntityTarget<Entity>,- entity: T,- options?: SaveOptions,- permissionOptions?: PermissionOptions,- ): Promise<T>;-- override async save<- Entity extends ObjectLiteral,- T extends DeepPartialWithNestedRelationFields<Entity>,- >(- targetOrEntity: EntityTarget<Entity> | Entity | Entity[],- entityOrMaybeOptions:- | T- | T[]- | SaveOptions- | (SaveOptions & { reload: false }),- maybeOptionsOrMaybePermissionOptions?:- | PermissionOptions- | SaveOptions- | (SaveOptions & { reload: false }),- permissionOptions?: PermissionOptions,- ): Promise<(T & Entity) | (T & Entity)[] | Entity | Entity[]> {- try {- const permissionOptionsFromArgs =- maybeOptionsOrMaybePermissionOptions &&- ('shouldBypassPermissionChecks' in- maybeOptionsOrMaybePermissionOptions ||- 'objectRecordsPermissions' in maybeOptionsOrMaybePermissionOptions)- ? maybeOptionsOrMaybePermissionOptions- : permissionOptions;-- let target =- arguments.length > 1 &&- (typeof targetOrEntity === 'function' ||- InstanceChecker.isEntitySchema(targetOrEntity) ||- typeof targetOrEntity === 'string')- ? targetOrEntity- : undefined;-- const entity = target ? entityOrMaybeOptions : targetOrEntity;-- const options = target- ? maybeOptionsOrMaybePermissionOptions- : entityOrMaybeOptions;-- if (InstanceChecker.isEntitySchema(target)) target = target.options.name;- if (Array.isArray(entity) && entity.length === 0)- return Promise.resolve(entity as Entity[]);-- const queryRunnerForEntityPersistExecutor =- this.connection.createQueryRunnerForEntityPersistExecutor();-- const isEntityArray = Array.isArray(entity);- const entityTarget =- target ?? (isEntityArray ? entity[0]?.constructor : entity.constructor);-- const entityArray = isEntityArray ? entity : [entity];-- const relationNestedQueries = new RelationNestedQueries(- this.internalContext,- );-- const relationNestedConfig =- relationNestedQueries.prepareNestedRelationQueries(- entityArray,- entityTarget,- );-- const entityWithConnectedRelations = isDefined(relationNestedConfig)- ? await relationNestedQueries.processRelationNestedQueries({- entities: entityArray,- relationNestedConfig,- queryBuilder: this.createQueryBuilder(- undefined,- undefined,- undefined,- permissionOptions,- ),- })- : entityArray;-- const entityIds = entityArray- .map((entity) => (entity as { id: string }).id)- .filter(isDefined);- const beforeUpdate = await this.find(- entityTarget,- {- where: { id: In(entityIds) },- withDeleted: true,- },- { shouldBypassPermissionChecks: true }, // Bypass as this is for event emission- );-- const beforeUpdateMapById = beforeUpdate.reduce(- (acc, e: ObjectLiteral) => {- acc[e.id] = e;-- return acc;- },- {} as Record<string, ObjectLiteral>,- );-- const filesFieldSync = new FilesFieldSync(this.internalContext);-- let filesFieldDiffByEntityIndex = null;- let filesFieldFileIds = null;-- filesFieldDiffByEntityIndex =- filesFieldSync.computeFilesFieldDiffBeforeUpsert(- entityWithConnectedRelations,- entityTarget,- beforeUpdateMapById,- );-- if (isDefined(filesFieldDiffByEntityIndex)) {- const result = await filesFieldSync.enrichFilesFields({- entities: entityWithConnectedRelations,- filesFieldDiffByEntityIndex,- workspaceId: this.internalContext.workspaceId,- target: entityTarget,- });-- filesFieldFileIds = result.fileIds;-- entityWithConnectedRelations.splice(- 0,- entityWithConnectedRelations.length,- ...result.entities,- );- }-- const objectMetadataItem = getObjectMetadataFromEntityTarget(- entityTarget,- this.internalContext,- );-- const formattedEntityOrEntities = formatData(- entityWithConnectedRelations,- objectMetadataItem,- this.internalContext.flatFieldMetadataMaps,- );-- const updatedColumns = formattedEntityOrEntities- .map((e) => Object.keys(e))- .flat();-- this.validatePermissions({- target: targetOrEntity,- operationType: 'update',- permissionOptions: permissionOptionsFromArgs,- selectedColumns: [],- updatedColumns,- });-- const result = await new EntityPersistExecutor(- this.connection,- queryRunnerForEntityPersistExecutor,- 'save',- target,- formattedEntityOrEntities as ObjectLiteral[],- options as SaveOptions | (SaveOptions & { reload: false }),- )- .execute()- .then(() => formattedEntityOrEntities as Entity[])- // oxlint-disable-next-line typescript/no-misused-promises- .finally(() => queryRunnerForEntityPersistExecutor.release());-- if (isDefined(filesFieldFileIds)) {- await filesFieldSync.updateFileEntityRecords(filesFieldFileIds);- }-- const resultArray = Array.isArray(result) ? result : [result];-- let formattedResult = formatResult<Entity[]>(- resultArray,- objectMetadataItem,- this.internalContext.flatObjectMetadataMaps,- this.internalContext.flatFieldMetadataMaps,- );-- const createdEntities = formattedResult.filter(- (entity) => !beforeUpdateMapById[entity.id],- );-- const updatedEntityIds = formattedResult- .map((entity) => entity.id)- .filter((entityId) => isDefined(beforeUpdateMapById[entityId]));-- const updatedEntities = isNonEmptyArray(updatedEntityIds)- ? await this.find(- entityTarget,- {- where: { id: In(updatedEntityIds) },- withDeleted: true,- },- { shouldBypassPermissionChecks: true }, // Bypass as this is for event emission- )- : [];-- this.internalContext.eventEmitterService.emitDatabaseBatchEvent(- formatTwentyOrmEventToDatabaseBatchEvent({- action: DatabaseEventAction.UPDATED,- objectMetadataItem,- flatFieldMetadataMaps: this.internalContext.flatFieldMetadataMaps,- workspaceId: this.internalContext.workspaceId,- recordsAfter: updatedEntities,- recordsBefore: beforeUpdate,- }),- );-- this.internalContext.eventEmitterService.emitDatabaseBatchEvent(- formatTwentyOrmEventToDatabaseBatchEvent({- action: DatabaseEventAction.CREATED,- objectMetadataItem,- flatFieldMetadataMaps: this.internalContext.flatFieldMetadataMaps,- workspaceId: this.internalContext.workspaceId,- recordsAfter: createdEntities,- }),- );-- const permissionCheckApplies =- permissionOptionsFromArgs?.shouldBypassPermissionChecks !== true &&- objectMetadataItem.isSystem !== true;-- if (permissionCheckApplies) {- formattedResult = this.getFormattedResultWithoutNonReadableFields({- formattedResult,- objectMetadataItem,- permissionOptionsFromArgs,- });- }-- return isEntityArray ? formattedResult : formattedResult[0];- } catch (error) {- const objectMetadataItem = getObjectMetadataFromEntityTarget(- getEntityTarget(targetOrEntity, entityOrMaybeOptions),- this.internalContext,- );-- throw await computeTwentyORMException(- error,- objectMetadataItem,- this,- this.internalContext,- );- }- }-- private getFormattedResultWithoutNonReadableFields<- Entity extends ObjectLiteral,- >({- formattedResult,- objectMetadataItem,- permissionOptionsFromArgs,- }: {- formattedResult: Entity[];- objectMetadataItem: FlatObjectMetadata;- permissionOptionsFromArgs: PermissionOptions | undefined;- }): Entity[] {- if (permissionOptionsFromArgs?.shouldBypassPermissionChecks === true) {- return formattedResult;- }-- const restrictedFields =- permissionOptionsFromArgs?.objectRecordsPermissions?.[- objectMetadataItem.id- ].restrictedFields;-- if (!restrictedFields) {- throw new InternalServerError('Restricted fields not found');- }-- if (isEmpty(restrictedFields)) {- return formattedResult;- }-- const restrictedFieldNames = new Set(- Object.entries(restrictedFields)- .filter(([_, fieldPermissions]) => fieldPermissions.canRead === false)- .map(([fieldMetadataId]) => {- const fieldMetadata = findFlatEntityByIdInFlatEntityMaps({- flatEntityId: fieldMetadataId,- flatEntityMaps: this.internalContext.flatFieldMetadataMaps,- });-- if (!isDefined(fieldMetadata)) {- throw new InternalServerError(- `Field metadata not found for field ${fieldMetadataId}`,- );- }-- return fieldMetadata.name;- }),- );-- const filteredResult = formattedResult.map((individualFormattedResult) => {- return Object.fromEntries(- Object.entries(individualFormattedResult).filter(- ([key]) => !restrictedFieldNames.has(key),- ),- );- });-- return filteredResult as Entity[];- }-- override remove<Entity>(- entity: Entity,- options?: RemoveOptions,- permissionOptions?: PermissionOptions,- ): Promise<Entity>;-- override remove<Entity>(- targetOrEntity: EntityTarget<Entity>,- entity: Entity,- options?: RemoveOptions,- permissionOptions?: PermissionOptions,- ): Promise<Entity>;-- override remove<Entity>(- entity: Entity[],- options?: RemoveOptions,- permissionOptions?: PermissionOptions,- ): Promise<Entity>;-- override remove<Entity>(- targetOrEntity: EntityTarget<Entity>,- entity: Entity[],- options?: RemoveOptions,- permissionOptions?: PermissionOptions,- ): Promise<Entity[]>;-- override async remove<Entity extends ObjectLiteral>(- targetOrEntity: EntityTarget<Entity> | Entity[] | Entity,- entityOrMaybeOptions: Entity | Entity[] | RemoveOptions,- maybeOptionsOrMaybePermissionOptions?: RemoveOptions | PermissionOptions,- permissionOptions?: PermissionOptions,- ): Promise<Entity | Entity[]> {- const permissionOptionsFromArgs =- maybeOptionsOrMaybePermissionOptions &&- ('shouldBypassPermissionChecks' in maybeOptionsOrMaybePermissionOptions ||- 'objectRecordsPermissions' in maybeOptionsOrMaybePermissionOptions)- ? (maybeOptionsOrMaybePermissionOptions as PermissionOptions)- : permissionOptions;-- this.validatePermissions({- target: targetOrEntity,- operationType: 'delete',- permissionOptions: permissionOptionsFromArgs,- selectedColumns: [], // TODO- });-- const target =- arguments.length > 1 &&- (typeof targetOrEntity === 'function' ||- InstanceChecker.isEntitySchema(targetOrEntity) ||- typeof targetOrEntity === 'string')- ? targetOrEntity- : undefined;- const entity = target ? entityOrMaybeOptions : targetOrEntity;- const options = target- ? maybeOptionsOrMaybePermissionOptions- : entityOrMaybeOptions;-- const isEntityArray = Array.isArray(entity);-- if (isEntityArray && entity.length === 0) return Promise.resolve(entity);-- const queryRunnerForEntityPersistExecutor =- this.connection.createQueryRunnerForEntityPersistExecutor();-- const entityTarget =- target ?? (isEntityArray ? entity[0]?.constructor : entity.constructor);-- const objectMetadataItem = getObjectMetadataFromEntityTarget(- entityTarget,- this.internalContext,- );-- const formattedEntity = formatData(- entity,- objectMetadataItem,- this.internalContext.flatFieldMetadataMaps,- );-- const result = new EntityPersistExecutor(- this.connection,- queryRunnerForEntityPersistExecutor,- 'remove',- target as string | undefined,- formattedEntity as ObjectLiteral,- options as RemoveOptions,- )- .execute()- .then(() => formattedEntity as Entity | Entity[])- // oxlint-disable-next-line typescript/no-misused-promises- .finally(() => queryRunnerForEntityPersistExecutor.release());-- const formattedResult = formatResult<Entity[]>(- result,- objectMetadataItem,- this.internalContext.flatObjectMetadataMaps,- this.internalContext.flatFieldMetadataMaps,- );-- const recordsBefore = Array.isArray(formattedResult)- ? formattedResult- : [formattedResult];-- this.internalContext.eventEmitterService.emitDatabaseBatchEvent(- formatTwentyOrmEventToDatabaseBatchEvent({- action: DatabaseEventAction.DESTROYED,- objectMetadataItem,- flatFieldMetadataMaps: this.internalContext.flatFieldMetadataMaps,- workspaceId: this.internalContext.workspaceId,- recordsBefore,- }),- );-- return isEntityArray ? formattedResult : formattedResult[0];- }-- override softRemove<Entity extends ObjectLiteral>(- entities: Entity[],- options?: SaveOptions,- permissionOptions?: PermissionOptions,- ): Promise<Entity[]>;-- override softRemove<Entity extends ObjectLiteral>(- entities: Entity,- options?: SaveOptions,- permissionOptions?: PermissionOptions,- ): Promise<Entity>;-- override softRemove<- Entity extends ObjectLiteral,- T extends DeepPartial<Entity>,- >(- targetOrEntity: EntityTarget<Entity>,- entities: T[],- options?: SaveOptions,- permissionOptions?: PermissionOptions,- ): Promise<T[]>;-- override softRemove<- Entity extends ObjectLiteral,- T extends DeepPartial<Entity>,- >(- targetOrEntity: EntityTarget<Entity>,- entities: T,- options?: SaveOptions,- permissionOptions?: PermissionOptions,- ): Promise<T>;-- override async softRemove<- Entity extends ObjectLiteral,- T extends DeepPartial<Entity>,- >(- targetOrEntityOrEntities: Entity | Entity[] | EntityTarget<Entity>,- entitiesOrMaybeOptions: T | T[] | SaveOptions,- maybeOptionsOrMaybePermissionOptions?: SaveOptions | PermissionOptions,- permissionOptions?: PermissionOptions,- ): Promise<Entity | Entity[] | T | T[]> {- const permissionOptionsFromArgs =- maybeOptionsOrMaybePermissionOptions &&- ('shouldBypassPermissionChecks' in maybeOptionsOrMaybePermissionOptions ||- 'objectRecordsPermissions' in maybeOptionsOrMaybePermissionOptions)- ? (maybeOptionsOrMaybePermissionOptions as PermissionOptions)- : permissionOptions;-- this.validatePermissions({- target: targetOrEntityOrEntities,- operationType: 'soft-delete',- permissionOptions: permissionOptionsFromArgs,- selectedColumns: [], // TODO- });-- let target =- arguments.length > 1 &&- (typeof targetOrEntityOrEntities === 'function' ||- InstanceChecker.isEntitySchema(targetOrEntityOrEntities) ||- typeof targetOrEntityOrEntities === 'string')- ? targetOrEntityOrEntities- : undefined;- const entity = target ? entitiesOrMaybeOptions : targetOrEntityOrEntities;- const options = target- ? maybeOptionsOrMaybePermissionOptions- : entitiesOrMaybeOptions;-- if (InstanceChecker.isEntitySchema(target)) target = target.options.name;- if (Array.isArray(entity) && entity.length === 0)- return Promise.resolve(entity);-- const queryRunnerForEntityPersistExecutor =- this.connection.createQueryRunnerForEntityPersistExecutor();-- const isEntityArray = Array.isArray(entity);- const entityTarget =- target ?? (isEntityArray ? entity[0]?.constructor : entity.constructor);-- const entityArray = isEntityArray ? entity : [entity];-- const entityIds = entityArray- .map((entity) => (entity as { id: string }).id)- .filter(isDefined);-- const recordsBeforeFindResult = await this.find<BaseWorkspaceEntity>(- entityTarget,- {- where: { id: In(entityIds) },- },- { shouldBypassPermissionChecks: true }, // Bypass as this is for event emission- );-- const beforeUpdateMapById = recordsBeforeFindResult.reduce(- (acc, e: BaseWorkspaceEntity) => {- acc[e.id] = e;-- return acc;- },- {} as Record<string, BaseWorkspaceEntity>,- );-- const objectMetadataItem = getObjectMetadataFromEntityTarget(- entityTarget,- this.internalContext,- );-- const formattedEntity = formatData(- entity,- objectMetadataItem,- this.internalContext.flatFieldMetadataMaps,- );-- const result = new EntityPersistExecutor(- this.connection,- queryRunnerForEntityPersistExecutor,- 'soft-remove',- target,- formattedEntity as ObjectLiteral,- options as SaveOptions,- )- .execute()- .then(() => formattedEntity as Entity)- // oxlint-disable-next-line typescript/no-misused-promises- .finally(() => queryRunnerForEntityPersistExecutor.release());-- const formattedResult = formatResult<Entity[]>(- result,- objectMetadataItem,- this.internalContext.flatObjectMetadataMaps,- this.internalContext.flatFieldMetadataMaps,- );-- const recordsAfter = Array.isArray(formattedResult)- ? formattedResult- : [formattedResult];-- const recordsBefore = recordsAfter.map<Entity>(- (record) => beforeUpdateMapById[record.id] as unknown as Entity,- );-- this.internalContext.eventEmitterService.emitDatabaseBatchEvent(- formatTwentyOrmEventToDatabaseBatchEvent({- action: DatabaseEventAction.DELETED,- objectMetadataItem,- flatFieldMetadataMaps: this.internalContext.flatFieldMetadataMaps,- workspaceId: this.internalContext.workspaceId,- recordsAfter,- recordsBefore,- }),- );-- return isEntityArray ? formattedResult : formattedResult[0];- }-- override recover<Entity>(- entities: Entity[],- options?: SaveOptions,- permissionOptions?: PermissionOptions,- ): Promise<Entity[]>;-- override recover<Entity>(- entity: Entity,- options?: SaveOptions,- permissionOptions?: PermissionOptions,- ): Promise<Entity>;-- override recover<Entity, T extends DeepPartial<Entity>>(- targetOrEntity: EntityTarget<Entity>,- entities: T[],- options?: SaveOptions,- permissionOptions?: PermissionOptions,- ): Promise<T[]>;-- override recover<Entity, T extends DeepPartial<Entity>>(- targetOrEntity: EntityTarget<Entity>,- entity: T,- options?: SaveOptions,- permissionOptions?: PermissionOptions,- ): Promise<T>;-- override async recover<- Entity extends ObjectLiteral,- T extends DeepPartial<Entity>,- >(- targetOrEntityOrEntities: EntityTarget<Entity> | Entity | Entity[],- entityOrEntitiesOrMaybeOptions: T | T[] | SaveOptions,- maybeOptionsOrMaybePermissionOptions?: SaveOptions | PermissionOptions,- permissionOptions?: PermissionOptions,- ): Promise<Entity | Entity[] | T | T[]> {- const permissionOptionsFromArgs =- maybeOptionsOrMaybePermissionOptions &&- ('shouldBypassPermissionChecks' in maybeOptionsOrMaybePermissionOptions ||- 'objectRecordsPermissions' in maybeOptionsOrMaybePermissionOptions)- ? (maybeOptionsOrMaybePermissionOptions as PermissionOptions)- : permissionOptions;-- this.validatePermissions({- target: targetOrEntityOrEntities,- operationType: 'restore',- permissionOptions: permissionOptionsFromArgs,- selectedColumns: [], // TODO- });-- let target =- arguments.length > 1 &&- (typeof targetOrEntityOrEntities === 'function' ||- InstanceChecker.isEntitySchema(targetOrEntityOrEntities) ||- typeof targetOrEntityOrEntities === 'string')- ? targetOrEntityOrEntities- : undefined;- const entity = target- ? entityOrEntitiesOrMaybeOptions- : targetOrEntityOrEntities;- const options = target- ? maybeOptionsOrMaybePermissionOptions- : entityOrEntitiesOrMaybeOptions;-- if (InstanceChecker.isEntitySchema(target)) target = target.options.name;- const isEntityArray = Array.isArray(entity);-- if (isEntityArray && entity.length === 0) return Promise.resolve(entity);-- const queryRunnerForEntityPersistExecutor =- this.connection.createQueryRunnerForEntityPersistExecutor();-- const entityTarget =- target ?? (isEntityArray ? entity[0]?.constructor : entity.constructor);-- const entityArray = isEntityArray ? entity : [entity];-- const entityIds = entityArray- .map((entity) => (entity as { id: string }).id)- .filter(isDefined);-- const recordsBeforeFindResult = await this.find<BaseWorkspaceEntity>(- entityTarget,- {- where: { id: In(entityIds) },- },- { shouldBypassPermissionChecks: true }, // Bypass as this is for event emission- );-- const beforeUpdateMapById = recordsBeforeFindResult.reduce(- (acc, e: BaseWorkspaceEntity) => {- acc[e.id] = e;-- return acc;- },- {} as Record<string, BaseWorkspaceEntity>,- );-- const objectMetadataItem = getObjectMetadataFromEntityTarget(- entityTarget,- this.internalContext,- );-- const formattedEntity = formatData(- entity,- objectMetadataItem,- this.internalContext.flatFieldMetadataMaps,- );-- const result = new EntityPersistExecutor(- this.connection,- queryRunnerForEntityPersistExecutor,- 'recover',- target,- formattedEntity as ObjectLiteral,- options as SaveOptions,- )- .execute()- .then(() => formattedEntity as Entity)- // oxlint-disable-next-line typescript/no-misused-promises- .finally(() => queryRunnerForEntityPersistExecutor.release());-- const formattedResult = formatResult<Entity[]>(- result,- objectMetadataItem,- this.internalContext.flatObjectMetadataMaps,- this.internalContext.flatFieldMetadataMaps,- );-- const recordsAfter = Array.isArray(formattedResult)- ? formattedResult- : [formattedResult];-- const recordsBefore = recordsAfter.map<Entity>(- (record) => beforeUpdateMapById[record.id] as unknown as Entity,- );-- this.internalContext.eventEmitterService.emitDatabaseBatchEvent(- formatTwentyOrmEventToDatabaseBatchEvent({- action: DatabaseEventAction.RESTORED,- objectMetadataItem,- flatFieldMetadataMaps: this.internalContext.flatFieldMetadataMaps,- workspaceId: this.internalContext.workspaceId,- recordsAfter,- recordsBefore,- }),- );-- return isEntityArray ? formattedResult : formattedResult[0];- }-- // oxlint-disable-next-line typescript/no-explicit-any- override query<T = any>(_query: string, _parameters?: any[]): Promise<T> {- throw new PermissionsException(- 'Method not allowed.',- PermissionsExceptionCode.RAW_SQL_NOT_ALLOWED,- );- }-}diff --git a/packages/twenty-server/src/engine/twenty-orm/error-handling/__tests__/compute-twenty-orm-exception.spec.ts b/packages/twenty-server/src/engine/twenty-orm/error-handling/__tests__/compute-twenty-orm-exception.spec.tsdeleted file mode 100644index 85be7d0cd5f..00000000000--- a/packages/twenty-server/src/engine/twenty-orm/error-handling/__tests__/compute-twenty-orm-exception.spec.ts+++ /dev/null@@ -1,198 +0,0 @@-import { msg } from '@lingui/core/macro';-import { QueryFailedError } from 'typeorm';--import { POSTGRESQL_ERROR_CODES } from 'src/engine/api/graphql/workspace-query-runner/constants/postgres-error-codes.constants';-import { handleDuplicateKeyError } from 'src/engine/api/graphql/workspace-query-runner/utils/handle-duplicate-key-error.util';-import { PostgresException } from 'src/engine/api/graphql/workspace-query-runner/utils/postgres-exception';-import { computeTwentyORMException } from 'src/engine/twenty-orm/error-handling/compute-twenty-orm-exception';-import {- TwentyORMException,- TwentyORMExceptionCode,-} from 'src/engine/twenty-orm/exceptions/twenty-orm.exception';--jest.mock(- 'src/engine/api/graphql/workspace-query-runner/utils/handle-duplicate-key-error.util',- () => ({- handleDuplicateKeyError: jest.fn(),- }),-);--const handleDuplicateKeyErrorMock = handleDuplicateKeyError as jest.Mock;--const buildQueryFailedError = (- code: string | undefined,- message = 'query failed',-): QueryFailedError => {- const driverError = new Error(message);-- if (code !== undefined) {- Object.assign(driverError, { code });- }-- return new QueryFailedError('SELECT 1', [], driverError);-};--describe('computeTwentyORMException', () => {- beforeEach(() => {- jest.clearAllMocks();- });-- it('should return an INVALID_INPUT exception with a missing-field message when error is a NOT_NULL_VIOLATION', async () => {- const error = buildQueryFailedError(- POSTGRESQL_ERROR_CODES.NOT_NULL_VIOLATION,- );-- const result = await computeTwentyORMException(error);-- expect(result).toBeInstanceOf(TwentyORMException);- expect((result as TwentyORMException).code).toBe(- TwentyORMExceptionCode.INVALID_INPUT,- );- expect((result as TwentyORMException).userFriendlyMessage).toEqual(- msg`A required field is missing. Please provide all required values and try again.`,- );- });-- it('should return an INVALID_INPUT exception with a relationship message when error is a FOREIGN_KEY_VIOLATION', async () => {- const error = buildQueryFailedError(- POSTGRESQL_ERROR_CODES.FOREIGN_KEY_VIOLATION,- );-- const result = await computeTwentyORMException(error);-- expect(result).toBeInstanceOf(TwentyORMException);- expect((result as TwentyORMException).code).toBe(- TwentyORMExceptionCode.INVALID_INPUT,- );- expect((result as TwentyORMException).userFriendlyMessage).toEqual(- msg`This operation references a record that does not exist or cannot be modified due to existing relationships.`,- );- });-- it('should return an INVALID_INPUT exception with a still-referenced message when error is a RESTRICT_VIOLATION', async () => {- const error = buildQueryFailedError(- POSTGRESQL_ERROR_CODES.RESTRICT_VIOLATION,- );-- const result = await computeTwentyORMException(error);-- expect(result).toBeInstanceOf(TwentyORMException);- expect((result as TwentyORMException).code).toBe(- TwentyORMExceptionCode.INVALID_INPUT,- );- expect((result as TwentyORMException).userFriendlyMessage).toEqual(- msg`This record cannot be deleted because it is still referenced by other records.`,- );- });-- it('should preserve the original message when surfacing a constraint violation as INVALID_INPUT', async () => {- const error = buildQueryFailedError(- POSTGRESQL_ERROR_CODES.NOT_NULL_VIOLATION,- 'null value in column "name" violates not-null constraint',- );-- const result = await computeTwentyORMException(error);-- expect((result as TwentyORMException).message).toBe(- 'null value in column "name" violates not-null constraint',- );- });-- it('should throw the generic PostgresException when error is a CHECK_VIOLATION (handled by the catch-all)', async () => {- const error = buildQueryFailedError(POSTGRESQL_ERROR_CODES.CHECK_VIOLATION);-- await expect(computeTwentyORMException(error)).rejects.toThrow(- PostgresException,- );- await expect(computeTwentyORMException(error)).rejects.toMatchObject({- message: 'Data validation error.',- code: POSTGRESQL_ERROR_CODES.CHECK_VIOLATION,- });- });-- it('should return an INVALID_INPUT exception with the original message when error is an INVALID_TEXT_REPRESENTATION', async () => {- const error = buildQueryFailedError(- POSTGRESQL_ERROR_CODES.INVALID_TEXT_REPRESENTATION,- 'invalid input syntax for type uuid',- );-- const result = await computeTwentyORMException(error);-- expect(result).toBeInstanceOf(TwentyORMException);- expect((result as TwentyORMException).code).toBe(- TwentyORMExceptionCode.INVALID_INPUT,- );- expect((result as TwentyORMException).message).toBe(- 'invalid input syntax for type uuid',- );- });-- it('should return a QUERY_READ_TIMEOUT exception when error message mentions a query read timeout', async () => {- const error = buildQueryFailedError(undefined, 'Query read timeout');-- const result = await computeTwentyORMException(error);-- expect(result).toBeInstanceOf(TwentyORMException);- expect((result as TwentyORMException).code).toBe(- TwentyORMExceptionCode.QUERY_READ_TIMEOUT,- );- });-- it('should delegate to handleDuplicateKeyError when error is a UNIQUE_VIOLATION and metadata context is provided', async () => {- const error = buildQueryFailedError(- POSTGRESQL_ERROR_CODES.UNIQUE_VIOLATION,- );- const objectMetadata = { nameSingular: 'person' } as never;- const entityManager = {} as never;- const internalContext = {} as never;- const duplicateException = new TwentyORMException(- 'A duplicate entry was detected',- TwentyORMExceptionCode.DUPLICATE_ENTRY_DETECTED,- );-- handleDuplicateKeyErrorMock.mockResolvedValue(duplicateException);-- const result = await computeTwentyORMException(- error,- objectMetadata,- entityManager,- internalContext,- );-- expect(handleDuplicateKeyErrorMock).toHaveBeenCalledWith(- error,- objectMetadata,- internalContext,- entityManager,- );- expect(result).toBe(duplicateException);- });-- it('should throw the generic PostgresException when error is a known postgres code without dedicated handling', async () => {- const error = buildQueryFailedError(- POSTGRESQL_ERROR_CODES.SERIALIZATION_FAILURE,- );-- await expect(computeTwentyORMException(error)).rejects.toThrow(- PostgresException,- );- await expect(computeTwentyORMException(error)).rejects.toMatchObject({- message: 'Data validation error.',- code: POSTGRESQL_ERROR_CODES.SERIALIZATION_FAILURE,- });- });-- it('should rethrow the original error when error is a QueryFailedError with an unknown code', async () => {- const error = buildQueryFailedError('99999');-- await expect(computeTwentyORMException(error)).rejects.toBe(error);- });-- it('should return the error unchanged when error is not a QueryFailedError', async () => {- const error = new Error('some unrelated error');-- const result = await computeTwentyORMException(error);-- expect(result).toBe(error);- });-});diff --git a/packages/twenty-server/src/engine/twenty-orm/error-handling/compute-twenty-orm-exception.ts b/packages/twenty-server/src/engine/twenty-orm/error-handling/compute-twenty-orm-exception.tsdeleted file mode 100644index 2f440a3a74b..00000000000--- a/packages/twenty-server/src/engine/twenty-orm/error-handling/compute-twenty-orm-exception.ts+++ /dev/null@@ -1,89 +0,0 @@-import { isDefined } from 'twenty-shared/utils';-import { QueryFailedError } from 'typeorm';--import { type WorkspaceInternalContext } from 'src/engine/twenty-orm/interfaces/workspace-internal-context.interface';--import { POSTGRESQL_ERROR_CODES } from 'src/engine/api/graphql/workspace-query-runner/constants/postgres-error-codes.constants';-import {- CONSTRAINT_VIOLATION_USER_FRIENDLY_MESSAGES,- QUERY_READ_TIMEOUT_MESSAGE,- QUERY_READ_TIMEOUT_USER_FRIENDLY_MESSAGE,-} from 'src/engine/api/graphql/workspace-query-runner/constants/postgres-error-messages.constants';-import { handleDuplicateKeyError } from 'src/engine/api/graphql/workspace-query-runner/utils/handle-duplicate-key-error.util';-import { PostgresException } from 'src/engine/api/graphql/workspace-query-runner/utils/postgres-exception';-import { type FlatObjectMetadata } from 'src/engine/metadata-modules/flat-object-metadata/types/flat-object-metadata.type';-import { type WorkspaceEntityManager } from 'src/engine/twenty-orm/entity-manager/workspace-entity-manager';-import {- TwentyORMException,- TwentyORMExceptionCode,-} from 'src/engine/twenty-orm/exceptions/twenty-orm.exception';--interface QueryFailedErrorWithCode extends QueryFailedError {- code?: string;-}--export const computeTwentyORMException = async (- error: Error,- objectMetadata?: FlatObjectMetadata,- entityManager?: WorkspaceEntityManager,- internalContext?: WorkspaceInternalContext,-): Promise<Error | TwentyORMException> => {- if (error instanceof QueryFailedError) {- if (error.message.includes(QUERY_READ_TIMEOUT_MESSAGE)) {- return new TwentyORMException(- QUERY_READ_TIMEOUT_MESSAGE,- TwentyORMExceptionCode.QUERY_READ_TIMEOUT,- {- userFriendlyMessage: QUERY_READ_TIMEOUT_USER_FRIENDLY_MESSAGE,- },- );- }-- const errorCode = (error as QueryFailedErrorWithCode).code;-- if (- errorCode === POSTGRESQL_ERROR_CODES.UNIQUE_VIOLATION &&- isDefined(objectMetadata) &&- isDefined(entityManager) &&- isDefined(internalContext)- ) {- return await handleDuplicateKeyError(- error,- objectMetadata,- internalContext,- entityManager,- );- }-- if (errorCode === POSTGRESQL_ERROR_CODES.INVALID_TEXT_REPRESENTATION) {- return new TwentyORMException(- error.message,- TwentyORMExceptionCode.INVALID_INPUT,- );- }-- if (- isDefined(errorCode) &&- errorCode in CONSTRAINT_VIOLATION_USER_FRIENDLY_MESSAGES- ) {- return new TwentyORMException(- error.message,- TwentyORMExceptionCode.INVALID_INPUT,- {- userFriendlyMessage:- CONSTRAINT_VIOLATION_USER_FRIENDLY_MESSAGES[errorCode],- },- );- }-- if (- isDefined(errorCode) &&- Object.values(POSTGRESQL_ERROR_CODES).includes(errorCode)- ) {- throw new PostgresException('Data validation error.', errorCode);- }- throw error;- }-- return error;-};diff --git a/packages/twenty-server/src/engine/twenty-orm/factories/entity-schema-column.factory.ts b/packages/twenty-server/src/engine/twenty-orm/factories/entity-schema-column.factory.tsdeleted file mode 100644index ce9db2cd798..00000000000--- a/packages/twenty-server/src/engine/twenty-orm/factories/entity-schema-column.factory.ts+++ /dev/null@@ -1,157 +0,0 @@-import { Injectable } from '@nestjs/common';--import {- FieldMetadataType,- compositeTypeDefinitions,-} from 'twenty-shared/types';-import { isDefined } from 'twenty-shared/utils';-import { type ColumnType, type EntitySchemaColumnOptions } from 'typeorm';--import { computeMorphOrRelationFieldJoinColumnName } from 'src/engine/metadata-modules/field-metadata/utils/compute-morph-or-relation-field-join-column-name.util';-import { RelationType } from 'src/engine/metadata-modules/field-metadata/interfaces/relation-type.interface';--import { computeCompositeColumnName } from 'src/engine/metadata-modules/field-metadata/utils/compute-column-name.util';-import { isCompositeFieldMetadataType } from 'src/engine/metadata-modules/field-metadata/utils/is-composite-field-metadata-type.util';-import { isEnumFieldMetadataType } from 'src/engine/metadata-modules/field-metadata/utils/is-enum-field-metadata-type.util';-import { serializeDefaultValue } from 'src/engine/metadata-modules/field-metadata/utils/serialize-default-value';-import {- type EntitySchemaFieldMetadata,- type EntitySchemaFieldMetadataMaps,- type EntitySchemaObjectMetadata,-} from 'src/engine/twenty-orm/global-workspace-datasource/types/entity-schema-metadata.type';-import { isFieldMetadataEntityOfType } from 'src/engine/utils/is-field-metadata-of-type.util';-import { fieldMetadataTypeToColumnType } from 'src/engine/workspace-manager/workspace-migration/workspace-migration-runner/utils/field-metadata-type-to-column-type.util';--type EntitySchemaColumnMap = {- [key: string]: EntitySchemaColumnOptions;-};--@Injectable()-export class EntitySchemaColumnFactory {- create(- objectMetadata: EntitySchemaObjectMetadata,- fieldMetadataMaps: EntitySchemaFieldMetadataMaps,- ): EntitySchemaColumnMap {- let entitySchemaColumnMap: EntitySchemaColumnMap = {};-- const fieldMetadataCollection = objectMetadata.fieldIds- .map((fieldId) => fieldMetadataMaps.byId[fieldId])- .filter(isDefined);-- for (const fieldMetadata of fieldMetadataCollection) {- const key = fieldMetadata.name;-- const isRelation =- isFieldMetadataEntityOfType(- fieldMetadata,- FieldMetadataType.RELATION,- ) ||- isFieldMetadataEntityOfType(- fieldMetadata,- FieldMetadataType.MORPH_RELATION,- );-- if (isRelation) {- const isManyToOneRelation =- fieldMetadata.settings?.relationType === RelationType.MANY_TO_ONE;-- if (!isManyToOneRelation) {- continue;- }-- const joinColumnName = computeMorphOrRelationFieldJoinColumnName({- name: fieldMetadata.name,- });-- entitySchemaColumnMap[joinColumnName] = {- name: joinColumnName,- type: 'uuid',- nullable: fieldMetadata.isNullable ?? false,- };-- continue;- }-- if (isCompositeFieldMetadataType(fieldMetadata.type)) {- const compositeColumns = this.createCompositeColumns(fieldMetadata);-- entitySchemaColumnMap = {- ...entitySchemaColumnMap,- ...compositeColumns,- };-- continue;- }-- const columnType = fieldMetadataTypeToColumnType(fieldMetadata.type);- const defaultValue = serializeDefaultValue(fieldMetadata.defaultValue);-- entitySchemaColumnMap[key] = {- name: key,- type: columnType as ColumnType,- precision:- fieldMetadata.type === FieldMetadataType.DATE_TIME ? 3 : undefined,- // TODO: We should double check that- primary: key === 'id',- nullable: fieldMetadata.isNullable ?? false,- createDate: key === 'createdAt',- updateDate: key === 'updatedAt',- deleteDate: key === 'deletedAt',- array: fieldMetadata.type === FieldMetadataType.MULTI_SELECT,- default: defaultValue,- };-- if (isEnumFieldMetadataType(fieldMetadata.type)) {- const values = fieldMetadata.options?.map((option) => option.value);-- if (values && values.length > 0) {- entitySchemaColumnMap[key].enum = values;- }- }- }-- return entitySchemaColumnMap;- }-- private createCompositeColumns(- fieldMetadata: EntitySchemaFieldMetadata,- ): EntitySchemaColumnMap {- const entitySchemaColumnMap: EntitySchemaColumnMap = {};- const compositeType = compositeTypeDefinitions.get(fieldMetadata.type);-- if (!compositeType) {- throw new Error(- `Composite type ${fieldMetadata.type} is not defined in compositeTypeDefinitions`,- );- }-- for (const compositeProperty of compositeType.properties) {- const columnName = computeCompositeColumnName(- fieldMetadata.name,- compositeProperty,- );- const columnType = fieldMetadataTypeToColumnType(compositeProperty.type);- const defaultValue = serializeDefaultValue(- // @ts-expect-error legacy noImplicitAny- fieldMetadata.defaultValue?.[compositeProperty.name],- );-- entitySchemaColumnMap[columnName] = {- name: columnName,- type: columnType as ColumnType,- nullable: compositeProperty.isRequired,- default: defaultValue,- };-- if (isEnumFieldMetadataType(compositeProperty.type)) {- const values = compositeProperty.options?.map((option) => option.value);-- if (values && values.length > 0) {- entitySchemaColumnMap[columnName].enum = values;- }- }- }-- return entitySchemaColumnMap;- }-}diff --git a/packages/twenty-server/src/engine/twenty-orm/factories/entity-schema-relation.factory.ts b/packages/twenty-server/src/engine/twenty-orm/factories/entity-schema-relation.factory.tsdeleted file mode 100644index d9d8cf2fab2..00000000000--- a/packages/twenty-server/src/engine/twenty-orm/factories/entity-schema-relation.factory.ts+++ /dev/null@@ -1,68 +0,0 @@-import { Injectable } from '@nestjs/common';--import { FieldMetadataType } from 'twenty-shared/types';-import { isDefined } from 'twenty-shared/utils';-import { type EntitySchemaRelationOptions } from 'typeorm';--import {- type EntitySchemaFieldMetadata,- type EntitySchemaFieldMetadataMaps,- type EntitySchemaObjectMetadata,- type EntitySchemaObjectMetadataMaps,-} from 'src/engine/twenty-orm/global-workspace-datasource/types/entity-schema-metadata.type';-import { determineSchemaRelationDetails } from 'src/engine/twenty-orm/utils/determine-schema-relation-details.util';--type EntitySchemaRelationMap = {- [key: string]: EntitySchemaRelationOptions;-};--type RelationFieldMetadata = EntitySchemaFieldMetadata<- FieldMetadataType.RELATION | FieldMetadataType.MORPH_RELATION->;--@Injectable()-export class EntitySchemaRelationFactory {- constructor() {}-- create(- objectMetadata: EntitySchemaObjectMetadata,- objectMetadataMaps: EntitySchemaObjectMetadataMaps,- fieldMetadataMaps: EntitySchemaFieldMetadataMaps,- ): EntitySchemaRelationMap {- const entitySchemaRelationMap: EntitySchemaRelationMap = {};-- const fieldMetadatas = objectMetadata.fieldIds- .map((fieldId) => fieldMetadataMaps.byId[fieldId])- .filter(isDefined);-- for (const fieldMetadata of fieldMetadatas) {- if (!this.isRelationField(fieldMetadata)) {- continue;- }-- const relationDetails = determineSchemaRelationDetails(- fieldMetadata,- objectMetadataMaps,- fieldMetadataMaps,- );-- entitySchemaRelationMap[fieldMetadata.name] = {- type: relationDetails.relationType,- target: relationDetails.target,- inverseSide: relationDetails.inverseSide,- joinColumn: relationDetails.joinColumn,- } satisfies EntitySchemaRelationOptions;- }-- return entitySchemaRelationMap;- }-- private isRelationField(- fieldMetadata: EntitySchemaFieldMetadata,- ): fieldMetadata is RelationFieldMetadata {- return (- fieldMetadata.type === FieldMetadataType.RELATION ||- fieldMetadata.type === FieldMetadataType.MORPH_RELATION- );- }-}diff --git a/packages/twenty-server/src/engine/twenty-orm/factories/entity-schema.factory.ts b/packages/twenty-server/src/engine/twenty-orm/factories/entity-schema.factory.tsdeleted file mode 100644index a495a35c467..00000000000--- a/packages/twenty-server/src/engine/twenty-orm/factories/entity-schema.factory.ts+++ /dev/null@@ -1,54 +0,0 @@-import { Injectable } from '@nestjs/common';--import { EntitySchema } from 'typeorm';--import { EntitySchemaColumnFactory } from 'src/engine/twenty-orm/factories/entity-schema-column.factory';-import { EntitySchemaRelationFactory } from 'src/engine/twenty-orm/factories/entity-schema-relation.factory';-import {- type EntitySchemaFieldMetadataMaps,- type EntitySchemaObjectMetadata,- type EntitySchemaObjectMetadataMaps,-} from 'src/engine/twenty-orm/global-workspace-datasource/types/entity-schema-metadata.type';-import { computeTableName } from 'src/engine/utils/compute-table-name.util';-import { getWorkspaceSchemaName } from 'src/engine/workspace-datasource/utils/get-workspace-schema-name.util';--@Injectable()-export class EntitySchemaFactory {- constructor(- private readonly entitySchemaColumnFactory: EntitySchemaColumnFactory,- private readonly entitySchemaRelationFactory: EntitySchemaRelationFactory,- ) {}-- create(- workspaceId: string,- objectMetadata: EntitySchemaObjectMetadata,- objectMetadataMaps: EntitySchemaObjectMetadataMaps,- fieldMetadataMaps: EntitySchemaFieldMetadataMaps,- ): EntitySchema {- const columns = this.entitySchemaColumnFactory.create(- objectMetadata,- fieldMetadataMaps,- );-- const relations = this.entitySchemaRelationFactory.create(- objectMetadata,- objectMetadataMaps,- fieldMetadataMaps,- );-- const schemaName = getWorkspaceSchemaName(workspaceId);-- const entitySchema = new EntitySchema({- name: objectMetadata.nameSingular,- tableName: computeTableName(- objectMetadata.nameSingular,- objectMetadata.isCustom,- ),- columns,- relations,- schema: schemaName,- });-- return entitySchema;- }-}diff --git a/packages/twenty-server/src/engine/twenty-orm/factories/index.ts b/packages/twenty-server/src/engine/twenty-orm/factories/index.tsdeleted file mode 100644index 951debc166e..00000000000--- a/packages/twenty-server/src/engine/twenty-orm/factories/index.ts+++ /dev/null@@ -1,9 +0,0 @@-import { EntitySchemaColumnFactory } from 'src/engine/twenty-orm/factories/entity-schema-column.factory';-import { EntitySchemaRelationFactory } from 'src/engine/twenty-orm/factories/entity-schema-relation.factory';-import { EntitySchemaFactory } from 'src/engine/twenty-orm/factories/entity-schema.factory';--export const entitySchemaFactories = [- EntitySchemaColumnFactory,- EntitySchemaRelationFactory,- EntitySchemaFactory,-];diff --git a/packages/twenty-server/src/engine/twenty-orm/field-operations/relation-nested-queries/relation-nested-queries.ts b/packages/twenty-server/src/engine/twenty-orm/field-operations/relation-nested-queries/relation-nested-queries.tsindex 8658129d4e1..7497245e9c5 100644--- a/packages/twenty-server/src/engine/twenty-orm/field-operations/relation-nested-queries/relation-nested-queries.ts+++ b/packages/twenty-server/src/engine/twenty-orm/field-operations/relation-nested-queries/relation-nested-queries.ts@@ -1,10 +1,6 @@import { isDefined } from 'class-validator';import { RELATION_NESTED_QUERY_KEYWORDS } from 'twenty-shared/constants';-import {- type EntityTarget,- type ObjectLiteral,- type SelectQueryBuilder,-} from 'typeorm';+import { type EntityTarget, type ObjectLiteral } from 'typeorm';import { type QueryDeepPartialEntity } from 'typeorm/query-builder/QueryPartialEntity';import { type WorkspaceInternalContext } from 'src/engine/twenty-orm/interfaces/workspace-internal-context.interface';@@ -20,13 +16,11 @@ import {TwentyORMExceptionCode,} from 'src/engine/twenty-orm/exceptions/twenty-orm.exception';import { formatConnectRecordNotFoundErrorMessage } from 'src/engine/twenty-orm/field-operations/relation-nested-queries/utils/formatConnectRecordNotFoundErrorMessage.util';-import { type WorkspaceSelectQueryBuilder } from 'src/engine/twenty-orm/repository/workspace-select-query-builder';import { computeRelationConnectQueryConfigs } from 'src/engine/twenty-orm/utils/compute-relation-connect-query-configs.util';import { createSqlWhereTupleInClause } from 'src/engine/twenty-orm/utils/create-sql-where-tuple-in-clause.utils';import { extractNestedRelationFieldsByEntityIndex } from 'src/engine/twenty-orm/utils/extract-nested-relation-fields-by-entity-index.util';import { getAssociatedRelationFieldName } from 'src/engine/twenty-orm/utils/get-associated-relation-field-name.util';import { getObjectMetadataFromEntityTarget } from 'src/engine/twenty-orm/utils/get-object-metadata-from-entity-target.util';-import { getRecordToConnectFields } from 'src/engine/twenty-orm/utils/get-record-to-connect-fields.util';export type ConnectQueryRunner = (args: {connectQueryConfig: RelationConnectQueryConfig;@@ -93,7 +87,6 @@ export class RelationNestedQueries {async processRelationNestedQueries<Entity extends ObjectLiteral>({entities,relationNestedConfig,- queryBuilder,connectQueryRunner,}: {entities:@@ -103,10 +96,7 @@ export class RelationNestedQueries {RelationConnectQueryConfig[],RelationDisconnectQueryFieldsByEntityIndex,];- queryBuilder?:- | WorkspaceSelectQueryBuilder<Entity>- | SelectQueryBuilder<Entity>;- connectQueryRunner?: ConnectQueryRunner;+ connectQueryRunner: ConnectQueryRunner;}): Promise<QueryDeepPartialEntity<Entity>[]> {const entitiesArray = Array.isArray(entities) ? entities : [entities];@@ -123,7 +113,6 @@ export class RelationNestedQueries {const updatedEntitiesWithConnect = await this.processRelationConnect({entities: updatedEntitiesWithDisconnect,relationConnectQueryConfigs,- queryBuilder,connectQueryRunner,});@@ -133,21 +122,16 @@ export class RelationNestedQueries {private async processRelationConnect<Entity extends ObjectLiteral>({entities,relationConnectQueryConfigs,- queryBuilder,connectQueryRunner,}: {entities: QueryDeepPartialEntityWithNestedRelationFields<Entity>[];relationConnectQueryConfigs: RelationConnectQueryConfig[];- queryBuilder?:- | WorkspaceSelectQueryBuilder<Entity>- | SelectQueryBuilder<Entity>;- connectQueryRunner?: ConnectQueryRunner;+ connectQueryRunner: ConnectQueryRunner;}): Promise<QueryDeepPartialEntity<Entity>[]> {if (relationConnectQueryConfigs.length === 0) return entities;const recordsToConnectWithConfig = await this.executeConnectQueries(relationConnectQueryConfigs,- queryBuilder,connectQueryRunner,);@@ -159,13 +143,9 @@ export class RelationNestedQueries {return updatedEntities;}- private async executeConnectQueries<Entity extends ObjectLiteral>(+ private async executeConnectQueries(relationConnectQueryConfigs: RelationConnectQueryConfig[],- queryBuilder:- | WorkspaceSelectQueryBuilder<Entity>- | SelectQueryBuilder<Entity>- | undefined,- connectQueryRunner?: ConnectQueryRunner,+ connectQueryRunner: ConnectQueryRunner,): Promise<[RelationConnectQueryConfig, Record<string, unknown>[]][]> {const allRecordsToConnectWithConfig: [RelationConnectQueryConfig,@@ -178,32 +158,11 @@ export class RelationNestedQueries {connectQueryConfig.targetObjectName,);- let recordsToConnect: Record<string, unknown>[];-- if (connectQueryRunner) {- recordsToConnect = await connectQueryRunner({- connectQueryConfig,- clause,- parameters,- });- } else if (queryBuilder) {- queryBuilder.expressionMap.aliases = [];- queryBuilder.expressionMap.mainAlias = undefined;-- recordsToConnect = await queryBuilder- .select(getRecordToConnectFields(connectQueryConfig))- .where(clause, parameters)- .from(- connectQueryConfig.targetObjectName,- connectQueryConfig.targetObjectName,- )- .getRawMany();- } else {- throw new TwentyORMException(- 'A query builder or a connect query runner is required to resolve connect queries',- TwentyORMExceptionCode.INVALID_INPUT,- );- }+ const recordsToConnect = await connectQueryRunner({+ connectQueryConfig,+ clause,+ parameters,+ });allRecordsToConnectWithConfig.push([connectQueryConfig,diff --git a/packages/twenty-server/src/engine/twenty-orm/global-workspace-datasource/global-workspace-datasource.module.ts b/packages/twenty-server/src/engine/twenty-orm/global-workspace-datasource/global-workspace-datasource.module.tsindex 77ce2658b79..c343893463b 100644--- a/packages/twenty-server/src/engine/twenty-orm/global-workspace-datasource/global-workspace-datasource.module.ts+++ b/packages/twenty-server/src/engine/twenty-orm/global-workspace-datasource/global-workspace-datasource.module.ts@@ -10,13 +10,8 @@ import { FieldMetadataEntity } from 'src/engine/metadata-modules/field-metadata/import { WorkspaceManyOrAllFlatEntityMapsCacheModule } from 'src/engine/metadata-modules/flat-entity/services/workspace-many-or-all-flat-entity-maps-cache.module';import { ObjectMetadataEntity } from 'src/engine/metadata-modules/object-metadata/object-metadata.entity';import { WorkspaceFeatureFlagsMapCacheModule } from 'src/engine/metadata-modules/workspace-feature-flags-map-cache/workspace-feature-flags-map-cache.module';-import { EntitySchemaColumnFactory } from 'src/engine/twenty-orm/factories/entity-schema-column.factory';-import { EntitySchemaRelationFactory } from 'src/engine/twenty-orm/factories/entity-schema-relation.factory';-import { EntitySchemaFactory } from 'src/engine/twenty-orm/factories/entity-schema.factory';-import { GlobalWorkspaceDataSourceService } from 'src/engine/twenty-orm/global-workspace-datasource/global-workspace-datasource.service';import { GlobalWorkspaceOrmManager } from 'src/engine/twenty-orm/global-workspace-datasource/global-workspace-orm.manager';import { WorkspaceORMEntityMetadatasCacheService } from 'src/engine/twenty-orm/global-workspace-datasource/workspace-orm-entity-metadatas-cache.service';-import { TwentyORMModule } from 'src/engine/twenty-orm/twenty-orm.module';import { provideWorkspaceScopedRepository } from 'src/engine/twenty-orm/workspace-scoped-repository/provide-workspace-scoped-repository';import { TwentyORMV2Module } from 'src/engine/twenty-orm-v2/twenty-orm-v2.module';import { WorkspaceCacheStorageModule } from 'src/engine/workspace-cache-storage/workspace-cache-storage.module';@@ -40,18 +35,13 @@ import { WorkspaceEventEmitterModule } from 'src/engine/workspace-event-emitter/TwentyConfigModule,WorkspaceEventEmitterModule,WorkspaceCacheModule,- TwentyORMModule,TwentyORMV2Module,],providers: [- GlobalWorkspaceDataSourceService,GlobalWorkspaceOrmManager,- EntitySchemaFactory,- EntitySchemaColumnFactory,- EntitySchemaRelationFactory,WorkspaceORMEntityMetadatasCacheService,provideWorkspaceScopedRepository(FeatureFlagEntity),],- exports: [GlobalWorkspaceDataSourceService, GlobalWorkspaceOrmManager],+ exports: [GlobalWorkspaceOrmManager],})export class GlobalWorkspaceDataSourceModule {}diff --git a/packages/twenty-server/src/engine/twenty-orm/global-workspace-datasource/global-workspace-datasource.service.ts b/packages/twenty-server/src/engine/twenty-orm/global-workspace-datasource/global-workspace-datasource.service.tsdeleted file mode 100644index a77ac70d8ca..00000000000--- a/packages/twenty-server/src/engine/twenty-orm/global-workspace-datasource/global-workspace-datasource.service.ts+++ /dev/null@@ -1,138 +0,0 @@-import {- Injectable,- OnApplicationShutdown,- OnModuleInit,-} from '@nestjs/common';-import { InjectDataSource } from '@nestjs/typeorm';--import { isDefined } from 'twenty-shared/utils';-import { DataSource } from 'typeorm';--import {- DatabasePoolMetricsService,- DatabasePoolName,-} from 'src/database/typeorm/database-pool-metrics.service';-import { TwentyConfigService } from 'src/engine/core-modules/twenty-config/twenty-config.service';-import { GlobalWorkspaceDataSource } from 'src/engine/twenty-orm/global-workspace-datasource/global-workspace-datasource';-import { WorkspaceEventEmitter } from 'src/engine/workspace-event-emitter/workspace-event-emitter';--@Injectable()-export class GlobalWorkspaceDataSourceService- implements OnModuleInit, OnApplicationShutdown-{- private globalWorkspaceDataSource: GlobalWorkspaceDataSource | null = null;- private globalWorkspaceDataSourceReplica: GlobalWorkspaceDataSource | null =- null;-- constructor(- private readonly twentyConfigService: TwentyConfigService,- private readonly workspaceEventEmitter: WorkspaceEventEmitter,- @InjectDataSource()- private readonly coreDataSource: DataSource,- private readonly databasePoolMetricsService: DatabasePoolMetricsService,- ) {}-- async onModuleInit(): Promise<void> {- this.globalWorkspaceDataSource = new GlobalWorkspaceDataSource(- {- url: this.twentyConfigService.get('PG_DATABASE_URL'),- type: 'postgres',- logging: this.twentyConfigService.getLoggingConfig(),- entities: [],- ssl: this.twentyConfigService.get('PG_SSL_ALLOW_SELF_SIGNED')- ? {- rejectUnauthorized: false,- }- : undefined,- poolSize: this.twentyConfigService.get('PG_POOL_MAX_CONNECTIONS'),- extra: {- query_timeout: this.twentyConfigService.get(- 'PG_DATABASE_PRIMARY_TIMEOUT_MS',- ),- idleTimeoutMillis: this.twentyConfigService.get(- 'PG_POOL_IDLE_TIMEOUT_MS',- ),- allowExitOnIdle: this.twentyConfigService.get(- 'PG_POOL_ALLOW_EXIT_ON_IDLE',- ),- },- },- this.workspaceEventEmitter,- this.coreDataSource,- );-- await this.globalWorkspaceDataSource.initialize();- this.databasePoolMetricsService.registerDataSource({- poolName: DatabasePoolName.WorkspacePrimary,- dataSource: this.globalWorkspaceDataSource,- });-- const shouldInitializeReplicaDataSource = isDefined(- this.twentyConfigService.get('PG_DATABASE_REPLICA_URL'),- );-- if (shouldInitializeReplicaDataSource) {- this.globalWorkspaceDataSourceReplica = new GlobalWorkspaceDataSource(- {- url: this.twentyConfigService.get('PG_DATABASE_REPLICA_URL'),- type: 'postgres',- logging: this.twentyConfigService.getLoggingConfig(),- entities: [],- ssl: this.twentyConfigService.get('PG_SSL_ALLOW_SELF_SIGNED')- ? {- rejectUnauthorized: false,- }- : undefined,- poolSize: this.twentyConfigService.get('PG_POOL_MAX_CONNECTIONS'),- extra: {- query_timeout: this.twentyConfigService.get(- 'PG_DATABASE_REPLICA_TIMEOUT_MS',- ),- idleTimeoutMillis: this.twentyConfigService.get(- 'PG_POOL_IDLE_TIMEOUT_MS',- ),- allowExitOnIdle: this.twentyConfigService.get(- 'PG_POOL_ALLOW_EXIT_ON_IDLE',- ),- },- },- this.workspaceEventEmitter,- this.coreDataSource,- );- await this.globalWorkspaceDataSourceReplica.initialize();- this.databasePoolMetricsService.registerDataSource({- poolName: DatabasePoolName.WorkspaceReplica,- dataSource: this.globalWorkspaceDataSourceReplica,- });- }- }-- public getGlobalWorkspaceDataSource(): GlobalWorkspaceDataSource {- if (!isDefined(this.globalWorkspaceDataSource)) {- throw new Error(- 'GlobalWorkspaceDataSource has not been initialized. Make sure the module has been initialized.',- );- }-- return this.globalWorkspaceDataSource;- }-- public getGlobalWorkspaceDataSourceReplica(): GlobalWorkspaceDataSource {- if (!isDefined(this.globalWorkspaceDataSourceReplica)) {- return this.getGlobalWorkspaceDataSource();- }-- return this.globalWorkspaceDataSourceReplica;- }-- async onApplicationShutdown(): Promise<void> {- if (this.globalWorkspaceDataSource) {- await this.globalWorkspaceDataSource.destroy();- this.globalWorkspaceDataSource = null;- }- if (this.globalWorkspaceDataSourceReplica) {- await this.globalWorkspaceDataSourceReplica.destroy();- this.globalWorkspaceDataSourceReplica = null;- }- }-}diff --git a/packages/twenty-server/src/engine/twenty-orm/global-workspace-datasource/global-workspace-datasource.ts b/packages/twenty-server/src/engine/twenty-orm/global-workspace-datasource/global-workspace-datasource.tsdeleted file mode 100644index 3abc313d788..00000000000--- a/packages/twenty-server/src/engine/twenty-orm/global-workspace-datasource/global-workspace-datasource.ts+++ /dev/null@@ -1,251 +0,0 @@-import { type ObjectsPermissionsByRoleId } from 'twenty-shared/types';-import { isDefined } from 'twenty-shared/utils';-import {- DataSource,- type DataSourceOptions,- type EntityMetadata,- type EntityTarget,- type ObjectLiteral,- type QueryRunner,- type ReplicationMode,- type SelectQueryBuilder,-} from 'typeorm';-import { EntityManagerFactory } from 'typeorm/entity-manager/EntityManagerFactory';-import { EntityMetadataNotFoundError } from 'typeorm/error/EntityMetadataNotFoundError';--import { type FeatureFlagMap } from 'src/engine/core-modules/feature-flag/interfaces/feature-flag-map.interface';--import { type WorkspaceAuthContext } from 'src/engine/core-modules/auth/types/workspace-auth-context.type';-import {- PermissionsException,- PermissionsExceptionCode,-} from 'src/engine/metadata-modules/permissions/permissions.exception';-import { WorkspaceEntityManager } from 'src/engine/twenty-orm/entity-manager/workspace-entity-manager';-import { type WorkspaceQueryRunner } from 'src/engine/twenty-orm/query-runner/workspace-query-runner';-import { type WorkspaceRepository } from 'src/engine/twenty-orm/repository/workspace.repository';-import { getWorkspaceContext } from 'src/engine/twenty-orm/storage/orm-workspace-context.storage';-import { type RolePermissionConfig } from 'src/engine/twenty-orm/types/role-permission-config';-import { type WorkspaceEventEmitter } from 'src/engine/workspace-event-emitter/workspace-event-emitter';--type CreateQueryBuilderOptions = {- calledByWorkspaceEntityManager?: boolean;-};--export class GlobalWorkspaceDataSource extends DataSource {- readonly eventEmitterService: WorkspaceEventEmitter;- readonly coreDataSource: DataSource;- private _isConstructing = true;- dataSourceWithOverridenCreateQueryBuilder: GlobalWorkspaceDataSource;-- constructor(- options: DataSourceOptions,- eventEmitterService: WorkspaceEventEmitter,- coreDataSource: DataSource,- ) {- super(options);- this.eventEmitterService = eventEmitterService;- this.coreDataSource = coreDataSource;- this._isConstructing = false;-- Object.defineProperty(this, 'manager', {- get: () => this.createEntityManager(),- });- }-- get authContext(): WorkspaceAuthContext {- const context = getWorkspaceContext();-- return context.authContext;- }-- get featureFlagMap(): FeatureFlagMap {- const context = getWorkspaceContext();-- return context.featureFlagsMap;- }-- get permissionsPerRoleId(): ObjectsPermissionsByRoleId {- const context = getWorkspaceContext();-- return context.permissionsPerRoleId;- }-- override getRepository<Entity extends ObjectLiteral>(- target: EntityTarget<Entity>,- permissionOptions?: RolePermissionConfig,- ): WorkspaceRepository<Entity> {- const manager = this.createEntityManager();-- return manager.getRepository(target, permissionOptions, this.authContext);- }-- override findMetadata(- target: EntityTarget<ObjectLiteral>,- ): EntityMetadata | undefined {- const context = getWorkspaceContext();- const { entityMetadatas } = context;-- return entityMetadatas.find((metadata) => metadata.target === target);- }-- override getMetadata(target: EntityTarget<ObjectLiteral>): EntityMetadata {- const metadata = this.findMetadata(target);-- if (!metadata) {- throw new EntityMetadataNotFoundError(target);- }-- return metadata;- }-- override createEntityManager(- queryRunner?: QueryRunner,- ): WorkspaceEntityManager {- if (this._isConstructing !== false) {- return super.createEntityManager(queryRunner) as WorkspaceEntityManager;- }-- return new WorkspaceEntityManager(this, queryRunner);- }-- override createQueryRunner(- mode = 'master' as ReplicationMode,- ): WorkspaceQueryRunner {- const queryRunner = this.driver.createQueryRunner(mode);- const manager = this.createEntityManager(queryRunner);-- Object.assign(queryRunner, { manager: manager });-- // oxlint-disable-next-line typescript/no-explicit-any- return queryRunner as any as WorkspaceQueryRunner;- }-- // Do not use, only for specific permission-related purpose- createQueryRunnerForEntityPersistExecutor(- mode = 'master' as ReplicationMode,- ) {- if (this.dataSourceWithOverridenCreateQueryBuilder) {- const queryRunner = this.driver.createQueryRunner(mode);- const manager = new EntityManagerFactory().create(- this.dataSourceWithOverridenCreateQueryBuilder,- queryRunner,- );-- Object.assign(queryRunner, { manager: manager });-- return queryRunner;- }-- const dataSourceWithOverridenCreateQueryBuilder = Object.assign(- Object.create(Object.getPrototypeOf(this)),- this,- {- createQueryBuilder: (- entityOrRunner: EntityTarget<ObjectLiteral> | QueryRunner,- alias?: string,- queryRunner?: QueryRunner,- ) => {- if (isDefined(alias) && typeof alias === 'string') {- const entity = entityOrRunner as EntityTarget<ObjectLiteral>;-- return this.createQueryBuilder(entity, alias, queryRunner, {- calledByWorkspaceEntityManager: true,- });- } else {- const runner = entityOrRunner as QueryRunner;-- return this.createQueryBuilder(runner, {- calledByWorkspaceEntityManager: true,- });- }- },- },- );- const queryRunner = this.driver.createQueryRunner(mode);- const manager = new EntityManagerFactory().create(- dataSourceWithOverridenCreateQueryBuilder,- queryRunner,- );-- Object.assign(queryRunner, { manager: manager });-- return queryRunner;- }-- override createQueryBuilder<Entity extends ObjectLiteral>(- entityClass: EntityTarget<Entity>,- alias: string,- queryRunner?: QueryRunner,- options?: CreateQueryBuilderOptions,- ): SelectQueryBuilder<Entity>;-- override createQueryBuilder(- queryRunner?: QueryRunner,- options?: CreateQueryBuilderOptions, // oxlint-disable-next-line typescript/no-explicit-any- ): SelectQueryBuilder<any>;-- // Only callable from workspaceEntityManager to guarantee a permission check was run- override createQueryBuilder(- // oxlint-disable-next-line typescript/no-explicit-any- queryRunnerOrEntityClass?: QueryRunner | EntityTarget<any>,- aliasOrOptions?: string | CreateQueryBuilderOptions,- queryRunner?: QueryRunner,- options?: CreateQueryBuilderOptions,- // oxlint-disable-next-line typescript/no-explicit-any- ): SelectQueryBuilder<any> {- let calledByWorkspaceEntityManager;-- const isCalledWithEntityTarget =- isDefined(aliasOrOptions) && typeof aliasOrOptions === 'string';-- if (isCalledWithEntityTarget) {- calledByWorkspaceEntityManager = options?.calledByWorkspaceEntityManager;- } else {- calledByWorkspaceEntityManager = (- aliasOrOptions as CreateQueryBuilderOptions- )?.calledByWorkspaceEntityManager;- }-- if (!(calledByWorkspaceEntityManager === true)) {- throw new PermissionsException(- 'Method not allowed because permissions are not implemented at datasource level.',- PermissionsExceptionCode.METHOD_NOT_ALLOWED,- );- }-- if (isCalledWithEntityTarget) {- // oxlint-disable-next-line typescript/no-explicit-any- const entityClass = queryRunnerOrEntityClass as EntityTarget<any>;-- return super.createQueryBuilder(- entityClass,- aliasOrOptions as string,- queryRunner,- );- } else {- const queryRunner = queryRunnerOrEntityClass as QueryRunner;-- return super.createQueryBuilder(queryRunner);- }- }-- // oxlint-disable-next-line typescript/no-explicit-any- override query<T = any>(- query: string,- // oxlint-disable-next-line typescript/no-explicit-any- parameters?: any[],- queryRunner?: QueryRunner,- options?: {- shouldBypassPermissionChecks?: boolean;- },- ): Promise<T> {- if (!options?.shouldBypassPermissionChecks) {- throw new PermissionsException(- 'Method not allowed because permissions are not implemented at datasource level.',- PermissionsExceptionCode.METHOD_NOT_ALLOWED,- );- }-- return super.query(query, parameters, queryRunner);- }-}diff --git a/packages/twenty-server/src/engine/twenty-orm/global-workspace-datasource/global-workspace-orm.manager.ts b/packages/twenty-server/src/engine/twenty-orm/global-workspace-datasource/global-workspace-orm.manager.tsindex ba27bc03276..00e82ad910a 100644--- a/packages/twenty-server/src/engine/twenty-orm/global-workspace-datasource/global-workspace-orm.manager.ts+++ b/packages/twenty-server/src/engine/twenty-orm/global-workspace-datasource/global-workspace-orm.manager.ts@@ -2,27 +2,26 @@ import { Injectable, type Type } from '@nestjs/common';import { type ObjectLiteral } from 'typeorm';+import { type ObjectRecord } from 'twenty-shared/types';+import { getWorkspaceAuthContext } from 'src/engine/core-modules/auth/storage/workspace-auth-context.storage';import { type WorkspaceAuthContext } from 'src/engine/core-modules/auth/types/workspace-auth-context.type';import { buildObjectIdByNameMaps } from 'src/engine/metadata-modules/flat-object-metadata/utils/build-object-id-by-name-maps.util';-import { GlobalWorkspaceDataSource } from 'src/engine/twenty-orm/global-workspace-datasource/global-workspace-datasource';-import { GlobalWorkspaceDataSourceService } from 'src/engine/twenty-orm/global-workspace-datasource/global-workspace-datasource.service';import { ExecuteInWorkspaceContextOptions } from 'src/engine/twenty-orm/global-workspace-datasource/types/execute-in-workspace-context-options.type';import { type WorkspaceTransactionScope } from 'src/engine/twenty-orm/global-workspace-datasource/types/workspace-transaction-scope.type';-import type { WorkspaceRepository } from 'src/engine/twenty-orm/repository/workspace.repository';import {type ORMWorkspaceContext,withWorkspaceContext,} from 'src/engine/twenty-orm/storage/orm-workspace-context.storage';import type { RolePermissionConfig } from 'src/engine/twenty-orm/types/role-permission-config';import { WorkspaceDataSourceV2Service } from 'src/engine/twenty-orm-v2/datasource/workspace-data-source-v2.service';+import { type WorkspaceRepositoryV2 } from 'src/engine/twenty-orm-v2/repository/workspace-repository-v2';import { WorkspaceCacheService } from 'src/engine/workspace-cache/services/workspace-cache.service';import { convertClassNameToObjectMetadataName } from 'src/engine/workspace-manager/utils/convert-class-to-object-metadata-name.util';@Injectable()export class GlobalWorkspaceOrmManager {constructor(- private readonly globalWorkspaceDataSourceService: GlobalWorkspaceDataSourceService,private readonly workspaceCacheService: WorkspaceCacheService,private readonly workspaceDataSourceV2Service: WorkspaceDataSourceV2Service,) {}@@ -31,19 +30,19 @@ export class GlobalWorkspaceOrmManager {workspaceId: string,workspaceEntity: Type<T>,permissionOptions?: RolePermissionConfig,- ): Promise<WorkspaceRepository<T>>;+ ): Promise<WorkspaceRepositoryV2<T>>;async getRepository<T extends ObjectLiteral>(workspaceId: string,objectMetadataName: string,permissionOptions?: RolePermissionConfig,- ): Promise<WorkspaceRepository<T>>;+ ): Promise<WorkspaceRepositoryV2<T>>;async getRepository<T extends ObjectLiteral>(_workspaceId: string,workspaceEntityOrObjectMetadataName: Type<T> | string,permissionOptions?: RolePermissionConfig,- ): Promise<WorkspaceRepository<T>> {+ ): Promise<WorkspaceRepositoryV2<T>> {const objectMetadataName = this.resolveObjectMetadataName(workspaceEntityOrObjectMetadataName,);@@ -53,15 +52,7 @@ export class GlobalWorkspaceOrmManager {.getRepository(objectMetadataName,permissionOptions,- ) as unknown as WorkspaceRepository<T>;- }-- async getGlobalWorkspaceDataSource(): Promise<GlobalWorkspaceDataSource> {- return this.globalWorkspaceDataSourceService.getGlobalWorkspaceDataSource();- }-- async getGlobalWorkspaceDataSourceReplica(): Promise<GlobalWorkspaceDataSource> {- return this.globalWorkspaceDataSourceService.getGlobalWorkspaceDataSourceReplica();+ ) as unknown as WorkspaceRepositoryV2<T>;}private resolveObjectMetadataName<T extends ObjectLiteral>(@@ -83,14 +74,14 @@ export class GlobalWorkspaceOrmManager {.getDataSource({ useReplica: false }).transaction((transactionScope) =>work({- getRepository: <Entity extends ObjectLiteral>(+ getRepository: <T extends ObjectLiteral = ObjectRecord>(objectMetadataName: string,rolePermissionConfig?: RolePermissionConfig,- ): WorkspaceRepository<Entity> =>+ ): WorkspaceRepositoryV2<T> =>transactionScope.getRepository(objectMetadataName,rolePermissionConfig,- ) as unknown as WorkspaceRepository<Entity>,+ ) as unknown as WorkspaceRepositoryV2<T>,executeRawQuery: (sql, parameters) =>transactionScope.executeRawQuery(sql, parameters),}),diff --git a/packages/twenty-server/src/engine/twenty-orm/global-workspace-datasource/types/entity-schema-metadata.type.ts b/packages/twenty-server/src/engine/twenty-orm/global-workspace-datasource/types/entity-schema-metadata.type.tsdeleted file mode 100644index 5e99064142d..00000000000--- a/packages/twenty-server/src/engine/twenty-orm/global-workspace-datasource/types/entity-schema-metadata.type.ts+++ /dev/null@@ -1,89 +0,0 @@-import { type FieldMetadataType } from 'twenty-shared/types';--import { type FieldMetadataEntity } from 'src/engine/metadata-modules/field-metadata/field-metadata.entity';-import { type ObjectMetadataEntity } from 'src/engine/metadata-modules/object-metadata/object-metadata.entity';--export type EntitySchemaObjectMetadata = Pick<- ObjectMetadataEntity,- 'id' | 'nameSingular'-> & {- isCustom: boolean;- fieldIds: string[];-};--export type EntitySchemaFieldMetadata<- TFieldMetadataType extends FieldMetadataType = FieldMetadataType,-> = Pick<- FieldMetadataEntity<TFieldMetadataType>,- | 'id'- | 'name'- | 'type'- | 'settings'- | 'isNullable'- | 'isUnique'- | 'defaultValue'- | 'options'- | 'objectMetadataId'- | 'relationTargetObjectMetadataId'- | 'relationTargetFieldMetadataId'->;--export type EntitySchemaObjectMetadataMaps = {- byId: Partial<Record<string, EntitySchemaObjectMetadata>>;-};--export type EntitySchemaFieldMetadataMaps = {- byId: Partial<Record<string, EntitySchemaFieldMetadata>>;-};--export const buildEntitySchemaMetadataMaps = (- objectMetadatas: ObjectMetadataEntity[],- fieldMetadatas: FieldMetadataEntity[],- standardApplicationId: string | undefined,-): {- objectMetadataMaps: EntitySchemaObjectMetadataMaps;- fieldMetadataMaps: EntitySchemaFieldMetadataMaps;-} => {- const fieldIdsByObjectId = new Map<string, string[]>();-- for (const field of fieldMetadatas) {- const existing = fieldIdsByObjectId.get(field.objectMetadataId);-- if (existing) {- existing.push(field.id);- } else {- fieldIdsByObjectId.set(field.objectMetadataId, [field.id]);- }- }-- const objectMetadataMaps: EntitySchemaObjectMetadataMaps = { byId: {} };-- for (const object of objectMetadatas) {- objectMetadataMaps.byId[object.id] = {- id: object.id,- nameSingular: object.nameSingular,- isCustom: object.applicationId !== standardApplicationId,- fieldIds: fieldIdsByObjectId.get(object.id) ?? [],- };- }-- const fieldMetadataMaps: EntitySchemaFieldMetadataMaps = { byId: {} };-- for (const field of fieldMetadatas) {- fieldMetadataMaps.byId[field.id] = {- id: field.id,- name: field.name,- type: field.type,- settings: field.settings,- isNullable: field.isNullable,- isUnique: field.isUnique,- defaultValue: field.defaultValue,- options: field.options,- objectMetadataId: field.objectMetadataId,- relationTargetObjectMetadataId: field.relationTargetObjectMetadataId,- relationTargetFieldMetadataId: field.relationTargetFieldMetadataId,- };- }-- return { objectMetadataMaps, fieldMetadataMaps };-};diff --git a/packages/twenty-server/src/engine/twenty-orm/global-workspace-datasource/types/workspace-transaction-scope.type.ts b/packages/twenty-server/src/engine/twenty-orm/global-workspace-datasource/types/workspace-transaction-scope.type.tsindex bad5a272b3a..f741615dcc9 100644--- a/packages/twenty-server/src/engine/twenty-orm/global-workspace-datasource/types/workspace-transaction-scope.type.ts+++ b/packages/twenty-server/src/engine/twenty-orm/global-workspace-datasource/types/workspace-transaction-scope.type.ts@@ -1,13 +1,15 @@import { type ObjectLiteral } from 'typeorm';-import { type WorkspaceRepository } from 'src/engine/twenty-orm/repository/workspace.repository';+import { type ObjectRecord } from 'twenty-shared/types';+import { type RolePermissionConfig } from 'src/engine/twenty-orm/types/role-permission-config';+import { type WorkspaceRepositoryV2 } from 'src/engine/twenty-orm-v2/repository/workspace-repository-v2';export type WorkspaceTransactionScope = {- getRepository: <Entity extends ObjectLiteral>(+ getRepository: <T extends ObjectLiteral = ObjectRecord>(objectMetadataName: string,rolePermissionConfig?: RolePermissionConfig,- ) => WorkspaceRepository<Entity>;+ ) => WorkspaceRepositoryV2<T>;executeRawQuery: (sql: string,parameters?: unknown[],diff --git a/packages/twenty-server/src/engine/twenty-orm/query-runner/workspace-query-runner.ts b/packages/twenty-server/src/engine/twenty-orm/query-runner/workspace-query-runner.tsdeleted file mode 100644index 0d11a14dd86..00000000000--- a/packages/twenty-server/src/engine/twenty-orm/query-runner/workspace-query-runner.ts+++ /dev/null@@ -1,9 +0,0 @@-import { type QueryRunner } from 'typeorm';--import { type WorkspaceEntityManager } from 'src/engine/twenty-orm/entity-manager/workspace-entity-manager';--interface WorkspaceQueryRunner extends Omit<QueryRunner, 'manager'> {- manager: WorkspaceEntityManager;-}--export { WorkspaceQueryRunner };diff --git a/packages/twenty-server/src/engine/twenty-orm/repository/__tests__/workspace.repository.spec.ts b/packages/twenty-server/src/engine/twenty-orm/repository/__tests__/workspace.repository.spec.tsdeleted file mode 100644index d634d252c8b..00000000000--- a/packages/twenty-server/src/engine/twenty-orm/repository/__tests__/workspace.repository.spec.ts+++ /dev/null@@ -1,520 +0,0 @@-import {- FeatureFlagKey,- FieldMetadataType,- MetadataWritability,- type ObjectsPermissions,-} from 'twenty-shared/types';-import {- type DeepPartial,- type FindManyOptions,- type FindOneOptions,- type FindOptionsWhere,- type ObjectLiteral,- type QueryRunner,-} from 'typeorm';--import { type FeatureFlagMap } from 'src/engine/core-modules/feature-flag/interfaces/feature-flag-map.interface';-import { type WorkspaceInternalContext } from 'src/engine/twenty-orm/interfaces/workspace-internal-context.interface';--import { type FlatFieldMetadata } from 'src/engine/metadata-modules/flat-field-metadata/types/flat-field-metadata.type';-import { type WorkspaceEntityManager } from 'src/engine/twenty-orm/entity-manager/workspace-entity-manager';-import { WorkspaceRepository } from 'src/engine/twenty-orm/repository/workspace.repository';--describe('WorkspaceRepository', () => {- let repository: WorkspaceRepository<ObjectLiteral>;- let mockEntityManager: jest.Mocked<WorkspaceEntityManager>;- let mockInternalContext: WorkspaceInternalContext;- let mockFeatureFlagMap: FeatureFlagMap;- let mockObjectRecordsPermissions: ObjectsPermissions;- let mockQueryRunner: QueryRunner;-- beforeEach(() => {- mockEntityManager = {- find: jest.fn(),- findBy: jest.fn(),- findAndCount: jest.fn(),- findAndCountBy: jest.fn(),- findOne: jest.fn(),- findOneBy: jest.fn(),- findOneOrFail: jest.fn(),- findOneByOrFail: jest.fn(),- save: jest.fn(),- remove: jest.fn(),- delete: jest.fn(),- softRemove: jest.fn(),- softDelete: jest.fn(),- recover: jest.fn(),- restore: jest.fn(),- insert: jest.fn(),- update: jest.fn(),- upsert: jest.fn(),- exists: jest.fn(),- existsBy: jest.fn(),- count: jest.fn(),- countBy: jest.fn(),- sum: jest.fn(),- average: jest.fn(),- minimum: jest.fn(),- maximum: jest.fn(),- increment: jest.fn(),- decrement: jest.fn(),- preload: jest.fn(),- clear: jest.fn(),- get internalContext() {- return mockInternalContext;- },- } as unknown as jest.Mocked<WorkspaceEntityManager>;-- const mockFieldMetadata: FlatFieldMetadata = {- id: 'test-field-id',- name: 'id',- type: FieldMetadataType.UUID,- objectMetadataId: 'test-metadata-id',- isActive: true,- isSystemSideEffect: false,- isNullable: false,- isUnique: true,- isSystem: true,- isUIEditable: true,- writability: MetadataWritability.OPEN,- isLabelSyncedWithName: false,- label: 'ID',- description: 'Record ID',- icon: 'IconKey',- workspaceId: 'test-workspace-id',- universalIdentifier: 'id-field-universal-id',- createdAt: new Date().toISOString(),- updatedAt: new Date().toISOString(),- defaultValue: null,- options: null,- settings: null,- morphId: null,- overrides: null,- applicationId: 'application-id',- relationTargetFieldMetadataId: null,- relationTargetObjectMetadataId: null,- calendarViewIds: [],- calendarEndViewIds: [],- viewFilterIds: [],- fieldPermissionIds: [],- kanbanAggregateOperationViewIds: [],- viewFieldIds: [],- mainGroupByFieldMetadataViewIds: [],- applicationUniversalIdentifier: 'application-id',- objectMetadataUniversalIdentifier: 'test-metadata-id',- relationTargetObjectMetadataUniversalIdentifier: null,- relationTargetFieldMetadataUniversalIdentifier: null,- viewFilterUniversalIdentifiers: [],- viewFieldUniversalIdentifiers: [],- kanbanAggregateOperationViewUniversalIdentifiers: [],- calendarViewUniversalIdentifiers: [],- calendarEndViewUniversalIdentifiers: [],- mainGroupByFieldMetadataViewUniversalIdentifiers: [],- fieldPermissionUniversalIdentifiers: [],- viewSortIds: [],- viewSortUniversalIdentifiers: [],- searchFieldMetadataIds: [],- searchFieldMetadataUniversalIdentifiers: [],- universalSettings: null,- };-- mockInternalContext = {- workspaceId: 'test-workspace-id',- flatObjectMetadataMaps: {- byUniversalIdentifier: {},- universalIdentifierById: {},- universalIdentifiersByApplicationId: {},- },- flatFieldMetadataMaps: {- byUniversalIdentifier: {- 'id-field-universal-id': mockFieldMetadata,- },- universalIdentifierById: {- 'test-field-id': 'id-field-universal-id',- },- universalIdentifiersByApplicationId: {},- },- flatIndexMaps: {- byUniversalIdentifier: {},- universalIdentifierById: {},- universalIdentifiersByApplicationId: {},- },- flatRowLevelPermissionPredicateMaps: {- byUniversalIdentifier: {},- universalIdentifierById: {},- universalIdentifiersByApplicationId: {},- },- flatRowLevelPermissionPredicateGroupMaps: {- byUniversalIdentifier: {},- universalIdentifierById: {},- universalIdentifiersByApplicationId: {},- },- objectIdByNameSingular: {},- featureFlagsMap: {} as FeatureFlagMap,- userWorkspaceRoleMap: {},- eventEmitterService: {} as unknown,- } as unknown as WorkspaceInternalContext;-- mockFeatureFlagMap = Object.values(FeatureFlagKey).reduce(- (acc, key) => ({ ...acc, [key]: false }),- {} as FeatureFlagMap,- );- mockObjectRecordsPermissions = {- 'test-entity': {- canReadObjectRecords: true,- canUpdateObjectRecords: false,- canSoftDeleteObjectRecords: false,- canDestroyObjectRecords: false,- restrictedFields: {},- rowLevelPermissionPredicates: [],- rowLevelPermissionPredicateGroups: [],- },- };- mockQueryRunner = {} as QueryRunner;-- repository = new WorkspaceRepository(- 'test-entity',- mockEntityManager,- mockFeatureFlagMap,- mockQueryRunner,- mockObjectRecordsPermissions,- false,- );-- jest- .spyOn(repository as any, 'getObjectMetadataFromTarget')- .mockResolvedValue({- id: 'test-metadata-id',- nameSingular: 'test-entity',- namePlural: 'test-entities',- fieldIds: ['test-field-id'],- fieldIdByName: {- id: 'test-field-id',- },- fieldIdByJoinColumnName: {},- fieldsById: {- 'test-field-id': {- id: 'test-field-id',- name: 'id',- type: 'string',- isNullable: false,- isUnique: true,- },- },- });- });-- describe('Find Methods', () => {- it('should delegate to workspaceEntityManager find', async () => {- const options: FindManyOptions<ObjectLiteral> = {- where: { id: 'test-id' },- };-- mockEntityManager.find.mockResolvedValue([{ id: 'test-id' }]);-- await repository.find(options);-- expect(mockEntityManager.find).toHaveBeenCalledWith(- 'test-entity',- { where: { id: 'test-id' } },- {- shouldBypassPermissionChecks: false,- objectRecordsPermissions: mockObjectRecordsPermissions,- },- );- });-- it('should delegate to workspaceEntityManager findBy', async () => {- const where: FindOptionsWhere<ObjectLiteral> = { id: 'test-id' };-- mockEntityManager.findBy.mockResolvedValue([{ id: 'test-id' }]);-- await repository.findBy(where);-- expect(mockEntityManager.findBy).toHaveBeenCalledWith(- 'test-entity',- { id: 'test-id' },- {- shouldBypassPermissionChecks: false,- objectRecordsPermissions: mockObjectRecordsPermissions,- },- );- });-- it('should delegate to workspaceEntityManager findAndCount', async () => {- const options: FindManyOptions<ObjectLiteral> = {- where: { id: 'test-id' },- };-- mockEntityManager.findAndCount.mockResolvedValue([- [{ id: 'test-id' }],- 1,- ]);-- await repository.findAndCount(options);-- expect(mockEntityManager.findAndCount).toHaveBeenCalledWith(- 'test-entity',- { where: { id: 'test-id' } },- {- shouldBypassPermissionChecks: false,- objectRecordsPermissions: mockObjectRecordsPermissions,- },- );- });-- it('should delegate to workspaceEntityManager findOne', async () => {- const options: FindOneOptions<ObjectLiteral> = {- where: { id: 'test-id' },- };-- mockEntityManager.findOne.mockResolvedValue({ id: 'test-id' });-- await repository.findOne(options);-- expect(mockEntityManager.findOne).toHaveBeenCalledWith(- 'test-entity',- { where: { id: 'test-id' } },- {- shouldBypassPermissionChecks: false,- objectRecordsPermissions: mockObjectRecordsPermissions,- },- );- });- });-- describe('Save Methods', () => {- it('should delegate to workspaceEntityManager save', async () => {- const entity: DeepPartial<ObjectLiteral> = { id: 'test-id' };-- mockEntityManager.save.mockResolvedValue({ id: 'test-id' });-- await repository.save(entity);-- expect(mockEntityManager.save).toHaveBeenCalledWith(- 'test-entity',- { id: 'test-id' },- undefined,- {- shouldBypassPermissionChecks: false,- objectRecordsPermissions: mockObjectRecordsPermissions,- },- );- });- });-- describe('Remove Methods', () => {- it('should delegate to workspaceEntityManager remove', async () => {- const entity: ObjectLiteral = { id: 'test-id' };- const expectedResult = [{ id: 'test-id' }];-- mockEntityManager.remove.mockResolvedValue(expectedResult);-- const result = await repository.remove(entity);-- expect(mockEntityManager.remove).toHaveBeenCalledWith(- 'test-entity',- { id: 'test-id' },- undefined,- {- shouldBypassPermissionChecks: false,- objectRecordsPermissions: mockObjectRecordsPermissions,- },- );- expect(result).toEqual(expectedResult);- });-- it('should delegate to workspaceEntityManager delete', async () => {- const criteria: FindOptionsWhere<ObjectLiteral> = { id: 'test-id' };- const expectedResult = { affected: 1, raw: [], generatedMaps: [] };-- mockEntityManager.delete.mockResolvedValue(expectedResult);-- const result = await repository.delete(criteria);-- expect(mockEntityManager.delete).toHaveBeenCalledWith(- 'test-entity',- { id: 'test-id' },- {- shouldBypassPermissionChecks: false,- objectRecordsPermissions: mockObjectRecordsPermissions,- },- undefined,- );- expect(result).toEqual(expectedResult);- });- });-- describe('Insert Methods', () => {- it('should delegate to workspaceEntityManager insert', async () => {- const entity: DeepPartial<ObjectLiteral> = { id: 'test-id' };-- mockEntityManager.insert.mockResolvedValue({- identifiers: [{ id: 'test-id' }],- generatedMaps: [{ id: 'test-id' }],- raw: [],- });-- await repository.insert(entity);-- expect(mockEntityManager.insert).toHaveBeenCalledWith(- 'test-entity',- { id: 'test-id' },- undefined,- {- shouldBypassPermissionChecks: false,- objectRecordsPermissions: mockObjectRecordsPermissions,- },- undefined,- );- });-- it('should delegate to workspaceEntityManager upsert', async () => {- const entity: DeepPartial<ObjectLiteral> = { id: 'test-id' };-- mockEntityManager.upsert.mockResolvedValue({- identifiers: [{ id: 'test-id' }],- generatedMaps: [{ id: 'test-id' }],- raw: [],- });-- await repository.upsert(entity, ['id']);-- expect(mockEntityManager.upsert).toHaveBeenCalledWith(- 'test-entity',- { id: 'test-id' },- ['id'],- {- shouldBypassPermissionChecks: false,- objectRecordsPermissions: mockObjectRecordsPermissions,- },- [],- );- });- });-- describe('Update Methods', () => {- it('should delegate to workspaceEntityManager update', async () => {- const criteria: FindOptionsWhere<ObjectLiteral> = { id: 'test-id' };- const partialEntity: DeepPartial<ObjectLiteral> = { name: 'test' };-- mockEntityManager.update.mockResolvedValue({- affected: 1,- raw: [],- generatedMaps: [],- });-- await repository.update(criteria, partialEntity);-- expect(mockEntityManager.update).toHaveBeenCalledWith(- 'test-entity',- { id: 'test-id' },- { name: 'test' },- undefined,- {- shouldBypassPermissionChecks: false,- objectRecordsPermissions: mockObjectRecordsPermissions,- },- undefined,- );- });- });-- describe('Math Methods', () => {- it('should delegate to workspaceEntityManager sum', async () => {- const where: FindOptionsWhere<ObjectLiteral> = { id: 'test-id' };-- mockEntityManager.sum.mockResolvedValue(100);-- await repository.sum('testColumn', where);-- expect(mockEntityManager.sum).toHaveBeenCalledWith(- 'test-entity',- 'testColumn',- { id: 'test-id' },- {- shouldBypassPermissionChecks: false,- objectRecordsPermissions: mockObjectRecordsPermissions,- },- );- });-- it('should delegate to workspaceEntityManager increment', async () => {- const conditions: FindOptionsWhere<ObjectLiteral> = { id: 'test-id' };-- mockEntityManager.increment.mockResolvedValue({- affected: 1,- raw: [],- generatedMaps: [],- });-- await repository.increment(conditions, 'testColumn', 1);-- expect(mockEntityManager.increment).toHaveBeenCalledWith(- 'test-entity',- { id: 'test-id' },- 'testColumn',- 1,- {- shouldBypassPermissionChecks: false,- objectRecordsPermissions: mockObjectRecordsPermissions,- },- undefined,- );- });- });-- describe('Preload and Clear Methods', () => {- it('should delegate to workspaceEntityManager preload', async () => {- const entityLike: DeepPartial<ObjectLiteral> = { id: 'test-id' };-- mockEntityManager.preload.mockResolvedValue({ id: 'test-id' });-- await repository.preload(entityLike);-- expect(mockEntityManager.preload).toHaveBeenCalledWith(- 'test-entity',- { id: 'test-id' },- {- shouldBypassPermissionChecks: false,- objectRecordsPermissions: mockObjectRecordsPermissions,- },- );- });-- it('should delegate to workspaceEntityManager clear', async () => {- mockEntityManager.clear.mockResolvedValue(undefined);-- await repository.clear();-- expect(mockEntityManager.clear).toHaveBeenCalledWith('test-entity', {- shouldBypassPermissionChecks: false,- objectRecordsPermissions: mockObjectRecordsPermissions,- });- });- });-- describe('Restricted Methods', () => {- it('should throw error for query', async () => {- await expect(repository.query()).rejects.toThrow('Method not allowed.');- });-- it('should throw error for findByIds', async () => {- await expect(repository.findByIds()).rejects.toThrow(- 'findByIds is deprecated. Please use findBy with In operator instead.',- );- });-- it('should throw error for findOneById', async () => {- await expect(repository.findOneById()).rejects.toThrow(- 'findOneById is deprecated. Please use findOneBy with id condition instead.',- );- });-- it('should throw error for exist', async () => {- await expect(repository.exist()).rejects.toThrow(- 'exist is deprecated. Please use exists method instead.',- );- });- });-});diff --git a/packages/twenty-server/src/engine/twenty-orm/repository/workspace-delete-query-builder.ts b/packages/twenty-server/src/engine/twenty-orm/repository/workspace-delete-query-builder.tsdeleted file mode 100644index 6806606a6b9..00000000000--- a/packages/twenty-server/src/engine/twenty-orm/repository/workspace-delete-query-builder.ts+++ /dev/null@@ -1,234 +0,0 @@-import { type ObjectsPermissions } from 'twenty-shared/types';-import { isDefined } from 'twenty-shared/utils';-import {- DeleteQueryBuilder,- type DeleteResult,- type EntityTarget,- type InsertQueryBuilder,- type ObjectLiteral,-} from 'typeorm';-import { type QueryDeepPartialEntity } from 'typeorm/query-builder/QueryPartialEntity';-import { type WhereClause } from 'typeorm/query-builder/WhereClause';--import { type FeatureFlagMap } from 'src/engine/core-modules/feature-flag/interfaces/feature-flag-map.interface';-import { type WorkspaceInternalContext } from 'src/engine/twenty-orm/interfaces/workspace-internal-context.interface';--import { DatabaseEventAction } from 'src/engine/api/graphql/graphql-query-runner/enums/database-event-action';-import { type WorkspaceAuthContext } from 'src/engine/core-modules/auth/types/workspace-auth-context.type';-import { computeTwentyORMException } from 'src/engine/twenty-orm/error-handling/compute-twenty-orm-exception';-import {- TwentyORMException,- TwentyORMExceptionCode,-} from 'src/engine/twenty-orm/exceptions/twenty-orm.exception';-import { validateQueryIsPermittedOrThrow } from 'src/engine/twenty-orm/repository/permissions.utils';-import { type WorkspaceSelectQueryBuilder } from 'src/engine/twenty-orm/repository/workspace-select-query-builder';-import { type WorkspaceSoftDeleteQueryBuilder } from 'src/engine/twenty-orm/repository/workspace-soft-delete-query-builder';-import { type WorkspaceUpdateQueryBuilder } from 'src/engine/twenty-orm/repository/workspace-update-query-builder';-import { applyRowLevelPermissionPredicates } from 'src/engine/twenty-orm/utils/apply-row-level-permission-predicates.util';-import { applyTableAliasOnWhereCondition } from 'src/engine/twenty-orm/utils/apply-table-alias-on-where-condition';-import { computeEventSelectQueryBuilder } from 'src/engine/twenty-orm/utils/compute-event-select-query-builder.util';-import { formatResult } from 'src/engine/twenty-orm/utils/format-result.util';-import { formatTwentyOrmEventToDatabaseBatchEvent } from 'src/engine/twenty-orm/utils/format-twenty-orm-event-to-database-batch-event.util';-import { getObjectMetadataFromEntityTarget } from 'src/engine/twenty-orm/utils/get-object-metadata-from-entity-target.util';-import { computeObjectTargetTable } from 'src/engine/utils/compute-object-target-table.util';--export class WorkspaceDeleteQueryBuilder<- T extends ObjectLiteral,-> extends DeleteQueryBuilder<T> {- private objectRecordsPermissions: ObjectsPermissions;- private shouldBypassPermissionChecks: boolean;- private internalContext: WorkspaceInternalContext;- private authContext: WorkspaceAuthContext;- private featureFlagMap: FeatureFlagMap;- constructor(- queryBuilder: DeleteQueryBuilder<T>,- objectRecordsPermissions: ObjectsPermissions,- internalContext: WorkspaceInternalContext,- shouldBypassPermissionChecks: boolean,- authContext: WorkspaceAuthContext,- featureFlagMap: FeatureFlagMap,- ) {- super(queryBuilder);- this.objectRecordsPermissions = objectRecordsPermissions;- this.internalContext = internalContext;- this.shouldBypassPermissionChecks = shouldBypassPermissionChecks;- this.authContext = authContext;- this.featureFlagMap = featureFlagMap;- }-- override clone(): this {- const clonedQueryBuilder = super.clone();-- const workspaceDeleteQueryBuilder = new WorkspaceDeleteQueryBuilder(- clonedQueryBuilder,- this.objectRecordsPermissions,- this.internalContext,- this.shouldBypassPermissionChecks,- this.authContext,- this.featureFlagMap,- ) as this;-- return workspaceDeleteQueryBuilder;- }-- override async execute(): Promise<DeleteResult & { generatedMaps: T[] }> {- try {- this.applyRowLevelPermissionPredicates();- validateQueryIsPermittedOrThrow({- expressionMap: this.expressionMap,- objectsPermissions: this.objectRecordsPermissions,- flatObjectMetadataMaps: this.internalContext.flatObjectMetadataMaps,- flatFieldMetadataMaps: this.internalContext.flatFieldMetadataMaps,- objectIdByNameSingular: this.internalContext.objectIdByNameSingular,- shouldBypassPermissionChecks: this.shouldBypassPermissionChecks,- authContext: this.authContext,- });-- const mainAliasTarget = this.getMainAliasTarget();-- const objectMetadata = getObjectMetadataFromEntityTarget(- mainAliasTarget,- this.internalContext,- );-- const eventSelectQueryBuilder = computeEventSelectQueryBuilder<T>({- queryBuilder: this,- authContext: this.authContext,- internalContext: this.internalContext,- featureFlagMap: this.featureFlagMap,- expressionMap: this.expressionMap,- objectRecordsPermissions: this.objectRecordsPermissions,- });-- const tableName = computeObjectTargetTable(objectMetadata);-- const before = await eventSelectQueryBuilder.getOne({- noFormatting: true,- });-- this.expressionMap.wheres = applyTableAliasOnWhereCondition({- condition: this.expressionMap.wheres,- tableName,- aliasName: objectMetadata.nameSingular,- }) as WhereClause[];-- const result = await super.execute();-- const formattedResult = formatResult<T[]>(- result.raw,- objectMetadata,- this.internalContext.flatObjectMetadataMaps,- this.internalContext.flatFieldMetadataMaps,- );-- const formattedBefore = formatResult<T | null>(- before,- objectMetadata,- this.internalContext.flatObjectMetadataMaps,- this.internalContext.flatFieldMetadataMaps,- );-- const recordsBefore = isDefined(formattedBefore)- ? Array.isArray(formattedBefore)- ? formattedBefore- : [formattedBefore]- : [];-- this.internalContext.eventEmitterService.emitDatabaseBatchEvent(- formatTwentyOrmEventToDatabaseBatchEvent({- action: DatabaseEventAction.DESTROYED,- objectMetadataItem: objectMetadata,- flatFieldMetadataMaps: this.internalContext.flatFieldMetadataMaps,- workspaceId: this.internalContext.workspaceId,- recordsBefore,- authContext: this.authContext,- }),- );-- return {- raw: result.raw,- generatedMaps: formattedResult,- affected: result.affected,- };- } catch (error) {- throw await computeTwentyORMException(error);- }- }-- private getMainAliasTarget(): EntityTarget<T> {- const mainAliasTarget = this.expressionMap.mainAlias?.target;-- if (!mainAliasTarget) {- throw new TwentyORMException(- 'Main alias target is missing',- TwentyORMExceptionCode.MISSING_MAIN_ALIAS_TARGET,- );- }-- return mainAliasTarget;- }-- private applyRowLevelPermissionPredicates(): void {- if (this.shouldBypassPermissionChecks) {- return;- }-- const mainAliasTarget = this.getMainAliasTarget();-- const objectMetadata = getObjectMetadataFromEntityTarget(- mainAliasTarget,- this.internalContext,- );-- applyRowLevelPermissionPredicates({- queryBuilder: this as unknown as WorkspaceSelectQueryBuilder<T>,- objectMetadata,- internalContext: this.internalContext,- authContext: this.authContext,- featureFlagMap: this.featureFlagMap,- });- }-- override select(): WorkspaceSelectQueryBuilder<T> {- throw new TwentyORMException(- 'This builder cannot morph into a select builder',- TwentyORMExceptionCode.METHOD_NOT_ALLOWED,- );- }-- override update(): WorkspaceUpdateQueryBuilder<T>;-- override update(- updateSet: QueryDeepPartialEntity<T>,- ): WorkspaceUpdateQueryBuilder<T>;-- override update(- _updateSet?: QueryDeepPartialEntity<T>,- ): WorkspaceUpdateQueryBuilder<T> {- throw new TwentyORMException(- 'This builder cannot morph into an update builder',- TwentyORMExceptionCode.METHOD_NOT_ALLOWED,- );- }-- override insert(): InsertQueryBuilder<T> {- throw new TwentyORMException(- 'This builder cannot morph into an insert builder',- TwentyORMExceptionCode.METHOD_NOT_ALLOWED,- );- }-- override softDelete(): WorkspaceSoftDeleteQueryBuilder<T> {- throw new TwentyORMException(- 'This builder cannot morph into a soft delete builder',- TwentyORMExceptionCode.METHOD_NOT_ALLOWED,- );- }-- override restore(): WorkspaceSoftDeleteQueryBuilder<T> {- throw new TwentyORMException(- 'This builder cannot morph into a soft delete builder',- TwentyORMExceptionCode.METHOD_NOT_ALLOWED,- );- }-}diff --git a/packages/twenty-server/src/engine/twenty-orm/repository/workspace-insert-query-builder.ts b/packages/twenty-server/src/engine/twenty-orm/repository/workspace-insert-query-builder.tsdeleted file mode 100644index fbddd4903d9..00000000000--- a/packages/twenty-server/src/engine/twenty-orm/repository/workspace-insert-query-builder.ts+++ /dev/null@@ -1,410 +0,0 @@-import { type ObjectsPermissions } from 'twenty-shared/types';-import { isDefined } from 'twenty-shared/utils';-import {- type EntityTarget,- InsertQueryBuilder,- type InsertResult,- type ObjectLiteral,-} from 'typeorm';--import { type FeatureFlagMap } from 'src/engine/core-modules/feature-flag/interfaces/feature-flag-map.interface';-import { type WorkspaceInternalContext } from 'src/engine/twenty-orm/interfaces/workspace-internal-context.interface';--import { DatabaseEventAction } from 'src/engine/api/graphql/graphql-query-runner/enums/database-event-action';-import { type WorkspaceAuthContext } from 'src/engine/core-modules/auth/types/workspace-auth-context.type';-import { type QueryDeepPartialEntityWithNestedRelationFields } from 'src/engine/twenty-orm/entity-manager/types/query-deep-partial-entity-with-nested-relation-fields.type';-import { type RelationConnectQueryConfig } from 'src/engine/twenty-orm/entity-manager/types/relation-connect-query-config.type';-import { type RelationDisconnectQueryFieldsByEntityIndex } from 'src/engine/twenty-orm/entity-manager/types/relation-nested-query-fields-by-entity-index.type';-import { type WorkspaceEntityManager } from 'src/engine/twenty-orm/entity-manager/workspace-entity-manager';-import { computeTwentyORMException } from 'src/engine/twenty-orm/error-handling/compute-twenty-orm-exception';-import {- TwentyORMException,- TwentyORMExceptionCode,-} from 'src/engine/twenty-orm/exceptions/twenty-orm.exception';-import { FilesFieldSync } from 'src/engine/twenty-orm/field-operations/files-field-sync/files-field-sync';-import { RelationNestedQueries } from 'src/engine/twenty-orm/field-operations/relation-nested-queries/relation-nested-queries';-import { validateQueryIsPermittedOrThrow } from 'src/engine/twenty-orm/repository/permissions.utils';-import { type WorkspaceDeleteQueryBuilder } from 'src/engine/twenty-orm/repository/workspace-delete-query-builder';-import { WorkspaceSelectQueryBuilder } from 'src/engine/twenty-orm/repository/workspace-select-query-builder';-import { type WorkspaceSoftDeleteQueryBuilder } from 'src/engine/twenty-orm/repository/workspace-soft-delete-query-builder';-import { type WorkspaceUpdateQueryBuilder } from 'src/engine/twenty-orm/repository/workspace-update-query-builder';-import { formatData } from 'src/engine/twenty-orm/utils/format-data.util';-import { formatResult } from 'src/engine/twenty-orm/utils/format-result.util';-import { formatTwentyOrmEventToDatabaseBatchEvent } from 'src/engine/twenty-orm/utils/format-twenty-orm-event-to-database-batch-event.util';-import { getObjectMetadataFromEntityTarget } from 'src/engine/twenty-orm/utils/get-object-metadata-from-entity-target.util';-import { validateRLSPredicatesForRecords } from 'src/engine/twenty-orm/utils/validate-rls-predicates-for-records.util';--export class WorkspaceInsertQueryBuilder<- T extends ObjectLiteral,-> extends InsertQueryBuilder<T> {- private objectRecordsPermissions: ObjectsPermissions;- private shouldBypassPermissionChecks: boolean;- private internalContext: WorkspaceInternalContext;- private authContext: WorkspaceAuthContext;- private featureFlagMap: FeatureFlagMap;- private relationNestedConfig:- | [RelationConnectQueryConfig[], RelationDisconnectQueryFieldsByEntityIndex]- | null;-- private _relationNestedQueries?: RelationNestedQueries;- private _filesFieldSync?: FilesFieldSync;-- private get relationNestedQueries(): RelationNestedQueries {- return (this._relationNestedQueries ??= new RelationNestedQueries(- this.internalContext,- ));- }-- private get filesFieldSync(): FilesFieldSync {- return (this._filesFieldSync ??= new FilesFieldSync(this.internalContext));- }-- constructor(- queryBuilder: InsertQueryBuilder<T>,- objectRecordsPermissions: ObjectsPermissions,- internalContext: WorkspaceInternalContext,- shouldBypassPermissionChecks: boolean,- authContext: WorkspaceAuthContext,- featureFlagMap: FeatureFlagMap,- ) {- super(queryBuilder);- this.objectRecordsPermissions = objectRecordsPermissions;- this.internalContext = internalContext;- this.shouldBypassPermissionChecks = shouldBypassPermissionChecks;- this.authContext = authContext;- this.featureFlagMap = featureFlagMap;- }-- override clone(): this {- const clonedQueryBuilder = super.clone();-- return new WorkspaceInsertQueryBuilder(- clonedQueryBuilder,- this.objectRecordsPermissions,- this.internalContext,- this.shouldBypassPermissionChecks,- this.authContext,- this.featureFlagMap,- ) as this;- }-- override values(- values:- | QueryDeepPartialEntityWithNestedRelationFields<T>- | QueryDeepPartialEntityWithNestedRelationFields<T>[],- ): this {- const mainAliasTarget = this.getMainAliasTarget();-- this.relationNestedConfig =- this.relationNestedQueries.prepareNestedRelationQueries(- values,- mainAliasTarget,- );-- const objectMetadata = getObjectMetadataFromEntityTarget(- mainAliasTarget,- this.internalContext,- );-- const formattedValues = formatData(- values,- objectMetadata,- this.internalContext.flatFieldMetadataMaps,- );-- return super.values(formattedValues);- }-- private validateQueryPermissionsOrThrow(): void {- validateQueryIsPermittedOrThrow({- expressionMap: this.expressionMap,- objectsPermissions: this.objectRecordsPermissions,- flatObjectMetadataMaps: this.internalContext.flatObjectMetadataMaps,- flatFieldMetadataMaps: this.internalContext.flatFieldMetadataMaps,- objectIdByNameSingular: this.internalContext.objectIdByNameSingular,- shouldBypassPermissionChecks: this.shouldBypassPermissionChecks,- authContext: this.authContext,- });- }-- override async execute(): Promise<InsertResult> {- try {- this.validateQueryPermissionsOrThrow();-- // Fix overwrites for composite fields - valuesSet contains formatted/flattened column names- // but overwrites was computed before formatData, missing composite field columns- if (- isDefined(this.expressionMap.onUpdate?.overwrite) &&- isDefined(this.expressionMap.valuesSet)- ) {- const valuesArray = Array.isArray(this.expressionMap.valuesSet)- ? this.expressionMap.valuesSet- : [this.expressionMap.valuesSet];-- const allValueKeys = new Set(- valuesArray.flatMap((value) => Object.keys(value)),- );-- const mainAliasMetadata = this.expressionMap.mainAlias?.metadata;-- if (mainAliasMetadata) {- const missingColumns = mainAliasMetadata.columns- .filter(- (col) =>- allValueKeys.has(col.databaseName) &&- !this.expressionMap.onUpdate.overwrite!.includes(- col.databaseName,- ),- )- .map((col) => col.databaseName);-- this.expressionMap.onUpdate.overwrite = [- ...this.expressionMap.onUpdate.overwrite,- ...missingColumns,- ];- }- }-- const mainAliasTarget = this.getMainAliasTarget();-- const objectMetadata = getObjectMetadataFromEntityTarget(- mainAliasTarget,- this.internalContext,- );-- let filesFieldFileIds = null;-- const entities = Array.isArray(this.expressionMap.valuesSet)- ? this.expressionMap.valuesSet- : [this.expressionMap.valuesSet];-- const filesFieldDiffByEntityIndex =- this.filesFieldSync.computeFilesFieldDiffBeforeInsert(- entities as QueryDeepPartialEntityWithNestedRelationFields<T>[],- mainAliasTarget,- );-- if (isDefined(filesFieldDiffByEntityIndex)) {- const result = await this.filesFieldSync.enrichFilesFields({- entities:- entities as QueryDeepPartialEntityWithNestedRelationFields<T>[],- filesFieldDiffByEntityIndex,- workspaceId: this.internalContext.workspaceId,- target: mainAliasTarget,- });-- filesFieldFileIds = result.fileIds;-- this.expressionMap.valuesSet = Array.isArray(- this.expressionMap.valuesSet,- )- ? result.entities- : result.entities[0];- }-- if (isDefined(this.relationNestedConfig)) {- const nestedRelationQueryBuilder = new WorkspaceSelectQueryBuilder(- this as unknown as WorkspaceSelectQueryBuilder<T>,- this.objectRecordsPermissions,- this.internalContext,- this.shouldBypassPermissionChecks,- this.authContext,- this.featureFlagMap,- );-- const updatedValues =- await this.relationNestedQueries.processRelationNestedQueries({- entities: this.expressionMap.valuesSet as- | QueryDeepPartialEntityWithNestedRelationFields<T>- | QueryDeepPartialEntityWithNestedRelationFields<T>[],- relationNestedConfig: this.relationNestedConfig,- queryBuilder: nestedRelationQueryBuilder,- });-- this.expressionMap.valuesSet = updatedValues;-- this.validateQueryPermissionsOrThrow();- }-- this.validateRLSPredicatesForInsert();-- const result = await super.execute();-- if (isDefined(filesFieldFileIds)) {- await this.filesFieldSync.updateFileEntityRecords(filesFieldFileIds);- }- const eventSelectQueryBuilder = (- this.connection.manager as WorkspaceEntityManager- ).createQueryBuilder(- mainAliasTarget,- this.expressionMap.mainAlias?.metadata.name ?? '',- undefined,- {- shouldBypassPermissionChecks: true,- },- ) as WorkspaceSelectQueryBuilder<T>;-- eventSelectQueryBuilder.whereInIds(- result.identifiers.map((identifier) => identifier.id),- );-- const afterResult = await eventSelectQueryBuilder.getMany({- noFormatting: true,- });-- const formattedResultForEvent = formatResult<T[]>(- afterResult,- objectMetadata,- this.internalContext.flatObjectMetadataMaps,- this.internalContext.flatFieldMetadataMaps,- );-- this.internalContext.eventEmitterService.emitDatabaseBatchEvent(- formatTwentyOrmEventToDatabaseBatchEvent({- action: DatabaseEventAction.CREATED,- objectMetadataItem: objectMetadata,- flatFieldMetadataMaps: this.internalContext.flatFieldMetadataMaps,- workspaceId: this.internalContext.workspaceId,- recordsAfter: formattedResultForEvent,- authContext: this.authContext,- }),- );-- this.internalContext.eventEmitterService.emitDatabaseBatchEvent(- formatTwentyOrmEventToDatabaseBatchEvent({- action: DatabaseEventAction.UPSERTED,- objectMetadataItem: objectMetadata,- flatFieldMetadataMaps: this.internalContext.flatFieldMetadataMaps,- workspaceId: this.internalContext.workspaceId,- recordsAfter: formattedResultForEvent,- authContext: this.authContext,- }),- );-- // TypeORM returns all entity columns for insertions- const resultWithoutInsertionExtraColumns = !isDefined(result.raw)- ? []- : result.raw.map((rawResult: Record<string, string>) =>- Object.keys(rawResult)- .filter(- (key) =>- this.expressionMap.returning.includes(key) ||- this.expressionMap.returning === '*',- )- .reduce((filtered: Record<string, string>, key) => {- filtered[key] = rawResult[key];-- return filtered;- }, {}),- );-- const formattedResult = formatResult<T[]>(- resultWithoutInsertionExtraColumns,- objectMetadata,- this.internalContext.flatObjectMetadataMaps,- this.internalContext.flatFieldMetadataMaps,- );-- return {- raw: resultWithoutInsertionExtraColumns,- generatedMaps: formattedResult,- identifiers: result.identifiers,- };- } catch (error) {- const objectMetadata = getObjectMetadataFromEntityTarget(- this.getMainAliasTarget(),- this.internalContext,- );-- throw await computeTwentyORMException(- error,- objectMetadata,- this.connection.manager as WorkspaceEntityManager,- this.internalContext,- );- }- }-- private validateRLSPredicatesForInsert(): void {- const mainAliasTarget = this.getMainAliasTarget();- const objectMetadata = getObjectMetadataFromEntityTarget(- mainAliasTarget,- this.internalContext,- );-- const valuesToInsert = Array.isArray(this.expressionMap.valuesSet)- ? this.expressionMap.valuesSet- : [this.expressionMap.valuesSet];-- const valuesToInsertFormatted = formatResult<T[]>(- valuesToInsert,- objectMetadata,- this.internalContext.flatObjectMetadataMaps,- this.internalContext.flatFieldMetadataMaps,- );-- validateRLSPredicatesForRecords({- records: valuesToInsertFormatted,- objectMetadata,- internalContext: this.internalContext,- authContext: this.authContext,- shouldBypassPermissionChecks: this.shouldBypassPermissionChecks,- });- }-- private getMainAliasTarget(): EntityTarget<T> {- const mainAliasTarget = this.expressionMap.mainAlias?.target;-- if (!mainAliasTarget) {- throw new TwentyORMException(- 'Main alias target is missing',- TwentyORMExceptionCode.MISSING_MAIN_ALIAS_TARGET,- );- }-- return mainAliasTarget;- }-- override select(): WorkspaceSelectQueryBuilder<T> {- throw new TwentyORMException(- 'This builder cannot morph into a select builder',- TwentyORMExceptionCode.METHOD_NOT_ALLOWED,- );- }-- override update(): WorkspaceUpdateQueryBuilder<T> {- throw new TwentyORMException(- 'This builder cannot morph into an update builder',- TwentyORMExceptionCode.METHOD_NOT_ALLOWED,- );- }-- override delete(): WorkspaceDeleteQueryBuilder<T> {- throw new TwentyORMException(- 'This builder cannot morph into a delete builder',- TwentyORMExceptionCode.METHOD_NOT_ALLOWED,- );- }-- override softDelete(): WorkspaceSoftDeleteQueryBuilder<T> {- throw new TwentyORMException(- 'This builder cannot morph into a soft delete builder',- TwentyORMExceptionCode.METHOD_NOT_ALLOWED,- );- }-- override restore(): WorkspaceSoftDeleteQueryBuilder<T> {- throw new TwentyORMException(- 'This builder cannot morph into a soft delete builder',- TwentyORMExceptionCode.METHOD_NOT_ALLOWED,- );- }-- setWorkspaceAuthContext(- authContext: WorkspaceAuthContext,- ): WorkspaceInsertQueryBuilder<T> {- this.authContext = authContext;-- return this;- }-}diff --git a/packages/twenty-server/src/engine/twenty-orm/repository/workspace-select-query-builder.ts b/packages/twenty-server/src/engine/twenty-orm/repository/workspace-select-query-builder.tsdeleted file mode 100644index f79f905cde8..00000000000--- a/packages/twenty-server/src/engine/twenty-orm/repository/workspace-select-query-builder.ts+++ /dev/null@@ -1,546 +0,0 @@-import { isNonEmptyString } from '@sniptt/guards';-import { type ObjectsPermissions } from 'twenty-shared/types';-import { isDefined } from 'twenty-shared/utils';-import {- type EntityTarget,- type ObjectLiteral,- SelectQueryBuilder,-} from 'typeorm';-import { type JoinAttribute } from 'typeorm/query-builder/JoinAttribute';-import { type QueryDeepPartialEntity } from 'typeorm/query-builder/QueryPartialEntity';--import { type FeatureFlagMap } from 'src/engine/core-modules/feature-flag/interfaces/feature-flag-map.interface';-import { type WorkspaceInternalContext } from 'src/engine/twenty-orm/interfaces/workspace-internal-context.interface';--import { type WorkspaceAuthContext } from 'src/engine/core-modules/auth/types/workspace-auth-context.type';-import { findFlatEntityByIdInFlatEntityMaps } from 'src/engine/metadata-modules/flat-entity/utils/find-flat-entity-by-id-in-flat-entity-maps.util';-import { type FlatObjectMetadata } from 'src/engine/metadata-modules/flat-object-metadata/types/flat-object-metadata.type';-import {- PermissionsException,- PermissionsExceptionCode,-} from 'src/engine/metadata-modules/permissions/permissions.exception';-import { computeTwentyORMException } from 'src/engine/twenty-orm/error-handling/compute-twenty-orm-exception';-import {- TwentyORMException,- TwentyORMExceptionCode,-} from 'src/engine/twenty-orm/exceptions/twenty-orm.exception';-import { validateQueryIsPermittedOrThrow } from 'src/engine/twenty-orm/repository/permissions.utils';-import { WorkspaceDeleteQueryBuilder } from 'src/engine/twenty-orm/repository/workspace-delete-query-builder';-import { WorkspaceInsertQueryBuilder } from 'src/engine/twenty-orm/repository/workspace-insert-query-builder';-import { WorkspaceSoftDeleteQueryBuilder } from 'src/engine/twenty-orm/repository/workspace-soft-delete-query-builder';-import { WorkspaceUpdateQueryBuilder } from 'src/engine/twenty-orm/repository/workspace-update-query-builder';-import { applyRowLevelPermissionPredicates } from 'src/engine/twenty-orm/utils/apply-row-level-permission-predicates.util';-import { formatResult } from 'src/engine/twenty-orm/utils/format-result.util';-import { getObjectMetadataFromEntityTarget } from 'src/engine/twenty-orm/utils/get-object-metadata-from-entity-target.util';-import { renderRowLevelPermissionFilterToSql } from 'src/engine/twenty-orm/utils/render-row-level-permission-filter-to-sql.util';-import { resolveRowLevelPermissionRecordFilter } from 'src/engine/twenty-orm/utils/resolve-row-level-permission-record-filter.util';--type JoinAttributeWithRowLevelPermissionMarker = JoinAttribute & {- hasRowLevelPermissionPredicateApplied?: true;-};--const hasRowLevelPermissionPredicateApplied = (- joinAttribute: JoinAttribute,-): boolean =>- (joinAttribute as JoinAttributeWithRowLevelPermissionMarker)- .hasRowLevelPermissionPredicateApplied === true;--const markRowLevelPermissionPredicateApplied = (- joinAttribute: JoinAttribute,-): void => {- (- joinAttribute as JoinAttributeWithRowLevelPermissionMarker- ).hasRowLevelPermissionPredicateApplied = true;-};--const andWithExistingJoinCondition = (- existingJoinCondition: string | undefined,- rowLevelPermissionCondition: string,-): string =>- isNonEmptyString(existingJoinCondition)- ? `(${existingJoinCondition}) AND (${rowLevelPermissionCondition})`- : rowLevelPermissionCondition;--export class WorkspaceSelectQueryBuilder<- T extends ObjectLiteral,-> extends SelectQueryBuilder<T> {- objectRecordsPermissions: ObjectsPermissions;- shouldBypassPermissionChecks: boolean;- internalContext: WorkspaceInternalContext;- authContext: WorkspaceAuthContext;- featureFlagMap: FeatureFlagMap;- constructor(- queryBuilder: SelectQueryBuilder<T>,- objectRecordsPermissions: ObjectsPermissions,- internalContext: WorkspaceInternalContext,- shouldBypassPermissionChecks: boolean,- authContext: WorkspaceAuthContext,- featureFlagMap: FeatureFlagMap,- ) {- super(queryBuilder);- this.objectRecordsPermissions = objectRecordsPermissions;- this.internalContext = internalContext;- this.shouldBypassPermissionChecks = shouldBypassPermissionChecks;- this.authContext = authContext;- this.featureFlagMap = featureFlagMap;- }-- getFindOptions() {- return this.findOptions;- }-- override clone(): this {- const clonedQueryBuilder = super.clone();-- const workspaceSelectQueryBuilder = new WorkspaceSelectQueryBuilder(- clonedQueryBuilder,- this.objectRecordsPermissions,- this.internalContext,- this.shouldBypassPermissionChecks,- this.authContext,- this.featureFlagMap,- ) as this;-- return workspaceSelectQueryBuilder;- }-- // oxlint-disable-next-line typescript/no-explicit-any- override async execute(): Promise<any> {- try {- this.validatePermissions();-- const mainAliasTarget = this.getMainAliasTarget();-- const objectMetadata = getObjectMetadataFromEntityTarget(- mainAliasTarget,- this.internalContext,- );-- const result = await super.execute();-- const formattedResult = formatResult<T[]>(- result,- objectMetadata,- this.internalContext.flatObjectMetadataMaps,- this.internalContext.flatFieldMetadataMaps,- );-- return {- raw: result,- generatedMaps: formattedResult,- identifiers: result.identifiers,- };- } catch (error) {- throw await computeTwentyORMException(error);- }- }-- // oxlint-disable-next-line typescript/no-explicit-any- override async getRawAndEntities<RawRow = any>(): Promise<{- entities: T[];- raw: RawRow[];- }> {- try {- this.validatePermissions();-- const { entities, raw } = await super.getRawAndEntities<RawRow>();-- const mainAliasTarget = this.getMainAliasTarget();-- const objectMetadata = getObjectMetadataFromEntityTarget(- mainAliasTarget,- this.internalContext,- );-- return {- raw,- entities: formatResult<T[]>(- entities,- objectMetadata,- this.internalContext.flatObjectMetadataMaps,- this.internalContext.flatFieldMetadataMaps,- ),- };- } catch (error) {- throw await computeTwentyORMException(error);- }- }-- override async getMany(options?: { noFormatting?: boolean }): Promise<T[]> {- try {- this.validatePermissions();-- const result = await super.getMany();-- if (options?.noFormatting === true) {- return result;- }-- const mainAliasTarget = this.getMainAliasTarget();-- const objectMetadata = getObjectMetadataFromEntityTarget(- mainAliasTarget,- this.internalContext,- );-- const formattedResult = formatResult<T[]>(- result,- objectMetadata,- this.internalContext.flatObjectMetadataMaps,- this.internalContext.flatFieldMetadataMaps,- );-- return formattedResult;- } catch (error) {- throw await computeTwentyORMException(error);- }- }-- // oxlint-disable-next-line typescript/no-explicit-any- override async getRawOne<U = any>(): Promise<U | undefined> {- try {- this.validatePermissions();-- return super.getRawOne();- } catch (error) {- throw await computeTwentyORMException(error);- }- }-- // oxlint-disable-next-line typescript/no-explicit-any- override async getRawMany<U = any>(): Promise<U[]> {- try {- this.validatePermissions();-- return super.getRawMany();- } catch (error) {- throw await computeTwentyORMException(error);- }- }-- override async getOne(options?: {- noFormatting?: boolean;- }): Promise<T | null> {- try {- this.validatePermissions();-- this.take(1);-- const result = await super.getOne();-- if (options?.noFormatting === true) {- return result;- }-- const mainAliasTarget = this.getMainAliasTarget();-- const objectMetadata = getObjectMetadataFromEntityTarget(- mainAliasTarget,- this.internalContext,- );-- const formattedResult = formatResult<T>(- result,- objectMetadata,- this.internalContext.flatObjectMetadataMaps,- this.internalContext.flatFieldMetadataMaps,- );-- return formattedResult;- } catch (error) {- throw await computeTwentyORMException(error);- }- }-- override async getOneOrFail(): Promise<T> {- try {- this.validatePermissions();-- const mainAliasTarget = this.getMainAliasTarget();-- const objectMetadata = getObjectMetadataFromEntityTarget(- mainAliasTarget,- this.internalContext,- );-- const result = await super.getOneOrFail();-- const formattedResult = formatResult<T>(- result,- objectMetadata,- this.internalContext.flatObjectMetadataMaps,- this.internalContext.flatFieldMetadataMaps,- );-- return formattedResult[0];- } catch (error) {- throw await computeTwentyORMException(error);- }- }-- override async getCount(): Promise<number> {- try {- this.validatePermissions();-- return super.getCount();- } catch (error) {- throw await computeTwentyORMException(error);- }- }-- override getExists(): Promise<boolean> {- throw new PermissionsException(- 'getExists is not supported because it calls dataSource.createQueryBuilder()',- PermissionsExceptionCode.METHOD_NOT_ALLOWED,- );- }-- override async getManyAndCount(): Promise<[T[], number]> {- try {- this.validatePermissions();-- const mainAliasTarget = this.getMainAliasTarget();-- const objectMetadata = getObjectMetadataFromEntityTarget(- mainAliasTarget,- this.internalContext,- );-- const [result, count] = await super.getManyAndCount();-- const formattedResult = formatResult<T[]>(- result,- objectMetadata,- this.internalContext.flatObjectMetadataMaps,- this.internalContext.flatFieldMetadataMaps,- );-- return [formattedResult, count];- } catch (error) {- throw await computeTwentyORMException(error);- }- }-- override insert(): WorkspaceInsertQueryBuilder<T> {- const insertQueryBuilder = super.insert();-- return new WorkspaceInsertQueryBuilder<T>(- insertQueryBuilder,- this.objectRecordsPermissions,- this.internalContext,- this.shouldBypassPermissionChecks,- this.authContext,- this.featureFlagMap,- );- }-- override update(): WorkspaceUpdateQueryBuilder<T>;-- override update(- updateSet: QueryDeepPartialEntity<T>,- ): WorkspaceUpdateQueryBuilder<T>;-- override update(- updateSet?: QueryDeepPartialEntity<T>,- ): WorkspaceUpdateQueryBuilder<T> {- const updateQueryBuilder = updateSet- ? super.update(updateSet)- : super.update();-- return new WorkspaceUpdateQueryBuilder<T>(- updateQueryBuilder,- this.objectRecordsPermissions,- this.internalContext,- this.shouldBypassPermissionChecks,- this.authContext,- this.featureFlagMap,- );- }-- override delete(): WorkspaceDeleteQueryBuilder<T> {- const deleteQueryBuilder = super.delete();-- return new WorkspaceDeleteQueryBuilder<T>(- deleteQueryBuilder,- this.objectRecordsPermissions,- this.internalContext,- this.shouldBypassPermissionChecks,- this.authContext,- this.featureFlagMap,- );- }-- override softDelete(): WorkspaceSoftDeleteQueryBuilder<T> {- const softDeleteQueryBuilder = super.softDelete();-- return new WorkspaceSoftDeleteQueryBuilder<T>(- softDeleteQueryBuilder,- this.objectRecordsPermissions,- this.internalContext,- this.shouldBypassPermissionChecks,- this.authContext,- this.featureFlagMap,- );- }-- override restore(): WorkspaceSoftDeleteQueryBuilder<T> {- const restoreQueryBuilder = super.restore();-- return new WorkspaceSoftDeleteQueryBuilder<T>(- restoreQueryBuilder,- this.objectRecordsPermissions,- this.internalContext,- this.shouldBypassPermissionChecks,- this.authContext,- this.featureFlagMap,- );- }-- override executeExistsQuery(): Promise<boolean> {- throw new PermissionsException(- 'executeExistsQuery is not supported because it calls dataSource.createQueryBuilder()',- PermissionsExceptionCode.METHOD_NOT_ALLOWED,- );- }-- private validatePermissions(): void {- this.applyRowLevelPermissionPredicatesToMainAliasAndJoinedRelations();- validateQueryIsPermittedOrThrow({- expressionMap: this.expressionMap,- objectsPermissions: this.objectRecordsPermissions,- flatObjectMetadataMaps: this.internalContext.flatObjectMetadataMaps,- flatFieldMetadataMaps: this.internalContext.flatFieldMetadataMaps,- objectIdByNameSingular: this.internalContext.objectIdByNameSingular,- shouldBypassPermissionChecks: this.shouldBypassPermissionChecks,- authContext: this.authContext,- });- }-- applyRowLevelPermissionPredicatesToMainAliasAndJoinedRelations(): void {- this.applyRowLevelPermissionPredicates();- this.applyRowLevelPermissionPredicatesToJoinedRelations();- }-- private getMainAliasTarget(): EntityTarget<T> {- const mainAlias = this.expressionMap.mainAlias;-- const mainAliasTarget = mainAlias?.target;-- if (!mainAliasTarget) {- throw new TwentyORMException(- 'Main alias target is missing',- TwentyORMExceptionCode.MISSING_MAIN_ALIAS_TARGET,- );- }-- return mainAliasTarget;- }-- private applyRowLevelPermissionPredicates(): void {- if (this.shouldBypassPermissionChecks) {- return;- }-- // Subqueries don't have entity metadata, skip permission predicates- // Permissions are already applied on the original entity query- if (this.expressionMap.mainAlias?.subQuery) {- return;- }-- const mainAliasTarget = this.getMainAliasTarget();-- const objectMetadata = getObjectMetadataFromEntityTarget(- mainAliasTarget,- this.internalContext,- );-- applyRowLevelPermissionPredicates({- queryBuilder: this,- objectMetadata,- internalContext: this.internalContext,- authContext: this.authContext,- featureFlagMap: this.featureFlagMap,- });- }-- private applyRowLevelPermissionPredicatesToJoinedRelations(): void {- if (this.shouldBypassPermissionChecks) {- return;- }-- for (const joinAttribute of this.expressionMap.joinAttributes) {- if (hasRowLevelPermissionPredicateApplied(joinAttribute)) {- continue;- }-- const joinedObjectMetadata =- this.getJoinedObjectMetadataOrUndefined(joinAttribute);-- if (!isDefined(joinedObjectMetadata)) {- continue;- }-- const recordFilter = resolveRowLevelPermissionRecordFilter({- internalContext: this.internalContext,- authContext: this.authContext,- objectMetadata: joinedObjectMetadata,- });-- if (!isDefined(recordFilter)) {- markRowLevelPermissionPredicateApplied(joinAttribute);- continue;- }-- const renderedCondition = renderRowLevelPermissionFilterToSql({- recordFilter,- tableAlias: joinAttribute.alias.name,- objectMetadata: joinedObjectMetadata,- flatFieldMetadataMaps: this.internalContext.flatFieldMetadataMaps,- });-- if (!isDefined(renderedCondition)) {- markRowLevelPermissionPredicateApplied(joinAttribute);- continue;- }-- joinAttribute.condition = andWithExistingJoinCondition(- joinAttribute.condition,- renderedCondition.sql,- );-- this.setParameters(renderedCondition.parameters);- markRowLevelPermissionPredicateApplied(joinAttribute);- }- }-- private getJoinedObjectMetadataOrUndefined(- joinAttribute: JoinAttribute,- ): FlatObjectMetadata | undefined {- const joinedEntityMetadata = joinAttribute.metadata;- const isJoinOnSubQueryOrCustomTable =- isDefined(joinAttribute.alias?.subQuery) ||- !isDefined(joinedEntityMetadata);-- if (isJoinOnSubQueryOrCustomTable) {- return undefined;- }-- const joinedEntityTarget = joinedEntityMetadata.target;-- if (typeof joinedEntityTarget !== 'string') {- return undefined;- }-- const joinedObjectMetadataId =- this.internalContext.objectIdByNameSingular[joinedEntityTarget];-- if (!isDefined(joinedObjectMetadataId)) {- return undefined;- }-- return findFlatEntityByIdInFlatEntityMaps({- flatEntityId: joinedObjectMetadataId,- flatEntityMaps: this.internalContext.flatObjectMetadataMaps,- });- }-}diff --git a/packages/twenty-server/src/engine/twenty-orm/repository/workspace-soft-delete-query-builder.ts b/packages/twenty-server/src/engine/twenty-orm/repository/workspace-soft-delete-query-builder.tsdeleted file mode 100644index 4efa0c76a39..00000000000--- a/packages/twenty-server/src/engine/twenty-orm/repository/workspace-soft-delete-query-builder.ts+++ /dev/null@@ -1,220 +0,0 @@-import { type ObjectsPermissions } from 'twenty-shared/types';-import {- type EntityTarget,- type InsertQueryBuilder,- type ObjectLiteral,- type UpdateResult,-} from 'typeorm';-import { SoftDeleteQueryBuilder } from 'typeorm/query-builder/SoftDeleteQueryBuilder';-import { type WhereClause } from 'typeorm/query-builder/WhereClause';--import { type FeatureFlagMap } from 'src/engine/core-modules/feature-flag/interfaces/feature-flag-map.interface';-import { type WorkspaceInternalContext } from 'src/engine/twenty-orm/interfaces/workspace-internal-context.interface';--import { DatabaseEventAction } from 'src/engine/api/graphql/graphql-query-runner/enums/database-event-action';-import { type WorkspaceAuthContext } from 'src/engine/core-modules/auth/types/workspace-auth-context.type';-import { computeTwentyORMException } from 'src/engine/twenty-orm/error-handling/compute-twenty-orm-exception';-import {- TwentyORMException,- TwentyORMExceptionCode,-} from 'src/engine/twenty-orm/exceptions/twenty-orm.exception';-import { validateQueryIsPermittedOrThrow } from 'src/engine/twenty-orm/repository/permissions.utils';-import { type WorkspaceDeleteQueryBuilder } from 'src/engine/twenty-orm/repository/workspace-delete-query-builder';-import { type WorkspaceSelectQueryBuilder } from 'src/engine/twenty-orm/repository/workspace-select-query-builder';-import { type WorkspaceUpdateQueryBuilder } from 'src/engine/twenty-orm/repository/workspace-update-query-builder';-import { applyRowLevelPermissionPredicates } from 'src/engine/twenty-orm/utils/apply-row-level-permission-predicates.util';-import { applyTableAliasOnWhereCondition } from 'src/engine/twenty-orm/utils/apply-table-alias-on-where-condition';-import { computeEventSelectQueryBuilder } from 'src/engine/twenty-orm/utils/compute-event-select-query-builder.util';-import { formatResult } from 'src/engine/twenty-orm/utils/format-result.util';-import { formatTwentyOrmEventToDatabaseBatchEvent } from 'src/engine/twenty-orm/utils/format-twenty-orm-event-to-database-batch-event.util';-import { getObjectMetadataFromEntityTarget } from 'src/engine/twenty-orm/utils/get-object-metadata-from-entity-target.util';-import { computeObjectTargetTable } from 'src/engine/utils/compute-object-target-table.util';--export class WorkspaceSoftDeleteQueryBuilder<- T extends ObjectLiteral,-> extends SoftDeleteQueryBuilder<T> {- private objectRecordsPermissions: ObjectsPermissions;- private shouldBypassPermissionChecks: boolean;- private internalContext: WorkspaceInternalContext;- private authContext: WorkspaceAuthContext;- private featureFlagMap: FeatureFlagMap;-- constructor(- queryBuilder: SoftDeleteQueryBuilder<T>,- objectRecordsPermissions: ObjectsPermissions,- internalContext: WorkspaceInternalContext,- shouldBypassPermissionChecks: boolean,- authContext: WorkspaceAuthContext,- featureFlagMap: FeatureFlagMap,- ) {- super(queryBuilder);- this.objectRecordsPermissions = objectRecordsPermissions;- this.internalContext = internalContext;- this.shouldBypassPermissionChecks = shouldBypassPermissionChecks;- this.authContext = authContext;- this.featureFlagMap = featureFlagMap;- }-- override clone(): this {- const clonedQueryBuilder = super.clone();-- const workspaceSoftDeleteQueryBuilder = new WorkspaceSoftDeleteQueryBuilder(- clonedQueryBuilder,- this.objectRecordsPermissions,- this.internalContext,- this.shouldBypassPermissionChecks,- this.authContext,- this.featureFlagMap,- ) as this;-- return workspaceSoftDeleteQueryBuilder;- }-- override async execute(): Promise<UpdateResult> {- try {- this.applyRowLevelPermissionPredicates();- validateQueryIsPermittedOrThrow({- expressionMap: this.expressionMap,- objectsPermissions: this.objectRecordsPermissions,- flatObjectMetadataMaps: this.internalContext.flatObjectMetadataMaps,- flatFieldMetadataMaps: this.internalContext.flatFieldMetadataMaps,- objectIdByNameSingular: this.internalContext.objectIdByNameSingular,- shouldBypassPermissionChecks: this.shouldBypassPermissionChecks,- authContext: this.authContext,- });-- const mainAliasTarget = this.getMainAliasTarget();-- const objectMetadata = getObjectMetadataFromEntityTarget(- mainAliasTarget,- this.internalContext,- );-- const beforeEventSelectQueryBuilder = computeEventSelectQueryBuilder<T>({- queryBuilder: this,- authContext: this.authContext,- internalContext: this.internalContext,- featureFlagMap: this.featureFlagMap,- expressionMap: this.expressionMap,- objectRecordsPermissions: this.objectRecordsPermissions,- });-- const tableName = computeObjectTargetTable(objectMetadata);-- const before = await beforeEventSelectQueryBuilder.getMany({- noFormatting: true,- });-- this.expressionMap.wheres = applyTableAliasOnWhereCondition({- condition: this.expressionMap.wheres,- tableName,- aliasName: objectMetadata.nameSingular,- }) as WhereClause[];-- const typeORMSoftRemoveResultWithOnlyIdColumn = await super.execute();-- const afterWithAllFields = await beforeEventSelectQueryBuilder.getMany({- noFormatting: true,- });-- const formattedAfter = formatResult<T[]>(- afterWithAllFields,- objectMetadata,- this.internalContext.flatObjectMetadataMaps,- this.internalContext.flatFieldMetadataMaps,- );-- const formattedBefore = formatResult<T[]>(- before,- objectMetadata,- this.internalContext.flatObjectMetadataMaps,- this.internalContext.flatFieldMetadataMaps,- );-- this.internalContext.eventEmitterService.emitDatabaseBatchEvent(- formatTwentyOrmEventToDatabaseBatchEvent({- action:- this.expressionMap.queryType === 'restore'- ? DatabaseEventAction.RESTORED- : DatabaseEventAction.DELETED,- objectMetadataItem: objectMetadata,- flatFieldMetadataMaps: this.internalContext.flatFieldMetadataMaps,- workspaceId: this.internalContext.workspaceId,- recordsBefore: formattedBefore,- recordsAfter: formattedAfter,- authContext: this.authContext,- }),- );-- return {- raw: typeORMSoftRemoveResultWithOnlyIdColumn.raw,- generatedMaps: formattedAfter,- affected: typeORMSoftRemoveResultWithOnlyIdColumn.affected,- };- } catch (error) {- throw await computeTwentyORMException(error);- }- }-- override select(): WorkspaceSelectQueryBuilder<T> {- throw new TwentyORMException(- 'This builder cannot morph into a select builder',- TwentyORMExceptionCode.METHOD_NOT_ALLOWED,- );- }-- override update(): WorkspaceUpdateQueryBuilder<T> {- throw new TwentyORMException(- 'This builder cannot morph into an update builder',- TwentyORMExceptionCode.METHOD_NOT_ALLOWED,- );- }-- override insert(): InsertQueryBuilder<T> {- throw new TwentyORMException(- 'This builder cannot morph into an insert builder',- TwentyORMExceptionCode.METHOD_NOT_ALLOWED,- );- }-- override delete(): WorkspaceDeleteQueryBuilder<T> {- throw new TwentyORMException(- 'This builder cannot morph into a delete builder',- TwentyORMExceptionCode.METHOD_NOT_ALLOWED,- );- }-- private getMainAliasTarget(): EntityTarget<T> {- const mainAliasTarget = this.expressionMap.mainAlias?.target;-- if (!mainAliasTarget) {- throw new TwentyORMException(- 'Main alias target is missing',- TwentyORMExceptionCode.MISSING_MAIN_ALIAS_TARGET,- );- }-- return mainAliasTarget;- }-- private applyRowLevelPermissionPredicates(): void {- if (this.shouldBypassPermissionChecks) {- return;- }-- const mainAliasTarget = this.getMainAliasTarget();-- const objectMetadata = getObjectMetadataFromEntityTarget(- mainAliasTarget,- this.internalContext,- );-- applyRowLevelPermissionPredicates({- queryBuilder: this as unknown as WorkspaceSelectQueryBuilder<T>,- objectMetadata,- internalContext: this.internalContext,- authContext: this.authContext,- featureFlagMap: this.featureFlagMap,- });- }-}diff --git a/packages/twenty-server/src/engine/twenty-orm/repository/workspace-update-query-builder.ts b/packages/twenty-server/src/engine/twenty-orm/repository/workspace-update-query-builder.tsdeleted file mode 100644index 01dacce1831..00000000000--- a/packages/twenty-server/src/engine/twenty-orm/repository/workspace-update-query-builder.ts+++ /dev/null@@ -1,704 +0,0 @@-import { msg } from '@lingui/core/macro';-import { QUERY_MAX_RECORDS } from 'twenty-shared/constants';-import { type ObjectsPermissions } from 'twenty-shared/types';-import { isDefined } from 'twenty-shared/utils';-import {- UpdateQueryBuilder,- type EntityTarget,- type ObjectLiteral,- type UpdateResult,-} from 'typeorm';-import { type QueryDeepPartialEntity } from 'typeorm/query-builder/QueryPartialEntity';-import { type WhereClause } from 'typeorm/query-builder/WhereClause';--import { type FeatureFlagMap } from 'src/engine/core-modules/feature-flag/interfaces/feature-flag-map.interface';-import { type WorkspaceInternalContext } from 'src/engine/twenty-orm/interfaces/workspace-internal-context.interface';--import { DatabaseEventAction } from 'src/engine/api/graphql/graphql-query-runner/enums/database-event-action';-import { type WorkspaceAuthContext } from 'src/engine/core-modules/auth/types/workspace-auth-context.type';-import { type QueryDeepPartialEntityWithNestedRelationFields } from 'src/engine/twenty-orm/entity-manager/types/query-deep-partial-entity-with-nested-relation-fields.type';-import { type RelationConnectQueryConfig } from 'src/engine/twenty-orm/entity-manager/types/relation-connect-query-config.type';-import { type RelationDisconnectQueryFieldsByEntityIndex } from 'src/engine/twenty-orm/entity-manager/types/relation-nested-query-fields-by-entity-index.type';-import { type WorkspaceEntityManager } from 'src/engine/twenty-orm/entity-manager/workspace-entity-manager';-import { computeTwentyORMException } from 'src/engine/twenty-orm/error-handling/compute-twenty-orm-exception';-import {- TwentyORMException,- TwentyORMExceptionCode,-} from 'src/engine/twenty-orm/exceptions/twenty-orm.exception';-import { FilesFieldSync } from 'src/engine/twenty-orm/field-operations/files-field-sync/files-field-sync';-import { RelationNestedQueries } from 'src/engine/twenty-orm/field-operations/relation-nested-queries/relation-nested-queries';-import { validateQueryIsPermittedOrThrow } from 'src/engine/twenty-orm/repository/permissions.utils';-import { type WorkspaceDeleteQueryBuilder } from 'src/engine/twenty-orm/repository/workspace-delete-query-builder';-import { WorkspaceSelectQueryBuilder } from 'src/engine/twenty-orm/repository/workspace-select-query-builder';-import { type WorkspaceSoftDeleteQueryBuilder } from 'src/engine/twenty-orm/repository/workspace-soft-delete-query-builder';-import { applyRowLevelPermissionPredicates } from 'src/engine/twenty-orm/utils/apply-row-level-permission-predicates.util';-import { applyTableAliasOnWhereCondition } from 'src/engine/twenty-orm/utils/apply-table-alias-on-where-condition';-import { computeEventSelectQueryBuilder } from 'src/engine/twenty-orm/utils/compute-event-select-query-builder.util';-import { formatData } from 'src/engine/twenty-orm/utils/format-data.util';-import { formatResult } from 'src/engine/twenty-orm/utils/format-result.util';-import { formatTwentyOrmEventToDatabaseBatchEvent } from 'src/engine/twenty-orm/utils/format-twenty-orm-event-to-database-batch-event.util';-import { getObjectMetadataFromEntityTarget } from 'src/engine/twenty-orm/utils/get-object-metadata-from-entity-target.util';-import {- getUpdateEventRecords,- mergeRecordsWithUpdateValues,- mergeRecordWithUpdateValues,-} from 'src/engine/twenty-orm/utils/merge-records-with-update-values.util';-import { validateRLSPredicatesForRecords } from 'src/engine/twenty-orm/utils/validate-rls-predicates-for-records.util';-import { computeObjectTargetTable } from 'src/engine/utils/compute-object-target-table.util';--export class WorkspaceUpdateQueryBuilder<- T extends ObjectLiteral,-> extends UpdateQueryBuilder<T> {- private objectRecordsPermissions: ObjectsPermissions;- private shouldBypassPermissionChecks: boolean;- private internalContext: WorkspaceInternalContext;- private authContext: WorkspaceAuthContext;- private featureFlagMap: FeatureFlagMap;- private relationNestedConfig:- | [RelationConnectQueryConfig[], RelationDisconnectQueryFieldsByEntityIndex]- | null;- private manyInputs: {- criteria: string;- partialEntity: QueryDeepPartialEntity<T>;- }[];-- private _relationNestedQueries?: RelationNestedQueries;- private _filesFieldSync?: FilesFieldSync;-- private get relationNestedQueries(): RelationNestedQueries {- return (this._relationNestedQueries ??= new RelationNestedQueries(- this.internalContext,- ));- }-- private get filesFieldSync(): FilesFieldSync {- return (this._filesFieldSync ??= new FilesFieldSync(this.internalContext));- }-- constructor(- queryBuilder: UpdateQueryBuilder<T>,- objectRecordsPermissions: ObjectsPermissions,- internalContext: WorkspaceInternalContext,- shouldBypassPermissionChecks: boolean,- authContext: WorkspaceAuthContext,- featureFlagMap: FeatureFlagMap,- ) {- super(queryBuilder);- this.objectRecordsPermissions = objectRecordsPermissions;- this.internalContext = internalContext;- this.shouldBypassPermissionChecks = shouldBypassPermissionChecks;- this.authContext = authContext;- this.featureFlagMap = featureFlagMap;- }-- override clone(): this {- const clonedQueryBuilder = super.clone();-- const workspaceUpdateQueryBuilder = new WorkspaceUpdateQueryBuilder(- clonedQueryBuilder as UpdateQueryBuilder<T>,- this.objectRecordsPermissions,- this.internalContext,- this.shouldBypassPermissionChecks,- this.authContext,- this.featureFlagMap,- ) as this;-- return workspaceUpdateQueryBuilder;- }-- private validateQueryPermissionsOrThrow(): void {- validateQueryIsPermittedOrThrow({- expressionMap: this.expressionMap,- objectsPermissions: this.objectRecordsPermissions,- flatObjectMetadataMaps: this.internalContext.flatObjectMetadataMaps,- flatFieldMetadataMaps: this.internalContext.flatFieldMetadataMaps,- objectIdByNameSingular: this.internalContext.objectIdByNameSingular,- shouldBypassPermissionChecks: this.shouldBypassPermissionChecks,- authContext: this.authContext,- });- }-- private validateManyInputsPermissionsOrThrow(): void {- for (const input of this.manyInputs) {- const fakeExpressionMapToValidatePermissions = Object.assign(- {},- this.expressionMap,- {- wheres: input.criteria,- valuesSet: input.partialEntity,- },- );-- validateQueryIsPermittedOrThrow({- expressionMap: fakeExpressionMapToValidatePermissions,- objectsPermissions: this.objectRecordsPermissions,- flatObjectMetadataMaps: this.internalContext.flatObjectMetadataMaps,- flatFieldMetadataMaps: this.internalContext.flatFieldMetadataMaps,- objectIdByNameSingular: this.internalContext.objectIdByNameSingular,- shouldBypassPermissionChecks: this.shouldBypassPermissionChecks,- authContext: this.authContext,- });- }- }-- override async execute(): Promise<UpdateResult> {- try {- if (this.manyInputs) {- return this.executeMany();- }- this.validateQueryPermissionsOrThrow();-- const mainAliasTarget = this.getMainAliasTarget();-- const objectMetadata = getObjectMetadataFromEntityTarget(- mainAliasTarget,- this.internalContext,- );-- const eventSelectQueryBuilder = computeEventSelectQueryBuilder<T>({- queryBuilder: this,- authContext: this.authContext,- internalContext: this.internalContext,- featureFlagMap: this.featureFlagMap,- expressionMap: this.expressionMap,- objectRecordsPermissions: this.objectRecordsPermissions,- });-- const tableName = computeObjectTargetTable(objectMetadata);-- const before = structuredClone(- await eventSelectQueryBuilder.getMany({- noFormatting: true,- }),- );-- if (before.length > QUERY_MAX_RECORDS) {- throw new TwentyORMException(- `Cannot update more than ${QUERY_MAX_RECORDS} records at once`,- TwentyORMExceptionCode.TOO_MANY_RECORDS_TO_UPDATE,- {- userFriendlyMessage: msg`You can only update up to ${QUERY_MAX_RECORDS} records at once.`,- },- );- }-- this.expressionMap.wheres = applyTableAliasOnWhereCondition({- condition: this.expressionMap.wheres,- tableName,- aliasName: objectMetadata.nameSingular,- }) as WhereClause[];-- const nestedRelationQueryBuilder = new WorkspaceSelectQueryBuilder(- this as unknown as WorkspaceSelectQueryBuilder<T>,- this.objectRecordsPermissions,- this.internalContext,- this.shouldBypassPermissionChecks,- this.authContext,- this.featureFlagMap,- );-- const formattedBefore = formatResult<T[]>(- structuredClone(before),- objectMetadata,- this.internalContext.flatObjectMetadataMaps,- this.internalContext.flatFieldMetadataMaps,- );-- let filesFieldDiffByEntityIndex = null;- let filesFieldFileIds = null;-- const updatePayload = Array.isArray(this.expressionMap.valuesSet)- ? (this.expressionMap.valuesSet[0] ?? {})- : (this.expressionMap.valuesSet ?? {});-- filesFieldDiffByEntityIndex =- this.filesFieldSync.computeFilesFieldDiffBeforeUpdateOne(- updatePayload,- mainAliasTarget,- formattedBefore,- );-- if (isDefined(filesFieldDiffByEntityIndex)) {- const entities = formattedBefore.map(() => updatePayload);-- const result = await this.filesFieldSync.enrichFilesFields({- entities,- filesFieldDiffByEntityIndex,- workspaceId: this.internalContext.workspaceId,- target: mainAliasTarget,- });-- filesFieldFileIds = result.fileIds;-- this.expressionMap.valuesSet = result.entities[0];- }-- if (isDefined(this.relationNestedConfig)) {- const updatedValues =- await this.relationNestedQueries.processRelationNestedQueries({- entities: this.expressionMap.valuesSet as- | QueryDeepPartialEntityWithNestedRelationFields<T>- | QueryDeepPartialEntityWithNestedRelationFields<T>[],- relationNestedConfig: this.relationNestedConfig,- queryBuilder: nestedRelationQueryBuilder,- });-- this.expressionMap.valuesSet =- updatedValues.length === 1 ? updatedValues[0] : updatedValues;-- this.validateQueryPermissionsOrThrow();- }-- this.applyRowLevelPermissionPredicates();-- const valuesSet = this.expressionMap.valuesSet ?? {};- const updatedRecords = mergeRecordsWithUpdateValues(- structuredClone(before),- valuesSet,- );-- this.validateRLSPredicatesForUpdate({- updatedRecords,- });-- const result = await super.execute();-- if (isDefined(filesFieldFileIds)) {- await this.filesFieldSync.updateFileEntityRecords(filesFieldFileIds);- }-- const after = await eventSelectQueryBuilder.getMany({- noFormatting: true,- });-- const formattedAfter = formatResult<T[]>(- mergeRecordsWithUpdateValues(- structuredClone(getUpdateEventRecords(before, after)),- valuesSet,- ),- objectMetadata,- this.internalContext.flatObjectMetadataMaps,- this.internalContext.flatFieldMetadataMaps,- );-- this.internalContext.eventEmitterService.emitDatabaseBatchEvent(- formatTwentyOrmEventToDatabaseBatchEvent({- action: DatabaseEventAction.UPDATED,- objectMetadataItem: objectMetadata,- flatFieldMetadataMaps: this.internalContext.flatFieldMetadataMaps,- workspaceId: this.internalContext.workspaceId,- recordsAfter: formattedAfter,- recordsBefore: formattedBefore,- authContext: this.authContext,- }),- );-- this.internalContext.eventEmitterService.emitDatabaseBatchEvent(- formatTwentyOrmEventToDatabaseBatchEvent({- action: DatabaseEventAction.UPSERTED,- objectMetadataItem: objectMetadata,- flatFieldMetadataMaps: this.internalContext.flatFieldMetadataMaps,- workspaceId: this.internalContext.workspaceId,- recordsAfter: formattedAfter,- recordsBefore: formattedBefore,- authContext: this.authContext,- }),- );-- const formattedResult = formatResult<T[]>(- result.raw,- objectMetadata,- this.internalContext.flatObjectMetadataMaps,- this.internalContext.flatFieldMetadataMaps,- );-- return {- raw: result.raw,- generatedMaps: formattedResult,- affected: result.affected,- };- } catch (error) {- const objectMetadata = getObjectMetadataFromEntityTarget(- this.getMainAliasTarget(),- this.internalContext,- );-- throw await computeTwentyORMException(- error,- objectMetadata,- this.connection.manager as WorkspaceEntityManager,- this.internalContext,- );- }- }-- public async executeMany(): Promise<UpdateResult> {- try {- this.validateManyInputsPermissionsOrThrow();-- const mainAliasTarget = this.getMainAliasTarget();-- const objectMetadata = getObjectMetadataFromEntityTarget(- mainAliasTarget,- this.internalContext,- );-- const eventSelectQueryBuilder = computeEventSelectQueryBuilder<T>({- queryBuilder: this,- authContext: this.authContext,- internalContext: this.internalContext,- featureFlagMap: this.featureFlagMap,- expressionMap: this.expressionMap,- objectRecordsPermissions: this.objectRecordsPermissions,- });-- eventSelectQueryBuilder.whereInIds(- this.manyInputs.map((input) => input.criteria),- );-- const beforeRecords = structuredClone(- await eventSelectQueryBuilder.getMany({- noFormatting: true,- }),- );-- const formattedBefore = formatResult<T[]>(- structuredClone(beforeRecords),- objectMetadata,- this.internalContext.flatObjectMetadataMaps,- this.internalContext.flatFieldMetadataMaps,- );-- const results: UpdateResult[] = [];-- const nestedRelationQueryBuilder = new WorkspaceSelectQueryBuilder(- this as unknown as WorkspaceSelectQueryBuilder<T>,- this.objectRecordsPermissions,- this.internalContext,- this.shouldBypassPermissionChecks,- this.authContext,- this.featureFlagMap,- );-- this.relationNestedConfig =- this.relationNestedQueries.prepareNestedRelationQueries(- this.manyInputs.map(- (input) => input.partialEntity,- ) as QueryDeepPartialEntityWithNestedRelationFields<T>[],- mainAliasTarget,- );-- let filesFieldDiffByEntityIndex = null;- let filesFieldFileIds = null;-- const entities = this.manyInputs.map((input) => input.partialEntity);-- filesFieldDiffByEntityIndex =- this.filesFieldSync.computeFilesFieldDiffBeforeUpdate(- entities,- mainAliasTarget,- formattedBefore,- );-- if (isDefined(filesFieldDiffByEntityIndex)) {- const result = await this.filesFieldSync.enrichFilesFields({- entities,- filesFieldDiffByEntityIndex,- workspaceId: this.internalContext.workspaceId,- target: mainAliasTarget,- });-- filesFieldFileIds = result.fileIds;-- this.manyInputs = result.entities.map((updatedEntity, index) => ({- criteria: this.manyInputs[index].criteria,- partialEntity: updatedEntity,- }));- }-- if (isDefined(this.relationNestedConfig)) {- const updatedValues =- await this.relationNestedQueries.processRelationNestedQueries({- entities: this.manyInputs.map((input) => input.partialEntity) as- | QueryDeepPartialEntityWithNestedRelationFields<T>- | QueryDeepPartialEntityWithNestedRelationFields<T>[],- relationNestedConfig: this.relationNestedConfig,- queryBuilder: nestedRelationQueryBuilder,- });-- this.manyInputs = updatedValues.map((updatedValue, index) => ({- criteria: this.manyInputs[index].criteria,- partialEntity: updatedValue,- }));-- this.validateManyInputsPermissionsOrThrow();- }-- const beforeRecordById = new Map<string, T>();-- for (const beforeRecord of formattedBefore) {- if (isDefined(beforeRecord.id)) {- beforeRecordById.set(beforeRecord.id, beforeRecord);- }- }-- for (const input of this.manyInputs) {- this.expressionMap.valuesSet = input.partialEntity;- this.where({ id: input.criteria });-- this.applyRowLevelPermissionPredicates();-- const beforeRecord = beforeRecordById.get(input.criteria);- const updatedRecords = beforeRecord- ? [- mergeRecordWithUpdateValues(- structuredClone(beforeRecord),- input.partialEntity,- ),- ]- : [];-- this.validateRLSPredicatesForUpdate({- updatedRecords,- });-- const result = await super.execute();-- results.push(result);- }-- if (isDefined(filesFieldFileIds)) {- await this.filesFieldSync.updateFileEntityRecords(filesFieldFileIds);- }-- const afterRecords = await eventSelectQueryBuilder.getMany({- noFormatting: true,- });-- const updateValuesByRecordId = new Map(- this.manyInputs.map(({ criteria, partialEntity }) => [- criteria,- partialEntity,- ]),- );-- const formattedAfter = formatResult<T[]>(- getUpdateEventRecords(beforeRecords, afterRecords).map((record) =>- mergeRecordWithUpdateValues(- structuredClone(record),- updateValuesByRecordId.get(record.id),- ),- ),- objectMetadata,- this.internalContext.flatObjectMetadataMaps,- this.internalContext.flatFieldMetadataMaps,- );-- this.internalContext.eventEmitterService.emitDatabaseBatchEvent(- formatTwentyOrmEventToDatabaseBatchEvent({- action: DatabaseEventAction.UPDATED,- objectMetadataItem: objectMetadata,- flatFieldMetadataMaps: this.internalContext.flatFieldMetadataMaps,- workspaceId: this.internalContext.workspaceId,- recordsAfter: formattedAfter,- recordsBefore: formattedBefore,- authContext: this.authContext,- }),- );-- this.internalContext.eventEmitterService.emitDatabaseBatchEvent(- formatTwentyOrmEventToDatabaseBatchEvent({- action: DatabaseEventAction.UPSERTED,- objectMetadataItem: objectMetadata,- flatFieldMetadataMaps: this.internalContext.flatFieldMetadataMaps,- workspaceId: this.internalContext.workspaceId,- recordsAfter: formattedAfter,- recordsBefore: formattedBefore,- authContext: this.authContext,- }),- );-- const formattedResults = formatResult<T[]>(- results.flatMap((result) => result.raw),- objectMetadata,- this.internalContext.flatObjectMetadataMaps,- this.internalContext.flatFieldMetadataMaps,- );-- return {- raw: results.flatMap((result) => result.raw),- generatedMaps: formattedResults,- affected: results.length,- };- } catch (error) {- const objectMetadata = getObjectMetadataFromEntityTarget(- this.getMainAliasTarget(),- this.internalContext,- );-- throw await computeTwentyORMException(- error,- objectMetadata,- this.connection.manager as WorkspaceEntityManager,- this.internalContext,- );- }- }-- override set(- _values:- | QueryDeepPartialEntityWithNestedRelationFields<T>- | QueryDeepPartialEntityWithNestedRelationFields<T>[],- ): this;-- override set(_values: QueryDeepPartialEntity<T>): this;-- override set(- _values:- | QueryDeepPartialEntityWithNestedRelationFields<T>- | QueryDeepPartialEntityWithNestedRelationFields<T>[]- | QueryDeepPartialEntity<T>- | QueryDeepPartialEntity<T>[],- ): this {- const mainAliasTarget = this.getMainAliasTarget();-- const objectMetadata = getObjectMetadataFromEntityTarget(- mainAliasTarget,- this.internalContext,- );-- const extendedValues = _values as- | QueryDeepPartialEntityWithNestedRelationFields<T>- | QueryDeepPartialEntityWithNestedRelationFields<T>[];-- this.relationNestedConfig =- this.relationNestedQueries.prepareNestedRelationQueries(- extendedValues,- mainAliasTarget,- );-- const formattedUpdateSet = formatData(- _values,- objectMetadata,- this.internalContext.flatFieldMetadataMaps,- );-- return super.set(formattedUpdateSet as QueryDeepPartialEntity<T>);- }-- override select(): WorkspaceSelectQueryBuilder<T> {- throw new TwentyORMException(- 'This builder cannot morph into a select builder',- TwentyORMExceptionCode.METHOD_NOT_ALLOWED,- );- }-- override delete(): WorkspaceDeleteQueryBuilder<T> {- throw new TwentyORMException(- 'This builder cannot morph into a delete builder',- TwentyORMExceptionCode.METHOD_NOT_ALLOWED,- );- }-- override softDelete(): WorkspaceSoftDeleteQueryBuilder<T> {- throw new TwentyORMException(- 'This builder cannot morph into a soft delete builder',- TwentyORMExceptionCode.METHOD_NOT_ALLOWED,- );- }-- override restore(): WorkspaceSoftDeleteQueryBuilder<T> {- throw new TwentyORMException(- 'This builder cannot morph into a soft delete builder',- TwentyORMExceptionCode.METHOD_NOT_ALLOWED,- );- }-- private getMainAliasTarget(): EntityTarget<T> {- const mainAliasTarget = this.expressionMap.mainAlias?.target;-- if (!mainAliasTarget) {- throw new TwentyORMException(- 'Main alias target is missing',- TwentyORMExceptionCode.MISSING_MAIN_ALIAS_TARGET,- );- }-- return mainAliasTarget;- }-- public setManyInputs(- inputs: {- criteria: string;- partialEntity: QueryDeepPartialEntity<T>;- }[],- ): this {- const mainAliasTarget = this.getMainAliasTarget();-- const objectMetadata = getObjectMetadataFromEntityTarget(- mainAliasTarget,- this.internalContext,- );-- this.manyInputs = inputs.map((input) => ({- criteria: input.criteria,- partialEntity: formatData(- input.partialEntity,- objectMetadata,- this.internalContext.flatFieldMetadataMaps,- ),- }));-- return this;- }-- private applyRowLevelPermissionPredicates(): void {- if (this.shouldBypassPermissionChecks) {- return;- }-- const mainAliasTarget = this.getMainAliasTarget();-- const objectMetadata = getObjectMetadataFromEntityTarget(- mainAliasTarget,- this.internalContext,- );-- applyRowLevelPermissionPredicates({- queryBuilder: this as unknown as WorkspaceSelectQueryBuilder<T>,- objectMetadata,- internalContext: this.internalContext,- authContext: this.authContext,- featureFlagMap: this.featureFlagMap,- });- }-- private validateRLSPredicatesForUpdate({- updatedRecords,- }: {- updatedRecords: T[];- }): void {- const mainAliasTarget = this.getMainAliasTarget();- const objectMetadata = getObjectMetadataFromEntityTarget(- mainAliasTarget,- this.internalContext,- );-- const updatedRecordsFormatted = formatResult<T[]>(- updatedRecords,- objectMetadata,- this.internalContext.flatObjectMetadataMaps,- this.internalContext.flatFieldMetadataMaps,- );-- validateRLSPredicatesForRecords({- records: updatedRecordsFormatted,- objectMetadata,- internalContext: this.internalContext,- authContext: this.authContext,- shouldBypassPermissionChecks: this.shouldBypassPermissionChecks,- errorMessage:- 'Updated record does not satisfy row-level security constraints of your current role',- });- }-}diff --git a/packages/twenty-server/src/engine/twenty-orm/repository/workspace.repository.ts b/packages/twenty-server/src/engine/twenty-orm/repository/workspace.repository.tsdeleted file mode 100644index 60c0c9668c7..00000000000--- a/packages/twenty-server/src/engine/twenty-orm/repository/workspace.repository.ts+++ /dev/null@@ -1,981 +0,0 @@-import { type ObjectsPermissions } from 'twenty-shared/types';-import {- type DeepPartial,- type DeleteResult,- type EntityTarget,- type FindManyOptions,- type FindOneOptions,- type FindOptionsWhere,- type InsertResult,- type ObjectId,- type ObjectLiteral,- type QueryRunner,- type RemoveOptions,- Repository,- type SaveOptions,- type UpdateResult,-} from 'typeorm';-import { type PickKeysByType } from 'typeorm/common/PickKeysByType';-import { type QueryDeepPartialEntity } from 'typeorm/query-builder/QueryPartialEntity';-import { type UpdateOptions } from 'typeorm/repository/UpdateOptions';-import { type UpsertOptions } from 'typeorm/repository/UpsertOptions';--import { type FeatureFlagMap } from 'src/engine/core-modules/feature-flag/interfaces/feature-flag-map.interface';-import { type WorkspaceInternalContext } from 'src/engine/twenty-orm/interfaces/workspace-internal-context.interface';--import { type WorkspaceAuthContext } from 'src/engine/core-modules/auth/types/workspace-auth-context.type';-import {- PermissionsException,- PermissionsExceptionCode,-} from 'src/engine/metadata-modules/permissions/permissions.exception';-import { type DeepPartialWithNestedRelationFields } from 'src/engine/twenty-orm/entity-manager/types/deep-partial-entity-with-nested-relation-fields.type';-import { type QueryDeepPartialEntityWithNestedRelationFields } from 'src/engine/twenty-orm/entity-manager/types/query-deep-partial-entity-with-nested-relation-fields.type';-import { type WorkspaceEntityManager } from 'src/engine/twenty-orm/entity-manager/workspace-entity-manager';-import { WorkspaceSelectQueryBuilder } from 'src/engine/twenty-orm/repository/workspace-select-query-builder';-import { formatData } from 'src/engine/twenty-orm/utils/format-data.util';-import { getObjectMetadataFromEntityTarget } from 'src/engine/twenty-orm/utils/get-object-metadata-from-entity-target.util';--export class WorkspaceRepository<- T extends ObjectLiteral,-> extends Repository<T> {- private shouldBypassPermissionChecks: boolean;- private featureFlagMap: FeatureFlagMap;- public readonly objectRecordsPermissions?: ObjectsPermissions;- private authContext?: WorkspaceAuthContext;- declare manager: WorkspaceEntityManager;-- get internalContext(): WorkspaceInternalContext {- return this.manager.internalContext;- }-- constructor(- target: EntityTarget<T>,- manager: WorkspaceEntityManager,- featureFlagMap: FeatureFlagMap,- queryRunner?: QueryRunner,- objectRecordsPermissions?: ObjectsPermissions,- shouldBypassPermissionChecks = false,- authContext?: WorkspaceAuthContext,- ) {- super(target, manager, queryRunner);- this.featureFlagMap = featureFlagMap;- this.objectRecordsPermissions = objectRecordsPermissions;- this.shouldBypassPermissionChecks = shouldBypassPermissionChecks;- this.manager = manager;- this.authContext = authContext;- }-- override createQueryBuilder<U extends T>(- alias?: string,- queryRunner?: QueryRunner,- ): WorkspaceSelectQueryBuilder<U> {- const queryBuilder = super.createQueryBuilder(- alias,- queryRunner,- ) as unknown as WorkspaceSelectQueryBuilder<U>;-- if (!this.objectRecordsPermissions) {- throw new Error('Object records permissions are required');- }-- return new WorkspaceSelectQueryBuilder(- queryBuilder,- this.objectRecordsPermissions,- this.internalContext,- this.shouldBypassPermissionChecks,- this.authContext ?? ({} as WorkspaceAuthContext),- this.featureFlagMap,- );- }-- /**- * FIND METHODS- */- override async find(- options?: FindManyOptions<T>,- entityManager?: WorkspaceEntityManager,- ): Promise<T[]> {- const manager = entityManager || this.manager;- const computedOptions = await this.transformOptions(options);- const permissionOptions = {- shouldBypassPermissionChecks: this.shouldBypassPermissionChecks,- objectRecordsPermissions: this.objectRecordsPermissions,- };- const result = await manager.find(- this.target,- computedOptions,- permissionOptions,- );-- return result;- }-- override async findBy(- where: FindOptionsWhere<T> | FindOptionsWhere<T>[],- entityManager?: WorkspaceEntityManager,- ): Promise<T[]> {- const manager = entityManager || this.manager;- const computedOptions = await this.transformOptions({ where });- const permissionOptions = {- shouldBypassPermissionChecks: this.shouldBypassPermissionChecks,- objectRecordsPermissions: this.objectRecordsPermissions,- };- const result = await manager.findBy(- this.target,- computedOptions.where,- permissionOptions,- );-- return result;- }-- override async findAndCount(- options?: FindManyOptions<T>,- entityManager?: WorkspaceEntityManager,- ): Promise<[T[], number]> {- const manager = entityManager || this.manager;- const computedOptions = await this.transformOptions(options);- const permissionOptions = {- shouldBypassPermissionChecks: this.shouldBypassPermissionChecks,- objectRecordsPermissions: this.objectRecordsPermissions,- };- const result = await manager.findAndCount(- this.target,- computedOptions,- permissionOptions,- );-- return result;- }-- override async findAndCountBy(- where: FindOptionsWhere<T> | FindOptionsWhere<T>[],- entityManager?: WorkspaceEntityManager,- ): Promise<[T[], number]> {- const manager = entityManager || this.manager;- const computedOptions = await this.transformOptions({ where });- const permissionOptions = {- shouldBypassPermissionChecks: this.shouldBypassPermissionChecks,- objectRecordsPermissions: this.objectRecordsPermissions,- };- const result = await manager.findAndCountBy(- this.target,- computedOptions.where,- permissionOptions,- );-- return result;- }-- override async findOne(- options: FindOneOptions<T>,- entityManager?: WorkspaceEntityManager,- ): Promise<T | null> {- const manager = entityManager || this.manager;- const computedOptions = await this.transformOptions(options);- const permissionOptions = {- shouldBypassPermissionChecks: this.shouldBypassPermissionChecks,- objectRecordsPermissions: this.objectRecordsPermissions,- };- const result = await manager.findOne(- this.target,- computedOptions,- permissionOptions,- );-- return result;- }-- override async findOneBy(- where: FindOptionsWhere<T> | FindOptionsWhere<T>[],- entityManager?: WorkspaceEntityManager,- ): Promise<T | null> {- const manager = entityManager || this.manager;- const computedOptions = await this.transformOptions({ where });- const permissionOptions = {- shouldBypassPermissionChecks: this.shouldBypassPermissionChecks,- objectRecordsPermissions: this.objectRecordsPermissions,- };- const result = await manager.findOneBy(- this.target,- computedOptions.where,- permissionOptions,- );-- return result;- }-- override async findOneOrFail(- options: FindOneOptions<T>,- entityManager?: WorkspaceEntityManager,- ): Promise<T> {- const manager = entityManager || this.manager;- const computedOptions = await this.transformOptions(options);- const permissionOptions = {- shouldBypassPermissionChecks: this.shouldBypassPermissionChecks,- objectRecordsPermissions: this.objectRecordsPermissions,- };- const result = await manager.findOneOrFail(- this.target,- computedOptions,- permissionOptions,- );-- return result;- }-- override async findOneByOrFail(- where: FindOptionsWhere<T> | FindOptionsWhere<T>[],- entityManager?: WorkspaceEntityManager,- ): Promise<T> {- const manager = entityManager || this.manager;- const computedOptions = await this.transformOptions({ where });- const permissionOptions = {- shouldBypassPermissionChecks: this.shouldBypassPermissionChecks,- objectRecordsPermissions: this.objectRecordsPermissions,- };- const result = await manager.findOneByOrFail(- this.target,- computedOptions.where,- permissionOptions,- );-- return result;- }-- /**- * SAVE METHODS- */- override save<U extends DeepPartialWithNestedRelationFields<T>>(- entities: U[],- options: SaveOptions & { reload: false },- entityManager?: WorkspaceEntityManager,- ): Promise<T[]>;-- override save<U extends DeepPartialWithNestedRelationFields<T>>(- entities: U[],- options?: SaveOptions,- entityManager?: WorkspaceEntityManager,- ): Promise<(U & T)[]>;-- override save<U extends DeepPartialWithNestedRelationFields<T>>(- entity: U,- options: SaveOptions & { reload: false },- entityManager?: WorkspaceEntityManager,- ): Promise<T>;-- override save<U extends DeepPartialWithNestedRelationFields<T>>(- entity: U,- options?: SaveOptions,- entityManager?: WorkspaceEntityManager,- ): Promise<U & T>;-- override async save<U extends DeepPartialWithNestedRelationFields<T>>(- entityOrEntities: U | U[],- options?: SaveOptions | (SaveOptions & { reload: false }),- entityManager?: WorkspaceEntityManager,- ): Promise<U | U[]> {- const manager = entityManager || this.manager;- let result: U | U[];-- const permissionOptions = {- shouldBypassPermissionChecks: this.shouldBypassPermissionChecks,- objectRecordsPermissions: this.objectRecordsPermissions,- };-- // Needed because save method has multiple signature, otherwise we will need to do a type assertion- if (Array.isArray(entityOrEntities)) {- result = await manager.save(- this.target,- entityOrEntities,- options,- permissionOptions,- );- } else {- result = await manager.save(- this.target,- entityOrEntities,- options,- permissionOptions,- );- }-- return result;- }-- /**- * REMOVE METHODS- */- override remove(- entities: T[],- options?: RemoveOptions,- entityManager?: WorkspaceEntityManager,- ): Promise<T[]>;-- override remove(- entity: T,- options?: RemoveOptions,- entityManager?: WorkspaceEntityManager,- ): Promise<T>;-- override async remove(- entityOrEntities: T | T[],- options?: RemoveOptions,- entityManager?: WorkspaceEntityManager,- ): Promise<T | T[]> {- const manager = entityManager || this.manager;- const permissionOptions = {- shouldBypassPermissionChecks: this.shouldBypassPermissionChecks,- objectRecordsPermissions: this.objectRecordsPermissions,- };- const result = await manager.remove(- this.target,- entityOrEntities,- options,- permissionOptions,- );-- return result;- }-- override async delete(- criteria:- | string- | string[]- | number- | number[]- | Date- | Date[]- | ObjectId- | ObjectId[]- | FindOptionsWhere<T>,- entityManager?: WorkspaceEntityManager,- selectedColumns?: string[] | '*',- ): Promise<DeleteResult> {- const manager = entityManager || this.manager;-- if (typeof criteria === 'object' && 'where' in criteria) {- criteria = await this.transformOptions(criteria);- }-- const permissionOptions = {- shouldBypassPermissionChecks: this.shouldBypassPermissionChecks,- objectRecordsPermissions: this.objectRecordsPermissions,- };-- return manager.delete(- this.target,- criteria,- permissionOptions,- selectedColumns,- );- }-- override softRemove<U extends DeepPartial<T>>(- entities: U[],- options: SaveOptions & { reload: false },- entityManager?: WorkspaceEntityManager,- ): Promise<T[]>;-- override softRemove<U extends DeepPartial<T>>(- entities: U[],- options?: SaveOptions,- entityManager?: WorkspaceEntityManager,- ): Promise<(U & T)[]>;-- override softRemove<U extends DeepPartial<T>>(- entity: U,- options: SaveOptions & { reload: false },- entityManager?: WorkspaceEntityManager,- ): Promise<U>;-- override softRemove<U extends DeepPartial<T>>(- entity: T,- options?: SaveOptions,- entityManager?: WorkspaceEntityManager,- ): Promise<U & T>;-- override async softRemove<U extends DeepPartial<T>>(- entityOrEntities: U | U[],- options?: SaveOptions,- entityManager?: WorkspaceEntityManager,- ): Promise<U | U[]> {- const manager = entityManager || this.manager;- const permissionOptions = {- shouldBypassPermissionChecks: this.shouldBypassPermissionChecks,- objectRecordsPermissions: this.objectRecordsPermissions,- };- let result: U | U[];-- // Needed because save method has multiple signature, otherwise we will need to do a type assertion- if (Array.isArray(entityOrEntities)) {- result = await manager.softRemove(- this.target,- entityOrEntities,- options,- permissionOptions,- );- } else {- result = await manager.softRemove(- this.target,- entityOrEntities,- options,- permissionOptions,- );- }-- return result;- }-- override async softDelete(- criteria:- | string- | string[]- | number- | number[]- | Date- | Date[]- | ObjectId- | ObjectId[]- | FindOptionsWhere<T>,- entityManager?: WorkspaceEntityManager,- selectedColumns?: string[],- ): Promise<UpdateResult> {- const manager = entityManager || this.manager;-- if (typeof criteria === 'object' && 'where' in criteria) {- criteria = await this.transformOptions(criteria);- }-- const permissionOptions = {- shouldBypassPermissionChecks: this.shouldBypassPermissionChecks,- objectRecordsPermissions: this.objectRecordsPermissions,- };-- return manager.softDelete(- this.target,- criteria,- permissionOptions,- selectedColumns,- );- }-- /**- * RECOVERY METHODS- */- override recover<U extends DeepPartial<T>>(- entities: U,- options: SaveOptions & { reload: false },- entityManager?: WorkspaceEntityManager,- ): Promise<U>;-- override recover<U extends DeepPartial<T>>(- entities: U,- options?: SaveOptions,- entityManager?: WorkspaceEntityManager,- ): Promise<(U & T)[]>;-- override recover<U extends DeepPartial<T>>(- entity: U,- options: SaveOptions & { reload: false },- entityManager?: WorkspaceEntityManager,- ): Promise<U>;-- override recover<U extends DeepPartial<T>>(- entity: U,- options?: SaveOptions,- entityManager?: WorkspaceEntityManager,- ): Promise<U & T>;-- override async recover<U extends DeepPartial<T>>(- entityOrEntities: U | U[],- options?: SaveOptions,- entityManager?: WorkspaceEntityManager,- ): Promise<U | U[]> {- const manager = entityManager || this.manager;- const permissionOptions = {- shouldBypassPermissionChecks: this.shouldBypassPermissionChecks,- objectRecordsPermissions: this.objectRecordsPermissions,- };- let result: U | U[];-- // Needed because save method has multiple signature, otherwise we will need to do a type assertion- if (Array.isArray(entityOrEntities)) {- result = await manager.recover(- this.target,- entityOrEntities,- options,- permissionOptions,- );- } else {- result = await manager.recover(- this.target,- entityOrEntities,- options,- permissionOptions,- );- }-- return result;- }-- override async restore(- criteria:- | string- | string[]- | number- | number[]- | Date- | Date[]- | ObjectId- | ObjectId[]- | FindOptionsWhere<T>,- entityManager?: WorkspaceEntityManager,- selectedColumns?: string[],- ): Promise<UpdateResult> {- const manager = entityManager || this.manager;-- if (typeof criteria === 'object' && 'where' in criteria) {- criteria = await this.transformOptions(criteria);- }-- const permissionOptions = {- shouldBypassPermissionChecks: this.shouldBypassPermissionChecks,- objectRecordsPermissions: this.objectRecordsPermissions,- };-- return manager.restore(- this.target,- criteria,- permissionOptions,- selectedColumns,- );- }-- /**- * INSERT METHODS- */- override async insert(- entity:- | QueryDeepPartialEntityWithNestedRelationFields<T>- | QueryDeepPartialEntityWithNestedRelationFields<T>[],- entityManager?: WorkspaceEntityManager,- selectedColumns?: string[],- ): Promise<InsertResult> {- const manager = entityManager || this.manager;-- const permissionOptions = {- shouldBypassPermissionChecks: this.shouldBypassPermissionChecks,- objectRecordsPermissions: this.objectRecordsPermissions,- };-- return manager.insert(- this.target,- entity,- selectedColumns,- permissionOptions,- this.authContext,- );- }-- /**- * UPDATE METHODS- */- override async update(- criteria:- | string- | string[]- | number- | number[]- | Date- | Date[]- | ObjectId- | ObjectId[]- | FindOptionsWhere<T>,- partialEntity: QueryDeepPartialEntity<T>,- options?: UpdateOptions,- entityManager?: WorkspaceEntityManager,- selectedColumns?: string[],- ): Promise<UpdateResult> {- const manager = entityManager || this.manager;-- if (typeof criteria === 'object' && 'where' in criteria) {- criteria = await this.transformOptions(criteria);- }-- const permissionOptions = {- shouldBypassPermissionChecks: this.shouldBypassPermissionChecks,- objectRecordsPermissions: this.objectRecordsPermissions,- };-- return manager.update(- this.target,- criteria,- partialEntity,- options,- permissionOptions,- selectedColumns,- );- }-- // Experimental method to allow batch update and batch event emission- async updateMany(- inputs: {- criteria: string;- partialEntity: QueryDeepPartialEntity<T>;- }[],- entityManager?: WorkspaceEntityManager,- selectedColumns?: string[],- ): Promise<UpdateResult> {- const manager = entityManager || this.manager;-- const permissionOptions = {- shouldBypassPermissionChecks: this.shouldBypassPermissionChecks,- objectRecordsPermissions: this.objectRecordsPermissions,- };-- const results = await manager.updateMany(- this.target,- inputs,- permissionOptions,- selectedColumns,- );-- return results;- }-- override async upsert(- entityOrEntities:- | QueryDeepPartialEntityWithNestedRelationFields<T>- | QueryDeepPartialEntityWithNestedRelationFields<T>[],- conflictPathsOrOptions: string[] | UpsertOptions<T>,- entityManager?: WorkspaceEntityManager,- selectedColumns: string[] = [],- ): Promise<InsertResult> {- const manager = entityManager || this.manager;-- const permissionOptions = {- shouldBypassPermissionChecks: this.shouldBypassPermissionChecks,- objectRecordsPermissions: this.objectRecordsPermissions,- };-- const result = await manager.upsert(- this.target,- entityOrEntities,- conflictPathsOrOptions,- permissionOptions,- selectedColumns,- );-- return {- raw: result.raw,- generatedMaps: result.generatedMaps,- identifiers: result.identifiers,- };- }-- /**- * EXIST METHODS- */- override async exists(- options?: FindManyOptions<T>,- entityManager?: WorkspaceEntityManager,- ): Promise<boolean> {- const manager = entityManager || this.manager;- const computedOptions = await this.transformOptions(options);-- const permissionOptions = {- shouldBypassPermissionChecks: this.shouldBypassPermissionChecks,- objectRecordsPermissions: this.objectRecordsPermissions,- };-- return manager.exists(this.target, computedOptions, permissionOptions);- }-- override async existsBy(- where: FindOptionsWhere<T> | FindOptionsWhere<T>[],- entityManager?: WorkspaceEntityManager,- ): Promise<boolean> {- const manager = entityManager || this.manager;- const computedOptions = await this.transformOptions({ where });-- const permissionOptions = {- shouldBypassPermissionChecks: this.shouldBypassPermissionChecks,- objectRecordsPermissions: this.objectRecordsPermissions,- };-- return manager.existsBy(- this.target,- computedOptions.where,- permissionOptions,- );- }-- /**- * COUNT METHODS- */- override async count(- options?: FindManyOptions<T>,- entityManager?: WorkspaceEntityManager,- ): Promise<number> {- const manager = entityManager || this.manager;- const computedOptions = await this.transformOptions(options);-- const permissionOptions = {- shouldBypassPermissionChecks: this.shouldBypassPermissionChecks,- objectRecordsPermissions: this.objectRecordsPermissions,- };-- return manager.count(this.target, computedOptions, permissionOptions);- }-- override async countBy(- where: FindOptionsWhere<T> | FindOptionsWhere<T>[],- entityManager?: WorkspaceEntityManager,- ): Promise<number> {- const manager = entityManager || this.manager;- const computedOptions = await this.transformOptions({ where });-- const permissionOptions = {- shouldBypassPermissionChecks: this.shouldBypassPermissionChecks,- objectRecordsPermissions: this.objectRecordsPermissions,- };-- return manager.countBy(- this.target,- computedOptions.where,- permissionOptions,- );- }-- /**- * MATH METHODS- */- override async sum(- columnName: PickKeysByType<T, number>,- where?: FindOptionsWhere<T> | FindOptionsWhere<T>[],- entityManager?: WorkspaceEntityManager,- ): Promise<number | null> {- const manager = entityManager || this.manager;- const computedOptions = await this.transformOptions({ where });-- const permissionOptions = {- shouldBypassPermissionChecks: this.shouldBypassPermissionChecks,- objectRecordsPermissions: this.objectRecordsPermissions,- };-- return manager.sum(- this.target,- columnName,- computedOptions.where,- permissionOptions,- );- }-- override async average(- columnName: PickKeysByType<T, number>,- where?: FindOptionsWhere<T> | FindOptionsWhere<T>[],- entityManager?: WorkspaceEntityManager,- ): Promise<number | null> {- const manager = entityManager || this.manager;- const computedOptions = await this.transformOptions({ where });-- const permissionOptions = {- shouldBypassPermissionChecks: this.shouldBypassPermissionChecks,- objectRecordsPermissions: this.objectRecordsPermissions,- };-- return manager.average(- this.target,- columnName,- computedOptions.where,- permissionOptions,- );- }-- override async minimum(- columnName: PickKeysByType<T, number>,- where?: FindOptionsWhere<T> | FindOptionsWhere<T>[],- entityManager?: WorkspaceEntityManager,- ): Promise<number | null> {- const manager = entityManager || this.manager;- const computedOptions = await this.transformOptions({ where });-- const permissionOptions = {- shouldBypassPermissionChecks: this.shouldBypassPermissionChecks,- objectRecordsPermissions: this.objectRecordsPermissions,- };-- return manager.minimum(- this.target,- columnName,- computedOptions.where,- permissionOptions,- );- }-- override async maximum(- columnName: PickKeysByType<T, number>,- where?: FindOptionsWhere<T> | FindOptionsWhere<T>[],- entityManager?: WorkspaceEntityManager,- ): Promise<number | null> {- const manager = entityManager || this.manager;- const computedOptions = await this.transformOptions({ where });-- const permissionOptions = {- shouldBypassPermissionChecks: this.shouldBypassPermissionChecks,- objectRecordsPermissions: this.objectRecordsPermissions,- };-- return manager.maximum(- this.target,- columnName,- computedOptions.where,- permissionOptions,- );- }-- override async increment(- conditions: FindOptionsWhere<T>,- propertyPath: string,- value: number | string,- entityManager?: WorkspaceEntityManager,- selectedColumns?: string[],- ): Promise<UpdateResult> {- const manager = entityManager || this.manager;- const computedConditions = await this.transformOptions({- where: conditions,- });-- const permissionOptions = {- shouldBypassPermissionChecks: this.shouldBypassPermissionChecks,- objectRecordsPermissions: this.objectRecordsPermissions,- };-- return manager.increment(- this.target,- computedConditions.where,- propertyPath,- value,- permissionOptions,- selectedColumns,- );- }-- override async decrement(- conditions: FindOptionsWhere<T>,- propertyPath: string,- value: number | string,- entityManager?: WorkspaceEntityManager,- selectedColumns?: string[],- ): Promise<UpdateResult> {- const manager = entityManager || this.manager;- const computedConditions = await this.transformOptions({- where: conditions,- });-- const permissionOptions = {- shouldBypassPermissionChecks: this.shouldBypassPermissionChecks,- objectRecordsPermissions: this.objectRecordsPermissions,- };-- return manager.decrement(- this.target,- computedConditions.where,- propertyPath,- value,- permissionOptions,- selectedColumns,- );- }-- /**- * PRELOAD METHOD- */- override async preload<U extends DeepPartial<T>>(- entityLike: U,- entityManager?: WorkspaceEntityManager,- ): Promise<T | undefined> {- const manager = entityManager || this.manager;- const permissionOptions = {- shouldBypassPermissionChecks: this.shouldBypassPermissionChecks,- objectRecordsPermissions: this.objectRecordsPermissions,- };-- return manager.preload(this.target, entityLike, permissionOptions);- }-- /**- * CLEAR METHOD- */- override async clear(entityManager?: WorkspaceEntityManager): Promise<void> {- const manager = entityManager || this.manager;- const permissionOptions = {- shouldBypassPermissionChecks: this.shouldBypassPermissionChecks,- objectRecordsPermissions: this.objectRecordsPermissions,- };-- return manager.clear(this.target, permissionOptions);- }-- /**- * DEPRECATED AND RESTRICTED METHODS- */- override async query<TResult = unknown>(): Promise<TResult> {- throw new PermissionsException(- 'Method not allowed.',- PermissionsExceptionCode.RAW_SQL_NOT_ALLOWED,- );- }-- override async findByIds(): Promise<T[]> {- throw new Error(- 'findByIds is deprecated. Please use findBy with In operator instead.',- );- }-- override async findOneById(): Promise<T | null> {- throw new Error(- 'findOneById is deprecated. Please use findOneBy with id condition instead.',- );- }-- override async exist(): Promise<boolean> {- throw new Error('exist is deprecated. Please use exists method instead.');- }-- /**- * PRIVATE METHODS- */- private async getObjectMetadataFromTarget() {- return getObjectMetadataFromEntityTarget(this.target, this.internalContext);- }-- private async transformOptions<- U extends FindManyOptions<T> | FindOneOptions<T> | undefined,- >(options: U): Promise<U> {- if (!options) {- return options;- }-- const transformedOptions = { ...options };-- transformedOptions.where = await this.formatData(options.where);-- if (options.withDeleted) {- transformedOptions.withDeleted = true;- }-- return transformedOptions;- }-- private async formatData<T>(data: T): Promise<T> {- const objectMetadata = await this.getObjectMetadataFromTarget();-- return formatData(- data,- objectMetadata,- this.internalContext.flatFieldMetadataMaps,- ) as T;- }-}diff --git a/packages/twenty-server/src/engine/twenty-orm/twenty-orm.module.ts b/packages/twenty-server/src/engine/twenty-orm/twenty-orm.module.tsdeleted file mode 100644index 59d9e5c8adb..00000000000--- a/packages/twenty-server/src/engine/twenty-orm/twenty-orm.module.ts+++ /dev/null@@ -1,36 +0,0 @@-import { Global, Module } from '@nestjs/common';-import { TypeOrmModule } from '@nestjs/typeorm';--import { FeatureFlagModule } from 'src/engine/core-modules/feature-flag/feature-flag.module';-import { TwentyConfigModule } from 'src/engine/core-modules/twenty-config/twenty-config.module';-import { WorkspaceEntity } from 'src/engine/core-modules/workspace/workspace.entity';-import { WorkspaceManyOrAllFlatEntityMapsCacheModule } from 'src/engine/metadata-modules/flat-entity/services/workspace-many-or-all-flat-entity-maps-cache.module';-import { ObjectMetadataEntity } from 'src/engine/metadata-modules/object-metadata/object-metadata.entity';-import { PermissionsModule } from 'src/engine/metadata-modules/permissions/permissions.module';-import { RoleTargetEntity } from 'src/engine/metadata-modules/role-target/role-target.entity';-import { WorkspaceFeatureFlagsMapCacheModule } from 'src/engine/metadata-modules/workspace-feature-flags-map-cache/workspace-feature-flags-map-cache.module';-import { entitySchemaFactories } from 'src/engine/twenty-orm/factories';-import { EntitySchemaFactory } from 'src/engine/twenty-orm/factories/entity-schema.factory';-import { WorkspaceCacheStorageModule } from 'src/engine/workspace-cache-storage/workspace-cache-storage.module';-import { WorkspaceCacheModule } from 'src/engine/workspace-cache/workspace-cache.module';--@Global()-@Module({- imports: [- TypeOrmModule.forFeature([- ObjectMetadataEntity,- RoleTargetEntity,- WorkspaceEntity,- ]),- WorkspaceCacheStorageModule,- WorkspaceManyOrAllFlatEntityMapsCacheModule,- PermissionsModule,- WorkspaceFeatureFlagsMapCacheModule,- FeatureFlagModule,- TwentyConfigModule,- WorkspaceCacheModule,- ],- providers: [...entitySchemaFactories],- exports: [EntitySchemaFactory],-})-export class TwentyORMModule {}diff --git a/packages/twenty-server/src/engine/twenty-orm/utils/__tests__/apply-row-level-permission-predicates.util.spec.ts b/packages/twenty-server/src/engine/twenty-orm/utils/__tests__/apply-row-level-permission-predicates.util.spec.tsdeleted file mode 100644index 775e052f0a5..00000000000--- a/packages/twenty-server/src/engine/twenty-orm/utils/__tests__/apply-row-level-permission-predicates.util.spec.ts+++ /dev/null@@ -1,147 +0,0 @@-import { createWhereExpressionRecorder } from 'test/utils/create-where-expression-recorder.util';-import { FieldMetadataType } from 'twenty-shared/types';-import { type ObjectLiteral } from 'typeorm';--import { type FeatureFlagMap } from 'src/engine/core-modules/feature-flag/interfaces/feature-flag-map.interface';-import { type WorkspaceAuthContext } from 'src/engine/core-modules/auth/types/workspace-auth-context.type';-import { type FlatEntityMaps } from 'src/engine/metadata-modules/flat-entity/types/flat-entity-maps.type';-import { type FlatFieldMetadata } from 'src/engine/metadata-modules/flat-field-metadata/types/flat-field-metadata.type';-import { type FlatObjectMetadata } from 'src/engine/metadata-modules/flat-object-metadata/types/flat-object-metadata.type';-import { type WorkspaceInternalContext } from 'src/engine/twenty-orm/interfaces/workspace-internal-context.interface';-import { type WorkspaceSelectQueryBuilder } from 'src/engine/twenty-orm/repository/workspace-select-query-builder';-import { applyRowLevelPermissionPredicates } from 'src/engine/twenty-orm/utils/apply-row-level-permission-predicates.util';-import { buildRowLevelPermissionRecordFilter } from 'src/engine/twenty-orm/utils/build-row-level-permission-record-filter.util';--jest.mock(- 'src/engine/twenty-orm/utils/build-row-level-permission-record-filter.util',- () => ({- buildRowLevelPermissionRecordFilter: jest.fn(),- }),-);--jest.mock(- 'src/engine/twenty-orm/utils/resolve-role-ids-from-auth-context.util',- () => ({- resolveRoleIdsFromAuthContext: jest.fn(() => ['role-id']),- }),-);--const nameField = {- id: 'name-field-id',- name: 'name',- type: FieldMetadataType.TEXT,- universalIdentifier: 'name-field-universal-id',-} as FlatFieldMetadata;--const companyObjectMetadata = {- id: 'company-object-id',- nameSingular: 'company',- namePlural: 'companies',- fieldIds: [nameField.id],- universalIdentifier: 'company-object-universal-id',-} as FlatObjectMetadata;--const flatFieldMetadataMaps: FlatEntityMaps<FlatFieldMetadata> = {- byUniversalIdentifier: { [nameField.universalIdentifier]: nameField },- universalIdentifierById: { [nameField.id]: nameField.universalIdentifier },- universalIdentifiersByApplicationId: {},-};--const internalContext = {- flatFieldMetadataMaps,- flatRowLevelPermissionPredicateMaps: {},- flatRowLevelPermissionPredicateGroupMaps: {},- userWorkspaceRoleMap: {},- apiKeyRoleMap: {},-} as unknown as WorkspaceInternalContext;--const applyToFakeQueryBuilder = ({- queryType = 'select',- wheres = [],-}: {- queryType?: string;- wheres?: unknown[];-} = {}) => {- const recorder = createWhereExpressionRecorder();- const queryBuilder = Object.assign(recorder.whereExpression, {- expressionMap: { queryType, wheres },- objectRecordsPermissions: {},- }) as unknown as WorkspaceSelectQueryBuilder<ObjectLiteral>;-- applyRowLevelPermissionPredicates({- queryBuilder,- objectMetadata: companyObjectMetadata,- internalContext,- authContext: {} as WorkspaceAuthContext,- featureFlagMap: {} as FeatureFlagMap,- });-- return recorder.calls;-};--const getFirstLeafSql = (calls: ReturnType<typeof applyToFakeQueryBuilder>) => {- const groupNode = calls[0].node;-- if (groupNode.kind !== 'brackets') {- throw new Error('Expected the record filter to be wrapped in brackets');- }-- const leafNode = groupNode.children[0].node;-- if (leafNode.kind !== 'sql') {- throw new Error('Expected a sql leaf');- }-- return leafNode.sql;-};--describe('applyRowLevelPermissionPredicates', () => {- beforeEach(() => {- (buildRowLevelPermissionRecordFilter as jest.Mock).mockReturnValue({- name: { ilike: '%Visible%' },- });- });-- it('uses where when the query builder has no existing where clause', () => {- const calls = applyToFakeQueryBuilder({ wheres: [] });-- expect(calls).toHaveLength(1);- expect(calls[0].method).toBe('where');- expect(calls[0].node.kind).toBe('brackets');- });-- it('appends with andWhere so it never resets an existing where clause', () => {- const calls = applyToFakeQueryBuilder({ wheres: [{ type: 'simple' }] });-- expect(calls).toHaveLength(1);- expect(calls[0].method).toBe('andWhere');- });-- it('references the column through the table alias for a select query', () => {- expect(- getFirstLeafSql(applyToFakeQueryBuilder({ queryType: 'select' })),- ).toContain('"company"."name"');- });-- it.each(['update', 'delete', 'soft-delete'])(- 'references the column directly for a %s query',- (queryType) => {- const sql = getFirstLeafSql(applyToFakeQueryBuilder({ queryType }));-- expect(sql).toContain('"name"');- expect(sql).not.toContain('"company"."name"');- },- );-- it('emits nothing when there is no record filter', () => {- (buildRowLevelPermissionRecordFilter as jest.Mock).mockReturnValue(null);-- expect(applyToFakeQueryBuilder()).toEqual([]);- });-- it('emits nothing when the record filter is empty', () => {- (buildRowLevelPermissionRecordFilter as jest.Mock).mockReturnValue({});-- expect(applyToFakeQueryBuilder()).toEqual([]);- });-});diff --git a/packages/twenty-server/src/engine/twenty-orm/utils/__tests__/get-record-to-connect-fields.util.spec.ts b/packages/twenty-server/src/engine/twenty-orm/utils/__tests__/get-record-to-connect-fields.util.spec.tsdeleted file mode 100644index 7f01eac3cae..00000000000--- a/packages/twenty-server/src/engine/twenty-orm/utils/__tests__/get-record-to-connect-fields.util.spec.ts+++ /dev/null@@ -1,30 +0,0 @@-import {- type RelationConnectQueryConfig,- type UniqueConstraintCondition,-} from 'src/engine/twenty-orm/entity-manager/types/relation-connect-query-config.type';-import { getRecordToConnectFields } from 'src/engine/twenty-orm/utils/get-record-to-connect-fields.util';--describe('getRecordToConnectFields', () => {- it('should return the fields to connect', () => {- const connectQueryConfig = {- recordToConnectConditions: [- [- ['field1', 'value1'],- ['field2', 'value2'],- ] as UniqueConstraintCondition,- ],- targetObjectName: 'target',- relationFieldName: 'relationId',- connectFieldName: 'relation',- uniqueConstraintFields: [],- } as unknown as RelationConnectQueryConfig;-- const result = getRecordToConnectFields(connectQueryConfig);-- expect(result).toEqual([- '"target"."id"',- '"target"."field1"',- '"target"."field2"',- ]);- });-});diff --git a/packages/twenty-server/src/engine/twenty-orm/utils/apply-row-level-permission-predicates.util.ts b/packages/twenty-server/src/engine/twenty-orm/utils/apply-row-level-permission-predicates.util.tsdeleted file mode 100644index 8309485b150..00000000000--- a/packages/twenty-server/src/engine/twenty-orm/utils/apply-row-level-permission-predicates.util.ts+++ /dev/null@@ -1,92 +0,0 @@-/* @license Enterprise */--import { isDefined } from 'twenty-shared/utils';-import { Brackets, type ObjectLiteral } from 'typeorm';--import { type FeatureFlagMap } from 'src/engine/core-modules/feature-flag/interfaces/feature-flag-map.interface';-import { type WorkspaceInternalContext } from 'src/engine/twenty-orm/interfaces/workspace-internal-context.interface';--import { GraphqlQueryFilterFieldParser } from 'src/engine/api/graphql/graphql-query-runner/graphql-query-parsers/graphql-query-filter/graphql-query-filter-field.parser';-import { applyFilterEntriesToWhereExpression } from 'src/engine/api/graphql/graphql-query-runner/graphql-query-parsers/utils/apply-filter-entries-to-where-expression.util';-import { type WorkspaceAuthContext } from 'src/engine/core-modules/auth/types/workspace-auth-context.type';-import { type FlatObjectMetadata } from 'src/engine/metadata-modules/flat-object-metadata/types/flat-object-metadata.type';-import { type WorkspaceSelectQueryBuilder } from 'src/engine/twenty-orm/repository/workspace-select-query-builder';-import { resolveRowLevelPermissionRecordFilter } from 'src/engine/twenty-orm/utils/resolve-row-level-permission-record-filter.util';--type ApplyRowLevelPermissionPredicatesArgs<T extends ObjectLiteral> = {- queryBuilder: WorkspaceSelectQueryBuilder<T>;- objectMetadata: FlatObjectMetadata;- internalContext: WorkspaceInternalContext;- authContext: WorkspaceAuthContext;- featureFlagMap: FeatureFlagMap;-};--export const applyRowLevelPermissionPredicates = <T extends ObjectLiteral>({- queryBuilder,- objectMetadata,- internalContext,- authContext,- featureFlagMap: _featureFlagMap,-}: ApplyRowLevelPermissionPredicatesArgs<T>): void => {- const recordFilter = resolveRowLevelPermissionRecordFilter({- internalContext,- authContext,- objectMetadata,- });-- if (!isDefined(recordFilter)) {- return;- }-- const isUpdateOrDeleteQuery =- queryBuilder.expressionMap.queryType === 'update' ||- queryBuilder.expressionMap.queryType === 'soft-delete' ||- queryBuilder.expressionMap.queryType === 'delete';-- applyObjectRecordFilterToQueryBuilder({- queryBuilder,- objectNameSingular: objectMetadata.nameSingular,- recordFilter,- fieldParser: new GraphqlQueryFilterFieldParser(- objectMetadata,- internalContext.flatFieldMetadataMaps,- ),- useDirectTableReference: isUpdateOrDeleteQuery,- });-};--const applyObjectRecordFilterToQueryBuilder = <T extends ObjectLiteral>({- queryBuilder,- objectNameSingular,- recordFilter,- fieldParser,- useDirectTableReference = false,-}: {- queryBuilder: WorkspaceSelectQueryBuilder<T>;- objectNameSingular: string;- recordFilter: Record<string, unknown>;- fieldParser: GraphqlQueryFilterFieldParser;- useDirectTableReference?: boolean;-}): void => {- // The walker only uses the join surface, so widen back to ObjectLiteral here- // rather than threading the concrete T through every recursive call.- const outerQueryBuilderAsObjectLiteral =- queryBuilder as WorkspaceSelectQueryBuilder<ObjectLiteral>;-- const whereCondition = new Brackets((qb) => {- applyFilterEntriesToWhereExpression({- whereExpression: qb,- outerQueryBuilder: outerQueryBuilderAsObjectLiteral,- objectNameSingular,- filter: recordFilter,- fieldParser,- useDirectTableReference,- });- });-- if (queryBuilder.expressionMap.wheres.length === 0) {- queryBuilder.where(whereCondition);- } else {- queryBuilder.andWhere(whereCondition);- }-};diff --git a/packages/twenty-server/src/engine/twenty-orm/utils/compute-event-select-query-builder.util.ts b/packages/twenty-server/src/engine/twenty-orm/utils/compute-event-select-query-builder.util.tsdeleted file mode 100644index f58c6d37eff..00000000000--- a/packages/twenty-server/src/engine/twenty-orm/utils/compute-event-select-query-builder.util.ts+++ /dev/null@@ -1,59 +0,0 @@-import { type ObjectsPermissions } from 'twenty-shared/types';-import { type ObjectLiteral } from 'typeorm';-import { type QueryExpressionMap } from 'typeorm/query-builder/QueryExpressionMap';--import { type FeatureFlagMap } from 'src/engine/core-modules/feature-flag/interfaces/feature-flag-map.interface';-import { type WorkspaceInternalContext } from 'src/engine/twenty-orm/interfaces/workspace-internal-context.interface';--import { type WorkspaceAuthContext } from 'src/engine/core-modules/auth/types/workspace-auth-context.type';-import { type WorkspaceDeleteQueryBuilder } from 'src/engine/twenty-orm/repository/workspace-delete-query-builder';-import { type WorkspaceInsertQueryBuilder } from 'src/engine/twenty-orm/repository/workspace-insert-query-builder';-import { WorkspaceSelectQueryBuilder } from 'src/engine/twenty-orm/repository/workspace-select-query-builder';-import { type WorkspaceSoftDeleteQueryBuilder } from 'src/engine/twenty-orm/repository/workspace-soft-delete-query-builder';-import { type WorkspaceUpdateQueryBuilder } from 'src/engine/twenty-orm/repository/workspace-update-query-builder';--type EventSelectQueryBuilderFactoryArgs<T extends ObjectLiteral> = {- queryBuilder:- | WorkspaceUpdateQueryBuilder<T>- | WorkspaceSoftDeleteQueryBuilder<T>- | WorkspaceDeleteQueryBuilder<T>- | WorkspaceInsertQueryBuilder<T>;- authContext: WorkspaceAuthContext;- internalContext: WorkspaceInternalContext;- featureFlagMap: FeatureFlagMap;- expressionMap: QueryExpressionMap;- objectRecordsPermissions: ObjectsPermissions;-};--export const computeEventSelectQueryBuilder = <T extends ObjectLiteral>({- queryBuilder,- authContext,- featureFlagMap,- internalContext,- expressionMap,- objectRecordsPermissions,-}: EventSelectQueryBuilderFactoryArgs<T>): WorkspaceSelectQueryBuilder<T> => {- const eventSelectQueryBuilder = new WorkspaceSelectQueryBuilder(- queryBuilder as unknown as WorkspaceSelectQueryBuilder<T>,- objectRecordsPermissions,- internalContext,- true,- authContext,- featureFlagMap,- );-- eventSelectQueryBuilder.expressionMap.wheres = expressionMap.wheres;- eventSelectQueryBuilder.expressionMap.aliases = expressionMap.aliases;- eventSelectQueryBuilder.setParameters(expressionMap.parameters);-- if (- eventSelectQueryBuilder.expressionMap.selects.length === 0 &&- eventSelectQueryBuilder.expressionMap.mainAlias- ) {- eventSelectQueryBuilder.expressionMap.selects = [- { selection: eventSelectQueryBuilder.expressionMap.mainAlias.name },- ];- }-- return eventSelectQueryBuilder;-};diff --git a/packages/twenty-server/src/engine/twenty-orm/utils/determine-schema-relation-details.util.ts b/packages/twenty-server/src/engine/twenty-orm/utils/determine-schema-relation-details.util.tsdeleted file mode 100644index 5be82c5cc4d..00000000000--- a/packages/twenty-server/src/engine/twenty-orm/utils/determine-schema-relation-details.util.ts+++ /dev/null@@ -1,88 +0,0 @@-import {- type FieldMetadataType,- RelationType as TwentyRelationType,-} from 'twenty-shared/types';--import { type RelationType } from 'typeorm/metadata/types/RelationTypes';--import {- RelationException,- RelationExceptionCode,-} from 'src/engine/twenty-orm/exceptions/relation.exception';-import {- type EntitySchemaFieldMetadata,- type EntitySchemaFieldMetadataMaps,- type EntitySchemaObjectMetadataMaps,-} from 'src/engine/twenty-orm/global-workspace-datasource/types/entity-schema-metadata.type';-import { computeMorphOrRelationFieldJoinColumnName } from 'src/engine/metadata-modules/field-metadata/utils/compute-morph-or-relation-field-join-column-name.util';-import { converRelationTypeToTypeORMRelationType } from 'src/engine/twenty-orm/utils/convert-relation-type-to-typeorm-relation-type.util';--interface RelationDetails {- relationType: RelationType;- target: string;- inverseSide: string;- joinColumn: { name: string } | undefined;-}--export function determineSchemaRelationDetails(- fieldMetadata: EntitySchemaFieldMetadata<- FieldMetadataType.RELATION | FieldMetadataType.MORPH_RELATION- >,- objectMetadataMaps: EntitySchemaObjectMetadataMaps,- fieldMetadataMaps: EntitySchemaFieldMetadataMaps,-): RelationDetails {- if (!fieldMetadata.settings) {- throw new Error('Field metadata settings are missing');- }-- const relationType = converRelationTypeToTypeORMRelationType(- fieldMetadata.settings.relationType,- );-- if (!fieldMetadata.relationTargetObjectMetadataId) {- throw new RelationException(- 'Relation target object metadata ID is missing',- RelationExceptionCode.RELATION_OBJECT_METADATA_NOT_FOUND,- );- }-- const targetObjectMetadata =- objectMetadataMaps.byId[fieldMetadata.relationTargetObjectMetadataId];-- if (!targetObjectMetadata) {- throw new RelationException(- `Object metadata not found for field ${fieldMetadata.id}`,- RelationExceptionCode.RELATION_OBJECT_METADATA_NOT_FOUND,- );- }-- if (!fieldMetadata.relationTargetFieldMetadataId) {- throw new RelationException(- 'Relation target field metadata ID is missing',- RelationExceptionCode.RELATION_TARGET_FIELD_METADATA_ID_NOT_FOUND,- );- }-- const targetFieldMetadata =- fieldMetadataMaps.byId[fieldMetadata.relationTargetFieldMetadataId];-- if (!targetFieldMetadata) {- throw new Error('Target field metadata not found');- }-- const isManyToOne =- fieldMetadata.settings.relationType === TwentyRelationType.MANY_TO_ONE;-- return {- relationType,- target: targetObjectMetadata.nameSingular,- inverseSide: targetFieldMetadata.name,- joinColumn: isManyToOne- ? {- name: computeMorphOrRelationFieldJoinColumnName({- name: fieldMetadata.name,- }),- }- : undefined,- };-}diff --git a/packages/twenty-server/src/engine/twenty-orm/utils/get-record-to-connect-fields.util.ts b/packages/twenty-server/src/engine/twenty-orm/utils/get-record-to-connect-fields.util.tsdeleted file mode 100644index 8a74b4f4cba..00000000000--- a/packages/twenty-server/src/engine/twenty-orm/utils/get-record-to-connect-fields.util.ts+++ /dev/null@@ -1,12 +0,0 @@-import { type RelationConnectQueryConfig } from 'src/engine/twenty-orm/entity-manager/types/relation-connect-query-config.type';--export const getRecordToConnectFields = (- connectQueryConfig: RelationConnectQueryConfig,-) => {- return [- `"${connectQueryConfig.targetObjectName}"."id"`,- ...connectQueryConfig.recordToConnectConditions[0].map(([field]) => {- return `"${connectQueryConfig.targetObjectName}"."${field}"`;- }),- ];-};diff --git a/packages/twenty-server/src/engine/workspace-manager/dev-seeder/data/services/dev-seeder-data.service.ts b/packages/twenty-server/src/engine/workspace-manager/dev-seeder/data/services/dev-seeder-data.service.tsindex f7df36e4f19..b07e89c4f32 100644--- a/packages/twenty-server/src/engine/workspace-manager/dev-seeder/data/services/dev-seeder-data.service.ts+++ b/packages/twenty-server/src/engine/workspace-manager/dev-seeder/data/services/dev-seeder-data.service.ts@@ -6,14 +6,13 @@ import { join } from 'path';import { STANDARD_OBJECTS } from 'twenty-shared/metadata';import { FeatureFlagKey, FileFolder } from 'twenty-shared/types';-import { DataSource } from 'typeorm';+import { DataSource, type EntityManager } from 'typeorm';import { ApplicationService } from 'src/engine/core-modules/application/application.service';import { FileStorageService } from 'src/engine/core-modules/file-storage/services/file-storage.service';import { WorkspaceManyOrAllFlatEntityMapsCacheService } from 'src/engine/metadata-modules/flat-entity/services/workspace-many-or-all-flat-entity-maps-cache.service';import { FlatObjectMetadata } from 'src/engine/metadata-modules/flat-object-metadata/types/flat-object-metadata.type';import { ObjectMetadataService } from 'src/engine/metadata-modules/object-metadata/object-metadata.service';-import { type WorkspaceEntityManager } from 'src/engine/twenty-orm/entity-manager/workspace-entity-manager';import { computeObjectTargetTable } from 'src/engine/utils/compute-object-target-table.util';import {ATTACHMENT_DATA_SEED_COLUMNS,@@ -299,7 +298,7 @@ export class DevSeederDataService {generateAttachmentSeedsForWorkspace(workspaceId);await this.coreDataSource.transaction(- async (entityManager: WorkspaceEntityManager) => {+ async (entityManager: EntityManager) => {await this.seedRecordsInBatches({entityManager,schemaName,@@ -360,7 +359,7 @@ export class DevSeederDataService {objectMetadataItems,light = false,}: {- entityManager: WorkspaceEntityManager;+ entityManager: EntityManager;schemaName: string;workspaceId: string;attachmentSeeds: RecordSeedConfig['recordSeeds'];@@ -412,16 +411,14 @@ export class DevSeederDataService {pgColumns,recordSeeds,}: {- entityManager: WorkspaceEntityManager;+ entityManager: EntityManager;schemaName: string;tableName: string;pgColumns: string[];recordSeeds: Record<string, unknown>[];}) {await entityManager- .createQueryBuilder(undefined, undefined, undefined, {- shouldBypassPermissionChecks: true,- })+ .createQueryBuilder().insert().into(`${schemaName}.${tableName}`, pgColumns).orIgnore()@@ -431,7 +428,7 @@ export class DevSeederDataService {private async seedAttachmentFiles(workspaceId: string,- entityManager: WorkspaceEntityManager,+ entityManager: EntityManager,fileSeedMetadata: AttachmentFileSeedMetadata[],): Promise<void> {const IS_BUILT = __dirname.includes('/dist/');diff --git a/packages/twenty-server/src/engine/workspace-manager/dev-seeder/data/services/timeline-activity-seeder.service.ts b/packages/twenty-server/src/engine/workspace-manager/dev-seeder/data/services/timeline-activity-seeder.service.tsindex 99117510358..9f7c722c6b8 100644--- a/packages/twenty-server/src/engine/workspace-manager/dev-seeder/data/services/timeline-activity-seeder.service.ts+++ b/packages/twenty-server/src/engine/workspace-manager/dev-seeder/data/services/timeline-activity-seeder.service.ts@@ -4,6 +4,7 @@ import chunk from 'lodash.chunk';import { STANDARD_OBJECTS } from 'twenty-shared/metadata';import { ObjectRecord } from 'twenty-shared/types';import { capitalize, isDefined } from 'twenty-shared/utils';+import { type EntityManager } from 'typeorm';import { ObjectMetadataService } from 'src/engine/metadata-modules/object-metadata/object-metadata.service';import { TimelineActivityTypeCacheService } from 'src/modules/timeline/services/timeline-activity-type-cache.service';@@ -12,7 +13,6 @@ import {type ResolvedTimelineActivityType,} from 'src/modules/timeline/utils/resolve-timeline-activity-type.util';import { TimelineException } from 'src/modules/timeline/exceptions/timeline.exception';-import { type WorkspaceEntityManager } from 'src/engine/twenty-orm/entity-manager/workspace-entity-manager';import { CALENDAR_EVENT_DATA_SEEDS } from 'src/engine/workspace-manager/dev-seeder/data/constants/calendar-event-data-seeds.constant';import {CalendarEventParticipantDataSeed,@@ -133,7 +133,7 @@ export class TimelineActivitySeederService {schemaName,workspaceId,}: {- entityManager: WorkspaceEntityManager;+ entityManager: EntityManager;schemaName: string;workspaceId: string;}) {@@ -254,7 +254,7 @@ export class TimelineActivitySeederService {}private async insertTimelineActivities(- entityManager: WorkspaceEntityManager,+ entityManager: EntityManager,schemaName: string,timelineActivities: TimelineActivitySeedData[],) {@@ -267,9 +267,7 @@ export class TimelineActivitySeederService {for (const batch of timelineActivityBatches) {await entityManager- .createQueryBuilder(undefined, undefined, undefined, {- shouldBypassPermissionChecks: true,- })+ .createQueryBuilder().insert().into(`${schemaName}.timelineActivity`, ['id',diff --git a/packages/twenty-server/src/modules/blocklist/blocklist-validation-manager/blocklist-validation-manager.module.ts b/packages/twenty-server/src/modules/blocklist/blocklist-validation-manager/blocklist-validation-manager.module.tsindex 510ab0d1aa4..2f826f635cd 100644--- a/packages/twenty-server/src/modules/blocklist/blocklist-validation-manager/blocklist-validation-manager.module.ts+++ b/packages/twenty-server/src/modules/blocklist/blocklist-validation-manager/blocklist-validation-manager.module.ts@@ -1,14 +1,12 @@import { Module } from '@nestjs/common';import { ObjectMetadataRepositoryModule } from 'src/engine/object-metadata-repository/object-metadata-repository.module';-import { TwentyORMModule } from 'src/engine/twenty-orm/twenty-orm.module';import { BlocklistValidationService } from 'src/modules/blocklist/blocklist-validation-manager/services/blocklist-validation.service';import { BlocklistWorkspaceEntity } from 'src/modules/blocklist/standard-objects/blocklist.workspace-entity';@Module({imports: [ObjectMetadataRepositoryModule.forFeature([BlocklistWorkspaceEntity]),- TwentyORMModule,],providers: [BlocklistValidationService],exports: [BlocklistValidationService],diff --git a/packages/twenty-server/src/modules/connected-account/imap-api/imap-apis.module.ts b/packages/twenty-server/src/modules/connected-account/imap-api/imap-apis.module.tsindex cbd7e2a3b10..01af957afdf 100644--- a/packages/twenty-server/src/modules/connected-account/imap-api/imap-apis.module.ts+++ b/packages/twenty-server/src/modules/connected-account/imap-api/imap-apis.module.ts@@ -11,7 +11,6 @@ import { ConnectedAccountEntity } from 'src/engine/metadata-modules/connected-acimport { ConnectedAccountTokenEncryptionModule } from 'src/engine/metadata-modules/connected-account/services/connected-account-token-encryption.module';import { MessageChannelEntity } from 'src/engine/metadata-modules/message-channel/entities/message-channel.entity';import { ObjectMetadataEntity } from 'src/engine/metadata-modules/object-metadata/object-metadata.entity';-import { TwentyORMModule } from 'src/engine/twenty-orm/twenty-orm.module';import { WorkspaceEventEmitterModule } from 'src/engine/workspace-event-emitter/workspace-event-emitter.module';import { CalendarCommonModule } from 'src/modules/calendar/common/calendar-common.module';import { ConnectedAccountModule } from 'src/modules/connected-account/connected-account.module';@@ -31,7 +30,6 @@ import { MessagingFolderSyncManagerModule } from 'src/modules/messaging/message-MessageQueueModule,WorkspaceEventEmitterModule,TwentyConfigModule,- TwentyORMModule,FeatureFlagModule,AuthModule,CalendarCommonModule,diff --git a/packages/twenty-server/src/modules/contact-creation-manager/services/create-company-and-contact.service.ts b/packages/twenty-server/src/modules/contact-creation-manager/services/create-company-and-contact.service.tsindex a8dede6ae75..376df9dac64 100644--- a/packages/twenty-server/src/modules/contact-creation-manager/services/create-company-and-contact.service.ts+++ b/packages/twenty-server/src/modules/contact-creation-manager/services/create-company-and-contact.service.ts@@ -118,7 +118,7 @@ export class CreateCompanyAndPersonService {const alreadyCreatedPeople = await queryBuilder.orderBy('person.createdAt', 'ASC').withDeleted()- .getMany();+ .getMany<PersonWorkspaceEntity>();const {contactsThatNeedPersonCreate,diff --git a/packages/twenty-server/src/modules/contact-creation-manager/services/create-company.service.ts b/packages/twenty-server/src/modules/contact-creation-manager/services/create-company.service.tsindex f6110770078..dd553311ec7 100644--- a/packages/twenty-server/src/modules/contact-creation-manager/services/create-company.service.ts+++ b/packages/twenty-server/src/modules/contact-creation-manager/services/create-company.service.ts@@ -12,7 +12,7 @@ import { type DeepPartial, ILike } from 'typeorm';import { SecureHttpClientService } from 'src/engine/core-modules/secure-http-client/secure-http-client.service';import { GlobalWorkspaceOrmManager } from 'src/engine/twenty-orm/global-workspace-datasource/global-workspace-orm.manager';-import { type WorkspaceRepository } from 'src/engine/twenty-orm/repository/workspace.repository';+import { type WorkspaceRepositoryV2 } from 'src/engine/twenty-orm-v2/repository/workspace-repository-v2';import { buildSystemAuthContext } from 'src/engine/twenty-orm/utils/build-system-auth-context.util';import { CompanyWorkspaceEntity } from 'src/modules/company/standard-objects/company.workspace-entity';import { extractDomainFromLink } from 'src/modules/contact-creation-manager/utils/extract-domain-from-link.util';@@ -130,8 +130,6 @@ export class CreateCompanyService {},};}),- undefined,- ['domainNamePrimaryLinkUrl', 'id'],);const formattedRestoredCompanies = restoredCompanies.raw.map(@@ -233,7 +231,7 @@ export class CreateCompanyService {}private async getLastCompanyPosition(- companyRepository: WorkspaceRepository<CompanyWorkspaceEntity>,+ companyRepository: WorkspaceRepositoryV2<CompanyWorkspaceEntity>,): Promise<number> {const lastCompanyPosition = await companyRepository.maximum('position',diff --git a/packages/twenty-server/src/modules/contact-creation-manager/services/create-person.service.ts b/packages/twenty-server/src/modules/contact-creation-manager/services/create-person.service.tsindex eaad107477f..5f19afd803f 100644--- a/packages/twenty-server/src/modules/contact-creation-manager/services/create-person.service.ts+++ b/packages/twenty-server/src/modules/contact-creation-manager/services/create-person.service.ts@@ -4,7 +4,7 @@ import { type FullNameMetadata } from 'twenty-shared/types';import { DeepPartial } from 'typeorm';import { GlobalWorkspaceOrmManager } from 'src/engine/twenty-orm/global-workspace-datasource/global-workspace-orm.manager';-import { type WorkspaceRepository } from 'src/engine/twenty-orm/repository/workspace.repository';+import { type WorkspaceRepositoryV2 } from 'src/engine/twenty-orm-v2/repository/workspace-repository-v2';import { buildSystemAuthContext } from 'src/engine/twenty-orm/utils/build-system-auth-context.util';import { PersonWorkspaceEntity } from 'src/modules/person/standard-objects/person.workspace-entity';@@ -41,8 +41,6 @@ export class CreatePersonService {...person,position: lastPersonPosition + index,})),- undefined,- ['companyId', 'id'],);return createdPeople.raw;@@ -80,8 +78,6 @@ export class CreatePersonService {companyId,},})),- undefined,- ['companyId', 'id'],);return restoredPeople.raw;@@ -116,8 +112,6 @@ export class CreatePersonService {criteria: personId,partialEntity: { name },})),- undefined,- ['id'],);return enrichedPeople.raw;@@ -127,7 +121,7 @@ export class CreatePersonService {}private async getLastPersonPosition(- personRepository: WorkspaceRepository<PersonWorkspaceEntity>,+ personRepository: WorkspaceRepositoryV2<PersonWorkspaceEntity>,): Promise<number> {const lastPersonPosition = await personRepository.maximum('position',diff --git a/packages/twenty-server/src/modules/dashboard-sync/dashboard-sync.module.ts b/packages/twenty-server/src/modules/dashboard-sync/dashboard-sync.module.tsindex 9b9c5506a17..efcbb225f44 100644--- a/packages/twenty-server/src/modules/dashboard-sync/dashboard-sync.module.ts+++ b/packages/twenty-server/src/modules/dashboard-sync/dashboard-sync.module.ts@@ -1,11 +1,10 @@import { Module } from '@nestjs/common';import { WorkspaceManyOrAllFlatEntityMapsCacheModule } from 'src/engine/metadata-modules/flat-entity/services/workspace-many-or-all-flat-entity-maps-cache.module';-import { TwentyORMModule } from 'src/engine/twenty-orm/twenty-orm.module';import { DashboardSyncService } from 'src/modules/dashboard-sync/services/dashboard-sync.service';@Module({- imports: [TwentyORMModule, WorkspaceManyOrAllFlatEntityMapsCacheModule],+ imports: [WorkspaceManyOrAllFlatEntityMapsCacheModule],providers: [DashboardSyncService],exports: [DashboardSyncService],})diff --git a/packages/twenty-server/src/modules/dashboard/chart-data/chart-data.module.ts b/packages/twenty-server/src/modules/dashboard/chart-data/chart-data.module.tsindex 48b6eb9ab94..a40b7cc76c7 100644--- a/packages/twenty-server/src/modules/dashboard/chart-data/chart-data.module.ts+++ b/packages/twenty-server/src/modules/dashboard/chart-data/chart-data.module.ts@@ -3,7 +3,6 @@ import { Module } from '@nestjs/common';import { CoreCommonApiModule } from 'src/engine/api/common/core-common-api.module';import { WorkspaceManyOrAllFlatEntityMapsCacheModule } from 'src/engine/metadata-modules/flat-entity/services/workspace-many-or-all-flat-entity-maps-cache.module';import { PageLayoutWidgetModule } from 'src/engine/metadata-modules/page-layout-widget/page-layout-widget.module';-import { TwentyORMModule } from 'src/engine/twenty-orm/twenty-orm.module';import { BarChartDataResolver } from 'src/modules/dashboard/chart-data/resolvers/bar-chart-data.resolver';import { LineChartDataResolver } from 'src/modules/dashboard/chart-data/resolvers/line-chart-data.resolver';import { PieChartDataResolver } from 'src/modules/dashboard/chart-data/resolvers/pie-chart-data.resolver';@@ -18,7 +17,6 @@ import { PieChartDataService } from 'src/modules/dashboard/chart-data/services/pCoreCommonApiModule,PageLayoutWidgetModule,WorkspaceManyOrAllFlatEntityMapsCacheModule,- TwentyORMModule,],providers: [ChartDataQueryService,diff --git a/packages/twenty-server/src/modules/dashboard/dashboard.module.ts b/packages/twenty-server/src/modules/dashboard/dashboard.module.tsindex 7c25794cd7e..314a1894e41 100644--- a/packages/twenty-server/src/modules/dashboard/dashboard.module.ts+++ b/packages/twenty-server/src/modules/dashboard/dashboard.module.ts@@ -3,7 +3,6 @@ import { Module } from '@nestjs/common';import { ActorModule } from 'src/engine/core-modules/actor/actor.module';import { AuthModule } from 'src/engine/core-modules/auth/auth.module';import { PageLayoutModule } from 'src/engine/metadata-modules/page-layout/page-layout.module';-import { TwentyORMModule } from 'src/engine/twenty-orm/twenty-orm.module';import { WorkspaceCacheStorageModule } from 'src/engine/workspace-cache-storage/workspace-cache-storage.module';import { ChartDataModule } from 'src/modules/dashboard/chart-data/chart-data.module';import { DashboardController } from 'src/modules/dashboard/controllers/dashboard.controller';@@ -16,7 +15,6 @@ import { DashboardDuplicationService } from 'src/modules/dashboard/services/dashAuthModule,ChartDataModule,PageLayoutModule,- TwentyORMModule,WorkspaceCacheStorageModule,],controllers: [DashboardController],diff --git a/packages/twenty-server/src/modules/dashboard/query-hooks/dashboard-query-hook.module.ts b/packages/twenty-server/src/modules/dashboard/query-hooks/dashboard-query-hook.module.tsindex a3a1cf61c99..5557d827716 100644--- a/packages/twenty-server/src/modules/dashboard/query-hooks/dashboard-query-hook.module.ts+++ b/packages/twenty-server/src/modules/dashboard/query-hooks/dashboard-query-hook.module.ts@@ -2,7 +2,6 @@ import { Module } from '@nestjs/common';import { PageLayoutTabModule } from 'src/engine/metadata-modules/page-layout-tab/page-layout-tab.module';import { PageLayoutModule } from 'src/engine/metadata-modules/page-layout/page-layout.module';-import { TwentyORMModule } from 'src/engine/twenty-orm/twenty-orm.module';import { DashboardCreateManyPreQueryHook } from 'src/modules/dashboard/query-hooks/dashboard-create-many.pre-query.hook';import { DashboardCreateOnePreQueryHook } from 'src/modules/dashboard/query-hooks/dashboard-create-one.pre-query.hook';import { DashboardDestroyManyPreQueryHook } from 'src/modules/dashboard/query-hooks/dashboard-destroy-many.pre-query.hook';@@ -10,7 +9,7 @@ import { DashboardDestroyOnePreQueryHook } from 'src/modules/dashboard/query-hooimport { DashboardToPageLayoutSyncService } from 'src/modules/dashboard/services/dashboard-to-page-layout-sync.service';@Module({- imports: [PageLayoutModule, PageLayoutTabModule, TwentyORMModule],+ imports: [PageLayoutModule, PageLayoutTabModule],providers: [DashboardToPageLayoutSyncService,DashboardCreateOnePreQueryHook,diff --git a/packages/twenty-server/src/modules/dashboard/services/dashboard-duplication.service.ts b/packages/twenty-server/src/modules/dashboard/services/dashboard-duplication.service.tsindex c3c06d30cd2..9bc9dea163d 100644--- a/packages/twenty-server/src/modules/dashboard/services/dashboard-duplication.service.ts+++ b/packages/twenty-server/src/modules/dashboard/services/dashboard-duplication.service.ts@@ -6,7 +6,7 @@ import { ActorFromAuthContextService } from 'src/engine/core-modules/actor/serviimport { type WorkspaceAuthContext } from 'src/engine/core-modules/auth/types/workspace-auth-context.type';import { PageLayoutDuplicationService } from 'src/engine/metadata-modules/page-layout/services/page-layout-duplication.service';import { GlobalWorkspaceOrmManager } from 'src/engine/twenty-orm/global-workspace-datasource/global-workspace-orm.manager';-import { WorkspaceRepository } from 'src/engine/twenty-orm/repository/workspace.repository';+import { WorkspaceRepositoryV2 } from 'src/engine/twenty-orm-v2/repository/workspace-repository-v2';import { DuplicatedDashboardDTO } from 'src/modules/dashboard/dtos/duplicated-dashboard.dto';import {DashboardException,@@ -104,7 +104,7 @@ export class DashboardDuplicationService {private async createDuplicatedDashboard(originalDashboard: DashboardWorkspaceEntity,newPageLayoutId: string,- dashboardRepository: WorkspaceRepository<DashboardWorkspaceEntity>,+ dashboardRepository: WorkspaceRepositoryV2<DashboardWorkspaceEntity>,authContext: WorkspaceAuthContext,): Promise<DashboardWorkspaceEntity> {const newTitle = appendCopySuffix(originalDashboard.title ?? '');diff --git a/packages/twenty-server/src/modules/dashboard/tools/dashboard-tools.module.ts b/packages/twenty-server/src/modules/dashboard/tools/dashboard-tools.module.tsindex 133f893673b..824f35e71fa 100644--- a/packages/twenty-server/src/modules/dashboard/tools/dashboard-tools.module.ts+++ b/packages/twenty-server/src/modules/dashboard/tools/dashboard-tools.module.ts@@ -7,7 +7,6 @@ import { WorkspaceManyOrAllFlatEntityMapsCacheModule } from 'src/engine/metadataimport { PageLayoutTabModule } from 'src/engine/metadata-modules/page-layout-tab/page-layout-tab.module';import { PageLayoutWidgetModule } from 'src/engine/metadata-modules/page-layout-widget/page-layout-widget.module';import { PageLayoutModule } from 'src/engine/metadata-modules/page-layout/page-layout.module';-import { TwentyORMModule } from 'src/engine/twenty-orm/twenty-orm.module';import { DashboardToolWorkspaceService } from './services/dashboard-tool.workspace-service';@@ -18,7 +17,6 @@ import { DashboardToolWorkspaceService } from './services/dashboard-tool.workspaPageLayoutTabModule,PageLayoutWidgetModule,RecordPositionModule,- TwentyORMModule,ApplicationModule,WorkspaceManyOrAllFlatEntityMapsCacheModule,],diff --git a/packages/twenty-server/src/modules/match-participant/match-participant.service.ts b/packages/twenty-server/src/modules/match-participant/match-participant.service.tsindex d8c139e931f..f51a23ce75e 100644--- a/packages/twenty-server/src/modules/match-participant/match-participant.service.ts+++ b/packages/twenty-server/src/modules/match-participant/match-participant.service.ts@@ -143,7 +143,7 @@ export class MatchParticipantService<const people = await queryBuilder.orderBy('person.createdAt', 'ASC')- .getMany();+ .getMany<PersonWorkspaceEntity>();const workspaceMembers = await workspaceMemberRepository.find({where: {diff --git a/packages/twenty-server/src/modules/match-participant/utils/__tests__/add-person-email-filters-to-query-builder.util.spec.ts b/packages/twenty-server/src/modules/match-participant/utils/__tests__/add-person-email-filters-to-query-builder.util.spec.tsindex a359642b07b..495043a37d7 100644--- a/packages/twenty-server/src/modules/match-participant/utils/__tests__/add-person-email-filters-to-query-builder.util.spec.ts+++ b/packages/twenty-server/src/modules/match-participant/utils/__tests__/add-person-email-filters-to-query-builder.util.spec.ts@@ -1,8 +1,6 @@import { type EachTestingContext } from 'twenty-shared/testing';-import { type SelectQueryBuilder } from 'typeorm';-import { addPersonEmailFiltersToQueryBuilder } from 'src/modules/match-participant/utils/add-person-email-filters-to-query-builder';-import { type PersonWorkspaceEntity } from 'src/modules/person/standard-objects/person.workspace-entity';+import { type WorkspaceSelectQueryBuilderV2 } from 'src/engine/twenty-orm-v2/query-builder/workspace-select-query-builder-v2';type AddPersonEmailFiltersToQueryBuilderTestCase = EachTestingContext<{emails: string[];@@ -83,7 +81,7 @@ interface QueryBuilderCall {let queryBuilderCalls: QueryBuilderCall[] = [];-const mockQueryBuilder: Partial<SelectQueryBuilder<PersonWorkspaceEntity>> = {+const mockQueryBuilder: Partial<WorkspaceSelectQueryBuilderV2> = {select: jest.fn().mockImplementation((...args) => {queryBuilderCalls.push({ method: 'select', args });@@ -122,7 +120,7 @@ describe('addPersonEmailFiltersToQueryBuilder', () => {({ context: { emails, excludePersonIds, description } }) => {const result = addPersonEmailFiltersToQueryBuilder({queryBuilder:- mockQueryBuilder as SelectQueryBuilder<PersonWorkspaceEntity>,+ mockQueryBuilder as unknown as WorkspaceSelectQueryBuilderV2,emails,excludePersonIds,});diff --git a/packages/twenty-server/src/modules/match-participant/utils/add-person-email-filters-to-query-builder.ts b/packages/twenty-server/src/modules/match-participant/utils/add-person-email-filters-to-query-builder.tsindex a655c1d1501..286e4648887 100644--- a/packages/twenty-server/src/modules/match-participant/utils/add-person-email-filters-to-query-builder.ts+++ b/packages/twenty-server/src/modules/match-participant/utils/add-person-email-filters-to-query-builder.ts@@ -1,9 +1,7 @@-import { type SelectQueryBuilder } from 'typeorm';--import { type PersonWorkspaceEntity } from 'src/modules/person/standard-objects/person.workspace-entity';+import { type WorkspaceSelectQueryBuilderV2 } from 'src/engine/twenty-orm-v2/query-builder/workspace-select-query-builder-v2';export interface AddPersonEmailFiltersToQueryBuilderOptions {- queryBuilder: SelectQueryBuilder<PersonWorkspaceEntity>;+ queryBuilder: WorkspaceSelectQueryBuilderV2;emails: string[];excludePersonIds?: string[];}@@ -13,7 +11,7 @@ export function addPersonEmailFiltersToQueryBuilder({queryBuilder,emails,excludePersonIds = [],-}: AddPersonEmailFiltersToQueryBuilderOptions): SelectQueryBuilder<PersonWorkspaceEntity> {+}: AddPersonEmailFiltersToQueryBuilderOptions): WorkspaceSelectQueryBuilderV2 {const normalizedEmails = emails.map((email) => email.toLowerCase());queryBuilder = queryBuilderdiff --git a/packages/twenty-server/src/modules/messaging/message-cleaner/services/messaging-message-cleaner.service.ts b/packages/twenty-server/src/modules/messaging/message-cleaner/services/messaging-message-cleaner.service.tsindex 47757dc72a7..dfee43475d6 100644--- a/packages/twenty-server/src/modules/messaging/message-cleaner/services/messaging-message-cleaner.service.ts+++ b/packages/twenty-server/src/modules/messaging/message-cleaner/services/messaging-message-cleaner.service.ts@@ -5,7 +5,7 @@ import { isDefined } from 'twenty-shared/utils';import { In, MoreThan } from 'typeorm';import { GlobalWorkspaceOrmManager } from 'src/engine/twenty-orm/global-workspace-datasource/global-workspace-orm.manager';-import { type WorkspaceRepository } from 'src/engine/twenty-orm/repository/workspace.repository';+import { type WorkspaceRepositoryV2 } from 'src/engine/twenty-orm-v2/repository/workspace-repository-v2';import { buildSystemAuthContext } from 'src/engine/twenty-orm/utils/build-system-auth-context.util';import { type MessageChannelMessageAssociationWorkspaceEntity } from 'src/modules/messaging/common/standard-objects/message-channel-message-association.workspace-entity';import { type MessageThreadWorkspaceEntity } from 'src/modules/messaging/common/standard-objects/message-thread.workspace-entity';@@ -234,7 +234,7 @@ export class MessagingMessageCleanerService {}private async findReferencedMessageIds(- messageChannelMessageAssociationRepository: WorkspaceRepository<MessageChannelMessageAssociationWorkspaceEntity>,+ messageChannelMessageAssociationRepository: WorkspaceRepositoryV2<MessageChannelMessageAssociationWorkspaceEntity>,messageIds: string[],): Promise<string[]> {const associations = await messageChannelMessageAssociationRepository.find({@@ -246,7 +246,7 @@ export class MessagingMessageCleanerService {}private async findReferencedThreadIds(- messageRepository: WorkspaceRepository<MessageWorkspaceEntity>,+ messageRepository: WorkspaceRepositoryV2<MessageWorkspaceEntity>,threadIds: string[],): Promise<string[]> {const messages = await messageRepository.find({diff --git a/packages/twenty-server/src/modules/messaging/message-import-manager/services/messaging-delete-group-email-messages.service.ts b/packages/twenty-server/src/modules/messaging/message-import-manager/services/messaging-delete-group-email-messages.service.tsindex 6ad0dc35e9c..de011a6e035 100644--- a/packages/twenty-server/src/modules/messaging/message-import-manager/services/messaging-delete-group-email-messages.service.ts+++ b/packages/twenty-server/src/modules/messaging/message-import-manager/services/messaging-delete-group-email-messages.service.ts@@ -78,8 +78,8 @@ export class MessagingDeleteGroupEmailMessagesService {'message.messageParticipants','participant','participant.role = :role',- { role: MessageParticipantRole.FROM },)+ .setParameter('role', MessageParticipantRole.FROM).where('mcma.messageChannelId = :messageChannelId', {messageChannelId,})diff --git a/packages/twenty-server/src/modules/timeline/jobs/timeline-job.module.ts b/packages/twenty-server/src/modules/timeline/jobs/timeline-job.module.tsindex ea360127469..a89c30bb262 100644--- a/packages/twenty-server/src/modules/timeline/jobs/timeline-job.module.ts+++ b/packages/twenty-server/src/modules/timeline/jobs/timeline-job.module.ts@@ -1,11 +1,10 @@import { Module } from '@nestjs/common';-import { TwentyORMModule } from 'src/engine/twenty-orm/twenty-orm.module';import { UpsertTimelineActivityFromInternalEvent } from 'src/modules/timeline/jobs/upsert-timeline-activity-from-internal-event.job';import { TimelineActivityModule } from 'src/modules/timeline/timeline-activity.module';@Module({- imports: [TimelineActivityModule, TwentyORMModule],+ imports: [TimelineActivityModule],providers: [UpsertTimelineActivityFromInternalEvent],})export class TimelineJobModule {}diff --git a/packages/twenty-server/src/modules/timeline/repositories/timeline-activity.repository.ts b/packages/twenty-server/src/modules/timeline/repositories/timeline-activity.repository.tsindex cbcc7d9e390..40a9fd30659 100644--- a/packages/twenty-server/src/modules/timeline/repositories/timeline-activity.repository.ts+++ b/packages/twenty-server/src/modules/timeline/repositories/timeline-activity.repository.ts@@ -7,7 +7,7 @@ import { In, MoreThan, type ObjectLiteral } from 'typeorm';import { objectRecordDiffMerge } from 'src/engine/core-modules/event-emitter/utils/object-record-diff-merge';import { GlobalWorkspaceOrmManager } from 'src/engine/twenty-orm/global-workspace-datasource/global-workspace-orm.manager';import { type WorkspaceTransactionScope } from 'src/engine/twenty-orm/global-workspace-datasource/types/workspace-transaction-scope.type';-import { type WorkspaceRepository } from 'src/engine/twenty-orm/repository/workspace.repository';+import { type WorkspaceRepositoryV2 } from 'src/engine/twenty-orm-v2/repository/workspace-repository-v2';import { buildSystemAuthContext } from 'src/engine/twenty-orm/utils/build-system-auth-context.util';import { type TimelineActivityPayload } from 'src/modules/timeline/types/timeline-activity-payload';import {@@ -194,7 +194,7 @@ export class TimelineActivityRepository {objectSingularName,payloads,}: {- timelineActivityRepository: WorkspaceRepository<ObjectLiteral>;+ timelineActivityRepository: WorkspaceRepositoryV2<ObjectLiteral>;objectSingularName: string;payloads: TimelineActivityPayloadWorkspaceIdAndObjectSingularName['payloads'];}) {@@ -232,7 +232,7 @@ export class TimelineActivityRepository {objectSingularName,payloads,}: {- timelineActivityRepository: WorkspaceRepository<ObjectLiteral>;+ timelineActivityRepository: WorkspaceRepositoryV2<ObjectLiteral>;objectSingularName: string;payloads: TimelineActivityPayloadWorkspaceIdAndObjectSingularName['payloads'];}) {@@ -262,7 +262,7 @@ export class TimelineActivityRepository {timelineActivityRepository,merges,}: {- timelineActivityRepository: WorkspaceRepository<ObjectLiteral>;+ timelineActivityRepository: WorkspaceRepositoryV2<ObjectLiteral>;merges: {id: string;properties: Partial<ObjectRecord>;diff --git a/packages/twenty-server/src/modules/timeline/timeline-activity.module.ts b/packages/twenty-server/src/modules/timeline/timeline-activity.module.tsindex c598e087220..a42210ae3ea 100644--- a/packages/twenty-server/src/modules/timeline/timeline-activity.module.ts+++ b/packages/twenty-server/src/modules/timeline/timeline-activity.module.ts@@ -2,7 +2,6 @@ import { Module } from '@nestjs/common';import { WorkspaceManyOrAllFlatEntityMapsCacheModule } from 'src/engine/metadata-modules/flat-entity/services/workspace-many-or-all-flat-entity-maps-cache.module';import { ObjectMetadataRepositoryModule } from 'src/engine/object-metadata-repository/object-metadata-repository.module';-import { TwentyORMModule } from 'src/engine/twenty-orm/twenty-orm.module';import { TimelineActivityRoutingPlanService } from 'src/modules/timeline/services/timeline-activity-routing-plan.service';import { TimelineActivityTargetQueryService } from 'src/modules/timeline/services/timeline-activity-target-query.service';import { TimelineActivityTypeCacheService } from 'src/modules/timeline/services/timeline-activity-type-cache.service';@@ -14,7 +13,6 @@ import { TimelineActivityWorkspaceEntity } from 'src/modules/timeline/standard-oObjectMetadataRepositoryModule.forFeature([TimelineActivityWorkspaceEntity,]),- TwentyORMModule,WorkspaceManyOrAllFlatEntityMapsCacheModule,],providers: [diff --git a/packages/twenty-server/src/modules/workflow/common/workspace-services/workflow-common.workspace-service.ts b/packages/twenty-server/src/modules/workflow/common/workspace-services/workflow-common.workspace-service.tsindex 25e17fb550c..d01ff8372f8 100644--- a/packages/twenty-server/src/modules/workflow/common/workspace-services/workflow-common.workspace-service.ts+++ b/packages/twenty-server/src/modules/workflow/common/workspace-services/workflow-common.workspace-service.ts@@ -21,7 +21,7 @@ import {import { LogicFunctionFromSourceService } from 'src/engine/metadata-modules/logic-function/services/logic-function-from-source.service';import { type FlatLogicFunction } from 'src/engine/metadata-modules/logic-function/types/flat-logic-function.type';import { GlobalWorkspaceOrmManager } from 'src/engine/twenty-orm/global-workspace-datasource/global-workspace-orm.manager';-import { type WorkspaceRepository } from 'src/engine/twenty-orm/repository/workspace.repository';+import { type WorkspaceRepositoryV2 } from 'src/engine/twenty-orm-v2/repository/workspace-repository-v2';import { buildSystemAuthContext } from 'src/engine/twenty-orm/utils/build-system-auth-context.util';import {WorkflowCommonException,@@ -405,7 +405,7 @@ export class WorkflowCommonWorkspaceService {workspaceId,operation,}: {- workflowVersionRepository: WorkspaceRepository<WorkflowVersionWorkspaceEntity>;+ workflowVersionRepository: WorkspaceRepositoryV2<WorkflowVersionWorkspaceEntity>;workspaceId: string;workflowId: string;operation: 'restore' | 'delete' | 'destroy';@@ -497,7 +497,7 @@ export class WorkflowCommonWorkspaceService {workspaceId,operation,}: {- workflowVersionRepository: WorkspaceRepository<WorkflowVersionWorkspaceEntity>;+ workflowVersionRepository: WorkspaceRepositoryV2<WorkflowVersionWorkspaceEntity>;workflowId: string;workspaceId: string;operation: 'restore' | 'delete' | 'destroy';diff --git a/packages/twenty-server/src/modules/workflow/workflow-runner/workflow-run/workflow-run.workspace-service.ts b/packages/twenty-server/src/modules/workflow/workflow-runner/workflow-run/workflow-run.workspace-service.tsindex b4bcdbe653f..6447b60c070 100644--- a/packages/twenty-server/src/modules/workflow/workflow-runner/workflow-run/workflow-run.workspace-service.ts+++ b/packages/twenty-server/src/modules/workflow/workflow-runner/workflow-run/workflow-run.workspace-service.ts@@ -3,7 +3,6 @@ import { Injectable } from '@nestjs/common';import { type ActorMetadata } from 'twenty-shared/types';import { isDefined } from 'twenty-shared/utils';import { StepStatus, type WorkflowRunStepInfo } from 'twenty-shared/workflow';-import { type QueryDeepPartialEntity } from 'typeorm/query-builder/QueryPartialEntity';import { v4 } from 'uuid';import { WithLock } from 'src/engine/core-modules/cache-lock/with-lock.decorator';@@ -110,7 +109,7 @@ export class WorkflowRunWorkspaceService {where: {workflowId: workflow.id,},- order: { createdAt: 'desc' },+ order: { createdAt: 'DESC' },});const workflowRunCountMatch = lastWorkflowRun?.name?.match(/#(\d+)/);@@ -411,7 +410,7 @@ export class WorkflowRunWorkspaceService {}: {workflowRunId: string;workspaceId: string;- partialUpdate: QueryDeepPartialEntity<WorkflowRunWorkspaceEntity>;+ partialUpdate: Partial<WorkflowRunWorkspaceEntity>;}) {const authContext = buildSystemAuthContext(workspaceId);@@ -434,13 +433,7 @@ export class WorkflowRunWorkspaceService {);}- await workflowRunRepository.update(- workflowRunToUpdate.id,- partialUpdate,- undefined,- undefined,- ['id'],- );+ await workflowRunRepository.update(workflowRunToUpdate.id, partialUpdate);}, authContext);}diff --git a/packages/twenty-server/src/modules/workflow/workflow-status/jobs/workflow-statuses-update.job.ts b/packages/twenty-server/src/modules/workflow/workflow-status/jobs/workflow-statuses-update.job.tsindex 59a554f4477..0ea2245c6c2 100644--- a/packages/twenty-server/src/modules/workflow/workflow-status/jobs/workflow-statuses-update.job.ts+++ b/packages/twenty-server/src/modules/workflow/workflow-status/jobs/workflow-statuses-update.job.ts@@ -8,7 +8,7 @@ import { Process } from 'src/engine/core-modules/message-queue/decorators/procesimport { Processor } from 'src/engine/core-modules/message-queue/decorators/processor.decorator';import { MessageQueue } from 'src/engine/core-modules/message-queue/message-queue.constants';import { GlobalWorkspaceOrmManager } from 'src/engine/twenty-orm/global-workspace-datasource/global-workspace-orm.manager';-import { type WorkspaceRepository } from 'src/engine/twenty-orm/repository/workspace.repository';+import { type WorkspaceRepositoryV2 } from 'src/engine/twenty-orm-v2/repository/workspace-repository-v2';import { buildSystemAuthContext } from 'src/engine/twenty-orm/utils/build-system-auth-context.util';import {WorkflowVersionStatus,@@ -192,7 +192,7 @@ export class WorkflowStatusesUpdateJob {workflowVersionRepository,}: {workflowId: string;- workflowVersionRepository: WorkspaceRepository<WorkflowVersionWorkspaceEntity>;+ workflowVersionRepository: WorkspaceRepositoryV2<WorkflowVersionWorkspaceEntity>;}) {const workflowVersions = await workflowVersionRepository.find({where: {diff --git a/packages/twenty-server/src/modules/workflow/workflow-tools/tools/list-workflows.tool.ts b/packages/twenty-server/src/modules/workflow/workflow-tools/tools/list-workflows.tool.tsindex e9814c393b5..a0d5f510cc1 100644--- a/packages/twenty-server/src/modules/workflow/workflow-tools/tools/list-workflows.tool.ts+++ b/packages/twenty-server/src/modules/workflow/workflow-tools/tools/list-workflows.tool.ts@@ -61,7 +61,9 @@ export const createListWorkflowsTool = (.take(parameters.limit).skip(parameters.offset);- const [workflows, totalCount] = await queryBuilder.getManyAndCount();+ const workflows =+ await queryBuilder.getMany<WorkflowWorkspaceEntity>();+ const totalCount = await queryBuilder.getCount();return {success: true,diff --git a/packages/twenty-server/src/modules/workflow/workflow-trigger/workspace-services/workflow-trigger.workspace-service.ts b/packages/twenty-server/src/modules/workflow/workflow-trigger/workspace-services/workflow-trigger.workspace-service.tsindex 05146cd1a39..02c69c78422 100644--- a/packages/twenty-server/src/modules/workflow/workflow-trigger/workspace-services/workflow-trigger.workspace-service.ts+++ b/packages/twenty-server/src/modules/workflow/workflow-trigger/workspace-services/workflow-trigger.workspace-service.ts@@ -13,7 +13,7 @@ import { CommandMenuItemAvailabilityType } from 'src/engine/metadata-modules/comimport { EngineComponentKey } from 'src/engine/metadata-modules/command-menu-item/enums/engine-component-key.enum';import { type WorkspaceTransactionScope } from 'src/engine/twenty-orm/global-workspace-datasource/types/workspace-transaction-scope.type';import { GlobalWorkspaceOrmManager } from 'src/engine/twenty-orm/global-workspace-datasource/global-workspace-orm.manager';-import { type WorkspaceRepository } from 'src/engine/twenty-orm/repository/workspace.repository';+import { type WorkspaceRepositoryV2 } from 'src/engine/twenty-orm-v2/repository/workspace-repository-v2';import { buildSystemAuthContext } from 'src/engine/twenty-orm/utils/build-system-auth-context.util';import { WorkspaceEventEmitter } from 'src/engine/workspace-event-emitter/workspace-event-emitter';import { AutomatedTriggerType } from 'src/modules/workflow/common/standard-objects/workflow-automated-trigger.workspace-entity';@@ -269,7 +269,7 @@ export class WorkflowTriggerWorkspaceService {private async performActivationSteps(workflow: WorkflowWorkspaceEntity,workflowVersion: WorkflowVersionWorkspaceEntity,- workflowVersionRepository: WorkspaceRepository<WorkflowVersionWorkspaceEntity>,+ workflowVersionRepository: WorkspaceRepositoryV2<WorkflowVersionWorkspaceEntity>,workspaceId: string,) {const previousPublishedVersionId = workflow.lastPublishedVersionId;@@ -371,7 +371,7 @@ export class WorkflowTriggerWorkspaceService {private async performDeactivationSteps(workflowVersionId: string,- workflowVersionRepository: WorkspaceRepository<WorkflowVersionWorkspaceEntity>,+ workflowVersionRepository: WorkspaceRepositoryV2<WorkflowVersionWorkspaceEntity>,workspaceId: string,) {const workflowVersionNullable = await workflowVersionRepository.findOne({diff --git a/packages/twenty-server/src/modules/workspace-member/workspace-member.module.ts b/packages/twenty-server/src/modules/workspace-member/workspace-member.module.tsindex 3f1303c4bb7..c1774d85dc9 100644--- a/packages/twenty-server/src/modules/workspace-member/workspace-member.module.ts+++ b/packages/twenty-server/src/modules/workspace-member/workspace-member.module.ts@@ -2,11 +2,10 @@ import { Module } from '@nestjs/common';import { FeatureFlagModule } from 'src/engine/core-modules/feature-flag/feature-flag.module';import { FileModule } from 'src/engine/core-modules/file/file.module';-import { TwentyORMModule } from 'src/engine/twenty-orm/twenty-orm.module';import { WorkspaceMemberAvatarFileDeletionListener } from 'src/modules/workspace-member/listeners/workspace-member-avatar-file-deletion.listener';@Module({- imports: [TwentyORMModule, FeatureFlagModule, FileModule],+ imports: [FeatureFlagModule, FileModule],providers: [WorkspaceMemberAvatarFileDeletionListener],})diff --git a/packages/twenty-server/src/queue-worker/queue-worker.module.ts b/packages/twenty-server/src/queue-worker/queue-worker.module.tsindex 72c5f7c62e2..482faf7b716 100644--- a/packages/twenty-server/src/queue-worker/queue-worker.module.ts+++ b/packages/twenty-server/src/queue-worker/queue-worker.module.ts@@ -4,7 +4,6 @@ import { CoreEngineModule } from 'src/engine/core-modules/core-engine.module';import { JobsModule } from 'src/engine/core-modules/message-queue/jobs.module';import { MessageQueueModule } from 'src/engine/core-modules/message-queue/message-queue.module';import { GlobalWorkspaceDataSourceModule } from 'src/engine/twenty-orm/global-workspace-datasource/global-workspace-datasource.module';-import { TwentyORMModule } from 'src/engine/twenty-orm/twenty-orm.module';import { WorkspaceEventEmitterModule } from 'src/engine/workspace-event-emitter/workspace-event-emitter.module';@Module({@@ -13,7 +12,6 @@ import { WorkspaceEventEmitterModule } from 'src/engine/workspace-event-emitter/MessageQueueModule.registerExplorer(),WorkspaceEventEmitterModule,JobsModule,- TwentyORMModule,GlobalWorkspaceDataSourceModule,],})