gh-347 Update log statement for debugging

Signed-off-by: Victor Chang <[email protected]>

Author: mocsharp

src/Api/Storage/Payload.cs

@@ -75,6 +75,9 @@ public TimeSpan Elapsed
 
         public string? CalledAeTitle { get => Files.OfType<DicomFileStorageMetadata>().Select(p => p.CalledAeTitle).FirstOrDefault(); }
 
+        public int FilesUploaded { get => Files.Count(p => p.IsUploaded); }
+        public int FilesFailedToUpload { get => Files.Count(p => p.IsUploadFailed); }
+
         public Payload(string key, string correlationId, uint timeout)
         {
             Guard.Against.NullOrWhiteSpace(key);

src/InformaticsGateway/Logging/Log.3000.PayloadAssembler.cs

@@ -33,8 +33,8 @@ public static partial class Log
         [LoggerMessage(EventId = 3004, Level = LogLevel.Trace, Message = "Number of incomplete payloads waiting for processing: {count}.")]
         public static partial void BucketsActive(this ILogger logger, int count);
 
-        [LoggerMessage(EventId = 3005, Level = LogLevel.Trace, Message = "Checking elapsed time for bucket: {key}.")]
-        public static partial void BucketElapsedTime(this ILogger logger, string key);
+        [LoggerMessage(EventId = 3005, Level = LogLevel.Trace, Message = "Checking elapsed time for bucket: {key} with timeout set to {timeout}s. Elapsed {elapsed}s with {failedFiles} failures out of {totalNumberOfFiles}.")]
+        public static partial void BucketElapsedTime(this ILogger logger, string key, uint timeout, double elapsed, int totalNumberOfFiles, int failedFiles);
 
         [LoggerMessage(EventId = 3007, Level = LogLevel.Information, Message = "Bucket {key} sent to processing queue with {count} files.")]
         public static partial void BucketReady(this ILogger logger, string key, int count);

src/InformaticsGateway/Logging/Log.4000.ObjectUploadService.cs

@@ -36,7 +36,7 @@ public static partial class Log
         [LoggerMessage(EventId = 4004, Level = LogLevel.Debug, Message = "Error removing objects that are pending upload during startup.")]
         public static partial void ErrorRemovingPendingUploadObjects(this ILogger logger, Exception ex);
 
-        [LoggerMessage(EventId = 4005, Level = LogLevel.Debug, Message = "Error uploading temporary store. Waiting {timeSpan} before next retry. Retry attempt {retryCount}.")]
+        [LoggerMessage(EventId = 4005, Level = LogLevel.Error, Message = "Error uploading temporary store. Waiting {timeSpan} before next retry. Retry attempt {retryCount}.")]
         public static partial void ErrorUploadingFileToTemporaryStore(this ILogger logger, TimeSpan timespan, int retryCount, Exception ex);
 
         [LoggerMessage(EventId = 4006, Level = LogLevel.Information, Message = "File uploaded to temporary store at {filePath}.")]

src/InformaticsGateway/Services/Connectors/PayloadAssembler.cs

@@ -132,10 +132,10 @@ private async void OnTimedEvent(Object source, System.Timers.ElapsedEventArgs e)
                 }
                 foreach (var key in _payloads.Keys)
                 {
-                    _logger.BucketElapsedTime(key);
                     var payload = await _payloads[key].Task.ConfigureAwait(false);
                     using var loggerScope = _logger.BeginScope(new LoggingDataDictionary<string, object> { { "CorrelationId", payload.CorrelationId } });
 
+                    _logger.BucketElapsedTime(key, payload.Timeout, payload.ElapsedTime().TotalSeconds, payload.Files.Count, payload.FilesFailedToUpload);
                     // Wait for timer window closes before sending payload for processing
                     if (payload.HasTimedOut)
                     {

src/InformaticsGateway/Services/Connectors/PayloadExtensions.cs

@@ -30,7 +30,7 @@ public static bool IsUploadCompleted(this Payload payload)
 
         public static bool IsUploadCompletedWithFailures(this Payload payload)
         {
-            return payload.Files.Count(p => p.IsUploadFailed) + payload.Files.Count(p => p.IsUploaded) == payload.Count; ;
+            return (payload.FilesFailedToUpload + payload.FilesUploaded) == payload.Count; ;
         }
 
         public static bool IsMoveCompleted(this Payload payload)