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

Правка по ревью-3

Browse Source
This commit is contained in:
Olga Nemt 2023-11-30 15:08:58 +05:00
parent 8fd9961da7
commit 1acc94fad8
16 changed files with 42 additions and 98 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
AsbCloudApp/Services/IPlannedTrajectoryImportService.cs
View File

@ -1,40 +0,0 @@
using System.IO;
using System.Threading;
using System.Threading.Tasks;
namespace AsbCloudApp.Services
{
/// <summary>
/// Сервис загрузки и обработки плановой траектории из файла
/// </summary>
public interface IPlannedTrajectoryImportService
{
/// <summary>
/// скачать шаблон для заполнения плановой траектории
/// </summary>
/// <returns></returns>
Stream GetTemplateFile();
/// <summary>
/// Получить имя файла (исходя из названия скважины)
/// </summary>
/// <returns></returns>
Task<string> GetFileNameAsync(int idWell, CancellationToken token);
/// <summary>
/// загрузить текущую плановую траекторию в .xlsx
/// </summary>
/// <param name="idWell"></param>
/// <param name="token"></param>
/// <returns></returns>
Task<Stream> ExportAsync(int idWell, CancellationToken token);
/// <summary>
/// импортировать из excel плановую траекторию
/// </summary>
/// <param name="idWell"></param>
/// <param name="idUser"></param>
/// <param name="stream"></param>
/// <param name="token"></param>
/// <param name="deleteBeforeImport">Очистить старые координаты перед импортом (если файл проходит валидацию)</param>
Task<int> ImportAsync(int idWell, int idUser, Stream stream, bool deleteBeforeImport, CancellationToken token);
}
}

2
AsbCloudInfrastructure/AsbCloudInfrastructure.csproj
View File

@ -38,7 +38,7 @@
<EmbeddedResource Include="Services\DrillTestReport\DrillTestReportTemplate.xlsx" />
<EmbeddedResource Include="Services\Trajectory\Templates\TrajectoryFactNnbTemplate.xlsx" />
<EmbeddedResource Include="Services\Trajectory\Templates\TrajectoryFactManualTemplate.xlsx" />
<EmbeddedResource Include="Services\Trajectory\Templates\TrajectoryPlannedTemplate.xlsx" />
<EmbeddedResource Include="Services\Trajectory\Templates\TrajectoryPlanTemplate.xlsx" />
<EmbeddedResource Include="Services\WellOperationService\ScheduleReportTemplate.xlsx" />
<EmbeddedResource Include="Services\WellOperationImport\Files\WellOperationImportTemplate.xlsx" />
<EmbeddedResource Include="Services\WellOperationImport\Files\Dictionaries\Operations.txt" />

4
AsbCloudInfrastructure/DependencyInjection.cs
View File

@ -201,10 +201,10 @@ namespace AsbCloudInfrastructure
services.AddTransient<IWellService, WellService>();
services.AddTransient<IWellOperationImportService, WellOperationImportService>();
services.AddTransient<IProcessMapReportWellDrillingExportService, ProcessMapReportWellDrillingExportService>();
services.AddTransient<TrajectoryPlannedExportService>();
services.AddTransient<TrajectoryPlanExportService>();
services.AddTransient<TrajectoryFactManualExportService>();
services.AddTransient<TrajectoryFactNnbExportService>();
services.AddTransient<TrajectoryPlannedParserService>();
services.AddTransient<TrajectoryPlanParserService>();
services.AddTransient<TrajectoryFactManualParserService>();
services.AddTransient<IWellOperationRepository, WellOperationRepository>();
services.AddTransient<IDailyReportService, DailyReportService>();

6
AsbCloudInfrastructure/Services/Trajectory/Export/TrajectoryExportService.cs
View File

@ -18,7 +18,7 @@ namespace AsbCloudInfrastructure.Services.Trajectory.Export
private readonly ITrajectoryRepository<T> trajectoryRepository;
public abstract string templateFileName { get; }
public abstract string usingTemplateFile { get; }
public abstract string sheetTrajectory { get; }
public abstract string sheetName { get; }
public abstract int headerRowsCount { get; }
public TrajectoryExportService(IWellService wellService, ITrajectoryRepository<T> trajectoryRepository)
@ -65,9 +65,9 @@ namespace AsbCloudInfrastructure.Services.Trajectory.Export
{
if (trajectories.Any())
{
var sheet = workbook.Worksheets.FirstOrDefault(ws => ws.Name == sheetTrajectory);
var sheet = workbook.Worksheets.FirstOrDefault(ws => ws.Name == sheetName);
if (sheet is null)
throw new FileFormatException($"Лист с именем {sheetTrajectory} отсутствует, либо имеет некорректное название");
throw new FileFormatException($"Лист с именем {sheetName} отсутствует, либо имеет некорректное название");
AddTrajecoryToSheet(sheet, trajectories);
}
}

2
AsbCloudInfrastructure/Services/Trajectory/Export/TrajectoryFactManualExportService.cs
View File

@ -10,7 +10,7 @@ namespace AsbCloudInfrastructure.Services.Trajectory.Export
{
public override string templateFileName { get; } = "TrajectoryFactManualTemplate.xlsx";
public override string usingTemplateFile { get; } = "AsbCloudInfrastructure.Services.Trajectory.Templates";
public override string sheetTrajectory { get; } = "Фактическая траектория";
public override string sheetName { get; } = "Фактическая траектория";
public override int headerRowsCount { get; } = 2;
public TrajectoryFactManualExportService(

2
AsbCloudInfrastructure/Services/Trajectory/Export/TrajectoryFactNnbExportService.cs
View File

@ -10,7 +10,7 @@ namespace AsbCloudInfrastructure.Services.Trajectory.Export
{
public override string templateFileName { get; } = "TrajectoryFactNnbTemplate.xlsx";
public override string usingTemplateFile { get; } = "AsbCloudInfrastructure.Services.Trajectory.Templates";
public override string sheetTrajectory { get; } = "Фактическая ннб-траектория";
public override string sheetName { get; } = "Фактическая ннб-траектория";
public override int headerRowsCount { get; } = 2;
public TrajectoryFactNnbExportService(

8
AsbCloudInfrastructure/Services/Trajectory/Export/TrajectoryPlannedExportService.cs → AsbCloudInfrastructure/Services/Trajectory/Export/TrajectoryPlanExportService.cs
View File

@ -5,17 +5,17 @@ using ClosedXML.Excel;
namespace AsbCloudInfrastructure.Services.Trajectory.Export
{
public class TrajectoryPlannedExportService : TrajectoryExportService<TrajectoryGeoPlanDto>
public class TrajectoryPlanExportService : TrajectoryExportService<TrajectoryGeoPlanDto>
{
/*
* password for PlannedTrajectoryTemplate.xlsx is Drill2022
*/
public override string templateFileName { get; } = "TrajectoryPlannedTemplate.xlsx";
public override string templateFileName { get; } = "TrajectoryPlanTemplate.xlsx";
public override string usingTemplateFile { get; } = "AsbCloudInfrastructure.Services.Trajectory.Templates";
public override string sheetTrajectory { get; } = "Плановая траектория";
public override string sheetName { get; } = "Плановая траектория";
public override int headerRowsCount { get; } = 2;
public TrajectoryPlannedExportService(
public TrajectoryPlanExportService(
IWellService wellService,
ITrajectoryEditableRepository<TrajectoryGeoPlanDto> plannedTrajectoryService)
: base(wellService, plannedTrajectoryService)

7
AsbCloudInfrastructure/Services/Trajectory/Import/TrajectoryFactManualParserService.cs
View File

@ -8,14 +8,9 @@ namespace AsbCloudInfrastructure.Services.Trajectory.Import
{
public override string templateFileName { get; } = "TrajectoryFactManualTemplate.xlsx";
public override string usingTemplateFile { get; } = "AsbCloudInfrastructure.Services.Trajectory.Templates";
public override string sheetNameTrajectory { get; } = "Фактическая траектория";
public override string sheetName { get; } = "Фактическая траектория";
public override int headerRowsCount { get; } = 2;
public TrajectoryFactManualParserService() : base()
{
}
protected override TrajectoryGeoFactDto ParseRow(IXLRow row)
{
var trajectoryRow = new TrajectoryGeoFactDto

12
AsbCloudInfrastructure/Services/Trajectory/Import/TrajectoryParserService.cs
View File

@ -1,7 +1,6 @@
using AsbCloudApp.Data.Trajectory;
using ClosedXML.Excel;
using System.Collections.Generic;
using System.ComponentModel.DataAnnotations;
using System.IO;
using System.Linq;
@ -12,15 +11,12 @@ namespace AsbCloudInfrastructure.Services.Trajectory.Import
{
public abstract string templateFileName { get; }
public abstract string usingTemplateFile { get; }
public abstract string sheetNameTrajectory { get; }
public abstract string sheetName { get; }
public abstract int headerRowsCount { get; }
public TrajectoryParserService()
{
}
protected abstract T ParseRow(IXLRow row);
public IEnumerable<T> ImportAsync(Stream stream)
public IEnumerable<T> Import(Stream stream)
{
using var workbook = new XLWorkbook(stream, XLEventTracking.Disabled);
var trajectoryRows = ParseFileStream(stream);
@ -37,9 +33,9 @@ namespace AsbCloudInfrastructure.Services.Trajectory.Import
private IEnumerable<T> ParseWorkbook(IXLWorkbook workbook)
{
var sheetTrajectory = workbook.Worksheets.FirstOrDefault(ws => ws.Name == sheetNameTrajectory);
var sheetTrajectory = workbook.Worksheets.FirstOrDefault(ws => ws.Name == sheetName);
if (sheetTrajectory is null)
throw new FileFormatException($"Книга excel не содержит листа {sheetNameTrajectory}.");
throw new FileFormatException($"Книга excel не содержит листа {sheetName}.");
var trajectoryRows = ParseSheet(sheetTrajectory);
return trajectoryRows;
}

13
AsbCloudInfrastructure/Services/Trajectory/Import/TrajectoryPlannedParserService.cs → AsbCloudInfrastructure/Services/Trajectory/Import/TrajectoryPlanParserService.cs
View File

@ -4,20 +4,13 @@ using ClosedXML.Excel;
namespace AsbCloudInfrastructure.Services.Trajectory.Import
{
public class TrajectoryPlannedParserService : TrajectoryParserService<TrajectoryGeoPlanDto>
public class TrajectoryPlanParserService : TrajectoryParserService<TrajectoryGeoPlanDto>
{
/*
* password for PlannedTrajectoryTemplate.xlsx is Drill2022
*/
public override string templateFileName { get; } = "TrajectoryPlannedTemplate.xlsx";
public override string templateFileName { get; } = "TrajectoryPlanTemplate.xlsx";
public override string usingTemplateFile { get; } = "AsbCloudInfrastructure.Services.Trajectory.Templates";
public override string sheetNameTrajectory { get; } = "Плановая траектория";
public override string sheetName { get; } = "Плановая траектория";
public override int headerRowsCount { get; } = 2;
public TrajectoryPlannedParserService() : base()
{
}
protected override TrajectoryGeoPlanDto ParseRow(IXLRow row)
{
var trajectoryRow = new TrajectoryGeoPlanDto

0
AsbCloudInfrastructure/Services/Trajectory/Templates/TrajectoryPlannedTemplate.xlsx → AsbCloudInfrastructure/Services/Trajectory/Templates/TrajectoryPlanTemplate.xlsx
View File

1
AsbCloudInfrastructure/Services/Trajectory/Templates/password.md Normal file
View File

@ -0,0 +1 @@
password for PlannedTrajectoryTemplate.xlsx is Drill2022

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

@ -1,6 +1,5 @@
using AsbCloudApp.Data.Trajectory;
using AsbCloudApp.Repositories;
using AsbCloudApp.Requests;
using AsbCloudApp.Services;
using AsbCloudInfrastructure.Services.Trajectory.Export;
using NSubstitute;
@ -14,8 +13,8 @@ namespace AsbCloudWebApi.Tests.UnitTests.Services.Trajectory
public class TrajectoryExportTest
{
private IWellService wellService;
private readonly ITrajectoryEditableRepository<TrajectoryGeoPlanDto> trajectoryPlannedRepository;
private readonly TrajectoryPlannedExportService trajectoryPlannedExportService;
private readonly ITrajectoryEditableRepository<TrajectoryGeoPlanDto> trajectoryPlanRepository;
private readonly TrajectoryPlanExportService trajectoryPlanExportService;
private readonly ITrajectoryEditableRepository<TrajectoryGeoFactDto> trajectoryFactManualReposirory;
private readonly TrajectoryFactManualExportService trajectoryFactManualExportService;
@ -25,7 +24,7 @@ namespace AsbCloudWebApi.Tests.UnitTests.Services.Trajectory
private readonly int idWell = 4;
private readonly TrajectoryGeoPlanDto[] trajectoryPlannedRows = new TrajectoryGeoPlanDto[2] {
private readonly TrajectoryGeoPlanDto[] trajectoryPlanRows = new TrajectoryGeoPlanDto[2] {
new TrajectoryGeoPlanDto() {
Id = 1,
AzimuthGeo = 1,
@ -84,8 +83,8 @@ namespace AsbCloudWebApi.Tests.UnitTests.Services.Trajectory
public TrajectoryExportTest()
{
wellService = Substitute.For<IWellService>();
trajectoryPlannedRepository = Substitute.For<ITrajectoryEditableRepository<TrajectoryGeoPlanDto>>();
trajectoryPlannedExportService = new TrajectoryPlannedExportService(wellService, trajectoryPlannedRepository);
trajectoryPlanRepository = Substitute.For<ITrajectoryEditableRepository<TrajectoryGeoPlanDto>>();
trajectoryPlanExportService = new TrajectoryPlanExportService(wellService, trajectoryPlanRepository);
trajectoryFactManualReposirory = Substitute.For<ITrajectoryEditableRepository<TrajectoryGeoFactDto>>();
trajectoryFactManualExportService = new TrajectoryFactManualExportService(wellService, trajectoryFactManualReposirory);
@ -97,10 +96,10 @@ namespace AsbCloudWebApi.Tests.UnitTests.Services.Trajectory
[Fact]
public async Task Export_trajectory_planned()
{
trajectoryPlannedRepository.GetAsync(idWell, CancellationToken.None)
.Returns(trajectoryPlannedRows);
trajectoryPlanRepository.GetAsync(idWell, CancellationToken.None)
.Returns(trajectoryPlanRows);
var stream = await trajectoryPlannedExportService.ExportAsync(idWell, CancellationToken.None);
var stream = await trajectoryPlanExportService.ExportAsync(idWell, CancellationToken.None);
Assert.True(stream.Length > 0);
}

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

@ -6,14 +6,14 @@ namespace AsbCloudWebApi.Tests.UnitTests.Services.Trajectory
{
public class TrajectoryImportTest
{
private readonly TrajectoryPlannedParserService trajectoryPlannedImportService;
private readonly TrajectoryPlanParserService trajectoryPlanImportService;
private readonly TrajectoryFactManualParserService trajectoryFactManualImportService;
private string usingTemplateFile = "AsbCloudWebApi.Tests.Services.Trajectory.Templates";
public TrajectoryImportTest()
{
trajectoryPlannedImportService = new TrajectoryPlannedParserService();
trajectoryPlanImportService = new TrajectoryPlanParserService();
trajectoryFactManualImportService = new TrajectoryFactManualParserService();
}
@ -21,12 +21,12 @@ namespace AsbCloudWebApi.Tests.UnitTests.Services.Trajectory
public void Import_trajectory_planned()
{
var stream = System.Reflection.Assembly.GetExecutingAssembly()
.GetManifestResourceStream($"{usingTemplateFile}.TrajectoryPlannedTemplate.xlsx");
.GetManifestResourceStream($"{usingTemplateFile}.TrajectoryPlanTemplate.xlsx");
if (stream is null)
Assert.Fail("Файла для импорта не существует");
var trajectoryRows = trajectoryPlannedImportService.ImportAsync(stream);
var trajectoryRows = trajectoryPlanImportService.Import(stream);
Assert.Equal(3, trajectoryRows.Count());
}
@ -40,7 +40,7 @@ namespace AsbCloudWebApi.Tests.UnitTests.Services.Trajectory
if (stream is null)
Assert.Fail("Файла для импорта не существует");
var trajectoryRows = trajectoryFactManualImportService.ImportAsync(stream);
var trajectoryRows = trajectoryFactManualImportService.Import(stream);
Assert.Equal(4, trajectoryRows.Count());
}

2
AsbCloudWebApi/Controllers/Trajectory/TrajectoryEditableController.cs
View File

@ -88,7 +88,7 @@ namespace AsbCloudWebApi.Controllers.Trajectory
try
{
var trajectoryRows = trajectoryImportService.ImportAsync(stream);
var trajectoryRows = trajectoryImportService.Import(stream);
foreach (var row in trajectoryRows)
{
row.IdWell = idWell;

10
AsbCloudWebApi/Controllers/Trajectory/TrajectoryPlannedController.cs → AsbCloudWebApi/Controllers/Trajectory/TrajectoryPlanController.cs
View File

@ -15,15 +15,15 @@ namespace AsbCloudWebApi.Controllers.Trajectory
/// <summary>
/// Плановая траектория (загрузка и хранение)
/// </summary>
[Route("api/well/{idWell}/plannedTrajectory")]
[Route("api/well/{idWell}/[controller]")]
[ApiController]
public class TrajectoryPlannedController : TrajectoryEditableController<TrajectoryGeoPlanDto>
public class TrajectoryPlanController : TrajectoryEditableController<TrajectoryGeoPlanDto>
{
private readonly TrajectoryService trajectoryVisualizationService;
public TrajectoryPlannedController(IWellService wellService,
TrajectoryPlannedParserService plannedTrajectoryImportService,
TrajectoryPlannedExportService plannedTrajectoryExportService,
public TrajectoryPlanController(IWellService wellService,
TrajectoryPlanParserService plannedTrajectoryImportService,
TrajectoryPlanExportService plannedTrajectoryExportService,
ITrajectoryEditableRepository<TrajectoryGeoPlanDto> plannedTrajectoryRepository,
TrajectoryService trajectoryVisualizationService)
: base(