diff --git a/EnvelopeGenerator.Application/Dto/EnvelopeHistory/EnvelopeHistoryDto.cs b/EnvelopeGenerator.Application/Dto/EnvelopeHistory/EnvelopeHistoryDto.cs
index 986338ff..e89d20d1 100644
--- a/EnvelopeGenerator.Application/Dto/EnvelopeHistory/EnvelopeHistoryDto.cs
+++ b/EnvelopeGenerator.Application/Dto/EnvelopeHistory/EnvelopeHistoryDto.cs
@@ -62,7 +62,7 @@ public record EnvelopeHistoryDto
///
/// Information about the receiver associated with this history entry.
///
- public ReceiverReadDto? Receiver { get; set; }
+ public ReceiverDto? Receiver { get; set; }
///
/// Optional comment related to this history entry.
diff --git a/EnvelopeGenerator.Application/Dto/EnvelopeReceiver/EnvelopeReceiverDto.cs b/EnvelopeGenerator.Application/Dto/EnvelopeReceiver/EnvelopeReceiverDto.cs
index ab10e189..6a710ac9 100644
--- a/EnvelopeGenerator.Application/Dto/EnvelopeReceiver/EnvelopeReceiverDto.cs
+++ b/EnvelopeGenerator.Application/Dto/EnvelopeReceiver/EnvelopeReceiverDto.cs
@@ -18,5 +18,5 @@ public record EnvelopeReceiverDto() : EnvelopeReceiverBasicDto()
///
///
///
- public ReceiverReadDto? Receiver { get; set; }
+ public ReceiverDto? Receiver { get; set; }
}
\ No newline at end of file
diff --git a/EnvelopeGenerator.Application/Dto/EnvelopeReceiverReadOnly/EnvelopeReceiverReadOnlyDto.cs b/EnvelopeGenerator.Application/Dto/EnvelopeReceiverReadOnly/EnvelopeReceiverReadOnlyDto.cs
index 502eb496..784e285b 100644
--- a/EnvelopeGenerator.Application/Dto/EnvelopeReceiverReadOnly/EnvelopeReceiverReadOnlyDto.cs
+++ b/EnvelopeGenerator.Application/Dto/EnvelopeReceiverReadOnly/EnvelopeReceiverReadOnlyDto.cs
@@ -59,5 +59,5 @@ public class EnvelopeReceiverReadOnlyDto
///
/// Gets or inits the associated receiver details.
///
- public ReceiverReadDto? Receiver { get; set; }
+ public ReceiverDto? Receiver { get; set; }
}
\ No newline at end of file
diff --git a/EnvelopeGenerator.Application/Dto/MappingProfile.cs b/EnvelopeGenerator.Application/Dto/MappingProfile.cs
index e8dddc1b..ce1ce0b0 100644
--- a/EnvelopeGenerator.Application/Dto/MappingProfile.cs
+++ b/EnvelopeGenerator.Application/Dto/MappingProfile.cs
@@ -34,7 +34,7 @@ public class MappingProfile : Profile
CreateMap();
CreateMap();
CreateMap();
- CreateMap();
+ CreateMap();
CreateMap();
// DTO to Entity mappings
@@ -48,7 +48,7 @@ public class MappingProfile : Profile
CreateMap();
CreateMap();
CreateMap();
- CreateMap().ForMember(rcv => rcv.EnvelopeReceivers, rcvReadDto => rcvReadDto.Ignore());
+ CreateMap().ForMember(rcv => rcv.EnvelopeReceivers, rcvReadDto => rcvReadDto.Ignore());
CreateMap();
CreateMap();
CreateMap();
diff --git a/EnvelopeGenerator.Application/Dto/Receiver/ReceiverReadDto.cs b/EnvelopeGenerator.Application/Dto/Receiver/ReceiverDto.cs
similarity index 97%
rename from EnvelopeGenerator.Application/Dto/Receiver/ReceiverReadDto.cs
rename to EnvelopeGenerator.Application/Dto/Receiver/ReceiverDto.cs
index 9b5912d3..84e3f5bf 100644
--- a/EnvelopeGenerator.Application/Dto/Receiver/ReceiverReadDto.cs
+++ b/EnvelopeGenerator.Application/Dto/Receiver/ReceiverDto.cs
@@ -8,7 +8,7 @@ namespace EnvelopeGenerator.Application.Dto.Receiver;
///
///
[ApiExplorerSettings(IgnoreApi = true)]
-public class ReceiverReadDto
+public class ReceiverDto
{
///
///
diff --git a/EnvelopeGenerator.Application/EnvelopeReceivers/Commands/CreateEnvelopeReceiverCommandHandler.cs b/EnvelopeGenerator.Application/EnvelopeReceivers/Commands/CreateEnvelopeReceiverCommandHandler.cs
index 3138d7d9..a3a5e20e 100644
--- a/EnvelopeGenerator.Application/EnvelopeReceivers/Commands/CreateEnvelopeReceiverCommandHandler.cs
+++ b/EnvelopeGenerator.Application/EnvelopeReceivers/Commands/CreateEnvelopeReceiverCommandHandler.cs
@@ -59,7 +59,7 @@ public class CreateEnvelopeReceiverCommandHandler : IRequestHandler(envelope);
res.UnsentReceivers = unsentRecipients;
- res.SentReceiver = _mapper.Map>(sentRecipients);
+ res.SentReceiver = _mapper.Map>(sentRecipients);
return res;
}
}
\ No newline at end of file
diff --git a/EnvelopeGenerator.Application/EnvelopeReceivers/Commands/CreateEnvelopeReceiverResponse.cs b/EnvelopeGenerator.Application/EnvelopeReceivers/Commands/CreateEnvelopeReceiverResponse.cs
index f223fc66..b48a919b 100644
--- a/EnvelopeGenerator.Application/EnvelopeReceivers/Commands/CreateEnvelopeReceiverResponse.cs
+++ b/EnvelopeGenerator.Application/EnvelopeReceivers/Commands/CreateEnvelopeReceiverResponse.cs
@@ -11,7 +11,7 @@ public record CreateEnvelopeReceiverResponse : EnvelopeDto
///
///
///
- public IEnumerable SentReceiver { get; set; } = new List();
+ public IEnumerable SentReceiver { get; set; } = new List();
///
///
diff --git a/EnvelopeGenerator.Application/EnvelopeReceivers/MappingProfile.cs b/EnvelopeGenerator.Application/EnvelopeReceivers/MappingProfile.cs
index 42c5ec51..0a80052d 100644
--- a/EnvelopeGenerator.Application/EnvelopeReceivers/MappingProfile.cs
+++ b/EnvelopeGenerator.Application/EnvelopeReceivers/MappingProfile.cs
@@ -15,6 +15,6 @@ public class MappingProfile : Profile
///
public MappingProfile()
{
- CreateMap();
+ CreateMap();
}
}
diff --git a/EnvelopeGenerator.Application/Interfaces/Services/IEnvelopeHistoryService.cs b/EnvelopeGenerator.Application/Interfaces/Services/IEnvelopeHistoryService.cs
index 80dc1fc2..e3d6a547 100644
--- a/EnvelopeGenerator.Application/Interfaces/Services/IEnvelopeHistoryService.cs
+++ b/EnvelopeGenerator.Application/Interfaces/Services/IEnvelopeHistoryService.cs
@@ -71,7 +71,7 @@ public interface IEnvelopeHistoryService : ICRUDService
///
///
- Task> ReadRejectingReceivers(int envelopeId);
+ Task> ReadRejectingReceivers(int envelopeId);
///
///
diff --git a/EnvelopeGenerator.Application/Interfaces/Services/IReceiverService.cs b/EnvelopeGenerator.Application/Interfaces/Services/IReceiverService.cs
index c3d97fea..aa2c130a 100644
--- a/EnvelopeGenerator.Application/Interfaces/Services/IReceiverService.cs
+++ b/EnvelopeGenerator.Application/Interfaces/Services/IReceiverService.cs
@@ -10,7 +10,7 @@ namespace EnvelopeGenerator.Application.Interfaces.Services;
///
///
[Obsolete("Use MediatR")]
-public interface IReceiverService : ICRUDService
+public interface IReceiverService : ICRUDService
{
///
///
@@ -18,7 +18,7 @@ public interface IReceiverService : ICRUDService
///
///
- Task> ReadByAsync(string? emailAddress = null, string? signature = null);
+ Task> ReadByAsync(string? emailAddress = null, string? signature = null);
///
///
diff --git a/EnvelopeGenerator.Application/Receivers/Commands/CreateReceiverCommand.cs b/EnvelopeGenerator.Application/Receivers/Commands/CreateReceiverCommand.cs
index 075ec581..b8142501 100644
--- a/EnvelopeGenerator.Application/Receivers/Commands/CreateReceiverCommand.cs
+++ b/EnvelopeGenerator.Application/Receivers/Commands/CreateReceiverCommand.cs
@@ -15,7 +15,7 @@ namespace EnvelopeGenerator.Application.Receivers.Commands;
///
///
[ApiExplorerSettings(IgnoreApi = true)]
-public record CreateReceiverCommand : IRequest<(ReceiverReadDto Receiver, bool AlreadyExists)>
+public record CreateReceiverCommand : IRequest<(ReceiverDto Receiver, bool AlreadyExists)>
{
///
///
@@ -54,7 +54,7 @@ public record CreateReceiverCommand : IRequest<(ReceiverReadDto Receiver, bool A
///
///
///
-public class CreateReceiverCommandHandler : IRequestHandler
+public class CreateReceiverCommandHandler : IRequestHandler
{
///
///
@@ -79,7 +79,7 @@ public class CreateReceiverCommandHandler : IRequestHandler
///
///
- public async Task<(ReceiverReadDto Receiver, bool AlreadyExists)> Handle(CreateReceiverCommand request, CancellationToken cancel)
+ public async Task<(ReceiverDto Receiver, bool AlreadyExists)> Handle(CreateReceiverCommand request, CancellationToken cancel)
{
var receiver = await _repo.ReadOnly()
.Where(r => r.EmailAddress == request.EmailAddress)
@@ -90,7 +90,7 @@ public class CreateReceiverCommandHandler : IRequestHandler(receiver);
+ var receiverDto = _mapper.Map(receiver);
return (receiverDto, alreadyExists);
}
}
\ No newline at end of file
diff --git a/EnvelopeGenerator.Application/Services/EnvelopeHistoryService.cs b/EnvelopeGenerator.Application/Services/EnvelopeHistoryService.cs
index 801a292a..e2e424d8 100644
--- a/EnvelopeGenerator.Application/Services/EnvelopeHistoryService.cs
+++ b/EnvelopeGenerator.Application/Services/EnvelopeHistoryService.cs
@@ -121,11 +121,11 @@ public class EnvelopeHistoryService : CRUDService
///
///
- public async Task> ReadRejectingReceivers(int envelopeId)
+ public async Task> ReadRejectingReceivers(int envelopeId)
{
var envelopes = await ReadRejectedAsync(envelopeId);
return envelopes is null
- ? Enumerable.Empty()
+ ? Enumerable.Empty()
: envelopes
.Where(eh => eh?.Receiver != null)
.Select(eh => eh.Receiver!);
diff --git a/EnvelopeGenerator.Application/Services/ReceiverService.cs b/EnvelopeGenerator.Application/Services/ReceiverService.cs
index bcea084e..4d1d3f29 100644
--- a/EnvelopeGenerator.Application/Services/ReceiverService.cs
+++ b/EnvelopeGenerator.Application/Services/ReceiverService.cs
@@ -13,7 +13,7 @@ namespace EnvelopeGenerator.Application.Services;
///
///
[Obsolete("Use MediatR")]
-public class ReceiverService : CRUDService, IReceiverService
+public class ReceiverService : CRUDService, IReceiverService
{
///
///
@@ -31,14 +31,14 @@ public class ReceiverService : CRUDService
///
///
- public async Task> ReadByAsync(string? emailAddress = null, string? signature = null)
+ public async Task> ReadByAsync(string? emailAddress = null, string? signature = null)
{
var rcv = await _repository.ReadByAsync(emailAddress: emailAddress, signature: signature);
if (rcv is null)
- return Result.Fail();
+ return Result.Fail();
- return Result.Success(_mapper.Map(rcv));
+ return Result.Success(_mapper.Map(rcv));
}
///
diff --git a/EnvelopeGenerator.GeneratorAPI/Controllers/EnvelopeReceiverController.cs b/EnvelopeGenerator.GeneratorAPI/Controllers/EnvelopeReceiverController.cs
index 16f42f50..944719c7 100644
--- a/EnvelopeGenerator.GeneratorAPI/Controllers/EnvelopeReceiverController.cs
+++ b/EnvelopeGenerator.GeneratorAPI/Controllers/EnvelopeReceiverController.cs
@@ -208,7 +208,7 @@ public class EnvelopeReceiverController : ControllerBase
var res = _mapper.Map(envelope);
res.UnsentReceivers = unsentReceivers;
- res.SentReceiver = _mapper.Map>(sentReceivers.Select(er => er.Receiver));
+ res.SentReceiver = _mapper.Map>(sentReceivers.Select(er => er.Receiver));
#endregion
#region Add document
diff --git a/EnvelopeGenerator.GeneratorAPI/Controllers/ReceiverController.cs b/EnvelopeGenerator.GeneratorAPI/Controllers/ReceiverController.cs
index eecada82..9d4ca1bd 100644
--- a/EnvelopeGenerator.GeneratorAPI/Controllers/ReceiverController.cs
+++ b/EnvelopeGenerator.GeneratorAPI/Controllers/ReceiverController.cs
@@ -21,7 +21,7 @@ namespace EnvelopeGenerator.GeneratorAPI.Controllers;
[ApiController]
[Authorize]
[Obsolete("Use MediatR")]
-public class ReceiverController : CRUDControllerBaseWithErrorHandling
+public class ReceiverController : CRUDControllerBaseWithErrorHandling
{
///
/// Initialisiert eine neue Instanz des -Controllers.
diff --git a/EnvelopeGenerator.Web/Controllers/Test/TestReceiverController.cs b/EnvelopeGenerator.Web/Controllers/Test/TestReceiverController.cs
index d05d053b..6d0fcb8e 100644
--- a/EnvelopeGenerator.Web/Controllers/Test/TestReceiverController.cs
+++ b/EnvelopeGenerator.Web/Controllers/Test/TestReceiverController.cs
@@ -7,7 +7,7 @@ using EnvelopeGenerator.Application.Receivers.Commands;
namespace EnvelopeGenerator.Web.Controllers.Test;
[Obsolete("Use MediatR")]
-public class TestReceiverController : CRUDControllerBase
+public class TestReceiverController : CRUDControllerBase
{
public TestReceiverController(ILogger logger, IReceiverService service) : base(logger, service)
{