From b734ed929eb5a85c2c248b1c8699140b83aeaba9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=A1=D1=82=D0=B5=D0=BF=D0=B0=D0=BD=D0=BE=D0=B2=20=D0=94?= =?UTF-8?q?=D0=BC=D0=B8=D1=82=D1=80=D0=B8=D0=B9?= Date: Fri, 12 Apr 2024 09:47:17 +0300 Subject: [PATCH] Fix well service --- .../Services/SAUB/TelemetryDataCache.cs | 13 +++++++------ AsbCloudInfrastructure/Services/WellService.cs | 2 +- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/AsbCloudInfrastructure/Services/SAUB/TelemetryDataCache.cs b/AsbCloudInfrastructure/Services/SAUB/TelemetryDataCache.cs index a75c7bf3..0dcfe080 100644 --- a/AsbCloudInfrastructure/Services/SAUB/TelemetryDataCache.cs +++ b/AsbCloudInfrastructure/Services/SAUB/TelemetryDataCache.cs @@ -148,17 +148,18 @@ namespace AsbCloudInfrastructure.Services.SAUB { if (!caches.TryGetValue(idTelemetry, out TelemetryDataCacheItem? cacheItem)) return null; - - var from = cacheItem.FirstByDate?.DateTime; + if (!cacheItem.LastData.Any()) return null; + var from = cacheItem.FirstByDate.DateTime; var to = cacheItem.LastData[^1].DateTime; - from = from ?? cacheItem.LastData[0].DateTime; - return new DatesRangeDto { - From = from.Value.ToUtcDateTimeOffset(cacheItem.TimezoneHours), - To = to.ToUtcDateTimeOffset(cacheItem.TimezoneHours) }; + return new DatesRangeDto + { + From = new DateTimeOffset(from, TimeSpan.FromHours(cacheItem.TimezoneHours)), + To = new DateTimeOffset(to, TimeSpan.FromHours(cacheItem.TimezoneHours)) + }; } public DatesRangeDto? GetOrDefaultCachedDateRange(int idTelemetry) diff --git a/AsbCloudInfrastructure/Services/WellService.cs b/AsbCloudInfrastructure/Services/WellService.cs index 6ed241a0..795d944b 100644 --- a/AsbCloudInfrastructure/Services/WellService.cs +++ b/AsbCloudInfrastructure/Services/WellService.cs @@ -71,7 +71,7 @@ namespace AsbCloudInfrastructure.Services return DateTimeOffset.MinValue; var datesRange = telemetryService.GetDatesRange(well.IdTelemetry.Value); - return datesRange.To.DateTime; + return datesRange.To; } ///