diff --git a/AsbCloudApp/Data/ProcessMaps/ProcessMapPlanFunctionsAutoHoldDto.cs b/AsbCloudApp/Data/ProcessMaps/ProcessMapPlanAutoHoldTFDto.cs similarity index 84% rename from AsbCloudApp/Data/ProcessMaps/ProcessMapPlanFunctionsAutoHoldDto.cs rename to AsbCloudApp/Data/ProcessMaps/ProcessMapPlanAutoHoldTFDto.cs index aaed0489..83733093 100644 --- a/AsbCloudApp/Data/ProcessMaps/ProcessMapPlanFunctionsAutoHoldDto.cs +++ b/AsbCloudApp/Data/ProcessMaps/ProcessMapPlanAutoHoldTFDto.cs @@ -3,9 +3,9 @@ namespace AsbCloudApp.Data.ProcessMaps; /// -/// РТК план автоудержание +/// РТК план автоудержание TF /// -public class ProcessMapPlanFunctionsAutoHoldDto : ProcessMapPlanBaseDto +public class ProcessMapPlanAutoHoldTFDto : ProcessMapPlanBaseDto { /// /// Зенитный угол, градусы diff --git a/AsbCloudDb/Model/AsbCloudDbContext.cs b/AsbCloudDb/Model/AsbCloudDbContext.cs index 94395a4d..038301da 100644 --- a/AsbCloudDb/Model/AsbCloudDbContext.cs +++ b/AsbCloudDb/Model/AsbCloudDbContext.cs @@ -34,7 +34,7 @@ namespace AsbCloudDb.Model public virtual DbSet ProcessMapPlanFunctionsDrillTest => Set(); public virtual DbSet ProcessMapPlanFunctionsShockTest => Set(); public virtual DbSet ProcessMapPlanFunctionsDamper => Set(); - public virtual DbSet ProcessMapPlanFunctionsAutoHold => Set(); + public virtual DbSet ProcessMapPlanFunctionsAutoHold => Set(); public virtual DbSet ProcessMapPlanFunctionsJarrDrillTool => Set(); public virtual DbSet ProcessMapPlanFunctionsUpgradeNoload => Set(); public virtual DbSet ProcessMapPlanFunctionsOscillation => Set(); @@ -533,7 +533,7 @@ namespace AsbCloudDb.Model .WithMany() .OnDelete(DeleteBehavior.Restrict); - modelBuilder.Entity() + modelBuilder.Entity() .HasOne(p => p.Author) .WithMany() .OnDelete(DeleteBehavior.Restrict); @@ -633,7 +633,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 4ebae966..24a46649 100644 --- a/AsbCloudDb/Model/IAsbCloudDbContext.cs +++ b/AsbCloudDb/Model/IAsbCloudDbContext.cs @@ -95,7 +95,7 @@ namespace AsbCloudDb.Model DbSet ProcessMapPlanFunctionsDrillTest { get; } DbSet ProcessMapPlanFunctionsShockTest { get; } DbSet ProcessMapPlanFunctionsDamper { get; } - DbSet ProcessMapPlanFunctionsAutoHold { get; } + DbSet ProcessMapPlanFunctionsAutoHold { get; } DbSet ProcessMapPlanFunctionsJarrDrillTool { get; } DbSet ProcessMapPlanFunctionsUpgradeNoload { get; } DbSet ProcessMapPlanFunctionsOscillation { get; } diff --git a/AsbCloudDb/Model/ProcessMapPlan/ProcessMapPlanFunctionsAutoHold.cs b/AsbCloudDb/Model/ProcessMapPlan/ProcessMapPlanAutoHoldTF.cs similarity index 70% rename from AsbCloudDb/Model/ProcessMapPlan/ProcessMapPlanFunctionsAutoHold.cs rename to AsbCloudDb/Model/ProcessMapPlan/ProcessMapPlanAutoHoldTF.cs index ae61fba0..2144743e 100644 --- a/AsbCloudDb/Model/ProcessMapPlan/ProcessMapPlanFunctionsAutoHold.cs +++ b/AsbCloudDb/Model/ProcessMapPlan/ProcessMapPlanAutoHoldTF.cs @@ -5,8 +5,8 @@ using Microsoft.EntityFrameworkCore; namespace AsbCloudDb.Model.ProcessMaps; -[Table("t_process_map_plan_functions_autohold"), Comment("Автоудержание")] -public class ProcessMapPlanFunctionsAutoHold : ProcessMapPlanBase +[Table("t_process_map_plan_auto_hold_tf"), Comment("Автоудержание TF")] +public class ProcessMapPlanAutoHoldTF : ProcessMapPlanBase { [Column("zenit_angle"), Comment("Зенитный угол, градусы")] [Range(0.0, 100.0)] @@ -17,5 +17,5 @@ public class ProcessMapPlanFunctionsAutoHold : ProcessMapPlanBase public string Note { get; set; } = string.Empty; [ForeignKey(nameof(IdPrevious))] - public virtual ProcessMapPlanFunctionsAutoHold? Previous { get; set; } + public virtual ProcessMapPlanAutoHoldTF? Previous { get; set; } } \ No newline at end of file diff --git a/AsbCloudInfrastructure/DependencyInjection.cs b/AsbCloudInfrastructure/DependencyInjection.cs index 950fb2a8..bc48b3d5 100644 --- a/AsbCloudInfrastructure/DependencyInjection.cs +++ b/AsbCloudInfrastructure/DependencyInjection.cs @@ -230,11 +230,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() @@ -441,7 +441,7 @@ namespace AsbCloudInfrastructure services.AddTransient(); services.AddTransient(); services.AddTransient(); - services.AddTransient(); + services.AddTransient(); services.AddTransient(); services.AddTransient(); services.AddTransient(); @@ -467,7 +467,7 @@ namespace AsbCloudInfrastructure services.AddTransient(); services.AddTransient(); services.AddTransient(); - services.AddTransient(); + services.AddTransient(); services.AddTransient(); services.AddTransient(); services.AddTransient(); @@ -543,8 +543,8 @@ namespace AsbCloudInfrastructure ProcessMapPlanBaseRepository>(); services.AddTransient< - IChangeLogRepository, - ProcessMapPlanBaseRepository>(); + IChangeLogRepository, + ProcessMapPlanBaseRepository>(); services.AddTransient< IChangeLogRepository, @@ -580,7 +580,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/ProcessMapPlanFunctionsAutoHoldTemplate.cs b/AsbCloudInfrastructure/Services/ExcelServices/Templates/ProcessMapPlanTemplates/ProcessMapPlanAutoHoldTFTemplate.cs similarity index 54% rename from AsbCloudInfrastructure/Services/ExcelServices/Templates/ProcessMapPlanTemplates/ProcessMapPlanFunctionsAutoHoldTemplate.cs rename to AsbCloudInfrastructure/Services/ExcelServices/Templates/ProcessMapPlanTemplates/ProcessMapPlanAutoHoldTFTemplate.cs index 3ab5b7e1..3ddfe81c 100644 --- a/AsbCloudInfrastructure/Services/ExcelServices/Templates/ProcessMapPlanTemplates/ProcessMapPlanFunctionsAutoHoldTemplate.cs +++ b/AsbCloudInfrastructure/Services/ExcelServices/Templates/ProcessMapPlanTemplates/ProcessMapPlanAutoHoldTFTemplate.cs @@ -2,13 +2,13 @@ using System.Collections.Generic; namespace AsbCloudInfrastructure.Services.ExcelServices.Templates.ProcessMapPlanTemplates; -public class ProcessMapPlanFunctionsAutoHoldTemplate : ITemplateParameters +public class ProcessMapPlanAutoHoldTFTemplate : ITemplateParameters { - public string SheetName => "Автоудержание"; + public string SheetName => "Автоудержание TF"; public int HeaderRowsCount => 2; - public string FileName => "ProcessMapPlanFunctionsAutoHoldTemplate.xlsx"; + public string FileName => "ProcessMapPlanAutoHoldTFTemplate.xlsx"; public IDictionary Cells => new Dictionary { diff --git a/AsbCloudInfrastructure/Services/ProcessMapPlan/Export/ProcessMapPlanFunctionsAutoHoldExportService.cs b/AsbCloudInfrastructure/Services/ProcessMapPlan/Export/ProcessMapPlanAutoHoldTFExportService.cs similarity index 70% rename from AsbCloudInfrastructure/Services/ProcessMapPlan/Export/ProcessMapPlanFunctionsAutoHoldExportService.cs rename to AsbCloudInfrastructure/Services/ProcessMapPlan/Export/ProcessMapPlanAutoHoldTFExportService.cs index c53f0e1c..deb14626 100644 --- a/AsbCloudInfrastructure/Services/ProcessMapPlan/Export/ProcessMapPlanFunctionsAutoHoldExportService.cs +++ b/AsbCloudInfrastructure/Services/ProcessMapPlan/Export/ProcessMapPlanAutoHoldTFExportService.cs @@ -10,21 +10,21 @@ using System.Threading.Tasks; namespace AsbCloudInfrastructure.Services.ProcessMapPlan.Export; -public class ProcessMapPlanFunctionsAutoHoldExportService : ProcessMapPlanExportService +public class ProcessMapPlanAutoHoldTFExportService : ProcessMapPlanExportService { - public ProcessMapPlanFunctionsAutoHoldExportService( - IChangeLogRepository processMapPlanRepository, + public ProcessMapPlanAutoHoldTFExportService( + IChangeLogRepository processMapPlanRepository, IWellService wellService) : base(processMapPlanRepository, wellService) { } - protected override ITemplateParameters TemplateParameters { get; } = new ProcessMapPlanFunctionsAutoHoldTemplate(); + protected override ITemplateParameters TemplateParameters { get; } = new ProcessMapPlanAutoHoldTFTemplate(); protected override async Task BuildFileNameAsync(WellRelatedExportRequest options, CancellationToken token) { var caption = await wellService.GetWellCaptionByIdAsync(options.IdWell, token); - return $"{caption}_РТК_План_автоудержание.xlsx"; + return $"{caption}_РТК_План_автоудержание_tf.xlsx"; } } \ No newline at end of file diff --git a/AsbCloudInfrastructure/Services/ProcessMapPlan/Parser/ProcessMapPlanFunctionsAutoHoldParser.cs b/AsbCloudInfrastructure/Services/ProcessMapPlan/Parser/ProcessMapPlanAutoHoldTFParser.cs similarity index 74% rename from AsbCloudInfrastructure/Services/ProcessMapPlan/Parser/ProcessMapPlanFunctionsAutoHoldParser.cs rename to AsbCloudInfrastructure/Services/ProcessMapPlan/Parser/ProcessMapPlanAutoHoldTFParser.cs index 0eb26ff9..bae893a6 100644 --- a/AsbCloudInfrastructure/Services/ProcessMapPlan/Parser/ProcessMapPlanFunctionsAutoHoldParser.cs +++ b/AsbCloudInfrastructure/Services/ProcessMapPlan/Parser/ProcessMapPlanAutoHoldTFParser.cs @@ -9,16 +9,16 @@ using AsbCloudInfrastructure.Services.ExcelServices.Templates.ProcessMapPlanTemp namespace AsbCloudInfrastructure.Services.ProcessMapPlan.Parser; -public class ProcessMapPlanFunctionsAutoHoldParser : ProcessMapPlanParser +public class ProcessMapPlanAutoHoldTFParser : ProcessMapPlanParser { - public ProcessMapPlanFunctionsAutoHoldParser(IWellOperationRepository wellOperationRepository) + public ProcessMapPlanAutoHoldTFParser(IWellOperationRepository wellOperationRepository) : base(wellOperationRepository) { } - protected override ITemplateParameters TemplateParameters => new ProcessMapPlanFunctionsAutoHoldTemplate(); + protected override ITemplateParameters TemplateParameters => new ProcessMapPlanAutoHoldTFTemplate(); - protected override ProcessMapPlanFunctionsAutoHoldDto BuildDto(IDictionary row, int rowNumber) + protected override ProcessMapPlanAutoHoldTFDto BuildDto(IDictionary row, int rowNumber) { var dto = base.BuildDto(row, rowNumber); diff --git a/AsbCloudWebApi.IntegrationTests/Controllers/ProcessMapPlan/ProcessMapPlanFunctionsAutoHoldControllerTest.cs b/AsbCloudWebApi.IntegrationTests/Controllers/ProcessMapPlan/ProcessMapPlanAutoHoldTFControllerTest.cs similarity index 59% rename from AsbCloudWebApi.IntegrationTests/Controllers/ProcessMapPlan/ProcessMapPlanFunctionsAutoHoldControllerTest.cs rename to AsbCloudWebApi.IntegrationTests/Controllers/ProcessMapPlan/ProcessMapPlanAutoHoldTFControllerTest.cs index 6b548b80..392c99e3 100644 --- a/AsbCloudWebApi.IntegrationTests/Controllers/ProcessMapPlan/ProcessMapPlanFunctionsAutoHoldControllerTest.cs +++ b/AsbCloudWebApi.IntegrationTests/Controllers/ProcessMapPlan/ProcessMapPlanAutoHoldTFControllerTest.cs @@ -15,13 +15,13 @@ namespace AsbCloudWebApi.Controllers.ProcessMaps; /// /// РТК план автоудержание /// -public class ProcessMapPlanFunctionsAutoHoldControllerTest : - ProcessMapPlanBaseControllerTest +public class ProcessMapPlanAutoHoldTFControllerTest : + ProcessMapPlanBaseControllerTest { - public ProcessMapPlanFunctionsAutoHoldControllerTest(WebAppFactoryFixture factory) : base(factory, "ProcessMapPlanFunctionsAutoHold") + public ProcessMapPlanAutoHoldTFControllerTest(WebAppFactoryFixture factory) : base(factory, "ProcessMapPlanFunctionsAutoHold") { } - private readonly ProcessMapPlanFunctionsAutoHoldDto dto = new ProcessMapPlanFunctionsAutoHoldDto() + private readonly ProcessMapPlanAutoHoldTFDto dto = new ProcessMapPlanAutoHoldTFDto() { IdWell = 1, DepthStart = 1, @@ -32,7 +32,7 @@ public class ProcessMapPlanFunctionsAutoHoldControllerTest : ZenithAngle = 2, }; - private readonly ProcessMapPlanFunctionsAutoHold entity = new ProcessMapPlanFunctionsAutoHold() + private readonly ProcessMapPlanAutoHoldTF entity = new ProcessMapPlanAutoHoldTF() { IdWell = 1, DepthEnd = 10, @@ -52,17 +52,17 @@ public class ProcessMapPlanFunctionsAutoHoldControllerTest : await Get(entity, dto); } - protected override ProcessMapPlanFunctionsAutoHold GetByNote(DbSet dbSet, ProcessMapPlanFunctionsAutoHoldDto dto) + protected override ProcessMapPlanAutoHoldTF GetByNote(DbSet dbSet, ProcessMapPlanAutoHoldTFDto dto) { throw new NotImplementedException(); } - protected override ProcessMapPlanFunctionsAutoHoldDto GetByNote(IEnumerable dtos, ProcessMapPlanFunctionsAutoHoldDto dto) + protected override ProcessMapPlanAutoHoldTFDto GetByNote(IEnumerable dtos, ProcessMapPlanAutoHoldTFDto dto) { throw new NotImplementedException(); } - protected override ProcessMapPlanFunctionsAutoHold? GetByWellId() + protected override ProcessMapPlanAutoHoldTF? GetByWellId() { throw new NotImplementedException(); } diff --git a/AsbCloudWebApi/Controllers/ProcessMaps/ProcessMapPlanFunctionsAutoHoldController.cs b/AsbCloudWebApi/Controllers/ProcessMaps/ProcessMapPlanAutoHoldTFController.cs similarity index 51% rename from AsbCloudWebApi/Controllers/ProcessMaps/ProcessMapPlanFunctionsAutoHoldController.cs rename to AsbCloudWebApi/Controllers/ProcessMaps/ProcessMapPlanAutoHoldTFController.cs index e31881ba..dbf138d5 100644 --- a/AsbCloudWebApi/Controllers/ProcessMaps/ProcessMapPlanFunctionsAutoHoldController.cs +++ b/AsbCloudWebApi/Controllers/ProcessMaps/ProcessMapPlanAutoHoldTFController.cs @@ -9,20 +9,20 @@ using AsbCloudInfrastructure.Services.ProcessMapPlan.Parser; namespace AsbCloudWebApi.Controllers.ProcessMaps; /// -/// РТК план автоудержание +/// РТК план автоудержание TF /// -public class ProcessMapPlanFunctionsAutoHoldController : - ProcessMapPlanBaseController +public class ProcessMapPlanAutoHoldTFController : + ProcessMapPlanBaseController { - public ProcessMapPlanFunctionsAutoHoldController( - IChangeLogRepository repository, + public ProcessMapPlanAutoHoldTFController( + IChangeLogRepository repository, IWellService wellService, - ProcessMapPlanFunctionsAutoHoldParser parserService, + ProcessMapPlanAutoHoldTFParser parserService, ITelemetryService telemetryService, - ProcessMapPlanFunctionsAutoHoldExportService processMapPlanExportService) + ProcessMapPlanAutoHoldTFExportService processMapPlanExportService) : base(repository, wellService, parserService, processMapPlanExportService, telemetryService) { } - protected override string TemplateFileName => "ЕЦП_шаблон_файла_РТК_план_автоудержание.xlsx"; + protected override string TemplateFileName => "ЕЦП_шаблон_файла_РТК_план_автоудержание_tf.xlsx"; } \ No newline at end of file