on.nemtina/DD.WellWorkover.Cloud
1
0
Fork 0
forked from ddrilling/AsbCloudServer
Code Pull Requests Activity

правки по ревью, переменная lifetime типа TimeSpan

Browse Source
This commit is contained in:
Olga Nemt 2023-11-10 15:39:52 +05:00
parent de59cb5f85
commit 0735526c70
3 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
AsbCloudApp/Services/IReportService.cs
View File

@ -61,9 +61,9 @@ namespace AsbCloudApp.Services
/// <summary> /// <summary>
/// Удаление отчетов, с момента загрузки которых прошло n дней /// Удаление отчетов, с момента загрузки которых прошло n дней
/// </summary> /// </summary>
/// <param name="days">период, за который отчеты хранятся на сервере и при превышении которого удаляются</param> /// <param name="lifetime">период хранения на сервере скачанных отчетов</param>
/// <param name="token"></param> /// <param name="token"></param>
/// <returns></returns> /// <returns></returns>
Task<int> DeleteAllOldReportsAsync(int days, CancellationToken token); Task<int> DeleteAllOldReportsAsync(TimeSpan lifetime, CancellationToken token);
} }
} }

2
AsbCloudInfrastructure/Background/WorkToDeleteOldReports.cs
View File

@ -28,7 +28,7 @@ namespace AsbCloudInfrastructure.Background
protected override async Task Action(string id, IServiceProvider services, Action<string, double?> onProgressCallback, CancellationToken token) protected override async Task Action(string id, IServiceProvider services, Action<string, double?> onProgressCallback, CancellationToken token)
{ {
var reportService = services.GetRequiredService<IReportService>(); var reportService = services.GetRequiredService<IReportService>();
await reportService.DeleteAllOldReportsAsync(-30, token); await reportService.DeleteAllOldReportsAsync(new TimeSpan(30, 0, 0, 0), token);
} }
} }
} }

5
AsbCloudInfrastructure/Services/ReportService.cs
View File

@ -190,10 +190,11 @@ namespace AsbCloudInfrastructure.Services
return generator; return generator;
} }
public async Task<int> DeleteAllOldReportsAsync(int days, CancellationToken token) public async Task<int> DeleteAllOldReportsAsync(TimeSpan lifetime, CancellationToken token)
{ {
var lifeTimeStartDate = DateTime.UtcNow.Date.Add(-lifetime);
var fileIds = db.ReportProperties var fileIds = db.ReportProperties
.Where(r => r.File.UploadDate.Date < DateTime.UtcNow.Date.AddDays(days)) .Where(r => r.File.UploadDate.Date < lifeTimeStartDate)
.Select(r => r.IdFile); .Select(r => r.IdFile);
if (fileIds.Any()) if (fileIds.Any())