AppStd/EnvelopeGenerator
8
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fix service, fix duplicate emails. fix tempalte

Browse Source
This commit is contained in:
Jonathan Jenne 2023-12-06 16:05:05 +01:00
parent 588b532d86
commit 327102d63a
3 changed files with 20 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
EnvelopeGenerator.Common/Entities/EmailTemplate.vb
View File

@ -31,7 +31,7 @@ Public Class EmailTemplate
Private Sub InitBodyTemplates() Private Sub InitBodyTemplates()
_DocumentReceivedBodyTemplate = New List(Of String) From { _DocumentReceivedBodyTemplate = New List(Of String) From {
"Guten Tag, <NAME_RECEIVER>,", "Guten Tag <NAME_RECEIVER>,",
"", "",
"<NAME_SENDER> hat Ihnen ein Dokument zum <SIGNATURE_TYPE> gesendet.", "<NAME_SENDER> hat Ihnen ein Dokument zum <SIGNATURE_TYPE> gesendet.",
"", "",
@ -44,7 +44,7 @@ Public Class EmailTemplate
} }
_DocumentSignedBodyTemplate = New List(Of String) From { _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>.", "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 { _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.", "Der User <NAME_SENDER> hat den Umschlag <DOCUMENT_TITLE> gelöscht.",
"", "",
@ -62,7 +62,7 @@ Public Class EmailTemplate
} }
_DocumentCompletedBodyTemplate = New List(Of String) From { _DocumentCompletedBodyTemplate = New List(Of String) From {
"Guten Tag, <NAME_RECEIVER>", "Guten Tag <NAME_RECEIVER>",
"", "",
"Der Signaturvorgang <DOCUMENT_TITLE> wurde erfolgreich abgeschlossen.", "Der Signaturvorgang <DOCUMENT_TITLE> wurde erfolgreich abgeschlossen.",
"Sie erhalten das Dokument mit einem detaillierten Ergebnisbericht als Anhang zu dieser Email.", "Sie erhalten das Dokument mit einem detaillierten Ergebnisbericht als Anhang zu dieser Email.",

4
EnvelopeGenerator.Common/Services/ActionService.vb
View File

@ -47,10 +47,6 @@ Public Class ActionService
Return False Return False
End If End If
For Each oReceiver As EnvelopeReceiver In pEnvelope.Receivers
EmailService.SendEnvelopeDeletedEmail(pEnvelope, oReceiver)
Next
Return True Return True
End Function End Function

15
EnvelopeGenerator.Web/Services/EnvelopeService.cs
View File

@ -23,6 +23,7 @@ namespace EnvelopeGenerator.Web.Services
receiverModel = database.Models.receiverModel; receiverModel = database.Models.receiverModel;
envelopeModel = database.Models.envelopeModel; envelopeModel = database.Models.envelopeModel;
documentStatusModel = database.Models.documentStatusModel;
} }
public void EnsureValidEnvelopeKey(string envelopeKey) public void EnsureValidEnvelopeKey(string envelopeKey)
@ -45,6 +46,8 @@ namespace EnvelopeGenerator.Web.Services
public EnvelopeResponse LoadEnvelope(string pEnvelopeKey) public EnvelopeResponse LoadEnvelope(string pEnvelopeKey)
{ {
logger.Debug("Loading Envelope by Key [{0}]", pEnvelopeKey);
Tuple<string, string> result = Helpers.DecodeEnvelopeReceiverId(pEnvelopeKey); Tuple<string, string> result = Helpers.DecodeEnvelopeReceiverId(pEnvelopeKey);
var envelopeUuid = result.Item1; var envelopeUuid = result.Item1;
var receiverSignature = result.Item2; var receiverSignature = result.Item2;
@ -54,21 +57,30 @@ namespace EnvelopeGenerator.Web.Services
if (envelope == null) if (envelope == null)
{ {
logger.Warn("Envelope not found");
throw new NullReferenceException("Envelope not found"); throw new NullReferenceException("Envelope not found");
} }
logger.Debug("Envelope loaded");
if (envelope.Receivers == null) if (envelope.Receivers == null)
{ {
logger.Warn("Receivers for envelope not loaded");
throw new NullReferenceException("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(); EnvelopeReceiver? receiver = envelope.Receivers.Where(r => r.Id == receiverId).SingleOrDefault();
if (receiver == null) if (receiver == null)
{ {
logger.Warn("Receiver not found");
throw new NullReferenceException("Receiver not found"); throw new NullReferenceException("Receiver not found");
} }
logger.Debug("Loading documents for receiver [{0}]", receiver.Email);
envelope.Documents = FilterElementsByReceiver(envelope, receiverId); envelope.Documents = FilterElementsByReceiver(envelope, receiverId);
return new() return new()
@ -105,6 +117,8 @@ namespace EnvelopeGenerator.Web.Services
await request.BodyReader.CopyToAsync(ms); await request.BodyReader.CopyToAsync(ms);
var bytes = ms.ToArray(); var bytes = ms.ToArray();
logger.Debug("Annotation data parsed, size: [{0}]", bytes.Length);
return Encoding.UTF8.GetString(bytes); return Encoding.UTF8.GetString(bytes);
} }
catch (Exception e) catch (Exception e)
@ -158,6 +172,7 @@ namespace EnvelopeGenerator.Web.Services
public bool InsertDocumentStatus(Common.DocumentStatus documentStatus) public bool InsertDocumentStatus(Common.DocumentStatus documentStatus)
{ {
logger.Debug("Saving annotation data..");
return documentStatusModel.InsertOrUpdate(documentStatus); return documentStatusModel.InsertOrUpdate(documentStatus);
} }