From 50e8f557d8f3c630895b27beec94d33e00d8641f Mon Sep 17 00:00:00 2001
From: Olga Nemt <on.nemtina@digitaldrilling.ru>
Date: Fri, 20 Oct 2023 11:41:55 +0500
Subject: [PATCH] =?UTF-8?q?-=20IReportMakerService=20=D0=BF=D0=B5=D1=80?=
 =?UTF-8?q?=D0=B5=D0=BC=D0=B5=D1=89=D0=B5=D0=BD=20-=20=D0=9F=D0=BE=D0=B4?=
 =?UTF-8?q?=D0=BF=D1=80=D0=B0=D0=B2=D0=BB=D0=B5=D0=BD=D1=8B=20usings?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ...tedDailyReportMakerService.cs => IReportMakerService.cs} | 2 +-
 AsbCloudInfrastructure/Repository/DrillTestRepository.cs    | 6 ++++--
 .../AutoGeneratedDailyReportMakerService.cs                 | 2 +-
 .../Services/DrillTestReport/DrillTestReportMakerService.cs | 2 +-
 .../Services/DrillTestReport/DrillTestReportService.cs      | 1 -
 5 files changed, 7 insertions(+), 6 deletions(-)
 rename AsbCloudApp/Services/{AutoGeneratedDailyReports/IAutoGeneratedDailyReportMakerService.cs => IReportMakerService.cs} (90%)

diff --git a/AsbCloudApp/Services/AutoGeneratedDailyReports/IAutoGeneratedDailyReportMakerService.cs b/AsbCloudApp/Services/IReportMakerService.cs
similarity index 90%
rename from AsbCloudApp/Services/AutoGeneratedDailyReports/IAutoGeneratedDailyReportMakerService.cs
rename to AsbCloudApp/Services/IReportMakerService.cs
index 8c2e9a46..e1269a25 100644
--- a/AsbCloudApp/Services/AutoGeneratedDailyReports/IAutoGeneratedDailyReportMakerService.cs
+++ b/AsbCloudApp/Services/IReportMakerService.cs
@@ -2,7 +2,7 @@ using System.IO;
 using System.Threading;
 using System.Threading.Tasks;
 
-namespace AsbCloudApp.Services.AutoGeneratedDailyReports;
+namespace AsbCloudApp.Services;
 
 /// <summary>
 /// Сервис для генерации файлов отчётов
diff --git a/AsbCloudInfrastructure/Repository/DrillTestRepository.cs b/AsbCloudInfrastructure/Repository/DrillTestRepository.cs
index e349db2c..3a16b703 100644
--- a/AsbCloudInfrastructure/Repository/DrillTestRepository.cs
+++ b/AsbCloudInfrastructure/Repository/DrillTestRepository.cs
@@ -30,12 +30,14 @@ namespace AsbCloudInfrastructure.Repository
             if (request.GeDate.HasValue)
             {
                 var startDate = new DateTime(request.GeDate.Value.Year, request.GeDate.Value.Month, request.GeDate.Value.Day);
-                query = query.Where(q => q.TimeStampStart >= startDate);
+                DateTimeOffset startDateUTC = DateTime.SpecifyKind(startDate, DateTimeKind.Utc);
+                query = query.Where(q => q.TimeStampStart >= startDateUTC);
             }
             if (request.LeDate.HasValue)
             {
                 var finishDate = new DateTime(request.LeDate.Value.Year, request.LeDate.Value.Month, request.LeDate.Value.Day);
-                query = query.Where(q => q.TimeStampStart <= finishDate);
+                DateTimeOffset finishDateUTC = DateTime.SpecifyKind(finishDate, DateTimeKind.Utc);
+                query = query.Where(q => q.TimeStampStart <= finishDateUTC);
             }
 
             var entities = await query.ToListAsync(cancellationToken);
diff --git a/AsbCloudInfrastructure/Services/AutoGeneratedDailyReports/AutoGeneratedDailyReportMakerService.cs b/AsbCloudInfrastructure/Services/AutoGeneratedDailyReports/AutoGeneratedDailyReportMakerService.cs
index 8fee9b2c..cfc95753 100644
--- a/AsbCloudInfrastructure/Services/AutoGeneratedDailyReports/AutoGeneratedDailyReportMakerService.cs
+++ b/AsbCloudInfrastructure/Services/AutoGeneratedDailyReports/AutoGeneratedDailyReportMakerService.cs
@@ -5,7 +5,7 @@ using System.Reflection;
 using System.Threading;
 using System.Threading.Tasks;
 using AsbCloudApp.Data.AutogeneratedDailyReport;
-using AsbCloudApp.Services.AutoGeneratedDailyReports;
+using AsbCloudApp.Services;
 using AsbCloudInfrastructure.Services.AutoGeneratedDailyReports.AutogeneratedDailyReportBlocks;
 using ClosedXML.Excel;
 
diff --git a/AsbCloudInfrastructure/Services/DrillTestReport/DrillTestReportMakerService.cs b/AsbCloudInfrastructure/Services/DrillTestReport/DrillTestReportMakerService.cs
index 68ad690f..1badc97e 100644
--- a/AsbCloudInfrastructure/Services/DrillTestReport/DrillTestReportMakerService.cs
+++ b/AsbCloudInfrastructure/Services/DrillTestReport/DrillTestReportMakerService.cs
@@ -1,5 +1,5 @@
 using AsbCloudApp.Data.DrillTestReport;
-using AsbCloudApp.Services.AutoGeneratedDailyReports;
+using AsbCloudApp.Services;
 using ClosedXML.Excel;
 using System.IO;
 using System.Linq;
diff --git a/AsbCloudInfrastructure/Services/DrillTestReport/DrillTestReportService.cs b/AsbCloudInfrastructure/Services/DrillTestReport/DrillTestReportService.cs
index a3d6074e..6dbc9528 100644
--- a/AsbCloudInfrastructure/Services/DrillTestReport/DrillTestReportService.cs
+++ b/AsbCloudInfrastructure/Services/DrillTestReport/DrillTestReportService.cs
@@ -3,7 +3,6 @@ using AsbCloudApp.Data.DrillTestReport;
 using AsbCloudApp.Repositories;
 using AsbCloudApp.Requests;
 using AsbCloudApp.Services;
-using AsbCloudApp.Services.AutoGeneratedDailyReports;
 using System;
 using System.Collections.Generic;
 using System.IO;