From eabec7e7eea3279085f3921bcdfa854ed08ecf4a Mon Sep 17 00:00:00 2001
From: ngfrolov <ng.frolov@autodrilling.ru>
Date: Thu, 26 May 2022 13:34:40 +0500
Subject: [PATCH] =?UTF-8?q?=D0=94=D0=BE=D0=B1=D0=B0=D0=B2=D0=B8=D0=BB=20?=
 =?UTF-8?q?=D0=BD=D0=B0=D1=81=D0=BB=D0=B5=D0=B4=D0=BE=D0=B2=D0=B0=D0=BD?=
 =?UTF-8?q?=D0=B8=D0=B5=20=D0=BE=D1=82=20CrudController.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Controllers/DrillerController.cs          | 80 +------------------
 .../Controllers/ScheduleController.cs         | 70 ++--------------
 2 files changed, 11 insertions(+), 139 deletions(-)

diff --git a/AsbCloudWebApi/Controllers/DrillerController.cs b/AsbCloudWebApi/Controllers/DrillerController.cs
index a2c4cada..4be2d876 100644
--- a/AsbCloudWebApi/Controllers/DrillerController.cs
+++ b/AsbCloudWebApi/Controllers/DrillerController.cs
@@ -2,90 +2,16 @@
 using AsbCloudApp.Services;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
-using System.Threading;
-using System.Threading.Tasks;
 
 namespace AsbCloudWebApi.Controllers
 {
     [Route("api/driller")]
     [ApiController]
     [Authorize]
-    public class DrillerController : ControllerBase
+    public class DrillerController : CrudController<DrillerDto, IDrillerService>
     {
-        private readonly IDrillerService drillerService;
         public DrillerController(IDrillerService drillerService)
-        {
-            this.drillerService = drillerService;
-        }
-
-        /// <summary>
-        ///Добавить бурильщика
-        /// </summary>
-        /// <param name="value">Объект, описывающий бурильщика</param>
-        /// <param name="token"></param>
-        /// <returns>Идентификатор добавленого бурильщика</returns>
-        [HttpPost]
-        public async Task<ActionResult<int>> InsertAsync([FromBody] DrillerDto value, CancellationToken token = default)
-        {
-            var result = await drillerService.InsertAsync(value, token).ConfigureAwait(false);
-            return Ok(result);
-        }
-
-        /// <summary>
-        /// Получить весь список бурильщиков
-        /// </summary>
-        /// <param name="token"></param>
-        /// <returns>Список бурильщиков</returns>
-        [HttpGet]
-        public async Task<ActionResult<int>> GetAllAsync(CancellationToken token = default)
-        {
-            var result = await drillerService.GetAllAsync(token);
-            return Ok(result);
-        }
-
-        /// <summary>
-        /// Получить бурильщика по идентификатору
-        /// </summary>
-        /// <param name="drillerId">Идентификатор</param>
-        /// <param name="token"></param>
-        /// <returns>Объект, описывающий бурильщика</returns>
-        [HttpGet("{drillerId}")]
-        public async Task<IActionResult> GetAsync(int drillerId, CancellationToken token = default)
-        {
-            var driller = await drillerService.GetAsync(drillerId, token)
-                .ConfigureAwait(false);
-            return Ok(driller);
-        }
-
-        /// <summary>
-        /// Обновить данные о бурильщике
-        /// </summary>
-        /// <param name="drillerId">Идентификатор</param>
-        /// <param name="dto">Объект с измененными данными</param>
-        /// <param name="token"></param>
-        /// <returns>Количество измененых записей</returns>
-        [HttpPut("{drillerId}")]
-        public async Task<IActionResult> UpdateAsync(int drillerId, DrillerDto dto,
-            CancellationToken token = default)
-        {
-            var result = await drillerService.UpdateAsync(drillerId, dto, token)
-                .ConfigureAwait(false);
-            return Ok(result);
-
-        }
-
-        /// <summary>
-        /// Удалить бурильщика
-        /// </summary>
-        /// <param name="drillerId">Идентификатор бурильщика</param>
-        /// <param name="token"></param>
-        /// <returns>Количество удаленных записей</returns>
-        [HttpDelete("{drillerId}")]
-        public async Task<ActionResult<int>> DeleteAsync(int drillerId, CancellationToken token = default)
-        {
-            var result = await drillerService.DeleteAsync(drillerId, token)
-                .ConfigureAwait(false);
-            return Ok(result);
-        }
+            :base(drillerService)
+        {}
     }
 }
diff --git a/AsbCloudWebApi/Controllers/ScheduleController.cs b/AsbCloudWebApi/Controllers/ScheduleController.cs
index f8e90db5..0239b4cb 100644
--- a/AsbCloudWebApi/Controllers/ScheduleController.cs
+++ b/AsbCloudWebApi/Controllers/ScheduleController.cs
@@ -11,82 +11,28 @@ namespace AsbCloudWebApi.Controllers
     [Route("api/schedule")]
     [ApiController]
     [Authorize]
-    public class ScheduleController : ControllerBase
+    public class ScheduleController : CrudController<ScheduleDto, IScheduleService>
     {
         private readonly IScheduleService scheduleService;
-        public ScheduleController(IScheduleService service)
+        public ScheduleController(IScheduleService scheduleService)
+            :base(scheduleService)
         {
             this.scheduleService = service;
         }
 
         /// <summary>
-        /// Добавить запись графика работы
-        /// </summary>
-        /// <param name="value">Объект-запись</param>
-        /// <param name="token"></param>
-        /// <returns>Идентификатор добавленой записи</returns>
-        [HttpPost]
-        public async Task<ActionResult<int>> InsertAsync([FromBody] ScheduleDto value, CancellationToken token = default)
-        {
-            var result = await scheduleService.InsertAsync(value, token).ConfigureAwait(false);
-            return Ok(result);
-        }
-
-        /// <summary>
-        /// Получить все записи графика
-        /// </summary>
-        /// <param name="token"></param>
-        /// <returns>Список записей графика</returns>
-        [HttpGet("all")]
-        public async Task<ActionResult<int>> GetAllAsync(CancellationToken token = default)
-        {
-            var result = await scheduleService.GetAllAsync(token);
-            return Ok(result);
-        }
-
-        /// <summary>
-        /// Получить список записей графика для конкретной скважины
+        /// Получить бурильщика работавшего на скважине в определенное время.
         /// </summary>
         /// <param name="idWell">Идентификатор скважины</param>
         /// <param name="workTime">Рабочее время</param>
         /// <param name="token"></param>
-        /// <returns>Список записей графика</returns>
-        [HttpGet]
-        public async Task<ActionResult<int>> GetScheduleAsync(int idWell, DateTimeOffset workTime, CancellationToken token = default)
+        /// <returns>бурильщик</returns>
+        [HttpGet("driller")]
+        public async Task<ActionResult<DrillerDto>> GetDrillerAsync(int idWell, DateTime workTime, CancellationToken token = default)
         {
-            var result = await scheduleService.GetSchedule(idWell,workTime, token);
+            var result = await scheduleService.GetDrillerAsync(idWell,workTime, token);
             return Ok(result);
         }
 
-        /// <summary>
-        /// Обновить график
-        /// </summary>
-        /// <param name="scheduleId">Идентификатор записи</param>
-        /// <param name="dto">Элемент графика</param>
-        /// <param name="token"></param>
-        /// <returns>Количнство обновленных записей</returns>
-        [HttpPut("{scheduleId}")]
-        public async Task<IActionResult> UpdateAsync(int scheduleId, ScheduleDto dto,
-            CancellationToken token = default)
-        {
-            var result = await scheduleService.UpdateAsync(scheduleId, dto, token)
-                .ConfigureAwait(false);
-            return Ok(result);
-
-        }
-
-        /// <summary>
-        /// Удалить запись из графика
-        /// </summary>
-        /// <param name="scheduleId">Идентификатор записи</param>
-        /// <param name="token"></param>
-        /// <returns></returns>
-        [HttpDelete("{scheduleId}")]
-        public async Task<ActionResult<int>> DeleteAsync(int scheduleId, CancellationToken token = default)
-        {
-            var result = await scheduleService.DeleteAsync(scheduleId, token)
-                .ConfigureAwait(false);
-            return Ok(result);
-        }
     }
 }