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

move deletion limit on hard deletion (#10353)

Browse Source
This commit is contained in:
Etienne
2025-02-20 11:20:58 +01:00
committed by GitHub
parent 94c0d0f8d2
commit d4aba8d1ff
1 changed files with 4 additions and 7 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

@ -278,7 +278,8 @@ export class CleanerWorkspaceService {
if ( if (
daysSinceSoftDeleted > daysSinceSoftDeleted >
this.inactiveDaysBeforeDelete - this.inactiveDaysBeforeSoftDelete this.inactiveDaysBeforeDelete - this.inactiveDaysBeforeSoftDelete &&
deletedWorkspacesCount < this.maxNumberOfWorkspacesDeletedPerExecution
) { ) {
this.logger.log( this.logger.log(
`${dryRun ? 'DRY RUN - ' : ''}Destroying workspace ${workspace.id} ${workspace.displayName}`, `${dryRun ? 'DRY RUN - ' : ''}Destroying workspace ${workspace.id} ${workspace.displayName}`,
@ -286,20 +287,16 @@ export class CleanerWorkspaceService {
if (!dryRun) { if (!dryRun) {
await this.workspaceService.deleteWorkspace(workspace.id); await this.workspaceService.deleteWorkspace(workspace.id);
} }
deletedWorkspacesCount++;
continue; continue;
} }
if ( if (workspaceInactivity > this.inactiveDaysBeforeSoftDelete) {
workspaceInactivity > this.inactiveDaysBeforeSoftDelete &&
deletedWorkspacesCount <=
this.maxNumberOfWorkspacesDeletedPerExecution
) {
await this.informWorkspaceMembersAndSoftDeleteWorkspace( await this.informWorkspaceMembersAndSoftDeleteWorkspace(
workspace, workspace,
workspaceInactivity, workspaceInactivity,
dryRun, dryRun,
); );
deletedWorkspacesCount++;
continue; continue;
} }