From 8d2a22a38f0be4f5911d9596090b035d20030ca3 Mon Sep 17 00:00:00 2001
From: Olga Nemt <on.nemtina@digitaldrilling.ru>
Date: Fri, 6 Dec 2024 16:19:42 +0500
Subject: [PATCH] =?UTF-8?q?=D0=94=D0=BE=D0=B1=D0=B0=D0=B2=D0=BB=D0=B5?=
 =?UTF-8?q?=D0=BD=20idDiscriminator=20=D0=B2=20=D1=80=D0=BE=D1=83=D1=82=20?=
 =?UTF-8?q?=D0=B4=D0=BB=D1=8F=20=D0=B8=D0=BD=D1=82=D0=B5=D0=B3=D1=80=D0=B0?=
 =?UTF-8?q?=D1=86=D0=B8=D0=BE=D0=BD=D0=BD=D1=8B=D1=85=20=D1=82=D0=B5=D1=81?=
 =?UTF-8?q?=D1=82=D0=BE=D0=B2=20+=20=D0=BF=D1=80=D0=B0=D0=B2=D0=BA=D0=B0?=
 =?UTF-8?q?=20=D0=BF=D0=BE=20=D1=80=D0=B5=D0=B7=D1=83=D0=BB=D1=8C=D1=82?=
 =?UTF-8?q?=D0=B0=D1=82=D0=B0=D0=BC=20=D0=BF=D1=80=D0=BE=D0=B3=D0=BE=D0=BD?=
 =?UTF-8?q?=D0=B0=20=D1=82=D0=B5=D1=81=D1=82=D0=BE=D0=B2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Persistence.Client/Clients/IChangeLogClient.cs | 18 +++++++++---------
 .../Repositories/ChangeLogRepository.cs        |  2 +-
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/Persistence.Client/Clients/IChangeLogClient.cs b/Persistence.Client/Clients/IChangeLogClient.cs
index 4f1cc60..dcbc9e2 100644
--- a/Persistence.Client/Clients/IChangeLogClient.cs
+++ b/Persistence.Client/Clients/IChangeLogClient.cs
@@ -17,7 +17,7 @@ public interface IChangeLogClient
     /// <param name="idDiscriminator"></param>
     /// <param name="dtos"></param>
     /// <returns></returns>
-    [Post($"{BaseRoute}/replace")]
+    [Post($"{BaseRoute}/replace/{{idDiscriminator}}")]
     Task<IApiResponse<int>> ClearAndAddRange(Guid idDiscriminator, IEnumerable<DataWithWellDepthAndSectionDto> dtos);
 
     /// <summary>
@@ -28,10 +28,10 @@ public interface IChangeLogClient
     /// <param name="filterRequest">параметры запроса фильтрации</param>
     /// <param name="paginationRequest">параметры запроса пагинации</param>
     /// <returns></returns>
-    [Get($"{BaseRoute}/moment")]
+    [Get($"{BaseRoute}/moment/{{idDiscriminator}}")]
     Task<IApiResponse<PaginationContainer<DataWithWellDepthAndSectionDto>>> GetByDate(
-        Guid idDiscriminator, 
-        DateTimeOffset moment, 
+        Guid idDiscriminator,
+        DateTimeOffset moment,
         [Query] SectionPartRequest filterRequest,
         [Query] PaginationRequest paginationRequest);
 
@@ -42,7 +42,7 @@ public interface IChangeLogClient
     /// <param name="dateBegin"></param>
     /// <param name="dateEnd"></param>
     /// <returns></returns>
-    [Get($"{BaseRoute}/history")]
+    [Get($"{BaseRoute}/history/{{idDiscriminator}}")]
     Task<IApiResponse<IEnumerable<ChangeLogDto>>> GetChangeLogForInterval(Guid idDiscriminator, DateTimeOffset dateBegin, DateTimeOffset dateEnd);
 
     /// <summary>
@@ -51,7 +51,7 @@ public interface IChangeLogClient
     /// <param name="idDiscriminator"></param>
     /// <param name="dto"></param>
     /// <returns></returns>
-    [Post($"{BaseRoute}")]
+    [Post($"{BaseRoute}/{{idDiscriminator}}")]
     Task<IApiResponse<int>> Add(Guid idDiscriminator, DataWithWellDepthAndSectionDto dto);
 
     /// <summary>
@@ -60,7 +60,7 @@ public interface IChangeLogClient
     /// <param name="idDiscriminator"></param>
     /// <param name="dtos"></param>
     /// <returns></returns>
-    [Post($"{BaseRoute}/range")]
+    [Post($"{BaseRoute}/range/{{idDiscriminator}}")]
     Task<IApiResponse<int>> AddRange(Guid idDiscriminator, IEnumerable<DataWithWellDepthAndSectionDto> dtos);
 
     /// <summary>
@@ -69,7 +69,7 @@ public interface IChangeLogClient
     /// <param name="idDiscriminator"></param>
     /// <param name="dto"></param>
     /// <returns></returns>
-    [Put($"{BaseRoute}")]
+    [Put($"{BaseRoute}/{{idDiscriminator}}")]
     Task<IApiResponse<int>> Update(Guid idDiscriminator, DataWithWellDepthAndSectionDto dto);
 
     /// <summary>
@@ -78,7 +78,7 @@ public interface IChangeLogClient
     /// <param name="idDiscriminator"></param>
     /// <param name="dtos"></param>
     /// <returns></returns>
-    [Put($"{BaseRoute}/range")]
+    [Put($"{BaseRoute}/range/{{idDiscriminator}}")]
     Task<IApiResponse<int>> UpdateRange(Guid idDiscriminator, IEnumerable<DataWithWellDepthAndSectionDto> dtos);
 
     /// <summary>
diff --git a/Persistence.Repository/Repositories/ChangeLogRepository.cs b/Persistence.Repository/Repositories/ChangeLogRepository.cs
index 7f6d573..78c2eba 100644
--- a/Persistence.Repository/Repositories/ChangeLogRepository.cs
+++ b/Persistence.Repository/Repositories/ChangeLogRepository.cs
@@ -35,7 +35,7 @@ public class ChangeLogRepository : IChangeLogRepository
     {
         var query = db.Set<ChangeLog>()
             .Where(s => ids.Contains(s.Id))
-            .Where(s => s.Obsolete != null);
+            .Where(s => s.Obsolete == null);
 
         if (query.Count() != ids.Count())
         {