From 79204d4f6d40833d70292107efa6b64cf2b284b7 Mon Sep 17 00:00:00 2001 From: Developer 02 Date: Wed, 21 May 2025 18:43:48 +0200 Subject: [PATCH] refactor(EnvelopeStatus): umbenennen in EnvelopeReceiver --- ...nvelopeResponse.vb => EnvelopeReceiver.vb} | 2 +- .../EnvelopeGenerator.Common.vbproj | 2 +- .../Controllers/DocumentController.cs | 4 ++-- .../Controllers/EnvelopeController.cs | 4 ++-- .../Controllers/HomeController.cs | 20 +++++++++---------- .../Services/EnvelopeOldService.cs | 4 ++-- 6 files changed, 18 insertions(+), 18 deletions(-) rename EnvelopeGenerator.Common/Entities/{EnvelopeResponse.vb => EnvelopeReceiver.vb} (73%) diff --git a/EnvelopeGenerator.Common/Entities/EnvelopeResponse.vb b/EnvelopeGenerator.Common/Entities/EnvelopeReceiver.vb similarity index 73% rename from EnvelopeGenerator.Common/Entities/EnvelopeResponse.vb rename to EnvelopeGenerator.Common/Entities/EnvelopeReceiver.vb index 2a2a74be..0e5380e1 100644 --- a/EnvelopeGenerator.Common/Entities/EnvelopeResponse.vb +++ b/EnvelopeGenerator.Common/Entities/EnvelopeReceiver.vb @@ -1,4 +1,4 @@ -Public Class EnvelopeResponse +Public Class EnvelopeReceiver Public Property Envelope As Envelope Public Property Receiver As Receiver End Class diff --git a/EnvelopeGenerator.Common/EnvelopeGenerator.Common.vbproj b/EnvelopeGenerator.Common/EnvelopeGenerator.Common.vbproj index 39a59c19..cf6e1234 100644 --- a/EnvelopeGenerator.Common/EnvelopeGenerator.Common.vbproj +++ b/EnvelopeGenerator.Common/EnvelopeGenerator.Common.vbproj @@ -285,7 +285,7 @@ - + diff --git a/EnvelopeGenerator.Web/Controllers/DocumentController.cs b/EnvelopeGenerator.Web/Controllers/DocumentController.cs index 67f722a4..c343ddc9 100644 --- a/EnvelopeGenerator.Web/Controllers/DocumentController.cs +++ b/EnvelopeGenerator.Web/Controllers/DocumentController.cs @@ -30,7 +30,7 @@ namespace EnvelopeGenerator.Web.Controllers { // Validate Envelope Key and load envelope envelopeService.EnsureValidEnvelopeKey(envelopeKey); - EnvelopeResponse response = await envelopeService.LoadEnvelope(envelopeKey); + EnvelopeReceiver response = await envelopeService.LoadEnvelope(envelopeKey); // Load document info var document = await envelopeService.GetDocument(index, envelopeKey); @@ -61,7 +61,7 @@ namespace EnvelopeGenerator.Web.Controllers // Validate Envelope Key and load envelope envelopeService.EnsureValidEnvelopeKey(envelopeKey); - EnvelopeResponse response = await envelopeService.LoadEnvelope(envelopeKey); + EnvelopeReceiver response = await envelopeService.LoadEnvelope(envelopeKey); actionService?.OpenEnvelope(response.Envelope, response.Receiver); diff --git a/EnvelopeGenerator.Web/Controllers/EnvelopeController.cs b/EnvelopeGenerator.Web/Controllers/EnvelopeController.cs index 376e1a2d..ce2da2bc 100644 --- a/EnvelopeGenerator.Web/Controllers/EnvelopeController.cs +++ b/EnvelopeGenerator.Web/Controllers/EnvelopeController.cs @@ -47,7 +47,7 @@ namespace EnvelopeGenerator.Web.Controllers // Validate Envelope Key and load envelope envelopeService.EnsureValidEnvelopeKey(envelopeKey); - EnvelopeResponse response = await envelopeService.LoadEnvelope(envelopeKey); + EnvelopeReceiver response = await envelopeService.LoadEnvelope(envelopeKey); if (envelopeService.ReceiverAlreadySigned(response.Envelope, response.Receiver.Id) == true) { @@ -79,7 +79,7 @@ namespace EnvelopeGenerator.Web.Controllers // Validate Envelope Key and load envelope envelopeService.EnsureValidEnvelopeKey(envelopeKey); - EnvelopeResponse response = await envelopeService.LoadEnvelope(envelopeKey); + EnvelopeReceiver response = await envelopeService.LoadEnvelope(envelopeKey); // Again check if receiver has already signed if (envelopeService.ReceiverAlreadySigned(response.Envelope, response.Receiver.Id) == true) diff --git a/EnvelopeGenerator.Web/Controllers/HomeController.cs b/EnvelopeGenerator.Web/Controllers/HomeController.cs index fcd914bf..f9e1843e 100644 --- a/EnvelopeGenerator.Web/Controllers/HomeController.cs +++ b/EnvelopeGenerator.Web/Controllers/HomeController.cs @@ -106,7 +106,7 @@ public class HomeController : ViewControllerBase var er = er_res.Data; - EnvelopeResponse response = await envelopeOldService.LoadEnvelope(envelopeReceiverId); + EnvelopeReceiver response = await envelopeOldService.LoadEnvelope(envelopeReceiverId); bool accessCodeAlreadyRequested = await _historyService.AccessCodeAlreadyRequested(envelopeId: er.Envelope!.Id, userReference: er.Receiver!.EmailAddress); if (!accessCodeAlreadyRequested) @@ -182,7 +182,7 @@ public class HomeController : ViewControllerBase _logger.LogInformation("Envelope UUID: [{uuid}]\nReceiver Signature: [{signature}]", uuid, signature); //check access code - EnvelopeResponse response = await envelopeOldService.LoadEnvelope(envelopeReceiverId); + EnvelopeReceiver response = await envelopeOldService.LoadEnvelope(envelopeReceiverId); //check rejection var rejRcvrs = await _historyService.ReadRejectingReceivers(er.Envelope!.Id); @@ -342,7 +342,7 @@ public class HomeController : ViewControllerBase _logger.LogInformation("Envelope UUID: [{uuid}]\nReceiver Signature: [{signature}]", uuid, signature); //check access code - EnvelopeResponse response = await envelopeOldService.LoadEnvelope(envelopeReceiverId); + EnvelopeReceiver response = await envelopeOldService.LoadEnvelope(envelopeReceiverId); var er_secret_res = await _envRcvService.ReadWithSecretByUuidSignatureAsync(uuid: uuid, signature: signature); @@ -407,20 +407,20 @@ public class HomeController : ViewControllerBase { envelopeReceiverId = _sanitizer.Sanitize(envelopeReceiverId); return await _envRcvService.IsExisting(envelopeReceiverId: envelopeReceiverId).ThenAsync( - SuccessAsync: async isExisting => + SuccessAsync: (Func>)(async isExisting => { if(!isExisting) return this.ViewEnvelopeNotFound(); - EnvelopeResponse response = await envelopeOldService.LoadEnvelope(envelopeReceiverId); - if (!envelopeOldService.ReceiverAlreadySigned(response.Envelope, response.Receiver.Id)) - return Redirect($"/EnvelopeKey/{envelopeReceiverId}/Locked"); + Common.EnvelopeReceiver response = await envelopeOldService.LoadEnvelope(envelopeReceiverId); + if (!envelopeOldService.ReceiverAlreadySigned((Envelope)response.Envelope, (int)response.Receiver.Id)) + return base.Redirect($"/EnvelopeKey/{envelopeReceiverId}/Locked"); await HttpContext.SignOutAsync(CookieAuthenticationDefaults.AuthenticationScheme); ViewData["UserCulture"] = _cultures[UserLanguage]; ViewData["EnvelopeKey"] = envelopeReceiverId; - return View(); - }, + return base.View(); + }), Fail: IActionResult (messages, notices) => { _logger.LogNotice(notices); @@ -500,7 +500,7 @@ public class HomeController : ViewControllerBase { var envelopeKey = (er.Envelope!.Uuid, er.Receiver!.Signature).EncodeEnvelopeReceiverId(); - EnvelopeResponse response = await envelopeOldService.LoadEnvelope(envelopeKey); + EnvelopeReceiver response = await envelopeOldService.LoadEnvelope(envelopeKey); //TODO: implement multi-threading to history process (Task) var hist_res = await _historyService.RecordAsync((int)erro.EnvelopeId, erro.AddedWho, EnvelopeStatus.EnvelopeViewed); diff --git a/EnvelopeGenerator.Web/Services/EnvelopeOldService.cs b/EnvelopeGenerator.Web/Services/EnvelopeOldService.cs index 411b4ff5..cd862cb7 100644 --- a/EnvelopeGenerator.Web/Services/EnvelopeOldService.cs +++ b/EnvelopeGenerator.Web/Services/EnvelopeOldService.cs @@ -48,7 +48,7 @@ namespace EnvelopeGenerator.Web.Services throw new ArgumentNullException("ReceiverSignature"); } - public async Task LoadEnvelope(string pEnvelopeKey) + public async Task LoadEnvelope(string pEnvelopeKey) { _logger.LogInformation("Loading Envelope by Key [{0}]", pEnvelopeKey); @@ -152,7 +152,7 @@ namespace EnvelopeGenerator.Web.Services public async Task GetDocument(int documentId, string envelopeKey) { - EnvelopeResponse response = await LoadEnvelope(envelopeKey); + EnvelopeReceiver response = await LoadEnvelope(envelopeKey); _logger.LogInformation("Loading document for Id [{0}]", documentId);