From 9a4931781afc85d769fa86799a2cbf66b86f7dc0 Mon Sep 17 00:00:00 2001 From: Developer 02 Date: Mon, 7 Apr 2025 14:53:31 +0200 Subject: [PATCH] Refactor envelope and receiver response models - Updated `ReadEnvelopeReceiverResponse` to use `ReadEnvelopeResponse` instead of `ReadReceiverResponse`. - Modified `ReadReceiverResponse` to include additional parameters in its constructor for better detail. - Introduced a new `ReadEnvelopeResponse` record with comprehensive properties and a computed `StatusName`. --- .../Queries/Read/ReadEnvelopeReceiverResponse.cs | 3 ++- .../Envelopes/Queries/Read/ReadEnvelopeResponse.cs | 8 ++++++++ .../Receivers/Queries/Read/ReadReceiverResponse.cs | 2 +- 3 files changed, 11 insertions(+), 2 deletions(-) create mode 100644 EnvelopeGenerator.Application/Envelopes/Queries/Read/ReadEnvelopeResponse.cs diff --git a/EnvelopeGenerator.Application/EnvelopeReceivers/Queries/Read/ReadEnvelopeReceiverResponse.cs b/EnvelopeGenerator.Application/EnvelopeReceivers/Queries/Read/ReadEnvelopeReceiverResponse.cs index 69559533..4ca56486 100644 --- a/EnvelopeGenerator.Application/EnvelopeReceivers/Queries/Read/ReadEnvelopeReceiverResponse.cs +++ b/EnvelopeGenerator.Application/EnvelopeReceivers/Queries/Read/ReadEnvelopeReceiverResponse.cs @@ -1,4 +1,5 @@ using DigitalData.EmailProfilerDispatcher.Abstraction.Attributes; +using EnvelopeGenerator.Application.Envelopes.Queries.Read; using EnvelopeGenerator.Application.Receivers.Queries.Read; using System.ComponentModel.DataAnnotations; using System.ComponentModel.DataAnnotations.Schema; @@ -38,7 +39,7 @@ public record ReadEnvelopeReceiverResponse(int UserId, int Status) public bool HasPhoneNumber { get; init; } [Required] - public required ReadReceiverResponse Envelope { get; init; } + public required ReadEnvelopeResponse Envelope { get; init; } [Required] public required ReadReceiverResponse Receiver { get; init; } diff --git a/EnvelopeGenerator.Application/Envelopes/Queries/Read/ReadEnvelopeResponse.cs b/EnvelopeGenerator.Application/Envelopes/Queries/Read/ReadEnvelopeResponse.cs new file mode 100644 index 00000000..04938c55 --- /dev/null +++ b/EnvelopeGenerator.Application/Envelopes/Queries/Read/ReadEnvelopeResponse.cs @@ -0,0 +1,8 @@ +using EnvelopeGenerator.Common; + +namespace EnvelopeGenerator.Application.Envelopes.Queries.Read; + +public record ReadEnvelopeResponse(int Id, int UserId, int Status, string Uuid, string? Message, DateTime AddedWhen, DateTime? ChangedWhen, string? Title, string Language, bool TFAEnabled, DigitalData.UserManager.Domain.Entities.User User) +{ + public string StatusName => ((Constants.EnvelopeStatus)Status).ToString(); +} diff --git a/EnvelopeGenerator.Application/Receivers/Queries/Read/ReadReceiverResponse.cs b/EnvelopeGenerator.Application/Receivers/Queries/Read/ReadReceiverResponse.cs index 11794a88..2517fef3 100644 --- a/EnvelopeGenerator.Application/Receivers/Queries/Read/ReadReceiverResponse.cs +++ b/EnvelopeGenerator.Application/Receivers/Queries/Read/ReadReceiverResponse.cs @@ -1,5 +1,5 @@ namespace EnvelopeGenerator.Application.Receivers.Queries.Read; -public record ReadReceiverResponse +public record ReadReceiverResponse(int Id, string EmailAddress, DateTime AddedWhen, string Signature) { }