From 4401a702179b06a7f4230056e66d1d5cdf63802f Mon Sep 17 00:00:00 2001 From: Developer 02 Date: Mon, 12 May 2025 09:19:12 +0200 Subject: [PATCH] Refactor EnvelopeDto and improve response handling Updated the `EnvelopeDto` class by removing several properties to simplify the data structure and added `AddedWhen`, `ChangedWhen`, and a nullable `EnvelopeType`. Modified the return statement in `EnvelopeController.cs` to return `NotFound()` when no envelopes are present, enhancing the accuracy of HTTP responses. --- .../DTOs/EnvelopeDto.cs | 24 +++---------------- .../Controllers/EnvelopeController.cs | 2 +- 2 files changed, 4 insertions(+), 22 deletions(-) diff --git a/EnvelopeGenerator.Application/DTOs/EnvelopeDto.cs b/EnvelopeGenerator.Application/DTOs/EnvelopeDto.cs index c748b038..4fa36caf 100644 --- a/EnvelopeGenerator.Application/DTOs/EnvelopeDto.cs +++ b/EnvelopeGenerator.Application/DTOs/EnvelopeDto.cs @@ -21,9 +21,9 @@ namespace EnvelopeGenerator.Application.DTOs [TemplatePlaceholder("[MESSAGE]")] public string Message { get; set; } - public DateTime? ExpiresWhen { get; set; } - public DateTime? ExpiresWarningWhen { get; set; } + public DateTime AddedWhen { get; set; } + public DateTime? ChangedWhen { get; set; } [TemplatePlaceholder("[DOCUMENT_TITLE]")] @@ -33,40 +33,22 @@ namespace EnvelopeGenerator.Application.DTOs public string Language { get; set; } - public bool? SendReminderEmails { get; set; } - - public int? FirstReminderDays { get; set; } - - public int? ReminderIntervalDays { get; set; } - public int? EnvelopeTypeId { get; set; } public int? CertificationType { get; set; } public bool? UseAccessCode { get; set; } - public int? FinalEmailToCreator { get; set; } - - public int? FinalEmailToReceivers { get; set; } - - public int? ExpiresWhenDays { get; set; } - - public int? ExpiresWarningWhenDays { get; set; } - public bool TFAEnabled { get; init; } - public bool DmzMoved { get; set; } public UserReadDto? User { get; set; } + public EnvelopeType? EnvelopeType { get; set; } public string? EnvelopeTypeTitle { get; set; } public bool IsAlreadySent { get; set; } - public string? StatusTranslated { get; set; } - - public string? ContractTypeTranslated { get; set; } - public byte[]? DocResult { get; init; } public IEnumerable? Documents { get; set; } diff --git a/EnvelopeGenerator.GeneratorAPI/Controllers/EnvelopeController.cs b/EnvelopeGenerator.GeneratorAPI/Controllers/EnvelopeController.cs index 9deca564..0e271484 100644 --- a/EnvelopeGenerator.GeneratorAPI/Controllers/EnvelopeController.cs +++ b/EnvelopeGenerator.GeneratorAPI/Controllers/EnvelopeController.cs @@ -74,7 +74,7 @@ public class EnvelopeController : ControllerBase if (envelope.Uuid is string uuid) envelopes = envelopes.Where(e => e.Uuid == uuid); - return Ok(envelopes); + return envelopes.Any() ? Ok(envelopes) : NotFound(); }, Fail: IActionResult (msg, ntc) => {