From 3e7de2db6eef545d1c2838b54440166f860f8744 Mon Sep 17 00:00:00 2001 From: Olga Nemt Date: Thu, 28 Mar 2024 11:00:55 +0500 Subject: [PATCH] =?UTF-8?q?=D0=9F=D1=80=D0=B0=D0=B2=D0=BA=D0=B8=20=D0=BF?= =?UTF-8?q?=D0=BE=20=D1=80=D0=B5=D0=B7=D1=83=D0=BB=D1=8C=D1=82=D0=B0=D1=82?= =?UTF-8?q?=D0=B0=D0=BC=20=D1=82=D0=B5=D1=81=D1=82=D0=B0=20=D1=84=D1=80?= =?UTF-8?q?=D0=BE=D0=BD=D1=82=D0=B5=D0=BD=D0=B4=D0=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Repository/TrajectoryEditableRepository.cs | 2 +- .../Repository/WellOperationRepository.cs | 8 +++++--- AsbCloudInfrastructure/Services/SAUB/MessageService.cs | 3 +-- AsbCloudInfrastructure/Services/SAUB/SetpointsService.cs | 2 +- AsbCloudWebApi/Converters/DateOnlyTypeConverter.cs | 5 ++++- 5 files changed, 12 insertions(+), 8 deletions(-) diff --git a/AsbCloudInfrastructure/Repository/TrajectoryEditableRepository.cs b/AsbCloudInfrastructure/Repository/TrajectoryEditableRepository.cs index 6ac07c52..6aca2284 100644 --- a/AsbCloudInfrastructure/Repository/TrajectoryEditableRepository.cs +++ b/AsbCloudInfrastructure/Repository/TrajectoryEditableRepository.cs @@ -112,7 +112,7 @@ namespace AsbCloudInfrastructure.Repository private static TEntity Convert(Tdto dto) { var entity = dto.Adapt(); - entity.UpdateDate = DateTimeOffset.Now; + entity.UpdateDate = DateTimeOffset.UtcNow; return entity; } } diff --git a/AsbCloudInfrastructure/Repository/WellOperationRepository.cs b/AsbCloudInfrastructure/Repository/WellOperationRepository.cs index a5f12a2b..4e4fe612 100644 --- a/AsbCloudInfrastructure/Repository/WellOperationRepository.cs +++ b/AsbCloudInfrastructure/Repository/WellOperationRepository.cs @@ -139,7 +139,9 @@ public class WellOperationRepository : IWellOperationRepository operation.DepthEnd, }) .First(), - }); + }) + .Where(s => idsWells.Contains(s.IdWell)); + var dbData = await query.ToArrayAsync(token); var sections = dbData.Select( item => new SectionByOperationsDto @@ -163,8 +165,7 @@ public class WellOperationRepository : IWellOperationRepository return sections; }); - var sections = cache.Where(s => idsWells.Contains(s.IdWell)); - return sections; + return cache; } public async Task GetDatesRangeAsync(int idWell, int idType, CancellationToken cancellationToken) @@ -189,6 +190,7 @@ public class WellOperationRepository : IWellOperationRepository /// public DateTimeOffset? FirstOperationDate(int idWell) { + var sections = GetSectionsAsync(new[] { idWell }, CancellationToken.None).Result; var first = sections.FirstOrDefault(section => section.IdType == WellOperation.IdOperationTypeFact) ?? sections.FirstOrDefault(section => section.IdType == WellOperation.IdOperationTypePlan); diff --git a/AsbCloudInfrastructure/Services/SAUB/MessageService.cs b/AsbCloudInfrastructure/Services/SAUB/MessageService.cs index d728536a..17d92d8d 100644 --- a/AsbCloudInfrastructure/Services/SAUB/MessageService.cs +++ b/AsbCloudInfrastructure/Services/SAUB/MessageService.cs @@ -68,8 +68,6 @@ namespace AsbCloudInfrastructure.Services.SAUB query = query.OrderByDescending(m => m.DateTime); - var timezone = telemetryService.GetTimezone(telemetry.Id); - if (request.Begin is not null) { var beginUtc = request.Begin.Value.ToUniversalTime(); @@ -102,6 +100,7 @@ namespace AsbCloudInfrastructure.Services.SAUB var usersDict = users.ToDictionary(x => x.IdUser, x => x); var messagesDtoList = new List(); + var timezone = telemetryService.GetTimezone(telemetry.Id); foreach (var message in messagesList) { diff --git a/AsbCloudInfrastructure/Services/SAUB/SetpointsService.cs b/AsbCloudInfrastructure/Services/SAUB/SetpointsService.cs index 657a99c6..d06e0b4c 100644 --- a/AsbCloudInfrastructure/Services/SAUB/SetpointsService.cs +++ b/AsbCloudInfrastructure/Services/SAUB/SetpointsService.cs @@ -41,7 +41,7 @@ namespace AsbCloudInfrastructure.Services.SAUB public async Task InsertAsync(SetpointsRequestDto setpointsRequest, CancellationToken token) { setpointsRequest.IdState = 1; - setpointsRequest.UploadDate = DateTime.UtcNow; + setpointsRequest.UploadDate = DateTimeOffset.UtcNow; var result = await setpointsRepository.InsertAsync(setpointsRequest, token); return result; } diff --git a/AsbCloudWebApi/Converters/DateOnlyTypeConverter.cs b/AsbCloudWebApi/Converters/DateOnlyTypeConverter.cs index 581a070d..71d8730d 100644 --- a/AsbCloudWebApi/Converters/DateOnlyTypeConverter.cs +++ b/AsbCloudWebApi/Converters/DateOnlyTypeConverter.cs @@ -22,7 +22,10 @@ namespace AsbCloudWebApi.Converters { if (value is string str) { - return DateOnly.Parse(str); + if (DateTimeOffset.TryParse(str, out DateTimeOffset dateTime)) + return DateOnly.FromDateTime(dateTime.Date); + if (DateTime.TryParse(str, out DateTime date)) + return DateOnly.FromDateTime(date); } return base.ConvertFrom(context, culture, value); }