diff --git a/src/WorkflowManager/WorkflowExecuter/Services/WorkflowExecuterService.cs b/src/WorkflowManager/WorkflowExecuter/Services/WorkflowExecuterService.cs index 2608be9ba..d72128c6d 100644 --- a/src/WorkflowManager/WorkflowExecuter/Services/WorkflowExecuterService.cs +++ b/src/WorkflowManager/WorkflowExecuter/Services/WorkflowExecuterService.cs @@ -74,7 +74,7 @@ public WorkflowExecuterService( _storageConfiguration = storageConfiguration.Value; TaskDispatchRoutingKey = configuration.Value.Messaging.Topics.TaskDispatchRequest; - ExportRequestRoutingKey = $"{configuration.Value.Messaging.Topics.ExportRequestPrefix}.{configuration.Value.Messaging.DicomAgents.DicomWebAgentName}"; + ExportRequestRoutingKey = $"{configuration.Value.Messaging.Topics.ExportRequestPrefix}.{configuration.Value.Messaging.DicomAgents.ScuAgentName}"; _logger = logger ?? throw new ArgumentNullException(nameof(logger)); _workflowRepository = workflowRepository ?? throw new ArgumentNullException(nameof(workflowRepository)); diff --git a/tests/IntegrationTests/WorkflowExecutor.IntegrationTests/Hooks.cs b/tests/IntegrationTests/WorkflowExecutor.IntegrationTests/Hooks.cs index 3602e97ee..f8a0d2c96 100644 --- a/tests/IntegrationTests/WorkflowExecutor.IntegrationTests/Hooks.cs +++ b/tests/IntegrationTests/WorkflowExecutor.IntegrationTests/Hooks.cs @@ -73,7 +73,7 @@ public static void Init() TestExecutionConfig.RabbitConfig.TaskCallbackQueue = "md.tasks.callback"; TestExecutionConfig.RabbitConfig.TaskUpdateQueue = "md.tasks.update"; TestExecutionConfig.RabbitConfig.ExportCompleteQueue = config.GetValue("WorkflowManager:messaging:topics:exportComplete"); - TestExecutionConfig.RabbitConfig.ExportRequestQueue = $"{config.GetValue("WorkflowManager:messaging:topics:exportRequestPrefix")}.{config.GetValue("WorkflowManager:messaging:dicomAgents:dicomWebAgentName")}"; + TestExecutionConfig.RabbitConfig.ExportRequestQueue = $"{config.GetValue("WorkflowManager:messaging:topics:exportRequestPrefix")}.{config.GetValue("WorkflowManager:messaging:dicomAgents:scuAgentName")}"; TestExecutionConfig.MongoConfig.ConnectionString = config.GetValue("WorkloadManagerDatabase:ConnectionString"); TestExecutionConfig.MongoConfig.Database = config.GetValue("WorkloadManagerDatabase:DatabaseName"); diff --git a/tests/UnitTests/WorkflowExecuter.Tests/Services/WorkflowExecuterServiceTests.cs b/tests/UnitTests/WorkflowExecuter.Tests/Services/WorkflowExecuterServiceTests.cs index aafc594ea..19ba51f21 100644 --- a/tests/UnitTests/WorkflowExecuter.Tests/Services/WorkflowExecuterServiceTests.cs +++ b/tests/UnitTests/WorkflowExecuter.Tests/Services/WorkflowExecuterServiceTests.cs @@ -382,7 +382,7 @@ public async Task ProcessPayload_WithExportTask_DispatchesExport() var result = await WorkflowExecuterService.ProcessPayload(workflowRequest, new Payload() { Id = Guid.NewGuid().ToString() }); - _messageBrokerPublisherService.Verify(w => w.Publish($"{_configuration.Value.Messaging.Topics.ExportRequestPrefix}.{_configuration.Value.Messaging.DicomAgents.DicomWebAgentName}", It.IsAny()), Times.Exactly(1)); + _messageBrokerPublisherService.Verify(w => w.Publish($"{_configuration.Value.Messaging.Topics.ExportRequestPrefix}.{_configuration.Value.Messaging.DicomAgents.ScuAgentName}", It.IsAny()), Times.Exactly(1)); Assert.True(result); } @@ -1041,7 +1041,7 @@ public async Task ProcessTaskUpdate_ValidTaskUpdateEventWithExportTaskDestinatio var response = await WorkflowExecuterService.ProcessTaskUpdate(updateEvent); - _messageBrokerPublisherService.Verify(w => w.Publish($"{_configuration.Value.Messaging.Topics.ExportRequestPrefix}.{_configuration.Value.Messaging.DicomAgents.DicomWebAgentName}", It.IsAny()), Times.Exactly(1)); + _messageBrokerPublisherService.Verify(w => w.Publish($"{_configuration.Value.Messaging.Topics.ExportRequestPrefix}.{_configuration.Value.Messaging.DicomAgents.ScuAgentName}", It.IsAny()), Times.Exactly(1)); response.Should().BeTrue(); }