From b2b2682dbaa3d51e6c8bca777a6b62e4cd94a4c4 Mon Sep 17 00:00:00 2001
From: ngfrolov <ng.frolov@autodrilling.ru>
Date: Fri, 19 May 2023 16:32:37 +0500
Subject: [PATCH] TelemetryDataBaseService replace telemetry tracer by
 telemetryDataCache.

---
 .../Services/SAUB/TelemetryDataBaseService.cs          | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/AsbCloudInfrastructure/Services/SAUB/TelemetryDataBaseService.cs b/AsbCloudInfrastructure/Services/SAUB/TelemetryDataBaseService.cs
index 3dea46b9..54ab56c5 100644
--- a/AsbCloudInfrastructure/Services/SAUB/TelemetryDataBaseService.cs
+++ b/AsbCloudInfrastructure/Services/SAUB/TelemetryDataBaseService.cs
@@ -101,19 +101,15 @@ namespace AsbCloudInfrastructure.Services.SAUB
             DateTimeOffset dateBeginUtc;
             if (dateBegin == default)
             {
-                dateBeginUtc = telemetryService.GetLastTelemetryDate(telemetry.Id)
-                    .ToUtcDateTimeOffset(timezone.Hours);
-                if (dateBeginUtc != default)
-                    dateBeginUtc = dateBeginUtc.AddSeconds(-intervalSec);
+                var dateRange = telemetryDataCache.GetOrDefaultDataDateRange(telemetry.Id);
+                dateBeginUtc = (dateRange?.To.ToUtcDateTimeOffset(timezone.Hours) ?? DateTime.UtcNow)
+                    .AddSeconds(-intervalSec);
             }
             else
             {
                 dateBeginUtc = dateBegin.ToUtcDateTimeOffset(timezone.Hours);
             }
 
-            if (dateBeginUtc == default)
-                dateBeginUtc = DateTime.UtcNow.AddSeconds(-intervalSec);
-
             var cacheData = telemetryDataCache.GetOrDefault(telemetry.Id, dateBeginUtc.ToRemoteDateTime(timezone.Hours), intervalSec, approxPointsCount);
             if (cacheData is not null)
                 return cacheData;