From 1fac8ef5659ace908f6521fcbe7e3ebc727ad394 Mon Sep 17 00:00:00 2001
From: ngfrolov <ng.frolov@autodrilling.ru>
Date: Wed, 5 Jul 2023 16:00:06 +0500
Subject: [PATCH] =?UTF-8?q?WellController.=20=D0=9E=D0=B1=D1=8A=D0=B5?=
 =?UTF-8?q?=D0=B4=D0=B8=D0=BD=D0=B8=D0=BB=20GetAsync=20=D0=B8=20GetStatAsy?=
 =?UTF-8?q?nc=20=D0=B2=20GetAsync.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 AsbCloudApp/Services/IWellService.cs         | 17 ++++++------
 AsbCloudWebApi/Controllers/WellController.cs | 28 +++-----------------
 2 files changed, 12 insertions(+), 33 deletions(-)

diff --git a/AsbCloudApp/Services/IWellService.cs b/AsbCloudApp/Services/IWellService.cs
index 7c1cc8fd..a1df94f3 100644
--- a/AsbCloudApp/Services/IWellService.cs
+++ b/AsbCloudApp/Services/IWellService.cs
@@ -25,6 +25,14 @@ namespace AsbCloudApp.Services
         /// <returns></returns>
         Task<IEnumerable<WellDto>> GetAsync(WellRequest request, CancellationToken token);
 
+        /// <summary>
+        /// Статистика по скважине
+        /// </summary>
+        /// <param name="idWell"></param>
+        /// <param name="token"></param>
+        /// <returns></returns>
+        Task<WellMapInfoWithTelemetryStat?> GetOrDefaultStatAsync(int idWell, CancellationToken token);
+
         /// <summary>
         /// проверяет доступ к скважине для компании
         /// </summary>
@@ -34,6 +42,7 @@ namespace AsbCloudApp.Services
         /// <returns></returns>
         Task<bool> IsCompanyInvolvedInWellAsync(int idCompany, int idWell, CancellationToken token);
 
+        //TODO: remove that
         /// <summary>
         /// получить название скважины по id
         /// </summary>
@@ -102,13 +111,5 @@ namespace AsbCloudApp.Services
         /// <param name="token"></param>
         /// <returns></returns>
         Task<IEnumerable<DepositBranchDto>> GetWellTreeAsync(int idCompany, CancellationToken token);
-
-        /// <summary>
-        /// Статистика по скважине
-        /// </summary>
-        /// <param name="idWell"></param>
-        /// <param name="token"></param>
-        /// <returns></returns>
-        Task<WellMapInfoWithTelemetryStat?> GetOrDefaultStatAsync(int idWell, CancellationToken token);
     }
 }
diff --git a/AsbCloudWebApi/Controllers/WellController.cs b/AsbCloudWebApi/Controllers/WellController.cs
index 30b259c8..3ed37d65 100644
--- a/AsbCloudWebApi/Controllers/WellController.cs
+++ b/AsbCloudWebApi/Controllers/WellController.cs
@@ -74,7 +74,8 @@ namespace AsbCloudWebApi.Controllers
         /// <returns>Информация о требуемой скважине </returns>
         [HttpGet("{idWell}")]
         [Permission]
-        [ProducesResponseType(typeof(WellDto), (int)System.Net.HttpStatusCode.OK)]
+        [ProducesResponseType(typeof(WellMapInfoWithTelemetryStat), (int)System.Net.HttpStatusCode.OK)]
+        [ProducesResponseType((int)System.Net.HttpStatusCode.NoContent)]
         public async Task<IActionResult> GetAsync(int idWell, CancellationToken token)
         {
             var idCompany = User.GetCompanyId();
@@ -82,30 +83,7 @@ namespace AsbCloudWebApi.Controllers
             if (idCompany is null || !await wellService.IsCompanyInvolvedInWellAsync(idCompany ?? default, idWell, token).ConfigureAwait(false))
                 return Forbid();
 
-            var well = await wellService.GetOrDefaultAsync(idWell,
-                token).ConfigureAwait(false);
-
-            return Ok(well);
-        }
-
-        /// <summary>
-        /// Возвращает информацию о требуемой скважине 
-        /// </summary>
-        /// <param name="idWell"> Id требуемой скважины </param>
-        /// <param name="token"> Токен отмены задачи </param>
-        /// <returns>Информация о требуемой скважине </returns>
-        [HttpGet("{idWell}/info")]
-        [Permission]
-        [ProducesResponseType(typeof(WellDto), (int)System.Net.HttpStatusCode.OK)]
-        public async Task<IActionResult> GetStatAsync(int idWell, CancellationToken token)
-        {
-            var idCompany = User.GetCompanyId();
-
-            if (idCompany is null || !await wellService.IsCompanyInvolvedInWellAsync(idCompany ?? default, idWell, token).ConfigureAwait(false))
-                return Forbid();
-
-            var well = await wellService.GetOrDefaultStatAsync(idWell,
-                token);
+            var well = await wellService.GetOrDefaultStatAsync(idWell, token);
 
             return Ok(well);
         }