Правка автотестов

AsbCloudDb/Model/ProcessMapPlan/Operations/ProcessMapPlanRotor.cs

@@ -16,7 +16,7 @@ public class ProcessMapPlanRotor : ProcessMapPlanBase
     [Column("pressure_max"), Comment("Максимально допустимое давление, атм")]
     [Range(0.0, 400.0)]
     [Required]
-    public double PressureLimitMax { get; set; }
+    public double PressureMax { get; set; }
 
     [Column("differential_pressure"), Comment("Перепад давления, атм. Уставка")]
     [Range(0.0, 60.0)]

AsbCloudWebApi.IntegrationTests/Controllers/ProcessMapPlan/Functions/ProcessMapPlanAntiCrashRotationControllerTest.cs

@@ -5,7 +5,7 @@ using AsbCloudWebApi.IntegrationTests.Controllers.ProcessMapPlan;
 using Microsoft.EntityFrameworkCore;
 using Xunit;
 
-namespace AsbCloudWebApi.Controllers.ProcessMaps;
+namespace AsbCloudWebApi.IntegrationTests.Controllers.ProcessMapPlan.Functions;
 
 /// <summary>
 /// РТК план противоаварийное вращение
@@ -13,7 +13,7 @@ namespace AsbCloudWebApi.Controllers.ProcessMaps;
 public class ProcessMapPlanAntiCrashRotationControllerTest :
    ProcessMapPlanBaseControllerTest<ProcessMapPlanAntiCrashRotation, ProcessMapPlanAntiCrashRotationDto>
 {
-    public ProcessMapPlanAntiCrashRotationControllerTest(WebAppFactoryFixture factory) : base(factory, "ProcessMapPlanFunctionsAnticrashRotation")
+    public ProcessMapPlanAntiCrashRotationControllerTest(WebAppFactoryFixture factory) : base(factory, "ProcessMapPlanAntiCrashRotation")
     {
     }
     private readonly ProcessMapPlanAntiCrashRotationDto dto = new ProcessMapPlanAntiCrashRotationDto()
@@ -23,6 +23,10 @@ public class ProcessMapPlanAntiCrashRotationControllerTest :
         DepthEnd = 2,
         Id = 0,
         IdWellSectionType = 1,
+        Note = "1",
+        TopDriveRpmMin = 1,
+        TopDriveStartMinFlowRate = 1,
+        TopDriveTorqueMax = 1,
     };
 
     private readonly ProcessMapPlanAntiCrashRotation entity = new ProcessMapPlanAntiCrashRotation()
@@ -34,7 +38,11 @@ public class ProcessMapPlanAntiCrashRotationControllerTest :
         IdWellSectionType = 1,
         IdAuthor = 1,
         IdEditor = 1,
-        Creation = DateTimeOffset.UtcNow
+        Creation = DateTimeOffset.UtcNow,
+        Note = "1",
+        TopDriveRpmMin = 1,
+        TopDriveStartMinFlowRate = 1,
+        TopDriveTorqueMax = 1
     };
 
     [Fact]

AsbCloudWebApi.IntegrationTests/Controllers/ProcessMapPlan/Functions/ProcessMapPlanAutoHoldTFControllerTest.cs

@@ -10,7 +10,7 @@ using AsbCloudWebApi.IntegrationTests.Controllers.ProcessMapPlan;
 using Microsoft.EntityFrameworkCore;
 using Xunit;
 
-namespace AsbCloudWebApi.Controllers.ProcessMaps;
+namespace AsbCloudWebApi.IntegrationTests.Controllers.ProcessMapPlan.Functions;
 
 /// <summary>
 /// РТК план автоудержание
@@ -18,7 +18,7 @@ namespace AsbCloudWebApi.Controllers.ProcessMaps;
 public class ProcessMapPlanAutoHoldTFControllerTest :
     ProcessMapPlanBaseControllerTest<ProcessMapPlanAutoHoldTF, ProcessMapPlanAutoHoldTFDto>
 {
-    public ProcessMapPlanAutoHoldTFControllerTest(WebAppFactoryFixture factory) : base(factory, "ProcessMapPlanFunctionsAutoHold")
+    public ProcessMapPlanAutoHoldTFControllerTest(WebAppFactoryFixture factory) : base(factory, "ProcessMapPlanAutoHoldTF")
     {
     }
     private readonly ProcessMapPlanAutoHoldTFDto dto = new ProcessMapPlanAutoHoldTFDto()

AsbCloudWebApi.IntegrationTests/Controllers/ProcessMapPlan/Functions/ProcessMapPlanDamperControllerTest.cs

@@ -10,7 +10,7 @@ using Xunit;
 using AsbCloudDb.Model.ProcessMapPlan.Functions;
 using AsbCloudApp.Data.ProcessMaps.Functions;
 
-namespace AsbCloudWebApi.Controllers.ProcessMaps;
+namespace AsbCloudWebApi.IntegrationTests.Controllers.ProcessMapPlan.Functions;
 
 /// <summary>
 /// РТК план демпфер
@@ -18,7 +18,7 @@ namespace AsbCloudWebApi.Controllers.ProcessMaps;
 public class ProcessMapPlanDamperControllerTest :
       ProcessMapPlanBaseControllerTest<ProcessMapPlanDamper, ProcessMapPlanDamperDto>
 {
-    public ProcessMapPlanDamperControllerTest(WebAppFactoryFixture factory) : base(factory, "ProcessMapPlanFunctionsDamper")
+    public ProcessMapPlanDamperControllerTest(WebAppFactoryFixture factory) : base(factory, "ProcessMapPlanDamper")
     {
     }
     private readonly ProcessMapPlanDamperDto dto = new ProcessMapPlanDamperDto()
@@ -29,7 +29,7 @@ public class ProcessMapPlanDamperControllerTest :
         Id = 0,
         IdWellSectionType = 1,
         Note = "1",
-        StickSlip = 1
+        StickSlip = 1,
     };
 
     private readonly ProcessMapPlanDamper entity = new ProcessMapPlanDamper()

AsbCloudWebApi.IntegrationTests/Controllers/ProcessMapPlan/Functions/ProcessMapPlanDrillTestControllerTest.cs

@@ -10,7 +10,7 @@ using Xunit;
 using AsbCloudDb.Model.ProcessMapPlan.Functions;
 using AsbCloudApp.Data.ProcessMaps.Functions;
 
-namespace AsbCloudWebApi.Controllers.ProcessMaps;
+namespace AsbCloudWebApi.IntegrationTests.Controllers.ProcessMapPlan.Functions;
 
 /// <summary>
 /// РТК план дрилтест
@@ -18,7 +18,7 @@ namespace AsbCloudWebApi.Controllers.ProcessMaps;
 public class ProcessMapPlanDrillTestControllerTest :
       ProcessMapPlanBaseControllerTest<ProcessMapPlanDrillTest, ProcessMapPlanDrillTestDto>
 {
-    public ProcessMapPlanDrillTestControllerTest(WebAppFactoryFixture factory) : base(factory, "ProcessMapPlanFunctionsDrillTest")
+    public ProcessMapPlanDrillTestControllerTest(WebAppFactoryFixture factory) : base(factory, "ProcessMapPlanDrillTest")
     {
     }
     private readonly ProcessMapPlanDrillTestDto dto = new ProcessMapPlanDrillTestDto()
@@ -30,7 +30,10 @@ public class ProcessMapPlanDrillTestControllerTest :
         IdWellSectionType = 1,
         LengthStep = 1,
         Note = "1",
-        WeightOnBitMin = 1
+        WeightOnBitMin = 1,
+        RpmMin = 1,
+        RpmStepsCount = 1,
+        WeightOnBitStepsCount = 1,
     };
 
     private readonly ProcessMapPlanDrillTest entity = new ProcessMapPlanDrillTest()
@@ -45,7 +48,10 @@ public class ProcessMapPlanDrillTestControllerTest :
         Creation = DateTimeOffset.UtcNow,
         LengthStep = 1,
         Note = "1",
-        WeightOnBitMin = 1
+        WeightOnBitMin = 1,
+        RpmMin = 1,
+        RpmStepsCount = 1,
+        WeightOnBitStepsCount = 1
     };
 
     [Fact]

AsbCloudWebApi.IntegrationTests/Controllers/ProcessMapPlan/Functions/ProcessMapPlanOscillationControllerTest.cs

@@ -10,7 +10,7 @@ using Xunit;
 using AsbCloudDb.Model.ProcessMapPlan.Functions;
 using AsbCloudApp.Data.ProcessMaps.Functions;
 
-namespace AsbCloudWebApi.Controllers.ProcessMaps;
+namespace AsbCloudWebApi.IntegrationTests.Controllers.ProcessMapPlan.Functions;
 
 /// <summary>
 /// РТК план осцилляция
@@ -18,7 +18,7 @@ namespace AsbCloudWebApi.Controllers.ProcessMaps;
 public class ProcessMapPlanOscillationControllerTest :
       ProcessMapPlanBaseControllerTest<ProcessMapPlanOscillation, ProcessMapPlanOscillationDto>
 {
-    public ProcessMapPlanOscillationControllerTest(WebAppFactoryFixture factory) : base(factory, "ProcessMapPlanFunctionsOscillation")
+    public ProcessMapPlanOscillationControllerTest(WebAppFactoryFixture factory) : base(factory, "ProcessMapPlanOscillation")
     {
     }
     private readonly ProcessMapPlanOscillationDto dto = new ProcessMapPlanOscillationDto()
@@ -30,7 +30,11 @@ public class ProcessMapPlanOscillationControllerTest :
         IdWellSectionType = 1,
         Mode = 1,
         Note = "1",
-        OptimalOscillationAngle = 1
+        OptimalOscillationAngle = 1,
+        RpmLeft = 1,
+        RpmRight = 2,
+        TorqueMaxLeft = 2,
+        TorqueMaxRight = 3
     };
 
     private readonly ProcessMapPlanOscillation entity = new ProcessMapPlanOscillation()
@@ -45,7 +49,11 @@ public class ProcessMapPlanOscillationControllerTest :
         Creation = DateTimeOffset.UtcNow,
         Mode = 1,
         Note = "1",
-        OptimalOscillationAngle = 1
+        OptimalOscillationAngle = 1,
+        RpmLeft = 1,
+        RpmRight = 2,
+        TorqueMaxLeft = 2,
+        TorqueMaxRight = 3
     };
 
     [Fact]

AsbCloudWebApi.IntegrationTests/Controllers/ProcessMapPlan/Functions/ProcessMapPlanShockTestControllerTest.cs

@@ -10,7 +10,7 @@ using Xunit;
 using AsbCloudDb.Model.ProcessMapPlan.Functions;
 using AsbCloudApp.Data.ProcessMaps.Functions;
 
-namespace AsbCloudWebApi.Controllers.ProcessMaps;
+namespace AsbCloudWebApi.IntegrationTests.Controllers.ProcessMapPlan.Functions;
 
 /// <summary>
 /// РТК план shock test
@@ -18,7 +18,7 @@ namespace AsbCloudWebApi.Controllers.ProcessMaps;
 public class ProcessMapPlanShockTestControllerTest :
       ProcessMapPlanBaseControllerTest<ProcessMapPlanShockTest, ProcessMapPlanShockTestDto>
 {
-    public ProcessMapPlanShockTestControllerTest(WebAppFactoryFixture factory) : base(factory, "ProcessMapPlanFunctionsShockTest")
+    public ProcessMapPlanShockTestControllerTest(WebAppFactoryFixture factory) : base(factory, "ProcessMapPlanShockTest")
     {
     }
     private readonly ProcessMapPlanShockTestDto dto = new ProcessMapPlanShockTestDto()
@@ -33,7 +33,8 @@ public class ProcessMapPlanShockTestControllerTest :
         Note = "1",
         StickSlip = 1,
         WeightOnBitMin = 1,
-        Whirl = 1
+        Whirl = 1,
+        RpmMin = 1,
     };
 
     private readonly ProcessMapPlanShockTest entity = new ProcessMapPlanShockTest()
@@ -51,7 +52,8 @@ public class ProcessMapPlanShockTestControllerTest :
         Note = "1",
         StickSlip = 1,
         WeightOnBitMin = 1,
-        Whirl = 1
+        Whirl = 1,
+        RpmMin = 1,
     };
 
     [Fact]

AsbCloudWebApi.IntegrationTests/Controllers/ProcessMapPlan/Functions/ProcessMapPlanStaticMeasurementOutputControllerTest.cs

@@ -10,7 +10,7 @@ using Xunit;
 using AsbCloudDb.Model.ProcessMapPlan.Functions;
 using AsbCloudApp.Data.ProcessMaps.Functions;
 
-namespace AsbCloudWebApi.Controllers.ProcessMaps;
+namespace AsbCloudWebApi.IntegrationTests.Controllers.ProcessMapPlan.Functions;
 
 /// <summary>
 /// РТК план выход статического замера
@@ -18,7 +18,7 @@ namespace AsbCloudWebApi.Controllers.ProcessMaps;
 public class ProcessMapPlanStaticMeasurementOutputControllerTest :
       ProcessMapPlanBaseControllerTest<ProcessMapPlanStaticMeasurementOutput, ProcessMapPlanStaticMeasurementOutputDto>
 {
-    public ProcessMapPlanStaticMeasurementOutputControllerTest(WebAppFactoryFixture factory) : base(factory, "ProcessMapPlanFunctionsStaticMeasure")
+    public ProcessMapPlanStaticMeasurementOutputControllerTest(WebAppFactoryFixture factory) : base(factory, "ProcessMapPlanStaticMeasurementOutput")
     {
     }
     private readonly ProcessMapPlanStaticMeasurementOutputDto dto = new ProcessMapPlanStaticMeasurementOutputDto()
@@ -29,6 +29,7 @@ public class ProcessMapPlanStaticMeasurementOutputControllerTest :
         Id = 0,
         IdWellSectionType = 1,
         SignalWaitingTime = 1,
+        Note = "1"
     };
 
     private readonly ProcessMapPlanStaticMeasurementOutput entity = new ProcessMapPlanStaticMeasurementOutput()
@@ -42,6 +43,7 @@ public class ProcessMapPlanStaticMeasurementOutputControllerTest :
         IdEditor = 1,
         Creation = DateTimeOffset.UtcNow,
         SignalWaitingTime = 1,
+        Note = "1"
     };
 
     [Fact]

AsbCloudWebApi.IntegrationTests/Controllers/ProcessMapPlan/Functions/ProcessMapPlanUpdatingNoloadParametersControllerTest.cs

@@ -10,7 +10,7 @@ using Xunit;
 using AsbCloudDb.Model.ProcessMapPlan.Functions;
 using AsbCloudApp.Data.ProcessMaps.Functions;
 
-namespace AsbCloudWebApi.Controllers.ProcessMaps;
+namespace AsbCloudWebApi.IntegrationTests.Controllers.ProcessMapPlan.Functions;
 
 /// <summary>
 /// РТК план обновление холостого хода 
@@ -18,7 +18,7 @@ namespace AsbCloudWebApi.Controllers.ProcessMaps;
 public class ProcessMapPlanUpdatingNoloadParametersControllerTest :
       ProcessMapPlanBaseControllerTest<ProcessMapPlanUpdatingNoloadParameters, ProcessMapPlanUpdatingNoloadParametersDto>
 {
-    public ProcessMapPlanUpdatingNoloadParametersControllerTest(WebAppFactoryFixture factory) : base(factory, "ProcessMapPlanFunctionsUpgradeNoload")
+    public ProcessMapPlanUpdatingNoloadParametersControllerTest(WebAppFactoryFixture factory) : base(factory, "ProcessMapPlanUpdatingNoloadParameters")
     {
     }
     private readonly ProcessMapPlanUpdatingNoloadParametersDto dto = new ProcessMapPlanUpdatingNoloadParametersDto()
@@ -29,7 +29,7 @@ public class ProcessMapPlanUpdatingNoloadParametersControllerTest :
         Id = 0,
         IdWellSectionType = 1,
         IdDeclineSocketColumn = true,
-        Note = "1"
+        Note = "1",
     };
 
     private readonly ProcessMapPlanUpdatingNoloadParameters entity = new ProcessMapPlanUpdatingNoloadParameters()

AsbCloudWebApi.IntegrationTests/Controllers/ProcessMapPlan/Operations/ProcessMapPlanLoadCapacityControllerTest.cs

@@ -18,7 +18,7 @@ namespace AsbCloudWebApi.IntegrationTests.Controllers.ProcessMapPlan.Operations;
 public class ProcessMapPlanLoadCapacityControllerTest :
       ProcessMapPlanBaseControllerTest<ProcessMapPlanLoadCapacity, ProcessMapPlanLoadCapacityDto>
 {
-    public ProcessMapPlanLoadCapacityControllerTest(WebAppFactoryFixture factory) : base(factory, "ProcessMapPlanOperationLoadCapacity")
+    public ProcessMapPlanLoadCapacityControllerTest(WebAppFactoryFixture factory) : base(factory, "ProcessMapPlanLoadCapacity")
     {
     }
     private readonly ProcessMapPlanLoadCapacityDto dto = new ProcessMapPlanLoadCapacityDto()

AsbCloudWebApi.IntegrationTests/Controllers/ProcessMapPlan/Operations/ProcessMapPlanOscillationAnglesControllerTest.cs

@@ -10,7 +10,7 @@ using Xunit;
 using AsbCloudDb.Model.ProcessMapPlan.Operations;
 using AsbCloudApp.Data.ProcessMaps.Operations;
 
-namespace AsbCloudWebApi.Controllers.ProcessMaps;
+namespace AsbCloudWebApi.IntegrationTests.Controllers.ProcessMapPlan.Operations;
 
 /// <summary>
 /// РТК план определения углов осцилляции
@@ -28,6 +28,11 @@ public class ProcessMapPlanOscillationAnglesControllerTest :
         DepthEnd = 2,
         Id = 0,
         IdWellSectionType = 1,
+        Note = "1",
+        Rpm = 1,
+        RpmMax = 2,
+        TopDriveTorque = 2,
+        TopDriveTorqueMax = 3,
     };
 
     private readonly ProcessMapPlanOscillationAngles entity = new ProcessMapPlanOscillationAngles()
@@ -40,6 +45,11 @@ public class ProcessMapPlanOscillationAnglesControllerTest :
         IdAuthor = 1,
         IdEditor = 1,
         Creation = DateTimeOffset.UtcNow,
+        Note = "1",
+        Rpm = 1,
+        RpmMax = 2,
+        TopDriveTorque = 2,
+        TopDriveTorqueMax = 3,
     };
 
     [Fact]

AsbCloudWebApi.IntegrationTests/Controllers/ProcessMapPlan/Operations/ProcessMapPlanPositioningOffTheBottomControllerTest.cs

@@ -18,7 +18,7 @@ namespace AsbCloudWebApi.IntegrationTests.Controllers.ProcessMapPlan.Operations;
 public class ProcessMapPlanPositioningOffTheBottomControllerTest :
       ProcessMapPlanBaseControllerTest<ProcessMapPlanPositioningOffTheBottom, ProcessMapPlanPositioningOffTheBottomDto>
 {
-    public ProcessMapPlanPositioningOffTheBottomControllerTest(WebAppFactoryFixture factory) : base(factory, "ProcessMapPlanOperationPositioningOffTheBottom")
+    public ProcessMapPlanPositioningOffTheBottomControllerTest(WebAppFactoryFixture factory) : base(factory, "ProcessMapPlanPositioningOffTheBottom")
     {
     }
     private readonly ProcessMapPlanPositioningOffTheBottomDto dto = new ProcessMapPlanPositioningOffTheBottomDto()
@@ -28,7 +28,19 @@ public class ProcessMapPlanPositioningOffTheBottomControllerTest :
         DepthEnd = 2,
         Id = 0,
         IdWellSectionType = 1,
-        StopOffTheBottom = 1
+        StopOffTheBottom = 1,
+        DifferentialPressure = 1,
+        FlowRateDown = 1,
+        FlowRateUp = 1,
+        Note = "1",
+        RopDown = 1,
+        RopUp = 1,
+        PressureMax = 1,
+        RpmDown = 1,
+        RpmUp = 1,
+        SlackingOff = 1,
+        Tight = 1,
+        TorqueMax = 1
     };
 
     private readonly ProcessMapPlanPositioningOffTheBottom entity = new ProcessMapPlanPositioningOffTheBottom()
@@ -41,7 +53,19 @@ public class ProcessMapPlanPositioningOffTheBottomControllerTest :
         IdAuthor = 1,
         IdEditor = 1,
         Creation = DateTimeOffset.UtcNow,
-        StopOffTheBottom = 1
+        StopOffTheBottom = 1,
+        DifferentialPressure = 1,
+        FlowRateDown = 1,
+        FlowRateUp = 1,
+        Note = "1",
+        RopDown = 1,
+        RopUp = 1,
+        PressureMax = 1,
+        RpmDown = 1,
+        RpmUp = 1,
+        SlackingOff = 1,
+        Tight = 1,
+        TorqueMax = 1
     };
 
     [Fact]

AsbCloudWebApi.IntegrationTests/Controllers/ProcessMapPlan/Operations/ProcessMapPlanReamingRotorControllerTest.cs

@@ -18,7 +18,7 @@ namespace AsbCloudWebApi.IntegrationTests.Controllers.ProcessMapPlan.Operations;
 public class ProcessMapPlanReamingRotorControllerTest :
       ProcessMapPlanBaseControllerTest<ProcessMapPlanReamingRotor, ProcessMapPlanReamingRotorDto>
 {
-    public ProcessMapPlanReamingRotorControllerTest(WebAppFactoryFixture factory) : base(factory, "ProcessMapPlanOperationReamingRotor")
+    public ProcessMapPlanReamingRotorControllerTest(WebAppFactoryFixture factory) : base(factory, "ProcessMapPlanReamingRotor")
     {
     }
     private readonly ProcessMapPlanReamingRotorDto dto = new ProcessMapPlanReamingRotorDto()
@@ -42,6 +42,25 @@ public class ProcessMapPlanReamingRotorControllerTest :
         Reaming2StopPointOffBottom = 1,
         Reaming3Interval = 2,
         Reaming3StopPointOffBottom = 4,
+        Reaming3RopDown = 5,
+        TorqueMax = 6,
+        Tight = 6,
+        SlackingOff = 7,
+        PressureMax = 8,
+        Reaming1RepetitionsCount = 9,
+        Reaming1RopDown = 10,
+        Reaming1RopUp = 11,
+        Reaming1RpmDown = 12,
+        Reaming1RpmUp = 13,
+        Reaming2RpmDown = 14,
+        Reaming2RepetitionsCount = 15,
+        Reaming2RopDown = 16,
+        Reaming2RopUp = 17,
+        Reaming3RpmDown = 18,
+        Reaming3RpmUp = 19,
+        Reaming2RpmUp = 20,
+        Reaming3RepetitionsCount = 20,
+        Reaming3RopUp = 21,
     };
 
     private readonly ProcessMapPlanReamingRotor entity = new ProcessMapPlanReamingRotor()
@@ -68,6 +87,25 @@ public class ProcessMapPlanReamingRotorControllerTest :
         Reaming2StopPointOffBottom = 1,
         Reaming3Interval = 2,
         Reaming3StopPointOffBottom = 4,
+        Reaming3RopDown = 5,
+        TorqueMax = 6,
+        Tight = 6,
+        SlackingOff = 7,
+        PressureMax = 8,
+        Reaming1RepetitionsCount = 9,
+        Reaming1RopDown = 10,
+        Reaming1RopUp = 11,
+        Reaming1RpmDown = 12,
+        Reaming1RpmUp = 13,
+        Reaming2RpmDown = 14,
+        Reaming2RepetitionsCount = 15,
+        Reaming2RopDown = 16,
+        Reaming2RopUp = 17,
+        Reaming3RpmDown = 18,
+        Reaming3RpmUp = 19,
+        Reaming2RpmUp = 20,
+        Reaming3RepetitionsCount = 20,
+        Reaming3RopUp = 21,
     };
 
     [Fact]

AsbCloudWebApi.IntegrationTests/Controllers/ProcessMapPlan/Operations/ProcessMapPlanReamingSlideControllerTest.cs

@@ -18,7 +18,7 @@ namespace AsbCloudWebApi.IntegrationTests.Controllers.ProcessMapPlan.Operations;
 public class ProcessMapPlanReamingSlideControllerTest :
       ProcessMapPlanBaseControllerTest<ProcessMapPlanReamingSlide, ProcessMapPlanReamingSlideDto>
 {
-    public ProcessMapPlanReamingSlideControllerTest(WebAppFactoryFixture factory) : base(factory, "ProcessMapPlanOperationReamingSlide")
+    public ProcessMapPlanReamingSlideControllerTest(WebAppFactoryFixture factory) : base(factory, "ProcessMapPlanReamingSlide")
     {
     }
     private readonly ProcessMapPlanReamingSlideDto dto = new ProcessMapPlanReamingSlideDto()

AsbCloudWebApi.IntegrationTests/Controllers/ProcessMapPlan/Operations/ProcessMapPlanRecordingStaticMeasurementControllerTest.cs

@@ -18,7 +18,7 @@ namespace AsbCloudWebApi.IntegrationTests.Controllers.ProcessMapPlan.Operations;
 public class ProcessMapPlanRecordingStaticMeasurementControllerTest :
       ProcessMapPlanBaseControllerTest<ProcessMapPlanRecordingStaticMeasurement, ProcessMapPlanRecordingStaticMeasurementDto>
 {
-    public ProcessMapPlanRecordingStaticMeasurementControllerTest(WebAppFactoryFixture factory) : base(factory, "ProcessMapPlanSurvey")
+    public ProcessMapPlanRecordingStaticMeasurementControllerTest(WebAppFactoryFixture factory) : base(factory, "ProcessMapPlanRecordingStaticMeasurement")
     {
     }
     private readonly ProcessMapPlanRecordingStaticMeasurementDto dto = new ProcessMapPlanRecordingStaticMeasurementDto()
@@ -29,6 +29,7 @@ public class ProcessMapPlanRecordingStaticMeasurementControllerTest :
         Id = 0,
         IdWellSectionType = 1,
         MeasurementRecordingTime = 1,
+        Note = "1"
     };
 
     private readonly ProcessMapPlanRecordingStaticMeasurement entity = new ProcessMapPlanRecordingStaticMeasurement()
@@ -42,6 +43,7 @@ public class ProcessMapPlanRecordingStaticMeasurementControllerTest :
         IdEditor = 1,
         Creation = DateTimeOffset.UtcNow,
         MeasurementRecordingTime = 1,
+        Note = "1"
     };
 
     [Fact]

AsbCloudWebApi.IntegrationTests/Controllers/ProcessMapPlan/Operations/ProcessMapPlanRotorControllerTest.cs

@@ -5,7 +5,7 @@ using Mapster;
 using Microsoft.EntityFrameworkCore;
 using Xunit;
 
-namespace AsbCloudWebApi.IntegrationTests.Controllers.ProcessMapPlan;
+namespace AsbCloudWebApi.IntegrationTests.Controllers.ProcessMapPlan.Operations;
 public class ProcessMapPlanRotorControllerTest : ProcessMapPlanBaseControllerTest<ProcessMapPlanRotor, ProcessMapPlanRotorDto>
 {
     private readonly ProcessMapPlanRotorDto dto = new ProcessMapPlanRotorDto()
@@ -42,7 +42,7 @@ public class ProcessMapPlanRotorControllerTest : ProcessMapPlanBaseControllerTes
         Id = 0,
         IdWellSectionType = 1,
         Note = "1",
-        PressureLimitMax = 2,
+        PressureMax = 2,
         Rpm = 3,
         RpmMax = 4,
         RopMax = 5,

AsbCloudWebApi.IntegrationTests/Controllers/ProcessMapPlan/Operations/ProcessMapPlanRotorRpmAccelerationControllerTest.cs

@@ -1,14 +1,7 @@
-using AsbCloudApp.Repositories;
+using AsbCloudApp.Data.ProcessMaps.Operations;
-using AsbCloudApp.Requests;
+using AsbCloudDb.Model.ProcessMapPlan.Operations;
-using AsbCloudApp.Services;
-using AsbCloudInfrastructure.Services.ProcessMapPlan.Export;
-using AsbCloudInfrastructure.Services.ProcessMapPlan.Parser;
-using AsbCloudWebApi.IntegrationTests.Controllers.ProcessMapPlan;
-using AsbCloudWebApi.IntegrationTests;
 using Microsoft.EntityFrameworkCore;
 using Xunit;
-using AsbCloudDb.Model.ProcessMapPlan.Operations;
-using AsbCloudApp.Data.ProcessMaps.Operations;
 
 namespace AsbCloudWebApi.IntegrationTests.Controllers.ProcessMapPlan.Operations;
 
@@ -18,7 +11,7 @@ namespace AsbCloudWebApi.IntegrationTests.Controllers.ProcessMapPlan.Operations;
 public class ProcessMapPlanRotorRpmAccelerationControllerTest :
       ProcessMapPlanBaseControllerTest<ProcessMapPlanRotorRpmAcceleration, ProcessMapPlanRotorRpmAccelerationDto>
 {
-    public ProcessMapPlanRotorRpmAccelerationControllerTest(WebAppFactoryFixture factory) : base(factory, "ProcessMapPlanFunctionsJarrDrillTool")
+    public ProcessMapPlanRotorRpmAccelerationControllerTest(WebAppFactoryFixture factory) : base(factory, "ProcessMapPlanRotorRpmAcceleration")
     {
     }
     private readonly ProcessMapPlanRotorRpmAccelerationDto dto = new ProcessMapPlanRotorRpmAccelerationDto()
@@ -29,6 +22,10 @@ public class ProcessMapPlanRotorRpmAccelerationControllerTest :
         Id = 0,
         IdWellSectionType = 1,
         Note = "1",
+        Rpm = 1,
+        RpmMax = 2,
+        TopDriveTorque = 2,
+        TopDriveTorqueMax = 3,
     };
 
     private readonly ProcessMapPlanRotorRpmAcceleration entity = new ProcessMapPlanRotorRpmAcceleration()
@@ -42,6 +39,10 @@ public class ProcessMapPlanRotorRpmAccelerationControllerTest :
         IdEditor = 1,
         Creation = DateTimeOffset.UtcNow,
         Note = "1",
+        Rpm = 1,
+        RpmMax = 2,
+        TopDriveTorque = 2,
+        TopDriveTorqueMax = 3,
     };
 
     [Fact]

AsbCloudWebApi.IntegrationTests/Controllers/ProcessMapPlan/Operations/ProcessMapPlanSlideControllerTest.cs

@@ -4,7 +4,7 @@ using Mapster;
 using Microsoft.EntityFrameworkCore;
 using Xunit;
 
-namespace AsbCloudWebApi.IntegrationTests.Controllers.ProcessMapPlan;
+namespace AsbCloudWebApi.IntegrationTests.Controllers.ProcessMapPlan.Operations;
 public class ProcessMapPlanSlideControllerTest : ProcessMapPlanBaseControllerTest<ProcessMapPlanSlide, ProcessMapPlanSlideDto>
 {
     private readonly ProcessMapPlanSlideDto dto = new ProcessMapPlanSlideDto()
@@ -24,7 +24,7 @@ public class ProcessMapPlanSlideControllerTest : ProcessMapPlanBaseControllerTes
         Buckling = 12,
         Id = 0,
         IdWellSectionType = 1,
-        Note = "13"
+        Note = "13",
     };
 
     private readonly ProcessMapPlanSlide entity = new ProcessMapPlanSlide()

AsbCloudWebApi.IntegrationTests/Controllers/ProcessMapPlan/Operations/ProcessMapPlanSwitchingOffThePumpControllerTest.cs

@@ -10,7 +10,7 @@ using Xunit;
 using AsbCloudDb.Model.ProcessMapPlan.Operations;
 using AsbCloudApp.Data.ProcessMaps.Operations;
 
-namespace AsbCloudWebApi.Controllers.ProcessMaps;
+namespace AsbCloudWebApi.IntegrationTests.Controllers.ProcessMapPlan.Operations;
 
 /// <summary>
 /// РТК план выключение насоса
@@ -18,7 +18,7 @@ namespace AsbCloudWebApi.Controllers.ProcessMaps;
 public class ProcessMapPlanSwitchingOffThePumpControllerTest :
       ProcessMapPlanBaseControllerTest<ProcessMapPlanSwitchingOffThePump, ProcessMapPlanSwitchingOffThePumpDto>
 {
-    public ProcessMapPlanSwitchingOffThePumpControllerTest(WebAppFactoryFixture factory) : base(factory, "ProcessMapPlanOperationSwitchPump")
+    public ProcessMapPlanSwitchingOffThePumpControllerTest(WebAppFactoryFixture factory) : base(factory, "ProcessMapPlanSwitchingOffThePump")
     {
     }
     private readonly ProcessMapPlanSwitchingOffThePumpDto dto = new ProcessMapPlanSwitchingOffThePumpDto()
@@ -30,6 +30,7 @@ public class ProcessMapPlanSwitchingOffThePumpControllerTest :
         IdWellSectionType = 1,
         Duration = 1,
         ResidualPressureLimit = 1,
+        Note = "5"
     };
 
     private readonly ProcessMapPlanSwitchingOffThePump entity = new ProcessMapPlanSwitchingOffThePump()
@@ -44,6 +45,7 @@ public class ProcessMapPlanSwitchingOffThePumpControllerTest :
         Creation = DateTimeOffset.UtcNow,
         Duration = 1,
         ResidualPressureLimit = 1,
+        Note = "5"
     };
 
     [Fact]

AsbCloudWebApi.IntegrationTests/Controllers/ProcessMapPlan/Operations/ProcessMapPlanSwitchingToTheModeControllerTest.cs

@@ -13,7 +13,7 @@ namespace AsbCloudWebApi.IntegrationTests.Controllers.ProcessMapPlan.Operations;
 public class ProcessMapPlanSwitchingToTheModeControllerTest :
       ProcessMapPlanBaseControllerTest<ProcessMapPlanSwitchingToTheMode, ProcessMapPlanSwitchingToTheModeDto>
 {
-    public ProcessMapPlanSwitchingToTheModeControllerTest(WebAppFactoryFixture factory) : base(factory, "ProcessMapPlanOperationSwitchingToTheMode")
+    public ProcessMapPlanSwitchingToTheModeControllerTest(WebAppFactoryFixture factory) : base(factory, "ProcessMapPlanSwitchingToTheMode")
     {
     }
     private readonly ProcessMapPlanSwitchingToTheModeDto dto = new ProcessMapPlanSwitchingToTheModeDto()
@@ -23,6 +23,10 @@ public class ProcessMapPlanSwitchingToTheModeControllerTest :
         DepthEnd = 2,
         Id = 0,
         IdWellSectionType = 1,
+        FlowRate = 1,
+        PressureMax = 1,
+        RampTime = 1,
+        Note = "10"
     };
 
     private readonly ProcessMapPlanSwitchingToTheMode entity = new ProcessMapPlanSwitchingToTheMode()
@@ -35,6 +39,10 @@ public class ProcessMapPlanSwitchingToTheModeControllerTest :
         IdAuthor = 1,
         IdEditor = 1,
         Creation = DateTimeOffset.UtcNow,
+        FlowRate = 1,
+        PressureMax = 1,
+        RampTime = 1,
+        Note = "10"
     };
 
     [Fact]

AsbCloudWebApi.IntegrationTests/Controllers/ProcessMapPlan/Operations/ProcessMapPlanTFOrientationControllerTest.cs

@@ -18,7 +18,7 @@ namespace AsbCloudWebApi.IntegrationTests.Controllers.ProcessMapPlan.Operations;
 public class ProcessMapPlanTFOrientationControllerTest :
       ProcessMapPlanBaseControllerTest<ProcessMapPlanTFOrientation, ProcessMapPlanTFOrientationDto>
 {
-    public ProcessMapPlanTFOrientationControllerTest(WebAppFactoryFixture factory) : base(factory, "ProcessMapPlanOperationTFOrientation")
+    public ProcessMapPlanTFOrientationControllerTest(WebAppFactoryFixture factory) : base(factory, "ProcessMapPlanTFOrientation")
     {
     }
     private readonly ProcessMapPlanTFOrientationDto dto = new ProcessMapPlanTFOrientationDto()
@@ -29,7 +29,20 @@ public class ProcessMapPlanTFOrientationControllerTest :
         Id = 0,
         IdWellSectionType = 1,
         DifferentialPressure = 1,
-        Spring = 1
+        Spring = 1,
+        FlowRateDown = 1,
+        FlowRateUp = 1,
+        Interval = 1,
+        Note = "1",
+        PressureMax = 1,
+        RepetitionsCount = 1,
+        RopDown = 1,
+        RopUp = 1,
+        SlackingOff = 1,
+        StopPointOffBottom = 1,
+        TFSetpoint = 1,
+        Tight = 1,
+        TorqueMax = 1,
     };
 
     private readonly ProcessMapPlanTFOrientation entity = new ProcessMapPlanTFOrientation()
@@ -43,7 +56,20 @@ public class ProcessMapPlanTFOrientationControllerTest :
         IdEditor = 1,
         Creation = DateTimeOffset.UtcNow,
         DifferentialPressure = 1,
-        Spring = 1
+        Spring = 1,
+        FlowRateDown = 1,
+        FlowRateUp = 1,
+        Interval = 1,
+        Note = "1",
+        PressureMax = 1,
+        RepetitionsCount = 1,
+        RopDown = 1,
+        RopUp = 1,
+        SlackingOff = 1,
+        StopPointOffBottom = 1,
+        TFSetpoint = 1,
+        Tight = 1,
+        TorqueMax = 1,
     };
 
     [Fact]