more test coverage

Signed-off-by: Neil South <neil.south@answerdigital.com>

Author: neildsouth

src/.sonarlint/sonar.settings.json

@@ -1 +1 @@
-{"sonar.exclusions":[],"sonar.global.exclusions":["**/build-wrapper-dump.json","**/Migrations/M0*.cs"],"sonar.inclusions":[]}
+{"sonar.exclusions":[],"sonar.global.exclusions":["**/build-wrapper-dump.json","**/Migrations/*.cs"],"sonar.inclusions":[]}

src/Shared/Shared/Wrappers/Response.cs

@@ -37,7 +37,7 @@ public Response(T data)
         {
             Succeeded = true;
             Message = string.Empty;
-            Errors = null;
+            Errors = Array.Empty<string>();
             Data = data;
         }
 

src/TaskManager/Database/TaskExecutionStatsRepository.cs

@@ -119,7 +119,6 @@ await _taskExecutionStatsCollection.UpdateOneAsync(o =>
 
         public async Task<IEnumerable<TaskExecutionStats>> GetStatsAsync(DateTime startTime, DateTime endTime, int PageSize = 10, int PageNumber = 1, string workflowInstanceId = "", string taskId = "")
         {
-            var test = startTime.ToUniversalTime();
             startTime = startTime.ToUniversalTime();
 
             var workflowinstanceNull = string.IsNullOrWhiteSpace(workflowInstanceId);
@@ -183,8 +182,8 @@ public async Task<long> GetStatsCountAsync(DateTime startTime, DateTime endTime,
             return await _taskExecutionStatsCollection.CountDocumentsAsync(T =>
             T.StartedUTC >= startTime.ToUniversalTime() &&
             T.StartedUTC <= endTime.ToUniversalTime() &&
-            (workflowinstanceNull ? true : T.WorkflowInstanceId == workflowInstanceId) &&
-            (taskIdNull ? true : T.TaskId == taskId) &&
+            (workflowinstanceNull || T.WorkflowInstanceId == workflowInstanceId) &&
+            (taskIdNull || T.TaskId == taskId) &&
             (
                 T.Status == TaskExecutionStatus.Succeeded.ToString() ||
                 T.Status == TaskExecutionStatus.Failed.ToString() ||

tests/UnitTests/Monai.Deploy.WorkflowManager.Shared.Tests/UriServiceTests.cs

@@ -1,5 +1,23 @@
-using Monai.Deploy.WorkflowManager.Shared.Filter;
+/*
+ * Copyright 2023 MONAI Consortium
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+
+using Monai.Deploy.WorkflowManager.Shared.Filter;
 using Monai.Deploy.WorkflowManager.Shared.Services;
+using Monai.Deploy.WorkflowManager.Shared.Wrappers;
 
 namespace Monai.Deploy.WorkflowManager.Shared.Tests
 {
@@ -29,5 +47,16 @@ public void Should_Create_Usable_Url()
             Assert.Contains($"pageNumber={pageNum}", uri);
             Assert.Contains($"pageSize={pageSize}", uri);
         }
+
+        [Fact]
+        public void Resonce_Should_Initialise()
+        {
+            var data = "some data here";
+            var testObject = new Response<string>(data);
+            Assert.Equal(data, testObject.Data);
+            Assert.True(testObject.Succeeded);
+            Assert.Equal(Array.Empty<string>(), testObject.Errors);
+            Assert.Equal(string.Empty, testObject.Message);
+        }
     }
 }

tests/UnitTests/TaskManager.Tests/TaskExecutionStatsRepositoryTests.cs

@@ -17,6 +17,7 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using System.Linq.Expressions;
 using System.Threading;
 using System.Threading.Tasks;
 using Microsoft.Extensions.Logging;
@@ -25,10 +26,12 @@
 using Monai.Deploy.WorkflowManager.TaskManager.API.Models;
 using Monai.Deploy.WorkflowManager.TaskManager.Database;
 using Monai.Deploy.WorkflowManager.TaskManager.Database.Options;
+using Monai.Deploy.WorkflowManager.TaskManager.Logging;
 using MongoDB.Bson;
 using MongoDB.Driver;
 using Moq;
 using Xunit;
+using static Moq.It;
 
 namespace Monai.Deploy.WorkflowManager.TaskManager.Tests
 {
@@ -146,6 +149,61 @@ public async Task TaskExecutionStats_Create_Should_Store_All()
                 It.IsAny<CancellationToken>()), Times.Once);
         }
 
+        [Fact]
+        public async Task TaskExecutionStats_Create_Should_Log_On_Exception()
+        {
+            var testStore = new TaskDispatchEventInfo(new TaskDispatchEvent
+            {
+                CorrelationId = nameof(TaskDispatchEvent.CorrelationId),
+                ExecutionId = nameof(TaskDispatchEvent.ExecutionId),
+                WorkflowInstanceId = nameof(TaskDispatchEvent.WorkflowInstanceId),
+                TaskId = nameof(TaskDispatchEvent.TaskId),
+                Status = TaskExecutionStatus.Created,
+            });
+
+            _collection.Setup(c => c.ReplaceOneAsync(
+                It.IsAny<FilterDefinition<TaskExecutionStats>>(),
+                It.IsAny<TaskExecutionStats>(),
+                It.IsAny<ReplaceOptions>(),
+                It.IsAny<CancellationToken>())).Throws(new Exception());
+
+            await _repo.CreateAsync(testStore);
+
+            _logger.Verify(l =>
+                l.IsEnabled(LogLevel.Error)
+                , Times.Once);
+        }
+
+        [Fact]
+        public async Task TaskExecutionStats_Update_Should_Log_On_Exception()
+        {
+            var testStore = new TaskUpdateEvent
+            {
+                CorrelationId = nameof(TaskDispatchEvent.CorrelationId),
+                ExecutionId = nameof(TaskDispatchEvent.ExecutionId),
+                WorkflowInstanceId = nameof(TaskDispatchEvent.WorkflowInstanceId),
+                TaskId = nameof(TaskDispatchEvent.TaskId),
+                Status = TaskExecutionStatus.Created,
+                ExecutionStats = new System.Collections.Generic.Dictionary<string, string> {
+                    { "CompletedAt" , (new DateTime(2023,3,3,8,0,12)).ToString() },
+                    { "podStartTime0","2023-03-30T08:33:00+00:00"},
+                    { "podFinishTime0","2023-03-30T08:36:00+00:00"},
+                }
+            };
+
+            _collection.Setup(c => c.UpdateOneAsync(
+                It.IsAny<FilterDefinition<TaskExecutionStats>>(),
+                It.IsAny<UpdateDefinition<TaskExecutionStats>>(),
+                It.IsAny<UpdateOptions>(),
+                It.IsAny<CancellationToken>())).Throws(new Exception());
+
+            await _repo.UpdateExecutionStatsAsync(testStore);
+
+            _logger.Verify(l =>
+                l.IsEnabled(LogLevel.Error)
+                , Times.Once);
+        }
+
         [Fact]
         public async Task TaskExecutionStats_Update_Should_Update_All()
         {
@@ -173,6 +231,24 @@ public async Task TaskExecutionStats_Update_Should_Update_All()
                 It.IsAny<CancellationToken>()), Times.Once);
         }
 
+        [Fact]
+        public async Task TaskExecutionStats_Get_Stats_Should_Filter()
+        {
+            var results = new List<TaskExecutionStats>() {
+                new TaskExecutionStats { Status = TaskExecutionStatus.Accepted.ToString() },
+                 new TaskExecutionStats { Status = TaskExecutionStatus.Succeeded.ToString() }
+            };
+
+            var mockasynccursor = new Mock<IAsyncCursor<TaskExecutionStats>>();
+            _collection.Setup(c => c.FindAsync(
+                It.IsAny<FilterDefinition<TaskExecutionStats>>(),
+                It.IsAny<FindOptions<TaskExecutionStats>>(),
+                It.IsAny<CancellationToken>())).ReturnsAsync(mockasynccursor.Object);
+
+            var result = await _repo.GetStatsAsync(new DateTime(), new DateTime(), 10, 1, "", "");
+
+        }
+
         //[Fact]
         //public async Task Should_Return_Only_dates_in_range()
         //{