Remove serverless functions on soft delete

packages/twenty-server/src/engine/metadata-modules/serverless-function/serverless-function.resolver.ts

@@ -122,10 +122,10 @@ export class ServerlessFunctionResolver {
     try {
       await this.checkFeatureFlag(workspaceId);
 
-      return await this.serverlessFunctionService.deleteOneServerlessFunction(
-        input.id,
+      return await this.serverlessFunctionService.deleteOneServerlessFunction({
+        id: input.id,
         workspaceId,
-      );
+      });
     } catch (error) {
       serverlessFunctionGraphQLApiExceptionHandler(error);
     }

packages/twenty-server/src/engine/metadata-modules/serverless-function/serverless-function.service.ts

@@ -205,7 +205,15 @@ export class ServerlessFunctionService {
     });
   }
 
-  async deleteOneServerlessFunction(id: string, workspaceId: string) {
+  async deleteOneServerlessFunction({
+    id,
+    workspaceId,
+    permanentlyDelete = true,
+  }: {
+    id: string;
+    workspaceId: string;
+    permanentlyDelete?: boolean;
+  }) {
     const existingServerlessFunction =
       await this.serverlessFunctionRepository.findOneBy({
         id,
@@ -219,16 +227,17 @@ export class ServerlessFunctionService {
       );
     }
 
-    await this.serverlessFunctionRepository.delete(id);
+    if (permanentlyDelete) {
+      await this.serverlessFunctionRepository.delete(id);
+      await this.fileStorageService.delete({
+        folderPath: getServerlessFolder({
+          serverlessFunction: existingServerlessFunction,
+        }),
+      });
+    }
 
     await this.serverlessService.delete(existingServerlessFunction);
 
-    await this.fileStorageService.delete({
-      folderPath: getServerlessFolder({
-        serverlessFunction: existingServerlessFunction,
-      }),
-    });
-
     return existingServerlessFunction;
   }
 

packages/twenty-server/src/modules/workflow/common/workspace-services/workflow-common.workspace-service.ts

@@ -121,10 +121,11 @@ export class WorkflowCommonWorkspaceService {
       workflowVersions.map((workflowVersion) => {
         workflowVersion.steps?.map(async (step) => {
           if (step.type === WorkflowActionType.CODE) {
-            await this.serverlessFunctionService.deleteOneServerlessFunction(
-              step.settings.input.serverlessFunctionId,
+            await this.serverlessFunctionService.deleteOneServerlessFunction({
+              id: step.settings.input.serverlessFunctionId,
               workspaceId,
-            );
+              permanentlyDelete: false,
+            });
           }
         });
       }),

packages/twenty-server/src/modules/workflow/common/workspace-services/workflow-version-step.workspace-service.ts

@@ -511,10 +511,10 @@ export class WorkflowVersionStepWorkspaceService {
   }) {
     switch (step.type) {
       case WorkflowActionType.CODE: {
-        await this.serverlessFunctionService.deleteOneServerlessFunction(
-          step.settings.input.serverlessFunctionId,
+        await this.serverlessFunctionService.deleteOneServerlessFunction({
+          id: step.settings.input.serverlessFunctionId,
           workspaceId,
-        );
+        });
 
         break;
       }