Merge pull request #922 from Project-MONAI/AI-183

Ai 183

Author: neildsouth

src/Common/Configuration/ConfigurationValidator.cs

@@ -58,6 +58,9 @@ public bool IsTopicsValid(MessageBrokerConfigurationKeys configurationKeys)
             valid &= IsStringValueNotNull(nameof(configurationKeys.WorkflowRequest), configurationKeys.WorkflowRequest);
             valid &= IsStringValueNotNull(nameof(configurationKeys.ExportRequestPrefix), configurationKeys.ExportRequestPrefix);
             valid &= IsStringValueNotNull(nameof(configurationKeys.TaskDispatchRequest), configurationKeys.TaskDispatchRequest);
+            valid &= IsStringValueNotNull(nameof(configurationKeys.ExportHL7), configurationKeys.ExportHL7);
+            valid &= IsStringValueNotNull(nameof(configurationKeys.ExportHL7Complete), configurationKeys.ExportHL7Complete);
+
 
             return valid;
         }

src/Common/Configuration/MessageBrokerConfigurationKeys.cs

@@ -34,6 +34,13 @@ public class MessageBrokerConfigurationKeys
         [ConfigurationKeyName("exportComplete")]
         public string ExportComplete { get; set; } = "md.export.complete";
 
+        /// <summary>
+        /// Gets or sets the topic for publishing workflow requests.
+        /// Defaults to `md.export.complete`.
+        /// </summary>
+        [ConfigurationKeyName("exportHL7Complete")]
+        public string ExportHL7Complete { get; set; } = "md.export.hl7complete";
+
         /// <summary>
         /// Gets or sets the topic for publishing workflow requests.
         /// Defaults to `md.export.request`.
@@ -98,5 +105,20 @@ public class MessageBrokerConfigurationKeys
         /// </summary>
         [ConfigurationKeyName("externalAppRequest")]
         public string ExternalAppRequest { get; set; } = "md.externalapp.request";
+
+        /// <summary>
+        /// Gets or sets the topic for publishing workflow requests.
+        /// Defaults to `md.export.request`.
+        /// </summary>
+        [ConfigurationKeyName("exportHl7")]
+        public string ExportHL7 { get; set; } = "md.export.hl7";
+
+
+        /// <summary>
+        /// Gets or sets the topic for publishing export complete requests.
+        /// Defaults to `md_export_complete`.
+        /// </summary>
+        [ConfigurationKeyName("exportHl7Complete")]
+        public string ExportHl7Complete { get; set; } = "md.export.hl7complete";
     }
 }

src/Common/Miscellaneous/ValidationConstants.cs

@@ -118,6 +118,11 @@ public enum NotificationValues
         /// </summary>
         public const string ExternalAppTaskType = "remote_app_execution";
 
+        /// <summary>
+        /// Key for Hl7 export task type.
+        /// </summary>
+        public const string HL7ExportTask = "export_hl7";
+
         /// <summary>
         /// Key for the export task type.
         /// </summary>
@@ -141,7 +146,8 @@ public enum NotificationValues
                 ExportTaskType,
                 DockerTaskType,
                 Email,
-                ExternalAppTaskType
+                ExternalAppTaskType,
+                HL7ExportTask
             };
     }
 }

src/TaskManager/API/Monai.Deploy.WorkflowManager.TaskManager.API.csproj

@@ -43,4 +43,6 @@
     <PackageReference Include="Mongo.Migration" Version="3.1.4" />
     <PackageReference Include="MongoDB.Bson" Version="2.21.0" />
   </ItemGroup>
+  
+
 </Project>

src/TaskManager/API/packages.lock.json

@@ -78,15 +78,14 @@
   <ItemGroup>
     <ProjectReference Include="..\..\Common\Configuration\Monai.Deploy.WorkflowManager.Common.Configuration.csproj" />
     <ProjectReference Include="..\..\Common\Miscellaneous\Monai.Deploy.WorkflowManager.Common.Miscellaneous.csproj" />
-    <ProjectReference Include="..\..\Common\Miscellaneous\Monai.Deploy.WorkflowManager.Common.Miscellaneous.csproj" />
     <ProjectReference Include="..\API\Monai.Deploy.WorkflowManager.TaskManager.API.csproj" />
     <ProjectReference Include="..\Database\Monai.Deploy.WorkflowManager.TaskManager.Database.csproj" />
     <ProjectReference Include="..\Plug-ins\AideClinicalReview\Monai.Deploy.WorkflowManager.TaskManager.AideClinicalReview.csproj">
       <TreatAsUsed>true</TreatAsUsed>
     </ProjectReference>
     <ProjectReference Include="..\Plug-ins\Argo\Monai.Deploy.WorkflowManager.TaskManager.Argo.csproj" />
     <ProjectReference Include="..\Plug-ins\Docker\Monai.Deploy.WorkflowManager.TaskManager.Docker.csproj" />
-    <ProjectReference Include="..\Plug-ins\Email\Monai.Deploy.WorkflowManager.TaskManager.Email.csproj" />
+    <ProjectReference Include="..\Plug-ins\Email\Monai.Deploy.WorkflowManager.TaskManager.Email.csproj"/>
   </ItemGroup>
 
   <ItemGroup>

src/TaskManager/Database/packages.lock.json

@@ -77,6 +77,7 @@
         "aideClinicalReviewCancelation": "aide.clinical_review.cancellation",
         "notificationEmailRequest": "aide.notification_email.request",
         "notificationEmailCancelation": "aide.notification_email.cancellation",
+        "exportHl7": "md.export.hl7"
       },
       "dicomAgents": {
         "dicomWebAgentName": "monaidicomweb",

src/TaskManager/TaskManager/Monai.Deploy.WorkflowManager.TaskManager.csproj

@@ -20,10 +20,10 @@ public static class TaskTypeConstants
     {
         public const string RouterTask = "router";
 
-        public const string ExportTask = "export";
+        public const string DicomExportTask = "export";
 
         public const string ExternalAppTask = "remote_app_execution";
 
-        public const string ExportHl7Task = "export_hl7";
+        public const string HL7ExportTask = "export_hl7";
     }
 }