From d96865abc3e772f3069523bd6609b4f50bf4312e Mon Sep 17 00:00:00 2001
From: Etienne <45695613+etiennejouan@users.noreply.github.com>
Date: Thu, 20 Feb 2025 17:09:59 +0100
Subject: [PATCH] fix deleteCurrentWorkspace resolver output (#10365)

Tests are planned in this sprint - Core priority

closes https://github.com/twentyhq/twenty/issues/10347
---
 .../core-modules/workspace/services/workspace.service.ts   | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/packages/twenty-server/src/engine/core-modules/workspace/services/workspace.service.ts b/packages/twenty-server/src/engine/core-modules/workspace/services/workspace.service.ts
index e98b86517..2fc40f9f3 100644
--- a/packages/twenty-server/src/engine/core-modules/workspace/services/workspace.service.ts
+++ b/packages/twenty-server/src/engine/core-modules/workspace/services/workspace.service.ts
@@ -321,7 +321,9 @@ export class WorkspaceService extends TypeOrmQueryService<Workspace> {
     );
 
     if (softDelete) {
-      return await this.workspaceRepository.softDelete({ id });
+      await this.workspaceRepository.softDelete({ id });
+
+      return workspace;
     }
 
     await this.deleteMetadataSchemaCacheAndUserWorkspace(workspace);
@@ -330,8 +332,9 @@ export class WorkspaceService extends TypeOrmQueryService<Workspace> {
       FileWorkspaceFolderDeletionJob.name,
       { workspaceId: id },
     );
+    await this.workspaceRepository.delete(id);
 
-    return await this.workspaceRepository.delete(id);
+    return workspace;
   }
 
   async handleRemoveWorkspaceMember(