on.nemtina/DD.WellWorkover.Cloud
1
0
Fork 0
forked from ddrilling/AsbCloudServer
Code Pull Requests Activity

Правки после ревью - 4

Browse Source
This commit is contained in:
Olga Nemt 2023-11-30 15:20:22 +05:00
parent 1acc94fad8
commit 6046b61ba1
7 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
AsbCloudInfrastructure/Services/Trajectory/Export/TrajectoryPlanExportService.cs
View File

@ -17,8 +17,8 @@ namespace AsbCloudInfrastructure.Services.Trajectory.Export
public TrajectoryPlanExportService( public TrajectoryPlanExportService(
IWellService wellService, IWellService wellService,
ITrajectoryEditableRepository<TrajectoryGeoPlanDto> plannedTrajectoryService) ITrajectoryEditableRepository<TrajectoryGeoPlanDto> trajectoryPlanService)
: base(wellService, plannedTrajectoryService) : base(wellService, trajectoryPlanService)
{ {
} }

4
AsbCloudInfrastructure/Services/Trajectory/TrajectoryService.cs
View File

@ -130,11 +130,11 @@ public class TrajectoryService
private TrajectoryNnbService trajectoryNnbService; private TrajectoryNnbService trajectoryNnbService;
public TrajectoryService( public TrajectoryService(
ITrajectoryEditableRepository<TrajectoryGeoPlanDto> plannedRepository, ITrajectoryEditableRepository<TrajectoryGeoPlanDto> planRepository,
ITrajectoryEditableRepository<TrajectoryGeoFactDto> factRepository, ITrajectoryEditableRepository<TrajectoryGeoFactDto> factRepository,
ITrajectoryNnbRepository nnbRepository) ITrajectoryNnbRepository nnbRepository)
{ {
trajectoryPlanService = new TrajectoryPlanService(plannedRepository); trajectoryPlanService = new TrajectoryPlanService(planRepository);
trajectoryFactService = new TrajectoryFactService(factRepository); trajectoryFactService = new TrajectoryFactService(factRepository);
trajectoryNnbService = new TrajectoryNnbService(nnbRepository); trajectoryNnbService = new TrajectoryNnbService(nnbRepository);
} }

2
AsbCloudWebApi.Tests/AsbCloudWebApi.Tests.csproj
View File

@ -15,7 +15,7 @@
<ItemGroup> <ItemGroup>
<EmbeddedResource Include="UnitTests\Services\Trajectory\Templates\TrajectoryFactManualTemplate.xlsx" /> <EmbeddedResource Include="UnitTests\Services\Trajectory\Templates\TrajectoryFactManualTemplate.xlsx" />
<EmbeddedResource Include="UnitTests\Services\Trajectory\Templates\TrajectoryPlannedTemplate.xlsx" /> <EmbeddedResource Include="UnitTests\Services\Trajectory\Templates\TrajectoryPlanTemplate.xlsx" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>

0
AsbCloudWebApi.Tests/UnitTests/Services/Trajectory/Templates/TrajectoryPlannedTemplate.xlsx → AsbCloudWebApi.Tests/UnitTests/Services/Trajectory/Templates/TrajectoryPlanTemplate.xlsx
View File

2
AsbCloudWebApi.Tests/UnitTests/Services/Trajectory/TrajectoryExportTest.cs
View File

@ -94,7 +94,7 @@ namespace AsbCloudWebApi.Tests.UnitTests.Services.Trajectory
} }
[Fact] [Fact]
public async Task Export_trajectory_planned() public async Task Export_trajectory_plan()
{ {
trajectoryPlanRepository.GetAsync(idWell, CancellationToken.None) trajectoryPlanRepository.GetAsync(idWell, CancellationToken.None)
.Returns(trajectoryPlanRows); .Returns(trajectoryPlanRows);

4
AsbCloudWebApi.Tests/UnitTests/Services/Trajectory/TrajectoryImportTest.cs
View File

@ -9,7 +9,7 @@ namespace AsbCloudWebApi.Tests.UnitTests.Services.Trajectory
private readonly TrajectoryPlanParserService trajectoryPlanImportService; private readonly TrajectoryPlanParserService trajectoryPlanImportService;
private readonly TrajectoryFactManualParserService trajectoryFactManualImportService; private readonly TrajectoryFactManualParserService trajectoryFactManualImportService;
private string usingTemplateFile = "AsbCloudWebApi.Tests.Services.Trajectory.Templates"; private string usingTemplateFile = "AsbCloudWebApi.Tests.UnitTests.Services.Trajectory.Templates";
public TrajectoryImportTest() public TrajectoryImportTest()
{ {
@ -18,7 +18,7 @@ namespace AsbCloudWebApi.Tests.UnitTests.Services.Trajectory
} }
[Fact] [Fact]
public void Import_trajectory_planned() public void Import_trajectory_plan()
{ {
var stream = System.Reflection.Assembly.GetExecutingAssembly() var stream = System.Reflection.Assembly.GetExecutingAssembly()
.GetManifestResourceStream($"{usingTemplateFile}.TrajectoryPlanTemplate.xlsx"); .GetManifestResourceStream($"{usingTemplateFile}.TrajectoryPlanTemplate.xlsx");

12
AsbCloudWebApi/Controllers/Trajectory/TrajectoryPlanController.cs
View File

@ -22,15 +22,15 @@ namespace AsbCloudWebApi.Controllers.Trajectory
private readonly TrajectoryService trajectoryVisualizationService; private readonly TrajectoryService trajectoryVisualizationService;
public TrajectoryPlanController(IWellService wellService, public TrajectoryPlanController(IWellService wellService,
TrajectoryPlanParserService plannedTrajectoryImportService, TrajectoryPlanParserService trajectoryPlanImportService,
TrajectoryPlanExportService plannedTrajectoryExportService, TrajectoryPlanExportService trajectoryPlanExportService,
ITrajectoryEditableRepository<TrajectoryGeoPlanDto> plannedTrajectoryRepository, ITrajectoryEditableRepository<TrajectoryGeoPlanDto> trajectoryPlanRepository,
TrajectoryService trajectoryVisualizationService) TrajectoryService trajectoryVisualizationService)
: base( : base(
wellService, wellService,
plannedTrajectoryImportService, trajectoryPlanImportService,
plannedTrajectoryExportService, trajectoryPlanExportService,
plannedTrajectoryRepository) trajectoryPlanRepository)
{ {
fileName = "ЕЦП_шаблон_файла_плановая_траектория.xlsx"; fileName = "ЕЦП_шаблон_файла_плановая_траектория.xlsx";
this.trajectoryVisualizationService = trajectoryVisualizationService; this.trajectoryVisualizationService = trajectoryVisualizationService;