diff --git a/AsbCloudDb/Model/ProcessMapPlan/Operations/ProcessMapPlanRotor.cs b/AsbCloudDb/Model/ProcessMapPlan/Operations/ProcessMapPlanRotor.cs index 5d6203e0..3f0d5218 100644 --- a/AsbCloudDb/Model/ProcessMapPlan/Operations/ProcessMapPlanRotor.cs +++ b/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)] diff --git a/AsbCloudWebApi.IntegrationTests/Controllers/ProcessMapPlan/ProcessMapPlanAntiCrashRotationControllerTest.cs b/AsbCloudWebApi.IntegrationTests/Controllers/ProcessMapPlan/Functions/ProcessMapPlanAntiCrashRotationControllerTest.cs similarity index 80% rename from AsbCloudWebApi.IntegrationTests/Controllers/ProcessMapPlan/ProcessMapPlanAntiCrashRotationControllerTest.cs rename to AsbCloudWebApi.IntegrationTests/Controllers/ProcessMapPlan/Functions/ProcessMapPlanAntiCrashRotationControllerTest.cs index cb01881b..b2b72f9a 100644 --- a/AsbCloudWebApi.IntegrationTests/Controllers/ProcessMapPlan/ProcessMapPlanAntiCrashRotationControllerTest.cs +++ b/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; /// /// РТК план противоаварийное вращение @@ -13,7 +13,7 @@ namespace AsbCloudWebApi.Controllers.ProcessMaps; public class ProcessMapPlanAntiCrashRotationControllerTest : ProcessMapPlanBaseControllerTest { - 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] diff --git a/AsbCloudWebApi.IntegrationTests/Controllers/ProcessMapPlan/ProcessMapPlanAutoHoldTFControllerTest.cs b/AsbCloudWebApi.IntegrationTests/Controllers/ProcessMapPlan/Functions/ProcessMapPlanAutoHoldTFControllerTest.cs similarity index 93% rename from AsbCloudWebApi.IntegrationTests/Controllers/ProcessMapPlan/ProcessMapPlanAutoHoldTFControllerTest.cs rename to AsbCloudWebApi.IntegrationTests/Controllers/ProcessMapPlan/Functions/ProcessMapPlanAutoHoldTFControllerTest.cs index ec1eb6d7..5ed9a6a9 100644 --- a/AsbCloudWebApi.IntegrationTests/Controllers/ProcessMapPlan/ProcessMapPlanAutoHoldTFControllerTest.cs +++ b/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; /// /// РТК план автоудержание @@ -18,7 +18,7 @@ namespace AsbCloudWebApi.Controllers.ProcessMaps; public class ProcessMapPlanAutoHoldTFControllerTest : ProcessMapPlanBaseControllerTest { - public ProcessMapPlanAutoHoldTFControllerTest(WebAppFactoryFixture factory) : base(factory, "ProcessMapPlanFunctionsAutoHold") + public ProcessMapPlanAutoHoldTFControllerTest(WebAppFactoryFixture factory) : base(factory, "ProcessMapPlanAutoHoldTF") { } private readonly ProcessMapPlanAutoHoldTFDto dto = new ProcessMapPlanAutoHoldTFDto() diff --git a/AsbCloudWebApi.IntegrationTests/Controllers/ProcessMapPlan/ProcessMapPlanDamperControllerTest.cs b/AsbCloudWebApi.IntegrationTests/Controllers/ProcessMapPlan/Functions/ProcessMapPlanDamperControllerTest.cs similarity index 92% rename from AsbCloudWebApi.IntegrationTests/Controllers/ProcessMapPlan/ProcessMapPlanDamperControllerTest.cs rename to AsbCloudWebApi.IntegrationTests/Controllers/ProcessMapPlan/Functions/ProcessMapPlanDamperControllerTest.cs index 64a6193a..fb174196 100644 --- a/AsbCloudWebApi.IntegrationTests/Controllers/ProcessMapPlan/ProcessMapPlanDamperControllerTest.cs +++ b/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; /// /// РТК план демпфер @@ -18,7 +18,7 @@ namespace AsbCloudWebApi.Controllers.ProcessMaps; public class ProcessMapPlanDamperControllerTest : ProcessMapPlanBaseControllerTest { - 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() diff --git a/AsbCloudWebApi.IntegrationTests/Controllers/ProcessMapPlan/ProcessMapPlanDrillTestControllerTest.cs b/AsbCloudWebApi.IntegrationTests/Controllers/ProcessMapPlan/Functions/ProcessMapPlanDrillTestControllerTest.cs similarity index 84% rename from AsbCloudWebApi.IntegrationTests/Controllers/ProcessMapPlan/ProcessMapPlanDrillTestControllerTest.cs rename to AsbCloudWebApi.IntegrationTests/Controllers/ProcessMapPlan/Functions/ProcessMapPlanDrillTestControllerTest.cs index df61b16f..3d6eb0ff 100644 --- a/AsbCloudWebApi.IntegrationTests/Controllers/ProcessMapPlan/ProcessMapPlanDrillTestControllerTest.cs +++ b/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; /// /// РТК план дрилтест @@ -18,7 +18,7 @@ namespace AsbCloudWebApi.Controllers.ProcessMaps; public class ProcessMapPlanDrillTestControllerTest : ProcessMapPlanBaseControllerTest { - 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] diff --git a/AsbCloudWebApi.IntegrationTests/Controllers/ProcessMapPlan/ProcessMapPlanOscillationControllerTest.cs b/AsbCloudWebApi.IntegrationTests/Controllers/ProcessMapPlan/Functions/ProcessMapPlanOscillationControllerTest.cs similarity index 82% rename from AsbCloudWebApi.IntegrationTests/Controllers/ProcessMapPlan/ProcessMapPlanOscillationControllerTest.cs rename to AsbCloudWebApi.IntegrationTests/Controllers/ProcessMapPlan/Functions/ProcessMapPlanOscillationControllerTest.cs index 5dc42899..860904e1 100644 --- a/AsbCloudWebApi.IntegrationTests/Controllers/ProcessMapPlan/ProcessMapPlanOscillationControllerTest.cs +++ b/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; /// /// РТК план осцилляция @@ -18,7 +18,7 @@ namespace AsbCloudWebApi.Controllers.ProcessMaps; public class ProcessMapPlanOscillationControllerTest : ProcessMapPlanBaseControllerTest { - 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] diff --git a/AsbCloudWebApi.IntegrationTests/Controllers/ProcessMapPlan/ProcessMapPlanShockTestControllerTest.cs b/AsbCloudWebApi.IntegrationTests/Controllers/ProcessMapPlan/Functions/ProcessMapPlanShockTestControllerTest.cs similarity index 90% rename from AsbCloudWebApi.IntegrationTests/Controllers/ProcessMapPlan/ProcessMapPlanShockTestControllerTest.cs rename to AsbCloudWebApi.IntegrationTests/Controllers/ProcessMapPlan/Functions/ProcessMapPlanShockTestControllerTest.cs index 333755f2..3a0f8994 100644 --- a/AsbCloudWebApi.IntegrationTests/Controllers/ProcessMapPlan/ProcessMapPlanShockTestControllerTest.cs +++ b/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; /// /// РТК план shock test @@ -18,7 +18,7 @@ namespace AsbCloudWebApi.Controllers.ProcessMaps; public class ProcessMapPlanShockTestControllerTest : ProcessMapPlanBaseControllerTest { - 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] diff --git a/AsbCloudWebApi.IntegrationTests/Controllers/ProcessMapPlan/ProcessMapPlanStaticMeasurementOutputControllerTest.cs b/AsbCloudWebApi.IntegrationTests/Controllers/ProcessMapPlan/Functions/ProcessMapPlanStaticMeasurementOutputControllerTest.cs similarity index 91% rename from AsbCloudWebApi.IntegrationTests/Controllers/ProcessMapPlan/ProcessMapPlanStaticMeasurementOutputControllerTest.cs rename to AsbCloudWebApi.IntegrationTests/Controllers/ProcessMapPlan/Functions/ProcessMapPlanStaticMeasurementOutputControllerTest.cs index 961c4e00..589ab64a 100644 --- a/AsbCloudWebApi.IntegrationTests/Controllers/ProcessMapPlan/ProcessMapPlanStaticMeasurementOutputControllerTest.cs +++ b/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; /// /// РТК план выход статического замера @@ -18,7 +18,7 @@ namespace AsbCloudWebApi.Controllers.ProcessMaps; public class ProcessMapPlanStaticMeasurementOutputControllerTest : ProcessMapPlanBaseControllerTest { - 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] diff --git a/AsbCloudWebApi.IntegrationTests/Controllers/ProcessMapPlan/ProcessMapPlanUpdatingNoloadParametersControllerTest.cs b/AsbCloudWebApi.IntegrationTests/Controllers/ProcessMapPlan/Functions/ProcessMapPlanUpdatingNoloadParametersControllerTest.cs similarity index 92% rename from AsbCloudWebApi.IntegrationTests/Controllers/ProcessMapPlan/ProcessMapPlanUpdatingNoloadParametersControllerTest.cs rename to AsbCloudWebApi.IntegrationTests/Controllers/ProcessMapPlan/Functions/ProcessMapPlanUpdatingNoloadParametersControllerTest.cs index d7104b92..5e995aef 100644 --- a/AsbCloudWebApi.IntegrationTests/Controllers/ProcessMapPlan/ProcessMapPlanUpdatingNoloadParametersControllerTest.cs +++ b/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; /// /// РТК план обновление холостого хода @@ -18,7 +18,7 @@ namespace AsbCloudWebApi.Controllers.ProcessMaps; public class ProcessMapPlanUpdatingNoloadParametersControllerTest : ProcessMapPlanBaseControllerTest { - 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() diff --git a/AsbCloudWebApi.IntegrationTests/Controllers/ProcessMapPlan/Operations/ProcessMapPlanLoadCapacityControllerTest.cs b/AsbCloudWebApi.IntegrationTests/Controllers/ProcessMapPlan/Operations/ProcessMapPlanLoadCapacityControllerTest.cs index bf1c6766..fede306e 100644 --- a/AsbCloudWebApi.IntegrationTests/Controllers/ProcessMapPlan/Operations/ProcessMapPlanLoadCapacityControllerTest.cs +++ b/AsbCloudWebApi.IntegrationTests/Controllers/ProcessMapPlan/Operations/ProcessMapPlanLoadCapacityControllerTest.cs @@ -18,7 +18,7 @@ namespace AsbCloudWebApi.IntegrationTests.Controllers.ProcessMapPlan.Operations; public class ProcessMapPlanLoadCapacityControllerTest : ProcessMapPlanBaseControllerTest { - public ProcessMapPlanLoadCapacityControllerTest(WebAppFactoryFixture factory) : base(factory, "ProcessMapPlanOperationLoadCapacity") + public ProcessMapPlanLoadCapacityControllerTest(WebAppFactoryFixture factory) : base(factory, "ProcessMapPlanLoadCapacity") { } private readonly ProcessMapPlanLoadCapacityDto dto = new ProcessMapPlanLoadCapacityDto() diff --git a/AsbCloudWebApi.IntegrationTests/Controllers/ProcessMapPlan/ProcessMapPlanOscillationAnglesControllerTest.cs b/AsbCloudWebApi.IntegrationTests/Controllers/ProcessMapPlan/Operations/ProcessMapPlanOscillationAnglesControllerTest.cs similarity index 87% rename from AsbCloudWebApi.IntegrationTests/Controllers/ProcessMapPlan/ProcessMapPlanOscillationAnglesControllerTest.cs rename to AsbCloudWebApi.IntegrationTests/Controllers/ProcessMapPlan/Operations/ProcessMapPlanOscillationAnglesControllerTest.cs index 7c47f57c..3cbb7cb7 100644 --- a/AsbCloudWebApi.IntegrationTests/Controllers/ProcessMapPlan/ProcessMapPlanOscillationAnglesControllerTest.cs +++ b/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; /// /// РТК план определения углов осцилляции @@ -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] diff --git a/AsbCloudWebApi.IntegrationTests/Controllers/ProcessMapPlan/Operations/ProcessMapPlanPositioningOffTheBottomControllerTest.cs b/AsbCloudWebApi.IntegrationTests/Controllers/ProcessMapPlan/Operations/ProcessMapPlanPositioningOffTheBottomControllerTest.cs index 2bbff2f5..c2df1072 100644 --- a/AsbCloudWebApi.IntegrationTests/Controllers/ProcessMapPlan/Operations/ProcessMapPlanPositioningOffTheBottomControllerTest.cs +++ b/AsbCloudWebApi.IntegrationTests/Controllers/ProcessMapPlan/Operations/ProcessMapPlanPositioningOffTheBottomControllerTest.cs @@ -18,7 +18,7 @@ namespace AsbCloudWebApi.IntegrationTests.Controllers.ProcessMapPlan.Operations; public class ProcessMapPlanPositioningOffTheBottomControllerTest : ProcessMapPlanBaseControllerTest { - 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] diff --git a/AsbCloudWebApi.IntegrationTests/Controllers/ProcessMapPlan/Operations/ProcessMapPlanReamingRotorControllerTest.cs b/AsbCloudWebApi.IntegrationTests/Controllers/ProcessMapPlan/Operations/ProcessMapPlanReamingRotorControllerTest.cs index 6acd2a1c..c2f884ca 100644 --- a/AsbCloudWebApi.IntegrationTests/Controllers/ProcessMapPlan/Operations/ProcessMapPlanReamingRotorControllerTest.cs +++ b/AsbCloudWebApi.IntegrationTests/Controllers/ProcessMapPlan/Operations/ProcessMapPlanReamingRotorControllerTest.cs @@ -18,7 +18,7 @@ namespace AsbCloudWebApi.IntegrationTests.Controllers.ProcessMapPlan.Operations; public class ProcessMapPlanReamingRotorControllerTest : ProcessMapPlanBaseControllerTest { - 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] diff --git a/AsbCloudWebApi.IntegrationTests/Controllers/ProcessMapPlan/Operations/ProcessMapPlanReamingSlideControllerTest.cs b/AsbCloudWebApi.IntegrationTests/Controllers/ProcessMapPlan/Operations/ProcessMapPlanReamingSlideControllerTest.cs index 40216e41..d9ab7862 100644 --- a/AsbCloudWebApi.IntegrationTests/Controllers/ProcessMapPlan/Operations/ProcessMapPlanReamingSlideControllerTest.cs +++ b/AsbCloudWebApi.IntegrationTests/Controllers/ProcessMapPlan/Operations/ProcessMapPlanReamingSlideControllerTest.cs @@ -18,7 +18,7 @@ namespace AsbCloudWebApi.IntegrationTests.Controllers.ProcessMapPlan.Operations; public class ProcessMapPlanReamingSlideControllerTest : ProcessMapPlanBaseControllerTest { - public ProcessMapPlanReamingSlideControllerTest(WebAppFactoryFixture factory) : base(factory, "ProcessMapPlanOperationReamingSlide") + public ProcessMapPlanReamingSlideControllerTest(WebAppFactoryFixture factory) : base(factory, "ProcessMapPlanReamingSlide") { } private readonly ProcessMapPlanReamingSlideDto dto = new ProcessMapPlanReamingSlideDto() diff --git a/AsbCloudWebApi.IntegrationTests/Controllers/ProcessMapPlan/Operations/ProcessMapPlanRecordingStaticMeasurementControllerTest.cs b/AsbCloudWebApi.IntegrationTests/Controllers/ProcessMapPlan/Operations/ProcessMapPlanRecordingStaticMeasurementControllerTest.cs index dc5fb7d4..b8f59b6f 100644 --- a/AsbCloudWebApi.IntegrationTests/Controllers/ProcessMapPlan/Operations/ProcessMapPlanRecordingStaticMeasurementControllerTest.cs +++ b/AsbCloudWebApi.IntegrationTests/Controllers/ProcessMapPlan/Operations/ProcessMapPlanRecordingStaticMeasurementControllerTest.cs @@ -18,7 +18,7 @@ namespace AsbCloudWebApi.IntegrationTests.Controllers.ProcessMapPlan.Operations; public class ProcessMapPlanRecordingStaticMeasurementControllerTest : ProcessMapPlanBaseControllerTest { - 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] diff --git a/AsbCloudWebApi.IntegrationTests/Controllers/ProcessMapPlan/ProcessMapPlanRotorControllerTest.cs b/AsbCloudWebApi.IntegrationTests/Controllers/ProcessMapPlan/Operations/ProcessMapPlanRotorControllerTest.cs similarity index 99% rename from AsbCloudWebApi.IntegrationTests/Controllers/ProcessMapPlan/ProcessMapPlanRotorControllerTest.cs rename to AsbCloudWebApi.IntegrationTests/Controllers/ProcessMapPlan/Operations/ProcessMapPlanRotorControllerTest.cs index 0863bd6b..57e80efc 100644 --- a/AsbCloudWebApi.IntegrationTests/Controllers/ProcessMapPlan/ProcessMapPlanRotorControllerTest.cs +++ b/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 { 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, diff --git a/AsbCloudWebApi.IntegrationTests/Controllers/ProcessMapPlan/Operations/ProcessMapPlanRotorRpmAccelerationControllerTest.cs b/AsbCloudWebApi.IntegrationTests/Controllers/ProcessMapPlan/Operations/ProcessMapPlanRotorRpmAccelerationControllerTest.cs index 2e19ba28..35fc0cf5 100644 --- a/AsbCloudWebApi.IntegrationTests/Controllers/ProcessMapPlan/Operations/ProcessMapPlanRotorRpmAccelerationControllerTest.cs +++ b/AsbCloudWebApi.IntegrationTests/Controllers/ProcessMapPlan/Operations/ProcessMapPlanRotorRpmAccelerationControllerTest.cs @@ -1,14 +1,7 @@ -using AsbCloudApp.Repositories; -using AsbCloudApp.Requests; -using AsbCloudApp.Services; -using AsbCloudInfrastructure.Services.ProcessMapPlan.Export; -using AsbCloudInfrastructure.Services.ProcessMapPlan.Parser; -using AsbCloudWebApi.IntegrationTests.Controllers.ProcessMapPlan; -using AsbCloudWebApi.IntegrationTests; +using AsbCloudApp.Data.ProcessMaps.Operations; +using AsbCloudDb.Model.ProcessMapPlan.Operations; 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 { - 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] diff --git a/AsbCloudWebApi.IntegrationTests/Controllers/ProcessMapPlan/ProcessMapPlanSlideControllerTest.cs b/AsbCloudWebApi.IntegrationTests/Controllers/ProcessMapPlan/Operations/ProcessMapPlanSlideControllerTest.cs similarity index 99% rename from AsbCloudWebApi.IntegrationTests/Controllers/ProcessMapPlan/ProcessMapPlanSlideControllerTest.cs rename to AsbCloudWebApi.IntegrationTests/Controllers/ProcessMapPlan/Operations/ProcessMapPlanSlideControllerTest.cs index d33a1392..5aa98c9c 100644 --- a/AsbCloudWebApi.IntegrationTests/Controllers/ProcessMapPlan/ProcessMapPlanSlideControllerTest.cs +++ b/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 { 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() diff --git a/AsbCloudWebApi.IntegrationTests/Controllers/ProcessMapPlan/ProcessMapPlanSwitchingOffThePumpControllerTest.cs b/AsbCloudWebApi.IntegrationTests/Controllers/ProcessMapPlan/Operations/ProcessMapPlanSwitchingOffThePumpControllerTest.cs similarity index 91% rename from AsbCloudWebApi.IntegrationTests/Controllers/ProcessMapPlan/ProcessMapPlanSwitchingOffThePumpControllerTest.cs rename to AsbCloudWebApi.IntegrationTests/Controllers/ProcessMapPlan/Operations/ProcessMapPlanSwitchingOffThePumpControllerTest.cs index c84772f9..11768e47 100644 --- a/AsbCloudWebApi.IntegrationTests/Controllers/ProcessMapPlan/ProcessMapPlanSwitchingOffThePumpControllerTest.cs +++ b/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; /// /// РТК план выключение насоса @@ -18,7 +18,7 @@ namespace AsbCloudWebApi.Controllers.ProcessMaps; public class ProcessMapPlanSwitchingOffThePumpControllerTest : ProcessMapPlanBaseControllerTest { - 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] diff --git a/AsbCloudWebApi.IntegrationTests/Controllers/ProcessMapPlan/Operations/ProcessMapPlanSwitchingToTheModeControllerTest.cs b/AsbCloudWebApi.IntegrationTests/Controllers/ProcessMapPlan/Operations/ProcessMapPlanSwitchingToTheModeControllerTest.cs index 7c665a54..73dcd1c1 100644 --- a/AsbCloudWebApi.IntegrationTests/Controllers/ProcessMapPlan/Operations/ProcessMapPlanSwitchingToTheModeControllerTest.cs +++ b/AsbCloudWebApi.IntegrationTests/Controllers/ProcessMapPlan/Operations/ProcessMapPlanSwitchingToTheModeControllerTest.cs @@ -13,7 +13,7 @@ namespace AsbCloudWebApi.IntegrationTests.Controllers.ProcessMapPlan.Operations; public class ProcessMapPlanSwitchingToTheModeControllerTest : ProcessMapPlanBaseControllerTest { - 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] diff --git a/AsbCloudWebApi.IntegrationTests/Controllers/ProcessMapPlan/Operations/ProcessMapPlanTFOrientationControllerTest.cs b/AsbCloudWebApi.IntegrationTests/Controllers/ProcessMapPlan/Operations/ProcessMapPlanTFOrientationControllerTest.cs index 6b379f3d..7bccad24 100644 --- a/AsbCloudWebApi.IntegrationTests/Controllers/ProcessMapPlan/Operations/ProcessMapPlanTFOrientationControllerTest.cs +++ b/AsbCloudWebApi.IntegrationTests/Controllers/ProcessMapPlan/Operations/ProcessMapPlanTFOrientationControllerTest.cs @@ -18,7 +18,7 @@ namespace AsbCloudWebApi.IntegrationTests.Controllers.ProcessMapPlan.Operations; public class ProcessMapPlanTFOrientationControllerTest : ProcessMapPlanBaseControllerTest { - 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]