Merge pull request 'Фоновое удаление файлов (тех, дата загрузки которых составляет более 30 дней от текущей даты)' (#152) from feature/#23919905-drop-all-old-reports into dev

Reviewed-on: http://test.digitaldrilling.ru:8080/DDrilling/AsbCloudServer/pulls/152

AsbCloudApp/Services/IReportService.cs

@@ -57,5 +57,13 @@ namespace AsbCloudApp.Services
         /// <param name="token"></param>
         /// <returns></returns>
         Task<IEnumerable<ReportPropertiesDto>> GetAllReportsByWellAsync(int idWell, CancellationToken token);
+
+        /// <summary>
+        /// Удаление отчетов, если превышен их период хранения
+        /// </summary>
+        /// <param name="lifetime">период хранения отчетов</param>
+        /// <param name="token"></param>
+        /// <returns></returns>
+        Task<int> DeleteAllOldReportsAsync(TimeSpan lifetime, CancellationToken token);
     }
 }

AsbCloudInfrastructure/Background/WorkToDeleteOldReports.cs

@@ -0,0 +1,34 @@
+using AsbCloudApp.Services;
+using Microsoft.Extensions.DependencyInjection;
+using System;
+using System.Threading;
+using System.Threading.Tasks;
+
+namespace AsbCloudInfrastructure.Background
+{
+    /// <summary>
+    /// Задача по удалению загруженных отчетов
+    /// </summary>
+    public class WorkToDeleteOldReports : Work
+    {
+        public WorkToDeleteOldReports()
+            : base("work to delete reports older than 30 days")
+        {
+            Timeout = TimeSpan.FromMinutes(10);
+        }
+
+        /// <summary>
+        /// Удаление отчетов, загруженных ранее 30 дней от текущей даты
+        /// </summary>
+        /// <param name="id"></param>
+        /// <param name="services"></param>
+        /// <param name="onProgressCallback"></param>
+        /// <param name="token"></param>
+        /// <returns></returns>
+        protected override async Task Action(string id, IServiceProvider services, Action<string, double?> onProgressCallback, CancellationToken token)
+        {
+            var reportService = services.GetRequiredService<IReportService>();
+            await reportService.DeleteAllOldReportsAsync(TimeSpan.FromDays(30), token);
+        }
+    }
+}

AsbCloudInfrastructure/Repository/FileRepository.cs

@@ -147,7 +147,7 @@ namespace AsbCloudInfrastructure.Repository
         public async Task<IEnumerable<FileInfoDto>> DeleteAsync(IEnumerable<int> ids, CancellationToken token)
         {
             var query = dbSetConfigured
-                .Where(f => ids.Contains(f.Id) && f.IsDeleted);
+                .Where(f => ids.Contains(f.Id));
 
                 var files = await query.ToListAsync(token);
 

AsbCloudInfrastructure/Services/ReportService.cs

@@ -20,6 +20,7 @@ namespace AsbCloudInfrastructure.Services
     {
         private readonly IAsbCloudDbContext db;
         private readonly ITelemetryService telemetryService;
+        private readonly FileService fileService;
         private readonly IWellService wellService;
         private readonly BackgroundWorker backgroundWorkerService;
 
@@ -28,12 +29,14 @@ namespace AsbCloudInfrastructure.Services
         public ReportService(IAsbCloudDbContext db,
             ITelemetryService telemetryService,
             IWellService wellService,
+            FileService fileService,
             BackgroundWorker backgroundWorkerService)
         {
             this.db = db;
             this.wellService = wellService;
             this.backgroundWorkerService = backgroundWorkerService;
             this.telemetryService = telemetryService;
+            this.fileService = fileService;
             ReportCategoryId = db.FileCategories
                 .AsNoTracking()
                 .First(c => c.Name.Equals("Рапорт"))
@@ -186,6 +189,16 @@ namespace AsbCloudInfrastructure.Services
 
             return generator;
         }
-    }
 
+        public async Task<int> DeleteAllOldReportsAsync(TimeSpan lifetime, CancellationToken token)
+        {
+            var lifeTimeStartDate = DateTime.UtcNow.Date - lifetime;
+            var fileIds = await db.ReportProperties
+                .Where(r => r.File.UploadDate.Date < lifeTimeStartDate)
+                .Select(r => r.IdFile)
+                .ToArrayAsync(token);
+
+            return await fileService.DeleteAsync(fileIds, token);
+        }
+    }
 }

AsbCloudInfrastructure/Startup.cs

@@ -29,6 +29,7 @@ namespace AsbCloudInfrastructure
             _ = provider.GetRequiredService<ITelemetryDataCache<TelemetryDataSpinDto>>();
 
             var backgroundWorker = provider.GetRequiredService<PeriodicBackgroundWorker>();
+            backgroundWorker.Add<WorkToDeleteOldReports>(TimeSpan.FromDays(1));
             backgroundWorker.Add<WellInfoService.WorkWellInfoUpdate>(TimeSpan.FromMinutes(30));
             backgroundWorker.Add<WorkOperationDetection>(TimeSpan.FromMinutes(15));
             backgroundWorker.Add<WorkSubsystemOperationTimeCalc>(TimeSpan.FromMinutes(30));