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

cleaning workspace job - fix on soft delete condition (#10380)

Browse Source 
Context
If the command runs multiple times, soft deleted workspaces are soft
deleted again (+ email spamming)

Solution
Check for soft deletion before entering soft delete condition
This commit is contained in:
Etienne
2025-02-21 12:12:08 +01:00
committed by GitHub
parent 29d079babc
commit 5863c45d4b
1 changed files with 10 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
packages/twenty-server/src/engine/workspace-manager/workspace-cleaner/services/cleaner.workspace-service.ts
View File

@ -17,6 +17,7 @@ import { UserService } from 'src/engine/core-modules/user/services/user.service'
import { UserVarsService } from 'src/engine/core-modules/user/user-vars/services/user-vars.service'; import { UserVarsService } from 'src/engine/core-modules/user/user-vars/services/user-vars.service';
import { WorkspaceService } from 'src/engine/core-modules/workspace/services/workspace.service'; import { WorkspaceService } from 'src/engine/core-modules/workspace/services/workspace.service';
import { Workspace } from 'src/engine/core-modules/workspace/workspace.entity'; import { Workspace } from 'src/engine/core-modules/workspace/workspace.entity';
import { TwentyORMGlobalManager } from 'src/engine/twenty-orm/twenty-orm-global.manager';
import { USER_WORKSPACE_DELETION_WARNING_SENT_KEY } from 'src/engine/workspace-manager/workspace-cleaner/constants/user-workspace-deletion-warning-sent-key.constant'; import { USER_WORKSPACE_DELETION_WARNING_SENT_KEY } from 'src/engine/workspace-manager/workspace-cleaner/constants/user-workspace-deletion-warning-sent-key.constant';
import { import {
WorkspaceCleanerException, WorkspaceCleanerException,
@ -42,6 +43,7 @@ export class CleanerWorkspaceService {
private readonly workspaceRepository: Repository<Workspace>, private readonly workspaceRepository: Repository<Workspace>,
@InjectRepository(BillingSubscription, 'core') @InjectRepository(BillingSubscription, 'core')
private readonly billingSubscriptionRepository: Repository<BillingSubscription>, private readonly billingSubscriptionRepository: Repository<BillingSubscription>,
private readonly twentyORMGlobalManager: TwentyORMGlobalManager,
) { ) {
this.inactiveDaysBeforeSoftDelete = this.environmentService.get( this.inactiveDaysBeforeSoftDelete = this.environmentService.get(
'WORKSPACE_INACTIVE_DAYS_BEFORE_SOFT_DELETION', 'WORKSPACE_INACTIVE_DAYS_BEFORE_SOFT_DELETION',
@ -291,7 +293,10 @@ export class CleanerWorkspaceService {
continue; continue;
} }
if (workspaceInactivity > this.inactiveDaysBeforeSoftDelete) { if (
workspaceInactivity > this.inactiveDaysBeforeSoftDelete &&
!isDefined(workspace.deletedAt)
) {
await this.informWorkspaceMembersAndSoftDeleteWorkspace( await this.informWorkspaceMembersAndSoftDeleteWorkspace(
workspace, workspace,
workspaceInactivity, workspaceInactivity,
@ -315,6 +320,10 @@ export class CleanerWorkspaceService {
`Error while processing workspace ${workspace.id} ${workspace.displayName}: ${error}`, `Error while processing workspace ${workspace.id} ${workspace.displayName}: ${error}`,
); );
} }
await this.twentyORMGlobalManager.destroyDataSourceForWorkspace(
workspace.id,
);
} }
this.logger.log( this.logger.log(
`${dryRun ? 'DRY RUN - ' : ''}batchWarnOrCleanSuspendedWorkspaces done!`, `${dryRun ? 'DRY RUN - ' : ''}batchWarnOrCleanSuspendedWorkspaces done!`,