Merge pull request #765 from Project-MONAI/AC-1567

woodheadio · web-flow · commit 370bc14afff2 · 2023-05-10T09:13:45.000+01:00
AC-1567 Updated workflow request event trigger process
diff --git a/src/WorkflowManager/Database/Interfaces/IWorkflowRepository.cs b/src/WorkflowManager/Database/Interfaces/IWorkflowRepository.cs
@@ -17,6 +17,7 @@
 using System;
 using System.Collections.Generic;
 using System.Threading.Tasks;
+using Monai.Deploy.Messaging.Events;
 using Monai.Deploy.WorkflowManager.Contracts.Models;
 
 namespace Monai.Deploy.WorkflowManager.Database.Interfaces
@@ -67,6 +68,23 @@ public interface IWorkflowRepository
         /// <param name="aeTitle">An aeTitle to retrieve workflows for.</param>
         Task<IList<WorkflowRevision>> GetWorkflowsByAeTitleAsync(List<string> aeTitles);
 
+        /// <summary>
+        /// Retrieves a list of workflows based..<br/>
+        /// if clinical workflow has AET no data origin. => WorkflowRequestEvents received with CalledAET with that AET this workflow (regardless of what the CallingAET is)<br/>
+        /// if clinical workflow has AET and data_orgins => only WorkflowRequestEvents with CalledAET with that AET  and CallingAET trigger this workflow.<br/>
+        /// </summary>
+        /// <example>
+        /// If clinical workflow (workflow revision) exists with AET �MONAI� but no data_origins set
+        /// Any inbound WorkflowRequestEvents with CalledAET = �MONAI� trigger this workflow (regardless of what the CallingAET is)
+        /// 
+        /// If clinical workflow (workflow revision) exists with AET �MONAI� and data_origins set as �PACS�
+        /// Only inbound WorkflowRequestEvents with CalledAET = �MONAI� and CallingAET = �PACS� trigger this workflow
+        /// </example>
+        /// <param name="calledAeTitle"></param>
+        /// <param name="sallingAeTitle"></param>
+        /// <returns></returns>
+        Task<IList<WorkflowRevision>> GetWorkflowsForWorkflowRequestAsync(string calledAeTitle, string callingAeTitle);
+
         /// <summary>
         /// Creates a workflow object.
         /// </summary>
diff --git a/src/WorkflowManager/Database/Repositories/WorkflowRepository.cs b/src/WorkflowManager/Database/Repositories/WorkflowRepository.cs
@@ -199,9 +199,29 @@ public async Task<IList<WorkflowRevision>> GetWorkflowsByAeTitleAsync(List<strin
             return workflows;
         }
 
+        public async Task<IList<WorkflowRevision>> GetWorkflowsForWorkflowRequestAsync(string calledAeTitle, string callingAeTitle)
+        {
+            Guard.Against.NullOrEmpty(calledAeTitle);
+            Guard.Against.NullOrEmpty(callingAeTitle);
+
+            var wfs = await _workflowCollection
+                .Find(x =>
+                    x.Workflow != null &&
+                    x.Workflow.InformaticsGateway != null &&
+                    ((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;
+        }
+
         public async Task<string> CreateAsync(Workflow workflow)
         {
-            Guard.Against.Null(workflow, nameof(workflow));
+            Guard.Against.Null(workflow);
 
             var workflowRevision = new WorkflowRevision
             {
diff --git a/src/WorkflowManager/WorkflowExecuter/Services/WorkflowExecuterService.cs b/src/WorkflowManager/WorkflowExecuter/Services/WorkflowExecuterService.cs
@@ -117,13 +117,8 @@ public async Task<bool> ProcessPayload(WorkflowRequestEvent message, Payload pay
             }
             else
             {
-                var aeTitles = new List<string>
-                {
-                    message.CalledAeTitle,
-                    message.CallingAeTitle
-                };
-
-                workflows = await _workflowRepository.GetWorkflowsByAeTitleAsync(aeTitles) as List<WorkflowRevision>;
+                var result = await _workflowRepository.GetWorkflowsForWorkflowRequestAsync(message.CalledAeTitle, message.CallingAeTitle);
+                workflows = new List<WorkflowRevision>(result);
             }
 
             if (workflows is null || workflows.Any() is false)
diff --git a/tests/IntegrationTests/WorkflowExecutor.IntegrationTests/Features/WorkflowRequest.feature b/tests/IntegrationTests/WorkflowExecutor.IntegrationTests/Features/WorkflowRequest.feature
@@ -42,6 +42,29 @@ Scenario Outline: Publish a valid workflow request which creates multiple workfl
     | Basic_Workflow_1 | Basic_Workflow_2 | Basic_Multi_Id_WF_Request |
     | Basic_Workflow_1 | Basic_Workflow_3 | Basic_AeTitle_WF_Request  |
 
+@WorkflowRequest
+Scenario Outline: Publish a workflow request which triggers a worflow based on called_aet and calling_aet
+    Given I have a clinical workflow <workflow>
+    When I publish a Workflow Request Message <workflowRequestMessage> with no artifacts
+    Then I can see 1 Workflow Instance is created
+    And 1 Task Dispatch event is published
+    Examples:
+    | workflow                              | workflowRequestMessage            |
+    | Workflow_Called_AET                   | Called_AET_AIDE_Calling_AET_TEST  |
+    | Workflow_Called_AET_Calling_AET       | Called_AET_AIDE_Calling_AET_PACS1 |
+    | Workflow_Called_AET_Multi_Calling_AET | Called_AET_AIDE_Calling_AET_PACS1 |
+    | Workflow_Called_AET_Multi_Calling_AET | Called_AET_AIDE_Calling_AET_PACS2 |
+
+@WorkflowRequest
+Scenario Outline: Publish a workflow request which doesnt trigger a worflow based calling_aet
+    Given I have a clinical workflow <workflow>
+    When I publish a Workflow Request Message <workflowRequestMessage> with no artifacts
+    Then I can see no Workflow Instances are created
+    Examples:
+    | workflow                              | workflowRequestMessage           |
+    | Workflow_Called_AET_Calling_AET       | Called_AET_AIDE_Calling_AET_TEST |
+    | Workflow_Called_AET_Multi_Calling_AET | Called_AET_AIDE_Calling_AET_TEST |
+
 @WorkflowRequest
 Scenario: Publish a valid workflow request with mismatched AE title and workflow ID
     Given I have a clinical workflow Basic_Workflow_1
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
@@ -346,6 +346,48 @@ public static class WorkflowRequestsTestData
                     CallingAeTitle = "Non_Existent_Calling_AE",
                 }
             },
+            new WorkflowRequestTestData
+            {
+                Name = "Called_AET_AIDE_Calling_AET_TEST",
+                WorkflowRequestMessage = new WorkflowRequestMessage
+                {
+                    Bucket = "bucket1",
+                    PayloadId = Guid.NewGuid(),
+                    Workflows = new List<string>() { },
+                    CorrelationId = Guid.NewGuid().ToString(),
+                    Timestamp = DateTime.UtcNow,
+                    CalledAeTitle = "AIDE",
+                    CallingAeTitle = "TEST",
+                }
+            },
+            new WorkflowRequestTestData
+            {
+                Name = "Called_AET_AIDE_Calling_AET_PACS1",
+                WorkflowRequestMessage = new WorkflowRequestMessage
+                {
+                    Bucket = "bucket1",
+                    PayloadId = Guid.NewGuid(),
+                    Workflows = new List<string>() { },
+                    CorrelationId = Guid.NewGuid().ToString(),
+                    Timestamp = DateTime.UtcNow,
+                    CalledAeTitle = "AIDE",
+                    CallingAeTitle = "PACS1",
+                }
+            },
+            new WorkflowRequestTestData
+            {
+                Name = "Called_AET_AIDE_Calling_AET_PACS2",
+                WorkflowRequestMessage = new WorkflowRequestMessage
+                {
+                    Bucket = "bucket1",
+                    PayloadId = Guid.NewGuid(),
+                    Workflows = new List<string>() { },
+                    CorrelationId = Guid.NewGuid().ToString(),
+                    Timestamp = DateTime.UtcNow,
+                    CalledAeTitle = "AIDE",
+                    CallingAeTitle = "PACS2",
+                }
+            },
         };
     }
 }
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"
                         }
                     }
                 }
@@ -3036,6 +3036,98 @@ public static class WorkflowRevisionsTestData
                     }
                 }
             },
+            new WorkflowRevisionTestData()
+            {
+                Name = "Workflow_Called_AET",
+                WorkflowRevision = new WorkflowRevision()
+                {
+                    Id = Guid.NewGuid().ToString(),
+                    WorkflowId = Guid.NewGuid().ToString(),
+                    Revision = 1,
+                    Workflow = new Workflow()
+                    {
+                        Name = "Basic workflow 1",
+                        Description = "Basic workflow 1",
+                        Version = "1",
+                        Tasks = new TaskObject[]
+                        {
+                            new TaskObject
+                            {
+                                Id = Guid.NewGuid().ToString(),
+                                Type = "Basic_task",
+                                Description = "Basic Workflow 1 Task 1",
+                                Artifacts = new ArtifactMap(),
+                            }
+                        },
+                        InformaticsGateway = new InformaticsGateway()
+                        {
+                            AeTitle = "AIDE"
+                        }
+                    }
+                }
+            },
+            new WorkflowRevisionTestData()
+            {
+                Name = "Workflow_Called_AET_Calling_AET",
+                WorkflowRevision = new WorkflowRevision()
+                {
+                    Id = Guid.NewGuid().ToString(),
+                    WorkflowId = Guid.NewGuid().ToString(),
+                    Revision = 1,
+                    Workflow = new Workflow()
+                    {
+                        Name = "Basic workflow 1",
+                        Description = "Basic workflow 1",
+                        Version = "1",
+                        Tasks = new TaskObject[]
+                        {
+                            new TaskObject
+                            {
+                                Id = Guid.NewGuid().ToString(),
+                                Type = "Basic_task",
+                                Description = "Basic Workflow 1 Task 1",
+                                Artifacts = new ArtifactMap(),
+                            }
+                        },
+                        InformaticsGateway = new InformaticsGateway()
+                        {
+                            AeTitle = "AIDE",
+                            DataOrigins = new string[] { "PACS1" }
+                        }
+                    }
+                }
+            },
+            new WorkflowRevisionTestData()
+            {
+                Name = "Workflow_Called_AET_Multi_Calling_AET",
+                WorkflowRevision = new WorkflowRevision()
+                {
+                    Id = Guid.NewGuid().ToString(),
+                    WorkflowId = Guid.NewGuid().ToString(),
+                    Revision = 1,
+                    Workflow = new Workflow()
+                    {
+                        Name = "Basic workflow 1",
+                        Description = "Basic workflow 1",
+                        Version = "1",
+                        Tasks = new TaskObject[]
+                        {
+                            new TaskObject
+                            {
+                                Id = Guid.NewGuid().ToString(),
+                                Type = "Basic_task",
+                                Description = "Basic Workflow 1 Task 1",
+                                Artifacts = new ArtifactMap(),
+                            }
+                        },
+                        InformaticsGateway = new InformaticsGateway()
+                        {
+                            AeTitle = "AIDE",
+                            DataOrigins = new string[] { "PACS1", "PACS2" }
+                        }
+                    }
+                }
+            },
         };
     }
 }
diff --git a/tests/UnitTests/WorkflowExecuter.Tests/Services/WorkflowExecuterServiceTests.cs b/tests/UnitTests/WorkflowExecuter.Tests/Services/WorkflowExecuterServiceTests.cs

Original file line number	Diff line number	Diff line change
`@@ -117,13 +117,8 @@ public async Task<bool> ProcessPayload(WorkflowRequestEvent message, Payload pay`
`117`	`117`	`}`
`118`	`118`	`else`
`119`	`119`	`{`
`120`		`- var aeTitles = new List<string>`
`121`		`- {`
`122`		`- message.CalledAeTitle,`
`123`		`- message.CallingAeTitle`
`124`		`- };`
`125`		`-`
`126`		`- workflows = await _workflowRepository.GetWorkflowsByAeTitleAsync(aeTitles) as List<WorkflowRevision>;`
	`120`	`+ var result = await _workflowRepository.GetWorkflowsForWorkflowRequestAsync(message.CalledAeTitle, message.CallingAeTitle);`
	`121`	`+ workflows = new List<WorkflowRevision>(result);`
`127`	`122`	`}`
`128`	`123`
`129`	`124`	`if (workflows is null \|\| workflows.Any() is false)`
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`	`}`
`@@ -3036,6 +3036,98 @@ public static class WorkflowRevisionsTestData`
`3036`	`3036`	`}`
`3037`	`3037`	`}`
`3038`	`3038`	`},`
	`3039`	`+ new WorkflowRevisionTestData()`
	`3040`	`+ {`
	`3041`	`+ Name = "Workflow_Called_AET",`
	`3042`	`+ WorkflowRevision = new WorkflowRevision()`
	`3043`	`+ {`
	`3044`	`+ Id = Guid.NewGuid().ToString(),`
	`3045`	`+ WorkflowId = Guid.NewGuid().ToString(),`
	`3046`	`+ Revision = 1,`
	`3047`	`+ Workflow = new Workflow()`
	`3048`	`+ {`
	`3049`	`+ Name = "Basic workflow 1",`
	`3050`	`+ Description = "Basic workflow 1",`
	`3051`	`+ Version = "1",`
	`3052`	`+ Tasks = new TaskObject[]`
	`3053`	`+ {`
	`3054`	`+ new TaskObject`
	`3055`	`+ {`
	`3056`	`+ Id = Guid.NewGuid().ToString(),`
	`3057`	`+ Type = "Basic_task",`
	`3058`	`+ Description = "Basic Workflow 1 Task 1",`
	`3059`	`+ Artifacts = new ArtifactMap(),`
	`3060`	`+ }`
	`3061`	`+ },`
	`3062`	`+ InformaticsGateway = new InformaticsGateway()`
	`3063`	`+ {`
	`3064`	`+ AeTitle = "AIDE"`
	`3065`	`+ }`
	`3066`	`+ }`
	`3067`	`+ }`
	`3068`	`+ },`
	`3069`	`+ new WorkflowRevisionTestData()`
	`3070`	`+ {`
	`3071`	`+ Name = "Workflow_Called_AET_Calling_AET",`
	`3072`	`+ WorkflowRevision = new WorkflowRevision()`
	`3073`	`+ {`
	`3074`	`+ Id = Guid.NewGuid().ToString(),`
	`3075`	`+ WorkflowId = Guid.NewGuid().ToString(),`
	`3076`	`+ Revision = 1,`
	`3077`	`+ Workflow = new Workflow()`
	`3078`	`+ {`
	`3079`	`+ Name = "Basic workflow 1",`
	`3080`	`+ Description = "Basic workflow 1",`
	`3081`	`+ Version = "1",`
	`3082`	`+ Tasks = new TaskObject[]`
	`3083`	`+ {`
	`3084`	`+ new TaskObject`
	`3085`	`+ {`
	`3086`	`+ Id = Guid.NewGuid().ToString(),`
	`3087`	`+ Type = "Basic_task",`
	`3088`	`+ Description = "Basic Workflow 1 Task 1",`
	`3089`	`+ Artifacts = new ArtifactMap(),`
	`3090`	`+ }`
	`3091`	`+ },`
	`3092`	`+ InformaticsGateway = new InformaticsGateway()`
	`3093`	`+ {`
	`3094`	`+ AeTitle = "AIDE",`
	`3095`	`+ DataOrigins = new string[] { "PACS1" }`
	`3096`	`+ }`
	`3097`	`+ }`
	`3098`	`+ }`
	`3099`	`+ },`
	`3100`	`+ new WorkflowRevisionTestData()`
	`3101`	`+ {`
	`3102`	`+ Name = "Workflow_Called_AET_Multi_Calling_AET",`
	`3103`	`+ WorkflowRevision = new WorkflowRevision()`
	`3104`	`+ {`
	`3105`	`+ Id = Guid.NewGuid().ToString(),`
	`3106`	`+ WorkflowId = Guid.NewGuid().ToString(),`
	`3107`	`+ Revision = 1,`
	`3108`	`+ Workflow = new Workflow()`
	`3109`	`+ {`
	`3110`	`+ Name = "Basic workflow 1",`
	`3111`	`+ Description = "Basic workflow 1",`
	`3112`	`+ Version = "1",`
	`3113`	`+ Tasks = new TaskObject[]`
	`3114`	`+ {`
	`3115`	`+ new TaskObject`
	`3116`	`+ {`
	`3117`	`+ Id = Guid.NewGuid().ToString(),`
	`3118`	`+ Type = "Basic_task",`
	`3119`	`+ Description = "Basic Workflow 1 Task 1",`
	`3120`	`+ Artifacts = new ArtifactMap(),`
	`3121`	`+ }`
	`3122`	`+ },`
	`3123`	`+ InformaticsGateway = new InformaticsGateway()`
	`3124`	`+ {`
	`3125`	`+ AeTitle = "AIDE",`
	`3126`	`+ DataOrigins = new string[] { "PACS1", "PACS2" }`
	`3127`	`+ }`
	`3128`	`+ }`
	`3129`	`+ }`
	`3130`	`+ },`
`3039`	`3131`	`};`
`3040`	`3132`	`}`
`3041`	`3133`	`}`