DD.Persistence.API/Controllers/ChangeLogController.cs

@@ -10,13 +10,12 @@ using DD.Persistence.API.Services;
 namespace DD.Persistence.API.Controllers;
 
 [ApiController]
-//[Authorize]
+[Authorize]
 [Route("api/[controller]")]
 public class ChangeLogController : ControllerBase, IChangeLogApi
 {
     private readonly IChangeLogRepository repository;
-
-    public ChangeLogService service { get; }
+    private ChangeLogService service { get; }
 
     /// <summary>
     /// ctor
@@ -37,8 +36,7 @@ public class ChangeLogController : ControllerBase, IChangeLogApi
         string comment,
         CancellationToken token)
     {
-        //var userId = User.GetUserId<Guid>();
-        var userId = Guid.NewGuid();
+        var userId = User.GetUserId<Guid>();
         var changeLogCommit = new ChangeLogCommitDto(userId, comment, [dto]);
         var result = await service.AddRange(idDiscriminator, changeLogCommit, token);
 
@@ -53,8 +51,7 @@ public class ChangeLogController : ControllerBase, IChangeLogApi
         string comment,
         CancellationToken token)
     {
-        //var userId = User.GetUserId<Guid>();
-        var userId = Guid.NewGuid();
+        var userId = User.GetUserId<Guid>();
         var changeLogCommit = new ChangeLogCommitDto(userId, comment, dtos);
         var result = await service.AddRange(idDiscriminator, changeLogCommit, token);
 
@@ -66,12 +63,7 @@ public class ChangeLogController : ControllerBase, IChangeLogApi
     public async Task<IActionResult> Delete(Guid id, string comment, CancellationToken token)
     {
         var userId = User.GetUserId<Guid>();
-        var changeLogCommit = new ChangeLogCommitDto()
-        {
-            Comment = comment,
-            IdAuthor = userId,
-            Creation = DateTimeOffset.UtcNow,
-        };
+        var changeLogCommit = new ChangeLogCommitDto(userId, comment, Enumerable.Empty<ChangeLogValuesDto>());
         var result = await service.MarkAsDeleted([id], changeLogCommit, token);
 
         return Ok(result);
@@ -82,12 +74,7 @@ public class ChangeLogController : ControllerBase, IChangeLogApi
     public async Task<IActionResult> DeleteRange(IEnumerable<Guid> ids, string comment, CancellationToken token)
     {
         var userId = User.GetUserId<Guid>();
-        var changeLogCommit = new ChangeLogCommitDto()
-        {
-            Comment = comment,
-            IdAuthor = userId,
-            Creation = DateTimeOffset.UtcNow,
-        };
+        var changeLogCommit = new ChangeLogCommitDto(userId, comment, Enumerable.Empty<ChangeLogValuesDto>());
         var result = await service.MarkAsDeleted(ids, changeLogCommit, token);
 
         return Ok(result);
@@ -101,8 +88,7 @@ public class ChangeLogController : ControllerBase, IChangeLogApi
         string comment,
         CancellationToken token)
     {
-        //var userId = User.GetUserId<Guid>();
-        var userId = Guid.NewGuid();
+        var userId = User.GetUserId<Guid>();
         var changeLogCommit = new ChangeLogCommitDto(userId, comment, dtos);
         var result = await service.ClearAndAddRange(idDiscriminator, changeLogCommit, token);
         return Ok(result);
@@ -115,8 +101,7 @@ public class ChangeLogController : ControllerBase, IChangeLogApi
         string comment,
         CancellationToken token)
     {
-        //var userId = User.GetUserId<Guid>();
-        var userId = Guid.NewGuid();
+        var userId = User.GetUserId<Guid>();
         var changeLogCommit = new ChangeLogCommitDto(userId, comment, [dto]);
         var result = await service.UpdateRange(changeLogCommit, token);
 
@@ -130,8 +115,7 @@ public class ChangeLogController : ControllerBase, IChangeLogApi
         string comment,
         CancellationToken token)
     {
-        //var userId = User.GetUserId<Guid>();
-        var userId = Guid.NewGuid();
+        var userId = User.GetUserId<Guid>();
         var changeLogCommit = new ChangeLogCommitDto(userId, comment, dtos);
         var result = await service.UpdateRange(changeLogCommit, token);
 

DD.Persistence.API/Services/ChangeLogService.cs

@@ -1,18 +1,25 @@
-using DD.Persistence.Database.Entity;
-using DD.Persistence.Models.Requests;
+using DD.Persistence.Models.Requests;
 using DD.Persistence.Repositories;
-using Microsoft.AspNetCore.Components.Forms;
 using Microsoft.Extensions.Caching.Memory;
-using Newtonsoft.Json.Linq;
 
 namespace DD.Persistence.API.Services;
-public class ChangeLogService 
+
+/// <summary>
+/// Сервис по работе с журналом изменений
+/// </summary>
+public class ChangeLogService
 {
     private readonly IMemoryCache memoryCache;
     private readonly IChangeLogCommitRepository commitRepository;
     private readonly IChangeLogRepository repository;
     private readonly TimeSpan? AbsoluteExpirationRelativeToNow = TimeSpan.FromMinutes(60);
 
+    /// <summary>
+    /// ctor
+    /// </summary>
+    /// <param name="memoryCache"></param>
+    /// <param name="commitRepository"></param>
+    /// <param name="repository"></param>
     public ChangeLogService(
         IMemoryCache memoryCache,
         IChangeLogCommitRepository commitRepository,
@@ -23,7 +30,13 @@ public class ChangeLogService
         this.repository = repository;
     }
 
-    private async Task<Guid> GetOrCreateAsync(ChangeLogCommitDto commitDto, CancellationToken token)
+    /// <summary>
+    /// Создание или чтение данных коммита
+    /// </summary>
+    /// <param name="commitDto"></param>
+    /// <param name="token"></param>
+    /// <returns></returns>
+    private async Task<Guid> GetOrCreateCommitAsync(ChangeLogCommitDto commitDto, CancellationToken token)
     {
         var key = (commitDto.IdAuthor, commitDto.Comment);
         var commitId = await memoryCache.GetOrCreateAsync(key, async (cacheEntry) =>
@@ -37,18 +50,32 @@ public class ChangeLogService
         return commitId;
     }
 
+    /// <summary>
+    /// Добавление записи в журнал изменений
+    /// </summary>
+    /// <param name="idDiscriminator"></param>
+    /// <param name="commitDto"></param>
+    /// <param name="token"></param>
+    /// <returns></returns>
     public async Task<int> AddRange(Guid idDiscriminator, ChangeLogCommitDto commitDto, CancellationToken token)
     {
-        var commitId = await GetOrCreateAsync(commitDto, token);
+        var commitId = await GetOrCreateCommitAsync(commitDto, token);
         commitDto.Id = commitId;
 
         var result = await repository.AddRange(idDiscriminator, commitDto, token);
         return result;
     }
 
-    public async Task<int> MarkAsDeleted(IEnumerable<Guid> ids, ChangeLogCommitDto commitDto, CancellationToken token) 
+    /// <summary>
+    /// Пометить запись журнала изменений как удаленную
+    /// </summary>
+    /// <param name="ids"></param>
+    /// <param name="commitDto"></param>
+    /// <param name="token"></param>
+    /// <returns></returns>
+    public async Task<int> MarkAsDeleted(IEnumerable<Guid> ids, ChangeLogCommitDto commitDto, CancellationToken token)
     {
-        var commitId = await GetOrCreateAsync(commitDto, token);
+        var commitId = await GetOrCreateCommitAsync(commitDto, token);
         commitDto.Id = commitId;
 
         var result = await repository.MarkAsDeleted(commitId, ids, commitDto.Creation, token);
@@ -56,9 +83,16 @@ public class ChangeLogService
         return result;
     }
 
+    /// <summary>
+    /// Очистить старые и добавить новые записи в журнал изменений
+    /// </summary>
+    /// <param name="idDiscriminator"></param>
+    /// <param name="commitDto"></param>
+    /// <param name="token"></param>
+    /// <returns></returns>
     public async Task<int> ClearAndAddRange(Guid idDiscriminator, ChangeLogCommitDto commitDto, CancellationToken token)
     {
-        var commitId = await GetOrCreateAsync(commitDto, token);
+        var commitId = await GetOrCreateCommitAsync(commitDto, token);
         commitDto.Id = commitId;
 
         var result = await repository.ClearAndAddRange(idDiscriminator, commitDto, token);
@@ -66,9 +100,15 @@ public class ChangeLogService
         return result;
     }
 
+    /// <summary>
+    /// Обновить записи в журнале изменений
+    /// </summary>
+    /// <param name="changeLogCommit"></param>
+    /// <param name="token"></param>
+    /// <returns></returns>
     public async Task<int> UpdateRange(ChangeLogCommitDto changeLogCommit, CancellationToken token)
     {
-        var commitId = await GetOrCreateAsync(changeLogCommit, token);
+        var commitId = await GetOrCreateCommitAsync(changeLogCommit, token);
         changeLogCommit.Id = commitId;
 
         var result = await repository.UpdateRange(changeLogCommit, token);

DD.Persistence.App/appsettings.Tests.json

@@ -1,7 +1,7 @@
 {
   "DbConnection": {
-    "Host": "localhost",
-    "Port": 5462,
+    "Host": "postgres",
+    "Port": 5432,
     "Database": "persistence",
     "Username": "postgres",
     "Password": "postgres"

DD.Persistence.Database.Postgres.Test/DD.Persistence.Database.Postgres.Test.csproj

@@ -17,7 +17,6 @@
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\DD.Persistence.API\DD.Persistence.API.csproj" />
     <ProjectReference Include="..\DD.Persistence.Database.Postgres\DD.Persistence.Database.Postgres.csproj" />
   </ItemGroup>
 

DD.Persistence.Database.Postgres/Migrations/20250218052129_Init.Designer.cs

@@ -13,8 +13,8 @@ using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata;
 namespace DD.Persistence.Database.Postgres.Migrations
 {
     [DbContext(typeof(PersistencePostgresContext))]
-    [Migration("20250214113032_Initial")]
-    partial class Initial
+    [Migration("20250218052129_Init")]
+    partial class Init
     {
         /// <inheritdoc />
         protected override void BuildTargetModel(ModelBuilder modelBuilder)

DD.Persistence.Database.Postgres/Migrations/20250218052129_Init.cs

@@ -7,7 +7,7 @@ using Microsoft.EntityFrameworkCore.Migrations;
 namespace DD.Persistence.Database.Postgres.Migrations
 {
     /// <inheritdoc />
-    public partial class Initial : Migration
+    public partial class Init : Migration
     {
         /// <inheritdoc />
         protected override void Up(MigrationBuilder migrationBuilder)

DD.Persistence.Database/PersistenceDbContext.cs

@@ -16,7 +16,7 @@ public class PersistenceDbContext : DbContext
 
     public DbSet<ChangeLog> ChangeLog => Set<ChangeLog>();
 
-    public DbSet<ChangeLogCommit> ChangeLogAction => Set<ChangeLogCommit>();
+    public DbSet<ChangeLogCommit> ChangeLogCommit => Set<ChangeLogCommit>();
 
     public DbSet<TechMessage> TechMessage => Set<TechMessage>();
 

DD.Persistence.Database/Repositories/ChangeLogCommitRepository.cs

@@ -15,10 +15,6 @@ public class ChangeLogCommitRepository : IChangeLogCommitRepository
 {
     private DbContext db;
 
-    public ChangeLogCommitRepository()
-    {
-        
-    }
     public ChangeLogCommitRepository(DbContext db) 
     {
         this.db = db;

DD.Persistence.IntegrationTests/Controllers/ChangeLogControllerTest.cs

@@ -40,11 +40,11 @@ public class ChangeLogControllerTest : BaseIntegrationTest
     {
         // arrange
         var insertedCount = 10;
-        var newEntitiesData = await CreateAndReturnNewDtos(insertedCount, (-15, 15));
+        var newEntitiesData = await CreateAndReturnNewDtos(insertedCount, (-15, -1));
         var idDiscriminator = newEntitiesData.Item1;
         var dtos = newEntitiesData.Item2;
 
-
+        //act
         var result = await client.ClearAndAddRange(idDiscriminator, dtos, "Добавление новых элементов и очистка старых", CancellationToken.None);
 
         // assert
@@ -218,7 +218,7 @@ public class ChangeLogControllerTest : BaseIntegrationTest
 
         //создаем записи
         var count = 5;
-        var changeLogItems = await CreateAndReturnNewDtos(count, (-15, 15));
+        var changeLogItems = await CreateAndReturnNewDtos(count, (-15, -1));
         var idDiscriminator = changeLogItems.Item1;
         var entities = changeLogItems.Item2;
 
@@ -322,7 +322,7 @@ public class ChangeLogControllerTest : BaseIntegrationTest
             Creation = DateTimeOffset.UtcNow,
             Id = Guid.NewGuid(),
         };
-        dbContext.ChangeLogAction.Add(commit);
+        dbContext.ChangeLogCommit.Add(commit);
         await dbContext.SaveChangesAsync();
 
         var minDayCount = daysRange.Item1;

DD.Persistence.Models/Requests/ChangeLogCommitDto.cs

@@ -30,14 +30,6 @@ public class ChangeLogCommitDto
     /// </summary>
     public IEnumerable<ChangeLogValuesDto> ChangeLogItems { get; set; }
 
-    /// <summary>
-    /// ctor
-    /// </summary>
-    public ChangeLogCommitDto()
-    {
-        
-    }
-
     /// <summary>
     /// 
     /// </summary>

DD.Persistence.Repository.Test/DD.Persistence.Repository.Test.csproj

@@ -19,7 +19,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\DD.Persistence.API\DD.Persistence.API.csproj" />
+    <ProjectReference Include="..\DD.Persistence.Database.Postgres\DD.Persistence.Database.Postgres.csproj" />
   </ItemGroup>
 
   <ItemGroup>

DD.Persistence/Repositories/IChangeLogCommitRepository.cs

@@ -8,12 +8,12 @@ using System.Threading.Tasks;
 namespace DD.Persistence.Repositories;
 
 /// <summary>
-/// 
+/// Интерфейс для работы с коммитами журнала изменений
 /// </summary>
 public interface IChangeLogCommitRepository
 {
     /// <summary>
-    /// 
+    /// Добавить коммит для журнала изменений
     /// </summary>
     /// <param name="commitDto"></param>
     /// <param name="token"></param>