fix up samll issues

Signed-off-by: Neil South <[email protected]>

Author: neildsouth

src/Database/EntityFramework/Repositories/RemoteAppExecutionRepository.cs

@@ -66,19 +66,19 @@ public async Task<bool> AddAsync(RemoteAppExecution item, CancellationToken canc
 
             return await _retryPolicy.ExecuteAsync(async () =>
             {
-                var result = await _dataset.AddAsync(item, cancellationToken).ConfigureAwait(false);
+                await _dataset.AddAsync(item, cancellationToken).ConfigureAwait(false);
                 await _informaticsGatewayContext.SaveChangesAsync(cancellationToken).ConfigureAwait(false);
                 return true;
             }).ConfigureAwait(false);
         }
 
-        public async Task<int> RemoveAsync(string OriginalStudyUid, CancellationToken cancellationToken = default)
+        public async Task<int> RemoveAsync(string OutgoingStudyUid, CancellationToken cancellationToken = default)
         {
-            Guard.Against.Null(OriginalStudyUid, nameof(OriginalStudyUid));
+            Guard.Against.Null(OutgoingStudyUid, nameof(OutgoingStudyUid));
 
             return await _retryPolicy.ExecuteAsync(async () =>
             {
-                var result = await _dataset.SingleOrDefaultAsync(p => p.OutgoingUid == OriginalStudyUid).ConfigureAwait(false);
+                var result = await _dataset.SingleOrDefaultAsync(p => p.OutgoingUid == OutgoingStudyUid).ConfigureAwait(false);
                 if (result is not null)
                 {
                     _dataset.Remove(result);

src/Database/MongoDB/Repositories/RemoteAppExecutionRepository.cs

@@ -96,8 +96,7 @@ public async Task<int> RemoveAsync(string OutgoingStudyUid, CancellationToken ca
             }).ConfigureAwait(false);
         }
 
-
-        public void Dispose(bool disposing)
+        protected virtual void Dispose(bool disposing)
         {
             if (!_disposedValue)
             {

src/InformaticsGateway/ExecutionPlugins/ExternalAppIncoming.cs

@@ -51,10 +51,10 @@ public ExternalAppIncoming(
             var scope = _serviceScopeFactory.CreateScope();
             var repository = scope.ServiceProvider.GetRequiredService<IRemoteAppExecutionRepository>();
 
-            var tagUsedAsKey = GetTags(_options.Configuration["ReplaceTags"]).First();
+            var tagUsedAsKey = GetTags(_options.Configuration["ReplaceTags"])[0];
 
             var incommingStudyUid = dicomFile.Dataset.GetString(tagUsedAsKey);
-            var remoteAppExecution = await repository.GetAsync(incommingStudyUid);
+            var remoteAppExecution = await repository.GetAsync(incommingStudyUid).ConfigureAwait(false);
             if (remoteAppExecution is null)
             {
                 _logger.LogOriginalStudyUidNotFound(incommingStudyUid);
@@ -64,7 +64,7 @@ public ExternalAppIncoming(
             {
                 dicomFile.Dataset.AddOrUpdate(key, remoteAppExecution.OriginalValues[key]);
             }
-            //dicomFile.Dataset.AddOrUpdate(DicomTag.StudyInstanceUID, remoteAppExecution.StudyUid);
+
             fileMetadata.WorkflowInstanceId = remoteAppExecution.WorkflowInstanceId;
             fileMetadata.TaskId = remoteAppExecution.ExportTaskId;
 

src/InformaticsGateway/ExecutionPlugins/ExternalAppOutgoing.cs

@@ -54,7 +54,7 @@ public ExternalAppOutgoing(
             var scope = _serviceScopeFactory.CreateScope();
             var repository = scope.ServiceProvider.GetRequiredService<IRemoteAppExecutionRepository>();
 
-            var remoteAppExecution = await GetRemoteAppExecution(exportRequestDataMessage, tags).ConfigureAwait(false);
+            var remoteAppExecution = await GetRemoteAppExecution(exportRequestDataMessage).ConfigureAwait(false);
             remoteAppExecution.StudyUid = dicomFile.Dataset.GetString(DicomTag.StudyInstanceUID);
 
             foreach (var tag in tags)
@@ -66,7 +66,7 @@ public ExternalAppOutgoing(
                 }
             }
 
-            remoteAppExecution.OutgoingUid = dicomFile.Dataset.GetString(tags.First());
+            remoteAppExecution.OutgoingUid = dicomFile.Dataset.GetString(tags[0]);
 
             await repository.AddAsync(remoteAppExecution).ConfigureAwait(false);
             _logger.LogStudyUidChanged(remoteAppExecution.StudyUid, remoteAppExecution.OutgoingUid);
@@ -80,7 +80,7 @@ private static void SetTag(DicomFile dicomFile, DicomTag tag)
             // https://dicom.nema.org/dicom/2013/output/chtml/part05/sect_6.2.html
             // for full list
 
-            switch (tag.DictionaryEntry.ValueRepresentations.First().Code)
+            switch (tag.DictionaryEntry.ValueRepresentations[0].Code)
             {
                 case "UI":
                 case "LO":
@@ -102,7 +102,7 @@ private static void SetTag(DicomFile dicomFile, DicomTag tag)
             }
         }
 
-        private async Task<RemoteAppExecution> GetRemoteAppExecution(ExportRequestDataMessage request, DicomTag[] tags)
+        private async Task<RemoteAppExecution> GetRemoteAppExecution(ExportRequestDataMessage request)
         {
             var remoteAppExecution = new RemoteAppExecution
             {

src/InformaticsGateway/Services/Connectors/PayloadAssembler.cs

@@ -28,6 +28,7 @@
 using Monai.Deploy.InformaticsGateway.Api.Storage;
 using Monai.Deploy.InformaticsGateway.Database.Api.Repositories;
 using Monai.Deploy.InformaticsGateway.Logging;
+#nullable enable
 
 namespace Monai.Deploy.InformaticsGateway.Services.Connectors
 {