From 528e649813210e8029fd3b52dd96cdca4b87d8c5 Mon Sep 17 00:00:00 2001
From: KharchenkoVV <vv.harchenko@autodrilling.ru>
Date: Mon, 31 May 2021 16:28:50 +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=BE=20=D0=BF=D0=BE=D0=BB=D1=83=D1=87=D0=B5=D0=BD?=
 =?UTF-8?q?=D0=B8=D0=B5=20=D0=B4=D0=B8=D0=B0=D0=BF=D0=B0=D0=B7=D0=BE=D0=BD?=
 =?UTF-8?q?=D0=B0=20=D0=B4=D0=B0=D1=82=20=D0=B4=D0=BB=D1=8F=20=D0=A0=D0=B5?=
 =?UTF-8?q?=D0=BF=D0=BE=D1=80=D1=82=D0=BE=D0=B2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Services/ReportService.cs                 | 31 ++++++++++++-------
 1 file changed, 20 insertions(+), 11 deletions(-)

diff --git a/AsbCloudInfrastructure/Services/ReportService.cs b/AsbCloudInfrastructure/Services/ReportService.cs
index 2a2df2a6..c75a6fd6 100644
--- a/AsbCloudInfrastructure/Services/ReportService.cs
+++ b/AsbCloudInfrastructure/Services/ReportService.cs
@@ -85,20 +85,29 @@ namespace AsbCloudInfrastructure.Services
         public DatesRangeDto GetReportsDatesRange(int wellId)
         {
             var telemetry = telemetryService.GetTelemetryByWellId(wellId);
+
             if (telemetry is null)
                 return null;
 
-            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 = datesRange is null ? DateTime.MinValue : datesRange.Min(),
-                To = datesRange is null ? DateTime.MaxValue : datesRange.Max()
-            };
+            try
+            {
+                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).GroupBy(g => true)
+                                  .Select(g => new
+                                  {
+                                      From = g.Min(),
+                                      To = g.Max()
+                                  }).FirstOrDefault(); 
+                return new DatesRangeDto { From = datesRange.From, To = datesRange.To };
+            }
+            catch(InvalidOperationException)
+            {
+                return new DatesRangeDto { From = DateTime.MinValue, To = DateTime.MaxValue };
+            }
         }
 
         private IEnumerable<string> GetSuitableReportNamesFromDb(int wellId, DateTime begin, DateTime end, int stepSeconds, int format)