final refactor

Author: nvmLantana

DotNet/DataAcquisition.Domain/Application/Models/Exceptions/TooManyRequestsException.cs

@@ -5,8 +5,8 @@ namespace LantanaGroup.Link.DataAcquisition.Domain.Application.Models.Exceptions
 {
     public class TooManyRequestsException : FhirOperationException
     {
-        public TimeSpan? RetryAfter { get; }
-        public TooManyRequestsException(string message, TimeSpan? retryAfter = null) : base(message, System.Net.HttpStatusCode.TooManyRequests)
+        public TimeSpan RetryAfter { get; }
+        public TooManyRequestsException(string message, TimeSpan retryAfter) : base(message, System.Net.HttpStatusCode.TooManyRequests)
         {
             RetryAfter = retryAfter;
         }

DotNet/DataAcquisition.Domain/Application/Services/FhirApi/Commands/FhirCommandUtils.cs

@@ -16,17 +16,17 @@ protected override async Task<HttpResponseMessage> SendAsync(HttpRequestMessage
 
 internal static class FhirCommandUtils
 {
-    private const int DEFAULT_DELAY_SECONDS = 60;
-
-    public static TimeSpan ParseRetryAfter(HttpResponseHeaders? headers)
+    public static TimeSpan ParseRetryAfter(HttpResponseHeaders? headers, TimeSpan defaultDelay = default)
     {
+        defaultDelay = defaultDelay == default ? TimeSpan.FromSeconds(60) : defaultDelay;
+
         if (headers == null || headers.RetryAfter == null)
         {
-            return DateTime.UtcNow.AddSeconds(DEFAULT_DELAY_SECONDS).TimeOfDay;
+            return defaultDelay;
         }
 
         var retryValue = headers.RetryAfter;
-        TimeSpan? delay = null;
+        TimeSpan delay;
 
         if (retryValue.Delta.HasValue)
         {
@@ -36,12 +36,16 @@ public static TimeSpan ParseRetryAfter(HttpResponseHeaders? headers)
         {
             delay = retryValue.Date.Value - DateTimeOffset.UtcNow;
         }
+        else
+        {
+            return defaultDelay;
+        }
 
-        if (!delay.HasValue || delay.Value <= TimeSpan.Zero)
+        if (delay <= TimeSpan.Zero)
         {
-            delay = DateTime.UtcNow.AddSeconds(DEFAULT_DELAY_SECONDS).TimeOfDay;
+            return defaultDelay;
         }
 
-        return delay.Value;
+        return delay;
     }
 }

DotNet/DataAcquisition.Domain/Application/Services/PatientDataService.cs

@@ -553,10 +553,9 @@ await _dataAcquisitionLogManager.UpdateAsync(new UpdateDataAcquisitionLogModel
 
                 log.RetryAttempts ??= 0;
 
-                var delay = ex.RetryAfter ?? TimeSpan.FromSeconds(Math.Min(Math.Pow(2, log.RetryAttempts.Value), 60));
-                log.ExecutionDate = DateTime.UtcNow.Add(delay);
+                log.ExecutionDate = DateTime.UtcNow.Add(ex.RetryAfter);
                 log.Status = RequestStatus.Pending; //Don't count this as a failure
-                log.Notes.Add($"[{DateTime.UtcNow}] Throttled (429): Retrying after {delay.TotalSeconds}s. Attempt {log.RetryAttempts}.");
+                log.Notes.Add($"[{DateTime.UtcNow}] Throttled (429): Retrying after {ex.RetryAfter.TotalSeconds}s. Attempt {log.RetryAttempts}.");
 
                 await _dataAcquisitionLogManager.UpdateAsync(new UpdateDataAcquisitionLogModel
                 {