From 65cccbfba0e211b51e15797867c488b6f1c688f1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=A1=D1=82=D0=B5=D0=BF=D0=B0=D0=BD=D0=BE=D0=B2=20=D0=94?=
 =?UTF-8?q?=D0=BC=D0=B8=D1=82=D1=80=D0=B8=D0=B9?= <falldimka007@gmail.com>
Date: Fri, 15 Dec 2023 11:57:01 +0500
Subject: [PATCH] =?UTF-8?q?=D0=98=D1=81=D0=BF=D1=80=D0=B0=D0=B2=D0=BB?=
 =?UTF-8?q?=D0=B5=D0=BD=D0=B8=D1=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

1. Поправлен запрос в репозитории
2. Поправлен DbConxtext, удалено лишнее поле
3. Поправлена валидация. у ValidationResult добавлено название параметров
---
 AsbCloudDb/Model/AsbCloudDbContext.cs                           | 1 -
 AsbCloudInfrastructure/Repository/WellSectionPlanRepository.cs  | 1 +
 .../Services/ProcessMaps/ProcessMapPlanService.cs               | 2 +-
 3 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/AsbCloudDb/Model/AsbCloudDbContext.cs b/AsbCloudDb/Model/AsbCloudDbContext.cs
index 4b6e339f..9a8b6a05 100644
--- a/AsbCloudDb/Model/AsbCloudDbContext.cs
+++ b/AsbCloudDb/Model/AsbCloudDbContext.cs
@@ -89,7 +89,6 @@ namespace AsbCloudDb.Model
         public DbSet<Manual> Manuals => Set<Manual>();
         public DbSet<ManualDirectory> ManualDirectories => Set<ManualDirectory>();
         public DbSet<Contact> Contacts => Set<Contact>();
-        public DbSet<WellSectionPlan> WellSectionPlans => Set<WellSectionPlan>();
 
         public DbSet<DrillTest> DrillTests => Set<DrillTest>();
         public AsbCloudDbContext() : base()
diff --git a/AsbCloudInfrastructure/Repository/WellSectionPlanRepository.cs b/AsbCloudInfrastructure/Repository/WellSectionPlanRepository.cs
index f50cd7a0..c9963838 100644
--- a/AsbCloudInfrastructure/Repository/WellSectionPlanRepository.cs
+++ b/AsbCloudInfrastructure/Repository/WellSectionPlanRepository.cs
@@ -64,6 +64,7 @@ public class WellSectionPlanRepository : CrudWellRelatedRepositoryBase<WellSecti
 	{
 		var query = from wellSectionType in dbContext.WellSectionTypes
 			join wellSectionPlan in dbContext.WellSectionsPlan on wellSectionType.Id equals wellSectionPlan.IdSectionType
+			where wellSectionPlan.IdWell == idWell
 			orderby wellSectionType.Order
 			select wellSectionType;
 
diff --git a/AsbCloudInfrastructure/Services/ProcessMaps/ProcessMapPlanService.cs b/AsbCloudInfrastructure/Services/ProcessMaps/ProcessMapPlanService.cs
index e4044310..2737e899 100644
--- a/AsbCloudInfrastructure/Services/ProcessMaps/ProcessMapPlanService.cs
+++ b/AsbCloudInfrastructure/Services/ProcessMaps/ProcessMapPlanService.cs
@@ -56,7 +56,7 @@ public class ProcessMapPlanService<T> : IProcessMapPlanService<T>
 			{
 				new($"Конструкция секции: {wellSectionType?.Caption}; " +
 					$"Интервал бурения от {processMapPlan.DepthStart} до {processMapPlan.DepthEnd} не совпадает с данными указанными на странице " +
-					$"Конструкция скважины / План")
+					$"Конструкция скважины / План", new[] { nameof(processMapPlan.DepthStart), nameof(processMapPlan.DepthEnd) })
 			};
 
 			return validationResult;