From cc8a4fa200bd7cba0335a77ed1f4257dd8a131c1 Mon Sep 17 00:00:00 2001 From: ngfrolov Date: Tue, 20 Dec 2022 15:58:35 +0500 Subject: [PATCH] Fix WellOperationService.GetOperationsAsync exception by call Min on empty collection --- .../Services/WellOperationService/WellOperationService.cs | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/AsbCloudInfrastructure/Services/WellOperationService/WellOperationService.cs b/AsbCloudInfrastructure/Services/WellOperationService/WellOperationService.cs index 6e0d02d6..3c386136 100644 --- a/AsbCloudInfrastructure/Services/WellOperationService/WellOperationService.cs +++ b/AsbCloudInfrastructure/Services/WellOperationService/WellOperationService.cs @@ -106,7 +106,7 @@ namespace AsbCloudInfrastructure.Services.WellOperationService Take = take, Count = await query.CountAsync(token).ConfigureAwait(false), }; - var dateStart = query.Min(o => o.DateStart); + query = query .OrderBy(e => e.DateStart) .ThenBy(e => e.DepthEnd) @@ -118,8 +118,12 @@ namespace AsbCloudInfrastructure.Services.WellOperationService var entities = await query.Take(take).AsNoTracking() .ToListAsync(token).ConfigureAwait(false); + if (!entities.Any()) + return result; + var nptHours = 0d; + var dateStart = query.Min(o => o.DateStart); foreach (var entity in entities) { var dto = entity.Adapt(); @@ -287,8 +291,6 @@ namespace AsbCloudInfrastructure.Services.WellOperationService .Include(s => s.OperationCategory) .Where(s => s.IdWell == idWell); - var dateStart = query.Min(o => o.DateStart); - if (operationType.HasValue) query = query.Where(e => e.IdType == operationType.Value);