houseassassin/twenty
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update unique fields on standard field - include soft deleted records (#14562)

Browse Source 
Done : 
- migrate standard unique fields (add : -old)
- deactivate defaultWhereClause
- restore soft deleted if upserted (same for contact creation in mailing
sync)

fixes https://github.com/twentyhq/twenty/issues/14443

---------

Co-authored-by: Charles Bochet <charles@twenty.com>
This commit is contained in:
Etienne
2025-10-11 15:50:29 +02:00
committed by GitHub
parent c681fb7fb6
commit 560e24fa4b
26 changed files with 1119 additions and 316 deletions
Download Patch File Download Diff File Expand all files Collapse all files
packages/twenty-server/src/database/commands/upgrade-version-command/1-7/1-7-regenerate-person-search-vector-with-phones.command.ts
-118
View File
@@ -1,118 +0,0 @@
import { InjectDataSource, InjectRepository } from '@nestjs/typeorm';
import { Command } from 'nest-commander';
import { DataSource, Repository } from 'typeorm';
import {
ActiveOrSuspendedWorkspacesMigrationCommandRunner,
type RunOnWorkspaceArgs,
} from 'src/database/commands/command-runners/active-or-suspended-workspaces-migration.command-runner';
import { Workspace } from 'src/engine/core-modules/workspace/workspace.entity';
import { TwentyORMGlobalManager } from 'src/engine/twenty-orm/twenty-orm-global.manager';
import { getWorkspaceSchemaName } from 'src/engine/workspace-datasource/utils/get-workspace-schema-name.util';
import { getTsVectorColumnExpressionFromFields } from 'src/engine/workspace-manager/workspace-sync-metadata/utils/get-ts-vector-column-expression.util';
import { SEARCH_FIELDS_FOR_PERSON } from 'src/modules/person/standard-objects/person.workspace-entity';
@Command({
name: 'upgrade:1-7:regenerate-person-search-vector-with-phones',
description:
'Regenerate person search vector to include phone number indexing for existing workspaces',
})
export class RegeneratePersonSearchVectorWithPhonesCommand extends ActiveOrSuspendedWorkspacesMigrationCommandRunner {
constructor(
@InjectRepository(Workspace)
protected readonly workspaceRepository: Repository<Workspace>,
@InjectDataSource()
private readonly coreDataSource: DataSource,
protected readonly twentyORMGlobalManager: TwentyORMGlobalManager,
) {
super(workspaceRepository, twentyORMGlobalManager);
}
override async runOnWorkspace({
workspaceId,
}: RunOnWorkspaceArgs): Promise<void> {
const schemaName = getWorkspaceSchemaName(workspaceId);
this.logger.log(
`Regenerating person search vector for workspace ${workspaceId} in schema ${schemaName}`,
);
const personTableExists = await this.coreDataSource.query(`
SELECT EXISTS (
SELECT FROM information_schema.tables
WHERE table_schema = '${schemaName}'
AND table_name = 'person'
);
`);
if (!personTableExists[0]?.exists) {
this.logger.log(
`Person table does not exist in workspace ${workspaceId}, skipping`,
);
return;
}
const searchVectorColumnExists = await this.coreDataSource.query(`
SELECT EXISTS (
SELECT FROM information_schema.columns
WHERE table_schema = '${schemaName}'
AND table_name = 'person'
AND column_name = 'searchVector'
);
`);
if (!searchVectorColumnExists[0]?.exists) {
this.logger.log(
`searchVector column does not exist in workspace ${workspaceId}, skipping`,
);
return;
}
try {
const newSearchVectorExpression = getTsVectorColumnExpressionFromFields(
SEARCH_FIELDS_FOR_PERSON,
);
this.logger.log(
`Dropping existing searchVector column for workspace ${workspaceId}`,
);
await this.coreDataSource.query(`
ALTER TABLE "${schemaName}"."person"
DROP COLUMN "searchVector"
`);
this.logger.log(
`Creating new searchVector column with phone indexing for workspace ${workspaceId}`,
);
await this.coreDataSource.query(`
ALTER TABLE "${schemaName}"."person"
ADD COLUMN "searchVector" tsvector
GENERATED ALWAYS AS (${newSearchVectorExpression}) STORED
`);
this.logger.log(
`Recreating GIN index on searchVector for workspace ${workspaceId}`,
);
await this.coreDataSource.query(`
CREATE INDEX "IDX_person_searchVector"
ON "${schemaName}"."person"
USING GIN ("searchVector")
`);
this.logger.log(
`Successfully regenerated person search vector for workspace ${workspaceId}`,
);
} catch (error) {
this.logger.error(
`Failed to regenerate person search vector for workspace ${workspaceId}: ${error.message}`,
);
throw error;
}
}
}
packages/twenty-server/src/database/commands/upgrade-version-command/1-7/1-7-upgrade-version-command.module.ts
+2 -9
View File
@@ -2,19 +2,12 @@ import { Module } from '@nestjs/common';
import { TypeOrmModule } from '@nestjs/typeorm';
import { BackfillWorkflowManualTriggerAvailabilityCommand } from 'src/database/commands/upgrade-version-command/1-7/1-7-backfill-workflow-manual-trigger-availability.command';
import { RegeneratePersonSearchVectorWithPhonesCommand } from 'src/database/commands/upgrade-version-command/1-7/1-7-regenerate-person-search-vector-with-phones.command';
import { Workspace } from 'src/engine/core-modules/workspace/workspace.entity';
import { WorkspaceDataSourceModule } from 'src/engine/workspace-datasource/workspace-datasource.module';
@Module({
imports: [TypeOrmModule.forFeature([Workspace]), WorkspaceDataSourceModule],
providers: [
RegeneratePersonSearchVectorWithPhonesCommand,
BackfillWorkflowManualTriggerAvailabilityCommand,
],
exports: [
RegeneratePersonSearchVectorWithPhonesCommand,
BackfillWorkflowManualTriggerAvailabilityCommand,
],
providers: [BackfillWorkflowManualTriggerAvailabilityCommand],
exports: [BackfillWorkflowManualTriggerAvailabilityCommand],
})
export class V1_7_UpgradeVersionCommandModule {}