From 6ccc0d2e0a59a1c59d55f9c8eb69ec6d1c95fb97 Mon Sep 17 00:00:00 2001 From: Developer 02 Date: Fri, 18 Oct 2024 10:34:51 +0200 Subject: [PATCH] =?UTF-8?q?refactor(HomeController):=20Aktualisiert,=20um?= =?UTF-8?q?=20ein=20Dokument=20aus=20der=20Datenbank=20=C3=BCber=20Envelop?= =?UTF-8?q?eDocumentDto=20zu=20lesen,=20anstatt=20das=20Dokument=20aus=20d?= =?UTF-8?q?em=20Dateipfad=20mit=20envelopeOldService=20zu=20lesen?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Controllers/HomeController.cs | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/EnvelopeGenerator.Web/Controllers/HomeController.cs b/EnvelopeGenerator.Web/Controllers/HomeController.cs index ffd3e8f0..6bef98cb 100644 --- a/EnvelopeGenerator.Web/Controllers/HomeController.cs +++ b/EnvelopeGenerator.Web/Controllers/HomeController.cs @@ -17,6 +17,7 @@ using EnvelopeGenerator.Application.DTOs.EnvelopeReceiver; using static EnvelopeGenerator.Common.Constants; using Ganss.Xss; using Newtonsoft.Json; +using EnvelopeGenerator.Application.DTOs; namespace EnvelopeGenerator.Web.Controllers { @@ -188,15 +189,13 @@ namespace EnvelopeGenerator.Web.Controllers if (await _historyService.IsSigned(envelopeId: er.Envelope!.Id, userReference: er.Receiver!.EmailAddress)) return View("EnvelopeSigned"); - if (response.Envelope.Documents.Count > 0) + if (er.Envelope.Documents?.FirstOrDefault() is EnvelopeDocumentDto doc && doc.ByteData is not null) { - var document = await envelopeOldService.GetDocument(response.Envelope.Documents[0].Id, envelopeReceiverId); - byte[] bytes = await envelopeOldService.GetDocumentContents(document); - ViewData["DocumentBytes"] = bytes; + ViewData["DocumentBytes"] = doc.ByteData; } else { - _logger.LogEnvelopeError(envelopeReceiverId: envelopeReceiverId, message: "No document was found."); + _logger.LogEnvelopeError(envelopeReceiverId: envelopeReceiverId, message: "No document byte-data was found in ENVELOPE_DOCUMENT table."); return this.ViewDocumentNotFound(); } @@ -351,12 +350,10 @@ namespace EnvelopeGenerator.Web.Controllers _logger.LogNotice(hist_res.Notices); } - if (response.Envelope.Documents.Count > 0) + if (er.Envelope.Documents?.FirstOrDefault() is EnvelopeDocumentDto doc && doc.ByteData is not null) { - var document = await envelopeOldService.GetDocument(response.Envelope.Documents[0].Id, envelopeKey); - byte[] bytes = await envelopeOldService.GetDocumentContents(document); + ViewData["DocumentBytes"] = doc.ByteData; ViewData["EnvelopeKey"] = envelopeKey; - ViewData["DocumentBytes"] = bytes; ViewData["IsReadOnly"] = true; ViewData["ReadOnly"] = erro; ViewData["PSPDFKitLicenseKey"] = _configuration["PSPDFKitLicenseKey"]; @@ -364,7 +361,7 @@ namespace EnvelopeGenerator.Web.Controllers } else { - _logger.LogEnvelopeError(envelopeReceiverId: envelopeKey, message: "No document was found."); + _logger.LogEnvelopeError(envelopeReceiverId: envelopeKey, message: "No document byte-data was found in ENVELOPE_DOCUMENT table."); return this.ViewDocumentNotFound(); } },