fixups from sonar cloud

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

Author: neildsouth

src/WorkflowManager/Common/Services/PayloadService.cs

@@ -135,8 +135,6 @@ public PayloadService(
 
             if (workflowInstance is null) { return null; }
 
-            var t = await _workflowRepository.GetByWorkflowIdAsync(workflowInstance.WorkflowId);
-
             return (await _workflowRepository.GetByWorkflowIdAsync(workflowInstance.WorkflowId))?.Workflow?.DataRetentionDays ?? null;
         }
 

src/WorkflowManager/Contracts/Migrations/M004_Payload_expires.cs

@@ -19,9 +19,9 @@
 
 namespace Monai.Deploy.WorkflowManager.Common.Contracts.Migrations
 {
-    public class M004_Payload_expires : DocumentMigration<Payload>
+    public class M004_Payload_Expires : DocumentMigration<Payload>
     {
-        public M004_Payload_expires() : base("1.0.4") { }
+        public M004_Payload_Expires() : base("1.0.4") { }
 
         public override void Up(BsonDocument document)
         {

src/WorkflowManager/Contracts/Migrations/M004_WorkflowRevision_addDataRetension.cs

@@ -20,9 +20,9 @@
 
 namespace Monai.Deploy.WorkflowManager.Common.Contracts.Migrations
 {
-    public class M004_WorkflowRevision_addDataRetension : DocumentMigration<WorkflowRevision>
+    public class M004_WorkflowRevision_AddDataRetension : DocumentMigration<WorkflowRevision>
     {
-        public M004_WorkflowRevision_addDataRetension() : base("1.0.1") { }
+        public M004_WorkflowRevision_AddDataRetension() : base("1.0.1") { }
 
         public override void Up(BsonDocument document)
         {

src/WorkflowManager/Database/Repositories/PayloadRepository.cs

@@ -66,7 +66,7 @@ private async Task EnsureIndex()
             var indexes = bsonDocuments.Select(_ => _.GetElement("name").Value.ToString()).ToList();
 
             // If index not present create it else skip.
-            if (!indexes.Any(i => i is not null && i.Equals(indexName)))
+            if (!indexes.Exists(i => i is not null && i.Equals(indexName)))
             {
                 await _payloadCollection.Indexes.CreateOneAsync(model);
             }

src/WorkflowManager/Database/Repositories/WorkflowRepository.cs

@@ -206,20 +206,6 @@ public async Task<IList<WorkflowRevision>> GetWorkflowsForWorkflowRequestAsync(s
             ArgumentNullException.ThrowIfNullOrEmpty(calledAeTitle, nameof(calledAeTitle));
             ArgumentNullException.ThrowIfNullOrEmpty(callingAeTitle, nameof(callingAeTitle));
 
-            var t = _workflowCollection
-                .Find(x =>
-                    x.Workflow != null &&
-                    x.Workflow.InformaticsGateway != null &&
-                    ((x.Workflow.InformaticsGateway.AeTitle == calledAeTitle &&
-                        (x.Workflow.InformaticsGateway.DataOrigins == null ||
-                        x.Workflow.InformaticsGateway.DataOrigins.Length == 0)) ||
-                    x.Workflow.InformaticsGateway.AeTitle == calledAeTitle &&
-                        x.Workflow.InformaticsGateway.DataOrigins != null &&
-                        x.Workflow.InformaticsGateway.DataOrigins.Any(d => d == callingAeTitle)) &&
-                    x.Deleted == null);
-
-            var coll = t.ToList();
-
             var wfs = await _workflowCollection
                 .Find(x =>
                     x.Workflow != null &&
@@ -233,7 +219,6 @@ public async Task<IList<WorkflowRevision>> GetWorkflowsForWorkflowRequestAsync(s
                     x.Deleted == null)
                 .ToListAsync();
 
-
             return wfs;
         }
 

src/WorkflowManager/MonaiBackgroundService/Worker.cs

@@ -52,7 +52,7 @@ public Worker(
             _publisherService = publisherService ?? throw new ArgumentNullException(nameof(publisherService));
             _options = options ?? throw new ArgumentNullException(nameof(options));
             _payloadRepository = payloadRepository ?? throw new ArgumentNullException(nameof(payloadRepository));
-            _storageService = storageService ?? throw new ArgumentNullException(nameof(_storageService));
+            _storageService = storageService ?? throw new ArgumentNullException(nameof(storageService));
         }
 
         public static string ServiceName => "Monai Background Service";
@@ -110,7 +110,7 @@ private async Task ProcessExpiredPayloads()
             {
                 payloads = (await _payloadRepository.GetPayloadsToDelete(DateTime.UtcNow).ConfigureAwait(false)).ToList();
 
-                if (payloads.Any())
+                if (payloads.Count != 0)
                 {
                     var ids = payloads.Select(p => p.PayloadId).ToList();
 

tests/UnitTests/Common.Tests/Services/PayloadServiceTests.cs

@@ -483,7 +483,7 @@ public async Task PayloadServiceCreate_Should_Call_GetExpiry()
                 FileCount = 0
             });
 
-            var daysdiff = (payload!.Expires - DateTime.UtcNow).Value.TotalDays + 0.5;
+            var daysdiff = (payload!.Expires! - DateTime.UtcNow).Value.TotalDays + 0.5;
 
             Assert.Equal(99, (int)daysdiff);
         }