From 820e383e5b6aa6cf779657e4d8d925160353eee5 Mon Sep 17 00:00:00 2001
From: Olga Nemt <on.nemtina@digitaldrilling.ru>
Date: Thu, 21 Mar 2024 17:16:16 +0500
Subject: [PATCH] =?UTF-8?q?=D0=9F=D1=80=D0=B0=D0=B2=D0=BA=D0=B0=20=D1=82?=
 =?UTF-8?q?=D0=B8=D0=BF=D0=B0=20=D0=B4=D0=B0=D1=82=20=D0=B4=D0=BB=D1=8F=20?=
 =?UTF-8?q?ReportParametersRequest?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 AsbCloudApp/Requests/ReportParametersRequest.cs  |  6 +++---
 AsbCloudApp/Services/IReportService.cs           |  2 +-
 AsbCloudInfrastructure/Services/ReportService.cs | 14 +++++++-------
 3 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/AsbCloudApp/Requests/ReportParametersRequest.cs b/AsbCloudApp/Requests/ReportParametersRequest.cs
index 57b83e4d..74bc358a 100644
--- a/AsbCloudApp/Requests/ReportParametersRequest.cs
+++ b/AsbCloudApp/Requests/ReportParametersRequest.cs
@@ -24,12 +24,12 @@ public class ReportParametersRequest: IValidatableObject
 	/// <summary>
 	/// Дата начала интервала
 	/// </summary>
-	public DateTime Begin { get; set; } = default;
+	public DateTimeOffset Begin { get; set; } = default;
 
     /// <summary>
     /// Дата окончания интервала
     /// </summary>
-    public DateTime End { get; set; } = default;
+    public DateTimeOffset End { get; set; } = default;
 
 	/// <inheritdoc/>
     public IEnumerable<ValidationResult> Validate(ValidationContext validationContext)
@@ -37,7 +37,7 @@ public class ReportParametersRequest: IValidatableObject
 		if (End < Begin)
 			yield return new("End mast be less then begin");
 
-        if (Begin < new DateTime(2000, 1, 1))
+        if (Begin < new DateTimeOffset(2000, 1, 1, 0, 0, 0, TimeSpan.Zero))
             yield return new("Begin mast be > 2000-1-1");
     }
 }
\ No newline at end of file
diff --git a/AsbCloudApp/Services/IReportService.cs b/AsbCloudApp/Services/IReportService.cs
index 5f992a20..4b259240 100644
--- a/AsbCloudApp/Services/IReportService.cs
+++ b/AsbCloudApp/Services/IReportService.cs
@@ -46,7 +46,7 @@ namespace AsbCloudApp.Services
         /// <param name="stepSeconds"></param>
         /// <param name="format"></param>
         /// <returns></returns>
-        int GetReportPagesCount(int idWell, DateTime begin, DateTime end,
+        int GetReportPagesCount(int idWell, DateTimeOffset begin, DateTimeOffset end,
             int stepSeconds, int format);
 
         /// <summary>
diff --git a/AsbCloudInfrastructure/Services/ReportService.cs b/AsbCloudInfrastructure/Services/ReportService.cs
index e1c75d62..04d7c63b 100644
--- a/AsbCloudInfrastructure/Services/ReportService.cs
+++ b/AsbCloudInfrastructure/Services/ReportService.cs
@@ -64,11 +64,11 @@ public class ReportService : IReportService
         return work.Id;
     }
 
-    public int GetReportPagesCount(int idWell, DateTime begin, DateTime end, int stepSeconds, int format)
+    public int GetReportPagesCount(int idWell, DateTimeOffset begin, DateTimeOffset end, int stepSeconds, int format)
     {
         var timezoneOffset = wellService.GetTimezone(idWell).Hours;
-        var beginRemote = begin.ToTimeZoneOffsetHours(timezoneOffset);
-        var endRemote = end.ToTimeZoneOffsetHours(timezoneOffset);
+        var beginRemote = begin.DateTime.ToTimeZoneOffsetHours(timezoneOffset);
+        var endRemote = end.DateTime.ToTimeZoneOffsetHours(timezoneOffset);
 
         var generator = GetReportGenerator(idWell, beginRemote, endRemote, stepSeconds, format, db);
         var pagesCount = generator.GetPagesCount();
@@ -127,10 +127,10 @@ public class ReportService : IReportService
         CancellationToken token)
     {
         var timezoneOffset = wellService.GetTimezone(idWell).Hours;
-        var beginRemote = request.Begin.ToTimeZoneOffsetHours(timezoneOffset);
-        var endRemote = request.End.ToTimeZoneOffsetHours(timezoneOffset);
-        var beginUtc = request.Begin.ToUtcDateTimeOffset(timezoneOffset);
-        var endUtc = request.End.ToUtcDateTimeOffset(timezoneOffset);
+        var beginRemote = request.Begin.DateTime;
+        var endRemote = request.End.DateTime;
+        var beginUtc = request.Begin.ToUniversalTime();
+        var endUtc = request.End.ToUniversalTime();
 
         var tempDir = Path.Combine(Path.GetTempPath(), "report");