From 7997639e6ceac42d4567a5796e7646ec5b2cb878 Mon Sep 17 00:00:00 2001
From: Olga Nemt <on.nemtina@digitaldrilling.ru>
Date: Wed, 22 Mar 2023 11:59:39 +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=BC=D0=B5=D1=82=D0=BE=D0=B4=20=D0=B7=D0=B0=D0=BF?=
 =?UTF-8?q?=D0=B8=D1=81=D0=B8=20=D0=BA=D0=BB=D1=8E=D1=87=D0=B0=20=D0=BF?=
 =?UTF-8?q?=D0=BE=D0=BB=D1=8C=D0=B7=D0=BE=D0=B2=D0=B0=D1=82=D0=B5=D0=BE?=
 =?UTF-8?q?=D1=8F,=20=D1=80=D0=B5=D0=B4=D0=B0=D0=BA=D1=82=D0=B8=D1=80?=
 =?UTF-8?q?=D1=83=D1=8E=D1=89=D0=B5=D0=B3=D0=BE=20=D1=80=D0=B0=D0=BF=D0=BE?=
 =?UTF-8?q?=D1=80=D1=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Controllers/DailyReportController.cs      | 37 +++++++++++--------
 1 file changed, 21 insertions(+), 16 deletions(-)

diff --git a/AsbCloudWebApi/Controllers/DailyReportController.cs b/AsbCloudWebApi/Controllers/DailyReportController.cs
index 11b5c17a..bc44a4e1 100644
--- a/AsbCloudWebApi/Controllers/DailyReportController.cs
+++ b/AsbCloudWebApi/Controllers/DailyReportController.cs
@@ -91,11 +91,9 @@ namespace AsbCloudWebApi.Controllers
         [ProducesResponseType(typeof(int), (int)System.Net.HttpStatusCode.OK)]
         public async Task<IActionResult> UpdateHeadAsync(int idWell, [Required] DateTime date, [Required] HeadDto dto, CancellationToken token = default)
         {
-            var idUser = User.GetUserId();
-            if (idUser is null)
+            if (!setEditorIdToDailyReportBlock(dto))
                 return Forbid();
 
-            dto.IdUser = idUser;
             var result = await dailyReportService.UpdateBlockAsync(idWell, date, dto, token);
             return Ok(result);
         }
@@ -112,11 +110,9 @@ namespace AsbCloudWebApi.Controllers
         [ProducesResponseType(typeof(int), (int)System.Net.HttpStatusCode.OK)]
         public async Task<IActionResult> UpdateBhaAsync(int idWell, [Required] DateTime date, [Required] BhaDto dto, CancellationToken token = default)
         {
-            var idUser = User.GetUserId();
-            if (idUser is null)
+            if (!setEditorIdToDailyReportBlock(dto))
                 return Forbid();
 
-            dto.IdUser = idUser;
             var result = await dailyReportService.UpdateBlockAsync(idWell, date, dto, token);
             return Ok(result);
         }
@@ -133,16 +129,13 @@ namespace AsbCloudWebApi.Controllers
         [ProducesResponseType(typeof(int), (int)System.Net.HttpStatusCode.OK)]
         public async Task<IActionResult> UpdateNoDrillingAsync(int idWell, [Required] DateTime date, [Required] NoDrillingDto dto, CancellationToken token = default)
         {
-            var idUser = User.GetUserId();
-            if (idUser is null)
+            if (!setEditorIdToDailyReportBlock(dto))
                 return Forbid();
 
-            dto.IdUser = idUser;
             var result = await dailyReportService.UpdateBlockAsync(idWell, date, dto, token);
             return Ok(result);
         }
 
-
         /// <summary>
         /// Сохранение изменений набора данных для формирования рапорта (САУБ)
         /// </summary>
@@ -155,11 +148,9 @@ namespace AsbCloudWebApi.Controllers
         [ProducesResponseType(typeof(int), (int)System.Net.HttpStatusCode.OK)]
         public async Task<IActionResult> UpdateSaubAsync(int idWell, [Required] DateTime date, [Required] SaubDto dto, CancellationToken token = default)
         {
-            var idUser = User.GetUserId();
-            if (idUser is null)
+            if (!setEditorIdToDailyReportBlock(dto))
                 return Forbid();
 
-            dto.IdUser = idUser;
             var result = await dailyReportService.UpdateBlockAsync(idWell, date, dto, token);
             return Ok(result);
         }
@@ -176,15 +167,29 @@ namespace AsbCloudWebApi.Controllers
         [ProducesResponseType(typeof(int), (int)System.Net.HttpStatusCode.OK)]
         public async Task<IActionResult> UpdateSignAsync(int idWell, [Required] DateTime date, [Required] SignDto dto, CancellationToken token = default)
         {
-            var idUser = User.GetUserId();
-            if (idUser is null)
+            if (!setEditorIdToDailyReportBlock(dto))
                 return Forbid();
 
-            dto.IdUser = idUser;
             var result = await dailyReportService.UpdateBlockAsync(idWell, date, dto, token);
             return Ok(result);
         }
 
+        /// <summary>
+        /// записать ключ пользователя, вносящего изменения в блок суточного рапорта
+        /// </summary>
+        /// <param name="dto"></param>
+        /// <returns></returns>
+        private bool setEditorIdToDailyReportBlock(ItemInfoDto dto)
+        {
+            var idUser = User.GetUserId();
+            if (idUser is null)
+                return false;
+            else
+                dto.IdUser = idUser;
+
+            return true;
+        }
+
         /// <summary>
         /// Сформировать и скачать рапорт в формате excel
         /// </summary>