From d78209fa0b5d3b66718e9b7626da146a9ad07448 Mon Sep 17 00:00:00 2001
From: Olga Nemt <on.nemtina@digitaldrilling.ru>
Date: Fri, 22 Mar 2024 11:01:12 +0500
Subject: [PATCH] =?UTF-8?q?=D0=A1=D0=BC=D0=B5=D0=BD=D0=B0=20=D1=82=D0=B8?=
 =?UTF-8?q?=D0=BF=D0=BE=D0=B2=20=D0=B4=D0=B0=D1=82=20=D0=B4=D0=BB=D1=8F=20?=
 =?UTF-8?q?LimitingParameterDataDto?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 AsbCloudApp/Data/LimitingParameterDataDto.cs              | 4 ++--
 AsbCloudApp/Requests/LimitingParameterRequest.cs          | 4 ++--
 .../Repository/LimitingParameterRepository.cs             | 8 ++++----
 .../Services/LimitingParameterService.cs                  | 2 +-
 4 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/AsbCloudApp/Data/LimitingParameterDataDto.cs b/AsbCloudApp/Data/LimitingParameterDataDto.cs
index 1bf982dc..c5692729 100644
--- a/AsbCloudApp/Data/LimitingParameterDataDto.cs
+++ b/AsbCloudApp/Data/LimitingParameterDataDto.cs
@@ -20,12 +20,12 @@ namespace AsbCloudApp.Data
         /// <summary>
         /// Дата начала ограничения
         /// </summary>
-        public DateTime DateStart { get; set; }
+        public DateTimeOffset DateStart { get; set; }
 
         /// <summary>
         /// Дата окончания ограничения
         /// </summary>
-        public DateTime DateEnd { get; set; }
+        public DateTimeOffset DateEnd { get; set; }
 
         /// <summary>
         /// Глубина начала ограничения 
diff --git a/AsbCloudApp/Requests/LimitingParameterRequest.cs b/AsbCloudApp/Requests/LimitingParameterRequest.cs
index 31fb02f0..4e1b5d98 100644
--- a/AsbCloudApp/Requests/LimitingParameterRequest.cs
+++ b/AsbCloudApp/Requests/LimitingParameterRequest.cs
@@ -17,12 +17,12 @@ namespace AsbCloudApp.Requests
         /// <summary>
         /// Больше или равно дате
         /// </summary>
-        public DateTime? GtDate { get; set; }
+        public DateTimeOffset? GtDate { get; set; }
 
         /// <summary>
         /// Меньше или равно дате
         /// </summary>
-        public DateTime? LtDate { get; set; }
+        public DateTimeOffset? LtDate { get; set; }
 
         /// <summary>
         /// Больше или равно глубины забоя
diff --git a/AsbCloudInfrastructure/Repository/LimitingParameterRepository.cs b/AsbCloudInfrastructure/Repository/LimitingParameterRepository.cs
index 8f3c42c1..67fc5960 100644
--- a/AsbCloudInfrastructure/Repository/LimitingParameterRepository.cs
+++ b/AsbCloudInfrastructure/Repository/LimitingParameterRepository.cs
@@ -39,8 +39,8 @@ namespace AsbCloudInfrastructure.Repository
                     IdWell = request.IdWell,
                     IdTelemetry = x.IdTelemetry,
                     IdFeedRegulator = x.IdFeedRegulator,
-                    DateStart = DateTime.SpecifyKind(x.DateStart.UtcDateTime + timezoneSpan, DateTimeKind.Unspecified),
-                    DateEnd = DateTime.SpecifyKind(x.DateEnd.UtcDateTime + timezoneSpan, DateTimeKind.Unspecified),
+                    DateStart = x.DateStart.ToOffset(timezoneSpan),
+                    DateEnd = x.DateEnd.ToOffset(timezoneSpan),
                     DepthStart = x.DepthStart,
                     DepthEnd = x.DepthEnd
                 });
@@ -56,13 +56,13 @@ namespace AsbCloudInfrastructure.Repository
 
             if (request.GtDate.HasValue)
             {
-                var gtDate = request.GtDate.Value.ToUtcDateTimeOffset(timezoneHours);
+                var gtDate = request.GtDate.Value.ToUniversalTime();
                 query = query.Where(x => x.DateEnd >= gtDate);
             }
 
             if (request.LtDate.HasValue)
             {
-                var ltDate = request.LtDate.Value.ToUtcDateTimeOffset(timezoneHours);
+                var ltDate = request.LtDate.Value.ToUniversalTime();
                 query = query.Where(x => x.DateStart <= ltDate);
             }
 
diff --git a/AsbCloudInfrastructure/Services/LimitingParameterService.cs b/AsbCloudInfrastructure/Services/LimitingParameterService.cs
index c4323597..5dee9f53 100644
--- a/AsbCloudInfrastructure/Services/LimitingParameterService.cs
+++ b/AsbCloudInfrastructure/Services/LimitingParameterService.cs
@@ -106,7 +106,7 @@ namespace AsbCloudInfrastructure.Services
             return (float)result;
         }
 
-        private DateTime GetDate(double depth, LimitingParameterDataDto dto)
+        private DateTimeOffset GetDate(double depth, LimitingParameterDataDto dto)
         {
             var a = depth - dto.DepthStart;
             var b = dto.DepthEnd - dto.DepthStart;