From e10823c8685af808ff27c36ba773c2677f39d1b0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=9E=D0=BB=D1=8F=20=D0=91=D0=B8=D0=B7=D1=8E=D0=BA=D0=BE?=
 =?UTF-8?q?=D0=B2=D0=B0?= <user2@kaidev.ru>
Date: Wed, 22 Nov 2023 17:30:30 +0500
Subject: [PATCH] =?UTF-8?q?=D0=A0=D0=B5=D1=84=D0=B0=D0=BA=D1=82=D0=BE?=
 =?UTF-8?q?=D1=80,=20=D0=BA=D0=BE=D1=80=D1=80=D0=B5=D0=BA=D1=82=D0=BD?=
 =?UTF-8?q?=D1=8B=D0=B5=20=D0=BD=D0=B0=D0=B7=D0=B2=D0=B0=D0=BD=D0=B8=D1=8F?=
 =?UTF-8?q?=20=D0=BF=D0=B5=D1=80=D0=B5=D0=BC=D0=B5=D0=BD=D0=BD=D1=8B=D1=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../AsbCloudInfrastructure.csproj             |   6 +--
 .../Trajectory/FactTrajectoryImportService.cs |   2 +-
 .../Trajectory/NnbTrajectoryImportService.cs  |   4 +-
 .../Trajectory/NnbTrajectoryTemplate.xlsx     | Bin 11279 -> 0 bytes
 .../PlannedTrajectoryImportService.cs         |  35 +++---------------
 .../FactTrajectoryTemplate.xlsx               | Bin
 .../Templates/NnbTrajectoryTemplate.xlsx      | Bin 0 -> 11600 bytes
 .../PlannedTrajectoryTemplate.xlsx            | Bin
 .../Trajectory/TrajectoryImportService.cs     |  29 +++++++--------
 9 files changed, 25 insertions(+), 51 deletions(-)
 delete mode 100644 AsbCloudInfrastructure/Services/Trajectory/NnbTrajectoryTemplate.xlsx
 rename AsbCloudInfrastructure/Services/Trajectory/{ => Templates}/FactTrajectoryTemplate.xlsx (100%)
 create mode 100644 AsbCloudInfrastructure/Services/Trajectory/Templates/NnbTrajectoryTemplate.xlsx
 rename AsbCloudInfrastructure/Services/Trajectory/{ => Templates}/PlannedTrajectoryTemplate.xlsx (100%)

diff --git a/AsbCloudInfrastructure/AsbCloudInfrastructure.csproj b/AsbCloudInfrastructure/AsbCloudInfrastructure.csproj
index 3ff14745..8d110e66 100644
--- a/AsbCloudInfrastructure/AsbCloudInfrastructure.csproj
+++ b/AsbCloudInfrastructure/AsbCloudInfrastructure.csproj
@@ -34,9 +34,9 @@
   <ItemGroup>
     <EmbeddedResource Include="Services\DailyReport\DailyReportTemplate.xlsx" />
     <EmbeddedResource Include="Services\DrillTestReport\DrillTestReportTemplate.xlsx" />
-    <EmbeddedResource Include="Services\Trajectory\FactTrajectoryTemplate.xlsx" />
-    <EmbeddedResource Include="Services\Trajectory\NnbTrajectoryTemplate.xlsx" />
-    <EmbeddedResource Include="Services\Trajectory\PlannedTrajectoryTemplate.xlsx" />
+    <EmbeddedResource Include="Services\Trajectory\Templates\FactTrajectoryTemplate.xlsx" />
+    <EmbeddedResource Include="Services\Trajectory\Templates\NnbTrajectoryTemplate.xlsx" />
+    <EmbeddedResource Include="Services\Trajectory\Templates\PlannedTrajectoryTemplate.xlsx" />
     <EmbeddedResource Include="Services\WellOperationService\ScheduleReportTemplate.xlsx" />
     <EmbeddedResource Include="Services\AutoGeneratedDailyReports\AutogeneratedDailyReportTemplate.xlsx" />
     <EmbeddedResource Include="Services\WellOperationImport\Files\WellOperationImportTemplate.xlsx" />
diff --git a/AsbCloudInfrastructure/Services/Trajectory/FactTrajectoryImportService.cs b/AsbCloudInfrastructure/Services/Trajectory/FactTrajectoryImportService.cs
index 95b39bfc..defc5207 100644
--- a/AsbCloudInfrastructure/Services/Trajectory/FactTrajectoryImportService.cs
+++ b/AsbCloudInfrastructure/Services/Trajectory/FactTrajectoryImportService.cs
@@ -9,7 +9,7 @@ namespace AsbCloudInfrastructure.Services.Trajectory
     public class FactTrajectoryImportService : TrajectoryImportService<TrajectoryGeoFactDto>
     {
         public override string templateFileName { get; set; } = "FactTrajectoryTemplate.xlsx";
-        public override string usingTemplateFile { get; set; } = "AsbCloudInfrastructure.Services.Trajectory";
+        public override string usingTemplateFile { get; set; } = "AsbCloudInfrastructure.Services.Trajectory.Templates";
         public override string sheetNamePlannedTrajectory { get; set; } = "Фактическая траектория";
         public override int headerRowsCount { get; set; } = 2;
         public override int ColumnWellboreDepth { get; set; } = 1;
diff --git a/AsbCloudInfrastructure/Services/Trajectory/NnbTrajectoryImportService.cs b/AsbCloudInfrastructure/Services/Trajectory/NnbTrajectoryImportService.cs
index fd87606e..869de4d7 100644
--- a/AsbCloudInfrastructure/Services/Trajectory/NnbTrajectoryImportService.cs
+++ b/AsbCloudInfrastructure/Services/Trajectory/NnbTrajectoryImportService.cs
@@ -9,8 +9,8 @@ namespace AsbCloudInfrastructure.Services.Trajectory
     public class NnbTrajectoryImportService : TrajectoryImportService<TrajectoryGeoFactDto>
     {
         public override string templateFileName { get; set; } = "NnbTrajectoryTemplate.xlsx";
-        public override string usingTemplateFile { get; set; } = "AsbCloudInfrastructure.Services.Trajectory";
-        public override string sheetNamePlannedTrajectory { get; set; } = "Плановая траектория";
+        public override string usingTemplateFile { get; set; } = "AsbCloudInfrastructure.Services.Trajectory.Templates";
+        public override string sheetNamePlannedTrajectory { get; set; } = "Фактическая ннб-траектория";
         public override int headerRowsCount { get; set; } = 2;
         public override int ColumnWellboreDepth { get; set; } = 1;
         public override int ColumnZenithAngle { get; set; } = 2;
diff --git a/AsbCloudInfrastructure/Services/Trajectory/NnbTrajectoryTemplate.xlsx b/AsbCloudInfrastructure/Services/Trajectory/NnbTrajectoryTemplate.xlsx
deleted file mode 100644
index 8d01c25bb7dd02cd541c93b6977d580584b77b78..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 11279
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

diff --git a/AsbCloudInfrastructure/Services/Trajectory/PlannedTrajectoryImportService.cs b/AsbCloudInfrastructure/Services/Trajectory/PlannedTrajectoryImportService.cs
index bbfbf7a1..296a4002 100644
--- a/AsbCloudInfrastructure/Services/Trajectory/PlannedTrajectoryImportService.cs
+++ b/AsbCloudInfrastructure/Services/Trajectory/PlannedTrajectoryImportService.cs
@@ -1,40 +1,18 @@
 using AsbCloudApp.Data;
 using AsbCloudApp.Repositories;
 using AsbCloudApp.Services;
-using AsbCloudDb.Model;
 using ClosedXML.Excel;
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-using System.Threading;
-using System.Threading.Tasks;
 
 namespace AsbCloudInfrastructure.Services.Trajectory
 {
 
-    public class PlannedTrajectoryImportService : TrajectoryImportService<TrajectoryGeoPlanDto> //IPlannedTrajectoryImportService
+    public class PlannedTrajectoryImportService : TrajectoryImportService<TrajectoryGeoPlanDto>
     {
         /*
         * password for PlannedTrajectoryTemplate.xlsx is Drill2022
         */
-
-        private readonly IWellService wellService;
-        private readonly ITrajectoryEditableRepository<TrajectoryGeoPlanDto> plannedTrajectoryService;
-
-        //private const string templateFileName = "PlannedTrajectoryTemplate.xlsx";
-        //private const string usingTemplateFile = "AsbCloudInfrastructure.Services.Trajectory";
-        //private const string sheetNamePlannedTrajectory = "Плановая траектория";
-        //private const int headerRowsCount = 2;
-        //private const int ColumnWellboreDepth = 1;
-        //private const int ColumnZenithAngle = 2;
-        //private const int ColumnAzimuthGeo = 3;
-        //private const int ColumnAzimuthMagnetic = 4;
-        //private const int ColumnVerticalDepth = 5;
-        //private const int ColumnRadius = 6;
-        //private const int ColumnComment = 7;
         public override string templateFileName { get; set; } = "PlannedTrajectoryTemplate.xlsx";
-        public override string usingTemplateFile { get; set; } = "AsbCloudInfrastructure.Services.Trajectory";
+        public override string usingTemplateFile { get; set; } = "AsbCloudInfrastructure.Services.Trajectory.Templates";
         public override string sheetNamePlannedTrajectory { get; set; } = "Плановая траектория";
         public override int headerRowsCount { get; set; } = 2;
         public override int ColumnWellboreDepth { get; set; } = 1;
@@ -46,12 +24,11 @@ namespace AsbCloudInfrastructure.Services.Trajectory
         public override int ColumnComment { get; set; } = 7;
 
         public PlannedTrajectoryImportService(
-            IWellService wellService, 
-            ITrajectoryEditableRepository<TrajectoryGeoPlanDto> plannedTrajectoryService) 
+            IWellService wellService,
+            ITrajectoryEditableRepository<TrajectoryGeoPlanDto> plannedTrajectoryService)
             : base(plannedTrajectoryService, wellService)
         {
-            this.wellService = wellService;
-        }      
+        }
 
         protected override TrajectoryGeoPlanDto ParseRow(IXLRow row)
         {
@@ -65,7 +42,7 @@ namespace AsbCloudInfrastructure.Services.Trajectory
                 Radius = row.Cell(ColumnRadius).GetCellValue<double>(),
                 Comment = row.Cell(ColumnComment).GetCellValue<string?>()
             };
-            
+
             return trajectoryRow;
         }
 
diff --git a/AsbCloudInfrastructure/Services/Trajectory/FactTrajectoryTemplate.xlsx b/AsbCloudInfrastructure/Services/Trajectory/Templates/FactTrajectoryTemplate.xlsx
similarity index 100%
rename from AsbCloudInfrastructure/Services/Trajectory/FactTrajectoryTemplate.xlsx
rename to AsbCloudInfrastructure/Services/Trajectory/Templates/FactTrajectoryTemplate.xlsx
diff --git a/AsbCloudInfrastructure/Services/Trajectory/Templates/NnbTrajectoryTemplate.xlsx b/AsbCloudInfrastructure/Services/Trajectory/Templates/NnbTrajectoryTemplate.xlsx
new file mode 100644
index 0000000000000000000000000000000000000000..b6bc4bbf778127584baf9acdf27bfe3b6f93a6df
GIT binary patch
literal 11600
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

literal 0
HcmV?d00001

diff --git a/AsbCloudInfrastructure/Services/Trajectory/PlannedTrajectoryTemplate.xlsx b/AsbCloudInfrastructure/Services/Trajectory/Templates/PlannedTrajectoryTemplate.xlsx
similarity index 100%
rename from AsbCloudInfrastructure/Services/Trajectory/PlannedTrajectoryTemplate.xlsx
rename to AsbCloudInfrastructure/Services/Trajectory/Templates/PlannedTrajectoryTemplate.xlsx
diff --git a/AsbCloudInfrastructure/Services/Trajectory/TrajectoryImportService.cs b/AsbCloudInfrastructure/Services/Trajectory/TrajectoryImportService.cs
index 6f719f85..132ffd63 100644
--- a/AsbCloudInfrastructure/Services/Trajectory/TrajectoryImportService.cs
+++ b/AsbCloudInfrastructure/Services/Trajectory/TrajectoryImportService.cs
@@ -1,24 +1,23 @@
 using AsbCloudApp.Data;
 using AsbCloudApp.Repositories;
 using AsbCloudApp.Services;
-using AsbCloudDb.Model;
-using AsbCloudInfrastructure.Services.SAUB;
 using ClosedXML.Excel;
 using System;
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
-using System.Text;
 using System.Threading;
 using System.Threading.Tasks;
 
 namespace AsbCloudInfrastructure.Services.Trajectory
 {
-    public abstract class TrajectoryImportService<T> where T: TrajectoryGeoDto
+    public abstract class TrajectoryImportService<T> where T : TrajectoryGeoDto
     {
-        protected readonly IWellService wellService;
+        private readonly IWellService wellService;
 
-        protected readonly ITrajectoryRepository<T> trajectoryService;
+        private readonly ITrajectoryRepository<T> trajectoryService;
+        protected abstract void AddCoordinatesToRow(IXLRow row, T trajectory);
+        protected abstract T ParseRow(IXLRow row);
         public abstract string templateFileName { get; set; }
         public abstract string usingTemplateFile { get; set; }
         public abstract string sheetNamePlannedTrajectory { get; set; }
@@ -30,8 +29,6 @@ namespace AsbCloudInfrastructure.Services.Trajectory
         public abstract int ColumnVerticalDepth { get; set; }
         public abstract int ColumnRadius { get; set; }
         public abstract int ColumnComment { get; set; }
-        protected abstract void AddCoordinatesToRow(IXLRow row, T trajectory);
-        protected abstract T ParseRow(IXLRow row);
 
         public TrajectoryImportService(ITrajectoryRepository<T> trajectoryService, IWellService wellService)
         {
@@ -54,37 +51,37 @@ namespace AsbCloudInfrastructure.Services.Trajectory
             return MakeExelFileStream(plannedTrajectorys);
         }
 
-        private Stream MakeExelFileStream(IEnumerable<T> plannedTrajectories)
+        private Stream MakeExelFileStream(IEnumerable<T> trajectories)
         {
             using Stream ecxelTemplateStream = GetTemplateFile();
             using var workbook = new XLWorkbook(ecxelTemplateStream, XLEventTracking.Disabled);
-            AddPlannedTrajecoryToWorkbook(workbook, plannedTrajectories);
+            AddPlannedTrajecoryToWorkbook(workbook, trajectories);
             MemoryStream memoryStream = new MemoryStream();
             workbook.SaveAs(memoryStream, new SaveOptions { });
             memoryStream.Seek(0, SeekOrigin.Begin);
             return memoryStream;
         }
 
-        private void AddPlannedTrajecoryToWorkbook(XLWorkbook workbook, IEnumerable<T> plannedTrajectories)
+        private void AddPlannedTrajecoryToWorkbook(XLWorkbook workbook, IEnumerable<T> trajectories)
         {
-            if (plannedTrajectories.Any())
+            if (trajectories.Any())
             {
                 var sheet = workbook.Worksheets.FirstOrDefault(ws => ws.Name == sheetNamePlannedTrajectory);
                 if (sheet is null)
                     throw new FileFormatException($"Лист с именем {sheetNamePlannedTrajectory} отсутствует, либо имеет некорректное название");
-                AddPlannedTrajecoryToSheet(sheet, plannedTrajectories);
+                AddTrajecoryToSheet(sheet, trajectories);
             }
         }
 
-        private void AddPlannedTrajecoryToSheet(IXLWorksheet sheet, IEnumerable<T> plannedTrajectories)
+        private void AddTrajecoryToSheet(IXLWorksheet sheet, IEnumerable<T> trajectories)
         {
-            var rowList = plannedTrajectories.ToList();
+            var rowList = trajectories.ToList();
             for (int i = 0; i < rowList.Count; i++)
             {
                 var row = sheet.Row(1 + i + headerRowsCount);
                 AddCoordinatesToRow(row, rowList[i]);
             }
-        }        
+        }
 
         public async Task<string> GetFileNameAsync(int idWell, CancellationToken token)
         {