From 65f2f774599e91707f80c102ef65c57362da60bb Mon Sep 17 00:00:00 2001
From: Olga Nemt <on.nemtina@digitaldrilling.ru>
Date: Sat, 29 Jun 2024 20:58:35 +0500
Subject: [PATCH] =?UTF-8?q?=D0=9F=D1=80=D0=BE=D1=82=D0=B8=D0=B2=D0=BE?=
 =?UTF-8?q?=D0=B0=D0=B2=D0=B0=D1=80=D0=B8=D0=B9=D0=BD=D0=BE=D0=B5=20=D0=B2?=
 =?UTF-8?q?=D1=80=D0=B0=D1=89=D0=B5=D0=BD=D0=B8=D0=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ProcessMapPlanFunctionsAnticrashRotationDto.cs |  8 ++++----
 .../ProcessMapPlanFunctionsAnticrashRotation.cs    | 14 +++++++-------
 ...PlanFunctionsAnticrashRotationControllerTest.cs |  8 +-------
 3 files changed, 12 insertions(+), 18 deletions(-)

diff --git a/AsbCloudApp/Data/ProcessMaps/ProcessMapPlanFunctionsAnticrashRotationDto.cs b/AsbCloudApp/Data/ProcessMaps/ProcessMapPlanFunctionsAnticrashRotationDto.cs
index 885c07e1..60bee040 100644
--- a/AsbCloudApp/Data/ProcessMaps/ProcessMapPlanFunctionsAnticrashRotationDto.cs
+++ b/AsbCloudApp/Data/ProcessMaps/ProcessMapPlanFunctionsAnticrashRotationDto.cs
@@ -11,17 +11,17 @@ public class ProcessMapPlanFunctionsAnticrashRotationDto : ProcessMapPlanBaseDto
     /// Минимальные обороты ВСП, об/мин
     /// </summary>
     [Range(0.0, 250.0, ErrorMessage = "Минимальные обороты ВСП, об/мин., должно быть в пределах от 0 до 250")]
-    public double MinRPM { get; set; }
+    public double TopDriveRpmMin { get; set; }
 
     /// <summary>
     /// Минимальный расход для запуска оборотов  ВСП, л/сек
     /// </summary>
-    [Range(1.0, 100.0, ErrorMessage = "Минимальный расход для запуска оборотов  ВСП, л/сек., должно быть в пределах от 0 до 100")]
-    public double MinСonsumptionStartingFlowRate { get; set; }
+    [Range(0.0, 100.0, ErrorMessage = "Минимальный расход для запуска оборотов  ВСП, л/сек., должно быть в пределах от 0 до 100")]
+    public double TopDriveStartMinFlowRate { get; set; }
 
     /// <summary>
     /// Максимально допустимый момент на ВСП при противоаварийном вращении, кН*м
     /// </summary>
     [Range(1.0, 35.0, ErrorMessage = "Максимально допустимый момент на ВСП при противоаварийном вращении, кН*м., должно быть в пределах от 1 до 35")]
-    public double TopDriveTorqueLimitMax { get; set; }
+    public double TopDriveTorqueMax { get; set; }
 }
\ No newline at end of file
diff --git a/AsbCloudDb/Model/ProcessMapPlan/ProcessMapPlanFunctionsAnticrashRotation.cs b/AsbCloudDb/Model/ProcessMapPlan/ProcessMapPlanFunctionsAnticrashRotation.cs
index 427ebab4..b560cf31 100644
--- a/AsbCloudDb/Model/ProcessMapPlan/ProcessMapPlanFunctionsAnticrashRotation.cs
+++ b/AsbCloudDb/Model/ProcessMapPlan/ProcessMapPlanFunctionsAnticrashRotation.cs
@@ -8,20 +8,20 @@ namespace AsbCloudDb.Model.ProcessMaps;
 [Table("t_process_map_plan_functions_anticrash_rotation"), Comment("Противоаварийное вращение")]
 public class ProcessMapPlanFunctionsAnticrashRotation : ProcessMapPlanBase
 {
-    [Column("min_RPM"), Comment("Минимальные обороты ВСП, об/мин")]
+    [Column("top_drive_rpm_min"), Comment("Минимальные обороты ВСП, об/мин")]
     [Range(0.0, 250.0)]
     [Required]
-    public double MinRPM { get; set; }
+    public double TopDriveRpmMin { get; set; }
 
-    [Column("min_consumption_starting_flow_rate"), Comment("Минимальный расход для запуска оборотов  ВСП, л/сек")]
-    [Range(1.0, 100.0)]
+    [Column("top_drive_start_min_flow_rate"), Comment("Минимальный расход для запуска оборотов  ВСП, л/сек")]
+    [Range(0.0, 100.0)]
     [Required]
-    public double MinСonsumptionStartingFlowRate { get; set; }
+    public double TopDriveStartMinFlowRate { get; set; }
 
-    [Column("top_drive_torque_limit_max"), Comment("Максимально допустимый момент на ВСП при противоаварийном вращении, кН*м")]
+    [Column("top_drive_torque_max"), Comment("Максимально допустимый момент на ВСП при противоаварийном вращении, кН*м")]
     [Range(1.0, 35.0)]
     [Required]
-    public double TopDriveTorqueLimitMax { get; set; }
+    public double TopDriveTorqueMax { get; set; }
 
     [ForeignKey(nameof(IdPrevious))]
     public virtual ProcessMapPlanFunctionsAnticrashRotation? Previous { get; set; }
diff --git a/AsbCloudWebApi.IntegrationTests/Controllers/ProcessMapPlan/ProcessMapPlanFunctionsAnticrashRotationControllerTest.cs b/AsbCloudWebApi.IntegrationTests/Controllers/ProcessMapPlan/ProcessMapPlanFunctionsAnticrashRotationControllerTest.cs
index 5b42fb6e..23c282a1 100644
--- a/AsbCloudWebApi.IntegrationTests/Controllers/ProcessMapPlan/ProcessMapPlanFunctionsAnticrashRotationControllerTest.cs
+++ b/AsbCloudWebApi.IntegrationTests/Controllers/ProcessMapPlan/ProcessMapPlanFunctionsAnticrashRotationControllerTest.cs
@@ -28,9 +28,6 @@ public class ProcessMapPlanFunctionsAnticrashRotationControllerTest :
         DepthEnd = 2,
         Id = 0,
         IdWellSectionType = 1,
-        MinRPM = 1,
-        MinСonsumptionStartingFlowRate = 1,
-        TopDriveTorqueLimitMax = 1
     };
 
     private readonly ProcessMapPlanFunctionsAnticrashRotation entity = new ProcessMapPlanFunctionsAnticrashRotation()
@@ -42,10 +39,7 @@ public class ProcessMapPlanFunctionsAnticrashRotationControllerTest :
         IdWellSectionType = 1,
         IdAuthor = 1,
         IdEditor = 1,
-        Creation = DateTimeOffset.UtcNow,
-        MinRPM = 1,
-        MinСonsumptionStartingFlowRate = 1,
-        TopDriveTorqueLimitMax = 1
+        Creation = DateTimeOffset.UtcNow
     };
 
     [Fact]