update to interation tests

lillie-dae · JoeBatt1989 · commit dac3dc52859b · 2023-05-09T13:07:57.000+01:00
Signed-off-by: Lillie Dae &lt;lillie.dae@answerdigital.com&gt;
diff --git a/src/WorkflowManager/Database/Repositories/WorkflowRepository.cs b/src/WorkflowManager/Database/Repositories/WorkflowRepository.cs
@@ -206,11 +206,15 @@ public async Task<IList<WorkflowRevision>> GetWorkflowsForWorkflowRequestAsync(s
 
             var wfs = await _workflowCollection
                 .Find(x =>
-                    x.Deleted == null &&
                     x.Workflow != null &&
                     x.Workflow.InformaticsGateway != null &&
-                    (x.Workflow.InformaticsGateway.AeTitle == calledAeTitle && x.Workflow.InformaticsGateway.DataOrigins.Length == 0 ||
-                    x.Workflow.InformaticsGateway.AeTitle == calledAeTitle && x.Workflow.InformaticsGateway.DataOrigins.Contains(callingAeTitle)))
+                    ((x.Workflow.InformaticsGateway.AeTitle == calledAeTitle &&
+                        (x.Workflow.InformaticsGateway.DataOrigins == null ||
+                        x.Workflow.InformaticsGateway.DataOrigins.Length == 0)) ||
+                    x.Workflow.InformaticsGateway.AeTitle == calledAeTitle &&
+                        x.Workflow.InformaticsGateway.DataOrigins != null &&
+                        x.Workflow.InformaticsGateway.DataOrigins.Any(d => d == callingAeTitle)) &&
+                    x.Deleted == null)
                 .ToListAsync();
             return wfs;
         }
diff --git a/tests/IntegrationTests/WorkflowExecutor.IntegrationTests/TestData/WorkflowRequestTestData.cs b/tests/IntegrationTests/WorkflowExecutor.IntegrationTests/TestData/WorkflowRequestTestData.cs
@@ -39,8 +39,8 @@ public static class WorkflowRequestsTestData
                     Workflows = new List<string>() { },
                     CorrelationId = Guid.NewGuid().ToString(),
                     Timestamp = DateTime.UtcNow,
-                    CalledAeTitle = "Basic_AE",
-                    CallingAeTitle = "Basic_AE_3",
+                    CalledAeTitle = "MONAI",
+                    CallingAeTitle = "PACS",
                 }
             },
             new WorkflowRequestTestData
@@ -95,7 +95,7 @@ public static class WorkflowRequestsTestData
                     Workflows = new List<string>() { },
                     CorrelationId = Guid.NewGuid().ToString(),
                     Timestamp = DateTime.UtcNow,
-                    CalledAeTitle = "Multi_Revision",
+                    CalledAeTitle = "MONAI_2",
                     CallingAeTitle = "MWM",
                 }
             },
@@ -258,8 +258,8 @@ public static class WorkflowRequestsTestData
                     Workflows = new List<string>() { },
                     CorrelationId = Guid.NewGuid().ToString(),
                     Timestamp = DateTime.UtcNow,
-                    CalledAeTitle = "MWM",
-                    CallingAeTitle = "Basic_AE",
+                    CalledAeTitle = "MONAI",
+                    CallingAeTitle = "PACS",
                 }
             },
             new WorkflowRequestTestData
@@ -272,8 +272,8 @@ public static class WorkflowRequestsTestData
                     Workflows = new List<string>() { },
                     CorrelationId = Guid.NewGuid().ToString(),
                     Timestamp = DateTime.UtcNow,
-                    CalledAeTitle = "Basic_AE",
-                    CallingAeTitle = "MWM",
+                    CalledAeTitle = "MONAI",
+                    CallingAeTitle = "PACS",
                 }
             },
              new WorkflowRequestTestData
@@ -286,8 +286,8 @@ public static class WorkflowRequestsTestData
                     Workflows = new List<string>() { },
                     CorrelationId = Guid.NewGuid().ToString(),
                     Timestamp = DateTime.UtcNow,
-                    CalledAeTitle = "Basic_AE",
-                    CallingAeTitle = "MWM",
+                    CalledAeTitle = "MONAI",
+                    CallingAeTitle = "PACS",
                 }
             },
             new WorkflowRequestTestData
diff --git a/tests/IntegrationTests/WorkflowExecutor.IntegrationTests/TestData/WorkflowRevisionTestData.cs b/tests/IntegrationTests/WorkflowExecutor.IntegrationTests/TestData/WorkflowRevisionTestData.cs
@@ -54,7 +54,7 @@ public static class WorkflowRevisionsTestData
                         },
                         InformaticsGateway = new InformaticsGateway()
                         {
-                            AeTitle = "Basic_AE"
+                            AeTitle = "MONAI"
                         }
                     }
                 }
@@ -84,7 +84,7 @@ public static class WorkflowRevisionsTestData
                         },
                         InformaticsGateway = new InformaticsGateway()
                         {
-                            AeTitle = "Basic_AE"
+                            AeTitle = "MONAI"
                         }
                     }
                 }
@@ -114,7 +114,7 @@ public static class WorkflowRevisionsTestData
                         },
                         InformaticsGateway = new InformaticsGateway()
                         {
-                            AeTitle = "Basic_AE_3"
+                            AeTitle = "MONAI"
                         }
                     }
                 }
@@ -181,7 +181,7 @@ public static class WorkflowRevisionsTestData
             },
             new WorkflowRevisionTestData()
             {
-                Name = "Basic_Workflow_Multiple_Revisions_1",
+                Name = "Basic_Workflow_Multiple_Revisions_1", //not to be confused with 'Basic_Workflow_multiple_revisions_1' (lower case)
                 WorkflowRevision = new WorkflowRevision()
                 {
                     Id = Guid.NewGuid().ToString(),
@@ -204,7 +204,7 @@ public static class WorkflowRevisionsTestData
                         },
                         InformaticsGateway = new InformaticsGateway()
                         {
-                            AeTitle = "Multi_Revision"
+                            AeTitle = "MONAI"
                         }
                     }
                 }
@@ -234,7 +234,7 @@ public static class WorkflowRevisionsTestData
                         },
                         InformaticsGateway = new InformaticsGateway()
                         {
-                            AeTitle = "Multi_Revision"
+                            AeTitle = "MONAI_2"
                         }
                     }
                 }
@@ -331,7 +331,7 @@ public static class WorkflowRevisionsTestData
                         },
                         InformaticsGateway = new InformaticsGateway()
                         {
-                            AeTitle = "Multi_Created"
+                            AeTitle = "Multi_Req"
                         }
                     }
                 }
@@ -675,7 +675,7 @@ public static class WorkflowRevisionsTestData
             },
             new WorkflowRevisionTestData()
             {
-                Name = "Basic_Workflow_multiple_revisions_1",
+                Name = "Basic_Workflow_multiple_revisions_1", //not to be confused with 'Basic_Workflow_Multiple_Revisions_1' (upper case)
                 WorkflowRevision = new WorkflowRevision()
                 {
                     Id = Guid.NewGuid().ToString(),
@@ -698,7 +698,7 @@ public static class WorkflowRevisionsTestData
                         },
                         InformaticsGateway = new InformaticsGateway()
                         {
-                            AeTitle = "Basic_AE"
+                            AeTitle = "MONAI_2"
                         }
                     }
                 }
@@ -728,7 +728,7 @@ public static class WorkflowRevisionsTestData
                         },
                         InformaticsGateway = new InformaticsGateway()
                         {
-                            AeTitle = "Basic_AE"
+                            AeTitle = "MONAI_2"
                         }
                     }
                 }
diff --git a/tests/UnitTests/WorkflowExecuter.Tests/Services/WorkflowExecuterServiceTests.cs b/tests/UnitTests/WorkflowExecuter.Tests/Services/WorkflowExecuterServiceTests.cs
@@ -143,6 +143,7 @@ public async Task ProcessPayload_ValidAeTitleWorkflowRequest_ReturnesTrue()
             };
 
             _workflowRepository.Setup(w => w.GetWorkflowsByAeTitleAsync(It.IsAny<List<string>>())).ReturnsAsync(workflows);
+            _workflowRepository.Setup(w => w.GetWorkflowsForWorkflowRequestAsync(It.IsAny<string>(), It.IsAny<string>())).ReturnsAsync(workflows);
             _workflowRepository.Setup(w => w.GetByWorkflowIdAsync(workflows[0].WorkflowId)).ReturnsAsync(workflows[0]);
             _workflowInstanceRepository.Setup(w => w.CreateAsync(It.IsAny<List<WorkflowInstance>>())).ReturnsAsync(true);
             _workflowInstanceRepository.Setup(w => w.GetByWorkflowsIdsAsync(It.IsAny<List<string>>())).ReturnsAsync(new List<WorkflowInstance>());

Original file line number	Diff line number	Diff line change
`@@ -54,7 +54,7 @@ public static class WorkflowRevisionsTestData`
`54`	`54`	`},`
`55`	`55`	`InformaticsGateway = new InformaticsGateway()`
`56`	`56`	`{`
`57`		`- AeTitle = "Basic_AE"`
	`57`	`+ AeTitle = "MONAI"`
`58`	`58`	`}`
`59`	`59`	`}`
`60`	`60`	`}`
`@@ -84,7 +84,7 @@ public static class WorkflowRevisionsTestData`
`84`	`84`	`},`
`85`	`85`	`InformaticsGateway = new InformaticsGateway()`
`86`	`86`	`{`
`87`		`- AeTitle = "Basic_AE"`
	`87`	`+ AeTitle = "MONAI"`
`88`	`88`	`}`
`89`	`89`	`}`
`90`	`90`	`}`
`@@ -114,7 +114,7 @@ public static class WorkflowRevisionsTestData`
`114`	`114`	`},`
`115`	`115`	`InformaticsGateway = new InformaticsGateway()`
`116`	`116`	`{`
`117`		`- AeTitle = "Basic_AE_3"`
	`117`	`+ AeTitle = "MONAI"`
`118`	`118`	`}`
`119`	`119`	`}`
`120`	`120`	`}`
`@@ -181,7 +181,7 @@ public static class WorkflowRevisionsTestData`
`181`	`181`	`},`
`182`	`182`	`new WorkflowRevisionTestData()`
`183`	`183`	`{`
`184`		`- Name = "Basic_Workflow_Multiple_Revisions_1",`
	`184`	`+ Name = "Basic_Workflow_Multiple_Revisions_1", //not to be confused with 'Basic_Workflow_multiple_revisions_1' (lower case)`
`185`	`185`	`WorkflowRevision = new WorkflowRevision()`
`186`	`186`	`{`
`187`	`187`	`Id = Guid.NewGuid().ToString(),`
`@@ -204,7 +204,7 @@ public static class WorkflowRevisionsTestData`
`204`	`204`	`},`
`205`	`205`	`InformaticsGateway = new InformaticsGateway()`
`206`	`206`	`{`
`207`		`- AeTitle = "Multi_Revision"`
	`207`	`+ AeTitle = "MONAI"`
`208`	`208`	`}`
`209`	`209`	`}`
`210`	`210`	`}`
`@@ -234,7 +234,7 @@ public static class WorkflowRevisionsTestData`
`234`	`234`	`},`
`235`	`235`	`InformaticsGateway = new InformaticsGateway()`
`236`	`236`	`{`
`237`		`- AeTitle = "Multi_Revision"`
	`237`	`+ AeTitle = "MONAI_2"`
`238`	`238`	`}`
`239`	`239`	`}`
`240`	`240`	`}`
`@@ -331,7 +331,7 @@ public static class WorkflowRevisionsTestData`
`331`	`331`	`},`
`332`	`332`	`InformaticsGateway = new InformaticsGateway()`
`333`	`333`	`{`
`334`		`- AeTitle = "Multi_Created"`
	`334`	`+ AeTitle = "Multi_Req"`
`335`	`335`	`}`
`336`	`336`	`}`
`337`	`337`	`}`
`@@ -675,7 +675,7 @@ public static class WorkflowRevisionsTestData`
`675`	`675`	`},`
`676`	`676`	`new WorkflowRevisionTestData()`
`677`	`677`	`{`
`678`		`- Name = "Basic_Workflow_multiple_revisions_1",`
	`678`	`+ Name = "Basic_Workflow_multiple_revisions_1", //not to be confused with 'Basic_Workflow_Multiple_Revisions_1' (upper case)`
`679`	`679`	`WorkflowRevision = new WorkflowRevision()`
`680`	`680`	`{`
`681`	`681`	`Id = Guid.NewGuid().ToString(),`
`@@ -698,7 +698,7 @@ public static class WorkflowRevisionsTestData`
`698`	`698`	`},`
`699`	`699`	`InformaticsGateway = new InformaticsGateway()`
`700`	`700`	`{`
`701`		`- AeTitle = "Basic_AE"`
	`701`	`+ AeTitle = "MONAI_2"`
`702`	`702`	`}`
`703`	`703`	`}`
`704`	`704`	`}`
`@@ -728,7 +728,7 @@ public static class WorkflowRevisionsTestData`
`728`	`728`	`},`
`729`	`729`	`InformaticsGateway = new InformaticsGateway()`
`730`	`730`	`{`
`731`		`- AeTitle = "Basic_AE"`
	`731`	`+ AeTitle = "MONAI_2"`
`732`	`732`	`}`
`733`	`733`	`}`
`734`	`734`	`}`