Skip to content

The open alternative to Salesforce, designed for AI.

Index timeline activity linked record id and skip unchanged happensAt updates (#28277)

neo773adefd18bdad5
diff --git a/packages/twenty-server/src/database/commands/upgrade-version-command/2-50/2-50-upgrade-version-command.module.ts b/packages/twenty-server/src/database/commands/upgrade-version-command/2-50/2-50-upgrade-version-command.module.ts
index 25fac930556..f4e8b61eabb 100644
--- a/packages/twenty-server/src/database/commands/upgrade-version-command/2-50/2-50-upgrade-version-command.module.ts
+++ b/packages/twenty-server/src/database/commands/upgrade-version-command/2-50/2-50-upgrade-version-command.module.ts
@@ -2,9 +2,12 @@ import { Module } from '@nestjs/common';
import { WorkspaceIteratorModule } from 'src/database/commands/command-runners/workspace-iterator.module';
import { BackfillMemberRoleUniversalIdentifierCommand } from 'src/database/commands/upgrade-version-command/2-50/2-50-workspace-command-1792413669590-backfill-member-role-universal-identifier.command';
+import { AddTimelineActivityLinkedRecordIdIndexCommand } from 'src/database/commands/upgrade-version-command/2-50/2-50-workspace-command-1792423420000-add-timeline-activity-linked-record-id-index.command';
import { ApplicationModule } from 'src/engine/core-modules/application/application.module';
import { RoleModule } from 'src/engine/metadata-modules/role/role.module';
+import { WorkspaceSchemaManagerModule } from 'src/engine/twenty-orm/workspace-schema-manager/workspace-schema-manager.module';
import { WorkspaceCacheModule } from 'src/engine/workspace-cache/workspace-cache.module';
+import { WorkspaceMigrationModule } from 'src/engine/workspace-manager/workspace-migration/workspace-migration.module';
@Module({
imports: [
@@ -12,7 +15,12 @@ import { WorkspaceCacheModule } from 'src/engine/workspace-cache/workspace-cache
RoleModule,
WorkspaceCacheModule,
WorkspaceIteratorModule,
+ WorkspaceMigrationModule,
+ WorkspaceSchemaManagerModule,
+ ],
+ providers: [
+ BackfillMemberRoleUniversalIdentifierCommand,
+ AddTimelineActivityLinkedRecordIdIndexCommand,
],
- providers: [BackfillMemberRoleUniversalIdentifierCommand],
})
export class V2_50_UpgradeVersionCommandModule {}
diff --git a/packages/twenty-server/src/database/commands/upgrade-version-command/2-50/2-50-workspace-command-1792423420000-add-timeline-activity-linked-record-id-index.command.ts b/packages/twenty-server/src/database/commands/upgrade-version-command/2-50/2-50-workspace-command-1792423420000-add-timeline-activity-linked-record-id-index.command.ts
new file mode 100644
index 00000000000..e4da50f47bf
--- /dev/null
+++ b/packages/twenty-server/src/database/commands/upgrade-version-command/2-50/2-50-workspace-command-1792423420000-add-timeline-activity-linked-record-id-index.command.ts
@@ -0,0 +1,255 @@
+import { Command } from 'nest-commander';
+import { STANDARD_OBJECTS } from 'twenty-shared/metadata';
+import { isDefined } from 'twenty-shared/utils';
+
+import { ProvisionedWorkspaceCommandRunner } from 'src/database/commands/command-runners/provisioned-workspace.command-runner';
+import { WorkspaceIteratorService } from 'src/database/commands/command-runners/workspace-iterator.service';
+import { type RunOnWorkspaceArgs } from 'src/database/commands/command-runners/workspace.command-runner';
+import { getStandardFlatEntitiesToCreateOrThrow } from 'src/database/commands/upgrade-version-command/2-10/utils/get-standard-flat-entities-to-create-or-throw.util';
+import { ApplicationService } from 'src/engine/core-modules/application/application.service';
+import { RegisteredWorkspaceCommand } from 'src/engine/core-modules/upgrade/decorators/registered-workspace-command.decorator';
+import { findFlatEntityByUniversalIdentifier } from 'src/engine/metadata-modules/flat-entity/utils/find-flat-entity-by-universal-identifier.util';
+import { type FlatFieldMetadata } from 'src/engine/metadata-modules/flat-field-metadata/types/flat-field-metadata.type';
+import { 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 { WorkspaceSchemaManagerService } from 'src/engine/twenty-orm/workspace-schema-manager/workspace-schema-manager.service';
+import { WorkspaceCacheService } from 'src/engine/workspace-cache/services/workspace-cache.service';
+import { computeTwentyStandardApplicationAllFlatEntityMaps } from 'src/engine/workspace-manager/twenty-standard-application/utils/twenty-standard-application-all-flat-entity-maps.constant';
+import { WorkspaceMigrationBuilderException } from 'src/engine/workspace-manager/workspace-migration/exceptions/workspace-migration-builder-exception';
+import { WorkspaceMigrationValidateBuildAndRunService } from 'src/engine/workspace-manager/workspace-migration/services/workspace-migration-validate-build-and-run-service';
+import { getWorkspaceSchemaContextForMigration } from 'src/engine/workspace-manager/workspace-migration/workspace-migration-runner/utils/get-workspace-schema-context-for-migration.util';
+
+const TIMELINE_ACTIVITY = STANDARD_OBJECTS.timelineActivity;
+
+const LINKED_RECORD_ID_INDEX_UNIVERSAL_IDENTIFIER =
+ TIMELINE_ACTIVITY.indexes.linkedRecordIdIndex.universalIdentifier;
+
+@RegisteredWorkspaceCommand('2.50.0', 1792423420000)
+@Command({
+ name: 'upgrade:2-50:add-timeline-activity-linked-record-id-index',
+ description:
+ 'Index timelineActivity.linkedRecordId so linked activities can follow their source record without scanning the table',
+})
+export class AddTimelineActivityLinkedRecordIdIndexCommand extends ProvisionedWorkspaceCommandRunner {
+ constructor(
+ protected readonly workspaceIteratorService: WorkspaceIteratorService,
+ private readonly applicationService: ApplicationService,
+ private readonly workspaceCacheService: WorkspaceCacheService,
+ private readonly workspaceMigrationValidateBuildAndRunService: WorkspaceMigrationValidateBuildAndRunService,
+ private readonly workspaceSchemaManagerService: WorkspaceSchemaManagerService,
+ ) {
+ super(workspaceIteratorService);
+ }
+
+ override async runOnWorkspace(args: RunOnWorkspaceArgs): Promise<void> {
+ await this.up(args);
+ }
+
+ async up({
+ workspaceId,
+ dataSource,
+ options,
+ }: RunOnWorkspaceArgs): Promise<void> {
+ if (!isDefined(dataSource)) {
+ this.logger.log(`No data source for workspace ${workspaceId}, skipping`);
+
+ return;
+ }
+
+ const { flatObjectMetadataMaps, flatFieldMetadataMaps, flatIndexMaps } =
+ await this.workspaceCacheService.getOrRecompute(workspaceId, [
+ 'flatObjectMetadataMaps',
+ 'flatFieldMetadataMaps',
+ 'flatIndexMaps',
+ ]);
+
+ const timelineActivityFlatObjectMetadata =
+ findFlatEntityByUniversalIdentifier<FlatObjectMetadata>({
+ flatEntityMaps: flatObjectMetadataMaps,
+ universalIdentifier: TIMELINE_ACTIVITY.universalIdentifier,
+ });
+
+ const linkedRecordIdFlatFieldMetadata =
+ findFlatEntityByUniversalIdentifier<FlatFieldMetadata>({
+ flatEntityMaps: flatFieldMetadataMaps,
+ universalIdentifier:
+ TIMELINE_ACTIVITY.fields.linkedRecordId.universalIdentifier,
+ });
+
+ if (
+ !isDefined(timelineActivityFlatObjectMetadata) ||
+ !isDefined(linkedRecordIdFlatFieldMetadata)
+ ) {
+ this.logger.log(
+ `timelineActivity.linkedRecordId not found for workspace ${workspaceId}, skipping`,
+ );
+
+ return;
+ }
+
+ const { twentyStandardFlatApplication } =
+ await this.applicationService.findWorkspaceTwentyStandardAndCustomApplicationOrThrow(
+ { workspaceId },
+ );
+
+ const { allFlatEntityMaps: standardAllFlatEntityMaps } =
+ computeTwentyStandardApplicationAllFlatEntityMaps({
+ now: new Date().toISOString(),
+ workspaceId,
+ twentyStandardApplicationId: twentyStandardFlatApplication.id,
+ });
+
+ const [indexToCreate] =
+ getStandardFlatEntitiesToCreateOrThrow<FlatIndexMetadata>({
+ standardFlatEntityMaps: standardAllFlatEntityMaps.flatIndexMaps,
+ existingFlatEntityMaps: flatIndexMaps,
+ universalIdentifiers: [LINKED_RECORD_ID_INDEX_UNIVERSAL_IDENTIFIER],
+ });
+
+ if (!isDefined(indexToCreate)) {
+ return;
+ }
+
+ if (options.dryRun) {
+ this.logger.log(
+ `[DRY RUN] Would create index ${indexToCreate.name} for workspace ${workspaceId}`,
+ );
+
+ return;
+ }
+
+ const { schemaName, tableName } = getWorkspaceSchemaContextForMigration({
+ workspaceId,
+ objectMetadata: timelineActivityFlatObjectMetadata,
+ });
+
+ const queryRunner = dataSource.createQueryRunner();
+ let isQueryRunnerConnected = false;
+
+ try {
+ await queryRunner.connect();
+ isQueryRunnerConnected = true;
+
+ const invalidIndexes = await dataSource.query<{ name: string }[]>(
+ `SELECT c.relname AS name
+ FROM pg_index i
+ JOIN pg_class c ON c.oid = i.indexrelid
+ JOIN pg_namespace n ON n.oid = c.relnamespace
+ WHERE n.nspname = $1 AND c.relname = $2 AND NOT i.indisvalid`,
+ [schemaName, indexToCreate.name],
+ );
+
+ for (const { name } of invalidIndexes) {
+ await this.workspaceSchemaManagerService.indexManager.dropIndex({
+ queryRunner,
+ schemaName,
+ indexName: name,
+ });
+
+ this.logger.warn(
+ `Dropped invalid index ${name} left by an interrupted build in workspace ${workspaceId}, recreating it`,
+ );
+ }
+
+ await this.workspaceSchemaManagerService.indexManager.createIndex({
+ queryRunner,
+ schemaName,
+ tableName,
+ index: {
+ name: indexToCreate.name,
+ columns: [linkedRecordIdFlatFieldMetadata.name],
+ isUnique: indexToCreate.isUnique,
+ type: indexToCreate.indexType,
+ where: indexToCreate.indexWhereClause ?? undefined,
+ },
+ concurrently: true,
+ });
+ } finally {
+ if (isQueryRunnerConnected) {
+ await queryRunner.release();
+ }
+ }
+
+ await this.runIndexMigration({
+ workspaceId,
+ applicationUniversalIdentifier:
+ twentyStandardFlatApplication.universalIdentifier,
+ flatEntityToCreate: [indexToCreate],
+ flatEntityToDelete: [],
+ });
+
+ this.logger.log(
+ `Created index ${indexToCreate.name} for workspace ${workspaceId}`,
+ );
+ }
+
+ async down({ workspaceId, options }: RunOnWorkspaceArgs): Promise<void> {
+ const { flatIndexMaps } = await this.workspaceCacheService.getOrRecompute(
+ workspaceId,
+ ['flatIndexMaps'],
+ );
+
+ const indexToDelete =
+ findFlatEntityByUniversalIdentifier<FlatIndexMetadata>({
+ flatEntityMaps: flatIndexMaps,
+ universalIdentifier: LINKED_RECORD_ID_INDEX_UNIVERSAL_IDENTIFIER,
+ });
+
+ if (!isDefined(indexToDelete)) {
+ return;
+ }
+
+ if (options.dryRun) {
+ this.logger.log(
+ `[DRY RUN] Would drop index ${indexToDelete.name} for workspace ${workspaceId}`,
+ );
+
+ return;
+ }
+
+ const { twentyStandardFlatApplication } =
+ await this.applicationService.findWorkspaceTwentyStandardAndCustomApplicationOrThrow(
+ { workspaceId },
+ );
+
+ await this.runIndexMigration({
+ workspaceId,
+ applicationUniversalIdentifier:
+ twentyStandardFlatApplication.universalIdentifier,
+ flatEntityToCreate: [],
+ flatEntityToDelete: [indexToDelete],
+ });
+ }
+
+ private async runIndexMigration({
+ workspaceId,
+ applicationUniversalIdentifier,
+ flatEntityToCreate,
+ flatEntityToDelete,
+ }: {
+ workspaceId: string;
+ applicationUniversalIdentifier: string;
+ flatEntityToCreate: FlatIndexMetadata[];
+ flatEntityToDelete: FlatIndexMetadata[];
+ }): Promise<void> {
+ const result =
+ await this.workspaceMigrationValidateBuildAndRunService.validateBuildAndRunLegacyWorkspaceMigration(
+ {
+ isSystemBuild: true,
+ applicationUniversalIdentifier,
+ workspaceId,
+ allFlatEntityOperationByMetadataName: {
+ index: {
+ flatEntityToCreate,
+ flatEntityToDelete,
+ flatEntityToUpdate: [],
+ },
+ },
+ },
+ );
+
+ if (result.status === 'fail') {
+ throw new WorkspaceMigrationBuilderException(result);
+ }
+ }
+}
diff --git a/packages/twenty-server/src/engine/workspace-manager/twenty-standard-application/utils/index/compute-timeline-activity-standard-flat-index-metadata.util.ts b/packages/twenty-server/src/engine/workspace-manager/twenty-standard-application/utils/index/compute-timeline-activity-standard-flat-index-metadata.util.ts
index 99857f8a0ab..ebaded71cea 100644
--- a/packages/twenty-server/src/engine/workspace-manager/twenty-standard-application/utils/index/compute-timeline-activity-standard-flat-index-metadata.util.ts
+++ b/packages/twenty-server/src/engine/workspace-manager/twenty-standard-application/utils/index/compute-timeline-activity-standard-flat-index-metadata.util.ts
@@ -160,4 +160,16 @@ export const buildTimelineActivityStandardFlatIndexMetadatas = ({
twentyStandardApplicationId,
now,
}),
+ linkedRecordIdIndex: createStandardIndexFlatMetadata({
+ objectName,
+ workspaceId,
+ context: {
+ indexName: 'linkedRecordIdIndex',
+ relatedFieldNames: ['linkedRecordId'],
+ },
+ standardObjectMetadataRelatedEntityIds,
+ dependencyFlatEntityMaps,
+ twentyStandardApplicationId,
+ now,
+ }),
});
diff --git a/packages/twenty-server/src/modules/timeline/repositories/timeline-activity.repository.ts b/packages/twenty-server/src/modules/timeline/repositories/timeline-activity.repository.ts
index 1d2415e70f8..5c722800eaa 100644
--- a/packages/twenty-server/src/modules/timeline/repositories/timeline-activity.repository.ts
+++ b/packages/twenty-server/src/modules/timeline/repositories/timeline-activity.repository.ts
@@ -125,7 +125,7 @@ export class TimelineActivityRepository {
);
const timelineActivities = await timelineActivityRepository.find({
- select: ['id', 'linkedRecordId'],
+ select: ['id', 'linkedRecordId', 'happensAt'],
where: {
linkedRecordId: In([...happensAtByLinkedRecordId.keys()]),
timelineActivityTypeId: In(timelineActivityTypeIds),
@@ -137,9 +137,14 @@ export class TimelineActivityRepository {
timelineActivity.linkedRecordId,
);
- return isDefined(happensAt)
- ? [{ criteria: timelineActivity.id, partialEntity: { happensAt } }]
- : [];
+ if (
+ !isDefined(happensAt) ||
+ new Date(timelineActivity.happensAt).getTime() === happensAt.getTime()
+ ) {
+ return [];
+ }
+
+ return [{ criteria: timelineActivity.id, partialEntity: { happensAt } }];
});
for (const updateInputsChunk of chunk(updateInputs, QUERY_MAX_RECORDS)) {
diff --git a/packages/twenty-shared/src/metadata/__tests__/__snapshots__/standardObjectUniversalIdentifiers.test.ts.snap b/packages/twenty-shared/src/metadata/__tests__/__snapshots__/standardObjectUniversalIdentifiers.test.ts.snap
index bc702d07bfd..f7abfaa6984 100644
--- a/packages/twenty-shared/src/metadata/__tests__/__snapshots__/standardObjectUniversalIdentifiers.test.ts.snap
+++ b/packages/twenty-shared/src/metadata/__tests__/__snapshots__/standardObjectUniversalIdentifiers.test.ts.snap
@@ -3708,6 +3708,9 @@ exports[`STANDARD_OBJECTS universal identifiers should never change without an e
"dashboardIdIndex": {
"universalIdentifier": "e8821da9-728d-470a-bf5b-5a981fff7880",
},
+ "linkedRecordIdIndex": {
+ "universalIdentifier": "00e9bf50-0e98-4105-8cb7-31c94995ff55",
+ },
"messageCampaignIdIndex": {
"universalIdentifier": "e808e721-91cc-4b9b-b24b-806d64b4d5e2",
},
diff --git a/packages/twenty-shared/src/metadata/constants/standard-object.constant.ts b/packages/twenty-shared/src/metadata/constants/standard-object.constant.ts
index 5fdcf0c398c..200b0affbbf 100644
--- a/packages/twenty-shared/src/metadata/constants/standard-object.constant.ts
+++ b/packages/twenty-shared/src/metadata/constants/standard-object.constant.ts
@@ -1268,6 +1268,9 @@ export const STANDARD_OBJECTS = {
messageCampaignIdIndex: {
universalIdentifier: 'e808e721-91cc-4b9b-b24b-806d64b4d5e2',
},
+ linkedRecordIdIndex: {
+ universalIdentifier: '00e9bf50-0e98-4105-8cb7-31c94995ff55',
+ },
},
views: {
allTimelineActivities: buildStandardObjectIndexView({