From 488b8ec674817645eb061c03125653f3fd359f1d Mon Sep 17 00:00:00 2001
From: Olga Nemt <on.nemtina@digitaldrilling.ru>
Date: Mon, 25 Mar 2024 09:29:44 +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?SetpointsRequestDto=20=D0=B8=20=D0=B2=D1=81=D1=91,=20=D1=87?=
 =?UTF-8?q?=D1=82=D0=BE=20=D1=81=20=D0=BD=D0=B8=D0=BC=20=D1=81=D0=B2=D1=8F?=
 =?UTF-8?q?=D0=B7=D0=B0=D0=BD=D0=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 AsbCloudApp/Data/SAUB/SetpointsRequestDto.cs          |  2 +-
 .../Repository/ScheduleRepository.cs                  | 11 +++++------
 .../Repository/SetpointsRequestRepository.cs          |  5 ++---
 .../Services/SAUB/SetpointsService.cs                 |  1 -
 4 files changed, 8 insertions(+), 11 deletions(-)

diff --git a/AsbCloudApp/Data/SAUB/SetpointsRequestDto.cs b/AsbCloudApp/Data/SAUB/SetpointsRequestDto.cs
index ed81c0ef..192805a6 100644
--- a/AsbCloudApp/Data/SAUB/SetpointsRequestDto.cs
+++ b/AsbCloudApp/Data/SAUB/SetpointsRequestDto.cs
@@ -33,7 +33,7 @@ namespace AsbCloudApp.Data.SAUB
         /// <summary>
         /// отметка времени создания запроса
         /// </summary>
-        public DateTime UploadDate { get; set; } = DateTime.Now;
+        public DateTimeOffset UploadDate { get; set; } = DateTimeOffset.Now;
 
         /// <summary>
         /// время в секундах актуальности этого запроса
diff --git a/AsbCloudInfrastructure/Repository/ScheduleRepository.cs b/AsbCloudInfrastructure/Repository/ScheduleRepository.cs
index 7c7e6491..781b51ee 100644
--- a/AsbCloudInfrastructure/Repository/ScheduleRepository.cs
+++ b/AsbCloudInfrastructure/Repository/ScheduleRepository.cs
@@ -24,7 +24,7 @@ namespace AsbCloudInfrastructure.Repository
             this.wellService = wellService;
         }
 
-        public async Task<IEnumerable<ScheduleDto>> GetAsync(int idWell, DateTime workTime, CancellationToken token)
+        public async Task<IEnumerable<ScheduleDto>> GetAsync(int idWell, DateTimeOffset workTime, CancellationToken token)
         {
             var entities = await BuildQuery(idWell, workTime)
                 .AsNoTracking()
@@ -33,7 +33,7 @@ namespace AsbCloudInfrastructure.Repository
             return entities.Select(Convert);
         }
 
-        public async Task<DrillerDto?> GetOrDefaultDrillerAsync(int idWell, DateTime workTime, CancellationToken token)
+        public async Task<DrillerDto?> GetOrDefaultDrillerAsync(int idWell, DateTimeOffset workTime, CancellationToken token)
         {
             var entities = await BuildQuery(idWell, workTime)
                 .AsNoTracking()
@@ -43,8 +43,7 @@ namespace AsbCloudInfrastructure.Repository
                 return null;
             
             var hoursOffset = wellService.GetTimezone(idWell).Hours;
-            var remoteDate = workTime.ToUtcDateTimeOffset(hoursOffset).ToRemoteDateTime(hoursOffset);
-            var time = new TimeOnly(remoteDate.Hour, remoteDate.Minute, remoteDate.Second);
+            var time = new TimeOnly(workTime.Hour, workTime.Minute, workTime.Second);
             
             var entity = entities.FirstOrDefault(s =>
                 s.ShiftStart > s.ShiftEnd ^
@@ -69,11 +68,11 @@ namespace AsbCloudInfrastructure.Repository
 
         }
 
-        private IQueryable<Schedule> BuildQuery(int idWell, DateTime workTime)
+        private IQueryable<Schedule> BuildQuery(int idWell, DateTimeOffset workTime)
         {
             var hoursOffset = wellService.GetTimezone(idWell).Hours;
 
-            var workTimeDateTime = workTime.ToUtcDateTimeOffset(hoursOffset);
+            var workTimeDateTime = workTime.ToUniversalTime();
             
             return GetQuery().Where(s => s.IdWell == idWell
                                   && s.DrillStart <= workTimeDateTime
diff --git a/AsbCloudInfrastructure/Repository/SetpointsRequestRepository.cs b/AsbCloudInfrastructure/Repository/SetpointsRequestRepository.cs
index 838ae15b..2c1f7905 100644
--- a/AsbCloudInfrastructure/Repository/SetpointsRequestRepository.cs
+++ b/AsbCloudInfrastructure/Repository/SetpointsRequestRepository.cs
@@ -50,15 +50,14 @@ namespace AsbCloudInfrastructure.Repository
         {
             var result = base.Convert(src);
             var timezoneOffsetHours = wellService.GetTimezone(src.IdWell).Hours;
-            result.UploadDate = src.UploadDate.ToRemoteDateTime(timezoneOffsetHours);
+            result.UploadDate = src.UploadDate.ToOffset(TimeSpan.FromHours(timezoneOffsetHours));
             return result;
         }
 
         protected override SetpointsRequest Convert(SetpointsRequestDto src)
         {
             var result = base.Convert(src);
-            var timezoneOffsetHours = wellService.GetTimezone(src.IdWell).Hours;
-            result.UploadDate = src.UploadDate.ToUtcDateTimeOffset(timezoneOffsetHours);
+            result.UploadDate = src.UploadDate.ToUniversalTime();
             return result;
         }
     }
diff --git a/AsbCloudInfrastructure/Services/SAUB/SetpointsService.cs b/AsbCloudInfrastructure/Services/SAUB/SetpointsService.cs
index b0f5c824..657a99c6 100644
--- a/AsbCloudInfrastructure/Services/SAUB/SetpointsService.cs
+++ b/AsbCloudInfrastructure/Services/SAUB/SetpointsService.cs
@@ -72,7 +72,6 @@ namespace AsbCloudInfrastructure.Services.SAUB
             foreach (var item in filtered)
             {
                 item.IdState = 2;
-                item.UploadDate = DateTime.SpecifyKind(item.UploadDate, DateTimeKind.Utc);
             }
 
             await setpointsRepository.UpdateRangeAsync(filtered, token);