Merge pull request #803 from Project-MONAI/AC-2216

AC-2216 take2 workflow name
Project-MONAI · May 15, 2023 · 4e15f84 · 4e15f84
2 parents 2a0c339 + 0259b2a
commit 4e15f84
Show file tree

Hide file tree

Showing 5 changed files with 30 additions and 5 deletions.
diff --git a/src/WorkflowManager/Common/Interfaces/IWorkflowService.cs b/src/WorkflowManager/Common/Interfaces/IWorkflowService.cs
@@ -43,7 +43,7 @@ public interface IWorkflowService : IPaginatedApi<WorkflowRevision>
         /// </summary>
         /// <param name="workflow">Workflow to Update.</param>
         /// <param name="id">Id of the workflow to Update.</param>
-        Task<string?> UpdateAsync(Workflow workflow, string id);
+        Task<string?> UpdateAsync(Workflow workflow, string id, bool isUpdateToWorkflowName = false);
 
         /// <summary>
         /// Soft deletes a given workflow and all revisions

diff --git a/src/WorkflowManager/Common/Services/WorkflowService.cs b/src/WorkflowManager/Common/Services/WorkflowService.cs
@@ -54,12 +54,17 @@ public async Task<string> CreateAsync(Workflow workflow)
         {
             Guard.Against.Null(workflow);
 
+            foreach (var task in workflow.Tasks)
+            {
+                task.Args["workflow_name"] = workflow.Name;
+            }
+
             var id = await _workflowRepository.CreateAsync(workflow);
             _logger.WorkflowCreated(id, workflow.Name);
             return id;
         }
 
-        public async Task<string?> UpdateAsync(Workflow workflow, string id)
+        public async Task<string?> UpdateAsync(Workflow workflow, string id, bool isUpdateToWorkflowName = false)
         {
             Guard.Against.Null(workflow);
             Guard.Against.NullOrWhiteSpace(id);
@@ -71,6 +76,14 @@ public async Task<string> CreateAsync(Workflow workflow)
                 return null;
             }
 
+            if (isUpdateToWorkflowName)
+            {
+                foreach (var task in workflow.Tasks)
+                {
+                    task.Args["workflow_name"] = workflow.Name;
+                }
+            }
+
             var result = await _workflowRepository.UpdateAsync(workflow, existingWorkflow);
             _logger.WorkflowUpdated(id, workflow.Name);
             return result;

diff --git a/src/WorkflowManager/WorkflowManager/Controllers/WorkflowsController.cs b/src/WorkflowManager/WorkflowManager/Controllers/WorkflowsController.cs
@@ -261,7 +261,7 @@ public async Task<IActionResult> UpdateAsync([FromBody] WorkflowUpdateRequest re
 
             try
             {
-                var workflowId = await _workflowService.UpdateAsync(workflow, id);
+                var workflowId = await _workflowService.UpdateAsync(workflow, id, workflow.Name != originalName);
 
                 if (workflowId == null)
                 {

diff --git a/tests/UnitTests/Common.Tests/Services/WorkflowServiceTests.cs b/tests/UnitTests/Common.Tests/Services/WorkflowServiceTests.cs
@@ -71,6 +71,18 @@ public async Task WorkflowService_CreateAsync_With_Empty()
             await Assert.ThrowsAsync<ArgumentNullException>(() => WorkflowService.CreateAsync(null));
         }
 
+        [Fact]
+        public async Task WorkflowService_CreateAsync_With_ValidReturn()
+        {
+            var expectedResult = "1";
+            _workflowRepository.Setup(w => w.CreateAsync(It.IsAny<Workflow>())).ReturnsAsync(expectedResult);
+            var tasks = new TaskObject[] { new TaskObject() };
+            var result = await WorkflowService.CreateAsync(new Workflow() { Name = "workflow1", Tasks = tasks });
+
+            Assert.Equal(expectedResult, result);
+        }
+
+
         [Fact]
         public async Task WorkflowService_WorkflowExists_ReturnsWorkflowId()
         {
@@ -102,7 +114,7 @@ public async Task WorkflowService_WorkflowExists_ReturnsWorkflowId()
             _workflowRepository.Setup(w => w.GetByWorkflowIdAsync(workflowRevision.WorkflowId)).ReturnsAsync(workflowRevision);
             _workflowRepository.Setup(w => w.UpdateAsync(It.IsAny<Workflow>(), workflowRevision)).ReturnsAsync(workflowRevision.WorkflowId);
 
-            var result = await WorkflowService.UpdateAsync(new Workflow(), workflowRevision.WorkflowId);
+            var result = await WorkflowService.UpdateAsync(new Workflow(), workflowRevision.WorkflowId, true);
 
             Assert.Equal(workflowRevision.WorkflowId, result);
         }

diff --git a/tests/UnitTests/WorkflowManager.Tests/Controllers/WorkflowsControllerTests.cs b/tests/UnitTests/WorkflowManager.Tests/Controllers/WorkflowsControllerTests.cs
@@ -899,7 +899,7 @@ public async Task UpdateAsync_WorkflowsExist_ReturnsWorkflowId()
             request.Workflow = newWorkflow;
             request.OriginalWorkflowName = newWorkflow.Name + "1";
 
-            _workflowService.Setup(w => w.UpdateAsync(newWorkflow, workflowRevision.WorkflowId)).ReturnsAsync(workflowRevision.WorkflowId);
+            _workflowService.Setup(w => w.UpdateAsync(newWorkflow, workflowRevision.WorkflowId, It.IsAny<bool>())).ReturnsAsync(workflowRevision.WorkflowId);
 
             var result = await WorkflowsController.UpdateAsync(request, workflowRevision.WorkflowId);