From b41f25913e33c8acc4d3c384324bddaa1a120294 Mon Sep 17 00:00:00 2001
From: Olga Nemt <on.nemtina@digitaldrilling.ru>
Date: Fri, 31 May 2024 13:37:48 +0500
Subject: [PATCH] =?UTF-8?q?=D0=9C=D0=B5=D1=82=D0=BE=D0=B4=20=D0=BA=D0=BE?=
 =?UTF-8?q?=D0=BD=D1=82=D1=80=D0=BE=D0=BB=D0=BB=D0=B5=D1=80=D0=B0=20Proces?=
 =?UTF-8?q?sMapPlanBaseController=20=D0=BF=D0=B5=D1=80=D0=B5=D0=B8=D0=BC?=
 =?UTF-8?q?=D0=B5=D0=BD=D0=BE=D0=B2=D0=B0=D0=BD=20=D1=81=20Get=20=D0=BD?=
 =?UTF-8?q?=D0=B0=20GetCurrent?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Repositories/IChangeLogRepository.cs       |  4 ++--
 .../Repository/ChangeLogRepositoryAbstract.cs  |  2 +-
 .../ProcessMapPlanBaseController.cs            | 18 +++++++++---------
 3 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/AsbCloudApp/Repositories/IChangeLogRepository.cs b/AsbCloudApp/Repositories/IChangeLogRepository.cs
index bf7cc6ef..70d0df99 100644
--- a/AsbCloudApp/Repositories/IChangeLogRepository.cs
+++ b/AsbCloudApp/Repositories/IChangeLogRepository.cs
@@ -60,13 +60,13 @@ public interface IChangeLogRepository<TDto, TRequest>
     Task<int> ClearAndInsertRange(int idUser, TRequest request, IEnumerable<TDto> dtos, CancellationToken token);
 
     /// <summary>
-    /// Удаление записей
+    /// Пометить записи как удаленные
     /// </summary>
     /// <param name="idUser"></param>
     /// <param name="ids"></param>
     /// <param name="token"></param>
     /// <returns></returns>
-    Task<int> DeleteRange(int idUser, IEnumerable<int> ids, CancellationToken token);
+    Task<int> MarkAsDeleted(int idUser, IEnumerable<int> ids, CancellationToken token);
 
     /// <summary>
     /// Получение дат изменений записей
diff --git a/AsbCloudInfrastructure/Repository/ChangeLogRepositoryAbstract.cs b/AsbCloudInfrastructure/Repository/ChangeLogRepositoryAbstract.cs
index b768136a..9d764402 100644
--- a/AsbCloudInfrastructure/Repository/ChangeLogRepositoryAbstract.cs
+++ b/AsbCloudInfrastructure/Repository/ChangeLogRepositoryAbstract.cs
@@ -169,7 +169,7 @@ public abstract class ChangeLogRepositoryAbstract<TDto, TEntity, TRequest> : ICh
         }
     }
 
-    public async Task<int> DeleteRange(int idUser, IEnumerable<int> ids, CancellationToken token)
+    public async Task<int> MarkAsDeleted(int idUser, IEnumerable<int> ids, CancellationToken token)
     {
         var updateTime = DateTimeOffset.UtcNow;
         var query = db.Set<TEntity>()
diff --git a/AsbCloudWebApi/Controllers/ProcessMaps/ProcessMapPlanBaseController.cs b/AsbCloudWebApi/Controllers/ProcessMaps/ProcessMapPlanBaseController.cs
index f701dd89..0ed1a5af 100644
--- a/AsbCloudWebApi/Controllers/ProcessMaps/ProcessMapPlanBaseController.cs
+++ b/AsbCloudWebApi/Controllers/ProcessMaps/ProcessMapPlanBaseController.cs
@@ -95,7 +95,7 @@ public abstract class ProcessMapPlanBaseController<TDto> : ControllerBase
     }
 
     /// <summary>
-    /// Удаление
+    /// Пометить записи как удаленные
     /// </summary>
     /// <param name="idWell"></param>
     /// <param name="ids"></param>
@@ -104,11 +104,11 @@ public abstract class ProcessMapPlanBaseController<TDto> : ControllerBase
     [HttpDelete]
     [ProducesResponseType(typeof(int), StatusCodes.Status200OK)]
     [ProducesResponseType(typeof(ValidationProblemDetails), StatusCodes.Status400BadRequest)]
-    public async Task<IActionResult> DeleteRange([FromRoute] int idWell, IEnumerable<int> ids, CancellationToken token)
+    public async Task<IActionResult> MarkAsDeleted([FromRoute] int idWell, IEnumerable<int> ids, CancellationToken token)
     {
         var idUser = await AssertUserHasAccessToWell(idWell, token);
 
-        var result = await repository.DeleteRange(idUser, ids, token);
+        var result = await repository.MarkAsDeleted(idUser, ids, token);
         return Ok(result);
     }
 
@@ -131,7 +131,7 @@ public abstract class ProcessMapPlanBaseController<TDto> : ControllerBase
     }
 
     /// <summary>
-    /// Получение
+    /// Получение текущих записей по параметрам
     /// </summary>
     /// <param name="idWell"></param>
     /// <param name="token"></param>
@@ -139,7 +139,7 @@ public abstract class ProcessMapPlanBaseController<TDto> : ControllerBase
     [HttpGet]
     [ProducesResponseType(StatusCodes.Status200OK)]
     [ProducesResponseType(typeof(ValidationProblemDetails), StatusCodes.Status400BadRequest)]
-    public async Task<ActionResult<IEnumerable<TDto>>> Get([FromRoute] int idWell, CancellationToken token)
+    public async Task<ActionResult<IEnumerable<TDto>>> GetCurrent([FromRoute] int idWell, CancellationToken token)
     {
         await AssertUserHasAccessToWell(idWell, token);
 
@@ -149,7 +149,7 @@ public abstract class ProcessMapPlanBaseController<TDto> : ControllerBase
     }
 
     /// <summary>
-    /// Получение
+    /// Получение измененных записей за определенную дату по ключу скважины
     /// </summary>
     /// <param name="idWell"></param>
     /// <param name="moment"></param>
@@ -162,17 +162,17 @@ public abstract class ProcessMapPlanBaseController<TDto> : ControllerBase
     {
         await AssertUserHasAccessToWell(idWell, token);
 
-        var serviceRequest = new ProcessMapPlanBaseRequestWithWell(new ProcessMapPlanBaseRequest()
+        var serviceRequest = new ProcessMapPlanBaseRequestWithWell(idWell)
         {
             Moment = moment,
-        }, idWell);
+        };
 
         var result = await repository.GetChangeLog(serviceRequest, null, token);
         return Ok(result);
     }
 
     /// <summary>
-    /// Получение
+    /// Получение записей за определенную дату по uid
     /// </summary>
     /// <param name="uid"></param>
     /// <param name="updateFrom"></param>