diff --git a/DD.Persistence.API/Controllers/ChangeLogController.cs b/DD.Persistence.API/Controllers/ChangeLogController.cs index 0fd5b3f..33585fc 100644 --- a/DD.Persistence.API/Controllers/ChangeLogController.cs +++ b/DD.Persistence.API/Controllers/ChangeLogController.cs @@ -33,7 +33,7 @@ public class ChangeLogController : ControllerBase, IChangeLogApi CancellationToken token) { var userId = User.GetUserId(); - var changeLogCommitRequest = new ChangeLogCommitRequest(Uuid7.Guid(), comment); + var changeLogCommitRequest = new CreateChangeLogCommitRequest(Uuid7.Guid(), comment); var result = await service.AddRange(idDiscriminator, changeLogCommitRequest, dtos, token); return CreatedAtAction(nameof(AddRange), result); @@ -44,7 +44,7 @@ public class ChangeLogController : ControllerBase, IChangeLogApi public async Task DeleteRange(IEnumerable ids, string comment, CancellationToken token) { var userId = User.GetUserId(); - var changeLogCommitRequest = new ChangeLogCommitRequest(userId, comment); + var changeLogCommitRequest = new CreateChangeLogCommitRequest(userId, comment); var result = await service.MarkAsDeleted(ids, changeLogCommitRequest, token); return Ok(result); @@ -59,7 +59,7 @@ public class ChangeLogController : ControllerBase, IChangeLogApi CancellationToken token) { var userId = User.GetUserId(); - var changeLogCommitRequest = new ChangeLogCommitRequest(userId, comment); + var changeLogCommitRequest = new CreateChangeLogCommitRequest(userId, comment); var result = await service.ClearAndAddRange(idDiscriminator, changeLogCommitRequest, dtos, token); return Ok(result); } @@ -72,7 +72,7 @@ public class ChangeLogController : ControllerBase, IChangeLogApi CancellationToken token) { var userId = User.GetUserId(); - var changeLogCommitRequest = new ChangeLogCommitRequest(userId, comment); + var changeLogCommitRequest = new CreateChangeLogCommitRequest(userId, comment); var result = await service.UpdateRange(changeLogCommitRequest, dtos, token); return Ok(result); diff --git a/DD.Persistence.API/Services/ChangeLogService.cs b/DD.Persistence.API/Services/ChangeLogService.cs index 4b143a9..f4831d2 100644 --- a/DD.Persistence.API/Services/ChangeLogService.cs +++ b/DD.Persistence.API/Services/ChangeLogService.cs @@ -39,7 +39,7 @@ public class ChangeLogService /// /// /// - private async Task GetOrCreateCommitAsync(ChangeLogCommitRequest commitDto, CancellationToken token) + private async Task GetOrCreateCommitAsync(CreateChangeLogCommitRequest commitDto, CancellationToken token) { var key = (commitDto.IdAuthor, commitDto.Comment); var commitId = await memoryCache.GetOrCreateAsync(key, async (cacheEntry) => @@ -61,7 +61,7 @@ public class ChangeLogService /// /// /// - public async Task AddRange(Guid idDiscriminator, ChangeLogCommitRequest commitRequestDto, IEnumerable dtos, CancellationToken token) + public async Task AddRange(Guid idDiscriminator, CreateChangeLogCommitRequest commitRequestDto, IEnumerable dtos, CancellationToken token) { var commitId = await GetOrCreateCommitAsync(commitRequestDto, token); var commitDto = new ChangeLogCommitDto(commitId, commitRequestDto); @@ -77,7 +77,7 @@ public class ChangeLogService /// /// /// - public async Task MarkAsDeleted(IEnumerable ids, ChangeLogCommitRequest commitRequestDto, CancellationToken token) + public async Task MarkAsDeleted(IEnumerable ids, CreateChangeLogCommitRequest commitRequestDto, CancellationToken token) { var commitId = await GetOrCreateCommitAsync(commitRequestDto, token); var commitDto = new ChangeLogCommitDto(commitId, commitRequestDto); @@ -95,7 +95,7 @@ public class ChangeLogService /// /// /// - public async Task ClearAndAddRange(Guid idDiscriminator, ChangeLogCommitRequest commitRequestDto, IEnumerable dtos, CancellationToken token) + public async Task ClearAndAddRange(Guid idDiscriminator, CreateChangeLogCommitRequest commitRequestDto, IEnumerable dtos, CancellationToken token) { var commitId = await GetOrCreateCommitAsync(commitRequestDto, token); var commitDto = new ChangeLogCommitDto(commitId, commitRequestDto); @@ -112,7 +112,7 @@ public class ChangeLogService /// /// /// - public async Task UpdateRange(ChangeLogCommitRequest commitRequestDto, IEnumerable dtos, CancellationToken token) + public async Task UpdateRange(CreateChangeLogCommitRequest commitRequestDto, IEnumerable dtos, CancellationToken token) { var commitId = await GetOrCreateCommitAsync(commitRequestDto, token); var commitDto = new ChangeLogCommitDto(commitId, commitRequestDto); diff --git a/DD.Persistence.Database/Repositories/ChangeLogCommitRepository.cs b/DD.Persistence.Database/Repositories/ChangeLogCommitRepository.cs index 847e280..634136c 100644 --- a/DD.Persistence.Database/Repositories/ChangeLogCommitRepository.cs +++ b/DD.Persistence.Database/Repositories/ChangeLogCommitRepository.cs @@ -20,7 +20,7 @@ public class ChangeLogCommitRepository : IChangeLogCommitRepository this.db = db; } - public async Task Add(ChangeLogCommitRequest commitRequestDto, CancellationToken token) + public async Task Add(CreateChangeLogCommitRequest commitRequestDto, CancellationToken token) { var commit = new ChangeLogCommit() diff --git a/DD.Persistence.Models/ChangeLogCommitDto.cs b/DD.Persistence.Models/ChangeLogCommitDto.cs index 2d29ab6..0df8baf 100644 --- a/DD.Persistence.Models/ChangeLogCommitDto.cs +++ b/DD.Persistence.Models/ChangeLogCommitDto.cs @@ -3,7 +3,7 @@ /// /// Модель коммита с изменениями /// -public class ChangeLogCommitDto : ChangeLogCommitRequest +public class ChangeLogCommitDto : CreateChangeLogCommitRequest { /// /// Id @@ -13,7 +13,7 @@ public class ChangeLogCommitDto : ChangeLogCommitRequest /// /// /// - public ChangeLogCommitDto(Guid id, ChangeLogCommitRequest request) : base(request.IdAuthor, request.Comment) + public ChangeLogCommitDto(Guid id, CreateChangeLogCommitRequest request) : base(request.IdAuthor, request.Comment) { Id = id; } diff --git a/DD.Persistence.Models/Requests/ChangeLogCommitRequest.cs b/DD.Persistence.Models/Requests/CreateChangeLogCommitRequest.cs similarity index 78% rename from DD.Persistence.Models/Requests/ChangeLogCommitRequest.cs rename to DD.Persistence.Models/Requests/CreateChangeLogCommitRequest.cs index 10148b5..e0bcffa 100644 --- a/DD.Persistence.Models/Requests/ChangeLogCommitRequest.cs +++ b/DD.Persistence.Models/Requests/CreateChangeLogCommitRequest.cs @@ -1,9 +1,9 @@ namespace DD.Persistence.Models.Requests; /// -/// Модель коммита с изменениями +/// Модель для создания коммита /// -public class ChangeLogCommitRequest +public class CreateChangeLogCommitRequest { /// /// Дата создания @@ -23,7 +23,7 @@ public class ChangeLogCommitRequest /// /// /// - public ChangeLogCommitRequest(Guid idAuthor, string comment) + public CreateChangeLogCommitRequest(Guid idAuthor, string comment) { IdAuthor = idAuthor; Comment = comment; diff --git a/DD.Persistence.Test/ChangeLogTest.cs b/DD.Persistence.Test/ChangeLogTest.cs index ed0627d..106dca5 100644 --- a/DD.Persistence.Test/ChangeLogTest.cs +++ b/DD.Persistence.Test/ChangeLogTest.cs @@ -26,11 +26,11 @@ public class ChangeLogTest var discriminatorId = Uuid7.Guid(); var expectedCommitId = Uuid7.Guid(); var comment = "Добавление нескольких значений"; - var commitRequest = new ChangeLogCommitRequest(Uuid7.Guid(), comment); + var commitRequest = new CreateChangeLogCommitRequest(Uuid7.Guid(), comment); var commit = new ChangeLogCommitDto(expectedCommitId, commitRequest); var dtos = GenerateChangeLogValuesDto(2); - changeLogCommitRepository.Add(Arg.Any(), Arg.Any()).Returns(Uuid7.Guid()); + changeLogCommitRepository.Add(Arg.Any(), Arg.Any()).Returns(Uuid7.Guid()); changeLogRepository .AddRange( Arg.Any(), @@ -57,12 +57,12 @@ public class ChangeLogTest var discriminatorId = Uuid7.Guid(); var expectedCommitId = Uuid7.Guid(); var comment = "Изменение нескольких значений"; - var commitRequest = new ChangeLogCommitRequest(Uuid7.Guid(), comment); + var commitRequest = new CreateChangeLogCommitRequest(Uuid7.Guid(), comment); var commit = new ChangeLogCommitDto(expectedCommitId, commitRequest); var dtos = GenerateChangeLogValuesDto(2); - changeLogCommitRepository.Add(Arg.Any(), Arg.Any()).Returns(commit.Id); + changeLogCommitRepository.Add(Arg.Any(), Arg.Any()).Returns(commit.Id); changeLogRepository .UpdateRange( @@ -93,12 +93,12 @@ public class ChangeLogTest var discriminatorId = Uuid7.Guid(); var expectedCommitId = Uuid7.Guid(); var comment = "Удаление нескольких значений"; - var commitRequest = new ChangeLogCommitRequest(Uuid7.Guid(), comment); + var commitRequest = new CreateChangeLogCommitRequest(Uuid7.Guid(), comment); var commit = new ChangeLogCommitDto(expectedCommitId, commitRequest); var dtos = GenerateChangeLogValuesDto(2); var dtoIds = dtos.Select(d => d.Id); - changeLogCommitRepository.Add(Arg.Any(), Arg.Any()).Returns(expectedCommitId); + changeLogCommitRepository.Add(Arg.Any(), Arg.Any()).Returns(expectedCommitId); changeLogRepository .MarkAsDeleted( Arg.Any(), @@ -125,12 +125,12 @@ public class ChangeLogTest var discriminatorId = Uuid7.Guid(); var expectedCommitId = Uuid7.Guid(); var comment = "Удаление и добавление нескольких значений"; - var commitRequest = new ChangeLogCommitRequest(expectedCommitId, comment); + var commitRequest = new CreateChangeLogCommitRequest(expectedCommitId, comment); var commit = new ChangeLogCommitDto(expectedCommitId, commitRequest); var dtos = GenerateChangeLogValuesDto(2); var dtoIds = dtos.Select(d => d.Id); - changeLogCommitRepository.Add(Arg.Any(), Arg.Any()).Returns(Uuid7.Guid()); + changeLogCommitRepository.Add(Arg.Any(), Arg.Any()).Returns(Uuid7.Guid()); changeLogRepository .ClearAndAddRange( Arg.Any(), diff --git a/DD.Persistence/Repositories/IChangeLogCommitRepository.cs b/DD.Persistence/Repositories/IChangeLogCommitRepository.cs index 9aaa703..6cb1d0d 100644 --- a/DD.Persistence/Repositories/IChangeLogCommitRepository.cs +++ b/DD.Persistence/Repositories/IChangeLogCommitRepository.cs @@ -18,5 +18,5 @@ public interface IChangeLogCommitRepository /// /// /// - Task Add(ChangeLogCommitRequest commitDto, CancellationToken token); + Task Add(CreateChangeLogCommitRequest commitDto, CancellationToken token); }