Skip to content

The open alternative to Salesforce, designed for AI.

Fix timeline activity search vector deletion + support ts_vector creation through create field actions handler (#24846)

Paul Rastoin78a8ba24d133
diff --git a/packages/twenty-server/src/database/commands/upgrade-version-command/2-35/2-35-upgrade-version-command.module.ts b/packages/twenty-server/src/database/commands/upgrade-version-command/2-35/2-35-upgrade-version-command.module.ts
index 07d31e53192..856b241129e 100644
--- a/packages/twenty-server/src/database/commands/upgrade-version-command/2-35/2-35-upgrade-version-command.module.ts
+++ b/packages/twenty-server/src/database/commands/upgrade-version-command/2-35/2-35-upgrade-version-command.module.ts
@@ -6,6 +6,7 @@ import { BackfillCommandMenuItemTargetObjectMetadataCommand } from 'src/database
import { RestoreStandardDefaultRelationFieldsCommand } from 'src/database/commands/upgrade-version-command/2-35/2-35-workspace-command-1787582101000-restore-standard-default-relation-fields.command';
import { RepairTimelineActivityTargetFieldNamesCommand } from 'src/database/commands/upgrade-version-command/2-35/2-35-workspace-command-1787641226000-repair-timeline-activity-target-field-names.command';
import { ContractTimelineActivityCompatibilityCommand } from 'src/database/commands/upgrade-version-command/2-35/2-35-workspace-command-1787648000000-contract-timeline-activity-compatibility.command';
+import { BackfillTimelineActivitySearchFieldMetadataCommand } from 'src/database/commands/upgrade-version-command/2-35/2-35-workspace-command-1787749300000-backfill-timeline-activity-search-field-metadata.command';
import { ApplicationModule } from 'src/engine/core-modules/application/application.module';
import { WorkspaceCacheModule } from 'src/engine/workspace-cache/workspace-cache.module';
import { WorkspaceMigrationRunnerModule } from 'src/engine/workspace-manager/workspace-migration/workspace-migration-runner/workspace-migration-runner.module';
@@ -25,6 +26,7 @@ import { WorkspaceMigrationModule } from 'src/engine/workspace-manager/workspace
RestoreStandardDefaultRelationFieldsCommand,
RepairTimelineActivityTargetFieldNamesCommand,
ContractTimelineActivityCompatibilityCommand,
+ BackfillTimelineActivitySearchFieldMetadataCommand,
],
})
export class V2_35_UpgradeVersionCommandModule {}
diff --git a/packages/twenty-server/src/database/commands/upgrade-version-command/2-35/2-35-workspace-command-1787749300000-backfill-timeline-activity-search-field-metadata.command.ts b/packages/twenty-server/src/database/commands/upgrade-version-command/2-35/2-35-workspace-command-1787749300000-backfill-timeline-activity-search-field-metadata.command.ts
new file mode 100644
index 00000000000..2f287245303
--- /dev/null
+++ b/packages/twenty-server/src/database/commands/upgrade-version-command/2-35/2-35-workspace-command-1787749300000-backfill-timeline-activity-search-field-metadata.command.ts
@@ -0,0 +1,217 @@
+import { Command } from 'nest-commander';
+
+import { getSearchFieldUniversalIdentifier } from 'twenty-shared/application';
+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 { 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 FlatObjectMetadata } from 'src/engine/metadata-modules/flat-object-metadata/types/flat-object-metadata.type';
+import { buildFlatSearchFieldMetadataForField } from 'src/engine/metadata-modules/flat-search-field-metadata/utils/build-flat-search-field-metadata-for-field.util';
+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 { WorkspaceMigrationValidateBuildAndRunService } from 'src/engine/workspace-manager/workspace-migration/services/workspace-migration-validate-build-and-run-service';
+
+const TIMELINE_ACTIVITY = STANDARD_OBJECTS.timelineActivity;
+const LINKED_RECORD_CACHED_NAME_FIELD_UNIVERSAL_IDENTIFIER =
+ TIMELINE_ACTIVITY.fields.linkedRecordCachedName.universalIdentifier;
+const SEARCH_VECTOR_FIELD_UNIVERSAL_IDENTIFIER =
+ TIMELINE_ACTIVITY.fields.searchVector.universalIdentifier;
+
+@RegisteredWorkspaceCommand('2.35.0', 1787749300000)
+@Command({
+ name: 'upgrade:2-35:backfill-timeline-activity-search-field-metadata',
+ description:
+ 'Create the timelineActivity linkedRecordCachedName search field metadata row where it is missing, restoring the searchVector field itself when the workspace lost it. Workspaces upgraded from before the 2.33 search repoint never had this row, and dropping the legacy name field cascades away both their old row and the generated column. Idempotent.',
+})
+export class BackfillTimelineActivitySearchFieldMetadataCommand extends ProvisionedWorkspaceCommandRunner {
+ constructor(
+ protected readonly workspaceIteratorService: WorkspaceIteratorService,
+ private readonly workspaceCacheService: WorkspaceCacheService,
+ private readonly workspaceMigrationValidateBuildAndRunService: WorkspaceMigrationValidateBuildAndRunService,
+ ) {
+ super(workspaceIteratorService);
+ }
+
+ override async runOnWorkspace({
+ workspaceId,
+ options,
+ }: RunOnWorkspaceArgs): Promise<void> {
+ const isDryRun = options.dryRun ?? false;
+
+ const {
+ flatObjectMetadataMaps,
+ flatFieldMetadataMaps,
+ flatSearchFieldMetadataMaps,
+ } = await this.workspaceCacheService.getOrRecompute(workspaceId, [
+ 'flatObjectMetadataMaps',
+ 'flatFieldMetadataMaps',
+ 'flatSearchFieldMetadataMaps',
+ ]);
+
+ const timelineActivityFlatObjectMetadata =
+ findFlatEntityByUniversalIdentifier<FlatObjectMetadata>({
+ flatEntityMaps: flatObjectMetadataMaps,
+ universalIdentifier: TIMELINE_ACTIVITY.universalIdentifier,
+ });
+
+ if (!isDefined(timelineActivityFlatObjectMetadata)) {
+ this.logger.log(
+ `timelineActivity object does not exist for workspace ${workspaceId}, skipping`,
+ );
+
+ return;
+ }
+
+ const linkedRecordCachedNameFlatFieldMetadata =
+ findFlatEntityByUniversalIdentifier<FlatFieldMetadata>({
+ flatEntityMaps: flatFieldMetadataMaps,
+ universalIdentifier:
+ LINKED_RECORD_CACHED_NAME_FIELD_UNIVERSAL_IDENTIFIER,
+ });
+
+ if (!isDefined(linkedRecordCachedNameFlatFieldMetadata)) {
+ this.logger.log(
+ `timelineActivity.linkedRecordCachedName does not exist for workspace ${workspaceId}, skipping`,
+ );
+
+ return;
+ }
+
+ const searchVectorFlatFieldMetadata =
+ findFlatEntityByUniversalIdentifier<FlatFieldMetadata>({
+ flatEntityMaps: flatFieldMetadataMaps,
+ universalIdentifier: SEARCH_VECTOR_FIELD_UNIVERSAL_IDENTIFIER,
+ });
+
+ const standardFlatSearchFieldMetadata =
+ flatSearchFieldMetadataMaps.byUniversalIdentifier[
+ getSearchFieldUniversalIdentifier({
+ applicationUniversalIdentifier:
+ timelineActivityFlatObjectMetadata.applicationUniversalIdentifier,
+ fieldMetadataUniversalIdentifier:
+ LINKED_RECORD_CACHED_NAME_FIELD_UNIVERSAL_IDENTIFIER,
+ })
+ ];
+
+ if (
+ isDefined(standardFlatSearchFieldMetadata) &&
+ isDefined(searchVectorFlatFieldMetadata)
+ ) {
+ this.logger.log(
+ `timelineActivity search vector already indexes linkedRecordCachedName for workspace ${workspaceId}, skipping`,
+ );
+
+ return;
+ }
+
+ this.logger.log(
+ `${isDryRun ? '[DRY RUN] ' : ''}Restoring the timelineActivity ${[
+ ...(isDefined(standardFlatSearchFieldMetadata)
+ ? []
+ : ['search field metadata']),
+ ...(isDefined(searchVectorFlatFieldMetadata)
+ ? []
+ : ['searchVector field']),
+ ].join(' and ')} for workspace ${workspaceId}`,
+ );
+
+ if (isDryRun) {
+ return;
+ }
+
+ const validateAndBuildResult =
+ await this.workspaceMigrationValidateBuildAndRunService.validateBuildAndRunLegacyWorkspaceMigration(
+ {
+ isSystemBuild: true,
+ workspaceId,
+ applicationUniversalIdentifier:
+ timelineActivityFlatObjectMetadata.applicationUniversalIdentifier,
+ allFlatEntityOperationByMetadataName: {
+ fieldMetadata: {
+ flatEntityToCreate: isDefined(searchVectorFlatFieldMetadata)
+ ? []
+ : [
+ this.getStandardSearchVectorFlatFieldMetadata({
+ workspaceId,
+ twentyStandardApplicationId:
+ timelineActivityFlatObjectMetadata.applicationId,
+ }),
+ ],
+ flatEntityToDelete: [],
+ flatEntityToUpdate: [],
+ },
+ searchFieldMetadata: {
+ flatEntityToCreate: isDefined(standardFlatSearchFieldMetadata)
+ ? []
+ : [
+ buildFlatSearchFieldMetadataForField({
+ flatObjectMetadata: timelineActivityFlatObjectMetadata,
+ flatFieldMetadata:
+ linkedRecordCachedNameFlatFieldMetadata,
+ tsVectorFlatFieldMetadata: {
+ universalIdentifier:
+ SEARCH_VECTOR_FIELD_UNIVERSAL_IDENTIFIER,
+ },
+ position: 0,
+ }),
+ ],
+ flatEntityToDelete: [],
+ flatEntityToUpdate: [],
+ },
+ },
+ },
+ );
+
+ if (validateAndBuildResult.status === 'fail') {
+ throw new Error(
+ `Failed to restore the timelineActivity search field metadata for workspace ${workspaceId}:\n${JSON.stringify(
+ validateAndBuildResult,
+ null,
+ 2,
+ )}`,
+ );
+ }
+
+ this.logger.log(
+ `Restored the timelineActivity search vector for workspace ${workspaceId}`,
+ );
+ }
+
+ private getStandardSearchVectorFlatFieldMetadata({
+ workspaceId,
+ twentyStandardApplicationId,
+ }: {
+ workspaceId: string;
+ twentyStandardApplicationId: string;
+ }): FlatFieldMetadata {
+ const { allFlatEntityMaps: standardAllFlatEntityMaps } =
+ computeTwentyStandardApplicationAllFlatEntityMaps({
+ now: new Date().toISOString(),
+ workspaceId,
+ twentyStandardApplicationId,
+ });
+
+ const standardSearchVectorFlatFieldMetadata =
+ findFlatEntityByUniversalIdentifier<FlatFieldMetadata>({
+ flatEntityMaps: standardAllFlatEntityMaps.flatFieldMetadataMaps,
+ universalIdentifier: SEARCH_VECTOR_FIELD_UNIVERSAL_IDENTIFIER,
+ });
+
+ if (!isDefined(standardSearchVectorFlatFieldMetadata)) {
+ throw new Error(
+ 'Standard application is missing timelineActivity.searchVector',
+ );
+ }
+
+ return {
+ ...standardSearchVectorFlatFieldMetadata,
+ viewFieldIds: [],
+ viewFieldUniversalIdentifiers: [],
+ };
+ }
+}
diff --git a/packages/twenty-server/src/engine/metadata-modules/flat-search-field-metadata/utils/resolve-search-vector-as-expression-for-ts-vector-field.util.ts b/packages/twenty-server/src/engine/metadata-modules/flat-search-field-metadata/utils/resolve-search-vector-as-expression-for-ts-vector-field.util.ts
new file mode 100644
index 00000000000..587755da832
--- /dev/null
+++ b/packages/twenty-server/src/engine/metadata-modules/flat-search-field-metadata/utils/resolve-search-vector-as-expression-for-ts-vector-field.util.ts
@@ -0,0 +1,43 @@
+import { type FieldMetadataType } from 'twenty-shared/types';
+
+import { type FlatEntityMaps } from 'src/engine/metadata-modules/flat-entity/types/flat-entity-maps.type';
+import { type FlatSearchFieldMetadata } from 'src/engine/metadata-modules/flat-search-field-metadata/types/flat-search-field-metadata.type';
+import { deriveSearchVectorAsExpressionForTsVectorField } from 'src/engine/metadata-modules/flat-search-field-metadata/utils/derive-search-vector-as-expression-for-ts-vector-field.util';
+import { getTargetSearchFieldMetadatasForTsVectorField } from 'src/engine/metadata-modules/flat-search-field-metadata/utils/get-target-search-field-metadatas-for-ts-vector-field.util';
+
+type ResolvableFlatFieldMetadata = {
+ id: string;
+ name: string;
+ type: FieldMetadataType;
+};
+
+export const resolveSearchVectorAsExpressionForTsVectorField = ({
+ tsVectorFieldMetadataId,
+ objectFlatFieldMetadatas,
+ flatSearchFieldMetadataMaps,
+ getSearchFieldMetadatasByTsVectorFieldId,
+}: {
+ tsVectorFieldMetadataId: string;
+ objectFlatFieldMetadatas: ResolvableFlatFieldMetadata[];
+ flatSearchFieldMetadataMaps: FlatEntityMaps<FlatSearchFieldMetadata>;
+ getSearchFieldMetadatasByTsVectorFieldId?: (
+ tsVectorFieldMetadataId: string,
+ ) => FlatSearchFieldMetadata[];
+}): string =>
+ deriveSearchVectorAsExpressionForTsVectorField({
+ targetSearchFieldMetadatas:
+ getSearchFieldMetadatasByTsVectorFieldId?.(tsVectorFieldMetadataId) ??
+ getTargetSearchFieldMetadatasForTsVectorField({
+ tsVectorFieldMetadataId,
+ flatSearchFieldMetadataMaps,
+ }),
+ indexedFieldById: new Map(
+ objectFlatFieldMetadatas.map((objectFlatFieldMetadata) => [
+ objectFlatFieldMetadata.id,
+ {
+ name: objectFlatFieldMetadata.name,
+ type: objectFlatFieldMetadata.type,
+ },
+ ]),
+ ),
+ });
diff --git a/packages/twenty-server/src/engine/workspace-manager/workspace-migration/utils/aggregate-orchestrator-actions-report-deprioritize-ts-vector-create-field-actions.util.ts b/packages/twenty-server/src/engine/workspace-manager/workspace-migration/utils/aggregate-orchestrator-actions-report-deprioritize-ts-vector-create-field-actions.util.ts
new file mode 100644
index 00000000000..71cf3c4ff88
--- /dev/null
+++ b/packages/twenty-server/src/engine/workspace-manager/workspace-migration/utils/aggregate-orchestrator-actions-report-deprioritize-ts-vector-create-field-actions.util.ts
@@ -0,0 +1,33 @@
+import { FieldMetadataType } from 'twenty-shared/types';
+
+import { type AggregateOrchestratorActionsReportArgs } from 'src/engine/workspace-manager/workspace-migration/types/workspace-migration-aggregate-orchestrator-actions-report-args.type';
+import { type OrchestratorActionsReport } from 'src/engine/workspace-manager/workspace-migration/types/workspace-migration-orchestrator.type';
+
+export const aggregateOrchestratorActionsReportDeprioritizeTsVectorCreateFieldActions =
+ ({
+ orchestratorActionsReport,
+ }: AggregateOrchestratorActionsReportArgs): OrchestratorActionsReport => {
+ const createFieldActions = orchestratorActionsReport.fieldMetadata.create;
+
+ const tsVectorCreateFieldActions = createFieldActions.filter(
+ (createFieldAction) =>
+ createFieldAction.flatEntity.type === FieldMetadataType.TS_VECTOR,
+ );
+
+ if (tsVectorCreateFieldActions.length === 0) {
+ return orchestratorActionsReport;
+ }
+
+ const otherCreateFieldActions = createFieldActions.filter(
+ (createFieldAction) =>
+ createFieldAction.flatEntity.type !== FieldMetadataType.TS_VECTOR,
+ );
+
+ return {
+ ...orchestratorActionsReport,
+ fieldMetadata: {
+ ...orchestratorActionsReport.fieldMetadata,
+ create: [...otherCreateFieldActions, ...tsVectorCreateFieldActions],
+ },
+ };
+ };
diff --git a/packages/twenty-server/src/engine/workspace-manager/workspace-migration/utils/aggregate-orchestrator-actions-report.util.ts b/packages/twenty-server/src/engine/workspace-manager/workspace-migration/utils/aggregate-orchestrator-actions-report.util.ts
index bc06ce8c189..b852c83d919 100644
--- a/packages/twenty-server/src/engine/workspace-manager/workspace-migration/utils/aggregate-orchestrator-actions-report.util.ts
+++ b/packages/twenty-server/src/engine/workspace-manager/workspace-migration/utils/aggregate-orchestrator-actions-report.util.ts
@@ -1,6 +1,7 @@
import { type AggregateOrchestratorActionsReportArgs } from 'src/engine/workspace-manager/workspace-migration/types/workspace-migration-aggregate-orchestrator-actions-report-args.type';
import { aggregateNonRelationFieldsIntoObjectActions } from 'src/engine/workspace-manager/workspace-migration/utils/aggregate-non-relation-fields-into-object-actions.util';
import { aggregateOrchestratorActionsReportDeprioritizeSearchVectorUpdateFieldActions } from 'src/engine/workspace-manager/workspace-migration/utils/aggregate-orchestrator-actions-report-deprioritize-search-vector-update-field-actions.util';
+import { aggregateOrchestratorActionsReportDeprioritizeTsVectorCreateFieldActions } from 'src/engine/workspace-manager/workspace-migration/utils/aggregate-orchestrator-actions-report-deprioritize-ts-vector-create-field-actions.util';
import { aggregateRelationFieldPairs } from 'src/engine/workspace-manager/workspace-migration/utils/aggregate-relation-field-pairs.util';
export const aggregateOrchestratorActionsReport = ({
@@ -11,6 +12,7 @@ export const aggregateOrchestratorActionsReport = ({
const aggregatedOrchestratorActionsReport = [
aggregateNonRelationFieldsIntoObjectActions,
aggregateRelationFieldPairs,
+ aggregateOrchestratorActionsReportDeprioritizeTsVectorCreateFieldActions,
aggregateOrchestratorActionsReportDeprioritizeSearchVectorUpdateFieldActions,
].reduce(
(currentOrchestratorActionsReport, aggregator) =>
diff --git a/packages/twenty-server/src/engine/workspace-manager/workspace-migration/workspace-migration-runner/action-handlers/field/services/create-field-action-handler.service.ts b/packages/twenty-server/src/engine/workspace-manager/workspace-migration/workspace-migration-runner/action-handlers/field/services/create-field-action-handler.service.ts
index 3e3d012dd89..a6ed3c66e64 100644
--- a/packages/twenty-server/src/engine/workspace-manager/workspace-migration/workspace-migration-runner/action-handlers/field/services/create-field-action-handler.service.ts
+++ b/packages/twenty-server/src/engine/workspace-manager/workspace-migration/workspace-migration-runner/action-handlers/field/services/create-field-action-handler.service.ts
@@ -1,6 +1,6 @@
import { Injectable } from '@nestjs/common';
-import { RelationType } from 'twenty-shared/types';
+import { FieldMetadataType, RelationType } from 'twenty-shared/types';
import { isDefined } from 'twenty-shared/utils';
import { type QueryRunner } from 'typeorm';
import { v4 } from 'uuid';
@@ -8,11 +8,16 @@ import { v4 } from 'uuid';
import { computeMorphOrRelationFieldJoinColumnName } from 'src/engine/metadata-modules/field-metadata/utils/compute-morph-or-relation-field-join-column-name.util';
import { WorkspaceMigrationRunnerActionHandler } from 'src/engine/workspace-manager/workspace-migration/workspace-migration-runner/interfaces/workspace-migration-runner-action-handler-service.interface';
+import { type FlatEntityMaps } from 'src/engine/metadata-modules/flat-entity/types/flat-entity-maps.type';
import { type MetadataFlatEntityMaps } from 'src/engine/metadata-modules/flat-entity/types/metadata-flat-entity-maps.type';
import { findFlatEntityByIdInFlatEntityMapsOrThrow } from 'src/engine/metadata-modules/flat-entity/utils/find-flat-entity-by-id-in-flat-entity-maps-or-throw.util';
+import { findManyFlatEntityByIdInFlatEntityMaps } from 'src/engine/metadata-modules/flat-entity/utils/find-many-flat-entity-by-id-in-flat-entity-maps.util';
import { type FlatFieldMetadata } from 'src/engine/metadata-modules/flat-field-metadata/types/flat-field-metadata.type';
+import { isFlatFieldMetadataOfType } from 'src/engine/metadata-modules/flat-field-metadata/utils/is-flat-field-metadata-of-type.util';
import { isMorphOrRelationFlatFieldMetadata } from 'src/engine/metadata-modules/flat-field-metadata/utils/is-morph-or-relation-flat-field-metadata.util';
import { type FlatObjectMetadata } from 'src/engine/metadata-modules/flat-object-metadata/types/flat-object-metadata.type';
+import { type FlatSearchFieldMetadata } from 'src/engine/metadata-modules/flat-search-field-metadata/types/flat-search-field-metadata.type';
+import { resolveSearchVectorAsExpressionForTsVectorField } from 'src/engine/metadata-modules/flat-search-field-metadata/utils/resolve-search-vector-as-expression-for-ts-vector-field.util';
import { WorkspaceSchemaManagerService } from 'src/engine/twenty-orm/workspace-schema-manager/workspace-schema-manager.service';
import { computeObjectTargetTable } from 'src/engine/utils/compute-object-target-table.util';
import { convertOnDeleteActionToOnDelete } from 'src/engine/workspace-manager/workspace-migration/utils/convert-on-delete-action-to-on-delete.util';
@@ -119,7 +124,12 @@ export class CreateFieldActionHandlerService extends WorkspaceMigrationRunnerAct
const {
flatAction,
queryRunner,
- allFlatEntityMaps: { flatObjectMetadataMaps },
+ allFlatEntityMaps: {
+ flatObjectMetadataMaps,
+ flatFieldMetadataMaps,
+ flatSearchFieldMetadataMaps,
+ },
+ getSearchFieldMetadatasByTsVectorFieldId,
workspaceId,
} = context;
const { flatEntity, relatedFlatFieldMetadata } = flatAction;
@@ -145,7 +155,7 @@ export class CreateFieldActionHandlerService extends WorkspaceMigrationRunnerAct
for (const [
objectMetadataId,
- objectFlatFieldMetadatas,
+ createdFlatFieldMetadatas,
] of fieldsByObjectMetadataId) {
const flatObjectMetadata = findFlatEntityByIdInFlatEntityMapsOrThrow({
flatEntityMaps: flatObjectMetadataMaps,
@@ -157,11 +167,22 @@ export class CreateFieldActionHandlerService extends WorkspaceMigrationRunnerAct
objectMetadata: flatObjectMetadata,
});
- for (const flatFieldMetadata of objectFlatFieldMetadatas) {
+ const objectFlatFieldMetadatas = [
+ ...findManyFlatEntityByIdInFlatEntityMaps({
+ flatEntityMaps: flatFieldMetadataMaps,
+ flatEntityIds: flatObjectMetadata.fieldIds,
+ }),
+ ...createdFlatFieldMetadatas,
+ ];
+
+ for (const flatFieldMetadata of createdFlatFieldMetadatas) {
await this.executeSingleFieldMetadataWorkspaceSchema({
flatFieldMetadata,
flatObjectMetadata,
flatObjectMetadataMaps,
+ objectFlatFieldMetadatas,
+ flatSearchFieldMetadataMaps,
+ getSearchFieldMetadatasByTsVectorFieldId,
queryRunner,
schemaName,
tableName,
@@ -175,6 +196,9 @@ export class CreateFieldActionHandlerService extends WorkspaceMigrationRunnerAct
flatFieldMetadata,
flatObjectMetadata,
flatObjectMetadataMaps,
+ objectFlatFieldMetadatas,
+ flatSearchFieldMetadataMaps,
+ getSearchFieldMetadatasByTsVectorFieldId,
queryRunner,
schemaName,
tableName,
@@ -183,6 +207,11 @@ export class CreateFieldActionHandlerService extends WorkspaceMigrationRunnerAct
flatFieldMetadata: FlatFieldMetadata;
flatObjectMetadata: FlatObjectMetadata;
flatObjectMetadataMaps: MetadataFlatEntityMaps<'objectMetadata'>;
+ objectFlatFieldMetadatas: FlatFieldMetadata[];
+ flatSearchFieldMetadataMaps: FlatEntityMaps<FlatSearchFieldMetadata>;
+ getSearchFieldMetadatasByTsVectorFieldId?: (
+ tsVectorFieldMetadataId: string,
+ ) => FlatSearchFieldMetadata[];
queryRunner: QueryRunner;
schemaName: string;
tableName: string;
@@ -198,6 +227,17 @@ export class CreateFieldActionHandlerService extends WorkspaceMigrationRunnerAct
flatFieldMetadata,
flatObjectMetadata,
workspaceId,
+ searchVectorAsExpression: isFlatFieldMetadataOfType(
+ flatFieldMetadata,
+ FieldMetadataType.TS_VECTOR,
+ )
+ ? resolveSearchVectorAsExpressionForTsVectorField({
+ tsVectorFieldMetadataId: flatFieldMetadata.id,
+ objectFlatFieldMetadatas,
+ flatSearchFieldMetadataMaps,
+ getSearchFieldMetadatasByTsVectorFieldId,
+ })
+ : undefined,
});
await executeBatchEnumOperations({
diff --git a/packages/twenty-server/src/engine/workspace-manager/workspace-migration/workspace-migration-runner/action-handlers/field/services/update-field-action-handler.service.ts b/packages/twenty-server/src/engine/workspace-manager/workspace-migration/workspace-migration-runner/action-handlers/field/services/update-field-action-handler.service.ts
index 92f1d3ee74b..8a5dfa13e34 100644
--- a/packages/twenty-server/src/engine/workspace-manager/workspace-migration/workspace-migration-runner/action-handlers/field/services/update-field-action-handler.service.ts
+++ b/packages/twenty-server/src/engine/workspace-manager/workspace-migration/workspace-migration-runner/action-handlers/field/services/update-field-action-handler.service.ts
@@ -24,8 +24,7 @@ import { isCompositeFlatFieldMetadata } from 'src/engine/metadata-modules/flat-f
import { isEnumFlatFieldMetadata } from 'src/engine/metadata-modules/flat-field-metadata/utils/is-enum-flat-field-metadata.util';
import { isFlatFieldMetadataOfType } from 'src/engine/metadata-modules/flat-field-metadata/utils/is-flat-field-metadata-of-type.util';
import { isMorphOrRelationFlatFieldMetadata } from 'src/engine/metadata-modules/flat-field-metadata/utils/is-morph-or-relation-flat-field-metadata.util';
-import { deriveSearchVectorAsExpressionForTsVectorField } from 'src/engine/metadata-modules/flat-search-field-metadata/utils/derive-search-vector-as-expression-for-ts-vector-field.util';
-import { getTargetSearchFieldMetadatasForTsVectorField } from 'src/engine/metadata-modules/flat-search-field-metadata/utils/get-target-search-field-metadatas-for-ts-vector-field.util';
+import { resolveSearchVectorAsExpressionForTsVectorField } from 'src/engine/metadata-modules/flat-search-field-metadata/utils/resolve-search-vector-as-expression-for-ts-vector-field.util';
import { 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 { computeObjectTargetTable } from 'src/engine/utils/compute-object-target-table.util';
@@ -354,30 +353,15 @@ export class UpdateFieldActionHandlerService extends WorkspaceMigrationRunnerAct
FieldMetadataType.TS_VECTOR,
)
) {
- const indexedFieldById = new Map(
- findManyFlatEntityByIdInFlatEntityMaps({
- flatEntityMaps: flatFieldMetadataMaps,
- flatEntityIds: flatObjectMetadata.fieldIds,
- }).map((indexedFlatFieldMetadata) => [
- indexedFlatFieldMetadata.id,
- {
- name: indexedFlatFieldMetadata.name,
- type: indexedFlatFieldMetadata.type,
- },
- ]),
- );
-
const searchVectorAsExpression =
- deriveSearchVectorAsExpressionForTsVectorField({
- targetSearchFieldMetadatas:
- getSearchFieldMetadatasByTsVectorFieldId?.(
- optimisticFlatFieldMetadata.id,
- ) ??
- getTargetSearchFieldMetadatasForTsVectorField({
- tsVectorFieldMetadataId: optimisticFlatFieldMetadata.id,
- flatSearchFieldMetadataMaps,
- }),
- indexedFieldById,
+ resolveSearchVectorAsExpressionForTsVectorField({
+ tsVectorFieldMetadataId: optimisticFlatFieldMetadata.id,
+ objectFlatFieldMetadatas: findManyFlatEntityByIdInFlatEntityMaps({
+ flatEntityMaps: flatFieldMetadataMaps,
+ flatEntityIds: flatObjectMetadata.fieldIds,
+ }),
+ flatSearchFieldMetadataMaps,
+ getSearchFieldMetadatasByTsVectorFieldId,
});
const columnDefinitions = generateColumnDefinitions({
diff --git a/packages/twenty-server/src/engine/workspace-manager/workspace-migration/workspace-migration-runner/action-handlers/object/services/create-object-action-handler.service.ts b/packages/twenty-server/src/engine/workspace-manager/workspace-migration/workspace-migration-runner/action-handlers/object/services/create-object-action-handler.service.ts
index d0d85fddcbb..916569bb5d2 100644
--- a/packages/twenty-server/src/engine/workspace-manager/workspace-migration/workspace-migration-runner/action-handlers/object/services/create-object-action-handler.service.ts
+++ b/packages/twenty-server/src/engine/workspace-manager/workspace-migration/workspace-migration-runner/action-handlers/object/services/create-object-action-handler.service.ts
@@ -9,8 +9,7 @@ import { ALL_METADATA_ENTITY_BY_METADATA_NAME } from 'src/engine/metadata-module
import { isCompositeFlatFieldMetadata } from 'src/engine/metadata-modules/flat-field-metadata/utils/is-composite-flat-field-metadata.util';
import { isEnumFlatFieldMetadata } from 'src/engine/metadata-modules/flat-field-metadata/utils/is-enum-flat-field-metadata.util';
import { isFlatFieldMetadataOfType } from 'src/engine/metadata-modules/flat-field-metadata/utils/is-flat-field-metadata-of-type.util';
-import { deriveSearchVectorAsExpressionForTsVectorField } from 'src/engine/metadata-modules/flat-search-field-metadata/utils/derive-search-vector-as-expression-for-ts-vector-field.util';
-import { getTargetSearchFieldMetadatasForTsVectorField } from 'src/engine/metadata-modules/flat-search-field-metadata/utils/get-target-search-field-metadatas-for-ts-vector-field.util';
+import { resolveSearchVectorAsExpressionForTsVectorField } from 'src/engine/metadata-modules/flat-search-field-metadata/utils/resolve-search-vector-as-expression-for-ts-vector-field.util';
import { WorkspaceSchemaManagerService } from 'src/engine/twenty-orm/workspace-schema-manager/workspace-schema-manager.service';
import {
FlatCreateObjectAction,
@@ -135,13 +134,6 @@ export class CreateObjectActionHandlerService extends WorkspaceMigrationRunnerAc
objectMetadata: flatObjectMetadata,
});
- const indexedFieldById = new Map(
- flatFieldMetadatas.map((flatFieldMetadata) => [
- flatFieldMetadata.id,
- { name: flatFieldMetadata.name, type: flatFieldMetadata.type },
- ]),
- );
-
const columnDefinitions = flatFieldMetadatas.flatMap((flatFieldMetadata) =>
generateColumnDefinitions({
flatFieldMetadata,
@@ -151,17 +143,12 @@ export class CreateObjectActionHandlerService extends WorkspaceMigrationRunnerAc
flatFieldMetadata,
FieldMetadataType.TS_VECTOR,
)
- ? deriveSearchVectorAsExpressionForTsVectorField({
- targetSearchFieldMetadatas:
- getSearchFieldMetadatasByTsVectorFieldId?.(
- flatFieldMetadata.id,
- ) ??
- getTargetSearchFieldMetadatasForTsVectorField({
- tsVectorFieldMetadataId: flatFieldMetadata.id,
- flatSearchFieldMetadataMaps:
- allFlatEntityMaps.flatSearchFieldMetadataMaps,
- }),
- indexedFieldById,
+ ? resolveSearchVectorAsExpressionForTsVectorField({
+ tsVectorFieldMetadataId: flatFieldMetadata.id,
+ objectFlatFieldMetadatas: flatFieldMetadatas,
+ flatSearchFieldMetadataMaps:
+ allFlatEntityMaps.flatSearchFieldMetadataMaps,
+ getSearchFieldMetadatasByTsVectorFieldId,
})
: undefined,
}),