From 87805a7104c64940b649454e7665b3009fc0579c Mon Sep 17 00:00:00 2001
From: eugeniy_ivanov <ea.ivanov@digitaldrilling.ru>
Date: Thu, 20 Oct 2022 14:26:36 +0500
Subject: [PATCH] =?UTF-8?q?=D0=BA=D0=BE=D1=80=D1=80=D0=B5=D0=BA=D1=82?=
 =?UTF-8?q?=D0=B8=D1=80=D0=BE=D0=B2=D0=BA=D0=B0=20=D0=BC=D0=B5=D1=82=D0=BE?=
 =?UTF-8?q?=D0=B4=D0=B0=20=D0=BF=D0=BE=D0=BB=D1=83=D1=87=D0=B5=D0=BD=D0=B8?=
 =?UTF-8?q?=D1=8F=20=D0=B4=D0=B8=D0=B0=D0=BF=D0=B0=D0=B7=D0=BE=D0=BD=D0=B0?=
 =?UTF-8?q?=20=D0=B4=D0=B0=D1=82=20=D0=BF=D0=BE=20=D0=BD=D0=B0=D1=80=D0=B0?=
 =?UTF-8?q?=D0=B1=D0=BE=D1=82=D0=BA=D0=B0=D0=BC=20=D0=BF=D0=BE=D0=B4=D1=81?=
 =?UTF-8?q?=D0=B8=D1=81=D1=82=D0=B5=D0=BC,=20=D0=B4=D0=BE=D0=B1=D0=B0?=
 =?UTF-8?q?=D0=B2=D0=BB=D0=B5=D0=BD=D0=B8=D0=B5=20=D0=BC=D0=B5=D1=82=D0=BE?=
 =?UTF-8?q?=D0=B4=D0=B0=20=D0=B2=20=D0=B8=D0=BD=D1=82=D0=B5=D1=80=D1=84?=
 =?UTF-8?q?=D0=B5=D0=B9=D1=81=20ISubsystemOperationTimeService?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Subsystems/ISubsystemOperationTimeService.cs       | 10 +++++++++-
 .../Subsystems/SubsystemOperationTimeService.cs        | 10 +++++++---
 2 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/AsbCloudApp/Services/Subsystems/ISubsystemOperationTimeService.cs b/AsbCloudApp/Services/Subsystems/ISubsystemOperationTimeService.cs
index 07e41895..605d844c 100644
--- a/AsbCloudApp/Services/Subsystems/ISubsystemOperationTimeService.cs
+++ b/AsbCloudApp/Services/Subsystems/ISubsystemOperationTimeService.cs
@@ -36,7 +36,15 @@ namespace AsbCloudApp.Services.Subsystems
         /// <param name="request"></param>
         /// <param name="token"></param>
         /// <returns></returns>
-        Task<IEnumerable<SubsystemOperationTimeDto>?> GetOperationTimeAsync(SubsystemOperationTimeRequest request, CancellationToken token);        
+        Task<IEnumerable<SubsystemOperationTimeDto>?> GetOperationTimeAsync(SubsystemOperationTimeRequest request, CancellationToken token);
+
+        /// <summary>
+        /// Временной диапазон за который есть статистика работы подсистем
+        /// </summary>
+        /// <param name="idSubsystem"></param>
+        /// <param name="token"></param>
+        /// <returns></returns>
+        Task<IEnumerable<SubsystemOperationTimeDto>?> GetDateRangeOperationTimeAsync(int idSubsystem, CancellationToken token);
     }
 #nullable disable
 }
diff --git a/AsbCloudInfrastructure/Services/Subsystems/SubsystemOperationTimeService.cs b/AsbCloudInfrastructure/Services/Subsystems/SubsystemOperationTimeService.cs
index 1961c74f..5b0fdbb1 100644
--- a/AsbCloudInfrastructure/Services/Subsystems/SubsystemOperationTimeService.cs
+++ b/AsbCloudInfrastructure/Services/Subsystems/SubsystemOperationTimeService.cs
@@ -185,9 +185,9 @@ namespace AsbCloudInfrastructure.Services.Subsystems
 
         }
 
-        private (DateTimeOffset, DateTimeOffset) GetDateRangeOperationTime(int idSubsystem)
+        private async Task<(DateTimeOffset, DateTimeOffset)?> GetDateRangeOperationTime(int idSubsystem, CancellationToken token)
         {
-            var dateRange = db.SubsystemOperationTimes
+            var dateRange = await db.SubsystemOperationTimes
                 .Where(o => o.Id == idSubsystem)
                 .GroupBy(o => o.IdSubsystem)
                 .Select(g => new
@@ -195,7 +195,11 @@ namespace AsbCloudInfrastructure.Services.Subsystems
                     DateFirst = g.Min(o => o.DateStart),
                     DateLast = g.Max(o => o.DateEnd)
                 })
-                .FirstOrDefault();           
+                .FirstOrDefaultAsync(token);
+            if (dateRange == null)
+            {
+                return null;
+            }
             (DateTimeOffset dateFirst, DateTimeOffset dateLast) result = (dateRange.DateFirst, dateRange.DateLast);
             return result;
         }