Merge pull request #766 from Project-MONAI/AC-2129

change so failed to delete returns 500
Project-MONAI · Apr 25, 2023 · 9afe61c · 9afe61c
2 parents 4c630ca + 1a8888e
commit 9afe61c
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 6 deletions.
diff --git a/src/TaskManager/Plug-ins/Argo/ArgoClient.cs b/src/TaskManager/Plug-ins/Argo/ArgoClient.cs
@@ -143,13 +143,17 @@ public async Task<WorkflowTemplate> Argo_GetWorkflowTemplateAsync(string argoNam
         public virtual async Task<WorkflowTemplate> Argo_CreateWorkflowTemplateAsync(string argoNamespace, WorkflowTemplateCreateRequest body, CancellationToken cancellationToken)
         {
             Guard.Against.NullOrWhiteSpace(argoNamespace);
-            Guard.Against.Null(body);
+            Guard.Against.Null(body.Template);
 
             var urlBuilder = new StringBuilder();
             urlBuilder.Append(CultureInfo.InvariantCulture, $"{FormattedBaseUrl}/api/v1/workflow-templates/{argoNamespace}");
 
             var method = "POST";
-            var content = new StringContent(Newtonsoft.Json.JsonConvert.SerializeObject(body));
+            var stringBody = Newtonsoft.Json.JsonConvert.SerializeObject(body);
+            var content = new StringContent(stringBody);
+
+            var _logger = NLog.LogManager.GetCurrentClassLogger();
+            _logger.Debug($"Sending content to Argo :{stringBody}");
             return await SendRequest<WorkflowTemplate>(content, urlBuilder, method, cancellationToken).ConfigureAwait(false);
         }
 

diff --git a/src/TaskManager/Plug-ins/Argo/Controllers/TemplateController.cs b/src/TaskManager/Plug-ins/Argo/Controllers/TemplateController.cs
@@ -16,6 +16,7 @@
 using System.Text;
 using Argo;
 using Microsoft.AspNetCore.Authorization;
+using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Logging;
@@ -72,6 +73,8 @@ public async Task<ActionResult<WorkflowTemplate>> CreateArgoTemplate()
         }
 
         [Route("{name}")]
+        [ProducesResponseType(StatusCodes.Status200OK)]
+        [ProducesResponseType(StatusCodes.Status500InternalServerError)]
         [HttpDelete]
         public async Task<ActionResult<bool>> DeleteArgoTemplate(string name)
         {
@@ -82,7 +85,12 @@ public async Task<ActionResult<bool>> DeleteArgoTemplate(string name)
 
             try
             {
-                return Ok(await _argoPlugin.DeleteArgoTemplate(name));
+                var result = await _argoPlugin.DeleteArgoTemplate(name);
+                if (result is true)
+                {
+                    return Ok();
+                }
+                return StatusCode(StatusCodes.Status500InternalServerError);
             }
             catch (Exception)
             {

diff --git a/tests/UnitTests/TaskManager.Argo.Tests/ArgoClientTest.cs b/tests/UnitTests/TaskManager.Argo.Tests/ArgoClientTest.cs
@@ -224,7 +224,7 @@ public async Task Argo_CreateWorkflowTemplateAsync()
             ArgoClient argoClient = new(httpclient);
 
             var result = await argoClient.Argo_CreateWorkflowTemplateAsync("argo",
-                new WorkflowTemplateCreateRequest { Namespace = "argo" },
+                new WorkflowTemplateCreateRequest { Namespace = "argo", Template = new WorkflowTemplate() },
                 CancellationToken.None);
 
             Assert.NotNull(result);

diff --git a/tests/UnitTests/TaskManager.Argo.Tests/Controller/TemplateControllerTests.cs b/tests/UnitTests/TaskManager.Argo.Tests/Controller/TemplateControllerTests.cs
@@ -145,10 +145,11 @@ public async Task DeleteArgoTemplate_Controller_ReturnsOk()
                 _argoLogger.Object,
                 Options);
 
+            ArgoClient.Setup(a => a.Argo_DeleteWorkflowTemplateAsync(It.IsAny<string>(), It.IsAny<string>(), It.IsAny<CancellationToken>())).Returns(Task.FromResult(true));
+
             var result = await TemplateController.DeleteArgoTemplate("template");
 
-            Assert.IsType<ActionResult<bool>>(result);
-            var okResult = Assert.IsType<OkObjectResult>(result.Result);
+            var okResult = Assert.IsType<OkResult>(result.Result);
             Assert.Equal((int)HttpStatusCode.OK, okResult.StatusCode);
         }