Skip to content

The open alternative to Salesforce, designed for AI.

Consolidate the 2.46 chat inbox upgrade commands (#27415)

Félix Malfait5c884254a1cb
diff --git a/packages/twenty-server/src/database/commands/upgrade-version-command/2-46/2-46-upgrade-version-command.module.ts b/packages/twenty-server/src/database/commands/upgrade-version-command/2-46/2-46-upgrade-version-command.module.ts
index d35dbdf9069..23ade3d642e 100644
--- a/packages/twenty-server/src/database/commands/upgrade-version-command/2-46/2-46-upgrade-version-command.module.ts
+++ b/packages/twenty-server/src/database/commands/upgrade-version-command/2-46/2-46-upgrade-version-command.module.ts
@@ -5,13 +5,9 @@ import { WorkspaceIteratorModule } from 'src/database/commands/command-runners/w
import { AddAgentChatThreadParticipantObjectCommand } from 'src/database/commands/upgrade-version-command/2-46/2-46-workspace-command-1790942019631-add-agent-chat-thread-participant-object.command';
import { BackfillAgentChatThreadInboxStateCommand } from 'src/database/commands/upgrade-version-command/2-46/2-46-workspace-command-1790942019632-backfill-agent-chat-thread-inbox-state.command';
import { AddAiChatInboxCommandMenuItemsCommand } from 'src/database/commands/upgrade-version-command/2-46/2-46-workspace-command-1790942019633-add-ai-chat-inbox-command-menu-items.command';
-import { AllowAiChatInboxCommandsOnSeveralChatsCommand } from 'src/database/commands/upgrade-version-command/2-46/2-46-workspace-command-1791009973891-allow-ai-chat-inbox-commands-on-several-chats.command';
-import { MakeAgentChatThreadParticipantsPrivateCommand } from 'src/database/commands/upgrade-version-command/2-46/2-46-workspace-command-1791056679663-make-agent-chat-thread-participants-private.command';
import { DropWorkflowRunFromChatThreadsCommand } from 'src/database/commands/upgrade-version-command/2-46/2-46-workspace-command-1791208395308-drop-workflow-run-from-chat-threads.command';
import { DropAgentTurnEvaluationObjectCommand } from 'src/database/commands/upgrade-version-command/2-46/2-46-workspace-command-1791216273979-drop-agent-turn-evaluation-object.command';
import { BackfillAgentAndWorkflowIsSystemCommand } from 'src/database/commands/upgrade-version-command/2-46/2-46-workspace-command-1791130332894-backfill-agent-and-workflow-is-system.command';
-import { ScheduleAgentChatThreadSnoozeEndsCommand } from 'src/database/commands/upgrade-version-command/2-46/2-46-workspace-command-1791093059050-schedule-agent-chat-thread-snooze-ends.command';
-import { UnpinNewAiChatCommandMenuItemCommand } from 'src/database/commands/upgrade-version-command/2-46/2-46-workspace-command-1790942019634-unpin-new-ai-chat-command-menu-item.command';
import { TurnHiddenAgentMessagesIntoSystemMessagesCommand } from 'src/database/commands/upgrade-version-command/2-46/2-46-workspace-command-1791204952095-turn-hidden-agent-messages-into-system-messages.command';
import { AddAgentTurnRunFieldsCommand } from 'src/database/commands/upgrade-version-command/2-46/2-46-workspace-command-1791227584393-add-agent-turn-run-fields.command';
import { BackfillFailedAgentTurnsCommand } from 'src/database/commands/upgrade-version-command/2-46/2-46-workspace-command-1791227584394-backfill-failed-agent-turns.command';
@@ -31,10 +27,6 @@ import { WorkspaceMigrationModule } from 'src/engine/workspace-manager/workspace
AddAgentChatThreadParticipantObjectCommand,
BackfillAgentChatThreadInboxStateCommand,
AddAiChatInboxCommandMenuItemsCommand,
- UnpinNewAiChatCommandMenuItemCommand,
- AllowAiChatInboxCommandsOnSeveralChatsCommand,
- MakeAgentChatThreadParticipantsPrivateCommand,
- ScheduleAgentChatThreadSnoozeEndsCommand,
BackfillAgentAndWorkflowIsSystemCommand,
TurnHiddenAgentMessagesIntoSystemMessagesCommand,
DropWorkflowRunFromChatThreadsCommand,
diff --git a/packages/twenty-server/src/database/commands/upgrade-version-command/2-46/2-46-workspace-command-1790942019632-backfill-agent-chat-thread-inbox-state.command.ts b/packages/twenty-server/src/database/commands/upgrade-version-command/2-46/2-46-workspace-command-1790942019632-backfill-agent-chat-thread-inbox-state.command.ts
index 0d2565de6ea..2a2ac60a5c8 100644
--- a/packages/twenty-server/src/database/commands/upgrade-version-command/2-46/2-46-workspace-command-1790942019632-backfill-agent-chat-thread-inbox-state.command.ts
+++ b/packages/twenty-server/src/database/commands/upgrade-version-command/2-46/2-46-workspace-command-1790942019632-backfill-agent-chat-thread-inbox-state.command.ts
@@ -70,10 +70,12 @@ const backfillAgentChatThreadInboxState = async ({
manager,
workspaceId,
threadObjectMetadataId,
+ participantObjectMetadataId,
}: {
manager: EntityManager;
workspaceId: string;
threadObjectMetadataId: string;
+ participantObjectMetadataId: string;
}) => {
const tables = getBackfillTables(workspaceId);
@@ -183,6 +185,19 @@ const backfillAgentChatThreadInboxState = async ({
],
);
+ // The participant object is PRIVATE: each row is granted to its member, and
+ // only them
+ await manager.query(
+ `INSERT INTO ${tables.recordShare}
+ ("objectMetadataId", "recordId", "principalId", "principalType", "accessLevel", "rowCause", "sourceId")
+ SELECT $1, participant.id, participant."workspaceMemberId", 'WORKSPACE_MEMBER', 'FULL', 'OWNER', participant.id
+ FROM ${tables.participant} participant
+ JOIN ${tables.workspaceMember} member
+ ON member.id = participant."workspaceMemberId" AND member."deletedAt" IS NULL
+ ON CONFLICT DO NOTHING`,
+ [participantObjectMetadataId],
+ );
+
return {
threadCount,
participantCount: participants.length,
@@ -227,11 +242,29 @@ const moveRestoredArchivedChatThreadsBackToTrash = async ({
return movedCount;
};
+const deleteParticipantOwnerShares = async ({
+ manager,
+ workspaceId,
+ participantObjectMetadataId,
+}: {
+ manager: EntityManager;
+ workspaceId: string;
+ participantObjectMetadataId: string;
+}): Promise<void> => {
+ const tables = getBackfillTables(workspaceId);
+
+ await manager.query(
+ `DELETE FROM ${tables.recordShare}
+ WHERE "objectMetadataId" = $1 AND "rowCause" = 'OWNER'`,
+ [participantObjectMetadataId],
+ );
+};
+
@RegisteredWorkspaceCommand('2.46.0', 1790942019632)
@Command({
name: 'upgrade:2-46:backfill-agent-chat-thread-inbox-state',
description:
- 'Backfill the last activity of chat threads, mark existing chats read for their members and turn chats archived before 2.44 into per-member archives',
+ 'Backfill the last activity of chat threads, mark existing chats read for their members, grant each participant row to its member and turn chats archived before 2.44 into per-member archives',
})
export class BackfillAgentChatThreadInboxStateCommand extends ProvisionedWorkspaceCommandRunner {
constructor(
@@ -247,10 +280,10 @@ export class BackfillAgentChatThreadInboxStateCommand extends ProvisionedWorkspa
}
async up({ workspaceId, options }: RunOnWorkspaceArgs): Promise<void> {
- const threadObjectMetadataId =
- await this.findThreadObjectMetadataIdIfProvisioned(workspaceId);
+ const objectMetadataIds =
+ await this.findObjectMetadataIdsIfProvisioned(workspaceId);
- if (!isDefined(threadObjectMetadataId)) {
+ if (!isDefined(objectMetadataIds)) {
return;
}
@@ -267,7 +300,7 @@ export class BackfillAgentChatThreadInboxStateCommand extends ProvisionedWorkspa
backfillAgentChatThreadInboxState({
manager,
workspaceId,
- threadObjectMetadataId,
+ ...objectMetadataIds,
}),
);
@@ -277,10 +310,10 @@ export class BackfillAgentChatThreadInboxStateCommand extends ProvisionedWorkspa
}
async down({ workspaceId, options }: RunOnWorkspaceArgs): Promise<void> {
- const threadObjectMetadataId =
- await this.findThreadObjectMetadataIdIfProvisioned(workspaceId);
+ const objectMetadataIds =
+ await this.findObjectMetadataIdsIfProvisioned(workspaceId);
- if (!isDefined(threadObjectMetadataId)) {
+ if (!isDefined(objectMetadataIds)) {
return;
}
@@ -292,8 +325,21 @@ export class BackfillAgentChatThreadInboxStateCommand extends ProvisionedWorkspa
return;
}
- const movedCount = await this.storage.run(workspaceId, ({ manager }) =>
- moveRestoredArchivedChatThreadsBackToTrash({ manager, workspaceId }),
+ const movedCount = await this.storage.run(
+ workspaceId,
+ async ({ manager }) => {
+ await deleteParticipantOwnerShares({
+ manager,
+ workspaceId,
+ participantObjectMetadataId:
+ objectMetadataIds.participantObjectMetadataId,
+ });
+
+ return moveRestoredArchivedChatThreadsBackToTrash({
+ manager,
+ workspaceId,
+ });
+ },
);
this.logger.log(
@@ -301,9 +347,10 @@ export class BackfillAgentChatThreadInboxStateCommand extends ProvisionedWorkspa
);
}
- private async findThreadObjectMetadataIdIfProvisioned(
- workspaceId: string,
- ): Promise<string | undefined> {
+ private async findObjectMetadataIdsIfProvisioned(workspaceId: string): Promise<
+ | { threadObjectMetadataId: string; participantObjectMetadataId: string }
+ | undefined
+ > {
const { flatObjectMetadataMaps } =
await this.workspaceCacheService.getOrRecompute(workspaceId, [
'flatObjectMetadataMaps',
@@ -326,6 +373,9 @@ export class BackfillAgentChatThreadInboxStateCommand extends ProvisionedWorkspa
return undefined;
}
- return threadObject.id;
+ return {
+ threadObjectMetadataId: threadObject.id,
+ participantObjectMetadataId: participantObject.id,
+ };
}
}
diff --git a/packages/twenty-server/src/database/commands/upgrade-version-command/2-46/2-46-workspace-command-1790942019633-add-ai-chat-inbox-command-menu-items.command.ts b/packages/twenty-server/src/database/commands/upgrade-version-command/2-46/2-46-workspace-command-1790942019633-add-ai-chat-inbox-command-menu-items.command.ts
index 5eff17f0926..a356e520fc0 100644
--- a/packages/twenty-server/src/database/commands/upgrade-version-command/2-46/2-46-workspace-command-1790942019633-add-ai-chat-inbox-command-menu-items.command.ts
+++ b/packages/twenty-server/src/database/commands/upgrade-version-command/2-46/2-46-workspace-command-1790942019633-add-ai-chat-inbox-command-menu-items.command.ts
@@ -21,11 +21,13 @@ const AI_CHAT_INBOX_COMMAND_MENU_ITEM_NAMES = [
'snoozeAiChat',
] as const;
+const NEW_AI_CHAT_UNIVERSAL_IDENTIFIER = '604bc9b2-e438-4572-bd35-726fa0fb2ec7';
+
@RegisteredWorkspaceCommand('2.46.0', 1790942019633)
@Command({
name: 'upgrade:2-46:add-ai-chat-inbox-command-menu-items',
description:
- 'Add the Mark as read, Mark as unread, Mark as done, Reopen, Unsnooze and Snooze commands to chats',
+ 'Add the Mark as read, Mark as unread, Mark as done, Reopen, Unsnooze and Snooze commands to chats, and unpin New chat from the chat header',
})
export class AddAiChatInboxCommandMenuItemsCommand extends ProvisionedWorkspaceCommandRunner {
constructor(
@@ -79,15 +81,33 @@ export class AddAiChatInboxCommandMenuItemsCommand extends ProvisionedWorkspaceC
).filter(isDefined)
: [];
+ const newAiChat =
+ flatCommandMenuItemMaps.byUniversalIdentifier[
+ NEW_AI_CHAT_UNIVERSAL_IDENTIFIER
+ ];
+ const isNewAiChatPinned = direction === 'down';
+ const commandMenuItemsToUpdate =
+ isDefined(newAiChat) && newAiChat.isPinned !== isNewAiChatPinned
+ ? [
+ {
+ ...newAiChat,
+ isPinned: isNewAiChatPinned,
+ updatedAt: new Date().toISOString(),
+ },
+ ]
+ : [];
+
if (
- commandMenuItemsToCreate.length + commandMenuItemsToDelete.length ===
+ commandMenuItemsToCreate.length +
+ commandMenuItemsToDelete.length +
+ commandMenuItemsToUpdate.length ===
0
) {
return;
}
this.logger.log(
- `${options.dryRun ? '[DRY RUN] ' : ''}Workspace ${workspaceId} (${direction}): creating ${commandMenuItemsToCreate.length} and deleting ${commandMenuItemsToDelete.length} chat inbox command menu item(s)`,
+ `${options.dryRun ? '[DRY RUN] ' : ''}Workspace ${workspaceId} (${direction}): creating ${commandMenuItemsToCreate.length}, deleting ${commandMenuItemsToDelete.length} and updating ${commandMenuItemsToUpdate.length} chat command menu item(s)`,
);
if (options.dryRun) {
@@ -105,7 +125,7 @@ export class AddAiChatInboxCommandMenuItemsCommand extends ProvisionedWorkspaceC
commandMenuItem: {
flatEntityToCreate: commandMenuItemsToCreate,
flatEntityToDelete: commandMenuItemsToDelete,
- flatEntityToUpdate: [],
+ flatEntityToUpdate: commandMenuItemsToUpdate,
},
},
},
diff --git a/packages/twenty-server/src/database/commands/upgrade-version-command/2-46/2-46-workspace-command-1790942019634-unpin-new-ai-chat-command-menu-item.command.ts b/packages/twenty-server/src/database/commands/upgrade-version-command/2-46/2-46-workspace-command-1790942019634-unpin-new-ai-chat-command-menu-item.command.ts
deleted file mode 100644
index 944b49a16d2..00000000000
--- a/packages/twenty-server/src/database/commands/upgrade-version-command/2-46/2-46-workspace-command-1790942019634-unpin-new-ai-chat-command-menu-item.command.ts
+++ /dev/null
@@ -1,95 +0,0 @@
-import { Command } from 'nest-commander';
-import { TWENTY_STANDARD_APPLICATION_UNIVERSAL_IDENTIFIER } from 'twenty-shared/application';
-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 { WorkspaceCacheService } from 'src/engine/workspace-cache/services/workspace-cache.service';
-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';
-
-const NEW_AI_CHAT_UNIVERSAL_IDENTIFIER = '604bc9b2-e438-4572-bd35-726fa0fb2ec7';
-
-@RegisteredWorkspaceCommand('2.46.0', 1790942019634)
-@Command({
- name: 'upgrade:2-46:unpin-new-ai-chat-command-menu-item',
- description:
- 'Unpin New chat from the chat header, the inbox list offers it instead',
-})
-export class UnpinNewAiChatCommandMenuItemCommand extends ProvisionedWorkspaceCommandRunner {
- constructor(
- protected readonly workspaceIteratorService: WorkspaceIteratorService,
- private readonly workspaceCacheService: WorkspaceCacheService,
- private readonly workspaceMigrationValidateBuildAndRunService: WorkspaceMigrationValidateBuildAndRunService,
- ) {
- super(workspaceIteratorService);
- }
-
- override async runOnWorkspace(args: RunOnWorkspaceArgs): Promise<void> {
- await this.up(args);
- }
-
- async up(args: RunOnWorkspaceArgs): Promise<void> {
- await this.setIsPinned(args, false);
- }
-
- async down(args: RunOnWorkspaceArgs): Promise<void> {
- await this.setIsPinned(args, true);
- }
-
- private async setIsPinned(
- { workspaceId, options }: RunOnWorkspaceArgs,
- isPinned: boolean,
- ): Promise<void> {
- const { flatCommandMenuItemMaps } =
- await this.workspaceCacheService.getOrRecompute(workspaceId, [
- 'flatCommandMenuItemMaps',
- ]);
-
- const newAiChat =
- flatCommandMenuItemMaps.byUniversalIdentifier[
- NEW_AI_CHAT_UNIVERSAL_IDENTIFIER
- ];
-
- if (!isDefined(newAiChat) || newAiChat.isPinned === isPinned) {
- return;
- }
-
- this.logger.log(
- `${options.dryRun ? '[DRY RUN] ' : ''}Workspace ${workspaceId}: ${isPinned ? 'pinning' : 'unpinning'} New chat`,
- );
-
- if (options.dryRun) {
- return;
- }
-
- const result =
- await this.workspaceMigrationValidateBuildAndRunService.validateBuildAndRunLegacyWorkspaceMigration(
- {
- workspaceId,
- isSystemBuild: true,
- applicationUniversalIdentifier:
- TWENTY_STANDARD_APPLICATION_UNIVERSAL_IDENTIFIER,
- allFlatEntityOperationByMetadataName: {
- commandMenuItem: {
- flatEntityToCreate: [],
- flatEntityToDelete: [],
- flatEntityToUpdate: [
- {
- ...newAiChat,
- isPinned,
- updatedAt: new Date().toISOString(),
- },
- ],
- },
- },
- },
- );
-
- if (result.status === 'fail') {
- throw new WorkspaceMigrationBuilderException(result);
- }
- }
-}
diff --git a/packages/twenty-server/src/database/commands/upgrade-version-command/2-46/2-46-workspace-command-1791009973891-allow-ai-chat-inbox-commands-on-several-chats.command.ts b/packages/twenty-server/src/database/commands/upgrade-version-command/2-46/2-46-workspace-command-1791009973891-allow-ai-chat-inbox-commands-on-several-chats.command.ts
deleted file mode 100644
index 8e0784c06c9..00000000000
--- a/packages/twenty-server/src/database/commands/upgrade-version-command/2-46/2-46-workspace-command-1791009973891-allow-ai-chat-inbox-commands-on-several-chats.command.ts
+++ /dev/null
@@ -1,125 +0,0 @@
-import { Command } from 'nest-commander';
-import { TWENTY_STANDARD_APPLICATION_UNIVERSAL_IDENTIFIER } from 'twenty-shared/application';
-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 { WorkspaceCacheService } from 'src/engine/workspace-cache/services/workspace-cache.service';
-import { STANDARD_COMMAND_MENU_ITEMS } from 'src/engine/workspace-manager/twenty-standard-application/constants/standard-command-menu-item.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';
-
-const INBOX_COMMAND_MENU_ITEM_NAMES = [
- 'markAiChatAsRead',
- 'markAiChatAsUnread',
- 'markAiChatAsDone',
- 'reopenAiChat',
- 'unsnoozeAiChat',
- 'snoozeAiChat',
-] as const;
-
-const ONE_CHAT_CONDITION = 'numberOfSelectedRecords == 1 ';
-const SEVERAL_CHATS_CONDITION = 'numberOfSelectedRecords >= 1 ';
-
-@RegisteredWorkspaceCommand('2.46.0', 1791009973891)
-@Command({
- name: 'upgrade:2-46:allow-ai-chat-inbox-commands-on-several-chats',
- description:
- 'Offer the inbox commands when several chats are selected, for workspaces that got them for a single chat',
-})
-export class AllowAiChatInboxCommandsOnSeveralChatsCommand extends ProvisionedWorkspaceCommandRunner {
- constructor(
- protected readonly workspaceIteratorService: WorkspaceIteratorService,
- private readonly workspaceCacheService: WorkspaceCacheService,
- private readonly workspaceMigrationValidateBuildAndRunService: WorkspaceMigrationValidateBuildAndRunService,
- ) {
- super(workspaceIteratorService);
- }
-
- override async runOnWorkspace(args: RunOnWorkspaceArgs): Promise<void> {
- await this.up(args);
- }
-
- async up(args: RunOnWorkspaceArgs): Promise<void> {
- await this.replaceCondition(args, {
- from: ONE_CHAT_CONDITION,
- to: SEVERAL_CHATS_CONDITION,
- });
- }
-
- async down(args: RunOnWorkspaceArgs): Promise<void> {
- await this.replaceCondition(args, {
- from: SEVERAL_CHATS_CONDITION,
- to: ONE_CHAT_CONDITION,
- });
- }
-
- private async replaceCondition(
- { workspaceId, options }: RunOnWorkspaceArgs,
- { from, to }: { from: string; to: string },
- ): Promise<void> {
- const { flatCommandMenuItemMaps } =
- await this.workspaceCacheService.getOrRecompute(workspaceId, [
- 'flatCommandMenuItemMaps',
- ]);
-
- const commandMenuItemsToUpdate = INBOX_COMMAND_MENU_ITEM_NAMES.map(
- (name) =>
- flatCommandMenuItemMaps.byUniversalIdentifier[
- STANDARD_COMMAND_MENU_ITEMS[name].universalIdentifier
- ],
- ).filter(
- (commandMenuItem) =>
- isDefined(commandMenuItem) &&
- isDefined(commandMenuItem.conditionalAvailabilityExpression) &&
- commandMenuItem.conditionalAvailabilityExpression.startsWith(from),
- );
-
- if (commandMenuItemsToUpdate.length === 0) {
- return;
- }
-
- this.logger.log(
- `${options.dryRun ? '[DRY RUN] ' : ''}Workspace ${workspaceId}: updating ${commandMenuItemsToUpdate.length} inbox command menu item(s)`,
- );
-
- if (options.dryRun) {
- return;
- }
-
- const updatedAt = new Date().toISOString();
-
- const result =
- await this.workspaceMigrationValidateBuildAndRunService.validateBuildAndRunLegacyWorkspaceMigration(
- {
- workspaceId,
- isSystemBuild: true,
- applicationUniversalIdentifier:
- TWENTY_STANDARD_APPLICATION_UNIVERSAL_IDENTIFIER,
- allFlatEntityOperationByMetadataName: {
- commandMenuItem: {
- flatEntityToCreate: [],
- flatEntityToDelete: [],
- flatEntityToUpdate: commandMenuItemsToUpdate
- .filter(isDefined)
- .map((commandMenuItem) => ({
- ...commandMenuItem,
- conditionalAvailabilityExpression:
- commandMenuItem.conditionalAvailabilityExpression?.replace(
- from,
- to,
- ) ?? null,
- updatedAt,
- })),
- },
- },
- },
- );
-
- if (result.status === 'fail') {
- throw new WorkspaceMigrationBuilderException(result);
- }
- }
-}
diff --git a/packages/twenty-server/src/database/commands/upgrade-version-command/2-46/2-46-workspace-command-1791056679663-make-agent-chat-thread-participants-private.command.ts b/packages/twenty-server/src/database/commands/upgrade-version-command/2-46/2-46-workspace-command-1791056679663-make-agent-chat-thread-participants-private.command.ts
deleted file mode 100644
index 83df876d522..00000000000
--- a/packages/twenty-server/src/database/commands/upgrade-version-command/2-46/2-46-workspace-command-1791056679663-make-agent-chat-thread-participants-private.command.ts
+++ /dev/null
@@ -1,229 +0,0 @@
-import { Command } from 'nest-commander';
-import { TWENTY_STANDARD_APPLICATION_UNIVERSAL_IDENTIFIER } from 'twenty-shared/application';
-import { STANDARD_OBJECTS } from 'twenty-shared/metadata';
-import { MetadataReadability } from 'twenty-shared/types';
-import { isDefined } from 'twenty-shared/utils';
-import { type EntityManager } from 'typeorm';
-
-import { AgentHistoryUpgradeStorageService } from 'src/database/commands/agent-history/agent-history-upgrade-storage.service';
-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 { type FlatObjectMetadata } from 'src/engine/metadata-modules/flat-object-metadata/types/flat-object-metadata.type';
-import { WorkspaceCacheService } from 'src/engine/workspace-cache/services/workspace-cache.service';
-import { getWorkspaceSchemaName } from 'src/engine/workspace-datasource/utils/get-workspace-schema-name.util';
-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 { escapeIdentifier } from 'src/engine/workspace-manager/workspace-migration/utils/remove-sql-injection.util';
-
-const getTables = (workspaceId: string) => {
- const schema = escapeIdentifier(getWorkspaceSchemaName(workspaceId));
-
- return {
- participant: `${schema}."agentChatThreadParticipant"`,
- recordShare: `${schema}."recordShare"`,
- workspaceMember: `${schema}."workspaceMember"`,
- };
-};
-
-// Every row a member of the workspace still holds gets the grant that lets
-// them, and only them, read it
-const insertParticipantOwnerShares = async ({
- manager,
- workspaceId,
- participantObjectMetadataId,
-}: {
- manager: EntityManager;
- workspaceId: string;
- participantObjectMetadataId: string;
-}): Promise<number> => {
- const tables = getTables(workspaceId);
-
- const inserted: { id: string }[] = await manager.query(
- `INSERT INTO ${tables.recordShare}
- ("objectMetadataId", "recordId", "principalId", "principalType", "accessLevel", "rowCause", "sourceId")
- SELECT $1, participant.id, participant."workspaceMemberId", 'WORKSPACE_MEMBER', 'FULL', 'OWNER', participant.id
- FROM ${tables.participant} participant
- JOIN ${tables.workspaceMember} member
- ON member.id = participant."workspaceMemberId" AND member."deletedAt" IS NULL
- ON CONFLICT DO NOTHING
- RETURNING id`,
- [participantObjectMetadataId],
- );
-
- return inserted.length;
-};
-
-const deleteParticipantOwnerShares = async ({
- manager,
- workspaceId,
- participantObjectMetadataId,
-}: {
- manager: EntityManager;
- workspaceId: string;
- participantObjectMetadataId: string;
-}): Promise<number> => {
- const tables = getTables(workspaceId);
-
- const [, deletedCount]: [unknown[], number] = await manager.query(
- `DELETE FROM ${tables.recordShare}
- WHERE "objectMetadataId" = $1 AND "rowCause" = 'OWNER'`,
- [participantObjectMetadataId],
- );
-
- return deletedCount;
-};
-
-@RegisteredWorkspaceCommand('2.46.0', 1791056679663)
-@Command({
- name: 'upgrade:2-46:make-agent-chat-thread-participants-private',
- description:
- "Grant every chat participant row to its member and make the object PRIVATE, so a member's inbox state reaches their open apps through record events",
-})
-export class MakeAgentChatThreadParticipantsPrivateCommand extends ProvisionedWorkspaceCommandRunner {
- constructor(
- protected readonly workspaceIteratorService: WorkspaceIteratorService,
- private readonly workspaceCacheService: WorkspaceCacheService,
- private readonly workspaceMigrationValidateBuildAndRunService: WorkspaceMigrationValidateBuildAndRunService,
- private readonly storage: AgentHistoryUpgradeStorageService,
- ) {
- super(workspaceIteratorService);
- }
-
- override async runOnWorkspace(args: RunOnWorkspaceArgs): Promise<void> {
- await this.up(args);
- }
-
- // Grants first, so the object is never PRIVATE with rows nobody can read
- async up({ workspaceId, options }: RunOnWorkspaceArgs): Promise<void> {
- const participantObject = await this.findParticipantObject(workspaceId);
-
- if (!isDefined(participantObject)) {
- return;
- }
-
- if (options.dryRun ?? false) {
- this.logger.log(
- `[DRY RUN] Would grant chat participants to their members and make them PRIVATE for workspace ${workspaceId}`,
- );
-
- return;
- }
-
- const grantCount = await this.storage.run(workspaceId, ({ manager }) =>
- insertParticipantOwnerShares({
- manager,
- workspaceId,
- participantObjectMetadataId: participantObject.id,
- }),
- );
-
- await this.setReadability({
- workspaceId,
- participantObject,
- readability: MetadataReadability.PRIVATE,
- });
-
- this.logger.log(
- `Workspace ${workspaceId}: granted ${grantCount} chat participant row(s) to their members and made the object PRIVATE`,
- );
- }
-
- async down({ workspaceId, options }: RunOnWorkspaceArgs): Promise<void> {
- const participantObject = await this.findParticipantObject(workspaceId);
-
- if (!isDefined(participantObject)) {
- return;
- }
-
- if (options.dryRun ?? false) {
- this.logger.log(
- `[DRY RUN] Would make chat participants SYSTEM again and remove their grants for workspace ${workspaceId}`,
- );
-
- return;
- }
-
- await this.setReadability({
- workspaceId,
- participantObject,
- readability: MetadataReadability.SYSTEM,
- });
-
- const deletedCount = await this.storage.run(workspaceId, ({ manager }) =>
- deleteParticipantOwnerShares({
- manager,
- workspaceId,
- participantObjectMetadataId: participantObject.id,
- }),
- );
-
- this.logger.log(
- `Workspace ${workspaceId}: made chat participants SYSTEM again and removed ${deletedCount} grant(s)`,
- );
- }
-
- private async findParticipantObject(
- workspaceId: string,
- ): Promise<FlatObjectMetadata | undefined> {
- const { flatObjectMetadataMaps } =
- await this.workspaceCacheService.getOrRecompute(workspaceId, [
- 'flatObjectMetadataMaps',
- ]);
-
- const participantObject =
- flatObjectMetadataMaps.byUniversalIdentifier[
- STANDARD_OBJECTS.agentChatThreadParticipant.universalIdentifier
- ];
-
- if (!isDefined(participantObject)) {
- this.logger.log(
- `agentChatThreadParticipant object not found for workspace ${workspaceId}, skipping`,
- );
- }
-
- return participantObject;
- }
-
- private async setReadability({
- workspaceId,
- participantObject,
- readability,
- }: {
- workspaceId: string;
- participantObject: FlatObjectMetadata;
- readability: MetadataReadability;
- }): Promise<void> {
- if (participantObject.readability === readability) {
- return;
- }
-
- const result =
- await this.workspaceMigrationValidateBuildAndRunService.validateBuildAndRunLegacyWorkspaceMigration(
- {
- workspaceId,
- isSystemBuild: true,
- applicationUniversalIdentifier:
- TWENTY_STANDARD_APPLICATION_UNIVERSAL_IDENTIFIER,
- allFlatEntityOperationByMetadataName: {
- objectMetadata: {
- flatEntityToCreate: [],
- flatEntityToDelete: [],
- flatEntityToUpdate: [
- {
- ...participantObject,
- readability,
- updatedAt: new Date().toISOString(),
- },
- ],
- },
- },
- },
- );
-
- if (result.status === 'fail') {
- throw new WorkspaceMigrationBuilderException(result);
- }
- }
-}
diff --git a/packages/twenty-server/src/database/commands/upgrade-version-command/2-46/2-46-workspace-command-1791093059050-schedule-agent-chat-thread-snooze-ends.command.ts b/packages/twenty-server/src/database/commands/upgrade-version-command/2-46/2-46-workspace-command-1791093059050-schedule-agent-chat-thread-snooze-ends.command.ts
deleted file mode 100644
index 5114080dbb2..00000000000
--- a/packages/twenty-server/src/database/commands/upgrade-version-command/2-46/2-46-workspace-command-1791093059050-schedule-agent-chat-thread-snooze-ends.command.ts
+++ /dev/null
@@ -1,109 +0,0 @@
-import { Command } from 'nest-commander';
-import { STANDARD_OBJECTS } from 'twenty-shared/metadata';
-import { isDefined } from 'twenty-shared/utils';
-
-import { AgentHistoryUpgradeStorageService } from 'src/database/commands/agent-history/agent-history-upgrade-storage.service';
-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 { InjectMessageQueue } from 'src/engine/core-modules/message-queue/decorators/message-queue.decorator';
-import { MessageQueue } from 'src/engine/core-modules/message-queue/message-queue.constants';
-import { MessageQueueService } from 'src/engine/core-modules/message-queue/services/message-queue.service';
-import { RegisteredWorkspaceCommand } from 'src/engine/core-modules/upgrade/decorators/registered-workspace-command.decorator';
-import { AGENT_CHAT_THREAD_SNOOZE_END_JOB_RETRY_OPTIONS } from 'src/engine/metadata-modules/ai/ai-chat/constants/agent-chat-thread-snooze-end-job-retry-options.constant';
-import { END_AGENT_CHAT_THREAD_SNOOZE_JOB_NAME } from 'src/engine/metadata-modules/ai/ai-chat/jobs/end-agent-chat-thread-snooze-job-name.constant';
-import { type EndAgentChatThreadSnoozeJobData } from 'src/engine/metadata-modules/ai/ai-chat/jobs/end-agent-chat-thread-snooze-job.types';
-import { WorkspaceCacheService } from 'src/engine/workspace-cache/services/workspace-cache.service';
-import { getWorkspaceSchemaName } from 'src/engine/workspace-datasource/utils/get-workspace-schema-name.util';
-import { escapeIdentifier } from 'src/engine/workspace-manager/workspace-migration/utils/remove-sql-injection.util';
-
-type PendingSnooze = {
- threadId: string;
- workspaceMemberId: string;
- snoozedUntil: Date;
- remainingDelay: number;
-};
-
-// Snoozes saved before snoozing queued its own end have nothing to bring the
-// chat back to the inbox of an app that stays open
-@RegisteredWorkspaceCommand('2.46.0', 1791093059050)
-@Command({
- name: 'upgrade:2-46:schedule-agent-chat-thread-snooze-ends',
- description:
- 'Queue the end of every chat snooze still pending, so open apps see the chat come back',
-})
-export class ScheduleAgentChatThreadSnoozeEndsCommand extends ProvisionedWorkspaceCommandRunner {
- constructor(
- protected readonly workspaceIteratorService: WorkspaceIteratorService,
- private readonly workspaceCacheService: WorkspaceCacheService,
- private readonly storage: AgentHistoryUpgradeStorageService,
- @InjectMessageQueue(MessageQueue.delayedJobsQueue)
- private readonly delayedJobsQueueService: MessageQueueService,
- ) {
- super(workspaceIteratorService);
- }
-
- override async runOnWorkspace(args: RunOnWorkspaceArgs): Promise<void> {
- await this.up(args);
- }
-
- async up({ workspaceId, options }: RunOnWorkspaceArgs): Promise<void> {
- if (!(await this.hasParticipantObject(workspaceId))) {
- return;
- }
-
- const pendingSnoozes = await this.storage.run(workspaceId, ({ manager }) =>
- manager.query<PendingSnooze[]>(
- `SELECT "threadId", "workspaceMemberId", "snoozedUntil",
- CEIL(EXTRACT(EPOCH FROM "snoozedUntil" - clock_timestamp()) * 1000)::float8 AS "remainingDelay"
- FROM ${escapeIdentifier(getWorkspaceSchemaName(workspaceId))}."agentChatThreadParticipant"
- WHERE "archivedAt" IS NOT NULL AND "snoozedUntil" > clock_timestamp()`,
- ),
- );
-
- if (options.dryRun ?? false) {
- this.logger.log(
- `[DRY RUN] Would queue the end of ${pendingSnoozes.length} chat snooze(s) for workspace ${workspaceId}`,
- );
-
- return;
- }
-
- // The end of a snooze the member changed since finds nothing to end
- for (const { remainingDelay, snoozedUntil, ...snooze } of pendingSnoozes) {
- await this.delayedJobsQueueService.add<EndAgentChatThreadSnoozeJobData>(
- END_AGENT_CHAT_THREAD_SNOOZE_JOB_NAME,
- { ...snooze, workspaceId, snoozedUntil: snoozedUntil.toISOString() },
- {
- delay: remainingDelay,
- ...AGENT_CHAT_THREAD_SNOOZE_END_JOB_RETRY_OPTIONS,
- },
- );
- }
-
- this.logger.log(
- `Workspace ${workspaceId}: queued the end of ${pendingSnoozes.length} chat snooze(s)`,
- );
- }
-
- // Queued ends only send what is already true by then, so there is nothing
- // to undo
- async down({ workspaceId }: RunOnWorkspaceArgs): Promise<void> {
- this.logger.log(
- `Workspace ${workspaceId}: queued chat snooze ends are left to run`,
- );
- }
-
- private async hasParticipantObject(workspaceId: string): Promise<boolean> {
- const { flatObjectMetadataMaps } =
- await this.workspaceCacheService.getOrRecompute(workspaceId, [
- 'flatObjectMetadataMaps',
- ]);
-
- return isDefined(
- flatObjectMetadataMaps.byUniversalIdentifier[
- STANDARD_OBJECTS.agentChatThreadParticipant.universalIdentifier
- ],
- );
- }
-}
diff --git a/packages/twenty-server/test/integration/upgrade/suites/2-46-workspace-command-1790942019632-backfill-agent-chat-thread-inbox-state.integration-spec.ts b/packages/twenty-server/test/integration/upgrade/suites/2-46-workspace-command-1790942019632-backfill-agent-chat-thread-inbox-state.integration-spec.ts
index 3af2eb8495a..f1ee64a5ddf 100644
--- a/packages/twenty-server/test/integration/upgrade/suites/2-46-workspace-command-1790942019632-backfill-agent-chat-thread-inbox-state.integration-spec.ts
+++ b/packages/twenty-server/test/integration/upgrade/suites/2-46-workspace-command-1790942019632-backfill-agent-chat-thread-inbox-state.integration-spec.ts
@@ -154,6 +154,19 @@ describe('2-46 workspace commands - agent chat thread inbox state (integration)'
[threadIds],
);
+ const readOwnerShares = async () => {
+ const rows: { principalId: string; workspaceMemberId: string }[] =
+ await global.testDataSource.query(
+ `SELECT share."principalId", participant."workspaceMemberId"
+ FROM ${SCHEMA}."recordShare" share
+ JOIN ${SCHEMA}."agentChatThreadParticipant" participant ON participant.id = share."recordId"
+ WHERE participant."threadId" = ANY($1) AND share."rowCause" = 'OWNER'`,
+ [threadIds],
+ );
+
+ return rows;
+ };
+
beforeAll(async () => {
objectCommand =
getAppProviderByClassName<AddAgentChatThreadParticipantObjectCommand>(
@@ -273,6 +286,12 @@ describe('2-46 workspace commands - agent chat thread inbox state (integration)'
afterAll(async () => {
await runCommand(objectCommand, 'up');
await runCommand(backfillCommand, 'up');
+ await global.testDataSource.query(
+ `DELETE FROM ${SCHEMA}."recordShare" share
+ USING ${SCHEMA}."agentChatThreadParticipant" participant
+ WHERE participant.id = share."recordId" AND participant."threadId" = ANY($1)`,
+ [threadIds],
+ );
await global.testDataSource.query(
`DELETE FROM core."upgradeMigration" WHERE name = $1 AND attempt = 99 AND "workspaceId" = $2`,
[MOVE_MIGRATION_NAME, SEED_APPLE_WORKSPACE_ID],
@@ -386,6 +405,16 @@ describe('2-46 workspace commands - agent chat thread inbox state (integration)'
expect(threads[deletedThreadId].deletedAt).toEqual(ARCHIVED_AT);
});
+ it('grants each participant row to its member, and only them', async () => {
+ const participants = await readParticipants();
+ const ownerShares = await readOwnerShares();
+
+ expect(ownerShares).toHaveLength(participants.length);
+ ownerShares.forEach(({ principalId, workspaceMemberId }) =>
+ expect(principalId).toBe(workspaceMemberId),
+ );
+ });
+
it('leaves a chat its owner deleted again after the 2.44 move in the trash', async () => {
const threads = await readThreads();
@@ -411,10 +440,14 @@ describe('2-46 workspace commands - agent chat thread inbox state (integration)'
expect(threads[legacyArchivedThreadId].deletedAt).toEqual(MOVE_RECORDED_AT);
expect(threads[sharedThreadId].deletedAt).toBeNull();
+ expect(await readOwnerShares()).toEqual([]);
await runCommand(backfillCommand, 'up');
expect((await readThreads())[legacyArchivedThreadId].deletedAt).toBeNull();
+ expect(await readOwnerShares()).toHaveLength(
+ (await readParticipants()).length,
+ );
});
it('keeps chats working on a workspace the upgrade has not reached yet', () => {
diff --git a/packages/twenty-server/test/integration/upgrade/suites/2-46-workspace-command-1791056679663-make-agent-chat-thread-participants-private.integration-spec.ts b/packages/twenty-server/test/integration/upgrade/suites/2-46-workspace-command-1791056679663-make-agent-chat-thread-participants-private.integration-spec.ts
deleted file mode 100644
index f00f7aa1e6c..00000000000
--- a/packages/twenty-server/test/integration/upgrade/suites/2-46-workspace-command-1791056679663-make-agent-chat-thread-participants-private.integration-spec.ts
+++ /dev/null
@@ -1,144 +0,0 @@
-import { randomUUID } from 'node:crypto';
-
-import { getAppProviderByClassName } from 'test/integration/utils/get-app-provider-by-class-name.util';
-import { STANDARD_OBJECTS } from 'twenty-shared/metadata';
-import { MetadataReadability } from 'twenty-shared/types';
-
-import { type MakeAgentChatThreadParticipantsPrivateCommand } from 'src/database/commands/upgrade-version-command/2-46/2-46-workspace-command-1791056679663-make-agent-chat-thread-participants-private.command';
-import { buildSystemAuthContext } from 'src/engine/twenty-orm/utils/build-system-auth-context.util';
-import { type WorkspaceOrmManager } from 'src/engine/twenty-orm/workspace-orm.manager';
-import { type WorkspaceCacheService } from 'src/engine/workspace-cache/services/workspace-cache.service';
-import { getWorkspaceSchemaName } from 'src/engine/workspace-datasource/utils/get-workspace-schema-name.util';
-import { SEED_APPLE_WORKSPACE_ID } from 'src/engine/workspace-manager/dev-seeder/core/constants/seeder-workspaces.constant';
-import { WORKSPACE_MEMBER_DATA_SEED_IDS } from 'src/engine/workspace-manager/dev-seeder/data/constants/workspace-member-data-seeds.constant';
-
-const RUN_ON_WORKSPACE_ARGS = {
- workspaceId: SEED_APPLE_WORKSPACE_ID,
- options: {},
- index: 0,
- total: 1,
-};
-
-const SCHEMA = getWorkspaceSchemaName(SEED_APPLE_WORKSPACE_ID);
-
-describe('2-46 workspace command - make agent chat thread participants private (integration)', () => {
- let command: MakeAgentChatThreadParticipantsPrivateCommand;
- let workspaceOrmManager: WorkspaceOrmManager;
-
- const threadId = randomUUID();
- const janeParticipantId = randomUUID();
- const jonyParticipantId = randomUUID();
-
- const runCommand = (direction: 'up' | 'down') =>
- workspaceOrmManager.executeInWorkspaceContext(
- () => command[direction](RUN_ON_WORKSPACE_ARGS),
- buildSystemAuthContext(SEED_APPLE_WORKSPACE_ID),
- );
-
- const findParticipantObject = async () => {
- const { flatObjectMetadataMaps } =
- await getAppProviderByClassName<WorkspaceCacheService>(
- 'WorkspaceCacheService',
- ).getOrRecompute(SEED_APPLE_WORKSPACE_ID, ['flatObjectMetadataMaps']);
-
- return flatObjectMetadataMaps.byUniversalIdentifier[
- STANDARD_OBJECTS.agentChatThreadParticipant.universalIdentifier
- ]!;
- };
-
- const readOwnerShares = async () => {
- const rows: { recordId: string; principalId: string }[] =
- await global.testDataSource.query(
- `SELECT "recordId", "principalId" FROM ${SCHEMA}."recordShare"
- WHERE "recordId" = ANY($1) AND "rowCause" = 'OWNER'
- ORDER BY "principalId"`,
- [[janeParticipantId, jonyParticipantId]],
- );
-
- return rows;
- };
-
- beforeAll(async () => {
- command =
- getAppProviderByClassName<MakeAgentChatThreadParticipantsPrivateCommand>(
- 'MakeAgentChatThreadParticipantsPrivateCommand',
- );
- workspaceOrmManager = getAppProviderByClassName<WorkspaceOrmManager>(
- 'WorkspaceOrmManager',
- );
-
- await runCommand('down');
-
- await global.testDataSource.query(
- `INSERT INTO ${SCHEMA}."agentChatThread" (id, title, "workspaceMemberId")
- VALUES ($1, 'Private participants', $2)`,
- [threadId, WORKSPACE_MEMBER_DATA_SEED_IDS.JANE],
- );
- await global.testDataSource.query(
- `INSERT INTO ${SCHEMA}."agentChatThreadParticipant" (id, "threadId", "workspaceMemberId")
- VALUES ($1, $3, $4), ($2, $3, $5)`,
- [
- janeParticipantId,
- jonyParticipantId,
- threadId,
- WORKSPACE_MEMBER_DATA_SEED_IDS.JANE,
- WORKSPACE_MEMBER_DATA_SEED_IDS.JONY,
- ],
- );
- });
-
- afterAll(async () => {
- await runCommand('up');
- await global.testDataSource.query(
- `DELETE FROM ${SCHEMA}."recordShare" WHERE "recordId" = ANY($1)`,
- [[janeParticipantId, jonyParticipantId]],
- );
- await global.testDataSource.query(
- `DELETE FROM ${SCHEMA}."agentChatThreadParticipant" WHERE "threadId" = $1`,
- [threadId],
- );
- await global.testDataSource.query(
- `DELETE FROM ${SCHEMA}."agentChatThread" WHERE id = $1`,
- [threadId],
- );
- });
-
- it('starts from rows nobody is granted on a SYSTEM object', async () => {
- expect((await findParticipantObject()).readability).toBe(
- MetadataReadability.SYSTEM,
- );
- expect(await readOwnerShares()).toEqual([]);
- });
-
- it('grants each row to its member and makes the object PRIVATE', async () => {
- await runCommand('up');
- await runCommand('up');
-
- expect((await findParticipantObject()).readability).toBe(
- MetadataReadability.PRIVATE,
- );
- expect(await readOwnerShares()).toEqual(
- [
- {
- recordId: janeParticipantId,
- principalId: WORKSPACE_MEMBER_DATA_SEED_IDS.JANE,
- },
- {
- recordId: jonyParticipantId,
- principalId: WORKSPACE_MEMBER_DATA_SEED_IDS.JONY,
- },
- ].sort((first, second) =>
- first.principalId.localeCompare(second.principalId),
- ),
- );
- });
-
- it('makes the object SYSTEM again and removes the grants on down', async () => {
- await runCommand('down');
-
- expect((await findParticipantObject()).readability).toBe(
- MetadataReadability.SYSTEM,
- );
- expect(await readOwnerShares()).toEqual([]);
- });
-});
diff --git a/packages/twenty-server/test/integration/upgrade/suites/2-46-workspace-command-1791093059050-schedule-agent-chat-thread-snooze-ends.integration-spec.ts b/packages/twenty-server/test/integration/upgrade/suites/2-46-workspace-command-1791093059050-schedule-agent-chat-thread-snooze-ends.integration-spec.ts
deleted file mode 100644
index 2c211c9c888..00000000000
--- a/packages/twenty-server/test/integration/upgrade/suites/2-46-workspace-command-1791093059050-schedule-agent-chat-thread-snooze-ends.integration-spec.ts
+++ /dev/null
@@ -1,98 +0,0 @@
-import { randomUUID } from 'node:crypto';
-
-import { getAppProviderByClassName } from 'test/integration/utils/get-app-provider-by-class-name.util';
-
-import { type ScheduleAgentChatThreadSnoozeEndsCommand } from 'src/database/commands/upgrade-version-command/2-46/2-46-workspace-command-1791093059050-schedule-agent-chat-thread-snooze-ends.command';
-import { END_AGENT_CHAT_THREAD_SNOOZE_JOB_NAME } from 'src/engine/metadata-modules/ai/ai-chat/jobs/end-agent-chat-thread-snooze-job-name.constant';
-import { buildSystemAuthContext } from 'src/engine/twenty-orm/utils/build-system-auth-context.util';
-import { type WorkspaceOrmManager } from 'src/engine/twenty-orm/workspace-orm.manager';
-import { getWorkspaceSchemaName } from 'src/engine/workspace-datasource/utils/get-workspace-schema-name.util';
-import { SEED_APPLE_WORKSPACE_ID } from 'src/engine/workspace-manager/dev-seeder/core/constants/seeder-workspaces.constant';
-import { WORKSPACE_MEMBER_DATA_SEED_IDS } from 'src/engine/workspace-manager/dev-seeder/data/constants/workspace-member-data-seeds.constant';
-
-const SCHEMA = getWorkspaceSchemaName(SEED_APPLE_WORKSPACE_ID);
-
-describe('2-46 workspace command - schedule agent chat thread snooze ends (integration)', () => {
- const pendingThreadId = randomUUID();
- const endedThreadId = randomUUID();
- let pendingSnoozedUntil: Date;
-
- beforeAll(async () => {
- for (const threadId of [pendingThreadId, endedThreadId]) {
- await global.testDataSource.query(
- `INSERT INTO ${SCHEMA}."agentChatThread" (id, title, "workspaceMemberId")
- VALUES ($1, 'Snooze ends', $2)`,
- [threadId, WORKSPACE_MEMBER_DATA_SEED_IDS.JANE],
- );
- }
-
- pendingSnoozedUntil = new Date(Date.now() + 30_000);
-
- await global.testDataSource.query(
- `INSERT INTO ${SCHEMA}."agentChatThreadParticipant" ("threadId", "workspaceMemberId", "archivedAt", "snoozedUntil")
- VALUES ($1, $3, now(), $4), ($2, $3, now(), now() - interval '1 minute')`,
- [
- pendingThreadId,
- endedThreadId,
- WORKSPACE_MEMBER_DATA_SEED_IDS.JANE,
- pendingSnoozedUntil,
- ],
- );
- });
-
- afterAll(async () => {
- for (const threadId of [pendingThreadId, endedThreadId]) {
- await global.testDataSource.query(
- `DELETE FROM ${SCHEMA}."agentChatThreadParticipant" WHERE "threadId" = $1`,
- [threadId],
- );
- await global.testDataSource.query(
- `DELETE FROM ${SCHEMA}."agentChatThread" WHERE id = $1`,
- [threadId],
- );
- }
- });
-
- it('queues the end of each snooze still pending', async () => {
- const command =
- getAppProviderByClassName<ScheduleAgentChatThreadSnoozeEndsCommand>(
- 'ScheduleAgentChatThreadSnoozeEndsCommand',
- );
- const addSpy = jest
- .spyOn(command['delayedJobsQueueService'], 'add')
- .mockResolvedValue(undefined);
-
- await getAppProviderByClassName<WorkspaceOrmManager>(
- 'WorkspaceOrmManager',
- ).executeInWorkspaceContext(
- () =>
- command.up({
- workspaceId: SEED_APPLE_WORKSPACE_ID,
- options: {},
- index: 0,
- total: 1,
- }),
- buildSystemAuthContext(SEED_APPLE_WORKSPACE_ID),
- );
-
- const queuedThreadIds = addSpy.mock.calls.map(
- ([, data]) => (data as { threadId: string }).threadId,
- );
- const pendingCall = addSpy.mock.calls.find(
- ([, data]) => (data as { threadId: string }).threadId === pendingThreadId,
- );
-
- expect(queuedThreadIds).not.toContain(endedThreadId);
- expect(pendingCall?.[0]).toBe(END_AGENT_CHAT_THREAD_SNOOZE_JOB_NAME);
- expect(pendingCall?.[1]).toEqual({
- workspaceId: SEED_APPLE_WORKSPACE_ID,
- workspaceMemberId: WORKSPACE_MEMBER_DATA_SEED_IDS.JANE,
- threadId: pendingThreadId,
- snoozedUntil: pendingSnoozedUntil.toISOString(),
- });
- expect(pendingCall?.[2]?.delay).toBeGreaterThan(0);
- expect(pendingCall?.[2]?.delay).toBeLessThanOrEqual(30_000);
-
- addSpy.mockRestore();
- });
-});