From 7d94945c9f54e93dd6bc0aa10adcfa6700841437 Mon Sep 17 00:00:00 2001
From: "ai.astrakhantsev" <ai.astrakhantsev@digitaldrilling.ru>
Date: Mon, 13 Feb 2023 09:19:11 +0500
Subject: [PATCH] =?UTF-8?q?#8636739=20=D0=98=D0=B7=D0=BC=D0=B5=D0=BD=D0=B5?=
 =?UTF-8?q?=D0=BD=D0=B8=D0=B5=20=D0=BA=D0=BE=D0=BD=D1=82=D1=80=D0=BE=D0=BB?=
 =?UTF-8?q?=D0=BB=D0=B5=D1=80=D0=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../PlannedTrajectoryController.cs            | 22 +++++++++++-
 .../TrajectoryVisualizationController.cs      | 34 -------------------
 2 files changed, 21 insertions(+), 35 deletions(-)
 delete mode 100644 AsbCloudWebApi/Controllers/TrajectoryVisualizationController.cs

diff --git a/AsbCloudWebApi/Controllers/PlannedTrajectoryController.cs b/AsbCloudWebApi/Controllers/PlannedTrajectoryController.cs
index d396618f..258dae7a 100644
--- a/AsbCloudWebApi/Controllers/PlannedTrajectoryController.cs
+++ b/AsbCloudWebApi/Controllers/PlannedTrajectoryController.cs
@@ -4,6 +4,7 @@ using AsbCloudApp.Services;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Mvc;
+using ProtoBuf.Meta;
 using System.Collections.Generic;
 using System.IO;
 using System.Threading;
@@ -23,12 +24,17 @@ namespace AsbCloudWebApi.Controllers
         private readonly IWellService wellService;
         private readonly IPlannedTrajectoryImportService plannedTrajectoryImportService;
         private readonly IPlannedTrajectoryRepository plannedTrajectoryRepository;
+        private readonly ITrajectoryVisualizationService trajectoryVisualizationService;
 
-        public PlannedTrajectoryController(IWellService wellService, IPlannedTrajectoryImportService plannedTrajectoryImportService, IPlannedTrajectoryRepository plannedTrajectoryRepository)
+        public PlannedTrajectoryController(IWellService wellService, 
+            IPlannedTrajectoryImportService plannedTrajectoryImportService, 
+            IPlannedTrajectoryRepository plannedTrajectoryRepository,
+            ITrajectoryVisualizationService trajectoryVisualizationService)
         {
             this.plannedTrajectoryImportService = plannedTrajectoryImportService;
             this.wellService = wellService;
             this.plannedTrajectoryRepository = plannedTrajectoryRepository;
+            this.trajectoryVisualizationService = trajectoryVisualizationService;
         }
 
         /// <summary>
@@ -226,6 +232,20 @@ namespace AsbCloudWebApi.Controllers
             return Ok(result);
         }
 
+        /// <summary>
+        /// Получение координат для визуализации траектории
+        /// </summary>
+        /// <param name="idWell"></param>
+        /// <param name="token"></param>
+        /// <returns></returns>
+        [HttpGet]
+        [ProducesResponseType(typeof(IEnumerable<TrajectoryVisualizationDto>), (int)System.Net.HttpStatusCode.OK)]
+        public async Task<IActionResult> GetTrajectoryAsync(int idWell, CancellationToken token)
+        {
+            var result = await trajectoryVisualizationService.GetTrajectoryAsync(idWell, token);
+            return Ok(result);
+        }
+
         private async Task<bool> CanUserAccessToWellAsync(int idWell, CancellationToken token = default)
         {
             int? idCompany = User.GetCompanyId();
diff --git a/AsbCloudWebApi/Controllers/TrajectoryVisualizationController.cs b/AsbCloudWebApi/Controllers/TrajectoryVisualizationController.cs
deleted file mode 100644
index 1ba99178..00000000
--- a/AsbCloudWebApi/Controllers/TrajectoryVisualizationController.cs
+++ /dev/null
@@ -1,34 +0,0 @@
-using AsbCloudApp.Data;
-using AsbCloudApp.Services;
-using Microsoft.AspNetCore.Authorization;
-using Microsoft.AspNetCore.Mvc;
-using System.Threading.Tasks;
-using System.Threading;
-using System.Collections.Generic;
-
-namespace AsbCloudWebApi.Controllers
-{
-    /// <summary>
-    /// Визуализация траектории 3D
-    /// </summary>
-    [Route("api/[controller]")]
-    [ApiController]
-    [Authorize]
-    public class TrajectoryVisualizationController : ControllerBase
-    {
-        private readonly ITrajectoryVisualizationService service;
-
-        public TrajectoryVisualizationController(ITrajectoryVisualizationService service)
-        {
-            this.service = service;
-        }
-
-        [HttpGet]
-        [ProducesResponseType(typeof(IEnumerable<TrajectoryVisualizationDto>), (int)System.Net.HttpStatusCode.OK)]
-        public async Task<IActionResult> GetTrajectoryAsync(int idWell, CancellationToken token)
-        {
-            var result = await service.GetTrajectoryAsync(idWell, token);
-            return Ok(result);
-        }
-    }
-}