Merge pull request #45 from flow-build/fix/get-default-by-wid

Fix/get default by wid
flow-build · May 15, 2023 · 6fb330b · 6fb330b
2 parents 0c26840 + dfe3363
commit 6fb330b
Show file tree

Hide file tree

Showing 2 changed files with 39 additions and 31 deletions.
diff --git a/src/entities/diagram.js b/src/entities/diagram.js
@@ -66,11 +66,11 @@ class Diagram extends PersistedEntity {
       user_id,
       filters
     );
-    if (!serialized) {
-      [serialized] = await this.getPersist().getByUserId(user_id);
-    }
-    if (!serialized) {
-      serialized = await this.getPersist().getLatestPublic();
+    if (!serialized && filters.workflow_id) {
+      [serialized] = await this.getPersist().getByUserAndWF(
+        user_id,
+        filters.workflow_id
+      );
     }
     return this.deserialize(serialized);
   }

diff --git a/src/tests/diagramCore.test.js b/src/tests/diagramCore.test.js
@@ -17,6 +17,14 @@ const diagramPayload = {
   diagram_xml: diagramExample,
 };
 
+const workflowPayload = {
+  id: uuid(),
+  name: 'Workflow Example',
+  version: 1,
+  server_id: '1c8f314b-5421-40cb-9a5b-73fca821c88f',
+  blueprint_spec,
+};
+
 beforeAll(async () => {
   PersistorProvider.getPersistor(db);
   return db.raw('START TRANSACTION');
@@ -93,19 +101,33 @@ describe('DiagramCore tests (without workflow_id)', () => {
 
   test('get default diagram by user_id', async () => {
     const diagramCore = new DiagramCore(db);
-    const payload = _.cloneDeep({ ...diagramPayload, user_default: true });
+    const payload = _.cloneDeep({
+      ...diagramPayload,
+      user_default: true,
+      workflow_data: workflowPayload,
+    });
     await diagramCore.saveDiagram(payload);
-    const diagram = await diagramCore.getDefaultDiagram(diagramPayload.user_id);
+    const diagram = await diagramCore.getDefaultDiagram(
+      diagramPayload.user_id,
+      { workflow_id: workflowPayload.id }
+    );
     expect(diagram.user_id).toEqual('96293285-33b7-4a69-9b64-822059569734');
     expect(diagram.user_default).toBe(true);
     await diagramCore.deleteDiagram(diagram.id);
   });
 
   test('get default diagram by user_id (no default)', async () => {
     const diagramCore = new DiagramCore(db);
-    const payload = _.cloneDeep({ ...diagramPayload, user_default: false });
+    const payload = _.cloneDeep({
+      ...diagramPayload,
+      user_default: false,
+      workflow_data: workflowPayload,
+    });
     await diagramCore.saveDiagram(payload);
-    const diagram = await diagramCore.getDefaultDiagram(diagramPayload.user_id);
+    const diagram = await diagramCore.getDefaultDiagram(
+      diagramPayload.user_id,
+      { workflow_id: workflowPayload.id }
+    );
     expect(diagram.user_id).toEqual('96293285-33b7-4a69-9b64-822059569734');
     expect(diagram.user_default).toBe(false);
     await diagramCore.deleteDiagram(diagram.id);
@@ -118,9 +140,13 @@ describe('DiagramCore tests (without workflow_id)', () => {
       ...diagramPayload,
       user_id: other_user_id,
       isPublic: true,
+      workflow_data: workflowPayload,
     });
     await diagramCore.saveDiagram(payload);
-    const diagram = await diagramCore.getDefaultDiagram(diagramPayload.user_id);
+    const diagram = await diagramCore.getDefaultDiagram(
+      diagramPayload.user_id,
+      { workflow_id: workflowPayload.id }
+    );
     expect(diagram.id).toBeDefined();
     await diagramCore.deleteDiagram(diagram.id);
   });
@@ -187,13 +213,7 @@ describe('DiagramCore tests (with workflow_id)', () => {
   test('create diagram', async () => {
     const diagramCore = new DiagramCore(db);
     const payload = _.cloneDeep(diagramPayload);
-    payload.workflow_data = {
-      id: uuid(),
-      name: 'Workflow Example',
-      version: 1,
-      server_id: '1c8f314b-5421-40cb-9a5b-73fca821c88f',
-      blueprint_spec,
-    };
+    payload.workflow_data = workflowPayload;
     const diagram = await diagramCore.saveDiagram(payload);
     expect(validate(diagram.id)).toBeTruthy();
     expect(diagram.name).toEqual('Test');
@@ -237,13 +257,7 @@ describe('DiagramCore tests (with workflow_id)', () => {
     const diagramCore = new DiagramCore(db);
     const payload = _.cloneDeep({ ...diagramPayload, user_default: true });
     const workflow_id = 'ae7e95f6-787a-4c0b-8e1a-4cc122e7d68f';
-    payload.workflow_data = {
-      id: workflow_id,
-      name: 'Workflow Example',
-      version: 1,
-      server_id: '1c8f314b-5421-40cb-9a5b-73fca821c88f',
-      blueprint_spec,
-    };
+    payload.workflow_data = workflowPayload;
     await diagramCore.saveDiagram(payload);
     // await populateDiagram(payload);
     const diagram = await diagramCore.getDefaultDiagram(
@@ -259,13 +273,7 @@ describe('DiagramCore tests (public diagrams)', () => {
   test('create diagram', async () => {
     const diagramCore = new DiagramCore(db);
     const payload = _.cloneDeep(diagramPayload);
-    payload.workflow_data = {
-      id: uuid(),
-      name: 'Workflow Example',
-      version: 1,
-      server_id: '1c8f314b-5421-40cb-9a5b-73fca821c88f',
-      blueprint_spec,
-    };
+    payload.workflow_data = workflowPayload;
     payload.isPublic = true;
     const diagram = await diagramCore.saveDiagram(payload);
     expect(validate(diagram.id)).toBeTruthy();