From d1e6f0e14f67a03b1dc6c563c9ae56b4d7e706fc Mon Sep 17 00:00:00 2001 From: Olga Nemt Date: Fri, 28 Jun 2024 15:48:44 +0500 Subject: [PATCH] =?UTF-8?q?=D0=9E=D0=BF=D1=80=D0=B5=D0=B4=D0=B5=D0=BB?= =?UTF-8?q?=D0=B5=D0=BD=D0=B8=D0=B5=20=D1=83=D0=B3=D0=BB=D0=BE=D0=B2=20?= =?UTF-8?q?=D0=BE=D1=81=D1=86=D0=B8=D0=BB=D0=BB=D1=8F=D1=86=D0=B8=D0=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...tionDeterminationOfOscillationAnglesDto.cs | 45 ----------- ...ssMapPlanOperationSwitchingToTheModeDto.cs | 34 ++++++++ AsbCloudDb/Model/AsbCloudDbContext.cs | 6 +- AsbCloudDb/Model/IAsbCloudDbContext.cs | 2 +- ...erationDeterminationOfOscillationAngles.cs | 43 ----------- .../ProcessMapPlanOscillationAngles.cs | 37 +++++++++ AsbCloudInfrastructure/DependencyInjection.cs | 18 ++--- ...rocessMapPlanOscillationAnglesTemplate.cs} | 4 +- ...sMapPlanOscillationAnglesExportService.cs} | 8 +- ... ProcessMapPlanOscillationAnglesParser.cs} | 8 +- ...nationOfOscillationAnglesControllerTest.cs | 77 ------------------- ...erationSwitchingToTheModeControllerTest.cs | 7 +- ...sMapPlanOscillationAnglesControllerTest.cs | 71 +++++++++++++++++ ...erminationOfOscillationAnglesController.cs | 28 ------- ...ocessMapPlanOscillationAnglesController.cs | 28 +++++++ 15 files changed, 194 insertions(+), 222 deletions(-) delete mode 100644 AsbCloudApp/Data/ProcessMaps/ProcessMapPlanOperationDeterminationOfOscillationAnglesDto.cs create mode 100644 AsbCloudApp/Data/ProcessMaps/ProcessMapPlanOperationSwitchingToTheModeDto.cs delete mode 100644 AsbCloudDb/Model/ProcessMapPlan/ProcessMapPlanOperationDeterminationOfOscillationAngles.cs create mode 100644 AsbCloudDb/Model/ProcessMapPlan/ProcessMapPlanOscillationAngles.cs rename AsbCloudInfrastructure/Services/ExcelServices/Templates/ProcessMapPlanTemplates/{ProcessMapPlanOperationDeterminationOfOscillationAnglesTemplate.cs => ProcessMapPlanOscillationAnglesTemplate.cs} (63%) rename AsbCloudInfrastructure/Services/ProcessMapPlan/Export/{ProcessMapPlanOperationDeterminationOfOscillationAnglesExportService.cs => ProcessMapPlanOscillationAnglesExportService.cs} (65%) rename AsbCloudInfrastructure/Services/ProcessMapPlan/Parser/{ProcessMapPlanOperationDeterminationOfOscillationAnglesParser.cs => ProcessMapPlanOscillationAnglesParser.cs} (68%) delete mode 100644 AsbCloudWebApi.IntegrationTests/Controllers/ProcessMapPlan/ProcessMapPlanOperationDeterminationOfOscillationAnglesControllerTest.cs create mode 100644 AsbCloudWebApi.IntegrationTests/Controllers/ProcessMapPlan/ProcessMapPlanOscillationAnglesControllerTest.cs delete mode 100644 AsbCloudWebApi/Controllers/ProcessMaps/ProcessMapPlanOperationDeterminationOfOscillationAnglesController.cs create mode 100644 AsbCloudWebApi/Controllers/ProcessMaps/ProcessMapPlanOscillationAnglesController.cs diff --git a/AsbCloudApp/Data/ProcessMaps/ProcessMapPlanOperationDeterminationOfOscillationAnglesDto.cs b/AsbCloudApp/Data/ProcessMaps/ProcessMapPlanOperationDeterminationOfOscillationAnglesDto.cs deleted file mode 100644 index 0fc3b296..00000000 --- a/AsbCloudApp/Data/ProcessMaps/ProcessMapPlanOperationDeterminationOfOscillationAnglesDto.cs +++ /dev/null @@ -1,45 +0,0 @@ -using System.ComponentModel.DataAnnotations; - -namespace AsbCloudApp.Data.ProcessMaps; - -/// -/// РТК план определения углов осцилляции -/// -public class ProcessMapPlanOperationDeterminationOfOscillationAnglesDto : ProcessMapPlanBaseDto -{ - /// - /// Максимальное давление, атм - /// - [Range(0.0, 400.0, ErrorMessage = "Максимальное давление, атм., должно быть в пределах от 0 до 400")] - public double MaxPressure { get; set; } - - /// - /// Перепад давления, атм. - /// - [Range(0.0, 60.0, ErrorMessage = "Перепад давления, атм., должно быть в пределах от 0 до 60")] - public double DifferentialPressure { get; set; } - - /// - /// Уставки, т., затяжка - /// - [Range(0.0, 20.0, ErrorMessage = "Уставки, т., затяжка, должно быть в пределах от 0 до 20")] - public double SetpointsTight { get; set; } - - /// - /// Уставки, т., посадка - /// - [Range(0.0, 20.0, ErrorMessage = "Уставки, т., посадка, должно быть в пределах от 0 до 20")] - public double SetpointsSlackingOff { get; set; } - - /// - /// Скорость, м/ч., Вверх - /// - [Range(0.0, 999.0, ErrorMessage = "Скорость, м/ч., Вверх, должно быть в пределах от 0 до 999")] - public double Reaming1ROPUp { get; set; } - - /// - /// Скорость, м/ч., Вниз - /// - [Range(0.0, 999.0, ErrorMessage = "Скорость, м/ч., Вниз, должно быть в пределах от 0 до 999")] - public double Reaming1ROPDown { get; set; } -} \ No newline at end of file diff --git a/AsbCloudApp/Data/ProcessMaps/ProcessMapPlanOperationSwitchingToTheModeDto.cs b/AsbCloudApp/Data/ProcessMaps/ProcessMapPlanOperationSwitchingToTheModeDto.cs new file mode 100644 index 00000000..7351afdc --- /dev/null +++ b/AsbCloudApp/Data/ProcessMaps/ProcessMapPlanOperationSwitchingToTheModeDto.cs @@ -0,0 +1,34 @@ +using System.ComponentModel.DataAnnotations; +using System.ComponentModel.DataAnnotations.Schema; + +namespace AsbCloudApp.Data.ProcessMaps; + +/// +/// РТК план выход на плановый расход +/// +public class ProcessMapPlanOperationSwitchingToTheModeDto : ProcessMapPlanBaseDto +{ + /// + /// Время выхода буровых насосов на плановый расход, сек. + /// + [Range(0.0, 3600.0, ErrorMessage = "Время выхода буровых насосов на плановый расход, сек., должно быть в пределах от 0 до 3600")] + public double RampTime { get; set; } + + /// + /// Расход, л/с + /// + [Range(0.0, 100.0, ErrorMessage = "Расход, л/с., должно быть в пределах от 0 до 100")] + public double FlowRate { get; set; } + + /// + /// Максимально допустимое давление, атм. + /// + [Range(0.0, 400.0, ErrorMessage = "Максимально допустимое давление, атм., должно быть в пределах от 0 до 400")] + public double PressureMax { get; set; } + + /// + /// Примечание + /// + [StringLength(1024, ErrorMessage = "Примечание, должно быть не более 1024 символов")] + public string Note { get; set; } = string.Empty; +} \ No newline at end of file diff --git a/AsbCloudDb/Model/AsbCloudDbContext.cs b/AsbCloudDb/Model/AsbCloudDbContext.cs index cc6098c9..d878d481 100644 --- a/AsbCloudDb/Model/AsbCloudDbContext.cs +++ b/AsbCloudDb/Model/AsbCloudDbContext.cs @@ -27,7 +27,7 @@ namespace AsbCloudDb.Model public virtual DbSet ProcessMapPlanOperationLoadCapacity => Set(); public virtual DbSet ProcessMapPlanSurvey => Set(); public virtual DbSet ProcessMapPlanOperationPositioningOffTheBottom => Set(); - public virtual DbSet ProcessMapPlanOperationDeterminationOfOscillationAngles => Set(); + public virtual DbSet ProcessMapPlanOperationDeterminationOfOscillationAngles => Set(); public virtual DbSet ProcessMapPlanOperationTFOrientation => Set(); public virtual DbSet ProcessMapPlanOperationSwitchPump => Set(); public virtual DbSet ProcessMapPlanOperationSwitchMode => Set(); @@ -498,7 +498,7 @@ namespace AsbCloudDb.Model .WithMany() .OnDelete(DeleteBehavior.Restrict); - modelBuilder.Entity() + modelBuilder.Entity() .HasOne(p => p.Author) .WithMany() .OnDelete(DeleteBehavior.Restrict); @@ -598,7 +598,7 @@ namespace AsbCloudDb.Model .WithMany() .OnDelete(DeleteBehavior.Restrict); - modelBuilder.Entity() + modelBuilder.Entity() .HasOne(p => p.Editor) .WithMany() .OnDelete(DeleteBehavior.Restrict); diff --git a/AsbCloudDb/Model/IAsbCloudDbContext.cs b/AsbCloudDb/Model/IAsbCloudDbContext.cs index 762fbb48..c176e088 100644 --- a/AsbCloudDb/Model/IAsbCloudDbContext.cs +++ b/AsbCloudDb/Model/IAsbCloudDbContext.cs @@ -88,7 +88,7 @@ namespace AsbCloudDb.Model DbSet ProcessMapPlanOperationLoadCapacity { get; } DbSet ProcessMapPlanSurvey { get; } DbSet ProcessMapPlanOperationPositioningOffTheBottom { get; } - DbSet ProcessMapPlanOperationDeterminationOfOscillationAngles { get; } + DbSet ProcessMapPlanOperationDeterminationOfOscillationAngles { get; } DbSet ProcessMapPlanOperationTFOrientation { get; } DbSet ProcessMapPlanOperationSwitchPump { get; } DbSet ProcessMapPlanOperationSwitchMode { get; } diff --git a/AsbCloudDb/Model/ProcessMapPlan/ProcessMapPlanOperationDeterminationOfOscillationAngles.cs b/AsbCloudDb/Model/ProcessMapPlan/ProcessMapPlanOperationDeterminationOfOscillationAngles.cs deleted file mode 100644 index 148d3274..00000000 --- a/AsbCloudDb/Model/ProcessMapPlan/ProcessMapPlanOperationDeterminationOfOscillationAngles.cs +++ /dev/null @@ -1,43 +0,0 @@ -using System.ComponentModel.DataAnnotations; -using System.ComponentModel.DataAnnotations.Schema; -using AsbCloudDb.Model.ProcessMapPlan; -using Microsoft.EntityFrameworkCore; - -namespace AsbCloudDb.Model.ProcessMaps; - -[Table("t_process_map_plan_operation_oscillation_angels"), Comment("Определение углов осцилляции")] -public class ProcessMapPlanOperationDeterminationOfOscillationAngles : ProcessMapPlanBase -{ - [Column("max_pressure"), Comment("Максимальное давление, атм")] - [Range(0.0, 400.0)] - [Required] - public double MaxPressure { get; set; } - - [Column("differential_pressure"), Comment("Перепад давления, атм.")] - [Range(0.0, 60.0)] - [Required] - public double DifferentialPressure { get; set; } - - [Column("setpoints_tight"), Comment("Уставки, т., затяжка")] - [Range(0.0, 20.0)] - [Required] - public double SetpointsTight { get; set; } - - [Column("setpoints_slacking_off"), Comment("Уставки, т., посадка")] - [Range(0.0, 20.0)] - [Required] - public double SetpointsSlackingOff { get; set; } - - [Column("reaming1_rop_up"), Comment("Скорость, м/ч., Вверх")] - [Range(0.0, 999.0)] - [Required] - public double Reaming1ROPUp { get; set; } - - [Column("reaming1_rop_down"), Comment("Скорость, м/ч., Вниз")] - [Range(0.0, 999.0)] - [Required] - public double Reaming1ROPDown { get; set; } - - [ForeignKey(nameof(IdPrevious))] - public virtual ProcessMapPlanOperationDeterminationOfOscillationAngles? Previous { get; set; } -} \ No newline at end of file diff --git a/AsbCloudDb/Model/ProcessMapPlan/ProcessMapPlanOscillationAngles.cs b/AsbCloudDb/Model/ProcessMapPlan/ProcessMapPlanOscillationAngles.cs new file mode 100644 index 00000000..2fd5248f --- /dev/null +++ b/AsbCloudDb/Model/ProcessMapPlan/ProcessMapPlanOscillationAngles.cs @@ -0,0 +1,37 @@ +using System.ComponentModel.DataAnnotations; +using System.ComponentModel.DataAnnotations.Schema; +using AsbCloudDb.Model.ProcessMapPlan; +using Microsoft.EntityFrameworkCore; + +namespace AsbCloudDb.Model.ProcessMaps; + +[Table("t_process_map_plan_operation_oscillation_angels"), Comment("Определение углов осцилляции")] +public class ProcessMapPlanOscillationAngles : ProcessMapPlanBase +{ + [Column("top_drive_torque"), Comment("Момент на ВСП, кН*м., Уставка")] + [Range(0.0, 35.0)] + [Required] + public double TopDriveTorque { get; set; } + + [Column("top_drive_torque_max"), Comment("Момент на ВСП, кН*м., Ограничение")] + [Range(0.0, 35.0)] + [Required] + public double TopDriveTorqueMax { get; set; } + + [Column("rpm"), Comment("Обороты на ВСП, об/мин., Уставка")] + [Range(0.0, 270.0)] + [Required] + public double Rpm { get; set; } + + [Column("rpm_max"), Comment("Обороты на ВСП, об/мин., Ограничение")] + [Range(0.0, 270.0)] + [Required] + public double RpmMax { get; set; } + + [Column("note"), Comment("Примечание"), StringLength(1024)] + [Required] + public string Note { get; set; } = string.Empty; + + [ForeignKey(nameof(IdPrevious))] + public virtual ProcessMapPlanOscillationAngles? Previous { get; set; } +} \ No newline at end of file diff --git a/AsbCloudInfrastructure/DependencyInjection.cs b/AsbCloudInfrastructure/DependencyInjection.cs index ae3a6ccd..08ded898 100644 --- a/AsbCloudInfrastructure/DependencyInjection.cs +++ b/AsbCloudInfrastructure/DependencyInjection.cs @@ -181,11 +181,11 @@ namespace AsbCloudInfrastructure Item = src.Adapt() }); - TypeAdapterConfig>.NewConfig() - .Include>() - .Map(dest => dest, src => new ChangeLogDto() + TypeAdapterConfig>.NewConfig() + .Include>() + .Map(dest => dest, src => new ChangeLogDto() { - Item = src.Adapt() + Item = src.Adapt() }); TypeAdapterConfig>.NewConfig() @@ -434,7 +434,7 @@ namespace AsbCloudInfrastructure services.AddTransient(); services.AddTransient(); services.AddTransient(); - services.AddTransient(); + services.AddTransient(); services.AddTransient(); services.AddTransient(); services.AddTransient(); @@ -460,7 +460,7 @@ namespace AsbCloudInfrastructure services.AddTransient(); services.AddTransient(); services.AddTransient(); - services.AddTransient(); + services.AddTransient(); services.AddTransient(); services.AddTransient(); services.AddTransient(); @@ -515,8 +515,8 @@ namespace AsbCloudInfrastructure ProcessMapPlanBaseRepository>(); services.AddTransient< - IChangeLogRepository, - ProcessMapPlanBaseRepository>(); + IChangeLogRepository, + ProcessMapPlanBaseRepository>(); services.AddTransient< IChangeLogRepository, @@ -573,7 +573,7 @@ namespace AsbCloudInfrastructure services.AddTransient>(); services.AddTransient>(); services.AddTransient>(); - services.AddTransient>(); + services.AddTransient>(); services.AddTransient>(); services.AddTransient>(); services.AddTransient>(); diff --git a/AsbCloudInfrastructure/Services/ExcelServices/Templates/ProcessMapPlanTemplates/ProcessMapPlanOperationDeterminationOfOscillationAnglesTemplate.cs b/AsbCloudInfrastructure/Services/ExcelServices/Templates/ProcessMapPlanTemplates/ProcessMapPlanOscillationAnglesTemplate.cs similarity index 63% rename from AsbCloudInfrastructure/Services/ExcelServices/Templates/ProcessMapPlanTemplates/ProcessMapPlanOperationDeterminationOfOscillationAnglesTemplate.cs rename to AsbCloudInfrastructure/Services/ExcelServices/Templates/ProcessMapPlanTemplates/ProcessMapPlanOscillationAnglesTemplate.cs index ca63f61e..cffb099a 100644 --- a/AsbCloudInfrastructure/Services/ExcelServices/Templates/ProcessMapPlanTemplates/ProcessMapPlanOperationDeterminationOfOscillationAnglesTemplate.cs +++ b/AsbCloudInfrastructure/Services/ExcelServices/Templates/ProcessMapPlanTemplates/ProcessMapPlanOscillationAnglesTemplate.cs @@ -2,13 +2,13 @@ using System.Collections.Generic; namespace AsbCloudInfrastructure.Services.ExcelServices.Templates.ProcessMapPlanTemplates; -public class ProcessMapPlanOperationDeterminationOfOscillationAnglesTemplate : ITemplateParameters +public class ProcessMapPlanOscillationAnglesTemplate : ITemplateParameters { public string SheetName => "Определение углов осцилляции"; public int HeaderRowsCount => 2; - public string FileName => "ProcessMapPlanOperationDeterminationOfOscillationAnglesTemplate.xlsx"; + public string FileName => "ProcessMapPlanOscillationAnglesTemplate.xlsx"; public IDictionary Cells => new Dictionary { diff --git a/AsbCloudInfrastructure/Services/ProcessMapPlan/Export/ProcessMapPlanOperationDeterminationOfOscillationAnglesExportService.cs b/AsbCloudInfrastructure/Services/ProcessMapPlan/Export/ProcessMapPlanOscillationAnglesExportService.cs similarity index 65% rename from AsbCloudInfrastructure/Services/ProcessMapPlan/Export/ProcessMapPlanOperationDeterminationOfOscillationAnglesExportService.cs rename to AsbCloudInfrastructure/Services/ProcessMapPlan/Export/ProcessMapPlanOscillationAnglesExportService.cs index 4f43f0f9..221491e6 100644 --- a/AsbCloudInfrastructure/Services/ProcessMapPlan/Export/ProcessMapPlanOperationDeterminationOfOscillationAnglesExportService.cs +++ b/AsbCloudInfrastructure/Services/ProcessMapPlan/Export/ProcessMapPlanOscillationAnglesExportService.cs @@ -10,16 +10,16 @@ using System.Threading.Tasks; namespace AsbCloudInfrastructure.Services.ProcessMapPlan.Export; -public class ProcessMapPlanOperationDeterminationOfOscillationAnglesExportService : ProcessMapPlanExportService +public class ProcessMapPlanOscillationAnglesExportService : ProcessMapPlanExportService { - public ProcessMapPlanOperationDeterminationOfOscillationAnglesExportService( - IChangeLogRepository processMapPlanRepository, + public ProcessMapPlanOscillationAnglesExportService( + IChangeLogRepository processMapPlanRepository, IWellService wellService) : base(processMapPlanRepository, wellService) { } - protected override ITemplateParameters TemplateParameters { get; } = new ProcessMapPlanOperationDeterminationOfOscillationAnglesTemplate(); + protected override ITemplateParameters TemplateParameters { get; } = new ProcessMapPlanOscillationAnglesTemplate(); protected override async Task BuildFileNameAsync(WellRelatedExportRequest options, CancellationToken token) { diff --git a/AsbCloudInfrastructure/Services/ProcessMapPlan/Parser/ProcessMapPlanOperationDeterminationOfOscillationAnglesParser.cs b/AsbCloudInfrastructure/Services/ProcessMapPlan/Parser/ProcessMapPlanOscillationAnglesParser.cs similarity index 68% rename from AsbCloudInfrastructure/Services/ProcessMapPlan/Parser/ProcessMapPlanOperationDeterminationOfOscillationAnglesParser.cs rename to AsbCloudInfrastructure/Services/ProcessMapPlan/Parser/ProcessMapPlanOscillationAnglesParser.cs index 685b7c7d..8fd7fead 100644 --- a/AsbCloudInfrastructure/Services/ProcessMapPlan/Parser/ProcessMapPlanOperationDeterminationOfOscillationAnglesParser.cs +++ b/AsbCloudInfrastructure/Services/ProcessMapPlan/Parser/ProcessMapPlanOscillationAnglesParser.cs @@ -9,16 +9,16 @@ using AsbCloudInfrastructure.Services.ExcelServices.Templates.ProcessMapPlanTemp namespace AsbCloudInfrastructure.Services.ProcessMapPlan.Parser; -public class ProcessMapPlanOperationDeterminationOfOscillationAnglesParser : ProcessMapPlanParser +public class ProcessMapPlanOscillationAnglesParser : ProcessMapPlanParser { - public ProcessMapPlanOperationDeterminationOfOscillationAnglesParser(IWellOperationRepository wellOperationRepository) + public ProcessMapPlanOscillationAnglesParser(IWellOperationRepository wellOperationRepository) : base(wellOperationRepository) { } - protected override ITemplateParameters TemplateParameters => new ProcessMapPlanOperationDeterminationOfOscillationAnglesTemplate(); + protected override ITemplateParameters TemplateParameters => new ProcessMapPlanOscillationAnglesTemplate(); - protected override ProcessMapPlanOperationDeterminationOfOscillationAnglesDto BuildDto(IDictionary row, int rowNumber) + protected override ProcessMapPlanOscillationAnglesDto BuildDto(IDictionary row, int rowNumber) { var dto = base.BuildDto(row, rowNumber); diff --git a/AsbCloudWebApi.IntegrationTests/Controllers/ProcessMapPlan/ProcessMapPlanOperationDeterminationOfOscillationAnglesControllerTest.cs b/AsbCloudWebApi.IntegrationTests/Controllers/ProcessMapPlan/ProcessMapPlanOperationDeterminationOfOscillationAnglesControllerTest.cs deleted file mode 100644 index 1ff24202..00000000 --- a/AsbCloudWebApi.IntegrationTests/Controllers/ProcessMapPlan/ProcessMapPlanOperationDeterminationOfOscillationAnglesControllerTest.cs +++ /dev/null @@ -1,77 +0,0 @@ -using AsbCloudApp.Data.ProcessMaps; -using AsbCloudApp.Repositories; -using AsbCloudApp.Requests; -using AsbCloudApp.Services; -using AsbCloudDb.Model.ProcessMaps; -using AsbCloudInfrastructure.Services.ProcessMapPlan.Export; -using AsbCloudInfrastructure.Services.ProcessMapPlan.Parser; -using AsbCloudWebApi.IntegrationTests.Controllers.ProcessMapPlan; -using AsbCloudWebApi.IntegrationTests; -using Microsoft.EntityFrameworkCore; -using Xunit; - -namespace AsbCloudWebApi.Controllers.ProcessMaps; - -/// -/// РТК план определения углов осцилляции -/// -public class ProcessMapPlanOperationDeterminationOfOscillationAnglesControllerTest : - ProcessMapPlanBaseControllerTest -{ - public ProcessMapPlanOperationDeterminationOfOscillationAnglesControllerTest(WebAppFactoryFixture factory) : base(factory, "ProcessMapPlanOperationDeterminationOfOscillationAngles") - { - } - private readonly ProcessMapPlanOperationDeterminationOfOscillationAnglesDto dto = new ProcessMapPlanOperationDeterminationOfOscillationAnglesDto() - { - IdWell = 1, - DepthStart = 1, - DepthEnd = 2, - Id = 0, - IdWellSectionType = 1, - DifferentialPressure = 1, - MaxPressure = 2, - Reaming1ROPDown = 3, - Reaming1ROPUp = 4, - SetpointsSlackingOff = 5, - SetpointsTight = 6 - }; - - private readonly ProcessMapPlanOperationDeterminationOfOscillationAngles entity = new ProcessMapPlanOperationDeterminationOfOscillationAngles() - { - IdWell = 1, - DepthEnd = 10, - DepthStart = 2, - Id = 0, - IdWellSectionType = 1, - IdAuthor = 1, - IdEditor = 1, - Creation = DateTimeOffset.UtcNow, - DifferentialPressure = 1, - MaxPressure = 2, - Reaming1ROPDown = 3, - Reaming1ROPUp = 4, - SetpointsSlackingOff = 5, - SetpointsTight = 6 - }; - - [Fact] - public async Task Get_actual_returns_success() - { - await Get(entity, dto); - } - - protected override ProcessMapPlanOperationDeterminationOfOscillationAngles GetByNote(DbSet dbSet, ProcessMapPlanOperationDeterminationOfOscillationAnglesDto dto) - { - throw new NotImplementedException(); - } - - protected override ProcessMapPlanOperationDeterminationOfOscillationAnglesDto GetByNote(IEnumerable dtos, ProcessMapPlanOperationDeterminationOfOscillationAnglesDto dto) - { - throw new NotImplementedException(); - } - - protected override ProcessMapPlanOperationDeterminationOfOscillationAngles? GetByWellId() - { - throw new NotImplementedException(); - } -} \ No newline at end of file diff --git a/AsbCloudWebApi.IntegrationTests/Controllers/ProcessMapPlan/ProcessMapPlanOperationSwitchingToTheModeControllerTest.cs b/AsbCloudWebApi.IntegrationTests/Controllers/ProcessMapPlan/ProcessMapPlanOperationSwitchingToTheModeControllerTest.cs index a66ee50e..278f4e3c 100644 --- a/AsbCloudWebApi.IntegrationTests/Controllers/ProcessMapPlan/ProcessMapPlanOperationSwitchingToTheModeControllerTest.cs +++ b/AsbCloudWebApi.IntegrationTests/Controllers/ProcessMapPlan/ProcessMapPlanOperationSwitchingToTheModeControllerTest.cs @@ -13,7 +13,7 @@ namespace AsbCloudWebApi.Controllers.ProcessMaps; public class ProcessMapPlanOperationSwitchingToTheModeControllerTest : ProcessMapPlanBaseControllerTest { - public ProcessMapPlanOperationSwitchingToTheModeControllerTest(WebAppFactoryFixture factory) : base(factory, "ProcessMapPlanOperationSwitchMode") + public ProcessMapPlanOperationSwitchingToTheModeControllerTest(WebAppFactoryFixture factory) : base(factory, "ProcessMapPlanOperationSwitchingToTheMode") { } private readonly ProcessMapPlanOperationSwitchingToTheModeDto dto = new ProcessMapPlanOperationSwitchingToTheModeDto() @@ -23,10 +23,6 @@ public class ProcessMapPlanOperationSwitchingToTheModeControllerTest : DepthEnd = 2, Id = 0, IdWellSectionType = 1, - Comment = 1, - ExitTimeConsumption = 2, - ConsumptionFlowRate = 3, - PressureLimitMax = 4, }; private readonly ProcessMapPlanOperationSwitchingToTheMode entity = new ProcessMapPlanOperationSwitchingToTheMode() @@ -39,7 +35,6 @@ public class ProcessMapPlanOperationSwitchingToTheModeControllerTest : IdAuthor = 1, IdEditor = 1, Creation = DateTimeOffset.UtcNow, - Comment = "1", }; [Fact] diff --git a/AsbCloudWebApi.IntegrationTests/Controllers/ProcessMapPlan/ProcessMapPlanOscillationAnglesControllerTest.cs b/AsbCloudWebApi.IntegrationTests/Controllers/ProcessMapPlan/ProcessMapPlanOscillationAnglesControllerTest.cs new file mode 100644 index 00000000..116dc6b4 --- /dev/null +++ b/AsbCloudWebApi.IntegrationTests/Controllers/ProcessMapPlan/ProcessMapPlanOscillationAnglesControllerTest.cs @@ -0,0 +1,71 @@ +using AsbCloudApp.Data.ProcessMaps; +using AsbCloudApp.Repositories; +using AsbCloudApp.Requests; +using AsbCloudApp.Services; +using AsbCloudDb.Model.ProcessMaps; +using AsbCloudInfrastructure.Services.ProcessMapPlan.Export; +using AsbCloudInfrastructure.Services.ProcessMapPlan.Parser; +using AsbCloudWebApi.IntegrationTests.Controllers.ProcessMapPlan; +using AsbCloudWebApi.IntegrationTests; +using Microsoft.EntityFrameworkCore; +using Xunit; + +namespace AsbCloudWebApi.Controllers.ProcessMaps; + +/// +/// РТК план определения углов осцилляции +/// +public class ProcessMapPlanOscillationAnglesControllerTest : + ProcessMapPlanBaseControllerTest +{ + public ProcessMapPlanOscillationAnglesControllerTest(WebAppFactoryFixture factory) : base(factory, "ProcessMapPlanOscillationAngles") + { + } + private readonly ProcessMapPlanOscillationAnglesDto dto = new ProcessMapPlanOscillationAnglesDto() + { + IdWell = 1, + DepthStart = 1, + DepthEnd = 2, + Id = 0, + IdWellSectionType = 1, + DifferentialPressure = 1, + MaxPressure = 2, + Reaming1ROPDown = 3, + Reaming1ROPUp = 4, + SetpointsSlackingOff = 5, + SetpointsTight = 6 + }; + + private readonly ProcessMapPlanOscillationAngles entity = new ProcessMapPlanOscillationAngles() + { + IdWell = 1, + DepthEnd = 10, + DepthStart = 2, + Id = 0, + IdWellSectionType = 1, + IdAuthor = 1, + IdEditor = 1, + Creation = DateTimeOffset.UtcNow, + }; + + [Fact] + public async Task Get_actual_returns_success() + { + await Get(entity, dto); + } + + protected override ProcessMapPlanOscillationAngles GetByNote(DbSet dbSet, ProcessMapPlanOscillationAnglesDto dto) + { + throw new NotImplementedException(); + } + + protected override ProcessMapPlanOscillationAnglesDto GetByNote(IEnumerable dtos, ProcessMapPlanOscillationAnglesDto dto) + { + throw new NotImplementedException(); + } + + protected override ProcessMapPlanOscillationAngles? GetByWellId() + { + throw new NotImplementedException(); + } +} \ No newline at end of file diff --git a/AsbCloudWebApi/Controllers/ProcessMaps/ProcessMapPlanOperationDeterminationOfOscillationAnglesController.cs b/AsbCloudWebApi/Controllers/ProcessMaps/ProcessMapPlanOperationDeterminationOfOscillationAnglesController.cs deleted file mode 100644 index 7e5311f1..00000000 --- a/AsbCloudWebApi/Controllers/ProcessMaps/ProcessMapPlanOperationDeterminationOfOscillationAnglesController.cs +++ /dev/null @@ -1,28 +0,0 @@ -using AsbCloudApp.Data.ProcessMaps; -using AsbCloudApp.Repositories; -using AsbCloudApp.Requests; -using AsbCloudApp.Services; -using AsbCloudDb.Model.ProcessMaps; -using AsbCloudInfrastructure.Services.ProcessMapPlan.Export; -using AsbCloudInfrastructure.Services.ProcessMapPlan.Parser; - -namespace AsbCloudWebApi.Controllers.ProcessMaps; - -/// -/// РТК план определения углов осцилляции -/// -public class ProcessMapPlanOperationDeterminationOfOscillationAnglesController : - ProcessMapPlanBaseController -{ - public ProcessMapPlanOperationDeterminationOfOscillationAnglesController( - IChangeLogRepository repository, - IWellService wellService, - ProcessMapPlanOperationDeterminationOfOscillationAnglesParser parserService, - ITelemetryService telemetryService, - ProcessMapPlanOperationDeterminationOfOscillationAnglesExportService processMapPlanExportService) - : base(repository, wellService, parserService, processMapPlanExportService, telemetryService) - { - } - - protected override string TemplateFileName => "ЕЦП_шаблон_файла_РТК_план_позиционирование_над_забоем.xlsx"; -} \ No newline at end of file diff --git a/AsbCloudWebApi/Controllers/ProcessMaps/ProcessMapPlanOscillationAnglesController.cs b/AsbCloudWebApi/Controllers/ProcessMaps/ProcessMapPlanOscillationAnglesController.cs new file mode 100644 index 00000000..ca30f6da --- /dev/null +++ b/AsbCloudWebApi/Controllers/ProcessMaps/ProcessMapPlanOscillationAnglesController.cs @@ -0,0 +1,28 @@ +using AsbCloudApp.Data.ProcessMaps; +using AsbCloudApp.Repositories; +using AsbCloudApp.Requests; +using AsbCloudApp.Services; +using AsbCloudDb.Model.ProcessMaps; +using AsbCloudInfrastructure.Services.ProcessMapPlan.Export; +using AsbCloudInfrastructure.Services.ProcessMapPlan.Parser; + +namespace AsbCloudWebApi.Controllers.ProcessMaps; + +/// +/// РТК план определения углов осцилляции +/// +public class ProcessMapPlanOscillationAnglesController : + ProcessMapPlanBaseController +{ + public ProcessMapPlanOscillationAnglesController( + IChangeLogRepository repository, + IWellService wellService, + ProcessMapPlanOscillationAnglesParser parserService, + ITelemetryService telemetryService, + ProcessMapPlanOscillationAnglesExportService processMapPlanExportService) + : base(repository, wellService, parserService, processMapPlanExportService, telemetryService) + { + } + + protected override string TemplateFileName => "ЕЦП_шаблон_файла_РТК_план_определение_углов_осцилляции.xlsx"; +} \ No newline at end of file