The open alternative to Salesforce, designed for AI.
TypeScript crmcrm-systemcustomergood-first-issuegraphqlhacktoberfestjavascriptmarketingmonoreponestjsopen-sourcepostgresqlreactreactjssalestypescriptweb
Remove IS_ORM_V2_READ_PATH_ENABLED and collapse to the ORM v2 path (#24692)
Charles Bochet588ed9a4133e
diff --git a/.github/workflows/ci-server.yaml b/.github/workflows/ci-server.yamlindex 15c2bd4470c..2bbcbe2e8fe 100644--- a/.github/workflows/ci-server.yaml+++ b/.github/workflows/ci-server.yaml@@ -269,18 +269,6 @@ jobs:fail-fast: falsematrix:shard: [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16]- orm-v2: [false]- include:- - shard: 1- orm-v2: true- - shard: 2- orm-v2: true- - shard: 3- orm-v2: true- - shard: 4- orm-v2: true- - shard: 5- orm-v2: trueservices:postgres:image: postgres:18@@ -317,12 +305,6 @@ jobs:CLICKHOUSE_URL: "http://default:clickhousePassword@localhost:8123/twenty"CLICKHOUSE_PASSWORD: clickhousePasswordSHARD_COUNTER: 16- # The flagged run keeps every suite in one process (jest maxWorkers is 1)- # and its heap grows across suites, so it shards on suite count, not on- # the 16-way split the unflagged shards use.- ORM_V2_SHARD_COUNTER: 5- TEST_FORCED_FEATURE_FLAGS: ${{ matrix.orm-v2 && 'IS_ORM_V2_READ_PATH_ENABLED' || '' }}- ORM_V2_TEST_PATH_PATTERN: '(find-many|find-one|find-duplicates|group-by|composite-field-pagination|filter-by-relation-field|order-by-relation-field|nested-relation|soft-deleted-relation|relation-join-rls|object-records-permissions|merge-many|mutate-by-relation-field|mutation-relation-filter-rls|upsert|unique-field|object-generated|files-field|timeline-from-object-record|participant-matching)'steps:- name: Fetch custom Github Actions and base branch historyuses: actions/checkout@34e114876b0b11c390a56381ad16ebd13914f8d5 # v4.3.1@@ -361,12 +343,12 @@ jobs:tag: scope:backendtasks: 'test:integration'configuration: 'with-db-reset'- args: ${{ matrix.orm-v2 && format('--shard={0}/{1} --testPathPattern={2}', matrix.shard, env.ORM_V2_SHARD_COUNTER, env.ORM_V2_TEST_PATH_PATTERN) || format('--shard={0}/{1}', matrix.shard, env.SHARD_COUNTER) }}+ args: ${{ format('--shard={0}/{1}', matrix.shard, env.SHARD_COUNTER) }}# The secure-deployment suite boots the app as a production https# deployment (SERVER_URL is env-only, forced by its jest config), so it# cannot ride the main run. One shard is enough.- name: Server / Run secure-deployment integration tests- if: matrix.shard == 1 && !matrix.orm-v2+ if: matrix.shard == 1run: npx nx run twenty-server:test:integration:securecross-version-upgrade:diff --git a/packages/twenty-client-sdk/src/metadata/generated/schema.graphql b/packages/twenty-client-sdk/src/metadata/generated/schema.graphqlindex 1e9f559bf11..6a2123a947a 100644--- a/packages/twenty-client-sdk/src/metadata/generated/schema.graphql+++ b/packages/twenty-client-sdk/src/metadata/generated/schema.graphql@@ -1750,7 +1750,6 @@ enum FeatureFlagKey {IS_WORKFLOW_CORE_INDEX_PAGE_ENABLEDIS_WORKFLOW_DISPATCH_FROM_CORE_ENABLEDIS_NATIVE_CALL_RECORDING_TABS_ENABLED- IS_ORM_V2_READ_PATH_ENABLED}type WorkspaceUrls {diff --git a/packages/twenty-client-sdk/src/metadata/generated/schema.ts b/packages/twenty-client-sdk/src/metadata/generated/schema.tsindex 6bcf8de3d95..a8cbda62746 100644--- a/packages/twenty-client-sdk/src/metadata/generated/schema.ts+++ b/packages/twenty-client-sdk/src/metadata/generated/schema.ts@@ -1405,7 +1405,7 @@ export interface FeatureFlag {__typename: 'FeatureFlag'}-export type FeatureFlagKey = 'IS_APP_CLAIMING_ENABLED' | 'IS_UNIQUE_INDEXES_ENABLED' | 'IS_JSON_FILTER_ENABLED' | 'IS_CALENDAR_WEEK_VIEW_ENABLED' | 'IS_EMAIL_GROUP_ENABLED' | 'IS_JUNCTION_RELATIONS_ENABLED' | 'IS_LIST_VIEW_ENABLED' | 'IS_REST_METADATA_API_NEW_FORMAT_DIRECT' | 'IS_LOGIC_FUNCTION_PREBUILT_MODE_ENABLED' | 'IS_WORKFLOW_VERSION_IN_CORE_ENABLED' | 'IS_WORKFLOW_CORE_INDEX_PAGE_ENABLED' | 'IS_WORKFLOW_DISPATCH_FROM_CORE_ENABLED' | 'IS_NATIVE_CALL_RECORDING_TABS_ENABLED' | 'IS_ORM_V2_READ_PATH_ENABLED'+export type FeatureFlagKey = 'IS_APP_CLAIMING_ENABLED' | 'IS_UNIQUE_INDEXES_ENABLED' | 'IS_JSON_FILTER_ENABLED' | 'IS_CALENDAR_WEEK_VIEW_ENABLED' | 'IS_EMAIL_GROUP_ENABLED' | 'IS_JUNCTION_RELATIONS_ENABLED' | 'IS_LIST_VIEW_ENABLED' | 'IS_REST_METADATA_API_NEW_FORMAT_DIRECT' | 'IS_LOGIC_FUNCTION_PREBUILT_MODE_ENABLED' | 'IS_WORKFLOW_VERSION_IN_CORE_ENABLED' | 'IS_WORKFLOW_CORE_INDEX_PAGE_ENABLED' | 'IS_WORKFLOW_DISPATCH_FROM_CORE_ENABLED' | 'IS_NATIVE_CALL_RECORDING_TABS_ENABLED'export interface WorkspaceUrls {customUrl?: Scalars['String']@@ -9864,8 +9864,7 @@ export const enumFeatureFlagKey = {IS_WORKFLOW_VERSION_IN_CORE_ENABLED: 'IS_WORKFLOW_VERSION_IN_CORE_ENABLED' as const,IS_WORKFLOW_CORE_INDEX_PAGE_ENABLED: 'IS_WORKFLOW_CORE_INDEX_PAGE_ENABLED' as const,IS_WORKFLOW_DISPATCH_FROM_CORE_ENABLED: 'IS_WORKFLOW_DISPATCH_FROM_CORE_ENABLED' as const,- IS_NATIVE_CALL_RECORDING_TABS_ENABLED: 'IS_NATIVE_CALL_RECORDING_TABS_ENABLED' as const,- IS_ORM_V2_READ_PATH_ENABLED: 'IS_ORM_V2_READ_PATH_ENABLED' as const+ IS_NATIVE_CALL_RECORDING_TABS_ENABLED: 'IS_NATIVE_CALL_RECORDING_TABS_ENABLED' as const}export const enumIdentityProviderType = {diff --git a/packages/twenty-front/src/generated-admin/graphql.ts b/packages/twenty-front/src/generated-admin/graphql.tsindex 3c4a0998daa..dc9c5378cf1 100644--- a/packages/twenty-front/src/generated-admin/graphql.ts+++ b/packages/twenty-front/src/generated-admin/graphql.ts@@ -400,7 +400,6 @@ export enum FeatureFlagKey {IS_LIST_VIEW_ENABLED = 'IS_LIST_VIEW_ENABLED',IS_LOGIC_FUNCTION_PREBUILT_MODE_ENABLED = 'IS_LOGIC_FUNCTION_PREBUILT_MODE_ENABLED',IS_NATIVE_CALL_RECORDING_TABS_ENABLED = 'IS_NATIVE_CALL_RECORDING_TABS_ENABLED',- IS_ORM_V2_READ_PATH_ENABLED = 'IS_ORM_V2_READ_PATH_ENABLED',IS_REST_METADATA_API_NEW_FORMAT_DIRECT = 'IS_REST_METADATA_API_NEW_FORMAT_DIRECT',IS_UNIQUE_INDEXES_ENABLED = 'IS_UNIQUE_INDEXES_ENABLED',IS_WORKFLOW_CORE_INDEX_PAGE_ENABLED = 'IS_WORKFLOW_CORE_INDEX_PAGE_ENABLED',diff --git a/packages/twenty-front/src/generated-metadata/graphql.ts b/packages/twenty-front/src/generated-metadata/graphql.tsindex 6d4c8a5a72d..93539da7691 100644--- a/packages/twenty-front/src/generated-metadata/graphql.ts+++ b/packages/twenty-front/src/generated-metadata/graphql.ts@@ -1823,7 +1823,6 @@ export enum FeatureFlagKey {IS_LIST_VIEW_ENABLED = 'IS_LIST_VIEW_ENABLED',IS_LOGIC_FUNCTION_PREBUILT_MODE_ENABLED = 'IS_LOGIC_FUNCTION_PREBUILT_MODE_ENABLED',IS_NATIVE_CALL_RECORDING_TABS_ENABLED = 'IS_NATIVE_CALL_RECORDING_TABS_ENABLED',- IS_ORM_V2_READ_PATH_ENABLED = 'IS_ORM_V2_READ_PATH_ENABLED',IS_REST_METADATA_API_NEW_FORMAT_DIRECT = 'IS_REST_METADATA_API_NEW_FORMAT_DIRECT',IS_UNIQUE_INDEXES_ENABLED = 'IS_UNIQUE_INDEXES_ENABLED',IS_WORKFLOW_CORE_INDEX_PAGE_ENABLED = 'IS_WORKFLOW_CORE_INDEX_PAGE_ENABLED',diff --git a/packages/twenty-server/src/engine/api/common/common-nested-relations-processor/__tests__/process-nested-relations-v2.helper.spec.ts b/packages/twenty-server/src/engine/api/common/common-nested-relations-processor/__tests__/process-nested-relations-v2.helper.spec.tsdeleted file mode 100644index 656622b0c23..00000000000--- a/packages/twenty-server/src/engine/api/common/common-nested-relations-processor/__tests__/process-nested-relations-v2.helper.spec.ts+++ /dev/null@@ -1,188 +0,0 @@-import {- FieldMetadataType,- RelationType,- type ObjectRecord,-} from 'twenty-shared/types';-import { capitalize } from 'twenty-shared/utils';--import { ProcessNestedRelationsV2Helper } from 'src/engine/api/common/common-nested-relations-processor/process-nested-relations-v2.helper';-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 { getFlatFieldMetadataMock } from 'src/engine/metadata-modules/flat-field-metadata/__mocks__/get-flat-field-metadata.mock';-import { type FlatFieldMetadata } from 'src/engine/metadata-modules/flat-field-metadata/types/flat-field-metadata.type';-import { getFlatObjectMetadataMock } from 'src/engine/metadata-modules/flat-object-metadata/__mocks__/get-flat-object-metadata.mock';-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';--const MORPH_TARGET_NAMES = ['company', 'person', 'note', 'task'] as const;--type MorphTargetName = (typeof MORPH_TARGET_NAMES)[number];--const morphFieldName = (targetName: MorphTargetName) =>- `target${capitalize(targetName)}`;--const buildFlatEntityMaps = <- TEntity extends FlatObjectMetadata | FlatFieldMetadata,->(- entities: TEntity[],-): FlatEntityMaps<TEntity> => ({- byUniversalIdentifier: Object.fromEntries(- entities.map((entity) => [entity.universalIdentifier, entity]),- ),- universalIdentifierById: Object.fromEntries(- entities.map((entity) => [entity.id, entity.universalIdentifier]),- ),- universalIdentifiersByApplicationId: {},-});--const targetObjectByName = Object.fromEntries(- MORPH_TARGET_NAMES.map((targetName) => [- targetName,- getFlatObjectMetadataMock({- universalIdentifier: `${targetName}-object-universal-identifier`,- id: `${targetName}-object-id`,- nameSingular: targetName,- namePlural: `${targetName}s`,- }),- ]),-) as Record<MorphTargetName, FlatObjectMetadata>;--const timelineActivityObject = getFlatObjectMetadataMock({- universalIdentifier: 'timeline-activity-object-universal-identifier',- id: 'timeline-activity-object-id',- nameSingular: 'timelineActivity',- namePlural: 'timelineActivities',- fieldIds: MORPH_TARGET_NAMES.map((targetName) => `${targetName}-field-id`),-});--const morphFields = MORPH_TARGET_NAMES.map((targetName) =>- getFlatFieldMetadataMock({- universalIdentifier: `${targetName}-field-universal-identifier`,- id: `${targetName}-field-id`,- objectMetadataId: timelineActivityObject.id,- type: FieldMetadataType.MORPH_RELATION,- name: morphFieldName(targetName),- settings: {- relationType: RelationType.MANY_TO_ONE,- joinColumnName: `${morphFieldName(targetName)}Id`,- },- relationTargetObjectMetadataId: targetObjectByName[targetName].id,- relationTargetFieldMetadataId: `${targetName}-inverse-field-id`,- }),-);--const flatObjectMetadataMaps = buildFlatEntityMaps<FlatObjectMetadata>([- timelineActivityObject,- ...Object.values(targetObjectByName),-]);-const flatFieldMetadataMaps =- buildFlatEntityMaps<FlatFieldMetadata>(morphFields);--const relations = Object.fromEntries(- MORPH_TARGET_NAMES.map((targetName) => [morphFieldName(targetName), {}]),-);--const selectedFields = Object.fromEntries(- MORPH_TARGET_NAMES.map((targetName) => [- morphFieldName(targetName),- { id: true },- ]),-);--// Records which target object each relation query is actually sent against, so a-// test can assert on the number of round trips and not just on the returned data.-const buildDataSourceSpy = () => {- const queriedObjectNames: string[] = [];-- const workspaceDataSource = {- getRepository: (objectNameSingular: string) => ({- createQueryBuilder: () => {- const queryBuilder = {- setFindOptions: () => queryBuilder,- withDeleted: () => queryBuilder,- getFindOptions: () => ({ select: {} }),- where: () => queryBuilder,- take: () => queryBuilder,- getMany: async () => {- queriedObjectNames.push(objectNameSingular);-- return [];- },- };-- return queryBuilder;- },- }),- } as unknown as GlobalWorkspaceDataSource;-- return { workspaceDataSource, queriedObjectNames };-};--const processNestedRelations = async (- parentObjectRecords: ObjectRecord[],-): Promise<string[]> => {- const { workspaceDataSource, queriedObjectNames } = buildDataSourceSpy();-- await new ProcessNestedRelationsV2Helper().processNestedRelations({- flatObjectMetadataMaps,- flatFieldMetadataMaps,- parentObjectMetadataItem: timelineActivityObject,- parentObjectRecords,- relations,- limit: 60,- authContext: {} as WorkspaceAuthContext,- workspaceDataSource,- selectedFields,- });-- return queriedObjectNames.sort();-};--const buildParentRecord = (- id: string,- setTargets: Partial<Record<MorphTargetName, string>> = {},-): ObjectRecord =>- ({- id,- ...Object.fromEntries(- MORPH_TARGET_NAMES.map((targetName) => [- `${morphFieldName(targetName)}Id`,- setTargets[targetName] ?? null,- ]),- ),- }) as unknown as ObjectRecord;--describe('ProcessNestedRelationsV2Helper', () => {- it('should not query morph targets whose join column is null on every parent record', async () => {- const queriedObjectNames = await processNestedRelations([- buildParentRecord('record-1', { company: 'company-1' }),- buildParentRecord('record-2', { company: 'company-2' }),- ]);-- expect(queriedObjectNames).toEqual(['company']);- });-- it('should query every morph target that is set on at least one parent record', async () => {- const queriedObjectNames = await processNestedRelations([- buildParentRecord('record-1', { company: 'company-1' }),- buildParentRecord('record-2', { person: 'person-1' }),- ]);-- expect(queriedObjectNames).toEqual(['company', 'person']);- });-- it('should assign null to unset to-one relations rather than leaving them undefined', async () => {- const parentObjectRecords = [buildParentRecord('record-1')];-- const queriedObjectNames =- await processNestedRelations(parentObjectRecords);-- expect(queriedObjectNames).toEqual([]);- expect(parentObjectRecords[0]).toMatchObject({- targetCompany: null,- targetPerson: null,- targetNote: null,- targetTask: null,- });- });-});diff --git a/packages/twenty-server/src/engine/api/common/common-nested-relations-processor/process-nested-relations-v2.helper.ts b/packages/twenty-server/src/engine/api/common/common-nested-relations-processor/process-nested-relations-v2.helper.tsdeleted file mode 100644index a8ae248cbb9..00000000000--- a/packages/twenty-server/src/engine/api/common/common-nested-relations-processor/process-nested-relations-v2.helper.ts+++ /dev/null@@ -1,583 +0,0 @@-import { Injectable } from '@nestjs/common';--import { FieldMetadataType, type ObjectRecord } from 'twenty-shared/types';-import { isDefined, isValidUuid } from 'twenty-shared/utils';-import { type FindOptionsRelations, type ObjectLiteral } 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 {- type ConcurrencyLimiter,- createConcurrencyLimiter,-} from 'src/engine/api/common/common-nested-relations-processor/utils/create-concurrency-limiter.util';-import { getUniqueRelationIds } from 'src/engine/api/common/common-nested-relations-processor/utils/get-unique-relation-ids.util';-import { STANDARD_ERROR_MESSAGE } from 'src/engine/api/common/common-query-runners/errors/standard-error-message.constant';-import {- GraphqlQueryRunnerException,- GraphqlQueryRunnerExceptionCode,-} from 'src/engine/api/graphql/graphql-query-runner/errors/graphql-query-runner.exception';-import { ProcessAggregateHelper } from 'src/engine/api/graphql/graphql-query-runner/helpers/process-aggregate.helper';-import { buildColumnsToSelect } from 'src/engine/api/graphql/graphql-query-runner/utils/build-columns-to-select';-import { getTargetObjectMetadataOrThrow } from 'src/engine/api/graphql/graphql-query-runner/utils/get-target-object-metadata.util';-import { type AggregationField } from 'src/engine/api/graphql/workspace-schema-builder/utils/get-available-aggregations-from-object-fields.util';-import { type WorkspaceAuthContext } from 'src/engine/core-modules/auth/types/workspace-auth-context.type';-import { FlatEntityMaps } from 'src/engine/metadata-modules/flat-entity/types/flat-entity-maps.type';-import { findFlatEntityByIdInFlatEntityMaps } from 'src/engine/metadata-modules/flat-entity/utils/find-flat-entity-by-id-in-flat-entity-maps.util';-import { FlatFieldMetadata } from 'src/engine/metadata-modules/flat-field-metadata/types/flat-field-metadata.type';-import {- buildFieldMapsFromFlatObjectMetadata,- type FieldMapsForObject,-} from 'src/engine/metadata-modules/flat-field-metadata/utils/build-field-maps-from-flat-object-metadata.util';-import { FlatObjectMetadata } from 'src/engine/metadata-modules/flat-object-metadata/types/flat-object-metadata.type';-import { GlobalWorkspaceDataSource } from 'src/engine/twenty-orm/global-workspace-datasource/global-workspace-datasource';-import { type WorkspaceRepository } from 'src/engine/twenty-orm/repository/workspace.repository';-import { type WorkspaceSelectQueryBuilder } from 'src/engine/twenty-orm/repository/workspace-select-query-builder';-import { type RolePermissionConfig } from 'src/engine/twenty-orm/types/role-permission-config';-import { isFieldMetadataEntityOfType } from 'src/engine/utils/is-field-metadata-of-type.util';--const EMPTY_RELATION_SENTINEL_RECORD_ID =- '00000000-0000-0000-0000-000000000000';-const NESTED_RELATION_QUERY_MAX_CONCURRENCY = 4;--type ProcessNestedRelationsArgs<T extends ObjectRecord = ObjectRecord> = {- flatObjectMetadataMaps: FlatEntityMaps<FlatObjectMetadata>;- flatFieldMetadataMaps: FlatEntityMaps<FlatFieldMetadata>;- parentObjectMetadataItem: FlatObjectMetadata;- parentObjectRecords: T[];- // oxlint-disable-next-line typescript/no-explicit-any- parentObjectRecordsAggregatedValues?: Record<string, any>;- relations: Record<string, FindOptionsRelations<ObjectLiteral>>;- aggregate?: Record<string, AggregationField>;- limit: number;- authContext: WorkspaceAuthContext;- workspaceDataSource: GlobalWorkspaceDataSource;- rolePermissionConfig?: RolePermissionConfig;- // oxlint-disable-next-line typescript/no-explicit-any- selectedFields: Record<string, any>;-};--@Injectable()-export class ProcessNestedRelationsV2Helper {- constructor() {}-- public async processNestedRelations<T extends ObjectRecord = ObjectRecord>(- args: ProcessNestedRelationsArgs<T>,- ): Promise<void> {- await this.processNestedRelationsWithLimiter(- args,- createConcurrencyLimiter(NESTED_RELATION_QUERY_MAX_CONCURRENCY),- );- }-- private async processNestedRelationsWithLimiter<- T extends ObjectRecord = ObjectRecord,- >(- {- flatObjectMetadataMaps,- flatFieldMetadataMaps,- parentObjectMetadataItem,- parentObjectRecords,- parentObjectRecordsAggregatedValues = {},- relations,- aggregate = {},- limit,- authContext,- workspaceDataSource,- rolePermissionConfig,- selectedFields,- }: ProcessNestedRelationsArgs<T>,- relationQueryLimiter: ConcurrencyLimiter,- ): Promise<void> {- const processRelationTasks = Object.entries(relations).map(- ([sourceFieldName, nestedRelations]) =>- this.processRelation({- flatObjectMetadataMaps,- flatFieldMetadataMaps,- parentObjectMetadataItem,- parentObjectRecords,- parentObjectRecordsAggregatedValues,- sourceFieldName,- nestedRelations,- aggregate,- limit,- authContext,- workspaceDataSource,- rolePermissionConfig,- relationQueryLimiter,- selectedFields:- selectedFields[sourceFieldName] instanceof Object- ? selectedFields[sourceFieldName]- : undefined,- }),- );-- await Promise.all(processRelationTasks);- }-- private async processRelation<T extends ObjectRecord = ObjectRecord>({- flatObjectMetadataMaps,- flatFieldMetadataMaps,- parentObjectMetadataItem,- parentObjectRecords,- parentObjectRecordsAggregatedValues,- sourceFieldName,- nestedRelations,- aggregate,- limit,- authContext,- workspaceDataSource,- rolePermissionConfig,- relationQueryLimiter,- selectedFields,- }: {- flatObjectMetadataMaps: FlatEntityMaps<FlatObjectMetadata>;- flatFieldMetadataMaps: FlatEntityMaps<FlatFieldMetadata>;- parentObjectMetadataItem: FlatObjectMetadata;- parentObjectRecords: T[];- // oxlint-disable-next-line typescript/no-explicit-any- parentObjectRecordsAggregatedValues: Record<string, any>;- sourceFieldName: string;- nestedRelations: FindOptionsRelations<ObjectLiteral>;- aggregate: Record<string, AggregationField>;- limit: number;- authContext: WorkspaceAuthContext;- workspaceDataSource: GlobalWorkspaceDataSource;- rolePermissionConfig?: RolePermissionConfig;- relationQueryLimiter: ConcurrencyLimiter;- selectedFields: Record<string, unknown>;- }): Promise<void> {- const fieldMaps = buildFieldMapsFromFlatObjectMetadata(- flatFieldMetadataMaps,- parentObjectMetadataItem,- );-- const sourceFieldMetadata = findFlatEntityByIdInFlatEntityMaps({- flatEntityId: fieldMaps.fieldIdByName[sourceFieldName],- flatEntityMaps: flatFieldMetadataMaps,- });-- if (!sourceFieldMetadata) {- return;- }-- if (- !isFieldMetadataEntityOfType(- sourceFieldMetadata,- FieldMetadataType.RELATION,- ) &&- !isFieldMetadataEntityOfType(- sourceFieldMetadata,- FieldMetadataType.MORPH_RELATION,- )- ) {- // TODO: Maybe we should throw an error here ?- return;- }-- if (!sourceFieldMetadata.settings) {- throw new GraphqlQueryRunnerException(- `Relation settings not found for field ${sourceFieldName}`,- GraphqlQueryRunnerExceptionCode.RELATION_SETTINGS_NOT_FOUND,- { userFriendlyMessage: STANDARD_ERROR_MESSAGE },- );- }-- const relationType = sourceFieldMetadata.settings?.relationType;- const { targetRelationName, targetObjectMetadata, targetRelation } =- this.getTargetObjectMetadata({- flatObjectMetadataMaps,- flatFieldMetadataMaps,- parentObjectMetadataItem,- sourceFieldName,- fieldMaps,- });-- const targetObjectRepository = workspaceDataSource.getRepository(- targetObjectMetadata.nameSingular,- rolePermissionConfig,- );-- const targetObjectNameSingular = targetObjectMetadata.nameSingular;-- let targetObjectQueryBuilder = targetObjectRepository.createQueryBuilder(- targetObjectNameSingular,- );-- const columnsToSelect: Record<string, boolean> = buildColumnsToSelect({- select: selectedFields,- relations: nestedRelations,- flatObjectMetadata: targetObjectMetadata,- flatObjectMetadataMaps,- flatFieldMetadataMaps,- });-- if (relationType === RelationType.MANY_TO_ONE) {- columnsToSelect.deletedAt = true;- targetObjectQueryBuilder = targetObjectQueryBuilder.withDeleted();- }-- targetObjectQueryBuilder = targetObjectQueryBuilder.setFindOptions({- select: columnsToSelect,- });-- const joinColumnName = computeMorphOrRelationFieldJoinColumnName({- name: sourceFieldName,- });-- const relationIds = getUniqueRelationIds({- records: parentObjectRecords,- idField:- relationType === RelationType.ONE_TO_MANY ? 'id' : joinColumnName,- });-- if (- relationType === RelationType.ONE_TO_MANY &&- !isDefined(targetRelationName)- ) {- throw new GraphqlQueryRunnerException(- `Could not resolve target relation for one-to-many field ${sourceFieldName}`,- GraphqlQueryRunnerExceptionCode.RELATION_TARGET_OBJECT_METADATA_NOT_FOUND,- { userFriendlyMessage: STANDARD_ERROR_MESSAGE },- );- }-- const fieldMetadataTargetRelationColumnName =- computeMorphOrRelationFieldJoinColumnName({- name:- targetRelation &&- isFieldMetadataEntityOfType(- targetRelation,- FieldMetadataType.MORPH_RELATION,- )- ? targetRelation.name- : (targetRelationName as string),- });-- const { relationResults, relationAggregatedFieldsResult } =- await relationQueryLimiter(() =>- this.findRelations({- referenceQueryBuilder: targetObjectQueryBuilder,- targetObjectRepository,- column:- relationType === RelationType.ONE_TO_MANY- ? `"${fieldMetadataTargetRelationColumnName}"`- : 'id',- ids: relationIds,- relationType,- perParentLimit: limit,- parentRecordsCount: parentObjectRecords.length,- aggregate,- sourceFieldName,- targetObjectNameSingular,- }),- );-- this.assignRelationResults({- parentRecords: parentObjectRecords,- parentObjectRecordsAggregatedValues,- relationResults,- relationAggregatedFieldsResult,- sourceFieldName,- joinField:- relationType === RelationType.ONE_TO_MANY- ? `${fieldMetadataTargetRelationColumnName}`- : 'id',- joinColumnName,- relationType,- selectedFields,- });-- if (Object.keys(nestedRelations).length > 0) {- await this.processNestedRelationsWithLimiter(- {- flatObjectMetadataMaps,- flatFieldMetadataMaps,- parentObjectMetadataItem: targetObjectMetadata,- parentObjectRecords: relationResults as ObjectRecord[],- parentObjectRecordsAggregatedValues: relationAggregatedFieldsResult,- relations: nestedRelations as Record<- string,- FindOptionsRelations<ObjectLiteral>- >,- aggregate,- limit,- authContext,- workspaceDataSource,- rolePermissionConfig,- selectedFields,- },- relationQueryLimiter,- );- }- }-- private getTargetObjectMetadata({- flatObjectMetadataMaps,- flatFieldMetadataMaps,- parentObjectMetadataItem,- sourceFieldName,- fieldMaps,- }: {- flatObjectMetadataMaps: FlatEntityMaps<FlatObjectMetadata>;- flatFieldMetadataMaps: FlatEntityMaps<FlatFieldMetadata>;- parentObjectMetadataItem: FlatObjectMetadata;- sourceFieldName: string;- fieldMaps: FieldMapsForObject;- }) {- const targetFieldMetadata = findFlatEntityByIdInFlatEntityMaps({- flatEntityId: fieldMaps.fieldIdByName[sourceFieldName],- flatEntityMaps: flatFieldMetadataMaps,- });-- if (!targetFieldMetadata) {- throw new GraphqlQueryRunnerException(- `Field ${sourceFieldName} not found on object ${parentObjectMetadataItem.nameSingular}`,- GraphqlQueryRunnerExceptionCode.FIELD_NOT_FOUND,- { userFriendlyMessage: STANDARD_ERROR_MESSAGE },- );- }-- const targetObjectMetadata = getTargetObjectMetadataOrThrow(- targetFieldMetadata,- flatObjectMetadataMaps,- );-- if (- !targetFieldMetadata.relationTargetObjectMetadataId ||- !targetFieldMetadata.relationTargetFieldMetadataId- ) {- throw new GraphqlQueryRunnerException(- `Relation target object metadata id or field metadata id not found for field ${sourceFieldName}`,- GraphqlQueryRunnerExceptionCode.RELATION_TARGET_OBJECT_METADATA_NOT_FOUND,- { userFriendlyMessage: STANDARD_ERROR_MESSAGE },- );- }-- const targetRelation = findFlatEntityByIdInFlatEntityMaps({- flatEntityId: targetFieldMetadata.relationTargetFieldMetadataId,- flatEntityMaps: flatFieldMetadataMaps,- });-- const targetRelationName = targetRelation?.name;-- return { targetRelationName, targetObjectMetadata, targetRelation };- }-- private async findRelations({- referenceQueryBuilder,- targetObjectRepository,- column,- ids,- relationType,- perParentLimit,- parentRecordsCount,- aggregate,- sourceFieldName,- targetObjectNameSingular,- }: {- // oxlint-disable-next-line typescript/no-explicit-any- referenceQueryBuilder: WorkspaceSelectQueryBuilder<any>;- targetObjectRepository: WorkspaceRepository<ObjectLiteral>;- column: string;- // oxlint-disable-next-line typescript/no-explicit-any- ids: any[];- relationType: RelationType;- perParentLimit: number;- parentRecordsCount: number;- // oxlint-disable-next-line typescript/no-explicit-any- aggregate: Record<string, any>;- sourceFieldName: string;- targetObjectNameSingular: string;- // oxlint-disable-next-line typescript/no-explicit-any- }): Promise<{ relationResults: any[]; relationAggregatedFieldsResult: any }> {- if (ids.length === 0) {- return { relationResults: [], relationAggregatedFieldsResult: {} };- }-- const aggregateForRelation = aggregate[sourceFieldName];- // oxlint-disable-next-line typescript/no-explicit-any- let relationAggregatedFieldsResult: Record<string, any> = {};-- if (aggregateForRelation) {- const aggregateQueryBuilder = referenceQueryBuilder.clone();-- ProcessAggregateHelper.addSelectedAggregatedFieldsQueriesToQueryBuilder({- selectedAggregatedFields: aggregateForRelation,- queryBuilder: aggregateQueryBuilder,- objectMetadataNameSingular: targetObjectNameSingular,- });-- const aggregatedFieldsValues = await aggregateQueryBuilder- .addSelect(column)- .where(`${column} IN (:...ids)`, {- ids,- })- .groupBy(column)- .getRawMany();-- relationAggregatedFieldsResult = aggregatedFieldsValues.reduce(- (acc, item) => {- const columnWithoutQuotes = column.replace(/["']/g, '');- const key = item[columnWithoutQuotes];- const { [column]: _, ...itemWithoutColumn } = item;-- acc[key] = itemWithoutColumn;-- return acc;- },- {},- );- }-- const queryBuilderOptions = referenceQueryBuilder.getFindOptions();- const columnWithoutQuotes = column.replace(/["']/g, '');-- const findOptionsWithJoinColumn = {- ...queryBuilderOptions,- select: { ...queryBuilderOptions.select, [columnWithoutQuotes]: true },- };-- if (relationType !== RelationType.ONE_TO_MANY) {- const result = await referenceQueryBuilder- .setFindOptions(findOptionsWithJoinColumn)- .where(`${column} IN (:...ids)`, { ids })- .take(perParentLimit * parentRecordsCount)- .getMany();-- return { relationResults: result, relationAggregatedFieldsResult };- }-- const allowedRelationRecordIds =- await this.findRelationRecordIdsLimitedPerParent({- targetObjectRepository,- targetObjectNameSingular,- column,- ids,- perParentLimit,- });-- const recordIdsToHydrate =- allowedRelationRecordIds.length > 0- ? allowedRelationRecordIds- : [EMPTY_RELATION_SENTINEL_RECORD_ID];-- const result = await referenceQueryBuilder- .setFindOptions(findOptionsWithJoinColumn)- .where(`id IN (:...recordIdsToHydrate)`, {- recordIdsToHydrate,- })- .getMany();-- return { relationResults: result, relationAggregatedFieldsResult };- }-- private async findRelationRecordIdsLimitedPerParent({- targetObjectRepository,- targetObjectNameSingular,- column,- ids,- perParentLimit,- }: {- targetObjectRepository: WorkspaceRepository<ObjectLiteral>;- targetObjectNameSingular: string;- column: string;- ids: string[];- perParentLimit: number;- }): Promise<string[]> {- const sanitizedIds = ids.filter(isValidUuid);-- if (sanitizedIds.length === 0) {- return [];- }-- const perParentRecordIdsQueryBuilder = targetObjectRepository- .createQueryBuilder(targetObjectNameSingular)- .select('id', 'id')- .where(`${column} = "lateralParents"."parentId"`)- .limit(perParentLimit);-- perParentRecordIdsQueryBuilder.applyRowLevelPermissionPredicatesToMainAliasAndJoinedRelations();-- const perParentRecordIdsSql = perParentRecordIdsQueryBuilder.getQuery();-- const parentValues = sanitizedIds.map((id) => `('${id}'::uuid)`).join(', ');-- const lateralFromSubquery =- `(SELECT "lateralRecords"."id" AS "id" ` +- `FROM (VALUES ${parentValues}) AS "lateralParents"("parentId") ` +- `CROSS JOIN LATERAL (${perParentRecordIdsSql}) AS "lateralRecords")`;-- const limitedRecordsQueryBuilder = targetObjectRepository- .createQueryBuilder()- .from(lateralFromSubquery, 'limited_relation_records')- .select('limited_relation_records.id', 'id')- .setParameters(perParentRecordIdsQueryBuilder.getParameters());-- limitedRecordsQueryBuilder.expressionMap.aliases =- limitedRecordsQueryBuilder.expressionMap.aliases.filter((alias) =>- isDefined(alias.subQuery),- );-- const limitedRecords = await limitedRecordsQueryBuilder.getRawMany<{- id: string;- }>();-- return limitedRecords.map((limitedRecord) => limitedRecord.id);- }-- private assignRelationResults({- parentRecords,- parentObjectRecordsAggregatedValues,- relationResults,- relationAggregatedFieldsResult,- sourceFieldName,- joinField,- joinColumnName,- relationType,- selectedFields,- }: {- parentRecords: ObjectRecord[];- // oxlint-disable-next-line typescript/no-explicit-any- parentObjectRecordsAggregatedValues: Record<string, any>;- // oxlint-disable-next-line typescript/no-explicit-any- relationResults: any[];- // oxlint-disable-next-line typescript/no-explicit-any- relationAggregatedFieldsResult: Record<string, any>;- sourceFieldName: string;- joinField: string;- joinColumnName: string;- relationType: RelationType;- selectedFields: Record<string, unknown>;- }): void {- parentRecords.forEach((item) => {- if (relationType === RelationType.ONE_TO_MANY) {- item[sourceFieldName] = relationResults.filter(- (rel) => rel[joinField] === item.id,- );- } else {- const matchedRelation = relationResults.find(- (rel) => rel.id === item[joinColumnName],- );-- if (isDefined(matchedRelation?.deletedAt)) {- item[sourceFieldName] = null;- item[joinColumnName] = null;- } else if (isDefined(matchedRelation)) {- if (selectedFields?.deletedAt !== true) {- const { deletedAt: _, ...rest } = matchedRelation;-- item[sourceFieldName] = rest;- } else {- item[sourceFieldName] = matchedRelation;- }- } else {- item[sourceFieldName] = null;- }- }- });-- parentObjectRecordsAggregatedValues[sourceFieldName] =- relationAggregatedFieldsResult;- }-}diff --git a/packages/twenty-server/src/engine/api/common/common-nested-relations-processor/process-nested-relations.helper.ts b/packages/twenty-server/src/engine/api/common/common-nested-relations-processor/process-nested-relations.helper.tsindex 67c488e87af..174c869cfa7 100644--- a/packages/twenty-server/src/engine/api/common/common-nested-relations-processor/process-nested-relations.helper.ts+++ b/packages/twenty-server/src/engine/api/common/common-nested-relations-processor/process-nested-relations.helper.ts@@ -4,20 +4,17 @@ import { type ObjectRecord } from 'twenty-shared/types';import { type FindOptionsRelations, type ObjectLiteral } from 'typeorm';import { ProcessNestedRelationsOrmV2Helper } from 'src/engine/api/common/common-nested-relations-processor/process-nested-relations-orm-v2.helper';-import { ProcessNestedRelationsV2Helper } from 'src/engine/api/common/common-nested-relations-processor/process-nested-relations-v2.helper';import { type NestedRelationsReadPathOptions } from 'src/engine/api/common/types/nested-relations-read-path-options.type';import { type AggregationField } from 'src/engine/api/graphql/workspace-schema-builder/utils/get-available-aggregations-from-object-fields.util';import { type WorkspaceAuthContext } from 'src/engine/core-modules/auth/types/workspace-auth-context.type';import { FlatEntityMaps } from 'src/engine/metadata-modules/flat-entity/types/flat-entity-maps.type';import { FlatFieldMetadata } from 'src/engine/metadata-modules/flat-field-metadata/types/flat-field-metadata.type';import { FlatObjectMetadata } from 'src/engine/metadata-modules/flat-object-metadata/types/flat-object-metadata.type';-import { GlobalWorkspaceDataSource } from 'src/engine/twenty-orm/global-workspace-datasource/global-workspace-datasource';import { RolePermissionConfig } from 'src/engine/twenty-orm/types/role-permission-config';@Injectable()export class ProcessNestedRelationsHelper {constructor(- private readonly processNestedRelationsV2Helper: ProcessNestedRelationsV2Helper,private readonly processNestedRelationsOrmV2Helper: ProcessNestedRelationsOrmV2Helper,) {}@@ -31,10 +28,8 @@ export class ProcessNestedRelationsHelper {aggregate = {},limit,authContext,- workspaceDataSource,rolePermissionConfig,selectedFields,- isOrmV2ReadPathEnabled = false,useReplica = false,}: {flatObjectMetadataMaps: FlatEntityMaps<FlatObjectMetadata>;@@ -47,29 +42,11 @@ export class ProcessNestedRelationsHelper {aggregate?: Record<string, AggregationField>;limit: number;authContext: WorkspaceAuthContext;- workspaceDataSource: GlobalWorkspaceDataSource;rolePermissionConfig?: RolePermissionConfig;// oxlint-disable-next-line typescript/no-explicit-anyselectedFields: Record<string, any>;} & Partial<NestedRelationsReadPathOptions>): Promise<void> {- if (isOrmV2ReadPathEnabled) {- return this.processNestedRelationsOrmV2Helper.processNestedRelations({- flatObjectMetadataMaps,- flatFieldMetadataMaps,- parentObjectMetadataItem,- parentObjectRecords,- parentObjectRecordsAggregatedValues,- relations,- aggregate,- limit,- authContext,- useReplica,- rolePermissionConfig,- selectedFields,- });- }-- return this.processNestedRelationsV2Helper.processNestedRelations({+ return this.processNestedRelationsOrmV2Helper.processNestedRelations({flatObjectMetadataMaps,flatFieldMetadataMaps,parentObjectMetadataItem,@@ -79,7 +56,7 @@ export class ProcessNestedRelationsHelper {aggregate,limit,authContext,- workspaceDataSource,+ useReplica,rolePermissionConfig,selectedFields,});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 ba259455dd9..5ba13d4854a 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@@ -1,11 +1,7 @@import { Inject, Injectable } from '@nestjs/common';import { type PermissionFlagType } from 'twenty-shared/constants';-import {- FeatureFlagKey,- FieldMetadataType,- type ObjectRecord,-} from 'twenty-shared/types';+import { FieldMetadataType, type ObjectRecord } from 'twenty-shared/types';import { isDefined } from 'twenty-shared/utils';import { type ObjectLiteral } from 'typeorm';@@ -25,7 +21,6 @@ import {CommonQueryRunnerExceptionCode,} from 'src/engine/api/common/common-query-runners/errors/common-query-runner.exception';import { STANDARD_ERROR_MESSAGE } from 'src/engine/api/common/common-query-runners/errors/standard-error-message.constant';-import { buildMutationQueryBuilder } from 'src/engine/api/common/common-query-runners/utils/build-mutation-query-builder.util';import { buildMutationQueryBuilderV2 } from 'src/engine/api/common/common-query-runners/utils/build-mutation-query-builder-v2.util';import { CommonResultGettersService } from 'src/engine/api/common/common-result-getters/common-result-getters.service';import { CommonBaseQueryRunnerContext } from 'src/engine/api/common/types/common-base-query-runner-context.type';@@ -357,54 +352,32 @@ export abstract class CommonBaseQueryRunnerService<);}- const globalWorkspaceDataSource = this.isReadOnly- ? await this.globalWorkspaceOrmManager.getGlobalWorkspaceDataSourceReplica()- : await this.globalWorkspaceOrmManager.getGlobalWorkspaceDataSource();-- const repository = context.featureFlagsMap[- FeatureFlagKey.IS_ORM_V2_READ_PATH_ENABLED- ]- ? (this.workspaceDataSourceV2Service- .getDataSource({ useReplica: this.isReadOnly })- .getRepository(- queryRunnerContext.flatObjectMetadata.nameSingular,- rolePermissionConfig,- ) as unknown as WorkspaceRepository<ObjectLiteral>)- : globalWorkspaceDataSource.getRepository(- queryRunnerContext.flatObjectMetadata.nameSingular,- rolePermissionConfig,- );+ const repository = this.workspaceDataSourceV2Service+ .getDataSource({ useReplica: this.isReadOnly })+ .getRepository(+ queryRunnerContext.flatObjectMetadata.nameSingular,+ rolePermissionConfig,+ ) as unknown as WorkspaceRepository<ObjectLiteral>;return {...queryRunnerContext,authContext: context.authContext,- workspaceDataSource: globalWorkspaceDataSource,rolePermissionConfig,repository,featureFlagsMap: context.featureFlagsMap,};}- // Behind IS_ORM_V2_READ_PATH_ENABLED, reads go through the ORM v2 repository.- // useReplica follows isReadOnly so the v2 datasource matches the v1 one the- // base context already picked (replica for read-only runners, primary- // otherwise), keeping the root read and nested-relation loading consistent.+ // useReplica follows isReadOnly so reads on read-only runners hit the replica+ // and everything else the primary, keeping root read and nested-relation+ // loading consistent.protected getReadRepository({- repository,rolePermissionConfig,flatObjectMetadata,- featureFlagsMap,}: Pick<CommonExtendedQueryRunnerContext,- | 'repository'- | 'rolePermissionConfig'- | 'flatObjectMetadata'- | 'featureFlagsMap'- >): WorkspaceRepository<ObjectLiteral> | WorkspaceRepositoryV2 {- if (!featureFlagsMap[FeatureFlagKey.IS_ORM_V2_READ_PATH_ENABLED]) {- return repository;- }-+ 'rolePermissionConfig' | 'flatObjectMetadata'+ >): WorkspaceRepositoryV2 {this.metricsService.incrementCounterBy({key: MetricsKeys.OrmV2ReadPathUsed,amount: 1,@@ -448,77 +421,37 @@ export abstract class CommonBaseQueryRunnerService<kind: MutationKind;data?: Partial<ObjectRecord>;}): Promise<ObjectRecord[]> {- const {- repository,- flatObjectMetadata,- commonQueryParser,- featureFlagsMap,- } = queryRunnerContext;+ const { flatObjectMetadata, commonQueryParser } = queryRunnerContext;const alias = flatObjectMetadata.nameSingular;- const ormV2CanHandle =- featureFlagsMap[FeatureFlagKey.IS_ORM_V2_READ_PATH_ENABLED];-- if (ormV2CanHandle) {- const writeRepository = this.getWriteRepository(queryRunnerContext);-- const resolvedData =- kind === 'update' && isDefined(data)- ? (- await this.resolveNestedRelationsForOrmV2({- records: [data],- queryRunnerContext,- writeRepository,- })- )[0]- : data;-- const { selectQueryBuilder, rowLevelPermissionsApplied } =- buildMutationQueryBuilderV2({- repository: writeRepository,- alias,- filter,- commonQueryParser,- });-- return writeRepository.runMutation({- selectQueryBuilder,- rowLevelPermissionsApplied,- kind,- columnsToReturn,- data: resolvedData,+ const writeRepository = this.getWriteRepository(queryRunnerContext);++ const resolvedData =+ kind === 'update' && isDefined(data)+ ? (+ await this.resolveNestedRelationsForOrmV2({+ records: [data],+ queryRunnerContext,+ writeRepository,+ })+ )[0]+ : data;++ const { selectQueryBuilder, rowLevelPermissionsApplied } =+ buildMutationQueryBuilderV2({+ repository: writeRepository,+ alias,+ filter,+ commonQueryParser,});- }- const queryBuilder = buildMutationQueryBuilder({- repository,- alias,- filter,- commonQueryParser,+ return writeRepository.runMutation({+ selectQueryBuilder,+ rowLevelPermissionsApplied,+ kind,+ columnsToReturn,+ data: resolvedData,});-- if (kind === 'update') {- const result = await queryBuilder- .update()- .set(data ?? {})- .returning(columnsToReturn)- .execute();-- return result.generatedMaps as ObjectRecord[];- }-- const mutationQueryBuilder =- kind === 'soft-delete'- ? queryBuilder.softDelete()- : kind === 'restore'- ? queryBuilder.restore()- : queryBuilder.delete();-- const result = await mutationQueryBuilder- .returning(columnsToReturn)- .execute();-- return result.generatedMaps as ObjectRecord[];}protected async resolveNestedRelationsForOrmV2({@@ -607,15 +540,8 @@ export abstract class CommonBaseQueryRunnerService<});}- protected getNestedRelationsReadPathOptions({- featureFlagsMap,- }: Pick<- CommonExtendedQueryRunnerContext,- 'featureFlagsMap'- >): NestedRelationsReadPathOptions {+ protected getNestedRelationsReadPathOptions(): NestedRelationsReadPathOptions {return {- isOrmV2ReadPathEnabled:- featureFlagsMap[FeatureFlagKey.IS_ORM_V2_READ_PATH_ENABLED],useReplica: this.isReadOnly,};}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 f9014677a8a..1a79efd255e 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@@ -2,7 +2,7 @@ import { Injectable } from '@nestjs/common';import { msg } from '@lingui/core/macro';import { QUERY_MAX_RECORDS } from 'twenty-shared/constants';-import { FeatureFlagKey, ObjectRecord } from 'twenty-shared/types';+import { ObjectRecord } from 'twenty-shared/types';import { isDefined } from 'twenty-shared/utils';import {Brackets,@@ -46,7 +46,6 @@ 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 { GlobalWorkspaceDataSource } from 'src/engine/twenty-orm/global-workspace-datasource/global-workspace-datasource';import { WorkspaceRepository } from 'src/engine/twenty-orm/repository/workspace.repository';import { RolePermissionConfig } from 'src/engine/twenty-orm/types/role-permission-config';@@ -83,7 +82,6 @@ export class CommonCreateManyQueryRunnerService extends CommonBaseQueryRunnerSerflatObjectMetadataMaps,flatFieldMetadataMaps,flatIndexMaps,- workspaceDataSource,} = queryRunnerContext;if (!isDefined(flatIndexMaps)) {@@ -121,10 +119,8 @@ export class CommonCreateManyQueryRunnerService extends CommonBaseQueryRunnerSerflatObjectMetadataMaps,flatFieldMetadataMaps,authContext,- workspaceDataSource,rolePermissionConfig,- nestedRelationsReadPathOptions:- this.getNestedRelationsReadPathOptions(queryRunnerContext),+ nestedRelationsReadPathOptions: this.getNestedRelationsReadPathOptions(),});return upsertedRecords;@@ -137,7 +133,6 @@ export class CommonCreateManyQueryRunnerService extends CommonBaseQueryRunnerSerflatObjectMetadataMaps,flatFieldMetadataMaps,authContext,- workspaceDataSource,rolePermissionConfig,nestedRelationsReadPathOptions,}: {@@ -147,7 +142,6 @@ export class CommonCreateManyQueryRunnerService extends CommonBaseQueryRunnerSerflatObjectMetadataMaps: FlatEntityMaps<FlatObjectMetadata>;flatFieldMetadataMaps: FlatEntityMaps<FlatFieldMetadata>;authContext: WorkspaceAuthContext;- workspaceDataSource: GlobalWorkspaceDataSource;rolePermissionConfig?: RolePermissionConfig;nestedRelationsReadPathOptions: NestedRelationsReadPathOptions;}): Promise<void> {@@ -166,7 +160,6 @@ export class CommonCreateManyQueryRunnerService extends CommonBaseQueryRunnerSer>,limit: QUERY_MAX_RECORDS,authContext,- workspaceDataSource,rolePermissionConfig,selectedFields: args.selectedFieldsResult.select,...nestedRelationsReadPathOptions,@@ -242,25 +235,16 @@ export class CommonCreateManyQueryRunnerService extends CommonBaseQueryRunnerSerflatFieldMetadataMaps,});- const ormV2CanHandle =- queryRunnerContext.featureFlagsMap[- FeatureFlagKey.IS_ORM_V2_READ_PATH_ENABLED- ];-- if (ormV2CanHandle) {- const writeRepository = this.getWriteRepository(queryRunnerContext);-- return writeRepository.runInsert({- records: await this.resolveNestedRelationsForOrmV2({- records: args.data,- queryRunnerContext,- writeRepository,- }),- columnsToReturn: selectedColumns,- });- }+ const writeRepository = this.getWriteRepository(queryRunnerContext);- return await repository.insert(args.data, undefined, selectedColumns);+ return writeRepository.runInsert({+ records: await this.resolveNestedRelationsForOrmV2({+ records: args.data,+ queryRunnerContext,+ writeRepository,+ }),+ columnsToReturn: selectedColumns,+ });}return this.performUpsertOperation({@@ -308,10 +292,6 @@ export class CommonCreateManyQueryRunnerService extends CommonBaseQueryRunnerSerflatFieldMetadataMaps,args,conflictingFieldGroups,- isOrmV2Enabled:- queryRunnerContext.featureFlagsMap[- FeatureFlagKey.IS_ORM_V2_READ_PATH_ENABLED- ],});const { recordsToUpdate, recordsToInsert } = categorizeRecords(@@ -344,7 +324,6 @@ export class CommonCreateManyQueryRunnerService extends CommonBaseQueryRunnerSerif (recordsToUpdate.length > 0) {await this.processRecordsToUpdate({partialRecordsToUpdate: recordsToUpdate,- repository,flatObjectMetadata,flatFieldMetadataMaps,result,@@ -355,7 +334,6 @@ export class CommonCreateManyQueryRunnerService extends CommonBaseQueryRunnerSerawait this.processRecordsToInsert({recordsToInsert: recordsToInsertWithPosition,- repository,result,columnsToReturn,queryRunnerContext,@@ -402,14 +380,12 @@ export class CommonCreateManyQueryRunnerService extends CommonBaseQueryRunnerSerflatFieldMetadataMaps,args,conflictingFieldGroups,- isOrmV2Enabled,}: {repository: WorkspaceRepository<ObjectLiteral>;flatObjectMetadata: FlatObjectMetadata;flatFieldMetadataMaps: FlatEntityMaps<FlatFieldMetadata>;args: CreateManyQueryArgs;conflictingFieldGroups: ConflictingFieldGroup[];- isOrmV2Enabled: boolean;}): Promise<PartialObjectRecordWithId[]> {const queryBuilder = repository.createQueryBuilder(flatObjectMetadata.nameSingular,@@ -424,23 +400,17 @@ export class CommonCreateManyQueryRunnerService extends CommonBaseQueryRunnerSerreturn [];}- if (isOrmV2Enabled) {- queryBuilder.andWhere(- new Brackets((qb) => {- whereConditions.forEach((condition, index) => {- if (index === 0) {- qb.where(condition);- } else {- qb.orWhere(condition);- }- });- }),- );- } else {- whereConditions.forEach((condition) => {- queryBuilder.orWhere(condition);- });- }+ queryBuilder.andWhere(+ new Brackets((qb) => {+ whereConditions.forEach((condition, index) => {+ if (index === 0) {+ qb.where(condition);+ } else {+ qb.orWhere(condition);+ }+ });+ }),+ );const restrictedFields =repository.objectRecordsPermissions?.[flatObjectMetadata.id]@@ -464,7 +434,6 @@ export class CommonCreateManyQueryRunnerService extends CommonBaseQueryRunnerSerprivate async processRecordsToUpdate({partialRecordsToUpdate,- repository,flatObjectMetadata,flatFieldMetadataMaps,result,@@ -472,7 +441,6 @@ export class CommonCreateManyQueryRunnerService extends CommonBaseQueryRunnerSerqueryRunnerContext,}: {partialRecordsToUpdate: PartialObjectRecordWithId[];- repository: WorkspaceRepository<ObjectLiteral>;flatObjectMetadata: FlatObjectMetadata;flatFieldMetadataMaps: FlatEntityMaps<FlatFieldMetadata>;result: InsertResult;@@ -492,38 +460,20 @@ export class CommonCreateManyQueryRunnerService extends CommonBaseQueryRunnerSerdata: { ...record, deletedAt: null },}));- const ormV2CanHandle =- queryRunnerContext.featureFlagsMap[- FeatureFlagKey.IS_ORM_V2_READ_PATH_ENABLED- ];-- let savedRecords;-- if (ormV2CanHandle) {- const writeRepository = this.getWriteRepository(queryRunnerContext);- const resolvedData = await this.resolveNestedRelationsForOrmV2({- records: updateInputs.map((input) => input.data),- queryRunnerContext,- writeRepository,- });+ const writeRepository = this.getWriteRepository(queryRunnerContext);+ const resolvedData = await this.resolveNestedRelationsForOrmV2({+ records: updateInputs.map((input) => input.data),+ queryRunnerContext,+ writeRepository,+ });- savedRecords = await writeRepository.runBatchUpdate({- inputs: updateInputs.map((input, index) => ({- id: input.id,- data: resolvedData[index],- })),- columnsToReturn,- });- } else {- savedRecords = await repository.updateMany(- updateInputs.map((input) => ({- criteria: input.id,- partialEntity: input.data,- })),- undefined,- columnsToReturn,- );- }+ const savedRecords = await writeRepository.runBatchUpdate({+ inputs: updateInputs.map((input, index) => ({+ id: input.id,+ data: resolvedData[index],+ })),+ columnsToReturn,+ });result.identifiers.push(...savedRecords.generatedMaps.map((record) => ({ id: record.id })),@@ -535,13 +485,11 @@ export class CommonCreateManyQueryRunnerService extends CommonBaseQueryRunnerSerprivate async processRecordsToInsert({recordsToInsert,- repository,result,columnsToReturn,queryRunnerContext,}: {recordsToInsert: Partial<ObjectRecord>[];- repository: WorkspaceRepository<ObjectLiteral>;result: InsertResult;columnsToReturn: string[];queryRunnerContext: CommonExtendedQueryRunnerContext;@@ -550,31 +498,16 @@ export class CommonCreateManyQueryRunnerService extends CommonBaseQueryRunnerSerreturn;}- const ormV2CanHandle =- queryRunnerContext.featureFlagsMap[- FeatureFlagKey.IS_ORM_V2_READ_PATH_ENABLED- ];-- let insertResult;+ const writeRepository = this.getWriteRepository(queryRunnerContext);- if (ormV2CanHandle) {- const writeRepository = this.getWriteRepository(queryRunnerContext);-- insertResult = await writeRepository.runInsert({- records: await this.resolveNestedRelationsForOrmV2({- records: recordsToInsert,- queryRunnerContext,- writeRepository,- }),- columnsToReturn,- });- } else {- insertResult = await repository.insert(- recordsToInsert,- undefined,- columnsToReturn,- );- }+ const insertResult = await writeRepository.runInsert({+ records: await this.resolveNestedRelationsForOrmV2({+ records: recordsToInsert,+ queryRunnerContext,+ writeRepository,+ }),+ columnsToReturn,+ });result.identifiers.push(...insertResult.identifiers);result.generatedMaps.push(...insertResult.generatedMaps);diff --git a/packages/twenty-server/src/engine/api/common/common-query-runners/common-delete-many-query-runner.service.ts b/packages/twenty-server/src/engine/api/common/common-query-runners/common-delete-many-query-runner.service.tsindex fd9db66b300..480b97965c1 100644--- a/packages/twenty-server/src/engine/api/common/common-query-runners/common-delete-many-query-runner.service.ts+++ b/packages/twenty-server/src/engine/api/common/common-query-runners/common-delete-many-query-runner.service.ts@@ -41,7 +41,6 @@ export class CommonDeleteManyQueryRunnerService extends CommonBaseQueryRunnerSerconst {authContext,rolePermissionConfig,- workspaceDataSource,flatObjectMetadataMaps,flatFieldMetadataMaps,flatObjectMetadata,@@ -74,10 +73,9 @@ export class CommonDeleteManyQueryRunnerService extends CommonBaseQueryRunnerSer>,limit: QUERY_MAX_RECORDS_FROM_RELATION,authContext,- workspaceDataSource,rolePermissionConfig,selectedFields: args.selectedFieldsResult.select,- ...this.getNestedRelationsReadPathOptions(queryRunnerContext),+ ...this.getNestedRelationsReadPathOptions(),});}diff --git a/packages/twenty-server/src/engine/api/common/common-query-runners/common-destroy-many-query-runner.service.ts b/packages/twenty-server/src/engine/api/common/common-query-runners/common-destroy-many-query-runner.service.tsindex a875cc39946..c3f4db4aa98 100644--- a/packages/twenty-server/src/engine/api/common/common-query-runners/common-destroy-many-query-runner.service.ts+++ b/packages/twenty-server/src/engine/api/common/common-query-runners/common-destroy-many-query-runner.service.ts@@ -41,7 +41,6 @@ export class CommonDestroyManyQueryRunnerService extends CommonBaseQueryRunnerSeconst {authContext,rolePermissionConfig,- workspaceDataSource,flatObjectMetadataMaps,flatFieldMetadataMaps,flatObjectMetadata,@@ -74,10 +73,9 @@ export class CommonDestroyManyQueryRunnerService extends CommonBaseQueryRunnerSe>,limit: QUERY_MAX_RECORDS_FROM_RELATION,authContext,- workspaceDataSource,rolePermissionConfig,selectedFields: args.selectedFieldsResult.select,- ...this.getNestedRelationsReadPathOptions(queryRunnerContext),+ ...this.getNestedRelationsReadPathOptions(),});}diff --git a/packages/twenty-server/src/engine/api/common/common-query-runners/common-find-duplicates-query-runner.service.ts b/packages/twenty-server/src/engine/api/common/common-query-runners/common-find-duplicates-query-runner.service.tsindex a17045917ff..d0c138bbb83 100644--- a/packages/twenty-server/src/engine/api/common/common-query-runners/common-find-duplicates-query-runner.service.ts+++ b/packages/twenty-server/src/engine/api/common/common-query-runners/common-find-duplicates-query-runner.service.ts@@ -50,7 +50,6 @@ export class CommonFindDuplicatesQueryRunnerService extends CommonBaseQueryRunneflatFieldMetadataMaps,commonQueryParser,authContext,- workspaceDataSource,rolePermissionConfig,} = queryRunnerContext;@@ -167,10 +166,9 @@ export class CommonFindDuplicatesQueryRunnerService extends CommonBaseQueryRunne>,limit: QUERY_MAX_RECORDS_FROM_RELATION,authContext,- workspaceDataSource,rolePermissionConfig,selectedFields: args.selectedFieldsResult.select,- ...this.getNestedRelationsReadPathOptions(queryRunnerContext),+ ...this.getNestedRelationsReadPathOptions(),});}diff --git a/packages/twenty-server/src/engine/api/common/common-query-runners/common-find-many-query-runner.service.ts b/packages/twenty-server/src/engine/api/common/common-query-runners/common-find-many-query-runner.service.tsindex a469112f877..233b60e7dcc 100644--- a/packages/twenty-server/src/engine/api/common/common-query-runners/common-find-many-query-runner.service.ts+++ b/packages/twenty-server/src/engine/api/common/common-query-runners/common-find-many-query-runner.service.ts@@ -68,7 +68,6 @@ export class CommonFindManyQueryRunnerService extends CommonBaseQueryRunnerServiflatObjectMetadata,flatObjectMetadataMaps,flatFieldMetadataMaps,- workspaceDataSource,commonQueryParser,} = queryRunnerContext;@@ -254,10 +253,9 @@ export class CommonFindManyQueryRunnerService extends CommonBaseQueryRunnerServiaggregate: args.selectedFieldsResult.aggregate,limit: QUERY_MAX_RECORDS_FROM_RELATION,authContext,- workspaceDataSource,rolePermissionConfig,selectedFields: args.selectedFieldsResult.select,- ...this.getNestedRelationsReadPathOptions(queryRunnerContext),+ ...this.getNestedRelationsReadPathOptions(),});}diff --git a/packages/twenty-server/src/engine/api/common/common-query-runners/common-find-one-query-runner.service.ts b/packages/twenty-server/src/engine/api/common/common-query-runners/common-find-one-query-runner.service.tsindex 5da20862b92..47841e78cdc 100644--- a/packages/twenty-server/src/engine/api/common/common-query-runners/common-find-one-query-runner.service.ts+++ b/packages/twenty-server/src/engine/api/common/common-query-runners/common-find-one-query-runner.service.ts@@ -42,7 +42,6 @@ export class CommonFindOneQueryRunnerService extends CommonBaseQueryRunnerServicconst {authContext,rolePermissionConfig,- workspaceDataSource,flatObjectMetadataMaps,flatFieldMetadataMaps,flatObjectMetadata,@@ -104,10 +103,9 @@ export class CommonFindOneQueryRunnerService extends CommonBaseQueryRunnerServic>,limit: QUERY_MAX_RECORDS_FROM_RELATION,authContext,- workspaceDataSource,rolePermissionConfig,selectedFields: args.selectedFieldsResult.select,- ...this.getNestedRelationsReadPathOptions(queryRunnerContext),+ ...this.getNestedRelationsReadPathOptions(),});}diff --git a/packages/twenty-server/src/engine/api/common/common-query-runners/common-group-by-query-runner.service.ts b/packages/twenty-server/src/engine/api/common/common-query-runners/common-group-by-query-runner.service.tsindex dc8a4acae55..e8ac1b649f4 100644--- a/packages/twenty-server/src/engine/api/common/common-query-runners/common-group-by-query-runner.service.ts+++ b/packages/twenty-server/src/engine/api/common/common-query-runners/common-group-by-query-runner.service.ts@@ -2,7 +2,6 @@ import { Injectable } from '@nestjs/common';import {CompositeFieldSubFieldName,- FeatureFlagKey,PartialFieldMetadataItemOption,RecordFilterGroupLogicalOperator,type RestrictedFieldsPermissions,@@ -16,8 +15,6 @@ import {isDefined,turnAnyFieldFilterIntoRecordGqlFilter,} from 'twenty-shared/utils';-import { ObjectLiteral } from 'typeorm';-import { ObjectRecordFilter } from 'src/engine/api/graphql/workspace-query-builder/interfaces/object-record.interface';import { CommonBaseQueryRunnerService } from 'src/engine/api/common/common-query-runners/common-base-query-runner.service';@@ -43,7 +40,6 @@ import {import { CommonSelectedFieldsResult } from 'src/engine/api/common/types/common-selected-fields-result.type';import { GraphqlQueryParser } from 'src/engine/api/graphql/graphql-query-runner/graphql-query-parsers/graphql-query.parser';import { formatResultWithGroupByDimensionValues } from 'src/engine/api/graphql/graphql-query-runner/group-by/resolvers/utils/format-result-with-group-by-dimension-values.util';-import { GroupByWithRecordsService } from 'src/engine/api/graphql/graphql-query-runner/group-by/services/group-by-with-records.service';import { GroupByWithRecordsV2Service } from 'src/engine/api/graphql/graphql-query-runner/group-by/services/group-by-with-records-v2.service';import { getGroupLimit } from 'src/engine/api/graphql/graphql-query-runner/group-by/utils/get-group-limit.util';import { ProcessAggregateHelper } from 'src/engine/api/graphql/graphql-query-runner/helpers/process-aggregate.helper';@@ -57,10 +53,8 @@ import { FlatObjectMetadata } from 'src/engine/metadata-modules/flat-object-metaimport { ViewFilterGroupService } from 'src/engine/metadata-modules/view-filter-group/services/view-filter-group.service';import { ViewFilterService } from 'src/engine/metadata-modules/view-filter/services/view-filter.service';import { ViewService } from 'src/engine/metadata-modules/view/services/view.service';-import { WorkspaceSelectQueryBuilder } from 'src/engine/twenty-orm/repository/workspace-select-query-builder';import { formatColumnNameForRelationField } from 'src/engine/twenty-orm/utils/format-column-name-for-relation-field.util';import { type WorkspaceSelectQueryBuilderV2 } from 'src/engine/twenty-orm-v2/query-builder/workspace-select-query-builder-v2';-import { type WorkspaceRepositoryV2 } from 'src/engine/twenty-orm-v2/repository/workspace-repository-v2';@Injectable()export class CommonGroupByQueryRunnerService extends CommonBaseQueryRunnerService<@@ -71,7 +65,6 @@ export class CommonGroupByQueryRunnerService extends CommonBaseQueryRunnerServicprivate readonly viewFilterService: ViewFilterService,private readonly viewFilterGroupService: ViewFilterGroupService,private readonly viewService: ViewService,- private readonly groupByWithRecordsService: GroupByWithRecordsService,private readonly groupByWithRecordsV2Service: GroupByWithRecordsV2Service,) {super();@@ -90,16 +83,13 @@ export class CommonGroupByQueryRunnerService extends CommonBaseQueryRunnerServicflatObjectMetadataMaps,flatFieldMetadataMaps,authContext,- featureFlagsMap,} = queryRunnerContext;const objectAlias = getObjectAlias(flatObjectMetadata);const readRepository = this.getReadRepository(queryRunnerContext);- let queryBuilder = readRepository.createQueryBuilder(- objectAlias,- ) as WorkspaceSelectQueryBuilder<ObjectLiteral>;+ let queryBuilder = readRepository.createQueryBuilder(objectAlias);const groupByFields =this.groupByArgProcessor.validateAndTransformGroupByFieldsOrThrow({@@ -159,33 +149,18 @@ export class CommonGroupByQueryRunnerService extends CommonBaseQueryRunnerServicconst shouldIncludeRecords = args.includeRecords ?? false;if (shouldIncludeRecords) {- if (featureFlagsMap[FeatureFlagKey.IS_ORM_V2_READ_PATH_ENABLED]) {- return this.groupByWithRecordsV2Service.resolveWithRecords({- queryBuilderWithFiltersAndWithoutGroupBy:- queryBuilderWithFiltersAndWithoutGroupBy as unknown as WorkspaceSelectQueryBuilderV2,- queryBuilderWithGroupBy:- queryBuilder as unknown as WorkspaceSelectQueryBuilderV2,- readRepository: readRepository as WorkspaceRepositoryV2,- groupByDefinitions,- selectedFieldsResult: args.selectedFieldsResult,- queryRunnerContext,- orderByForRecords: args.orderByForRecords ?? [],- groupLimit: args.limit,- offsetForRecords: args.offsetForRecords,- nestedRelationsReadPathOptions:- this.getNestedRelationsReadPathOptions(queryRunnerContext),- });- }-- return this.groupByWithRecordsService.resolveWithRecords({+ return this.groupByWithRecordsV2Service.resolveWithRecords({queryBuilderWithFiltersAndWithoutGroupBy,queryBuilderWithGroupBy: queryBuilder,+ readRepository,groupByDefinitions,selectedFieldsResult: args.selectedFieldsResult,queryRunnerContext,orderByForRecords: args.orderByForRecords ?? [],groupLimit: args.limit,offsetForRecords: args.offsetForRecords,+ nestedRelationsReadPathOptions:+ this.getNestedRelationsReadPathOptions(),});}@@ -330,7 +305,7 @@ export class CommonGroupByQueryRunnerService extends CommonBaseQueryRunnerServic}: {args: GroupByQueryArgs;appliedFilters: ObjectRecordFilter;- queryBuilder: WorkspaceSelectQueryBuilder<ObjectLiteral>;+ queryBuilder: WorkspaceSelectQueryBuilderV2;flatObjectMetadata: FlatObjectMetadata;flatFieldMetadataMaps: FlatEntityMaps<FlatFieldMetadata>;workspaceId: string;@@ -366,7 +341,7 @@ export class CommonGroupByQueryRunnerService extends CommonBaseQueryRunnerServicselectedFieldsResult,groupLimit,}: {- queryBuilder: WorkspaceSelectQueryBuilder<ObjectLiteral>;+ queryBuilder: WorkspaceSelectQueryBuilderV2;groupByDefinitions: GroupByDefinition[];selectedFieldsResult: CommonSelectedFieldsResult;groupLimit?: number;@@ -389,7 +364,7 @@ export class CommonGroupByQueryRunnerService extends CommonBaseQueryRunnerServicgroupByFields,objectAlias,}: {- queryBuilder: WorkspaceSelectQueryBuilder<ObjectLiteral>;+ queryBuilder: WorkspaceSelectQueryBuilderV2;groupByFields: GroupByField[];objectAlias: string;}): void {diff --git a/packages/twenty-server/src/engine/api/common/common-query-runners/common-merge-many-query-runner.service.ts b/packages/twenty-server/src/engine/api/common/common-query-runners/common-merge-many-query-runner.service.tsindex 1e0590bca49..0df1f0c6aac 100644--- a/packages/twenty-server/src/engine/api/common/common-query-runners/common-merge-many-query-runner.service.ts+++ b/packages/twenty-server/src/engine/api/common/common-query-runners/common-merge-many-query-runner.service.ts@@ -6,7 +6,6 @@ import {QUERY_MAX_RECORDS_FROM_RELATION,} from 'twenty-shared/constants';import {- FeatureFlagKey,FieldMetadataSettingsMapping,FieldMetadataType,ObjectRecord,@@ -44,8 +43,6 @@ import { buildFieldMapsFromFlatObjectMetadata } from 'src/engine/metadata-moduleimport { isMorphOrRelationFlatFieldMetadata } from 'src/engine/metadata-modules/flat-field-metadata/utils/is-morph-or-relation-flat-field-metadata.util';import { 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 { WorkspaceEntityManager } from 'src/engine/twenty-orm/entity-manager/workspace-entity-manager';-import { WorkspaceRepository } from 'src/engine/twenty-orm/repository/workspace.repository';@Injectable()export class CommonMergeManyQueryRunnerService extends CommonBaseQueryRunnerService<@@ -85,93 +82,21 @@ export class CommonMergeManyQueryRunnerService extends CommonBaseQueryRunnerServconst idsToDelete = args.ids.filter((id) => id !== priorityRecord.id);- const updatedRecord = queryRunnerContext.featureFlagsMap[- FeatureFlagKey.IS_ORM_V2_READ_PATH_ENABLED- ]- ? await this.executeMergeWithinTransactionV2({- args,- queryRunnerContext,- idsToDelete,- priorityRecordId: priorityRecord.id,- mergedData,- })- : await queryRunnerContext.workspaceDataSource.transaction(- (transactionManager: WorkspaceEntityManager) =>- this.executeMergeWithinTransaction(transactionManager, {- args,- queryRunnerContext,- idsToDelete,- priorityRecordId: priorityRecord.id,- mergedData,- }),- );-- await this.processNestedRelations({- args,- queryRunnerContext,- updatedRecords: [updatedRecord],- });-- return updatedRecord;- }-- private async executeMergeWithinTransaction(- transactionManager: WorkspaceEntityManager,- {+ const updatedRecord = await this.executeMergeWithinTransactionV2({args,queryRunnerContext,idsToDelete,- priorityRecordId,+ priorityRecordId: priorityRecord.id,mergedData,- }: {- args: CommonExtendedInput<MergeManyQueryArgs>;- queryRunnerContext: CommonExtendedQueryRunnerContext;- idsToDelete: string[];- priorityRecordId: string;- mergedData: Partial<ObjectRecord>;- },- ): Promise<ObjectRecord> {- const {- flatObjectMetadata,- flatObjectMetadataMaps,- flatFieldMetadataMaps,- } = queryRunnerContext;-- const columnsToReturn = buildColumnsToReturn({- select: args.selectedFieldsResult.select,- relations: args.selectedFieldsResult.relations,- flatObjectMetadata,- flatObjectMetadataMaps,- flatFieldMetadataMaps,});- const transactionRepository = transactionManager.getRepository(- flatObjectMetadata.nameSingular,- queryRunnerContext.rolePermissionConfig,- queryRunnerContext.authContext,- );-- await this.migrateRelatedRecords(- transactionManager,- queryRunnerContext,- idsToDelete,- priorityRecordId,- );-- await transactionRepository- .createQueryBuilder(flatObjectMetadata.nameSingular)- .delete()- .whereInIds(idsToDelete)- .returning(columnsToReturn)- .execute();-- return this.updatePriorityRecord(+ await this.processNestedRelations({args,queryRunnerContext,- transactionRepository,- priorityRecordId,- mergedData,- );+ updatedRecords: [updatedRecord],+ });++ return updatedRecord;}private async fetchRecordsToMerge(@@ -219,10 +144,9 @@ export class CommonMergeManyQueryRunnerService extends CommonBaseQueryRunnerServ>,limit: QUERY_MAX_RECORDS_FROM_RELATION,authContext: context.authContext,- workspaceDataSource: context.workspaceDataSource,rolePermissionConfig: context.rolePermissionConfig,selectedFields: args.selectedFieldsResult.select,- ...this.getNestedRelationsReadPathOptions(context),+ ...this.getNestedRelationsReadPathOptions(),});}@@ -354,51 +278,6 @@ export class CommonMergeManyQueryRunnerService extends CommonBaseQueryRunnerServreturn dryRunRecord;}- private async updatePriorityRecord(- args: CommonExtendedInput<MergeManyQueryArgs>,- queryRunnerContext: CommonExtendedQueryRunnerContext,- repository: WorkspaceRepository<ObjectLiteral>,- priorityRecordId: string,- mergedData: Partial<ObjectRecord>,- ): Promise<ObjectRecord> {- const {- flatObjectMetadata,- flatObjectMetadataMaps,- flatFieldMetadataMaps,- } = queryRunnerContext;-- const queryBuilder = repository.createQueryBuilder(- flatObjectMetadata.nameSingular,- );-- const columnsToReturn = buildColumnsToReturn({- select: args.selectedFieldsResult.select,- relations: args.selectedFieldsResult.relations,- flatObjectMetadata,- flatObjectMetadataMaps,- flatFieldMetadataMaps,- });-- const updatedObjectRecords = await queryBuilder- .update()- .set(mergedData)- .where({ id: priorityRecordId })- .returning(columnsToReturn)- .execute();-- if (!updatedObjectRecords.generatedMaps.length) {- throw new CommonQueryRunnerException(- 'Failed to update record',- CommonQueryRunnerExceptionCode.RECORD_NOT_FOUND,- { userFriendlyMessage: STANDARD_ERROR_MESSAGE },- );- }-- const updatedRecord = updatedObjectRecords.generatedMaps[0] as ObjectRecord;-- return updatedRecord;- }-private getRelationFieldsPointingToCurrentObject(context: CommonExtendedQueryRunnerContext,): Array<{ objectMetadata: FlatObjectMetadata; joinColumnName: string }> {@@ -453,31 +332,6 @@ export class CommonMergeManyQueryRunnerService extends CommonBaseQueryRunnerServreturn relationFields;}- private async migrateRelatedRecords(- transactionManager: WorkspaceEntityManager,- context: CommonExtendedQueryRunnerContext,- fromIds: string[],- toId: string,- ): Promise<void> {- for (const relationField of this.getRelationFieldsPointingToCurrentObject(- context,- )) {- const repository = transactionManager.getRepository(- relationField.objectMetadata.nameSingular,- context.rolePermissionConfig,- context.authContext,- );-- await repository- .createQueryBuilder(relationField.objectMetadata.nameSingular)- .update()- .set({ [relationField.joinColumnName]: toId })- .where({ [relationField.joinColumnName]: In(fromIds) })- .returning('*')- .execute();- }- }-private async executeMergeWithinTransactionV2({args,queryRunnerContext,@@ -591,7 +445,6 @@ export class CommonMergeManyQueryRunnerService extends CommonBaseQueryRunnerServflatFieldMetadataMaps,flatObjectMetadata,authContext,- workspaceDataSource,rolePermissionConfig,} = queryRunnerContext;@@ -607,10 +460,9 @@ export class CommonMergeManyQueryRunnerService extends CommonBaseQueryRunnerServ>,limit: QUERY_MAX_RECORDS_FROM_RELATION,authContext,- workspaceDataSource,rolePermissionConfig,selectedFields: args.selectedFieldsResult.select,- ...this.getNestedRelationsReadPathOptions(queryRunnerContext),+ ...this.getNestedRelationsReadPathOptions(),});}}diff --git a/packages/twenty-server/src/engine/api/common/common-query-runners/common-restore-many-query-runner.service.ts b/packages/twenty-server/src/engine/api/common/common-query-runners/common-restore-many-query-runner.service.tsindex c1bdd756aaa..0a2700feaf3 100644--- a/packages/twenty-server/src/engine/api/common/common-query-runners/common-restore-many-query-runner.service.ts+++ b/packages/twenty-server/src/engine/api/common/common-query-runners/common-restore-many-query-runner.service.ts@@ -41,7 +41,6 @@ export class CommonRestoreManyQueryRunnerService extends CommonBaseQueryRunnerSeconst {authContext,rolePermissionConfig,- workspaceDataSource,flatObjectMetadataMaps,flatFieldMetadataMaps,flatObjectMetadata,@@ -74,10 +73,9 @@ export class CommonRestoreManyQueryRunnerService extends CommonBaseQueryRunnerSe>,limit: QUERY_MAX_RECORDS_FROM_RELATION,authContext,- workspaceDataSource,rolePermissionConfig,selectedFields: args.selectedFieldsResult.select,- ...this.getNestedRelationsReadPathOptions(queryRunnerContext),+ ...this.getNestedRelationsReadPathOptions(),});}diff --git a/packages/twenty-server/src/engine/api/common/common-query-runners/common-update-many-query-runner.service.ts b/packages/twenty-server/src/engine/api/common/common-query-runners/common-update-many-query-runner.service.tsindex cfbac07853d..28fc4fbee21 100644--- a/packages/twenty-server/src/engine/api/common/common-query-runners/common-update-many-query-runner.service.ts+++ b/packages/twenty-server/src/engine/api/common/common-query-runners/common-update-many-query-runner.service.ts@@ -41,7 +41,6 @@ export class CommonUpdateManyQueryRunnerService extends CommonBaseQueryRunnerSerconst {authContext,rolePermissionConfig,- workspaceDataSource,flatObjectMetadataMaps,flatFieldMetadataMaps,flatObjectMetadata,@@ -75,10 +74,9 @@ export class CommonUpdateManyQueryRunnerService extends CommonBaseQueryRunnerSer>,limit: QUERY_MAX_RECORDS_FROM_RELATION,authContext,- workspaceDataSource,rolePermissionConfig,selectedFields: args.selectedFieldsResult.select,- ...this.getNestedRelationsReadPathOptions(queryRunnerContext),+ ...this.getNestedRelationsReadPathOptions(),});}diff --git a/packages/twenty-server/src/engine/api/common/common-query-runners/utils/build-mutation-query-builder.util.ts b/packages/twenty-server/src/engine/api/common/common-query-runners/utils/build-mutation-query-builder.util.tsdeleted file mode 100644index 7f52fd59322..00000000000--- a/packages/twenty-server/src/engine/api/common/common-query-runners/utils/build-mutation-query-builder.util.ts+++ /dev/null@@ -1,52 +0,0 @@-import { type ObjectLiteral } from 'typeorm';--import { type ObjectRecordFilter } from 'src/engine/api/graphql/workspace-query-builder/interfaces/object-record.interface';--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 WorkspaceSelectQueryBuilder } from 'src/engine/twenty-orm/repository/workspace-select-query-builder';--type BuildMutationQueryBuilderArgs = {- repository: WorkspaceRepository<ObjectLiteral>;- alias: string;- filter: Partial<ObjectRecordFilter>;- commonQueryParser: GraphqlQueryParser;-};--// TypeORM drops join attributes when a SelectQueryBuilder is morphed into-// UPDATE / DELETE / SoftDelete / Restore — the generated SQL would reference-// an alias without a FROM entry and Postgres would throw. When the filter-// adds joins we rewrite it as `id IN (SELECT id FROM ... JOIN ... WHERE ...)`-// so the joins live inside a self-contained subquery.-export const buildMutationQueryBuilder = ({- repository,- alias,- filter,- commonQueryParser,-}: BuildMutationQueryBuilderArgs): WorkspaceSelectQueryBuilder<ObjectLiteral> => {- const filteredQueryBuilder = repository.createQueryBuilder(alias);-- commonQueryParser.applyFilterToBuilder(filteredQueryBuilder, alias, filter);-- const hasRelationTraversal =- filteredQueryBuilder.expressionMap.joinAttributes.length > 0;-- if (!hasRelationTraversal) {- return filteredQueryBuilder;- }-- // TypeORM auto-injects `deletedAt IS NULL` for SELECT-typed queries but- // not for mutation-typed ones, so the subquery (a SELECT) must opt out to- // mirror the semantics of the mutation it feeds — otherwise `restoreMany`- // would never find soft-deleted rows.- const idSubQueryBuilder = filteredQueryBuilder- .select(`${alias}.id`)- .withDeleted();-- idSubQueryBuilder.applyRowLevelPermissionPredicatesToMainAliasAndJoinedRelations();-- return repository- .createQueryBuilder(alias)- .where(`"${alias}"."id" IN (${idSubQueryBuilder.getQuery()})`)- .setParameters(idSubQueryBuilder.expressionMap.parameters);-};diff --git a/packages/twenty-server/src/engine/api/common/core-common-api.module.ts b/packages/twenty-server/src/engine/api/common/core-common-api.module.tsindex 334196f0720..5035847b7d3 100644--- a/packages/twenty-server/src/engine/api/common/core-common-api.module.ts+++ b/packages/twenty-server/src/engine/api/common/core-common-api.module.ts@@ -3,12 +3,10 @@ import { TypeOrmModule } from '@nestjs/typeorm';import { CommonArgsProcessors } from 'src/engine/api/common/common-args-processors/common-args-processors';import { GroupByArgProcessorService } from 'src/engine/api/common/common-args-processors/group-by-arg-processor/group-by-arg-processor.service';-import { ProcessNestedRelationsV2Helper } from 'src/engine/api/common/common-nested-relations-processor/process-nested-relations-v2.helper';import { ProcessNestedRelationsOrmV2Helper } from 'src/engine/api/common/common-nested-relations-processor/process-nested-relations-orm-v2.helper';import { ProcessNestedRelationsHelper } from 'src/engine/api/common/common-nested-relations-processor/process-nested-relations.helper';import { CommonQueryRunners } from 'src/engine/api/common/common-query-runners/common-query-runners';import { CommonResultGettersService } from 'src/engine/api/common/common-result-getters/common-result-getters.service';-import { GroupByWithRecordsService } from 'src/engine/api/graphql/graphql-query-runner/group-by/services/group-by-with-records.service';import { GroupByWithRecordsV2Service } from 'src/engine/api/graphql/graphql-query-runner/group-by/services/group-by-with-records-v2.service';import { ProcessAggregateHelper } from 'src/engine/api/graphql/graphql-query-runner/helpers/process-aggregate.helper';import { WorkspaceQueryHookModule } from 'src/engine/api/graphql/workspace-query-runner/workspace-query-hook/workspace-query-hook.module';@@ -53,13 +51,11 @@ import { WorkspaceCacheModule } from 'src/engine/workspace-cache/workspace-cache],providers: [ProcessNestedRelationsHelper,- ProcessNestedRelationsV2Helper,ProcessNestedRelationsOrmV2Helper,...CommonArgsProcessors,ProcessAggregateHelper,...CommonQueryRunners,CommonResultGettersService,- GroupByWithRecordsService,GroupByWithRecordsV2Service,],exports: [...CommonQueryRunners, GroupByArgProcessorService],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 df1d04f50b9..953bea74c9e 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,6 @@ 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 GlobalWorkspaceDataSource } from 'src/engine/twenty-orm/global-workspace-datasource/global-workspace-datasource';import { type WorkspaceRepository } from 'src/engine/twenty-orm/repository/workspace.repository';import { type RolePermissionConfig } from 'src/engine/twenty-orm/types/role-permission-config';@@ -16,6 +15,5 @@ export type CommonExtendedQueryRunnerContext = Omit<rolePermissionConfig: RolePermissionConfig;repository: WorkspaceRepository<ObjectLiteral>;commonQueryParser: GraphqlQueryParser;- workspaceDataSource: GlobalWorkspaceDataSource;featureFlagsMap: Record<FeatureFlagKey, boolean>;};diff --git a/packages/twenty-server/src/engine/api/common/types/nested-relations-read-path-options.type.ts b/packages/twenty-server/src/engine/api/common/types/nested-relations-read-path-options.type.tsindex 6bfc99cde42..32984768d51 100644--- a/packages/twenty-server/src/engine/api/common/types/nested-relations-read-path-options.type.ts+++ b/packages/twenty-server/src/engine/api/common/types/nested-relations-read-path-options.type.ts@@ -1,4 +1,3 @@export type NestedRelationsReadPathOptions = {- isOrmV2ReadPathEnabled: boolean;useReplica: boolean;};diff --git a/packages/twenty-server/src/engine/api/graphql/graphql-query-runner/graphql-query-runner.module.ts b/packages/twenty-server/src/engine/api/graphql/graphql-query-runner/graphql-query-runner.module.tsindex c43498d3792..07269c69b60 100644--- a/packages/twenty-server/src/engine/api/graphql/graphql-query-runner/graphql-query-runner.module.ts+++ b/packages/twenty-server/src/engine/api/graphql/graphql-query-runner/graphql-query-runner.module.ts@@ -1,7 +1,6 @@import { Module } from '@nestjs/common';import { TypeOrmModule } from '@nestjs/typeorm';-import { ProcessNestedRelationsV2Helper } from 'src/engine/api/common/common-nested-relations-processor/process-nested-relations-v2.helper';import { ProcessNestedRelationsOrmV2Helper } from 'src/engine/api/common/common-nested-relations-processor/process-nested-relations-orm-v2.helper';import { TwentyORMV2Module } from 'src/engine/twenty-orm-v2/twenty-orm-v2.module';import { ProcessNestedRelationsHelper } from 'src/engine/api/common/common-nested-relations-processor/process-nested-relations.helper';@@ -31,7 +30,6 @@ import { ViewModule } from 'src/engine/metadata-modules/view/view.module';],providers: [ProcessNestedRelationsHelper,- ProcessNestedRelationsV2Helper,ProcessNestedRelationsOrmV2Helper,ProcessAggregateHelper,],diff --git a/packages/twenty-server/src/engine/api/graphql/graphql-query-runner/group-by/services/group-by-with-records-v2.service.ts b/packages/twenty-server/src/engine/api/graphql/graphql-query-runner/group-by/services/group-by-with-records-v2.service.tsindex 344b9d92b36..83e9381ca4a 100644--- a/packages/twenty-server/src/engine/api/graphql/graphql-query-runner/group-by/services/group-by-with-records-v2.service.ts+++ b/packages/twenty-server/src/engine/api/graphql/graphql-query-runner/group-by/services/group-by-with-records-v2.service.ts@@ -74,7 +74,6 @@ export class GroupByWithRecordsV2Service {const {authContext,- workspaceDataSource,rolePermissionConfig,flatObjectMetadata,flatObjectMetadataMaps,@@ -123,7 +122,6 @@ export class GroupByWithRecordsV2Service {aggregate: selectedFieldsResult.aggregate,limit: RELATIONS_PER_RECORD_LIMIT,authContext,- workspaceDataSource,rolePermissionConfig,selectedFields: selectedFieldsResult.select,...nestedRelationsReadPathOptions,diff --git a/packages/twenty-server/src/engine/api/graphql/graphql-query-runner/group-by/services/group-by-with-records.service.ts b/packages/twenty-server/src/engine/api/graphql/graphql-query-runner/group-by/services/group-by-with-records.service.tsdeleted file mode 100644index ad5425b61cb..00000000000--- a/packages/twenty-server/src/engine/api/graphql/graphql-query-runner/group-by/services/group-by-with-records.service.ts+++ /dev/null@@ -1,297 +0,0 @@-import { Inject, Injectable } from '@nestjs/common';--import { isNonEmptyString } from '@sniptt/guards';-import isEmpty from 'lodash.isempty';-import { ObjectRecord } from 'twenty-shared/types';-import { isDefined } from 'twenty-shared/utils';-import { FindOptionsRelations, type ObjectLiteral } from 'typeorm';--import { ObjectRecordOrderBy } from 'src/engine/api/graphql/workspace-query-builder/interfaces/object-record.interface';--import { ProcessNestedRelationsHelper } from 'src/engine/api/common/common-nested-relations-processor/process-nested-relations.helper';-import { type GroupByDefinition } from 'src/engine/api/common/common-query-runners/types/group-by-definition.type';-import { getObjectAlias } from 'src/engine/api/common/common-query-runners/utils/get-object-alias-for-group-by.util';-import { CommonResultGettersService } from 'src/engine/api/common/common-result-getters/common-result-getters.service';-import { CommonExtendedQueryRunnerContext } from 'src/engine/api/common/types/common-extended-query-runner-context.type';-import { type CommonGroupByOutputItem } from 'src/engine/api/common/types/common-group-by-output-item.type';-import { CommonSelectedFieldsResult } from 'src/engine/api/common/types/common-selected-fields-result.type';-import { GraphqlQueryParser } from 'src/engine/api/graphql/graphql-query-runner/graphql-query-parsers/graphql-query.parser';-import { addRelationJoinAliasToQueryBuilder } from 'src/engine/api/graphql/graphql-query-runner/graphql-query-parsers/utils/add-relation-join-alias.util';-import { formatResultWithGroupByDimensionValues } from 'src/engine/api/graphql/graphql-query-runner/group-by/resolvers/utils/format-result-with-group-by-dimension-values.util';-import {- RECORDS_PER_GROUP_LIMIT,- RELATIONS_PER_RECORD_LIMIT,- SUB_QUERY_PREFIX,-} from 'src/engine/api/graphql/graphql-query-runner/group-by/services/group-by-with-records.constants';-import { buildGroupByRecordConditions } from 'src/engine/api/graphql/graphql-query-runner/group-by/utils/build-group-by-record-conditions.util';-import { getGroupLimit } from 'src/engine/api/graphql/graphql-query-runner/group-by/utils/get-group-limit.util';-import { buildColumnsToSelect } from 'src/engine/api/graphql/graphql-query-runner/utils/build-columns-to-select';-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';-import { type WorkspaceRepository } from 'src/engine/twenty-orm/repository/workspace.repository';--@Injectable()-export class GroupByWithRecordsService {- @Inject()- protected readonly processNestedRelationsHelper: ProcessNestedRelationsHelper;- @Inject()- protected readonly commonResultGettersService: CommonResultGettersService;- constructor() {}-- public async resolveWithRecords({- queryBuilderWithGroupBy,- queryBuilderWithFiltersAndWithoutGroupBy,- groupByDefinitions,- selectedFieldsResult,- queryRunnerContext,- orderByForRecords,- groupLimit,- offsetForRecords,- }: {- queryBuilderWithGroupBy: WorkspaceSelectQueryBuilder<ObjectLiteral>;- queryBuilderWithFiltersAndWithoutGroupBy: WorkspaceSelectQueryBuilder<ObjectLiteral>;- groupByDefinitions: GroupByDefinition[];- selectedFieldsResult: CommonSelectedFieldsResult;- queryRunnerContext: CommonExtendedQueryRunnerContext;- orderByForRecords: ObjectRecordOrderBy;- groupLimit?: number;- offsetForRecords?: number;- }): Promise<CommonGroupByOutputItem[]> {- const effectiveGroupLimit = getGroupLimit(groupLimit);-- const groupsResult = await queryBuilderWithGroupBy- .limit(effectiveGroupLimit)- .getRawMany();-- if (groupsResult.length === 0) {- return [];- }-- const {- authContext,- workspaceDataSource,- rolePermissionConfig,- flatObjectMetadata,- flatObjectMetadataMaps,- flatFieldMetadataMaps,- repository,- } = queryRunnerContext;-- const columnsToSelect = buildColumnsToSelect({- select: selectedFieldsResult.select,- relations: selectedFieldsResult.relations,- flatObjectMetadata,- flatObjectMetadataMaps,- flatFieldMetadataMaps,- });-- const queryBuilderWithPartitionBy = this.addPartitionByToQueryBuilder({- queryBuilderForSubQuery: queryBuilderWithFiltersAndWithoutGroupBy,- columnsToSelect,- groupsResult,- groupByDefinitions,- repository,- orderByForRecords,- flatObjectMetadata,- flatObjectMetadataMaps,- flatFieldMetadataMaps,- offsetForRecords,- });-- const recordsResult = await queryBuilderWithPartitionBy.getRawMany();-- const allRecords = recordsResult- .flatMap((group) => group.records)- .filter(isDefined);-- if (!isEmpty(selectedFieldsResult.relations)) {- await this.processNestedRelationsHelper.processNestedRelations({- flatObjectMetadataMaps,- flatFieldMetadataMaps,- parentObjectMetadataItem: flatObjectMetadata,- parentObjectRecords: allRecords,- parentObjectRecordsAggregatedValues: {},- relations: selectedFieldsResult.relations as Record<- string,- FindOptionsRelations<ObjectLiteral>- >,- aggregate: selectedFieldsResult.aggregate,- limit: RELATIONS_PER_RECORD_LIMIT,- authContext,- workspaceDataSource,- rolePermissionConfig,- selectedFields: selectedFieldsResult.select,- });- }-- return await formatResultWithGroupByDimensionValues({- groupsResult,- recordsResult,- groupByDefinitions,- aggregateFieldNames: Object.keys(selectedFieldsResult.aggregate),- flatObjectMetadata,- flatObjectMetadataMaps,- flatFieldMetadataMaps,- processRecord: (record: ObjectRecord) =>- this.commonResultGettersService.processRecord(- record,- flatObjectMetadata,- flatObjectMetadataMaps,- flatFieldMetadataMaps,- authContext.workspace.id,- ),- });- }-- private addPartitionByToQueryBuilder({- queryBuilderForSubQuery,- columnsToSelect,- groupsResult,- groupByDefinitions,- repository,- orderByForRecords,- flatObjectMetadata,- flatObjectMetadataMaps,- flatFieldMetadataMaps,- offsetForRecords = 0,- }: {- queryBuilderForSubQuery: WorkspaceSelectQueryBuilder<ObjectLiteral>;- columnsToSelect: Record<string, boolean>;- groupsResult: Array<Record<string, unknown>>;- groupByDefinitions: GroupByDefinition[];- repository: WorkspaceRepository<ObjectLiteral>;- orderByForRecords: ObjectRecordOrderBy;- flatObjectMetadata: FlatObjectMetadata;- flatObjectMetadataMaps: FlatEntityMaps<FlatObjectMetadata>;- flatFieldMetadataMaps: FlatEntityMaps<FlatFieldMetadata>;- offsetForRecords?: number;- }): WorkspaceSelectQueryBuilder<ObjectLiteral> {- const groupByAliases = groupByDefinitions- .map((def) => `"${def.alias}"`)- .join(', ');-- const { sql: groupConditions, parameters: groupConditionParameters } =- buildGroupByRecordConditions({ groupsResult, groupByDefinitions });-- const objectAlias = getObjectAlias(flatObjectMetadata);-- const recordSelectWithAlias = Object.keys(columnsToSelect)- .map((col) => `"${objectAlias}"."${col}" as "${SUB_QUERY_PREFIX}${col}"`)- .join(', ');-- const groupBySelectWithAlias = groupByDefinitions- .map((def) => `${def.expression} as "${def.alias}"`)- .join(', ');-- const subQuery = queryBuilderForSubQuery- .select(recordSelectWithAlias)- .addSelect(groupBySelectWithAlias)- .setParameters(groupConditionParameters)- .andWhere(groupConditions);-- this.applyPartitionByToBuilder({- groupByDefinitions,- flatObjectMetadata,- flatObjectMetadataMaps,- flatFieldMetadataMaps,- orderByForRecords,- queryBuilder: subQuery,- });-- subQuery.applyRowLevelPermissionPredicatesToMainAliasAndJoinedRelations();-- let mainQueryQueryBuilder = repository.createQueryBuilder();-- const pageStart = offsetForRecords;- const pageEnd = offsetForRecords + RECORDS_PER_GROUP_LIMIT;-- const mainQuery = mainQueryQueryBuilder- .from(`(${subQuery.getQuery()})`, 'ranked_records')- .setParameters(queryBuilderForSubQuery.expressionMap.parameters)-- .select(groupByAliases)- .addSelect(- `JSON_AGG(- CASE WHEN record_row_number > ${pageStart} AND record_row_number <= ${pageEnd} THEN- JSON_BUILD_OBJECT(- ${[- ...Object.keys(columnsToSelect).map(- (col) => `'${col}', "${SUB_QUERY_PREFIX}${col}"`,- ),- ...groupByDefinitions.map(- (def) => `'${def.alias}', "${def.alias}"`,- ),- ].join(',\n ')}- )- END- ) FILTER (WHERE record_row_number > ${pageStart} AND record_row_number <= ${pageEnd})`,- 'records',- )- .groupBy(groupByAliases);-- // Remove initial "from" condition (typeOrm limitation)- mainQuery.expressionMap.aliases = mainQuery.expressionMap.aliases.filter(- (alias) => isDefined(alias.subQuery),- );-- return mainQuery as WorkspaceSelectQueryBuilder<ObjectLiteral>;- }-- private applyPartitionByToBuilder({- groupByDefinitions,- flatObjectMetadata,- flatObjectMetadataMaps,- flatFieldMetadataMaps,- orderByForRecords,- queryBuilder,- }: {- queryBuilder: WorkspaceSelectQueryBuilder<ObjectLiteral>;- groupByDefinitions: GroupByDefinition[];- orderByForRecords: ObjectRecordOrderBy;- flatObjectMetadata: FlatObjectMetadata;- flatObjectMetadataMaps: FlatEntityMaps<FlatObjectMetadata>;- flatFieldMetadataMaps: FlatEntityMaps<FlatFieldMetadata>;- }) {- const groupByExpressions = groupByDefinitions- .map((def) => def.expression)- .join(', ');-- const hasOrderByForRecords = !isEmpty(orderByForRecords);-- if (hasOrderByForRecords) {- const graphqlQueryParser = new GraphqlQueryParser(- flatObjectMetadata,- flatObjectMetadataMaps,- flatFieldMetadataMaps,- );-- const { orderByRawSQL, relationJoins } =- graphqlQueryParser.getOrderByRawSQL(- orderByForRecords,- flatObjectMetadata.nameSingular,- );-- if (isNonEmptyString(orderByRawSQL)) {- for (const joinInfo of relationJoins) {- addRelationJoinAliasToQueryBuilder({- queryBuilder,- parentAlias: flatObjectMetadata.nameSingular,- relationName: joinInfo.joinAlias,- });- }-- return queryBuilder.addSelect(- `ROW_NUMBER() OVER (PARTITION BY ${groupByExpressions} ${orderByRawSQL})`,- 'record_row_number',- );- }- }-- return queryBuilder.addSelect(- `ROW_NUMBER() OVER (PARTITION BY ${groupByExpressions})`,- 'record_row_number',- );- }-}diff --git a/packages/twenty-server/src/engine/core-modules/feature-flag/services/feature-flag.service.ts b/packages/twenty-server/src/engine/core-modules/feature-flag/services/feature-flag.service.tsindex c0a333f95ca..ab37b0eaa35 100644--- a/packages/twenty-server/src/engine/core-modules/feature-flag/services/feature-flag.service.ts+++ b/packages/twenty-server/src/engine/core-modules/feature-flag/services/feature-flag.service.ts@@ -10,7 +10,6 @@ import {FeatureFlagException,FeatureFlagExceptionCode,} from 'src/engine/core-modules/feature-flag/feature-flag.exception';-import { getFeatureFlagCacheKeysToInvalidate } from 'src/engine/core-modules/feature-flag/utils/get-feature-flag-cache-keys-to-invalidate.util';import { featureFlagValidator } from 'src/engine/core-modules/feature-flag/validates/feature-flag.validate';import { publicFeatureFlagValidator } from 'src/engine/core-modules/feature-flag/validates/is-public-feature-flag.validate';import { InjectWorkspaceScopedRepository } from 'src/engine/twenty-orm/workspace-scoped-repository/inject-workspace-scoped-repository.decorator';@@ -73,10 +72,9 @@ export class FeatureFlagService {},);- await this.workspaceCacheService.invalidateAndRecompute(- workspaceId,- getFeatureFlagCacheKeysToInvalidate(keys),- );+ await this.workspaceCacheService.invalidateAndRecompute(workspaceId, [+ 'featureFlagsMap',+ ]);}}@@ -124,10 +122,9 @@ export class FeatureFlagService {['workspaceId', 'key'],);- await this.workspaceCacheService.invalidateAndRecompute(- workspaceId,- getFeatureFlagCacheKeysToInvalidate([featureFlag]),- );+ await this.workspaceCacheService.invalidateAndRecompute(workspaceId, [+ 'featureFlagsMap',+ ]);return result;}diff --git a/packages/twenty-server/src/engine/core-modules/feature-flag/utils/__tests__/get-feature-flag-cache-keys-to-invalidate.util.spec.ts b/packages/twenty-server/src/engine/core-modules/feature-flag/utils/__tests__/get-feature-flag-cache-keys-to-invalidate.util.spec.tsdeleted file mode 100644index a2493484734..00000000000--- a/packages/twenty-server/src/engine/core-modules/feature-flag/utils/__tests__/get-feature-flag-cache-keys-to-invalidate.util.spec.ts+++ /dev/null@@ -1,36 +0,0 @@-import { FeatureFlagKey } from 'twenty-shared/types';--import { getFeatureFlagCacheKeysToInvalidate } from 'src/engine/core-modules/feature-flag/utils/get-feature-flag-cache-keys-to-invalidate.util';--describe('getFeatureFlagCacheKeysToInvalidate', () => {- it('should invalidate ORMEntityMetadatas when the ORM v2 flag changes', () => {- expect(- getFeatureFlagCacheKeysToInvalidate([- FeatureFlagKey.IS_ORM_V2_READ_PATH_ENABLED,- ]),- ).toEqual(['featureFlagsMap', 'ORMEntityMetadatas']);- });-- it('should invalidate ORMEntityMetadatas when the ORM v2 flag changes among others', () => {- expect(- getFeatureFlagCacheKeysToInvalidate([- FeatureFlagKey.IS_JSON_FILTER_ENABLED,- FeatureFlagKey.IS_ORM_V2_READ_PATH_ENABLED,- ]),- ).toEqual(['featureFlagsMap', 'ORMEntityMetadatas']);- });-- it('should only invalidate featureFlagsMap for unrelated flags', () => {- expect(- getFeatureFlagCacheKeysToInvalidate([- FeatureFlagKey.IS_JSON_FILTER_ENABLED,- ]),- ).toEqual(['featureFlagsMap']);- });-- it('should only invalidate featureFlagsMap for an empty change set', () => {- expect(getFeatureFlagCacheKeysToInvalidate([])).toEqual([- 'featureFlagsMap',- ]);- });-});diff --git a/packages/twenty-server/src/engine/core-modules/feature-flag/utils/get-feature-flag-cache-keys-to-invalidate.util.ts b/packages/twenty-server/src/engine/core-modules/feature-flag/utils/get-feature-flag-cache-keys-to-invalidate.util.tsdeleted file mode 100644index e7ce9fab853..00000000000--- a/packages/twenty-server/src/engine/core-modules/feature-flag/utils/get-feature-flag-cache-keys-to-invalidate.util.ts+++ /dev/null@@ -1,15 +0,0 @@-import { FeatureFlagKey } from 'twenty-shared/types';--import { type WorkspaceCacheKeyName } from 'src/engine/workspace-cache/types/workspace-cache-key.type';--export const getFeatureFlagCacheKeysToInvalidate = (- changedFeatureFlagKeys: FeatureFlagKey[],-): WorkspaceCacheKeyName[] => {- if (- changedFeatureFlagKeys.includes(FeatureFlagKey.IS_ORM_V2_READ_PATH_ENABLED)- ) {- return ['featureFlagsMap', 'ORMEntityMetadatas'];- }-- return ['featureFlagsMap'];-};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 285533e5f7e..ef61dd4235a 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@@ -1564,10 +1564,6 @@ describe('ObjectRecordEventPublisher', () => {flatMapsKeys: ['flatObjectMetadataMaps', 'flatFieldMetadataMaps'],});- expect(- mockGlobalWorkspaceOrmManager.getGlobalWorkspaceDataSourceReplica,- ).toHaveBeenCalled();-expect(mockProcessNestedRelationsHelper.processNestedRelations,).toHaveBeenCalledWith(@@ -1578,9 +1574,6 @@ describe('ObjectRecordEventPublisher', () => {userWorkspaceId,userId: 'test-user-id',}),- workspaceDataSource: expect.objectContaining({- getRepository: expect.any(Function),- }),rolePermissionConfig: expect.objectContaining({intersectionOf: [roleId],}),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 1211d257610..99053aaa010 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@@ -313,9 +313,6 @@ export class ObjectRecordEventPublisher {intersectionOf: roleIds,};- const globalWorkspaceDataSource =- await this.globalWorkspaceOrmManager.getGlobalWorkspaceDataSourceReplica();-const selectedFields = this.commonSelectFieldsHelper.computeFromDepth({depth: 1,flatObjectMetadata: objectMetadata,@@ -343,7 +340,6 @@ export class ObjectRecordEventPublisher {authContext: streamData.authContext as unknown as WorkspaceAuthContext,limit: QUERY_MAX_RECORDS_FROM_RELATION,rolePermissionConfig,- workspaceDataSource: globalWorkspaceDataSource,relations: selectedFieldsResult.relations as Record<string,FindOptionsRelations<ObjectLiteral>diff --git a/packages/twenty-server/src/engine/subscriptions/subscriptions.module.ts b/packages/twenty-server/src/engine/subscriptions/subscriptions.module.tsindex 24ec8db4b51..e6469d89004 100644--- a/packages/twenty-server/src/engine/subscriptions/subscriptions.module.ts+++ b/packages/twenty-server/src/engine/subscriptions/subscriptions.module.ts@@ -1,7 +1,6 @@import { Global, Module } from '@nestjs/common';import { TypeOrmModule } from '@nestjs/typeorm';-import { ProcessNestedRelationsV2Helper } from 'src/engine/api/common/common-nested-relations-processor/process-nested-relations-v2.helper';import { ProcessNestedRelationsOrmV2Helper } from 'src/engine/api/common/common-nested-relations-processor/process-nested-relations-orm-v2.helper';import { TwentyORMV2Module } from 'src/engine/twenty-orm-v2/twenty-orm-v2.module';import { ProcessNestedRelationsHelper } from 'src/engine/api/common/common-nested-relations-processor/process-nested-relations.helper';@@ -52,7 +51,6 @@ import { WorkspaceCacheModule } from 'src/engine/workspace-cache/workspace-cacheMetadataEventsToDbListener,WorkspaceEventBroadcaster,ProcessNestedRelationsHelper,- ProcessNestedRelationsV2Helper,ProcessNestedRelationsOrmV2Helper,CommonSelectFieldsHelper,],diff --git a/packages/twenty-server/src/engine/twenty-orm-v2/README.md b/packages/twenty-server/src/engine/twenty-orm-v2/README.mdindex a6d87cb9685..cabcf94cd77 100644--- a/packages/twenty-server/src/engine/twenty-orm-v2/README.md+++ b/packages/twenty-server/src/engine/twenty-orm-v2/README.md@@ -4,7 +4,8 @@ A workspace-data ORM that uses no TypeORM. It exposes the same surface as`src/engine/twenty-orm` so call sites can move over one at a time, and underneath itgenerates parameterised SQL from field metadata and hands it to `pg`.-Behind `IS_ORM_V2_READ_PATH_ENABLED`. Off, nothing changes.+This is now the only read/write path for workspace data. The `IS_ORM_V2_READ_PATH_ENABLED`+flag that used to gate it has been removed, along with the v1 read/write branches it guarded.## Why it can exist at alldiff --git a/packages/twenty-server/src/engine/twenty-orm-v2/datasource/workspace-data-source-v2.service.ts b/packages/twenty-server/src/engine/twenty-orm-v2/datasource/workspace-data-source-v2.service.tsindex cb21d7836b2..79cb32bfd4e 100644--- a/packages/twenty-server/src/engine/twenty-orm-v2/datasource/workspace-data-source-v2.service.ts+++ b/packages/twenty-server/src/engine/twenty-orm-v2/datasource/workspace-data-source-v2.service.ts@@ -6,7 +6,7 @@ import {} from '@nestjs/common';import { InjectDataSource } from '@nestjs/typeorm';-import { Pool } from 'pg';+import { Pool, type PoolConfig, types } from 'pg';import { DataSource } from 'typeorm';import { isDefined } from 'twenty-shared/utils';@@ -24,6 +24,19 @@ import {} from 'src/engine/twenty-orm-v2/exceptions/twenty-orm-v2.exception';import { WorkspaceEventEmitter } from 'src/engine/workspace-event-emitter/workspace-event-emitter';+// node-postgres parses a `date` column into a JS Date (which serializes with a+// time component). Workspace DATE fields are date-only, so parse them as the raw+// 'YYYY-MM-DD' string Postgres returns, matching the v1 TypeORM datasource.+const DATE_ONLY_POOL_TYPES: PoolConfig['types'] = {+ getTypeParser: ((oid: number, format?: unknown) =>+ oid === types.builtins.DATE+ ? (value: string) => value+ : types.getTypeParser(+ oid,+ format as never,+ )) as typeof types.getTypeParser,+};+@Injectable()export class WorkspaceDataSourceV2Serviceimplements OnModuleInit, OnApplicationShutdown@@ -126,6 +139,7 @@ export class WorkspaceDataSourceV2Service}): Pool {const pool = new Pool({connectionString,+ types: DATE_ONLY_POOL_TYPES,max: this.twentyConfigService.get('PG_POOL_MAX_CONNECTIONS'),idleTimeoutMillis: this.twentyConfigService.get('PG_POOL_IDLE_TIMEOUT_MS',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.tsindex dd2f7bc721a..aaccb18a3b9 100644--- 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.ts@@ -257,7 +257,6 @@ describe('WorkspaceEntityManager', () => {IS_WORKFLOW_CORE_INDEX_PAGE_ENABLED: false,IS_WORKFLOW_DISPATCH_FROM_CORE_ENABLED: false,IS_NATIVE_CALL_RECORDING_TABS_ENABLED: false,- IS_ORM_V2_READ_PATH_ENABLED: false,},userWorkspaceRoleMap: {},apiKeyRoleMap: {},@@ -272,7 +271,7 @@ describe('WorkspaceEntityManager', () => {softDelete: jest.fn(),})),} as any,- } as WorkspaceInternalContext;+ } as unknown as WorkspaceInternalContext;mockDataSource = {featureFlagMap: {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 b79abd86127..ba27bc03276 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@@ -1,7 +1,5 @@import { Injectable, type Type } from '@nestjs/common';-import { FeatureFlagKey } from 'twenty-shared/types';-import { isDefined } from 'twenty-shared/utils';import { type ObjectLiteral } from 'typeorm';import { getWorkspaceAuthContext } from 'src/engine/core-modules/auth/storage/workspace-auth-context.storage';@@ -13,7 +11,6 @@ import { ExecuteInWorkspaceContextOptions } from 'src/engine/twenty-orm/global-wimport { 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 {- getWorkspaceContext,type ORMWorkspaceContext,withWorkspaceContext,} from 'src/engine/twenty-orm/storage/orm-workspace-context.storage';@@ -51,21 +48,12 @@ export class GlobalWorkspaceOrmManager {workspaceEntityOrObjectMetadataName,);- if (await this.isOrmV2ReadPathEnabled()) {- return this.workspaceDataSourceV2Service- .getDataSource({ useReplica: false })- .getRepository(- objectMetadataName,- permissionOptions,- ) as unknown as WorkspaceRepository<T>;- }-- const globalDataSource = await this.getGlobalWorkspaceDataSource();-- return globalDataSource.getRepository<T>(- objectMetadataName,- permissionOptions,- );+ return this.workspaceDataSourceV2Service+ .getDataSource({ useReplica: false })+ .getRepository(+ objectMetadataName,+ permissionOptions,+ ) as unknown as WorkspaceRepository<T>;}async getGlobalWorkspaceDataSource(): Promise<GlobalWorkspaceDataSource> {@@ -76,22 +64,6 @@ export class GlobalWorkspaceOrmManager {return this.globalWorkspaceDataSourceService.getGlobalWorkspaceDataSourceReplica();}- async ensureEntityMetadatasLoaded(): Promise<void> {- const context = getWorkspaceContext();-- if (context.entityMetadatas.length > 0) {- return;- }-- const { ORMEntityMetadatas } =- await this.workspaceCacheService.getOrRecompute(- context.authContext.workspace.id,- ['ORMEntityMetadatas'],- );-- context.entityMetadatas.push(...ORMEntityMetadatas);- }-private resolveObjectMetadataName<T extends ObjectLiteral>(workspaceEntityOrObjectMetadataName: Type<T> | string,): string {@@ -104,85 +76,25 @@ export class GlobalWorkspaceOrmManager {);}- private async isOrmV2ReadPathEnabled(): Promise<boolean> {- const context = getWorkspaceContext();- const contextFlag =- context.featureFlagsMap[FeatureFlagKey.IS_ORM_V2_READ_PATH_ENABLED];-- if (isDefined(contextFlag)) {- return contextFlag;- }-- const { featureFlagsMap } = await this.workspaceCacheService.getOrRecompute(- context.authContext.workspace.id,- ['featureFlagsMap'],- );-- return featureFlagsMap[FeatureFlagKey.IS_ORM_V2_READ_PATH_ENABLED] ?? false;- }-async runInWorkspaceTransaction<T>(work: (transactionScope: WorkspaceTransactionScope) => Promise<T>,): Promise<T> {- if (await this.isOrmV2ReadPathEnabled()) {- return this.workspaceDataSourceV2Service- .getDataSource({ useReplica: false })- .transaction((transactionScope) =>- work({- getRepository: <Entity extends ObjectLiteral>(- objectMetadataName: string,- rolePermissionConfig?: RolePermissionConfig,- ): WorkspaceRepository<Entity> =>- transactionScope.getRepository(- objectMetadataName,- rolePermissionConfig,- ) as unknown as WorkspaceRepository<Entity>,- executeRawQuery: (sql, parameters) =>- transactionScope.executeRawQuery(sql, parameters),- }),- );- }-- await this.ensureEntityMetadatasLoaded();-- const { authContext } = getWorkspaceContext();- const globalDataSource = await this.getGlobalWorkspaceDataSource();- const queryRunner = globalDataSource.createQueryRunner();-- try {- await queryRunner.connect();- await queryRunner.startTransaction();-- try {- const result = await work({+ return this.workspaceDataSourceV2Service+ .getDataSource({ useReplica: false })+ .transaction((transactionScope) =>+ work({getRepository: <Entity extends ObjectLiteral>(objectMetadataName: string,rolePermissionConfig?: RolePermissionConfig,): WorkspaceRepository<Entity> =>- queryRunner.manager.getRepository<Entity>(+ transactionScope.getRepository(objectMetadataName,rolePermissionConfig,- authContext,- ),- executeRawQuery: (sql, parameters = []) =>- queryRunner.query(sql, parameters) as Promise<- Record<string, unknown>[]- >,- });-- await queryRunner.commitTransaction();-- return result;- } catch (error) {- if (queryRunner.isTransactionActive) {- await queryRunner.rollbackTransaction();- }-- throw error;- }- } finally {- await queryRunner.release();- }+ ) as unknown as WorkspaceRepository<Entity>,+ executeRawQuery: (sql, parameters) =>+ transactionScope.executeRawQuery(sql, parameters),+ }),+ );}async executeInWorkspaceContext<T>(@@ -225,16 +137,6 @@ export class GlobalWorkspaceOrmManager {'flatRowLevelPermissionPredicateGroupMaps',]);- const entityMetadatas = featureFlagsMap[- FeatureFlagKey.IS_ORM_V2_READ_PATH_ENABLED- ]- ? []- : (- await this.workspaceCacheService.getOrRecompute(workspaceId, [- 'ORMEntityMetadatas',- ])- ).ORMEntityMetadatas;-const { idByNameSingular: objectIdByNameSingular } =buildObjectIdByNameMaps(flatObjectMetadataMaps);@@ -248,7 +150,7 @@ export class GlobalWorkspaceOrmManager {objectIdByNameSingular,featureFlagsMap,permissionsPerRoleId,- entityMetadatas,+ entityMetadatas: [],userWorkspaceRoleMap,apiKeyRoleMap,};@@ -259,23 +161,12 @@ export class GlobalWorkspaceOrmManager {): Promise<ORMWorkspaceContext> {const workspaceId = authContext.workspace.id;- const { flatObjectMetadataMaps, flatFieldMetadataMaps, featureFlagsMap } =+ const { flatObjectMetadataMaps, flatFieldMetadataMaps } =await this.workspaceCacheService.getOrRecompute(workspaceId, ['flatObjectMetadataMaps','flatFieldMetadataMaps',- 'featureFlagsMap',]);- const entityMetadatas = featureFlagsMap[- FeatureFlagKey.IS_ORM_V2_READ_PATH_ENABLED- ]- ? []- : (- await this.workspaceCacheService.getOrRecompute(workspaceId, [- 'ORMEntityMetadatas',- ])- ).ORMEntityMetadatas;-const { idByNameSingular: objectIdByNameSingular } =buildObjectIdByNameMaps(flatObjectMetadataMaps);@@ -301,7 +192,7 @@ export class GlobalWorkspaceOrmManager {objectIdByNameSingular,featureFlagsMap: {} as ORMWorkspaceContext['featureFlagsMap'],permissionsPerRoleId: {},- entityMetadatas,+ entityMetadatas: [],userWorkspaceRoleMap: {},apiKeyRoleMap: {},};diff --git a/packages/twenty-server/src/engine/twenty-orm/global-workspace-datasource/workspace-orm-entity-metadatas-cache.service.ts b/packages/twenty-server/src/engine/twenty-orm/global-workspace-datasource/workspace-orm-entity-metadatas-cache.service.tsindex ec0fdfa56ee..8dd1744197c 100644--- a/packages/twenty-server/src/engine/twenty-orm/global-workspace-datasource/workspace-orm-entity-metadatas-cache.service.ts+++ b/packages/twenty-server/src/engine/twenty-orm/global-workspace-datasource/workspace-orm-entity-metadatas-cache.service.ts@@ -1,26 +1,14 @@import { Injectable } from '@nestjs/common';-import { InjectRepository } from '@nestjs/typeorm';-import { TWENTY_STANDARD_APPLICATION_UNIVERSAL_IDENTIFIER } from 'twenty-shared/application';-import { FeatureFlagKey } from 'twenty-shared/types';-import { isDefined } from 'twenty-shared/utils';-import { type EntityMetadata, EntitySchema, Repository } from 'typeorm';-import { EntitySchemaTransformer } from 'typeorm/entity-schema/EntitySchemaTransformer';-import { EntityMetadataBuilder } from 'typeorm/metadata-builder/EntityMetadataBuilder';+import { type EntityMetadata } from 'typeorm';import { WorkspaceCacheProvider } from 'src/engine/workspace-cache/interfaces/workspace-cache-provider.service';-import { ApplicationEntity } from 'src/engine/core-modules/application/application.entity';-import { FeatureFlagEntity } from 'src/engine/core-modules/feature-flag/feature-flag.entity';-import { FieldMetadataEntity } from 'src/engine/metadata-modules/field-metadata/field-metadata.entity';-import { ObjectMetadataEntity } from 'src/engine/metadata-modules/object-metadata/object-metadata.entity';-import { EntitySchemaFactory } from 'src/engine/twenty-orm/factories/entity-schema.factory';-import { GlobalWorkspaceOrmManager } from 'src/engine/twenty-orm/global-workspace-datasource/global-workspace-orm.manager';-import { buildEntitySchemaMetadataMaps } from 'src/engine/twenty-orm/global-workspace-datasource/types/entity-schema-metadata.type';-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 { WorkspaceCache } from 'src/engine/workspace-cache/decorators/workspace-cache.decorator';+// The v1 TypeORM EntityMetadata graph is no longer built now that the ORM v2+// read/write path is the only path. The cache key is kept because committed+// upgrade commands and the migration runner still invalidate it.@Injectable()@WorkspaceCache('ORMEntityMetadatas', {localDataOnly: true,@@ -29,86 +17,7 @@ import { WorkspaceCache } from 'src/engine/workspace-cache/decorators/workspace-export class WorkspaceORMEntityMetadatasCacheService extends WorkspaceCacheProvider<EntityMetadata[]> {- constructor(- @InjectRepository(ObjectMetadataEntity)- private readonly objectMetadataRepository: Repository<ObjectMetadataEntity>,- @InjectRepository(FieldMetadataEntity)- private readonly fieldMetadataRepository: Repository<FieldMetadataEntity>,- @InjectRepository(ApplicationEntity)- private readonly applicationRepository: Repository<ApplicationEntity>,- @InjectWorkspaceScopedRepository(FeatureFlagEntity)- private readonly featureFlagRepository: WorkspaceScopedRepository<FeatureFlagEntity>,- private readonly entitySchemaFactory: EntitySchemaFactory,- private readonly globalWorkspaceOrmManager: GlobalWorkspaceOrmManager,- ) {- super();- }-- async computeForCache(workspaceId: string): Promise<EntityMetadata[]> {- const ormV2FeatureFlag = await this.featureFlagRepository.findOne(- workspaceId,- { where: { key: FeatureFlagKey.IS_ORM_V2_READ_PATH_ENABLED } },- );-- if (ormV2FeatureFlag?.value) {- return [];- }-- const [objectMetadatas, fieldMetadatas, twentyStandardApplication] =- await Promise.all([- this.objectMetadataRepository.find({- where: { workspaceId },- withDeleted: true,- }),- this.fieldMetadataRepository.find({- where: { workspaceId },- withDeleted: true,- }),- this.applicationRepository.findOne({- where: {- workspaceId,- universalIdentifier:- TWENTY_STANDARD_APPLICATION_UNIVERSAL_IDENTIFIER,- },- }),- ]);-- const { objectMetadataMaps, fieldMetadataMaps } =- buildEntitySchemaMetadataMaps(- objectMetadatas,- fieldMetadatas,- twentyStandardApplication?.id,- );-- const entitySchemas = Object.values(objectMetadataMaps.byId)- .filter(isDefined)- .map((objectMetadata) =>- this.entitySchemaFactory.create(- workspaceId,- objectMetadata,- objectMetadataMaps,- fieldMetadataMaps,- ),- );-- const entityMetadatas = await this.buildEntityMetadatas(entitySchemas);-- return entityMetadatas;- }-- private async buildEntityMetadatas(- entitySchemas: EntitySchema[],- ): Promise<EntityMetadata[]> {- const transformer = new EntitySchemaTransformer();- const metadataArgsStorage = transformer.transform(entitySchemas);-- const dataSource =- await this.globalWorkspaceOrmManager.getGlobalWorkspaceDataSource();- const entityMetadataBuilder = new EntityMetadataBuilder(- dataSource,- metadataArgsStorage,- );-- return entityMetadataBuilder.build();+ async computeForCache(): Promise<EntityMetadata[]> {+ return [];}}diff --git a/packages/twenty-server/src/engine/workspace-manager/dev-seeder/core/utils/seed-feature-flags.util.ts b/packages/twenty-server/src/engine/workspace-manager/dev-seeder/core/utils/seed-feature-flags.util.tsindex 52bd587ab19..6b8265d1091 100644--- a/packages/twenty-server/src/engine/workspace-manager/dev-seeder/core/utils/seed-feature-flags.util.ts+++ b/packages/twenty-server/src/engine/workspace-manager/dev-seeder/core/utils/seed-feature-flags.util.ts@@ -1,4 +1,3 @@-import { isNonEmptyString } from '@sniptt/guards';import { FeatureFlagKey } from 'twenty-shared/types';import { type QueryRunner } from 'typeorm';@@ -14,34 +13,6 @@ const DEFAULT_SEEDED_FEATURE_FLAGS: Partial<Record<FeatureFlagKey, boolean>> = {[FeatureFlagKey.IS_WORKFLOW_DISPATCH_FROM_CORE_ENABLED]: true,};-// Temporary: lets CI run the suite against the ORM v2 read path while it is behind a-// flag. To be deleted once the migration is complete.-const getForcedFeatureFlags = (): FeatureFlagKey[] => {- const forcedFeatureFlags = process.env.TEST_FORCED_FEATURE_FLAGS;-- if (!isNonEmptyString(forcedFeatureFlags)) {- return [];- }-- return forcedFeatureFlags- .split(',')- .map((featureFlagKey) => featureFlagKey.trim())- .filter(isNonEmptyString)- .map((featureFlagKey) => {- if (- !Object.values(FeatureFlagKey).includes(- featureFlagKey as FeatureFlagKey,- )- ) {- throw new Error(- `Unknown feature flag "${featureFlagKey}" in TEST_FORCED_FEATURE_FLAGS`,- );- }-- return featureFlagKey as FeatureFlagKey;- });-};-type SeedFeatureFlagsArgs = {queryRunner: QueryRunner;schemaName: string;@@ -53,21 +24,13 @@ export const seedFeatureFlags = async ({schemaName,workspaceId,}: SeedFeatureFlagsArgs) => {- const featureFlagValueByKey: Partial<Record<FeatureFlagKey, boolean>> = {- ...DEFAULT_SEEDED_FEATURE_FLAGS,- };-- for (const featureFlagKey of getForcedFeatureFlags()) {- featureFlagValueByKey[featureFlagKey] = true;- }-await queryRunner.manager.createQueryBuilder().insert().into(`${schemaName}.${tableName}`, ['key', 'workspaceId', 'value']).orIgnore().values(- Object.entries(featureFlagValueByKey).map(([key, value]) => ({+ Object.entries(DEFAULT_SEEDED_FEATURE_FLAGS).map(([key, value]) => ({key,workspaceId,value,diff --git a/packages/twenty-server/src/engine/workspace-manager/workspace-migration/constant/default-feature-flags.ts b/packages/twenty-server/src/engine/workspace-manager/workspace-migration/constant/default-feature-flags.tsindex f94d0e6fb87..fe54eab664d 100644--- a/packages/twenty-server/src/engine/workspace-manager/workspace-migration/constant/default-feature-flags.ts+++ b/packages/twenty-server/src/engine/workspace-manager/workspace-migration/constant/default-feature-flags.ts@@ -2,7 +2,6 @@ import { FeatureFlagKey } from 'twenty-shared/types';export const DEFAULT_FEATURE_FLAGS = [FeatureFlagKey.IS_REST_METADATA_API_NEW_FORMAT_DIRECT,- FeatureFlagKey.IS_ORM_V2_READ_PATH_ENABLED,FeatureFlagKey.IS_WORKFLOW_VERSION_IN_CORE_ENABLED,FeatureFlagKey.IS_WORKFLOW_DISPATCH_FROM_CORE_ENABLED,] as const satisfies FeatureFlagKey[];diff --git a/packages/twenty-server/src/modules/calendar/calendar-event-creation-manager/drivers/caldav/services/caldav-create-event.service.ts b/packages/twenty-server/src/modules/calendar/calendar-event-creation-manager/drivers/caldav/services/caldav-create-event.service.tsindex bdc34cba273..f0f5847be23 100644--- a/packages/twenty-server/src/modules/calendar/calendar-event-creation-manager/drivers/caldav/services/caldav-create-event.service.ts+++ b/packages/twenty-server/src/modules/calendar/calendar-event-creation-manager/drivers/caldav/services/caldav-create-event.service.ts@@ -12,6 +12,7 @@ import { type CalendarEventCreationDriver } from 'src/modules/calendar/calendar-import { type CalendarEventToCreate } from 'src/modules/calendar/calendar-event-creation-manager/types/calendar-event-to-create.type';import { CalDavClientProvider } from 'src/modules/calendar/calendar-event-import-manager/drivers/caldav/providers/caldav-client.provider';import { CalDavFetchEventsService } from 'src/modules/calendar/calendar-event-import-manager/drivers/caldav/services/caldav-fetch-events.service';+import { CalendarEventParticipantResponseStatus } from 'src/modules/calendar/common/standard-objects/calendar-event-participant.workspace-entity';import { type FetchedCalendarEvent } from 'src/modules/calendar/common/types/fetched-calendar-event';@Injectable()@@ -106,7 +107,7 @@ export class CalDavCreateEventService implements CalendarEventCreationDriver {participants: input.attendees.map((attendee) => ({displayName: attendee.displayName ?? '',handle: attendee.email,- responseStatus: 'needsAction',+ responseStatus: CalendarEventParticipantResponseStatus.NEEDS_ACTION,isOrganizer: false,})),};diff --git a/packages/twenty-server/test/integration/graphql/suites/timeline/timeline-activity-write-path.integration-spec.ts b/packages/twenty-server/test/integration/graphql/suites/timeline/timeline-activity-write-path.integration-spec.tsindex 427e49155d9..98b923e7f87 100644--- a/packages/twenty-server/test/integration/graphql/suites/timeline/timeline-activity-write-path.integration-spec.ts+++ b/packages/twenty-server/test/integration/graphql/suites/timeline/timeline-activity-write-path.integration-spec.ts@@ -8,9 +8,7 @@ import { deleteOneOperationFactory } from 'test/integration/graphql/utils/deleteimport { gql } from 'graphql-tag';import { STANDARD_OBJECTS } from 'twenty-shared/metadata';import { makeMetadataAPIRequest } from 'test/integration/metadata/suites/utils/make-metadata-api-request.util';-import { updateFeatureFlag } from 'test/integration/metadata/suites/utils/update-feature-flag.util';import { waitForAllJobsToFinish } from 'test/integration/utils/wait-for-all-jobs-to-finish.util';-import { FeatureFlagKey } from 'twenty-shared/types';import {type TimelineActivityAction,type TimelineActivityTypeSnapshot,@@ -86,27 +84,6 @@ const updateRecord = async ({expect(response.body.errors).toBeUndefined();};-const withOrmV2ReadPathSetting = async (- enabled: boolean,- callback: () => Promise<void>,-) => {- await updateFeatureFlag({- featureFlag: FeatureFlagKey.IS_ORM_V2_READ_PATH_ENABLED,- value: enabled,- expectToFail: false,- });-- try {- await callback();- } finally {- await updateFeatureFlag({- featureFlag: FeatureFlagKey.IS_ORM_V2_READ_PATH_ENABLED,- value: false,- expectToFail: false,- });- }-};-const findTimelineActivities = async (filter: object,): Promise<TimelineActivityRow[]> => {@@ -189,7 +166,6 @@ const ATTACHMENT_UNIVERSAL_IDENTIFIER =const COMPANY_ID = '20202020-7171-4000-8000-000000000001';const POSITION_COMPANY_ID = '20202020-7171-4000-8000-000000000002';-const LEGACY_COMPOSITE_COMPANY_ID = '20202020-7171-4000-8000-000000000003';const NOTE_COMPANY_ID = '20202020-7171-4000-8000-000000000004';const NOTE_ID = '20202020-7171-4000-8000-000000000005';const NOTE_TARGET_ID = '20202020-7171-4000-8000-000000000006';@@ -237,10 +213,6 @@ const CREATED_RECORD_IDS: { objectMetadataSingularName: string; id: string }[] =id,})),{ objectMetadataSingularName: 'company', id: NOTE_COMPANY_ID },- {- objectMetadataSingularName: 'company',- id: LEGACY_COMPOSITE_COMPANY_ID,- },{objectMetadataSingularName: 'company',id: ORM_V2_COMPOSITE_COMPANY_ID,@@ -336,76 +308,62 @@ describe('timeline activity write path (integration)', () => {});});- it.each([- {- companyId: LEGACY_COMPOSITE_COMPANY_ID,- isOrmV2ReadPathEnabled: false,- ormName: 'legacy ORM',- },- {- companyId: ORM_V2_COMPOSITE_COMPANY_ID,- isOrmV2ReadPathEnabled: true,- ormName: 'ORM v2',- },- ])(- 'should write an updated entry for a $ormName composite field change',- async ({ companyId, isOrmV2ReadPathEnabled }) => {- await withOrmV2ReadPathSetting(isOrmV2ReadPathEnabled, async () => {- await createRecord({- objectMetadataSingularName: 'company',- data: {- id: companyId,- name: 'Composite Field Timeline',- },- });+ it('should write an updated entry for a composite field change', async () => {+ const companyId = ORM_V2_COMPOSITE_COMPANY_ID;- const updateStartedAt = Date.now();+ await createRecord({+ objectMetadataSingularName: 'company',+ data: {+ id: companyId,+ name: 'Composite Field Timeline',+ },+ });- await updateRecord({- objectMetadataSingularName: 'company',- recordId: companyId,- data: {- address: {- addressStreet1: '234 Composite Street',- addressStreet2: '',- addressCity: 'Paris',- addressState: '',- addressCountry: '',- addressPostcode: '',- addressLat: null,- addressLng: null,- },- },- });+ const updateStartedAt = Date.now();- const timelineActivities = await findTimelineActivities({- targetCompanyId: { eq: companyId },- timelineActivityTypeId: {- eq: timelineActivityTypeIdForOrThrow('updated'),+ await updateRecord({+ objectMetadataSingularName: 'company',+ recordId: companyId,+ data: {+ address: {+ addressStreet1: '234 Composite Street',+ addressStreet2: '',+ addressCity: 'Paris',+ addressState: '',+ addressCountry: '',+ addressPostcode: '',+ addressLat: null,+ addressLng: null,+ },+ },+ });++ const timelineActivities = await findTimelineActivities({+ targetCompanyId: { eq: companyId },+ timelineActivityTypeId: {+ eq: timelineActivityTypeIdForOrThrow('updated'),+ },+ });++ expect(timelineActivities).toHaveLength(1);+ expect(+ new Date(timelineActivities[0].happensAt).getTime(),+ ).toBeGreaterThanOrEqual(updateStartedAt);+ expect(timelineActivities[0].properties).toMatchObject({+ diff: {+ address: {+ before: {+ addressStreet1: '',+ addressCity: '',},- });-- expect(timelineActivities).toHaveLength(1);- expect(- new Date(timelineActivities[0].happensAt).getTime(),- ).toBeGreaterThanOrEqual(updateStartedAt);- expect(timelineActivities[0].properties).toMatchObject({- diff: {- address: {- before: {- addressStreet1: '',- addressCity: '',- },- after: {- addressStreet1: '234 Composite Street',- addressCity: 'Paris',- },- },+ after: {+ addressStreet1: '234 Composite Street',+ addressCity: 'Paris',},- });- });- },- );+ },+ },+ });+ });it('should merge every record of a multi record batch', async () => {for (const [index, id] of BATCH_COMPANY_IDS.entries()) {diff --git a/packages/twenty-server/test/integration/utils/assert-forced-feature-flags-are-enabled.util.ts b/packages/twenty-server/test/integration/utils/assert-forced-feature-flags-are-enabled.util.tsdeleted file mode 100644index 540419827f4..00000000000--- a/packages/twenty-server/test/integration/utils/assert-forced-feature-flags-are-enabled.util.ts+++ /dev/null@@ -1,31 +0,0 @@-import { type DataSource } from 'typeorm';--export const assertForcedFeatureFlagsAreEnabled = async (- dataSource: DataSource,-): Promise<void> => {- const forcedFeatureFlags = (process.env.TEST_FORCED_FEATURE_FLAGS ?? '')- .split(',')- .map((featureFlagKey) => featureFlagKey.trim())- .filter((featureFlagKey) => featureFlagKey.length > 0);-- if (forcedFeatureFlags.length === 0) {- return;- }-- const enabledRows: { key: string }[] = await dataSource.query(- `SELECT DISTINCT "key" FROM core."featureFlag" WHERE "value" = true AND "key" = ANY($1)`,- [forcedFeatureFlags],- );-- const enabledKeys = new Set(enabledRows.map(({ key }) => key));-- const missingFeatureFlags = forcedFeatureFlags.filter(- (featureFlagKey) => !enabledKeys.has(featureFlagKey),- );-- if (missingFeatureFlags.length > 0) {- throw new Error(- `TEST_FORCED_FEATURE_FLAGS asked for ${missingFeatureFlags.join(', ')} but no workspace has them enabled. Re-run the suite with a database reset so the seeder picks them up.`,- );- }-};diff --git a/packages/twenty-server/test/integration/utils/setup-test.ts b/packages/twenty-server/test/integration/utils/setup-test.tsindex a707f227e94..11b7cb64607 100644--- a/packages/twenty-server/test/integration/utils/setup-test.ts+++ b/packages/twenty-server/test/integration/utils/setup-test.ts@@ -4,7 +4,6 @@ import 'tsconfig-paths/register';import { rawDataSource } from 'src/database/typeorm/raw/raw.datasource';-import { assertForcedFeatureFlagsAreEnabled } from './assert-forced-feature-flags-are-enabled.util';import { createApp } from './create-app';export default async (_: unknown, projectConfig: JestConfigWithTsJest) => {@@ -20,8 +19,6 @@ export default async (_: unknown, projectConfig: JestConfigWithTsJest) => {await rawDataSource.initialize();- await assertForcedFeatureFlagsAreEnabled(rawDataSource);-await app.listen(projectConfig.globals.APP_PORT as number);global.app = app;diff --git a/packages/twenty-shared/src/types/FeatureFlagKey.ts b/packages/twenty-shared/src/types/FeatureFlagKey.tsindex 50157359d29..1a1bc042267 100644--- a/packages/twenty-shared/src/types/FeatureFlagKey.ts+++ b/packages/twenty-shared/src/types/FeatureFlagKey.ts@@ -12,5 +12,4 @@ export enum FeatureFlagKey {IS_WORKFLOW_CORE_INDEX_PAGE_ENABLED = 'IS_WORKFLOW_CORE_INDEX_PAGE_ENABLED',IS_WORKFLOW_DISPATCH_FROM_CORE_ENABLED = 'IS_WORKFLOW_DISPATCH_FROM_CORE_ENABLED',IS_NATIVE_CALL_RECORDING_TABS_ENABLED = 'IS_NATIVE_CALL_RECORDING_TABS_ENABLED',- IS_ORM_V2_READ_PATH_ENABLED = 'IS_ORM_V2_READ_PATH_ENABLED',}