From 6046b61ba1a340f9234880fd9509f4986896a425 Mon Sep 17 00:00:00 2001 From: Olga Nemt Date: Thu, 30 Nov 2023 15:20:22 +0500 Subject: [PATCH] =?UTF-8?q?=D0=9F=D1=80=D0=B0=D0=B2=D0=BA=D0=B8=20=D0=BF?= =?UTF-8?q?=D0=BE=D1=81=D0=BB=D0=B5=20=D1=80=D0=B5=D0=B2=D1=8C=D1=8E=20-?= =?UTF-8?q?=204?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Export/TrajectoryPlanExportService.cs | 4 ++-- .../Services/Trajectory/TrajectoryService.cs | 4 ++-- AsbCloudWebApi.Tests/AsbCloudWebApi.Tests.csproj | 2 +- ...nedTemplate.xlsx => TrajectoryPlanTemplate.xlsx} | Bin .../Services/Trajectory/TrajectoryExportTest.cs | 2 +- .../Services/Trajectory/TrajectoryImportTest.cs | 4 ++-- .../Trajectory/TrajectoryPlanController.cs | 12 ++++++------ 7 files changed, 14 insertions(+), 14 deletions(-) rename AsbCloudWebApi.Tests/UnitTests/Services/Trajectory/Templates/{TrajectoryPlannedTemplate.xlsx => TrajectoryPlanTemplate.xlsx} (100%) diff --git a/AsbCloudInfrastructure/Services/Trajectory/Export/TrajectoryPlanExportService.cs b/AsbCloudInfrastructure/Services/Trajectory/Export/TrajectoryPlanExportService.cs index e5e6cc35..2d1c1689 100644 --- a/AsbCloudInfrastructure/Services/Trajectory/Export/TrajectoryPlanExportService.cs +++ b/AsbCloudInfrastructure/Services/Trajectory/Export/TrajectoryPlanExportService.cs @@ -17,8 +17,8 @@ namespace AsbCloudInfrastructure.Services.Trajectory.Export public TrajectoryPlanExportService( IWellService wellService, - ITrajectoryEditableRepository plannedTrajectoryService) - : base(wellService, plannedTrajectoryService) + ITrajectoryEditableRepository trajectoryPlanService) + : base(wellService, trajectoryPlanService) { } diff --git a/AsbCloudInfrastructure/Services/Trajectory/TrajectoryService.cs b/AsbCloudInfrastructure/Services/Trajectory/TrajectoryService.cs index 216a2041..730d0445 100644 --- a/AsbCloudInfrastructure/Services/Trajectory/TrajectoryService.cs +++ b/AsbCloudInfrastructure/Services/Trajectory/TrajectoryService.cs @@ -130,11 +130,11 @@ public class TrajectoryService private TrajectoryNnbService trajectoryNnbService; public TrajectoryService( - ITrajectoryEditableRepository plannedRepository, + ITrajectoryEditableRepository planRepository, ITrajectoryEditableRepository factRepository, ITrajectoryNnbRepository nnbRepository) { - trajectoryPlanService = new TrajectoryPlanService(plannedRepository); + trajectoryPlanService = new TrajectoryPlanService(planRepository); trajectoryFactService = new TrajectoryFactService(factRepository); trajectoryNnbService = new TrajectoryNnbService(nnbRepository); } diff --git a/AsbCloudWebApi.Tests/AsbCloudWebApi.Tests.csproj b/AsbCloudWebApi.Tests/AsbCloudWebApi.Tests.csproj index 8fd54d8c..03c795e6 100644 --- a/AsbCloudWebApi.Tests/AsbCloudWebApi.Tests.csproj +++ b/AsbCloudWebApi.Tests/AsbCloudWebApi.Tests.csproj @@ -15,7 +15,7 @@ - + diff --git a/AsbCloudWebApi.Tests/UnitTests/Services/Trajectory/Templates/TrajectoryPlannedTemplate.xlsx b/AsbCloudWebApi.Tests/UnitTests/Services/Trajectory/Templates/TrajectoryPlanTemplate.xlsx similarity index 100% rename from AsbCloudWebApi.Tests/UnitTests/Services/Trajectory/Templates/TrajectoryPlannedTemplate.xlsx rename to AsbCloudWebApi.Tests/UnitTests/Services/Trajectory/Templates/TrajectoryPlanTemplate.xlsx diff --git a/AsbCloudWebApi.Tests/UnitTests/Services/Trajectory/TrajectoryExportTest.cs b/AsbCloudWebApi.Tests/UnitTests/Services/Trajectory/TrajectoryExportTest.cs index 280b7392..0bc9c2d4 100644 --- a/AsbCloudWebApi.Tests/UnitTests/Services/Trajectory/TrajectoryExportTest.cs +++ b/AsbCloudWebApi.Tests/UnitTests/Services/Trajectory/TrajectoryExportTest.cs @@ -94,7 +94,7 @@ namespace AsbCloudWebApi.Tests.UnitTests.Services.Trajectory } [Fact] - public async Task Export_trajectory_planned() + public async Task Export_trajectory_plan() { trajectoryPlanRepository.GetAsync(idWell, CancellationToken.None) .Returns(trajectoryPlanRows); diff --git a/AsbCloudWebApi.Tests/UnitTests/Services/Trajectory/TrajectoryImportTest.cs b/AsbCloudWebApi.Tests/UnitTests/Services/Trajectory/TrajectoryImportTest.cs index 00063ada..cb151ce5 100644 --- a/AsbCloudWebApi.Tests/UnitTests/Services/Trajectory/TrajectoryImportTest.cs +++ b/AsbCloudWebApi.Tests/UnitTests/Services/Trajectory/TrajectoryImportTest.cs @@ -9,7 +9,7 @@ namespace AsbCloudWebApi.Tests.UnitTests.Services.Trajectory private readonly TrajectoryPlanParserService trajectoryPlanImportService; private readonly TrajectoryFactManualParserService trajectoryFactManualImportService; - private string usingTemplateFile = "AsbCloudWebApi.Tests.Services.Trajectory.Templates"; + private string usingTemplateFile = "AsbCloudWebApi.Tests.UnitTests.Services.Trajectory.Templates"; public TrajectoryImportTest() { @@ -18,7 +18,7 @@ namespace AsbCloudWebApi.Tests.UnitTests.Services.Trajectory } [Fact] - public void Import_trajectory_planned() + public void Import_trajectory_plan() { var stream = System.Reflection.Assembly.GetExecutingAssembly() .GetManifestResourceStream($"{usingTemplateFile}.TrajectoryPlanTemplate.xlsx"); diff --git a/AsbCloudWebApi/Controllers/Trajectory/TrajectoryPlanController.cs b/AsbCloudWebApi/Controllers/Trajectory/TrajectoryPlanController.cs index 3ca300ee..eb8559b6 100644 --- a/AsbCloudWebApi/Controllers/Trajectory/TrajectoryPlanController.cs +++ b/AsbCloudWebApi/Controllers/Trajectory/TrajectoryPlanController.cs @@ -22,15 +22,15 @@ namespace AsbCloudWebApi.Controllers.Trajectory private readonly TrajectoryService trajectoryVisualizationService; public TrajectoryPlanController(IWellService wellService, - TrajectoryPlanParserService plannedTrajectoryImportService, - TrajectoryPlanExportService plannedTrajectoryExportService, - ITrajectoryEditableRepository plannedTrajectoryRepository, + TrajectoryPlanParserService trajectoryPlanImportService, + TrajectoryPlanExportService trajectoryPlanExportService, + ITrajectoryEditableRepository trajectoryPlanRepository, TrajectoryService trajectoryVisualizationService) : base( wellService, - plannedTrajectoryImportService, - plannedTrajectoryExportService, - plannedTrajectoryRepository) + trajectoryPlanImportService, + trajectoryPlanExportService, + trajectoryPlanRepository) { fileName = "ЕЦП_шаблон_файла_плановая_траектория.xlsx"; this.trajectoryVisualizationService = trajectoryVisualizationService;