Merge pull request #2487 from automatisch/aut-1524

fix(folder): cover soft deleted flows on delete

packages/backend/src/models/folder.js

@@ -38,7 +38,10 @@ class Folder extends Base {
   });
 
   async delete() {
-    await this.$relatedQuery('flows').patch({ folderId: null });
+    await this.$relatedQuery('flows')
+      .withSoftDeleted()
+      .patch({ folderId: null });
+
     await this.$query().delete();
   }
 }

packages/backend/src/models/folder.test.js

@@ -54,6 +54,20 @@ describe('Folder model', () => {
       expect(refetchedFlow.folderId).toBe(null);
     });
 
+    it('should set folderId to null for all related soft-deleted flows before deleting the folder', async () => {
+      const user = await createUser();
+
+      const folder = await createFolder({ userId: user.id });
+      const flow = await createFlow({ folderId: folder.id, userId: user.id });
+
+      await flow.$query().delete();
+
+      await folder.delete();
+
+      const refetchedFlow = await flow.$query().withSoftDeleted();
+      expect(refetchedFlow.folderId).toBe(null);
+    });
+
     it('should delete the folder', async () => {
       const user = await createUser();
       const folder = await createFolder({ userId: user.id });