From b0155a19c01f07ed3ecc9b3c9c2aeb832d521b51 Mon Sep 17 00:00:00 2001
From: KharchenkoVV <vv.harchenko@autodrilling.ru>
Date: Mon, 31 May 2021 14:56:44 +0500
Subject: [PATCH] =?UTF-8?q?=D0=98=D1=81=D0=BF=D1=80=D0=B0=D0=B2=D0=BB?=
 =?UTF-8?q?=D0=B5=D0=BD=D0=B0=20=D0=BB=D0=BE=D0=B3=D0=B8=D0=BA=D0=B0=20?=
 =?UTF-8?q?=D0=BF=D0=BE=D0=BB=D1=83=D1=87=D0=B5=D0=BD=D0=B8=D1=8F=20=D0=B4?=
 =?UTF-8?q?=D0=B8=D0=B0=D0=BF=D0=B0=D0=B7=D0=BE=D0=BD=D0=B0=20=D0=B4=D0=B0?=
 =?UTF-8?q?=D1=82=20=D0=B4=D0=BB=D1=8F=20=D1=80=D0=B5=D0=BF=D0=BE=D1=80?=
 =?UTF-8?q?=D1=82=D0=BE=D0=B2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Services/ReportService.cs                   | 17 +++++++++--------
 AsbCloudWebApi/Controllers/ReportController.cs  |  6 +++---
 2 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/AsbCloudInfrastructure/Services/ReportService.cs b/AsbCloudInfrastructure/Services/ReportService.cs
index abbc06df..2a2df2a6 100644
--- a/AsbCloudInfrastructure/Services/ReportService.cs
+++ b/AsbCloudInfrastructure/Services/ReportService.cs
@@ -85,18 +85,19 @@ namespace AsbCloudInfrastructure.Services
         public DatesRangeDto GetReportsDatesRange(int wellId)
         {
             var telemetry = telemetryService.GetTelemetryByWellId(wellId);
-
             if (telemetry is null)
                 return null;
 
-            // Убран общий с другими сущностями интерфейс IIdTelemetryDate,
-            // т.к. у Report нет IdTelemetry. GetDatesRange() уже не работает для Report.
-            // Будет исправлено следом за этим коммитом
-            //var (From, To) = db.GetDatesRange<Report>(telemetry.Id);
+            var datesRange = (from d in db.DataSaubBases
+                              where d.IdTelemetry == telemetry.Id
+                              select d.Date).Union(
+                              from m in db.Messages
+                              where m.IdTelemetry == telemetry.Id
+                              select m.Date).ToList();
 
-            return new DatesRangeDto { 
-                From = DateTime.MinValue, 
-                To = DateTime.MaxValue 
+            return new DatesRangeDto {
+                From = datesRange is null ? DateTime.MinValue : datesRange.Min(),
+                To = datesRange is null ? DateTime.MaxValue : datesRange.Max()
             };
         }
 
diff --git a/AsbCloudWebApi/Controllers/ReportController.cs b/AsbCloudWebApi/Controllers/ReportController.cs
index 151520b5..e9a46bb1 100644
--- a/AsbCloudWebApi/Controllers/ReportController.cs
+++ b/AsbCloudWebApi/Controllers/ReportController.cs
@@ -36,7 +36,7 @@ namespace AsbCloudWebApi.Controllers
         /// </summary>
         /// <param name="wellId">id скважины</param>
         /// <param name="stepSeconds">шаг интервала</param>
-        /// <param name="format">формат отчета (0-PDF, 1-LASS)</param>
+        /// <param name="format">формат отчета (0-PDF, 1-LAS)</param>
         /// <param name="begin">дата начала интервала</param>
         /// <param name="end">дата окончания интервала</param>
         /// <returns>id фоновой задачи формирования отчета</returns>
@@ -94,7 +94,7 @@ namespace AsbCloudWebApi.Controllers
         /// </summary>
         /// <param name="wellId">id скважины</param>
         /// <param name="stepSeconds">шаг интервала</param>
-        /// <param name="format">формат отчета (0-PDF, 1-LASS)</param>
+        /// <param name="format">формат отчета (0-PDF, 1-LAS)</param>
         /// <param name="begin">дата начала интервала</param>
         /// <param name="end">дата окончания интервала</param>
         /// <returns>Список имен существующих отчетов (отчетов)</returns>
@@ -115,7 +115,7 @@ namespace AsbCloudWebApi.Controllers
         /// <param name="begin">дата начала интервала</param>
         /// <param name="end">дата окончания интервала</param>
         /// <param name="stepSeconds">шаг интервала</param>
-        /// <param name="format">формат отчета (0-PDF, 1-LASS)</param>
+        /// <param name="format">формат отчета (0-PDF, 1-LAS)</param>
         /// <returns>прогнозируемое кол-во страниц отчета</returns>
         [HttpGet]
         [Route("{wellId}/reportSize")]