From d4aba8d1ff989615b4d96f1b6d6910ceeeedc6e7 Mon Sep 17 00:00:00 2001
From: Etienne <45695613+etiennejouan@users.noreply.github.com>
Date: Thu, 20 Feb 2025 11:20:58 +0100
Subject: [PATCH] move deletion limit on hard deletion (#10353)

---
 .../services/cleaner.workspace-service.ts             | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/packages/twenty-server/src/engine/workspace-manager/workspace-cleaner/services/cleaner.workspace-service.ts b/packages/twenty-server/src/engine/workspace-manager/workspace-cleaner/services/cleaner.workspace-service.ts
index 7cc543299..f9e1d2fc9 100644
--- a/packages/twenty-server/src/engine/workspace-manager/workspace-cleaner/services/cleaner.workspace-service.ts
+++ b/packages/twenty-server/src/engine/workspace-manager/workspace-cleaner/services/cleaner.workspace-service.ts
@@ -278,7 +278,8 @@ export class CleanerWorkspaceService {
 
         if (
           daysSinceSoftDeleted >
-          this.inactiveDaysBeforeDelete - this.inactiveDaysBeforeSoftDelete
+            this.inactiveDaysBeforeDelete - this.inactiveDaysBeforeSoftDelete &&
+          deletedWorkspacesCount < this.maxNumberOfWorkspacesDeletedPerExecution
         ) {
           this.logger.log(
             `${dryRun ? 'DRY RUN - ' : ''}Destroying workspace ${workspace.id} ${workspace.displayName}`,
@@ -286,20 +287,16 @@ export class CleanerWorkspaceService {
           if (!dryRun) {
             await this.workspaceService.deleteWorkspace(workspace.id);
           }
+          deletedWorkspacesCount++;
 
           continue;
         }
-        if (
-          workspaceInactivity > this.inactiveDaysBeforeSoftDelete &&
-          deletedWorkspacesCount <=
-            this.maxNumberOfWorkspacesDeletedPerExecution
-        ) {
+        if (workspaceInactivity > this.inactiveDaysBeforeSoftDelete) {
           await this.informWorkspaceMembersAndSoftDeleteWorkspace(
             workspace,
             workspaceInactivity,
             dryRun,
           );
-          deletedWorkspacesCount++;
 
           continue;
         }