From 2e27211505078666ef06279f0a071424f05b8d5d Mon Sep 17 00:00:00 2001
From: Olga Nemt <on.nemtina@digitaldrilling.ru>
Date: Thu, 16 May 2024 13:19:11 +0500
Subject: [PATCH] =?UTF-8?q?=D0=9F=D1=80=D0=B0=D0=B2=D0=BA=D0=B0=20=D1=84?=
 =?UTF-8?q?=D0=B8=D0=BB=D1=8C=D1=82=D1=80=D0=B0=D1=86=D0=B8=D0=B8=20proces?=
 =?UTF-8?q?sMapPlanDrilling?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Services/WellInfoService.cs               | 20 ++++++++++++++-----
 1 file changed, 15 insertions(+), 5 deletions(-)

diff --git a/AsbCloudInfrastructure/Services/WellInfoService.cs b/AsbCloudInfrastructure/Services/WellInfoService.cs
index 5d5f3bf3..9c407490 100644
--- a/AsbCloudInfrastructure/Services/WellInfoService.cs
+++ b/AsbCloudInfrastructure/Services/WellInfoService.cs
@@ -43,7 +43,10 @@ public class WellInfoService
 
             var wellsIds = activeWells.Select(w => w.Id);
 
-            var processMapPlanWellDrillingRequests = wellsIds.Select(id => new ProcessMapPlanBaseRequestWithWell(id));
+            var processMapPlanWellDrillingRequests = wellsIds.Select(id => new ProcessMapPlanBaseRequestWithWell(id)
+            {
+                Moment = DateTimeOffset.UtcNow.AddDays(1)
+            });
             var processMapPlanWellDrillings = new List<ProcessMapPlanDrillingDto>();
             foreach (var processMapPlanWellDrillingRequest in processMapPlanWellDrillingRequests)
             {
@@ -97,14 +100,21 @@ public class WellInfoService
                 int? idSection = wellLastFactSection?.Id;
                 ProcessMapPlanDrillingDto? processMapPlanWellDrilling = null;
 
-                if (idSection.HasValue)
+                if(idSection.HasValue && currentDepth.HasValue)
                 {
-                    processMapPlanWellDrilling = wellProcessMaps.FirstOrDefault(p => p.IdWellSectionType == idSection);
-                }
-                else if (currentDepth.HasValue)
+                    processMapPlanWellDrilling = wellProcessMaps
+                        .Where(p => p.IdWellSectionType == idSection)
+                        .Where(p => p.DepthStart <= currentDepth.Value && p.DepthEnd >= currentDepth.Value)
+                        .FirstOrDefault();
+                }               
+                else if(currentDepth.HasValue)
                 {
                     processMapPlanWellDrilling = wellProcessMaps.FirstOrDefault(p => p.DepthStart <= currentDepth.Value && p.DepthEnd >= currentDepth.Value);
                 }
+                else if (idSection.HasValue)
+                {
+                    processMapPlanWellDrilling = wellProcessMaps.FirstOrDefault(p => p.IdWellSectionType == idSection);
+                }
 
                 double? planTotalDepth = null;
                 planTotalDepth = wellDepthByProcessMap.FirstOrDefault(p => p.Id == well.Id)?.DepthEnd;