From 327102d63a294a5db6829e9759f6d8c89672d449 Mon Sep 17 00:00:00 2001
From: Jonathan Jenne <j.jenne@digitaldata.works>
Date: Wed, 6 Dec 2023 16:05:05 +0100
Subject: [PATCH] fix service, fix duplicate emails. fix tempalte

---
 .../Entities/EmailTemplate.vb                   |  8 ++++----
 .../Services/ActionService.vb                   |  4 ----
 .../Services/EnvelopeService.cs                 | 17 ++++++++++++++++-
 3 files changed, 20 insertions(+), 9 deletions(-)

diff --git a/EnvelopeGenerator.Common/Entities/EmailTemplate.vb b/EnvelopeGenerator.Common/Entities/EmailTemplate.vb
index c472dc02..e7a14aa8 100644
--- a/EnvelopeGenerator.Common/Entities/EmailTemplate.vb
+++ b/EnvelopeGenerator.Common/Entities/EmailTemplate.vb
@@ -31,7 +31,7 @@ Public Class EmailTemplate
 
     Private Sub InitBodyTemplates()
         _DocumentReceivedBodyTemplate = New List(Of String) From {
-            "Guten Tag, <NAME_RECEIVER>,",
+            "Guten Tag <NAME_RECEIVER>,",
             "",
             "<NAME_SENDER> hat Ihnen ein Dokument zum <SIGNATURE_TYPE> gesendet.",
             "",
@@ -44,7 +44,7 @@ Public Class EmailTemplate
         }
 
         _DocumentSignedBodyTemplate = New List(Of String) From {
-            "Guten Tag, <NAME_RECEIVER>",
+            "Guten Tag <NAME_RECEIVER>",
             "",
             "hiermit bestätigen wir Ihnen die erfolgreiche Signatur für den Vorgang <DOCUMENT_TITLE>.",
             "",
@@ -53,7 +53,7 @@ Public Class EmailTemplate
         }
 
         _DocumentDeletedBodyTemplate = New List(Of String) From {
-            "Guten Tag, <NAME_RECEIVER>",
+            "Guten Tag <NAME_RECEIVER>",
             "",
             "Der User <NAME_SENDER> hat den Umschlag <DOCUMENT_TITLE> gelöscht.",
             "",
@@ -62,7 +62,7 @@ Public Class EmailTemplate
         }
 
         _DocumentCompletedBodyTemplate = New List(Of String) From {
-            "Guten Tag, <NAME_RECEIVER>",
+            "Guten Tag <NAME_RECEIVER>",
             "",
             "Der Signaturvorgang <DOCUMENT_TITLE> wurde erfolgreich abgeschlossen.",
             "Sie erhalten das Dokument mit einem detaillierten Ergebnisbericht als Anhang zu dieser Email.",
diff --git a/EnvelopeGenerator.Common/Services/ActionService.vb b/EnvelopeGenerator.Common/Services/ActionService.vb
index 6dbd8b22..bbc90626 100644
--- a/EnvelopeGenerator.Common/Services/ActionService.vb
+++ b/EnvelopeGenerator.Common/Services/ActionService.vb
@@ -47,10 +47,6 @@ Public Class ActionService
             Return False
         End If
 
-        For Each oReceiver As EnvelopeReceiver In pEnvelope.Receivers
-            EmailService.SendEnvelopeDeletedEmail(pEnvelope, oReceiver)
-        Next
-
         Return True
     End Function
 
diff --git a/EnvelopeGenerator.Web/Services/EnvelopeService.cs b/EnvelopeGenerator.Web/Services/EnvelopeService.cs
index 03637e36..675602a7 100644
--- a/EnvelopeGenerator.Web/Services/EnvelopeService.cs
+++ b/EnvelopeGenerator.Web/Services/EnvelopeService.cs
@@ -23,6 +23,7 @@ namespace EnvelopeGenerator.Web.Services
 
             receiverModel = database.Models.receiverModel;
             envelopeModel = database.Models.envelopeModel;
+            documentStatusModel = database.Models.documentStatusModel;
         }
 
         public void EnsureValidEnvelopeKey(string envelopeKey)
@@ -45,30 +46,41 @@ namespace EnvelopeGenerator.Web.Services
 
         public EnvelopeResponse LoadEnvelope(string pEnvelopeKey)
         {
+            logger.Debug("Loading Envelope by Key [{0}]", pEnvelopeKey);
+
             Tuple<string, string> result = Helpers.DecodeEnvelopeReceiverId(pEnvelopeKey);
             var envelopeUuid = result.Item1;
             var receiverSignature = result.Item2;
             var receiverId = receiverModel.GetReceiverIdBySignature(receiverSignature);
 
-            Envelope? envelope = envelopeModel.GetByUuid(envelopeUuid);
+            Envelope? envelope = envelopeModel.GetByUuid(envelopeUuid);            
 
             if (envelope == null)
             {
+                logger.Warn("Envelope not found");
                 throw new NullReferenceException("Envelope not found");
             }
 
+            logger.Debug("Envelope loaded");
+
             if (envelope.Receivers == null)
             {
+                logger.Warn("Receivers for envelope not loaded");
                 throw new NullReferenceException("Receivers for envelope not loaded");
             }
 
+            logger.Debug("Envelope receivers found: [{0}]", envelope.Receivers.Count);
+
             EnvelopeReceiver? receiver = envelope.Receivers.Where(r => r.Id == receiverId).SingleOrDefault();
 
             if (receiver == null)
             {
+                logger.Warn("Receiver not found");
                 throw new NullReferenceException("Receiver not found");
             }
 
+            logger.Debug("Loading documents for receiver [{0}]", receiver.Email);
+
             envelope.Documents = FilterElementsByReceiver(envelope, receiverId);
 
             return new()
@@ -105,6 +117,8 @@ namespace EnvelopeGenerator.Web.Services
                 await request.BodyReader.CopyToAsync(ms);
                 var bytes = ms.ToArray();
 
+                logger.Debug("Annotation data parsed, size: [{0}]", bytes.Length);
+
                 return Encoding.UTF8.GetString(bytes);
             }
             catch (Exception e)
@@ -158,6 +172,7 @@ namespace EnvelopeGenerator.Web.Services
 
         public bool InsertDocumentStatus(Common.DocumentStatus documentStatus)
         {
+            logger.Debug("Saving annotation data..");
             return documentStatusModel.InsertOrUpdate(documentStatus);
         }