Fix ORM event mixing records in batch updates (#15985)

While investigating the issue a customer was facing, I discovered that
before records and after records could be in different order, making the
orm event and timeline activity engine mix records
This commit is contained in:
Charles Bochet
2025-11-22 13:16:04 +01:00
committed by GitHub
parent b711c11431
commit 30e504628c
18 changed files with 329 additions and 90 deletions
@@ -0,0 +1,50 @@
import { type ObjectsPermissions } from 'twenty-shared/types';
import { type ObjectLiteral } from 'typeorm';
import { type QueryExpressionMap } from 'typeorm/query-builder/QueryExpressionMap';
import { type FeatureFlagMap } from 'src/engine/core-modules/feature-flag/interfaces/feature-flag-map.interface';
import { type WorkspaceInternalContext } from 'src/engine/twenty-orm/interfaces/workspace-internal-context.interface';
import { type AuthContext } from 'src/engine/core-modules/auth/types/auth-context.type';
import { type WorkspaceDeleteQueryBuilder } from 'src/engine/twenty-orm/repository/workspace-delete-query-builder';
import { type WorkspaceInsertQueryBuilder } from 'src/engine/twenty-orm/repository/workspace-insert-query-builder';
import { WorkspaceSelectQueryBuilder } from 'src/engine/twenty-orm/repository/workspace-select-query-builder';
import { type WorkspaceSoftDeleteQueryBuilder } from 'src/engine/twenty-orm/repository/workspace-soft-delete-query-builder';
import { type WorkspaceUpdateQueryBuilder } from 'src/engine/twenty-orm/repository/workspace-update-query-builder';
type EventSelectQueryBuilderFactoryArgs<T extends ObjectLiteral> = {
queryBuilder:
| WorkspaceUpdateQueryBuilder<T>
| WorkspaceSoftDeleteQueryBuilder<T>
| WorkspaceDeleteQueryBuilder<T>
| WorkspaceInsertQueryBuilder<T>;
authContext: AuthContext;
internalContext: WorkspaceInternalContext;
featureFlagMap: FeatureFlagMap;
expressionMap: QueryExpressionMap;
objectRecordsPermissions: ObjectsPermissions;
};
export const computeEventSelectQueryBuilder = <T extends ObjectLiteral>({
queryBuilder,
authContext,
featureFlagMap,
internalContext,
expressionMap,
objectRecordsPermissions,
}: EventSelectQueryBuilderFactoryArgs<T>): WorkspaceSelectQueryBuilder<T> => {
const eventSelectQueryBuilder = new WorkspaceSelectQueryBuilder(
queryBuilder as unknown as WorkspaceSelectQueryBuilder<T>,
objectRecordsPermissions,
internalContext,
true,
authContext,
featureFlagMap,
);
eventSelectQueryBuilder.expressionMap.wheres = expressionMap.wheres;
eventSelectQueryBuilder.expressionMap.aliases = expressionMap.aliases;
eventSelectQueryBuilder.setParameters(expressionMap.parameters);
return eventSelectQueryBuilder;
};