From c835896ce75b6e80c095a8f85f9dec1a79e21269 Mon Sep 17 00:00:00 2001 From: Olga Nemt Date: Fri, 10 Mar 2023 10:59:04 +0500 Subject: [PATCH] =?UTF-8?q?=D1=83=D0=B1=D1=80=D0=B0=D0=BD=20Extension-?= =?UTF-8?q?=D0=BC=D0=B5=D1=82=D0=BE=D0=B4=20=D0=B4=D0=BB=D1=8F=20DateOnly,?= =?UTF-8?q?=20=D1=84=D1=83=D0=BD=D0=BA=D1=86=D0=B8=D0=BE=D0=BD=D0=B0=D0=BB?= =?UTF-8?q?=D1=8C=D0=BD=D0=BE=D1=81=D1=82=D1=8C=20=D0=B4=D0=BE=D0=B1=D0=B0?= =?UTF-8?q?=D0=B2=D0=BB=D0=B5=D0=BD=D0=B0=20=D0=B2=20=D0=BB=D0=BE=D0=BA?= =?UTF-8?q?=D0=B0=D0=BB=D1=8C=D0=BD=D1=8B=D0=B9=20=D0=BC=D0=B5=D1=82=D0=BE?= =?UTF-8?q?=D0=B4=20ExtractDate?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- AsbCloudInfrastructure/Extensions.cs | 15 --------------- .../Services/DailyReport/DailyReportService.cs | 14 ++++++-------- 2 files changed, 6 insertions(+), 23 deletions(-) delete mode 100644 AsbCloudInfrastructure/Extensions.cs diff --git a/AsbCloudInfrastructure/Extensions.cs b/AsbCloudInfrastructure/Extensions.cs deleted file mode 100644 index acd67990..00000000 --- a/AsbCloudInfrastructure/Extensions.cs +++ /dev/null @@ -1,15 +0,0 @@ -namespace System -{ - public static class Extentions - { - public static DateOnly ExtractDateOnly(this DateTime date) - { - return new DateOnly(date.Year, date.Month, date.Day); - } - - public static DateOnly ExtractDateOnly(this DateTimeOffset date) - { - return new DateOnly(date.Date.Year, date.Date.Month, date.Date.Day); - } - } -} diff --git a/AsbCloudInfrastructure/Services/DailyReport/DailyReportService.cs b/AsbCloudInfrastructure/Services/DailyReport/DailyReportService.cs index cdaf137c..2fdae738 100644 --- a/AsbCloudInfrastructure/Services/DailyReport/DailyReportService.cs +++ b/AsbCloudInfrastructure/Services/DailyReport/DailyReportService.cs @@ -35,24 +35,22 @@ namespace AsbCloudInfrastructure.Services.DailyReport var query = db.DailyReports.Where(r => r.IdWell == idWell); - DateTimeOffset ExtractDate(DateTime dateTime) + DateOnly ExtractDate(DateTime dateTime) { var dateTimeOffset = dateTime.ToUtcDateTimeOffset(well!.Timezone.Hours); - var date = new DateTimeOffset(dateTimeOffset.Year, dateTimeOffset.Month, dateTimeOffset.Day, 0, 0, 0, TimeSpan.Zero); + var date = new DateOnly(dateTimeOffset.Year, dateTimeOffset.Month, dateTimeOffset.Day); return date; } if (begin is not null) { - var beginUTC = ExtractDate(begin.Value); - var beginDateOnly = beginUTC.ExtractDateOnly(); + var beginDateOnly = ExtractDate(begin.Value); query = query.Where(d => d.StartDate >= beginDateOnly); } if (end is not null) { - var endUTC = ExtractDate(end.Value); - var endDateOnly = endUTC.ExtractDateOnly(); + var endDateOnly = ExtractDate(end.Value); query = query.Where(d => d.StartDate <= endDateOnly); } @@ -76,7 +74,7 @@ namespace AsbCloudInfrastructure.Services.DailyReport if (well is null || well.Timezone is null) throw new ArgumentInvalidException("idWell doesn`t exist", nameof(idWell)); - var startDateOnly = startDate.ExtractDateOnly(); + var startDateOnly = DateOnly.FromDateTime(startDate); var entity = await db.DailyReports .FirstOrDefaultAsync(r => r.IdWell == idWell && r.StartDate == startDateOnly, token); @@ -127,7 +125,7 @@ namespace AsbCloudInfrastructure.Services.DailyReport public async Task UpdateBlockAsync(int idWell, DateTime date, Tdto dto, CancellationToken token) { - var startDateOnly = date.ExtractDateOnly(); + var startDateOnly = DateOnly.FromDateTime(date); var entity = await db.DailyReports.FirstOrDefaultAsync(r => r.IdWell == idWell && r.StartDate == startDateOnly, token); if (entity is null)