The open alternative to Salesforce, designed for AI.
TypeScript crmcrm-systemcustomergood-first-issuegraphqlhacktoberfestjavascriptmarketingmonoreponestjsopen-sourcepostgresqlreactreactjssalestypescriptweb
Repair missing company activity history during the 2.43 upgrade (#26631)
Félix Malfaita9f74372ad36
diff --git a/packages/twenty-server/src/database/commands/upgrade-version-command/2-43/2-43-upgrade-version-command.module.ts b/packages/twenty-server/src/database/commands/upgrade-version-command/2-43/2-43-upgrade-version-command.module.tsindex 744500ea27d..cbd673a0f53 100644--- a/packages/twenty-server/src/database/commands/upgrade-version-command/2-43/2-43-upgrade-version-command.module.ts+++ b/packages/twenty-server/src/database/commands/upgrade-version-command/2-43/2-43-upgrade-version-command.module.ts@@ -11,6 +11,7 @@ import { DeleteSystemReadableObjectNavigationCommandMenuItemsCommand } from 'srcimport { MoveCampaignSendingTablesToWorkspaceCommand } from 'src/database/commands/upgrade-version-command/2-43/2-43-workspace-command-1790203235337-move-campaign-sending-tables-to-workspace.command';import { EnableCommonRecordSharingCommand } from 'src/database/commands/upgrade-version-command/2-43/2-43-workspace-command-1790312694997-enable-common-record-sharing.command';import { BackfillLogicFunctionFileRowsCommand } from 'src/database/commands/upgrade-version-command/2-43/2-43-workspace-command-1790262034322-backfill-logic-function-file-rows.command';+import { RepairInitialCompanyTargetsCommand } from 'src/database/commands/upgrade-version-command/2-43/2-43-workspace-command-1790339692474-repair-initial-company-targets.command';import { ProvisionAgentChatThreadTargetCommand } from 'src/database/commands/upgrade-version-command/2-43/2-43-workspace-command-1790317893308-provision-agent-chat-thread-target.command';import { ApplicationModule } from 'src/engine/core-modules/application/application.module';import { BillingModule } from 'src/engine/core-modules/billing/billing.module';@@ -35,6 +36,7 @@ import { WorkspaceMigrationModule } from 'src/engine/workspace-manager/workspaceWorkspaceMigrationRunnerModule,],providers: [+ RepairInitialCompanyTargetsCommand,AddAgentChatThreadAttachmentTargetCommand,AttributeChatMessageSendersCommand,EnableCommonRecordSharingCommand,diff --git a/packages/twenty-server/src/database/commands/upgrade-version-command/2-43/2-43-workspace-command-1790339692474-repair-initial-company-targets.command.ts b/packages/twenty-server/src/database/commands/upgrade-version-command/2-43/2-43-workspace-command-1790339692474-repair-initial-company-targets.command.tsnew file mode 100644index 00000000000..b14f929643a--- /dev/null+++ b/packages/twenty-server/src/database/commands/upgrade-version-command/2-43/2-43-workspace-command-1790339692474-repair-initial-company-targets.command.ts@@ -0,0 +1,95 @@+import { Command } from 'nest-commander';+import { isDefined } from 'twenty-shared/utils';++import { ProvisionedWorkspaceCommandRunner } from 'src/database/commands/command-runners/provisioned-workspace.command-runner';+import { type RunOnWorkspaceArgs } from 'src/database/commands/command-runners/workspace.command-runner';+import { WorkspaceIteratorService } from 'src/database/commands/command-runners/workspace-iterator.service';+import { buildInitialCompanyTargetRepairQueries } from 'src/database/commands/upgrade-version-command/2-43/utils/build-initial-company-target-repair-queries.util';+import { RegisteredWorkspaceCommand } from 'src/engine/core-modules/upgrade/decorators/registered-workspace-command.decorator';+import { getWorkspaceSchemaName } from 'src/engine/workspace-datasource/utils/get-workspace-schema-name.util';++const REPAIR_BATCH_SIZE = 5_000;++@RegisteredWorkspaceCommand('2.43.0', 1790339692474)+@Command({+ name: 'upgrade:2-43:repair-initial-company-targets',+ description:+ 'Restore missing company activity targets supported by initial-assignment audit history',+})+export class RepairInitialCompanyTargetsCommand extends ProvisionedWorkspaceCommandRunner {+ constructor(+ protected readonly workspaceIteratorService: WorkspaceIteratorService,+ ) {+ super(workspaceIteratorService);+ }++ override async runOnWorkspace(args: RunOnWorkspaceArgs): Promise<void> {+ await this.up(args);+ }++ async down(_args: RunOnWorkspaceArgs): Promise<void> {+ // Repaired links have no migration-specific provenance; deleting them on+ // rollback could remove valid activity or later user assignments.+ }++ async up({+ workspaceId,+ dataSource,+ options,+ }: RunOnWorkspaceArgs): Promise<void> {+ if (!isDefined(dataSource)) {+ throw new Error(`No workspace data source for ${workspaceId}`);+ }++ const schemaName = getWorkspaceSchemaName(workspaceId);+ const [tables] = await dataSource.query<Array<{ ready: boolean }>>(+ `SELECT to_regclass($1) IS NOT NULL+ AND to_regclass($2) IS NOT NULL+ AND to_regclass($3) IS NOT NULL AS ready`,+ ['messageThreadTarget', 'calendarEventTarget', 'timelineActivity'].map(+ (tableName) => `"${schemaName}"."${tableName}"`,+ ),+ );++ if (!tables?.ready) {+ this.logger.warn(+ `Skipping workspace ${workspaceId}: target or audit tables are not provisioned`,+ );++ return;+ }++ for (const query of buildInitialCompanyTargetRepairQueries({+ schemaName,+ batchSize: REPAIR_BATCH_SIZE,+ })) {+ if (options.dryRun) {+ const [result] = await dataSource.query<Array<{ count: number }>>(+ query.countSql,+ );++ this.logger.log(+ `[DRY RUN] Would create ${result.count} ${query.label} for workspace ${workspaceId}`,+ );++ continue;+ }++ let candidateCount: number;+ let insertedCount = 0;++ do {+ const [result] = await dataSource.query<+ Array<{ candidateCount: number; insertedCount: number }>+ >(query.insertSql);++ candidateCount = result.candidateCount;+ insertedCount += result.insertedCount;+ } while (candidateCount === REPAIR_BATCH_SIZE);++ this.logger.log(+ `Created ${insertedCount} ${query.label} for workspace ${workspaceId}`,+ );+ }+ }+}diff --git a/packages/twenty-server/src/database/commands/upgrade-version-command/2-43/utils/build-initial-company-target-repair-queries.util.ts b/packages/twenty-server/src/database/commands/upgrade-version-command/2-43/utils/build-initial-company-target-repair-queries.util.tsnew file mode 100644index 00000000000..5289eb2771c--- /dev/null+++ b/packages/twenty-server/src/database/commands/upgrade-version-command/2-43/utils/build-initial-company-target-repair-queries.util.ts@@ -0,0 +1,88 @@+type CompanyTargetRepairQuery = {+ label: string;+ countSql: string;+ insertSql: string;+};++export const buildInitialCompanyTargetRepairQueries = ({+ schemaName,+ batchSize,+}: {+ schemaName: string;+ batchSize: number;+}): CompanyTargetRepairQuery[] => {+ // A null before-value must be recorded explicitly. Missing audit data does+ // not establish an initial assignment, and multiple changes are ambiguous.+ const assignmentsSql = `WITH initial_assignments AS MATERIALIZED (+ SELECT activity."targetPersonId" AS "personId",+ MIN(activity."happensAt") AS "assignedAt",+ MIN(activity."properties" #>> '{diff,company,after,id}') AS "companyId"+ FROM "${schemaName}"."timelineActivity" activity+ WHERE activity."targetPersonId" IS NOT NULL+ AND activity."linkedRecordId" IS NULL+ AND activity."properties" #> '{diff,company}' IS NOT NULL+ GROUP BY activity."targetPersonId"+ HAVING COUNT(*) = 1+ AND BOOL_AND(activity."deletedAt" IS NULL)+ AND BOOL_AND(activity."properties" #> '{diff,company,before,id}' = 'null'::jsonb)+)`;++ return (['messageThread', 'calendarEvent'] as const).map((parentName) => {+ const isMessage = parentName === 'messageThread';+ const targetTableName = `${parentName}Target`;+ const parentColumnName = `${parentName}Id`;+ const participantTableName = isMessage+ ? 'messageParticipant'+ : 'calendarEventParticipant';+ const parentJoinSql = isMessage+ ? `INNER JOIN "${schemaName}"."message" message+ ON message."id" = participant."messageId" AND message."deletedAt" IS NULL+ INNER JOIN "${schemaName}"."messageThread" parent+ ON parent."id" = message."messageThreadId"`+ : `INNER JOIN "${schemaName}"."calendarEvent" parent+ ON parent."id" = participant."calendarEventId"`;+ const candidatesSql = `SELECT DISTINCT parent."id" AS "parentId", company."id" AS "companyId"+ FROM initial_assignments assignment+ INNER JOIN "${schemaName}"."person" person+ ON person."id" = assignment."personId"+ AND person."companyId"::text = assignment."companyId"+ AND person."deletedAt" IS NULL+ INNER JOIN "${schemaName}"."company" company+ ON company."id" = person."companyId" AND company."deletedAt" IS NULL+ INNER JOIN "${schemaName}"."${participantTableName}" participant+ ON participant."personId" = person."id"+ AND participant."deletedAt" IS NULL+ AND participant."createdAt" <= assignment."assignedAt"+ ${parentJoinSql}+ WHERE parent."deletedAt" IS NULL+ AND NOT EXISTS (+ SELECT 1 FROM "${schemaName}"."${targetTableName}" existing_target+ WHERE existing_target."${parentColumnName}" = parent."id"+ AND existing_target."targetCompanyId" = company."id"+ )`;++ // Existing rows include tombstones; the repair must never resurrect an+ // explicitly removed attribution or rewrite another company's provenance.+ return {+ label: isMessage+ ? 'message thread company targets'+ : 'calendar event company targets',+ countSql: `${assignmentsSql}+SELECT COUNT(*)::int AS "count" FROM (${candidatesSql}) candidates`,+ insertSql: `${assignmentsSql}, candidates AS (+ ${candidatesSql}+ ORDER BY parent."id", company."id"+ LIMIT ${batchSize}+), inserted AS (+ INSERT INTO "${schemaName}"."${targetTableName}" (+ "${parentColumnName}", "targetCompanyId", "isAutomaticallyAssigned", "isManuallyAssigned"+ )+ SELECT "parentId", "companyId", TRUE, FALSE FROM candidates+ ON CONFLICT DO NOTHING+ RETURNING "id"+)+SELECT (SELECT COUNT(*)::int FROM candidates) AS "candidateCount",+ (SELECT COUNT(*)::int FROM inserted) AS "insertedCount"`,+ };+ });+};