updated workflow request event process

Signed-off-by: Lillie Dae <[email protected]>

Author: lillie-dae

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>

src/WorkflowManager/Database/Repositories/WorkflowRepository.cs

@@ -199,9 +199,25 @@ 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.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)))
+                .ToListAsync();
+            return wfs;
+        }
+
         public async Task<string> CreateAsync(Workflow workflow)
         {
-            Guard.Against.Null(workflow, nameof(workflow));
+            Guard.Against.Null(workflow);
 
             var workflowRevision = new WorkflowRevision
             {

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)