Fixed GetInProgress API - The condition for PagesRead needed to be a sum for all progress, not each row.

API/Services/DirectoryService.cs

@@ -39,7 +39,13 @@ namespace API.Services
              .Where(file =>
                 reSearchPattern.IsMatch(Path.GetExtension(file)));
        }
-       
+
+       public bool Exists(string directory)
+       {
+          var di = new DirectoryInfo(directory);
+          return di.Exists;
+       }
+
        public IEnumerable<string> GetFiles(string path, string searchPatternExpression = "", 
           SearchOption searchOption = SearchOption.TopDirectoryOnly)
        {

API/Services/Tasks/BackupService.cs

@@ -99,6 +99,54 @@ namespace API.Services.Tasks
             _directoryService.ClearAndDeleteDirectory(tempDirectory);
             _logger.LogInformation("Database backup completed");
         }
+
+        /// <summary>
+        /// Removes Database backups older than 30 days. If all backups are older than 30 days, the latest is kept.
+        /// </summary>
+        public void CleanupBackups()
+        {
+            const int dayThreshold = 30;
+            _logger.LogInformation("Beginning cleanup of Database backups at {Time}", DateTime.Now);
+            var backupDirectory = Task.Run(() => _unitOfWork.SettingsRepository.GetSettingAsync(ServerSettingKey.BackupDirectory)).Result.Value;
+            if (!_directoryService.Exists(backupDirectory)) return;
+            var deltaTime = DateTime.Today.Subtract(TimeSpan.FromDays(dayThreshold));
+            var allBackups = _directoryService.GetFiles(backupDirectory).ToList();
+            var expiredBackups = allBackups.Select(filename => new FileInfo(filename))
+                .Where(f => f.CreationTime > deltaTime)
+                .ToList();
+            if (expiredBackups.Count == allBackups.Count)
+            {
+                _logger.LogInformation("All expired backups are older than {Threshold} days. Removing all but last backup", dayThreshold);
+                var toDelete = expiredBackups.OrderByDescending(f => f.CreationTime).ToList();
+                for (var i = 1; i < toDelete.Count; i++)
+                {
+                    try
+                    {
+                        toDelete[i].Delete();
+                    }
+                    catch (Exception ex)
+                    {
+                        _logger.LogError(ex, "There was an issue deleting {FileName}", toDelete[i].Name);
+                    }
+                }
+            }
+            else
+            {
+                foreach (var file in expiredBackups)
+                {
+                    try
+                    {
+                        file.Delete();
+                    }
+                    catch (Exception ex)
+                    {
+                        _logger.LogError(ex, "There was an issue deleting {FileName}", file.Name);
+                    }
+                }
+                
+            }
+            _logger.LogInformation("Finished cleanup of Database backups at {Time}", DateTime.Now);
+        }
         
     }
 }

API/Services/Tasks/CleanupService.cs

@@ -13,12 +13,14 @@ namespace API.Services.Tasks
         private readonly ICacheService _cacheService;
         private readonly IDirectoryService _directoryService;
         private readonly ILogger<CleanupService> _logger;
+        private readonly IBackupService _backupService;
 
-        public CleanupService(ICacheService cacheService, IDirectoryService directoryService, ILogger<CleanupService> logger)
+        public CleanupService(ICacheService cacheService, IDirectoryService directoryService, ILogger<CleanupService> logger, IBackupService backupService)
         {
             _cacheService = cacheService;
             _directoryService = directoryService;
             _logger = logger;
+            _backupService = backupService;
         }
 
         [AutomaticRetry(Attempts = 3, LogEvents = false, OnAttemptsExceeded = AttemptsExceededAction.Fail)]
@@ -29,7 +31,9 @@ namespace API.Services.Tasks
             _directoryService.ClearDirectory(tempDirectory);
             _logger.LogInformation("Cleaning cache directory");
             _cacheService.Cleanup();
-            
+            _logger.LogInformation("Cleaning old database backups");
+            _backupService.CleanupBackups();
+
         }
     }
 }