refactor(query): restructure ReceiverAlreadySignedQuery for clarity
- Replaced internal string properties with EnvelopeQuery and ReceiverQuery records - Updated Key property to encode/decode using the new structured types - Added overloaded IMediator extension methods IsSignedAsync for better usability - Simplified ReceiverAlreadySignedQueryHandler to work with the new structure
This commit is contained in:
@@ -16,9 +16,9 @@ public record ReceiverAlreadySignedQuery : IRequest<bool>
|
|||||||
/// <summary>
|
/// <summary>
|
||||||
///
|
///
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public required string Key
|
public string Key
|
||||||
{
|
{
|
||||||
get => (EnvelopeUuid, ReceiverSignature).EncodeEnvelopeReceiverId();
|
get => (Envelope.Uuid, Receiver.Signature).EncodeEnvelopeReceiverId();
|
||||||
init
|
init
|
||||||
{
|
{
|
||||||
(string? EnvelopeUuid, string? ReceiverSignature) = value.DecodeEnvelopeReceiverId();
|
(string? EnvelopeUuid, string? ReceiverSignature) = value.DecodeEnvelopeReceiverId();
|
||||||
@@ -29,11 +29,41 @@ public record ReceiverAlreadySignedQuery : IRequest<bool>
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
internal string EnvelopeUuid { get; set; } = null!;
|
/// <summary>
|
||||||
|
///
|
||||||
|
/// </summary>
|
||||||
|
public EnvelopeQuery Envelope { get; set; } = new EnvelopeQuery();
|
||||||
|
|
||||||
internal string ReceiverSignature { get; set; } = null!;
|
/// <summary>
|
||||||
|
///
|
||||||
|
/// </summary>
|
||||||
|
public ReceiverQuery Receiver { get; set; } = new ReceiverQuery();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#region Queries
|
||||||
|
/// <summary>
|
||||||
|
///
|
||||||
|
/// </summary>
|
||||||
|
public record EnvelopeQuery()
|
||||||
|
{
|
||||||
|
/// <summary>
|
||||||
|
///
|
||||||
|
/// </summary>
|
||||||
|
public string Uuid { get; set; } = null!;
|
||||||
|
};
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
///
|
||||||
|
/// </summary>
|
||||||
|
public record ReceiverQuery()
|
||||||
|
{
|
||||||
|
/// <summary>
|
||||||
|
///
|
||||||
|
/// </summary>
|
||||||
|
public string Signature { get; set; } = null!;
|
||||||
|
};
|
||||||
|
#endregion
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
///
|
///
|
||||||
/// </summary>
|
/// </summary>
|
||||||
@@ -46,8 +76,23 @@ public static class ReceiverAlreadySignedQueryExtensions
|
|||||||
/// <param name="key"></param>
|
/// <param name="key"></param>
|
||||||
/// <param name="cancel"></param>
|
/// <param name="cancel"></param>
|
||||||
/// <returns></returns>
|
/// <returns></returns>
|
||||||
public static Task<bool> ReceiverAlreadySigned(this IMediator mediator, string key, CancellationToken cancel = default)
|
public static Task<bool> IsSignedAsync(this IMediator mediator, string key, CancellationToken cancel = default)
|
||||||
=> mediator.Send(new ReceiverAlreadySignedQuery { Key = key }, cancel);
|
=> mediator.Send(new ReceiverAlreadySignedQuery { Key = key }, cancel);
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
///
|
||||||
|
/// </summary>
|
||||||
|
/// <param name="mediator"></param>
|
||||||
|
/// <param name="uuid"></param>
|
||||||
|
/// <param name="signature"></param>
|
||||||
|
/// <param name="cancel"></param>
|
||||||
|
/// <returns></returns>
|
||||||
|
public static Task<bool> IsSignedAsync(this IMediator mediator, string uuid, string signature, CancellationToken cancel = default)
|
||||||
|
=> mediator.Send(new ReceiverAlreadySignedQuery
|
||||||
|
{
|
||||||
|
Envelope = new() { Uuid = uuid },
|
||||||
|
Receiver = new() { Signature = signature }
|
||||||
|
}, cancel);
|
||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
@@ -75,8 +120,8 @@ public class ReceiverAlreadySignedQueryHandler : IRequestHandler<ReceiverAlready
|
|||||||
public async Task<bool> Handle(ReceiverAlreadySignedQuery request, CancellationToken cancel = default)
|
public async Task<bool> Handle(ReceiverAlreadySignedQuery request, CancellationToken cancel = default)
|
||||||
{
|
{
|
||||||
return await _repo.Read()
|
return await _repo.Read()
|
||||||
.Where(er => er.Envelope.Uuid == request.EnvelopeUuid)
|
.Where(er => er.Envelope.Uuid == request.Envelope.Uuid)
|
||||||
.Where(er => er.Receiver.Signature == request.ReceiverSignature)
|
.Where(er => er.Receiver.Signature == request.Receiver.Signature)
|
||||||
.Where(er => er.Envelope.History.Any(hist => hist.Status == Constants.EnvelopeStatus.DocumentSigned))
|
.Where(er => er.Envelope.History.Any(hist => hist.Status == Constants.EnvelopeStatus.DocumentSigned))
|
||||||
.AnyAsync(cancel);
|
.AnyAsync(cancel);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -381,7 +381,7 @@ public class HomeController : ViewControllerBase
|
|||||||
if(!isExisting)
|
if(!isExisting)
|
||||||
return this.ViewEnvelopeNotFound();
|
return this.ViewEnvelopeNotFound();
|
||||||
|
|
||||||
var signed = await _mediator.ReceiverAlreadySigned(envelopeReceiverId, cancel);
|
var signed = await _mediator.IsSignedAsync(envelopeReceiverId, cancel);
|
||||||
if (signed)
|
if (signed)
|
||||||
return base.Redirect($"/EnvelopeKey/{envelopeReceiverId}/Locked");
|
return base.Redirect($"/EnvelopeKey/{envelopeReceiverId}/Locked");
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user