From 4c08a2963fb51202e252ddf8b2778cb3b837f728 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=A4=D1=80=D0=BE=D0=BB=D0=BE=D0=B2?= Date: Thu, 30 Sep 2021 12:38:29 +0500 Subject: [PATCH] Add fileDto to reportprops dto. For unification download mechanism. --- AsbCloudApp/Data/ReportPropertiesDto.cs | 2 +- .../Services/ReportService.cs | 29 ++++++++++++++----- 2 files changed, 23 insertions(+), 8 deletions(-) diff --git a/AsbCloudApp/Data/ReportPropertiesDto.cs b/AsbCloudApp/Data/ReportPropertiesDto.cs index a1e3e6e9..a8acfe71 100644 --- a/AsbCloudApp/Data/ReportPropertiesDto.cs +++ b/AsbCloudApp/Data/ReportPropertiesDto.cs @@ -6,7 +6,7 @@ namespace AsbCloudApp.Data { public int Id { get; set; } public string Name { get; set; } - public string Url { get; set; } + public FileInfoDto File { get; set; } public int IdWell { get; set; } public DateTime Date { get; set; } public DateTimeOffset Begin { get; set; } diff --git a/AsbCloudInfrastructure/Services/ReportService.cs b/AsbCloudInfrastructure/Services/ReportService.cs index e9a47329..90345c67 100644 --- a/AsbCloudInfrastructure/Services/ReportService.cs +++ b/AsbCloudInfrastructure/Services/ReportService.cs @@ -128,9 +128,7 @@ namespace AsbCloudInfrastructure.Services }; } - - [Obsolete] - Task> IReportService.GetSuitableReportsAsync(int idWell, DateTime begin, DateTime end, int stepSeconds, int format, CancellationToken token) => + public Task> GetSuitableReportsAsync(int idWell, DateTime begin, DateTime end, int stepSeconds, int format, CancellationToken token) => (from r in db.ReportProperties.Include(r => r.File) where r.IdWell == idWell && r.Begin >= begin @@ -141,7 +139,16 @@ namespace AsbCloudInfrastructure.Services { Id = r.Id, Name = r.File.Name, - Url = fileService.GetUrl(r.IdFile), + File = new FileInfoDto{ + Id = r.File.Id, + Author = null, + IdAuthor = r.File.IdAuthor??0, + IdCategory = r.File.IdCategory, + IdWell = r.File.IdWell, + Name = r.File.Name, + Size = r.File.Size, + UploadDate = r.File.UploadDate, + }, IdWell = r.IdWell, Date = r.File.UploadDate, Begin = r.Begin, @@ -160,9 +167,17 @@ namespace AsbCloudInfrastructure.Services { Id = r.Id, Name = r.File.Name, -#pragma warning disable IDE0057 // Use range operator - Url = fileService.GetUrl(r.IdWell, ReportCategoryId, r.File.Id, r.File.Name.Substring(r.File.Name.LastIndexOf(".") > 0 ? r.File.Name.LastIndexOf(".") : r.File.Name.Length)), -#pragma warning restore IDE0057 // Use range operator + File = new FileInfoDto + { + Id = r.File.Id, + Author = null, + IdAuthor = r.File.IdAuthor ?? 0, + IdCategory = r.File.IdCategory, + IdWell = r.File.IdWell, + Name = r.File.Name, + Size = r.File.Size, + UploadDate = r.File.UploadDate, + }, IdWell = r.IdWell, Date = r.File.UploadDate, Begin = r.Begin,