on.nemtina/persistence
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

нейминг-2

Browse Source
This commit is contained in:
Olga Nemt 2025-02-21 12:28:32 +05:00
parent 7590e8facb
commit 0c7006d52a
7 changed files with 24 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
DD.Persistence.API/Controllers/ChangeLogController.cs
View File

@ -33,7 +33,7 @@ public class ChangeLogController : ControllerBase, IChangeLogApi
CancellationToken token)
{
var userId = User.GetUserId<Guid>();
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<IActionResult> DeleteRange(IEnumerable<Guid> ids, string comment, CancellationToken token)
{
var userId = User.GetUserId<Guid>();
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<Guid>();
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<Guid>();
var changeLogCommitRequest = new ChangeLogCommitRequest(userId, comment);
var changeLogCommitRequest = new CreateChangeLogCommitRequest(userId, comment);
var result = await service.UpdateRange(changeLogCommitRequest, dtos, token);
return Ok(result);

10
DD.Persistence.API/Services/ChangeLogService.cs
View File

@ -39,7 +39,7 @@ public class ChangeLogService
/// <param name="commitDto"></param>
/// <param name="token"></param>
/// <returns></returns>
private async Task<Guid> GetOrCreateCommitAsync(ChangeLogCommitRequest commitDto, CancellationToken token)
private async Task<Guid> 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
/// <param name="dtos"></param>
/// <param name="token"></param>
/// <returns></returns>
public async Task<int> AddRange(Guid idDiscriminator, ChangeLogCommitRequest commitRequestDto, IEnumerable<ChangeLogValuesDto> dtos, CancellationToken token)
public async Task<int> AddRange(Guid idDiscriminator, CreateChangeLogCommitRequest commitRequestDto, IEnumerable<ChangeLogValuesDto> dtos, CancellationToken token)
{
var commitId = await GetOrCreateCommitAsync(commitRequestDto, token);
var commitDto = new ChangeLogCommitDto(commitId, commitRequestDto);
@ -77,7 +77,7 @@ public class ChangeLogService
/// <param name="commitRequestDto"></param>
/// <param name="token"></param>
/// <returns></returns>
public async Task<int> MarkAsDeleted(IEnumerable<Guid> ids, ChangeLogCommitRequest commitRequestDto, CancellationToken token)
public async Task<int> MarkAsDeleted(IEnumerable<Guid> ids, CreateChangeLogCommitRequest commitRequestDto, CancellationToken token)
{
var commitId = await GetOrCreateCommitAsync(commitRequestDto, token);
var commitDto = new ChangeLogCommitDto(commitId, commitRequestDto);
@ -95,7 +95,7 @@ public class ChangeLogService
/// <param name="dtos"></param>
/// <param name="token"></param>
/// <returns></returns>
public async Task<int> ClearAndAddRange(Guid idDiscriminator, ChangeLogCommitRequest commitRequestDto, IEnumerable<ChangeLogValuesDto> dtos, CancellationToken token)
public async Task<int> ClearAndAddRange(Guid idDiscriminator, CreateChangeLogCommitRequest commitRequestDto, IEnumerable<ChangeLogValuesDto> dtos, CancellationToken token)
{
var commitId = await GetOrCreateCommitAsync(commitRequestDto, token);
var commitDto = new ChangeLogCommitDto(commitId, commitRequestDto);
@ -112,7 +112,7 @@ public class ChangeLogService
/// <param name="dtos"></param>
/// <param name="token"></param>
/// <returns></returns>
public async Task<int> UpdateRange(ChangeLogCommitRequest commitRequestDto, IEnumerable<ChangeLogValuesDto> dtos, CancellationToken token)
public async Task<int> UpdateRange(CreateChangeLogCommitRequest commitRequestDto, IEnumerable<ChangeLogValuesDto> dtos, CancellationToken token)
{
var commitId = await GetOrCreateCommitAsync(commitRequestDto, token);
var commitDto = new ChangeLogCommitDto(commitId, commitRequestDto);

2
DD.Persistence.Database/Repositories/ChangeLogCommitRepository.cs
View File

@ -20,7 +20,7 @@ public class ChangeLogCommitRepository : IChangeLogCommitRepository
this.db = db;
}
public async Task<Guid> Add(ChangeLogCommitRequest commitRequestDto, CancellationToken token)
public async Task<Guid> Add(CreateChangeLogCommitRequest commitRequestDto, CancellationToken token)
{
var commit = new ChangeLogCommit()

4
DD.Persistence.Models/ChangeLogCommitDto.cs
View File

@ -3,7 +3,7 @@
/// <summary>
/// Модель коммита с изменениями
/// </summary>
public class ChangeLogCommitDto : ChangeLogCommitRequest
public class ChangeLogCommitDto : CreateChangeLogCommitRequest
{
/// <summary>
/// Id
@ -13,7 +13,7 @@ public class ChangeLogCommitDto : ChangeLogCommitRequest
/// <summary>
///
/// </summary>
public ChangeLogCommitDto(Guid id, ChangeLogCommitRequest request) : base(request.IdAuthor, request.Comment)
public ChangeLogCommitDto(Guid id, CreateChangeLogCommitRequest request) : base(request.IdAuthor, request.Comment)
{
Id = id;
}

6
DD.Persistence.Models/Requests/ChangeLogCommitRequest.cs → DD.Persistence.Models/Requests/CreateChangeLogCommitRequest.cs
View File

@ -1,9 +1,9 @@
namespace DD.Persistence.Models.Requests;
/// <summary>
/// Модель коммита с изменениями
/// Модель для создания коммита
/// </summary>
public class ChangeLogCommitRequest
public class CreateChangeLogCommitRequest
{
/// <summary>
/// Дата создания
@ -23,7 +23,7 @@ public class ChangeLogCommitRequest
/// <summary>
///
/// </summary>
public ChangeLogCommitRequest(Guid idAuthor, string comment)
public CreateChangeLogCommitRequest(Guid idAuthor, string comment)
{
IdAuthor = idAuthor;
Comment = comment;

16
DD.Persistence.Test/ChangeLogTest.cs
View File

@ -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<ChangeLogCommitRequest>(), Arg.Any<CancellationToken>()).Returns(Uuid7.Guid());
changeLogCommitRepository.Add(Arg.Any<CreateChangeLogCommitRequest>(), Arg.Any<CancellationToken>()).Returns(Uuid7.Guid());
changeLogRepository
.AddRange(
Arg.Any<Guid>(),
@ -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<ChangeLogCommitRequest>(), Arg.Any<CancellationToken>()).Returns(commit.Id);
changeLogCommitRepository.Add(Arg.Any<CreateChangeLogCommitRequest>(), Arg.Any<CancellationToken>()).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<ChangeLogCommitRequest>(), Arg.Any<CancellationToken>()).Returns(expectedCommitId);
changeLogCommitRepository.Add(Arg.Any<CreateChangeLogCommitRequest>(), Arg.Any<CancellationToken>()).Returns(expectedCommitId);
changeLogRepository
.MarkAsDeleted(
Arg.Any<Guid>(),
@ -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<ChangeLogCommitRequest>(), Arg.Any<CancellationToken>()).Returns(Uuid7.Guid());
changeLogCommitRepository.Add(Arg.Any<CreateChangeLogCommitRequest>(), Arg.Any<CancellationToken>()).Returns(Uuid7.Guid());
changeLogRepository
.ClearAndAddRange(
Arg.Any<Guid>(),

2
DD.Persistence/Repositories/IChangeLogCommitRepository.cs
View File

@ -18,5 +18,5 @@ public interface IChangeLogCommitRepository
/// <param name="commitDto"></param>
/// <param name="token"></param>
/// <returns></returns>
Task<Guid> Add(ChangeLogCommitRequest commitDto, CancellationToken token);
Task<Guid> Add(CreateChangeLogCommitRequest commitDto, CancellationToken token);
}