diff --git a/AsbCloudApp/Data/ProcessMaps/ProcessMapPlanOperationLoadCapacityDto.cs b/AsbCloudApp/Data/ProcessMaps/ProcessMapPlanOperationLoadCapacityDto.cs deleted file mode 100644 index 152fcc7a..00000000 --- a/AsbCloudApp/Data/ProcessMaps/ProcessMapPlanOperationLoadCapacityDto.cs +++ /dev/null @@ -1,35 +0,0 @@ -using System.ComponentModel.DataAnnotations; - -namespace AsbCloudApp.Data.ProcessMaps; - -/// -/// РТК план выработка нагрузки -/// -public class ProcessMapPlanOperationLoadCapacityDto : ProcessMapPlanBaseDto -{ - /// - /// Время выработки минимальное, сек - /// - [Range(0.0, 800.0, ErrorMessage = "Время выработки минимальное, сек., должно быть в пределах от 0 до 800")] - public double TimeLoadCapacityMin { get; set; } - - /// - /// Перепад давления минимальный, атм - /// - [Range(0.1, 400.0, ErrorMessage = "Перепад давления минимальный, атм., должно быть в пределах от 0.1 до 400")] - public double DifferentialPressureMin { get; set; } - - /// - /// Нагрузка минимальная, т - /// - [Range(0.1, 99.0, ErrorMessage = "Нагрузка минимальная, т, должно быть в пределах от 0.1 до 99")] - public double WeightOnBitMin { 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 87890e0c..8e0fae1b 100644 --- a/AsbCloudDb/Model/AsbCloudDbContext.cs +++ b/AsbCloudDb/Model/AsbCloudDbContext.cs @@ -24,7 +24,7 @@ namespace AsbCloudDb.Model public virtual DbSet ProcessMapPlanReams => Set(); public virtual DbSet ProcessMapPlanOperationReamingRotor => Set(); public virtual DbSet ProcessMapPlanOperationReamingSlide => Set(); - public virtual DbSet ProcessMapPlanOperationLoadCapacity => Set(); + public virtual DbSet ProcessMapPlanOperationLoadCapacity => Set(); public virtual DbSet ProcessMapPlanSurvey => Set(); public virtual DbSet ProcessMapPlanOperationPositioningOffTheBottom => Set(); public virtual DbSet ProcessMapPlanOperationDeterminationOfOscillationAngles => Set(); @@ -483,7 +483,7 @@ namespace AsbCloudDb.Model .WithMany() .OnDelete(DeleteBehavior.Restrict); - modelBuilder.Entity() + modelBuilder.Entity() .HasOne(p => p.Author) .WithMany() .OnDelete(DeleteBehavior.Restrict); @@ -583,7 +583,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 ed6b92e9..54ee4c6d 100644 --- a/AsbCloudDb/Model/IAsbCloudDbContext.cs +++ b/AsbCloudDb/Model/IAsbCloudDbContext.cs @@ -85,7 +85,7 @@ namespace AsbCloudDb.Model DbSet ProcessMapPlanSlide { get; } DbSet ProcessMapPlanOperationReamingRotor { get; } DbSet ProcessMapPlanOperationReamingSlide { get; } - DbSet ProcessMapPlanOperationLoadCapacity { get; } + DbSet ProcessMapPlanOperationLoadCapacity { get; } DbSet ProcessMapPlanSurvey { get; } DbSet ProcessMapPlanOperationPositioningOffTheBottom { get; } DbSet ProcessMapPlanOperationDeterminationOfOscillationAngles { get; } diff --git a/AsbCloudDb/Model/ProcessMapPlan/ProcessMapPlanOperationLoadCapacity.cs b/AsbCloudDb/Model/ProcessMapPlan/ProcessMapPlanLoadCapacity.cs similarity index 79% rename from AsbCloudDb/Model/ProcessMapPlan/ProcessMapPlanOperationLoadCapacity.cs rename to AsbCloudDb/Model/ProcessMapPlan/ProcessMapPlanLoadCapacity.cs index b3aee563..c7f8712e 100644 --- a/AsbCloudDb/Model/ProcessMapPlan/ProcessMapPlanOperationLoadCapacity.cs +++ b/AsbCloudDb/Model/ProcessMapPlan/ProcessMapPlanLoadCapacity.cs @@ -5,8 +5,8 @@ using Microsoft.EntityFrameworkCore; namespace AsbCloudDb.Model.ProcessMaps; -[Table("t_process_map_plan_operation_load_capacity"), Comment("РТК выработка нагрузки")] -public class ProcessMapPlanOperationLoadCapacity : ProcessMapPlanBase +[Table("t_process_map_plan_load_capacity"), Comment("РТК выработка нагрузки")] +public class ProcessMapPlanLoadCapacity : ProcessMapPlanBase { [Column("time_load_capacity_min"), Comment("Время выработки минимальное, сек")] [Range(0.0, 800.0)] @@ -27,5 +27,5 @@ public class ProcessMapPlanOperationLoadCapacity : ProcessMapPlanBase public string Note { get; set; } = string.Empty; [ForeignKey(nameof(IdPrevious))] - public virtual ProcessMapPlanOperationLoadCapacity? Previous { get; set; } + public virtual ProcessMapPlanLoadCapacity? Previous { get; set; } } \ No newline at end of file diff --git a/AsbCloudInfrastructure/DependencyInjection.cs b/AsbCloudInfrastructure/DependencyInjection.cs index e4239ef3..652c5d3c 100644 --- a/AsbCloudInfrastructure/DependencyInjection.cs +++ b/AsbCloudInfrastructure/DependencyInjection.cs @@ -160,11 +160,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() @@ -431,7 +431,7 @@ namespace AsbCloudInfrastructure services.AddTransient(); services.AddTransient(); services.AddTransient(); - services.AddTransient(); + services.AddTransient(); services.AddTransient(); services.AddTransient(); services.AddTransient(); @@ -457,7 +457,7 @@ namespace AsbCloudInfrastructure services.AddTransient(); services.AddTransient(); services.AddTransient(); - services.AddTransient(); + services.AddTransient(); services.AddTransient(); services.AddTransient(); services.AddTransient(); @@ -503,8 +503,8 @@ namespace AsbCloudInfrastructure ProcessMapPlanBaseRepository>(); services.AddTransient< - IChangeLogRepository, - ProcessMapPlanBaseRepository>(); + IChangeLogRepository, + ProcessMapPlanBaseRepository>(); services.AddTransient< IChangeLogRepository, @@ -570,7 +570,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/ProcessMapPlanOperationLoadCapacityTemplate.cs b/AsbCloudInfrastructure/Services/ExcelServices/Templates/ProcessMapPlanTemplates/ProcessMapPlanLoadCapacityTemplate.cs similarity index 67% rename from AsbCloudInfrastructure/Services/ExcelServices/Templates/ProcessMapPlanTemplates/ProcessMapPlanOperationLoadCapacityTemplate.cs rename to AsbCloudInfrastructure/Services/ExcelServices/Templates/ProcessMapPlanTemplates/ProcessMapPlanLoadCapacityTemplate.cs index 766b9fa9..386aded1 100644 --- a/AsbCloudInfrastructure/Services/ExcelServices/Templates/ProcessMapPlanTemplates/ProcessMapPlanOperationLoadCapacityTemplate.cs +++ b/AsbCloudInfrastructure/Services/ExcelServices/Templates/ProcessMapPlanTemplates/ProcessMapPlanLoadCapacityTemplate.cs @@ -2,13 +2,13 @@ using System.Collections.Generic; namespace AsbCloudInfrastructure.Services.ExcelServices.Templates.ProcessMapPlanTemplates; -public class ProcessMapPlanOperationLoadCapacityTemplate : ITemplateParameters +public class ProcessMapPlanLoadCapacityTemplate : ITemplateParameters { public string SheetName => "Выработка нагрузки"; public int HeaderRowsCount => 2; - public string FileName => "ProcessMapPlanOperationLoadCapacityTemplate.xlsx"; + public string FileName => "ProcessMapPlanLoadCapacityTemplate.xlsx"; public IDictionary Cells => new Dictionary { diff --git a/AsbCloudInfrastructure/Services/ProcessMapPlan/Export/ProcessMapPlanOperationLoadCapacityExportService.cs b/AsbCloudInfrastructure/Services/ProcessMapPlan/Export/ProcessMapPlanLoadCapacityExportService.cs similarity index 70% rename from AsbCloudInfrastructure/Services/ProcessMapPlan/Export/ProcessMapPlanOperationLoadCapacityExportService.cs rename to AsbCloudInfrastructure/Services/ProcessMapPlan/Export/ProcessMapPlanLoadCapacityExportService.cs index 640f2b8f..53534abb 100644 --- a/AsbCloudInfrastructure/Services/ProcessMapPlan/Export/ProcessMapPlanOperationLoadCapacityExportService.cs +++ b/AsbCloudInfrastructure/Services/ProcessMapPlan/Export/ProcessMapPlanLoadCapacityExportService.cs @@ -10,16 +10,16 @@ using System.Threading.Tasks; namespace AsbCloudInfrastructure.Services.ProcessMapPlan.Export; -public class ProcessMapPlanOperationLoadCapacityExportService : ProcessMapPlanExportService +public class ProcessMapPlanLoadCapacityExportService : ProcessMapPlanExportService { - public ProcessMapPlanOperationLoadCapacityExportService( - IChangeLogRepository processMapPlanRepository, + public ProcessMapPlanLoadCapacityExportService( + IChangeLogRepository processMapPlanRepository, IWellService wellService) : base(processMapPlanRepository, wellService) { } - protected override ITemplateParameters TemplateParameters { get; } = new ProcessMapPlanOperationLoadCapacityTemplate(); + protected override ITemplateParameters TemplateParameters { get; } = new ProcessMapPlanLoadCapacityTemplate(); protected override async Task BuildFileNameAsync(WellRelatedExportRequest options, CancellationToken token) { diff --git a/AsbCloudInfrastructure/Services/ProcessMapPlan/Parser/ProcessMapPlanOperationLoadCapacityParser.cs b/AsbCloudInfrastructure/Services/ProcessMapPlan/Parser/ProcessMapPlanLoadCapacityParser.cs similarity index 73% rename from AsbCloudInfrastructure/Services/ProcessMapPlan/Parser/ProcessMapPlanOperationLoadCapacityParser.cs rename to AsbCloudInfrastructure/Services/ProcessMapPlan/Parser/ProcessMapPlanLoadCapacityParser.cs index 6bb3a263..da88b090 100644 --- a/AsbCloudInfrastructure/Services/ProcessMapPlan/Parser/ProcessMapPlanOperationLoadCapacityParser.cs +++ b/AsbCloudInfrastructure/Services/ProcessMapPlan/Parser/ProcessMapPlanLoadCapacityParser.cs @@ -9,16 +9,16 @@ using AsbCloudInfrastructure.Services.ExcelServices.Templates.ProcessMapPlanTemp namespace AsbCloudInfrastructure.Services.ProcessMapPlan.Parser; -public class ProcessMapPlanOperationLoadCapacityParser : ProcessMapPlanParser +public class ProcessMapPlanLoadCapacityParser : ProcessMapPlanParser { - public ProcessMapPlanOperationLoadCapacityParser(IWellOperationRepository wellOperationRepository) + public ProcessMapPlanLoadCapacityParser(IWellOperationRepository wellOperationRepository) : base(wellOperationRepository) { } - protected override ITemplateParameters TemplateParameters => new ProcessMapPlanOperationLoadCapacityTemplate(); + protected override ITemplateParameters TemplateParameters => new ProcessMapPlanLoadCapacityTemplate(); - protected override ProcessMapPlanOperationLoadCapacityDto BuildDto(IDictionary row, int rowNumber) + protected override ProcessMapPlanLoadCapacityDto BuildDto(IDictionary row, int rowNumber) { var dto = base.BuildDto(row, rowNumber); diff --git a/AsbCloudWebApi.IntegrationTests/Controllers/ProcessMapPlan/ProcessMapPlanOperationLoadCapacityControllerTest.cs b/AsbCloudWebApi.IntegrationTests/Controllers/ProcessMapPlan/Operations/ProcessMapPlanLoadCapacityControllerTest.cs similarity index 58% rename from AsbCloudWebApi.IntegrationTests/Controllers/ProcessMapPlan/ProcessMapPlanOperationLoadCapacityControllerTest.cs rename to AsbCloudWebApi.IntegrationTests/Controllers/ProcessMapPlan/Operations/ProcessMapPlanLoadCapacityControllerTest.cs index 7cd21518..bbd353f2 100644 --- a/AsbCloudWebApi.IntegrationTests/Controllers/ProcessMapPlan/ProcessMapPlanOperationLoadCapacityControllerTest.cs +++ b/AsbCloudWebApi.IntegrationTests/Controllers/ProcessMapPlan/Operations/ProcessMapPlanLoadCapacityControllerTest.cs @@ -10,18 +10,18 @@ using AsbCloudWebApi.IntegrationTests; using Microsoft.EntityFrameworkCore; using Xunit; -namespace AsbCloudWebApi.Controllers.ProcessMaps; +namespace AsbCloudWebApi.IntegrationTests.Controllers.ProcessMapPlan.Operations; /// /// РТК план выработка нагрузки /// -public class ProcessMapPlanOperationLoadCapacityControllerTest : - ProcessMapPlanBaseControllerTest +public class ProcessMapPlanLoadCapacityControllerTest : + ProcessMapPlanBaseControllerTest { - public ProcessMapPlanOperationLoadCapacityControllerTest(WebAppFactoryFixture factory) : base(factory, "ProcessMapPlanOperationLoadCapacity") + public ProcessMapPlanLoadCapacityControllerTest(WebAppFactoryFixture factory) : base(factory, "ProcessMapPlanOperationLoadCapacity") { } - private readonly ProcessMapPlanOperationLoadCapacityDto dto = new ProcessMapPlanOperationLoadCapacityDto() + private readonly ProcessMapPlanLoadCapacityDto dto = new ProcessMapPlanLoadCapacityDto() { IdWell = 1, DepthStart = 1, @@ -34,7 +34,7 @@ public class ProcessMapPlanOperationLoadCapacityControllerTest : WeightOnBitMin = 3, }; - private readonly ProcessMapPlanOperationLoadCapacity entity = new ProcessMapPlanOperationLoadCapacity() + private readonly ProcessMapPlanLoadCapacity entity = new ProcessMapPlanLoadCapacity() { IdWell = 1, DepthEnd = 10, @@ -56,17 +56,17 @@ public class ProcessMapPlanOperationLoadCapacityControllerTest : await Get(entity, dto); } - protected override ProcessMapPlanOperationLoadCapacity GetByNote(DbSet dbSet, ProcessMapPlanOperationLoadCapacityDto dto) + protected override ProcessMapPlanLoadCapacity GetByNote(DbSet dbSet, ProcessMapPlanLoadCapacityDto dto) { throw new NotImplementedException(); } - protected override ProcessMapPlanOperationLoadCapacityDto GetByNote(IEnumerable dtos, ProcessMapPlanOperationLoadCapacityDto dto) + protected override ProcessMapPlanLoadCapacityDto GetByNote(IEnumerable dtos, ProcessMapPlanLoadCapacityDto dto) { throw new NotImplementedException(); } - protected override ProcessMapPlanOperationLoadCapacity? GetByWellId() + protected override ProcessMapPlanLoadCapacity? GetByWellId() { throw new NotImplementedException(); } diff --git a/AsbCloudWebApi/Controllers/ProcessMaps/ProcessMapPlanOperationLoadCapacityController.cs b/AsbCloudWebApi/Controllers/ProcessMaps/Operations/ProcessMapPlanLoadCapacityController.cs similarity index 56% rename from AsbCloudWebApi/Controllers/ProcessMaps/ProcessMapPlanOperationLoadCapacityController.cs rename to AsbCloudWebApi/Controllers/ProcessMaps/Operations/ProcessMapPlanLoadCapacityController.cs index 9a3b6929..7e813ef4 100644 --- a/AsbCloudWebApi/Controllers/ProcessMaps/ProcessMapPlanOperationLoadCapacityController.cs +++ b/AsbCloudWebApi/Controllers/ProcessMaps/Operations/ProcessMapPlanLoadCapacityController.cs @@ -6,20 +6,20 @@ using AsbCloudDb.Model.ProcessMaps; using AsbCloudInfrastructure.Services.ProcessMapPlan.Export; using AsbCloudInfrastructure.Services.ProcessMapPlan.Parser; -namespace AsbCloudWebApi.Controllers.ProcessMaps; +namespace AsbCloudWebApi.Controllers.ProcessMaps.Operations; /// /// РТК план выработка нагрузки /// -public class ProcessMapPlanOperationLoadCapacityController : - ProcessMapPlanBaseController +public class ProcessMapPlanLoadCapacityController : + ProcessMapPlanBaseController { - public ProcessMapPlanOperationLoadCapacityController( - IChangeLogRepository repository, + public ProcessMapPlanLoadCapacityController( + IChangeLogRepository repository, IWellService wellService, - ProcessMapPlanOperationLoadCapacityParser parserService, + ProcessMapPlanLoadCapacityParser parserService, ITelemetryService telemetryService, - ProcessMapPlanOperationLoadCapacityExportService processMapPlanExportService) + ProcessMapPlanLoadCapacityExportService processMapPlanExportService) : base(repository, wellService, parserService, processMapPlanExportService, telemetryService) { }