Compare commits
16 Commits
91e90b322b
...
595bbf3f25
| Author | SHA1 | Date | |
|---|---|---|---|
| 595bbf3f25 | |||
| ee7d01ed7f | |||
| 85104511fd | |||
| 1b87528cca | |||
| 2913514da8 | |||
| ce7e70162b | |||
| 5e00b6e9ec | |||
| f0b4c8d00c | |||
| abf616c115 | |||
| 42585e1f2c | |||
| ff10fc6b0a | |||
| 7222f7e9a7 | |||
| d913b949e0 | |||
| a35e05d016 | |||
| 8aabc3e233 | |||
| 8b7f99eb76 |
@@ -62,7 +62,7 @@ public record EnvelopeDto : IEnvelope
|
||||
/// <summary>
|
||||
///
|
||||
/// </summary>
|
||||
public int? ContractType { get; set; }
|
||||
public ContractType? ContractType { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// Default value is 'de-DE'
|
||||
|
||||
@@ -80,5 +80,5 @@ public class EnvelopeTypeDto
|
||||
/// <summary>
|
||||
/// Gets or sets the contract type associated with the envelope type.
|
||||
/// </summary>
|
||||
public int? ContractType { get; set; }
|
||||
public ContractType? ContractType { get; set; }
|
||||
}
|
||||
@@ -0,0 +1,12 @@
|
||||
namespace EnvelopeGenerator.Application.Common.Interfaces;
|
||||
|
||||
/// <summary>
|
||||
///
|
||||
/// </summary>
|
||||
public interface IRequestContext
|
||||
{
|
||||
/// <summary>
|
||||
///
|
||||
/// </summary>
|
||||
string? Origin { get; }
|
||||
}
|
||||
@@ -0,0 +1,98 @@
|
||||
using EnvelopeGenerator.Application.Common.Extensions;
|
||||
using EnvelopeGenerator.Domain.Constants;
|
||||
|
||||
namespace EnvelopeGenerator.Application.Common.Interfaces.Services.Notification;
|
||||
|
||||
/// <summary>
|
||||
///
|
||||
/// </summary>
|
||||
public record DocumentReceivedNotification : EnvelopeNotificationBase
|
||||
{
|
||||
/// <summary>
|
||||
///
|
||||
/// </summary>
|
||||
public required string DocumentTitle { get; init; }
|
||||
|
||||
/// <summary>
|
||||
///
|
||||
/// </summary>
|
||||
public required string NameReceiver { get; init; }
|
||||
|
||||
/// <summary>
|
||||
///
|
||||
/// </summary>
|
||||
public required string NameSender { get; init; }
|
||||
|
||||
/// <summary>
|
||||
/// [SIGNATURE_TYPE]
|
||||
/// </summary>
|
||||
public required bool IsReadAndConfirm { private get; init; }
|
||||
|
||||
/// <summary>
|
||||
///
|
||||
/// </summary>
|
||||
public string SignatureType => IsReadAndConfirm ? "Signieren" : "Lesen und bestätigen";
|
||||
|
||||
/// <summary>
|
||||
///
|
||||
/// </summary>
|
||||
public required bool AdvancedSignature { private get; init; }
|
||||
|
||||
/// <summary>
|
||||
///
|
||||
/// </summary>
|
||||
public string DocumentProcess => AdvancedSignature ? " und elektronisch unterschreiben" : string.Empty;
|
||||
|
||||
/// <summary>
|
||||
///
|
||||
/// </summary>
|
||||
public required Uri Origin { private get; init; }
|
||||
|
||||
/// <summary>
|
||||
///
|
||||
/// </summary>
|
||||
public required string EnvelopeUuid { private get; init; }
|
||||
|
||||
/// <summary>
|
||||
///
|
||||
/// </summary>
|
||||
public required string ReceiverSignature { private get; init; }
|
||||
|
||||
private Uri EnvelopeURL => new(Origin, $"Envelope/{(EnvelopeUuid, ReceiverSignature).ToEnvelopeKey()}");
|
||||
|
||||
/// <summary>
|
||||
///
|
||||
/// </summary>
|
||||
public string LinkToDocument => EnvelopeURL.AbsoluteUri;
|
||||
|
||||
/// <summary>
|
||||
///
|
||||
/// </summary>
|
||||
public string LinkToDocumentText
|
||||
{
|
||||
get
|
||||
{
|
||||
var urlText = EnvelopeURL.ToString();
|
||||
return $"{urlText[..Math.Min(urlText.Length, 40)]}..";
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
///
|
||||
/// </summary>
|
||||
public required string Message { get; init; }
|
||||
|
||||
/// <summary>
|
||||
///
|
||||
/// </summary>
|
||||
public string NamePortal { get; set; } = "signFLOW Portal";
|
||||
|
||||
/// <summary>
|
||||
///
|
||||
/// </summary>
|
||||
/// <returns></returns>
|
||||
public override EmailTemplateType GetTemplateType()
|
||||
{
|
||||
return EmailTemplateType.DocumentReceived;
|
||||
}
|
||||
}
|
||||
@@ -1,9 +1,11 @@
|
||||
namespace EnvelopeGenerator.Application.Common.Interfaces.Services.Notification;
|
||||
using EnvelopeGenerator.Domain.Constants;
|
||||
|
||||
namespace EnvelopeGenerator.Application.Common.Interfaces.Services.Notification;
|
||||
|
||||
/// <summary>
|
||||
///
|
||||
/// </summary>
|
||||
public record DocumentSignedNotification
|
||||
public record DocumentSignedNotification : EnvelopeNotificationBase
|
||||
{
|
||||
/// <summary>
|
||||
///
|
||||
@@ -23,7 +25,27 @@ public record DocumentSignedNotification
|
||||
/// <summary>
|
||||
///
|
||||
/// </summary>
|
||||
public required byte[] Attachment { get; init; }
|
||||
public required bool IsReadAndConfirm { private get; init; }
|
||||
|
||||
/// <summary>
|
||||
///
|
||||
/// </summary>
|
||||
public string ReceiverAction => IsReadAndConfirm ? "bestätigt" : "unterschrieben";
|
||||
|
||||
/// <summary>
|
||||
///
|
||||
/// </summary>
|
||||
public string FinalStatus => IsReadAndConfirm ? "Lesebestätigung" : "Signatur";
|
||||
|
||||
/// <summary>
|
||||
///
|
||||
/// </summary>
|
||||
public string FinalAction => IsReadAndConfirm ? "Empfänger bestätigt" : "Vertragspartner unterzeichnet";
|
||||
|
||||
/// <summary>
|
||||
///
|
||||
/// </summary>
|
||||
public override EmailTemplateType GetTemplateType() => EmailTemplateType.DocumentSigned;
|
||||
}
|
||||
|
||||
/*
|
||||
|
||||
@@ -0,0 +1,19 @@
|
||||
using EnvelopeGenerator.Domain.Constants;
|
||||
|
||||
namespace EnvelopeGenerator.Application.Common.Interfaces.Services.Notification;
|
||||
|
||||
/// <summary>
|
||||
///
|
||||
/// </summary>
|
||||
public abstract record EnvelopeNotificationBase
|
||||
{
|
||||
/// <summary>
|
||||
///
|
||||
/// </summary>
|
||||
public abstract EmailTemplateType GetTemplateType();
|
||||
|
||||
/// <summary>
|
||||
///
|
||||
/// </summary>
|
||||
public IReadOnlyList<(string FileName, byte[] Content)>? Attachments { get; init; }
|
||||
}
|
||||
@@ -8,9 +8,11 @@ public interface IEnvelopeNotificationService
|
||||
/// <summary>
|
||||
///
|
||||
/// </summary>
|
||||
/// <param name="email"></param>
|
||||
/// <param name="documentSigned"></param>
|
||||
/// <typeparam name="TEnvelopeNotificationBase"></typeparam>
|
||||
/// <param name="receiverEmail"></param>
|
||||
/// <param name="notification"></param>
|
||||
/// <param name="cancel"></param>
|
||||
/// <returns></returns>
|
||||
public Task Notify(string email, DocumentSignedNotification documentSigned, CancellationToken cancel = default);
|
||||
public Task Notify<TEnvelopeNotificationBase>(string receiverEmail, TEnvelopeNotificationBase notification, CancellationToken cancel = default)
|
||||
where TEnvelopeNotificationBase : EnvelopeNotificationBase;
|
||||
}
|
||||
|
||||
@@ -2,6 +2,7 @@
|
||||
using DigitalData.EmailProfilerDispatcher.Abstraction.Entities;
|
||||
using EnvelopeGenerator.Application.Common.Configurations;
|
||||
using EnvelopeGenerator.Application.Common.Extensions;
|
||||
using EnvelopeGenerator.Application.Common.Notifications.EnvelopeDeleted;
|
||||
using EnvelopeGenerator.Domain.Constants;
|
||||
using EnvelopeGenerator.Domain.Entities;
|
||||
using MediatR;
|
||||
@@ -96,6 +97,10 @@ public abstract class SendMailHandler<TNotification> : INotificationHandler<TNot
|
||||
/// <exception cref="NotImplementedException"></exception>
|
||||
public virtual async Task Handle(TNotification notification, CancellationToken cancel)
|
||||
{
|
||||
// do not send email if the envelope is deleted and the status is less than or equal to EnvelopeSaved
|
||||
if (notification is EnvelopeDeletedNotification delNot && delNot.Envelope.Status <= EnvelopeStatus.EnvelopeSaved)
|
||||
return;
|
||||
|
||||
var placeHolders = CreatePlaceHolders(notification);
|
||||
|
||||
var temp = await TempRepo
|
||||
|
||||
@@ -130,10 +130,27 @@ public record CreateEnvelopeCommand : IRequest<EnvelopeDto?>
|
||||
public bool UseSQLExecutor { get; set; } = true;
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
///
|
||||
/// </summary>
|
||||
/// <param name="DataAsBase64"></param>
|
||||
public record CreateEnvelopeDocumentDto(string DataAsBase64);
|
||||
|
||||
/// <summary>
|
||||
///
|
||||
/// </summary>
|
||||
/// <param name="X"></param>
|
||||
/// <param name="Y"></param>
|
||||
/// <param name="Page"></param>
|
||||
public record CreateEnvelopeFieldDto(double X, double Y, int Page);
|
||||
|
||||
/// <summary>
|
||||
///
|
||||
/// </summary>
|
||||
/// <param name="EmailAddress"></param>
|
||||
/// <param name="Name"></param>
|
||||
/// <param name="PhoneNumber"></param>
|
||||
/// <param name="Fields"></param>
|
||||
public record CreateEnvelopeReceiverDto(
|
||||
string EmailAddress,
|
||||
string? Name,
|
||||
|
||||
@@ -1,70 +1,66 @@
|
||||
using AutoMapper;
|
||||
using MediatR;
|
||||
using Microsoft.Extensions.DependencyInjection;
|
||||
using Microsoft.Extensions.Options;
|
||||
using DigitalData.Core.Abstraction.Application.Repository;
|
||||
using DigitalData.EmailProfilerDispatcher.Abstraction.Entities;
|
||||
using DigitalData.Core.Exceptions;
|
||||
using EnvelopeGenerator.Domain.Entities;
|
||||
using EnvelopeGenerator.Application.Common.Dto;
|
||||
using DigitalData.EmailProfilerDispatcher.Abstraction.Entities;
|
||||
using DigitalData.UserManager.Domain.Entities;
|
||||
using EnvelopeGenerator.Application.Common.Configurations;
|
||||
using EnvelopeGenerator.Application.Common.Dto;
|
||||
using EnvelopeGenerator.Application.Common.Extensions;
|
||||
using EnvelopeGenerator.Application.Common.Interfaces;
|
||||
using EnvelopeGenerator.Application.Common.Interfaces.Services;
|
||||
using EnvelopeGenerator.Application.Common.Interfaces.Services.Notification;
|
||||
using EnvelopeGenerator.Application.Common.Interfaces.SQLExecutor;
|
||||
using EnvelopeGenerator.Application.Histories.Commands;
|
||||
using EnvelopeGenerator.Domain.Constants;
|
||||
using EnvelopeGenerator.Domain;
|
||||
using EnvelopeGenerator.Domain.Constants;
|
||||
using EnvelopeGenerator.Domain.Entities;
|
||||
using EnvelopeGenerator.Domain.Interfaces;
|
||||
using MediatR;
|
||||
using Microsoft.EntityFrameworkCore;
|
||||
using Microsoft.Extensions.DependencyInjection;
|
||||
using Microsoft.Extensions.Logging;
|
||||
using Microsoft.Extensions.Options;
|
||||
|
||||
namespace EnvelopeGenerator.Application.Envelopes.Commands;
|
||||
|
||||
/// <summary>
|
||||
///
|
||||
/// </summary>
|
||||
public class CreateEnvelopeCommandHandler : IRequestHandler<CreateEnvelopeCommand, EnvelopeDto?>
|
||||
/// <param name="Provider"></param>
|
||||
/// <param name="Mapper"></param>
|
||||
/// <param name="EnvNtfService"></param>
|
||||
/// <param name="ReqCntxt"></param>
|
||||
/// <param name="Logger"></param>
|
||||
public class CreateEnvelopeCommandHandler(IServiceProvider Provider, IMapper Mapper, IEnvelopeNotificationService EnvNtfService, IRequestContext ReqCntxt, ILogger<CreateEnvelopeCommandHandler> Logger) : IRequestHandler<CreateEnvelopeCommand, EnvelopeDto?>
|
||||
{
|
||||
private readonly IServiceProvider _provider;
|
||||
private IEnvelopeExecutor Executor => Provider.GetRequiredService<IEnvelopeExecutor>();
|
||||
|
||||
private IEnvelopeExecutor Executor => _provider.GetRequiredService<IEnvelopeExecutor>();
|
||||
private IRepository<Envelope> Repository => Provider.GetRequiredService<IRepository<Envelope>>();
|
||||
|
||||
private IRepository<Envelope> Repository => _provider.GetRequiredService<IRepository<Envelope>>();
|
||||
private IRepository<Document> DocumentRepository => Provider.GetRequiredService<IRepository<Document>>();
|
||||
|
||||
private IRepository<Document> DocumentRepository => _provider.GetRequiredService<IRepository<Document>>();
|
||||
private IRepository<EnvelopeReceiver> EnvelopeReceiverRepository => Provider.GetRequiredService<IRepository<EnvelopeReceiver>>();
|
||||
|
||||
private IRepository<EnvelopeReceiver> EnvelopeReceiverRepository => _provider.GetRequiredService<IRepository<EnvelopeReceiver>>();
|
||||
private IRepository<EnvelopeType> EnvelopeTypeRepository => Provider.GetRequiredService<IRepository<EnvelopeType>>();
|
||||
|
||||
private IRepository<EnvelopeType> EnvelopeTypeRepository => _provider.GetRequiredService<IRepository<EnvelopeType>>();
|
||||
private IRepository<Receiver> ReceiverRepository => Provider.GetRequiredService<IRepository<Receiver>>();
|
||||
|
||||
private IRepository<Receiver> ReceiverRepository => _provider.GetRequiredService<IRepository<Receiver>>();
|
||||
private IRepository<DocReceiverElement> DocReceiverElementRepository => Provider.GetRequiredService<IRepository<DocReceiverElement>>();
|
||||
|
||||
private IRepository<DocReceiverElement> DocReceiverElementRepository => _provider.GetRequiredService<IRepository<DocReceiverElement>>();
|
||||
private IRepository<EmailTemplate> EmailTemplateRepository => Provider.GetRequiredService<IRepository<EmailTemplate>>();
|
||||
|
||||
private IRepository<EmailTemplate> EmailTemplateRepository => _provider.GetRequiredService<IRepository<EmailTemplate>>();
|
||||
private IRepository<EmailOut> EmailOutRepository => Provider.GetRequiredService<IRepository<EmailOut>>();
|
||||
|
||||
private IRepository<EmailOut> EmailOutRepository => _provider.GetRequiredService<IRepository<EmailOut>>();
|
||||
private MailParams MailParams => Provider.GetRequiredService<IOptions<MailParams>>().Value;
|
||||
|
||||
private MailParams MailParams => _provider.GetRequiredService<IOptions<MailParams>>().Value;
|
||||
private DispatcherParams DispatcherParams => Provider.GetRequiredService<IOptions<DispatcherParams>>().Value;
|
||||
|
||||
private DispatcherParams DispatcherParams => _provider.GetRequiredService<IOptions<DispatcherParams>>().Value;
|
||||
private SignatureFieldParams SignatureFieldParams => Provider.GetRequiredService<IOptionsMonitor<SignatureFieldParams>>().CurrentValue;
|
||||
|
||||
private SignatureFieldParams SignatureFieldParams => _provider.GetRequiredService<IOptionsMonitor<SignatureFieldParams>>().CurrentValue;
|
||||
[Obsolete("Use IConfigService instead.")]
|
||||
private IConfigService ConfigService => Provider.GetRequiredService<IConfigService>();
|
||||
|
||||
private IConfigService ConfigService => _provider.GetRequiredService<IConfigService>();
|
||||
|
||||
private IMediator Mediator => _provider.GetRequiredService<IMediator>();
|
||||
|
||||
private readonly IMapper _mapper;
|
||||
|
||||
/// <summary>
|
||||
///
|
||||
/// </summary>
|
||||
/// <param name="provider"></param>
|
||||
/// <param name="mapper"></param>
|
||||
public CreateEnvelopeCommandHandler(IServiceProvider provider, IMapper mapper)
|
||||
{
|
||||
_provider = provider;
|
||||
_mapper = mapper;
|
||||
}
|
||||
private IMediator Mediator => Provider.GetRequiredService<IMediator>();
|
||||
|
||||
/// <summary>
|
||||
///
|
||||
@@ -232,7 +228,7 @@ public class CreateEnvelopeCommandHandler : IRequestHandler<CreateEnvelopeComman
|
||||
.ThenInclude(er => er.Receiver)
|
||||
.FirstAsync(e => e.Id == envelope.Id, cancel);
|
||||
|
||||
return _mapper.Map<EnvelopeDto>(envelope);
|
||||
return Mapper.Map<EnvelopeDto>(envelope);
|
||||
}
|
||||
|
||||
private async Task<EnvelopeSettings> ResolveEnvelopeSettingsAsync(CreateEnvelopeCommand request, Envelope? existing, CancellationToken cancel)
|
||||
@@ -301,7 +297,7 @@ public class CreateEnvelopeCommandHandler : IRequestHandler<CreateEnvelopeComman
|
||||
ExpiresWarningWhen: expiresWarningWhenDays > 0 ? DateTime.Now.AddDays(expiresWarningWhenDays) : null,
|
||||
ContractType: existing?.ContractType
|
||||
?? selectedType?.ContractType
|
||||
?? (int)ContractType.Contract);
|
||||
?? ContractType.Contract);
|
||||
}
|
||||
|
||||
private static string ResolveLanguage(string? preferred, string? fallback1, string? fallback2)
|
||||
@@ -332,7 +328,7 @@ public class CreateEnvelopeCommandHandler : IRequestHandler<CreateEnvelopeComman
|
||||
int ExpiresWarningWhenDays,
|
||||
DateTime? ExpiresWhen,
|
||||
DateTime? ExpiresWarningWhen,
|
||||
int ContractType);
|
||||
ContractType ContractType);
|
||||
|
||||
private async Task<string> ResolveSenderReferenceAsync(Envelope envelope, CancellationToken cancel)
|
||||
{
|
||||
@@ -531,15 +527,15 @@ public class CreateEnvelopeCommandHandler : IRequestHandler<CreateEnvelopeComman
|
||||
if (!hasDocument)
|
||||
throw new BadRequestException("Cannot send envelope without a document.");
|
||||
|
||||
var links = await EnvelopeReceiverRepository.Query
|
||||
var envRcvs = await EnvelopeReceiverRepository.Query
|
||||
.Include(er => er.Receiver)
|
||||
.Where(er => er.EnvelopeId == envelope.Id)
|
||||
.ToListAsync(cancel);
|
||||
|
||||
if (links.Count == 0)
|
||||
if (envRcvs.Count == 0)
|
||||
throw new BadRequestException("Cannot send envelope without receivers.");
|
||||
|
||||
var receiverIds = links.Select(l => l.ReceiverId).Distinct().ToList();
|
||||
var receiverIds = envRcvs.Select(l => l.ReceiverId).Distinct().ToList();
|
||||
var documentIds = await DocumentRepository.Query
|
||||
.Where(d => d.EnvelopeId == envelope.Id)
|
||||
.Select(d => d.Id)
|
||||
@@ -552,7 +548,7 @@ public class CreateEnvelopeCommandHandler : IRequestHandler<CreateEnvelopeComman
|
||||
.Select(g => new { ReceiverId = g.Key, Count = g.Count() })
|
||||
.ToDictionaryAsync(x => x.ReceiverId, x => x.Count, cancel);
|
||||
|
||||
var receiversWithoutFields = links
|
||||
var receiversWithoutFields = envRcvs
|
||||
.Where(link => !receiverFieldCounts.TryGetValue(link.ReceiverId, out var count) || count <= 0)
|
||||
.Select(link => link.Name)
|
||||
.ToList();
|
||||
@@ -576,70 +572,39 @@ public class CreateEnvelopeCommandHandler : IRequestHandler<CreateEnvelopeComman
|
||||
Status = EnvelopeStatus.EnvelopeQueued
|
||||
}, cancel);
|
||||
|
||||
await QueueInvitationEmailsAsync(envelope, links, userReference, cancel);
|
||||
await SendInvitationEmailsAsync(envelope, envRcvs, cancel);
|
||||
|
||||
envelope.Status = EnvelopeStatus.EnvelopeQueued;
|
||||
}
|
||||
|
||||
private async Task QueueInvitationEmailsAsync(
|
||||
private async Task SendInvitationEmailsAsync(
|
||||
Envelope envelope,
|
||||
IReadOnlyCollection<EnvelopeReceiver> links,
|
||||
string senderReference,
|
||||
IReadOnlyCollection<EnvelopeReceiver> envRcvs,
|
||||
CancellationToken cancel)
|
||||
{
|
||||
var template = await EmailTemplateRepository.Query
|
||||
.SingleOrDefaultAsync(x => x.Name == EmailTemplateType.DocumentReceived.ToString(), cancel)
|
||||
?? throw new InvalidOperationException($"Email template not found: {EmailTemplateType.DocumentReceived}");
|
||||
|
||||
var signatureHost = await ConfigService.ReadDefaultSignatureHost();
|
||||
var senderName = senderReference;
|
||||
|
||||
foreach (var link in links)
|
||||
foreach (var er in envRcvs)
|
||||
{
|
||||
var receiver = link.Receiver;
|
||||
if (receiver is null || string.IsNullOrWhiteSpace(receiver.EmailAddress) || string.IsNullOrWhiteSpace(receiver.Signature))
|
||||
continue;
|
||||
|
||||
var envelopeKey = (envelope.Uuid, receiver.Signature).ToEnvelopeKey();
|
||||
var documentLink = $"{signatureHost.TrimEnd('/')}/envelope/login/{Uri.EscapeDataString(envelopeKey)}";
|
||||
|
||||
var placeholders = new Dictionary<string, string>(MailParams.Placeholders)
|
||||
var advancedSignature = envelope.CertificationType == CertificationType.AdvancedElectronicSignature;
|
||||
var origin = new Uri(ReqCntxt.Origin ?? throw new InvalidOperationException($"The request origin is missing in {nameof(CreateEnvelopeCommandHandler)}."));
|
||||
try
|
||||
{
|
||||
["[NAME_RECEIVER]"] = link.Name ?? string.Empty,
|
||||
["[NAME_SENDER]"] = senderName ?? string.Empty,
|
||||
["[DOCUMENT_TITLE]"] = envelope.Title ?? string.Empty,
|
||||
["[MESSAGE]"] = envelope.Message ?? string.Empty,
|
||||
["[LINK_TO_DOCUMENT]"] = documentLink,
|
||||
["[LINK_TO_DOCUMENT_TEXT]"] = documentLink[..Math.Min(40, documentLink.Length)] + ".."
|
||||
};
|
||||
|
||||
var subject = ReplacePlaceHolders(template.Subject, placeholders);
|
||||
var body = ReplacePlaceHolders(template.Body, placeholders);
|
||||
|
||||
var emailOut = new EmailOut
|
||||
await EnvNtfService.Notify(er.Receiver.EmailAddress, new DocumentReceivedNotification
|
||||
{
|
||||
AdvancedSignature = advancedSignature,
|
||||
DocumentTitle = envelope.Title ?? string.Empty,
|
||||
NameReceiver = er.Name ?? string.Empty,
|
||||
EnvelopeUuid = envelope.Uuid,
|
||||
IsReadAndConfirm = envelope.IsReadAndConfirm(),
|
||||
Message = envelope.Message ?? string.Empty,
|
||||
NameSender = $"{envelope.User.Prename} {envelope.User.Name}",
|
||||
Origin = origin,
|
||||
ReceiverSignature = er.Receiver.Signature,
|
||||
}, cancel);
|
||||
}
|
||||
catch(Exception ex)
|
||||
{
|
||||
EmailAddress = receiver.EmailAddress,
|
||||
EmailSubj = subject,
|
||||
EmailBody = body,
|
||||
AddedWhen = DateTime.Now,
|
||||
AddedWho = DispatcherParams.AddedWho,
|
||||
SendingProfile = DispatcherParams.SendingProfile,
|
||||
ReminderTypeId = DispatcherParams.ReminderTypeId,
|
||||
EmailAttmt1 = DispatcherParams.EmailAttmt1,
|
||||
WfId = (int)EnvelopeStatus.MessageInvitationSent,
|
||||
ReferenceString = receiver.EmailAddress,
|
||||
ReferenceId = link.ReceiverId
|
||||
};
|
||||
|
||||
await EmailOutRepository.CreateAsync(emailOut, cancel);
|
||||
Logger.LogError(ex, "Failed to send invitation email for receiver {emailAddress} in envelope {envelopeId}.", er.Receiver.EmailAddress, envelope.Id);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
private static string ReplacePlaceHolders(string text, Dictionary<string, string> placeHolders)
|
||||
{
|
||||
foreach (var placeHolder in placeHolders)
|
||||
text = text.Replace(placeHolder.Key, placeHolder.Value);
|
||||
|
||||
return text;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -98,7 +98,8 @@ public class FinalizeEnvelopeCommandHandler(IRepository<Envelope> Repo, ISender
|
||||
{
|
||||
DocumentTitle = envelope.Title,
|
||||
NameReceiver = er.Name,
|
||||
Attachment = doc
|
||||
Attachments = [($"unterzeichnetes-dokument.pdf", doc)],
|
||||
IsReadAndConfirm = envelope.IsReadAndConfirm(),
|
||||
}, cancel);
|
||||
}
|
||||
|
||||
|
||||
@@ -83,7 +83,7 @@ namespace EnvelopeGenerator.Domain.Entities
|
||||
public string Comment { get; set; }
|
||||
|
||||
[Column("CONTRACT_TYPE")]
|
||||
public int? ContractType { get; set; }
|
||||
public ContractType? ContractType { get; set; }
|
||||
|
||||
#if NETFRAMEWORK
|
||||
[NotMapped]
|
||||
@@ -129,7 +129,11 @@ namespace EnvelopeGenerator.Domain.Entities
|
||||
public int? ExpiresWarningWhenDays { get; set; }
|
||||
|
||||
[ForeignKey("UserId")]
|
||||
public User User { get; set; }
|
||||
public User
|
||||
#if nullable
|
||||
?
|
||||
#endif
|
||||
User { get; set; }
|
||||
|
||||
[Column("TFA_ENABLED")]
|
||||
public bool? TfaEnabled { get; set; }
|
||||
|
||||
@@ -1,5 +1,7 @@
|
||||
using System.ComponentModel.DataAnnotations;
|
||||
using System.ComponentModel.DataAnnotations.Schema;
|
||||
using EnvelopeGenerator.Domain.Constants;
|
||||
|
||||
#if NETFRAMEWORK
|
||||
using System;
|
||||
#endif
|
||||
@@ -56,7 +58,7 @@ namespace EnvelopeGenerator.Domain.Entities
|
||||
public int? ReminderIntervalDays { get; set; }
|
||||
|
||||
[Column("CONTRACT_TYPE")]
|
||||
public int? ContractType { get; set; }
|
||||
public ContractType? ContractType { get; set; }
|
||||
|
||||
[NotMapped]
|
||||
public bool TFA_Enabled { get; set; } = false;
|
||||
|
||||
@@ -0,0 +1,7 @@
|
||||
namespace EnvelopeGenerator.Infrastructure.Notification.Configuration;
|
||||
|
||||
public enum ConsumerType
|
||||
{
|
||||
API,
|
||||
RabbitMQ
|
||||
}
|
||||
@@ -0,0 +1,16 @@
|
||||
using DigitalData.MessagingService.RabbitMQ;
|
||||
|
||||
namespace EnvelopeGenerator.Infrastructure.Notification.Configuration;
|
||||
|
||||
public class NotificationOptions
|
||||
{
|
||||
public const string SectionName = "Notification";
|
||||
|
||||
public ConsumerType ConsumerType { get; set; }
|
||||
|
||||
public string? ApiUrl { get; set; }
|
||||
|
||||
public string SenderEmail { get; set; } = null!;
|
||||
|
||||
public RabbitMqConnectionConfiguration? RabbitMQ { get; set; }
|
||||
}
|
||||
@@ -1,41 +1,47 @@
|
||||
using DigitalData.MessagingService.Client;
|
||||
using DigitalData.MessagingService.Domain.Entities;
|
||||
using DigitalData.MessagingService.RabbitMQ;
|
||||
using EnvelopeGenerator.Application.Common.Interfaces.Services.Notification;
|
||||
using EnvelopeGenerator.Infrastructure.Notification.Configuration;
|
||||
using Microsoft.Extensions.Configuration;
|
||||
using Microsoft.Extensions.DependencyInjection;
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Linq;
|
||||
using System.Text;
|
||||
using System.Threading.Tasks;
|
||||
|
||||
namespace EnvelopeGenerator.Infrastructure.Notification;
|
||||
|
||||
public static class DependencyInjection
|
||||
{
|
||||
public static IServiceCollection AddNotificationInfrastructure(this IServiceCollection services, IConfiguration configuration)
|
||||
public static IServiceCollection AddNotificationInfrastructure(this IServiceCollection services, IConfiguration configuration, string sectionName = NotificationOptions.SectionName)
|
||||
{
|
||||
var rMqConfig = configuration.GetSection("RabbitMQ").Get<RabbitMqConfiguration>()
|
||||
?? throw new ArgumentNullException(nameof(RabbitMqConfiguration), "RabbitMQ configuration is missing");
|
||||
var ntfConfiguration = configuration.GetSection(sectionName);
|
||||
services.Configure<NotificationOptions>(ntfConfiguration);
|
||||
|
||||
EmailSender.ConnectRabbitMq(config =>
|
||||
var options = ntfConfiguration.Get<NotificationOptions>()
|
||||
?? throw new InvalidOperationException(
|
||||
$"Failed to bind configuration section '{sectionName}' to {nameof(NotificationOptions)}. Ensure the section exists and is correctly configured.");
|
||||
|
||||
switch (options.ConsumerType)
|
||||
{
|
||||
config.HostName = rMqConfig.HostName;
|
||||
config.Port = rMqConfig.Port;
|
||||
config.UserName = rMqConfig.UserName;
|
||||
config.Password = rMqConfig.Password;
|
||||
|
||||
config.VirtualHost = "/";
|
||||
config.QueueName = "emailprofiler.email.outbox";
|
||||
config.ExchangeName = "emailprofiler.emails";
|
||||
config.RoutingKey = "email.outbox";
|
||||
config.DlqQueueName = "emailprofiler.email.outbox.dlq";
|
||||
config.DlqExchangeName = "emailprofiler.emails.dlq";
|
||||
config.DlqRoutingKey = "email.outbox.dlq";
|
||||
});
|
||||
|
||||
services.Configure<EmailAccount>(configuration.GetSection("NotificationEmailAccount"));
|
||||
case ConsumerType.API:
|
||||
if (options.ApiUrl is string apiUrl)
|
||||
services.AddMessagingServiceHttpClient(opt =>
|
||||
{
|
||||
opt.BaseAddress = new Uri(apiUrl);
|
||||
// Additional configuration for the MessagingServiceHttpClient can be added here if needed
|
||||
});
|
||||
else
|
||||
throw new InvalidOperationException(
|
||||
$"MessagingServiceApiUrl must be provided when ClientType is set to Api in the '{sectionName}' configuration section.");
|
||||
break;
|
||||
case ConsumerType.RabbitMQ:
|
||||
if(options.RabbitMQ is not null)
|
||||
services.AddMessagingServiceClient(ntfConfiguration, nameof(options.RabbitMQ));
|
||||
else
|
||||
throw new InvalidOperationException(
|
||||
$"Missing RabbitMQ connection configuration." +
|
||||
$"When ClientType is set to RabbitMQ, a valid RabbitMQ configuration must be provided in the '{sectionName}' configuration section.");
|
||||
break;
|
||||
default:
|
||||
throw new InvalidOperationException(
|
||||
$"Unsupported ConsumerType '{options.ConsumerType}' in the '{sectionName}' configuration section.");
|
||||
}
|
||||
|
||||
services.AddScoped<IEnvelopeNotificationService, EnvelopeNotificationService>();
|
||||
return services;
|
||||
|
||||
@@ -8,7 +8,7 @@
|
||||
</PropertyGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<PackageReference Include="DigitalData.MessagingService.Client" Version="1.0.5" />
|
||||
<PackageReference Include="DigitalData.MessagingService.Client" Version="3.0.1" />
|
||||
<PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="10.0.10" />
|
||||
</ItemGroup>
|
||||
|
||||
|
||||
@@ -0,0 +1,15 @@
|
||||
using DigitalData.MessagingService.Application.Common.Dto;
|
||||
|
||||
namespace EnvelopeGenerator.Infrastructure.Notification;
|
||||
|
||||
public static class EnvelopeNotificationExtensions
|
||||
{
|
||||
public static EmailAttachmentDto ToEmailAttachmentDto(this (string FileName, byte[] Content) attachment) => new()
|
||||
{
|
||||
FileName = attachment.FileName,
|
||||
Content = attachment.Content
|
||||
};
|
||||
|
||||
public static IEnumerable<EmailAttachmentDto> ToEmailAttachmentDto(this IEnumerable<(string FileName, byte[] Content)> attachments)
|
||||
=> attachments.Select(ToEmailAttachmentDto);
|
||||
}
|
||||
@@ -1,44 +1,48 @@
|
||||
using DigitalData.Core.Abstraction.Application.Repository;
|
||||
using DigitalData.Core.Exceptions;
|
||||
using DigitalData.MessagingService.Application.Common.Dto;
|
||||
using DigitalData.MessagingService.Application.Common.Interfaces;
|
||||
using DigitalData.MessagingService.Application.EmailSending.Commands;
|
||||
using DigitalData.MessagingService.Client;
|
||||
using DigitalData.MessagingService.Domain.Entities;
|
||||
using EnvelopeGenerator.Application.Common.Interfaces.Services.Notification;
|
||||
using EnvelopeGenerator.Domain.Constants;
|
||||
using EnvelopeGenerator.Domain.Entities;
|
||||
using MediatR;
|
||||
using EnvelopeGenerator.Domain.Exceptions;
|
||||
using EnvelopeGenerator.Infrastructure.Notification.Configuration;
|
||||
using Microsoft.EntityFrameworkCore;
|
||||
using Microsoft.Extensions.Options;
|
||||
|
||||
namespace EnvelopeGenerator.Infrastructure.Notification;
|
||||
|
||||
public class EnvelopeNotificationService(IOptions<EmailAccount> EmailAccountOptions, IRepository<EmailTemplate> TempRepo) : IEnvelopeNotificationService
|
||||
public class EnvelopeNotificationService(IRepository<EmailTemplate> TempRepo, IMessagingServiceClient MsgClient, IOptions<NotificationOptions> ntfOpt) : IEnvelopeNotificationService
|
||||
{
|
||||
public async Task Notify(string email, DocumentSignedNotification documentSigned, CancellationToken cancel = default)
|
||||
{
|
||||
var template = await TempRepo.Where(t => t.Name == "DocumentCompleted").FirstOrDefaultAsync(cancel)
|
||||
?? throw new NotFoundException("DocumentCompleted email template not found");
|
||||
var subjectTemplate = Replace(template.Subject, documentSigned);
|
||||
var bodyTemplate = Replace(template.Body, documentSigned);
|
||||
private readonly NotificationOptions NtfOpt = ntfOpt.Value;
|
||||
|
||||
await EmailSender.Send(new EmailContext()
|
||||
private async Task<EmailTemplate> GetTemplateAsync(EmailTemplateType templateType, CancellationToken cancel = default)
|
||||
{
|
||||
return await TempRepo.Where(t => t.Name == templateType.ToString()).FirstOrDefaultAsync(cancel)
|
||||
?? throw new DataIntegrityException($"{templateType} email template not found");
|
||||
}
|
||||
|
||||
public async Task Notify<TEnvelopeNotificationBase>(string receiverEmail, TEnvelopeNotificationBase notification, CancellationToken cancel = default)
|
||||
where TEnvelopeNotificationBase : EnvelopeNotificationBase
|
||||
{
|
||||
var template = await GetTemplateAsync(notification.GetTemplateType(), cancel);
|
||||
|
||||
// create email command
|
||||
var mail = new PublishEmailViaSmtpCommand()
|
||||
{
|
||||
Body = bodyTemplate,
|
||||
Subject = subjectTemplate,
|
||||
Recipients = [email],
|
||||
Sender = EmailAccountOptions.Value,
|
||||
Attachments = [new EmailAttachmentDto()
|
||||
{
|
||||
FileName = "unterzeichnetes-dokument.pdf",
|
||||
Content = documentSigned.Attachment
|
||||
}]
|
||||
});
|
||||
}
|
||||
Body = template.Body.ReplacePlaceholders(notification),
|
||||
Subject = template.Subject.ReplacePlaceholders(notification),
|
||||
Recipients = [receiverEmail],
|
||||
Sender = NtfOpt.SenderEmail.ToSender(),
|
||||
IsHtml = true
|
||||
};
|
||||
|
||||
private static string Replace(string template, DocumentSignedNotification documentSigned)
|
||||
{
|
||||
return template
|
||||
.Replace("[DOCUMENT_TITLE]", documentSigned.DocumentTitle)
|
||||
.Replace("[NAME_PORTAL]", documentSigned.NamePortal)
|
||||
.Replace("[NAME_RECEIVER]", documentSigned.NameReceiver);
|
||||
// add attachments if any
|
||||
if(notification.Attachments?.Any() ?? false)
|
||||
mail = mail.WithAttachments(notification.Attachments.ToEmailAttachmentDto());
|
||||
|
||||
await MsgClient.SendAsync(mail, cancel);
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,47 @@
|
||||
using System.Collections.Concurrent;
|
||||
using System.Reflection;
|
||||
using System.Text.RegularExpressions;
|
||||
|
||||
namespace EnvelopeGenerator.Infrastructure.Notification;
|
||||
|
||||
public static class ReplacePlaceholderExtensions
|
||||
{
|
||||
private sealed record PlaceholderProperty(string Placeholder, PropertyInfo Property);
|
||||
|
||||
private static readonly ConcurrentDictionary<Type, PlaceholderProperty[]> PropertyCache = new();
|
||||
|
||||
public static string ReplacePlaceholders(this string template, object data)
|
||||
{
|
||||
var properties = PropertyCache.GetOrAdd(data.GetType(), CreatePlaceholderProperties);
|
||||
|
||||
foreach (var item in properties)
|
||||
{
|
||||
var value = item.Property.GetValue(data)?.ToString() ?? string.Empty;
|
||||
template = template.Replace(
|
||||
item.Placeholder,
|
||||
value,
|
||||
StringComparison.Ordinal);
|
||||
}
|
||||
|
||||
return template;
|
||||
}
|
||||
|
||||
private static PlaceholderProperty[] CreatePlaceholderProperties(
|
||||
Type type)
|
||||
{
|
||||
return [.. type
|
||||
.GetProperties(BindingFlags.Public | BindingFlags.Instance)
|
||||
.Where(p => p.CanRead && p.GetIndexParameters().Length == 0)
|
||||
.Select(p => new PlaceholderProperty(
|
||||
$"[{ToCapitalSnakeCase(p.Name)}]",
|
||||
p))];
|
||||
}
|
||||
|
||||
private static string ToCapitalSnakeCase(string name)
|
||||
{
|
||||
return Regex.Replace(
|
||||
Regex.Replace(name, @"([A-Z]+)([A-Z][a-z])", "$1_$2"),
|
||||
@"([a-z0-9])([A-Z])",
|
||||
"$1_$2").ToUpperInvariant();
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,17 @@
|
||||
-- Original email template: DocumentAccessCodeReceived (GUID 5)
|
||||
-- Backed up before redesign: 2026-10-29 16:32:15
|
||||
-- Subject: Zugriffscode für Dokument erhalten: ''[DOCUMENT_TITLE]''
|
||||
-- Restore by running this script against DD_ECM:
|
||||
UPDATE dbo.TBSIG_EMAIL_TEMPLATE
|
||||
SET BODY = N'Guten Tag [NAME_RECEIVER],<br />
|
||||
<br /><B><I>
|
||||
[NAME_SENDER]</I></B> hat Ihnen ein Dokument zum [SIGNATURE_TYPE] gesendet. <br />
|
||||
<br />
|
||||
Verwenden Sie den folgenden Zugriffscode, um das Dokument einzusehen:<br />
|
||||
<br />
|
||||
[DOCUMENT_ACCESS_CODE]<br />
|
||||
<br />
|
||||
Mit freundlichen Grüßen<br />
|
||||
<br />
|
||||
[NAME_PORTAL]'
|
||||
WHERE GUID = 5;
|
||||
@@ -0,0 +1,15 @@
|
||||
-- Original email template: DocumentCompleted (GUID 4)
|
||||
-- Backed up before redesign: 2026-10-29 16:29:55
|
||||
-- Subject: Umschlag abgeschlossen: ''[DOCUMENT_TITLE]''
|
||||
-- Restore by running this script against DD_ECM:
|
||||
UPDATE dbo.TBSIG_EMAIL_TEMPLATE
|
||||
SET BODY = N'Guten Tag [NAME_RECEIVER],<br />
|
||||
<br />
|
||||
Der Vorgang <B><I>''[DOCUMENT_TITLE]''</I></B> wurde erfolgreich abgeschlossen.<br />
|
||||
<br />
|
||||
Sie erhalten das Dokument mit einem detaillierten Ergebnisbericht als Anhang zu dieser Email.<br />
|
||||
<br />
|
||||
Mit freundlichen Grüßen<br />
|
||||
<br />
|
||||
[NAME_PORTAL]'
|
||||
WHERE GUID = 4;
|
||||
@@ -0,0 +1,13 @@
|
||||
-- Original email template: DocumentDeleted (GUID 2)
|
||||
-- Backed up before redesign: 2026-10-29 16:23:45
|
||||
-- Subject: Umschlag zurückgezogen: ''[DOCUMENT_TITLE]''
|
||||
-- Restore by running this script against DD_ECM:
|
||||
UPDATE dbo.TBSIG_EMAIL_TEMPLATE
|
||||
SET BODY = N'Guten Tag [NAME_RECEIVER],<br />
|
||||
<br /><B><I>
|
||||
[NAME_SENDER]</I></B> hat den Umschlag <B><I>''[DOCUMENT_TITLE]''</I></B> gelöscht/zurückgezogen.<br /><p>
|
||||
Begründung: <br /> <I>[REASON]</I> <p>
|
||||
<br />
|
||||
Mit freundlichen Grüßen<br />
|
||||
<br />
|
||||
[NAME_PORTAL]'
|
||||
@@ -0,0 +1,17 @@
|
||||
-- Original email template: DocumentReceived (GUID 1, de-DE)
|
||||
-- Backed up before redesign: 2026-10-29 16:06:07
|
||||
-- Subject: Dokument erhalten: ''[DOCUMENT_TITLE]''
|
||||
-- Restore by running this script against DD_ECM:
|
||||
UPDATE dbo.TBSIG_EMAIL_TEMPLATE
|
||||
SET BODY = N'Guten Tag [NAME_RECEIVER],<br />
|
||||
<br /><B><I>
|
||||
[NAME_SENDER]</I></B> hat Ihnen ein Dokument zum [SIGNATURE_TYPE] gesendet.<br />
|
||||
<br />
|
||||
Über den folgenden Link können Sie das Dokument einsehen[DOCUMENT_PROCESS]: <a href="[LINK_TO_DOCUMENT]">[LINK_TO_DOCUMENT_TEXT]</a><br />
|
||||
<br />
|
||||
[MESSAGE]<br />
|
||||
<br />
|
||||
Mit freundlichen Grüßen<br />
|
||||
<br />
|
||||
[NAME_PORTAL]'
|
||||
WHERE GUID = 1;
|
||||
@@ -0,0 +1,12 @@
|
||||
-- Original email template: DocumentRejected_ADM (GUID 6)
|
||||
-- Backed up before redesign: 2026-10-29 16:33:34
|
||||
-- Subject: ''[DOCUMENT_TITLE]'' - Vorgang zurückgezogen
|
||||
-- Restore by running this script against DD_ECM:
|
||||
UPDATE dbo.TBSIG_EMAIL_TEMPLATE
|
||||
SET BODY = N'Guten Tag [NAME_SENDER],<p><B><I>[NAME_RECEIVER]</I></B> hat den Umschlag <B><I>''[DOCUMENT_TITLE]''</I></B> mit folgendem Grund abgelehnt: <p>
|
||||
[REASON]
|
||||
<p>Der Umschlag wurde auf den Status Rejected gesetzt. <p>
|
||||
Mit freundlichen Grüßen<br />
|
||||
<br />
|
||||
[NAME_PORTAL]'
|
||||
WHERE GUID = 6;
|
||||
@@ -0,0 +1,11 @@
|
||||
-- Original email template: DocumentRejected_REC_2 (GUID 10)
|
||||
-- Backed up before redesign: 2026-10-29 16:37:12
|
||||
-- Subject: ''[DOCUMENT_TITLE]'' - Vorgang abgelehnt.
|
||||
-- Restore by running this script against DD_ECM:
|
||||
UPDATE dbo.TBSIG_EMAIL_TEMPLATE
|
||||
SET BODY = N'Guten Tag [NAME_RECEIVER],
|
||||
<p>Der Vorgang <B><I>''[DOCUMENT_TITLE]''</I></B> wurde durch einen anderen Vertragspartner abgelehnt.<p> Der Absender <B><I>[NAME_SENDER]</I></B> wird sich bei Bedarf mit Ihnen in Verbindung setzen. <p>
|
||||
Mit freundlichen Grüßen<br />
|
||||
<br />
|
||||
[NAME_PORTAL]'
|
||||
WHERE GUID = 10;
|
||||
@@ -0,0 +1,11 @@
|
||||
-- Original email template: DocumentRejected_REC (GUID 9)
|
||||
-- Backed up before redesign: 2026-10-29 16:34:21
|
||||
-- Subject: ''[DOCUMENT_TITLE]'' - Bestätigung der Ablehnung
|
||||
-- Restore by running this script against DD_ECM:
|
||||
UPDATE dbo.TBSIG_EMAIL_TEMPLATE
|
||||
SET BODY = N'Guten Tag [NAME_RECEIVER],
|
||||
<p>Hiermit bestätigen wir Ihnen die Ablehnung des Vorgangs <B><I>''[DOCUMENT_TITLE]''</I></B>!<p>Der Absender <B><I>[NAME_SENDER]</I></B> wurde über die Ablehnung informiert. <p>
|
||||
Mit freundlichen Grüßen<br />
|
||||
<br />
|
||||
[NAME_PORTAL]'
|
||||
WHERE GUID = 9;
|
||||
@@ -0,0 +1,7 @@
|
||||
-- Original email template: DocumentShared (GUID 11)
|
||||
-- Backed up before redesign: 2026-10-29 16:42:51
|
||||
-- Subject: Dokument geteilt: ''[DOCUMENT_TITLE]''
|
||||
-- Restore by running this script against DD_ECM:
|
||||
UPDATE dbo.TBSIG_EMAIL_TEMPLATE
|
||||
SET BODY = N'Guten Tag,<br /> <br /><B><I> [NAME_RECEIVER]</I></B> hat Ihnen ein Dokument zum Ansehen gesendet.<br /> <br /> Über den folgenden Link können Sie das Dokument einsehen: <a href="[LINK_TO_DOCUMENT]">[LINK_TO_DOCUMENT_TEXT]</a><br /> <br /> <br /> Mit freundlichen Grüßen<br /> <br /> [NAME_PORTAL]'
|
||||
WHERE GUID = 11;
|
||||
@@ -0,0 +1,14 @@
|
||||
-- Original email template: DocumentSigned (GUID 3)
|
||||
-- Backed up before redesign: 2026-10-29 16:25:45
|
||||
-- Subject: Dokument [RECEIVER_ACTION]: ''[DOCUMENT_TITLE]''
|
||||
-- Restore by running this script against DD_ECM:
|
||||
UPDATE dbo.TBSIG_EMAIL_TEMPLATE
|
||||
SET BODY = N'Guten Tag [NAME_RECEIVER],<br />
|
||||
<br />
|
||||
hiermit bestätigen wir Ihnen die erfolgreiche [FINAL_STATUS] für den Vorgang <B><I>''[DOCUMENT_TITLE]''</I></B>.<br />
|
||||
Wenn alle [FINAL_ACTION] haben, erhalten Sie ebenfalls per E-Mail ein abgeschlossenes Exemplar mit entsprechendem Zertifikat!
|
||||
<br />
|
||||
Mit freundlichen Grüßen<br />
|
||||
<br />
|
||||
[NAME_PORTAL]'
|
||||
WHERE GUID = 3;
|
||||
@@ -0,0 +1,8 @@
|
||||
-- Original email template: TotpSecret (GUID 12)
|
||||
-- Backed up before redesign: 2026-10-29 16:44:44
|
||||
-- Subject: 2-Faktor-Authentifizierung QR-Code
|
||||
-- Restore by running this script against DD_ECM:
|
||||
UPDATE dbo.TBSIG_EMAIL_TEMPLATE
|
||||
SET BODY = N'Guten Tag,<br /> <br />Sie können auf Ihren Zwei-Faktor-Authentifizierungscode zugreifen, indem Sie den unten stehenden QR-Code mit einer beliebigen Authentifizierungs-App auf Ihrem Telefon scannen (Google Authenticator, Microsoft Authenticator usw.). Dieser Code ist bis zum [TFA_EXPIRATION] gültig.<br /> <br /> <img src="data:image/png;base64,[TFA_QR_CODE]" style="width: 13rem; height: 13rem;"><br /> <br />
|
||||
<br /> Mit freundlichen Grüßen<br /> <br /> [NAME_PORTAL]'
|
||||
WHERE GUID = 12;
|
||||
@@ -0,0 +1,88 @@
|
||||
using EnvelopeGenerator.Application.Common.Interfaces.Services.Notification;
|
||||
using EnvelopeGenerator.Domain.Constants;
|
||||
using Microsoft.AspNetCore.Authorization;
|
||||
using Microsoft.AspNetCore.Mvc;
|
||||
|
||||
namespace EnvelopeGenerator.Server.Controllers;
|
||||
|
||||
/// <summary>
|
||||
/// Sends envelope notifications, optionally with randomly generated payloads.
|
||||
/// </summary>
|
||||
/// <remarks>
|
||||
/// Initializes a new instance of the <see cref="NotificationController"/> class.
|
||||
/// </remarks>
|
||||
[ApiController]
|
||||
[Route("api/[controller]")]
|
||||
public class NotificationController(IEnvelopeNotificationService notificationService) : ControllerBase
|
||||
{
|
||||
private const string FallbackEmail = "htek0100@gmail.com";
|
||||
|
||||
/// <summary>
|
||||
/// Sends the supplied document signed notification.
|
||||
/// </summary>
|
||||
[HttpPost("signed")]
|
||||
public async Task<IActionResult> SendSigned(
|
||||
[FromBody] DocumentSignedNotification notification,
|
||||
[FromQuery] string? email,
|
||||
CancellationToken cancel)
|
||||
{
|
||||
await notificationService.Notify(NormalizeEmail(email), notification, cancel);
|
||||
return Ok();
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Sends a randomly generated document signed notification.
|
||||
/// </summary>
|
||||
[HttpPost("signed/random")]
|
||||
public async Task<IActionResult> SendSignedRandom(
|
||||
[FromQuery] string? email,
|
||||
CancellationToken cancel)
|
||||
{
|
||||
await notificationService.Notify(NormalizeEmail(email), new DocumentSignedNotification
|
||||
{
|
||||
DocumentTitle = $"Dokument {Random.Shared.Next(1000, 9999)}",
|
||||
NameReceiver = $"Empfänger {Random.Shared.Next(1, 100)}",
|
||||
IsReadAndConfirm = Random.Shared.Next(2) == 0,
|
||||
}, cancel);
|
||||
return Ok();
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Sends the supplied document received notification.
|
||||
/// </summary>
|
||||
[HttpPost("received")]
|
||||
public async Task<IActionResult> SendReceived(
|
||||
[FromBody] DocumentReceivedNotification notification,
|
||||
[FromQuery] string? email,
|
||||
CancellationToken cancel)
|
||||
{
|
||||
await notificationService.Notify(NormalizeEmail(email), notification, cancel);
|
||||
return Ok();
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Sends a randomly generated document received notification.
|
||||
/// </summary>
|
||||
[HttpPost("received/random")]
|
||||
public async Task<IActionResult> SendReceivedRandom(
|
||||
[FromQuery] string? email,
|
||||
CancellationToken cancel)
|
||||
{
|
||||
await notificationService.Notify(NormalizeEmail(email), new DocumentReceivedNotification
|
||||
{
|
||||
DocumentTitle = $"Dokument {Random.Shared.Next(1000, 9999)}",
|
||||
NameReceiver = $"Empfänger {Random.Shared.Next(1, 100)}",
|
||||
NameSender = $"Absender {Random.Shared.Next(1, 100)}",
|
||||
IsReadAndConfirm = Random.Shared.Next(2) == 0,
|
||||
AdvancedSignature = Random.Shared.Next(2) == 0,
|
||||
Origin = new Uri($"{Request.Scheme}://{Request.Host}"),
|
||||
EnvelopeUuid = Guid.NewGuid().ToString(),
|
||||
ReceiverSignature = Guid.NewGuid().ToString(),
|
||||
Message = $"Testnachricht {Random.Shared.Next(1000, 9999)}"
|
||||
}, cancel);
|
||||
return Ok();
|
||||
}
|
||||
|
||||
private static string NormalizeEmail(string? email)
|
||||
=> string.IsNullOrWhiteSpace(email) ? FallbackEmail : email;
|
||||
}
|
||||
@@ -10,9 +10,9 @@
|
||||
<Authors>Digital Data GmbH</Authors>
|
||||
<Company>Digital Data GmbH</Company>
|
||||
<Product>EnvelopeGenerator.Server</Product>
|
||||
<Version>1.7.0-beta</Version>
|
||||
<FileVersion>1.7.0.0</FileVersion>
|
||||
<AssemblyVersion>1.7.0.0</AssemblyVersion>
|
||||
<Version>1.8.0-beta</Version>
|
||||
<FileVersion>1.8.0.0</FileVersion>
|
||||
<AssemblyVersion>1.8.0.0</AssemblyVersion>
|
||||
<Copyright>Copyright © 2026 Digital Data GmbH. All rights reserved.</Copyright>
|
||||
<DocumentationFile>bin\$(Configuration)\$(TargetFramework)\$(AssemblyName).xml</DocumentationFile>
|
||||
</PropertyGroup>
|
||||
|
||||
@@ -8,6 +8,7 @@ using DigitalData.Core.Application;
|
||||
using DigitalData.EmailProfilerDispatcher;
|
||||
using DigitalData.UserManager.DependencyInjection;
|
||||
using EnvelopeGenerator.Application;
|
||||
using EnvelopeGenerator.Application.Common.Interfaces;
|
||||
using EnvelopeGenerator.Application.Common.Interfaces.Doc;
|
||||
using EnvelopeGenerator.Domain.Constants;
|
||||
using EnvelopeGenerator.Infrastructure;
|
||||
@@ -19,6 +20,7 @@ using EnvelopeGenerator.Server.Client.Services;
|
||||
using EnvelopeGenerator.Server.Components;
|
||||
using EnvelopeGenerator.Server.Models;
|
||||
using EnvelopeGenerator.Server.Options;
|
||||
using EnvelopeGenerator.Server.Services;
|
||||
using Microsoft.AspNetCore.Authentication.Cookies;
|
||||
using Microsoft.AspNetCore.Authentication.JwtBearer;
|
||||
using Microsoft.AspNetCore.Localization;
|
||||
@@ -392,6 +394,8 @@ try
|
||||
builder.Services.Configure<EnvelopeGenerator.Server.Client.Options.PdfViewerOptions>(
|
||||
builder.Configuration.GetSection("PdfViewerOptions"));
|
||||
|
||||
builder.Services.AddScoped<IRequestContext, RequestContext>();
|
||||
|
||||
var app = builder.Build();
|
||||
|
||||
deferredProvider.Factory = () => app.Services;
|
||||
|
||||
@@ -0,0 +1,18 @@
|
||||
using EnvelopeGenerator.Application.Common.Interfaces;
|
||||
|
||||
namespace EnvelopeGenerator.Server.Services;
|
||||
|
||||
/// <summary>
|
||||
///
|
||||
/// </summary>
|
||||
/// <param name="HttpContextAccessor"></param>
|
||||
public sealed class RequestContext(
|
||||
IHttpContextAccessor HttpContextAccessor) : IRequestContext
|
||||
{
|
||||
/// <summary>
|
||||
///
|
||||
/// </summary>
|
||||
public string? Origin =>
|
||||
HttpContextAccessor.HttpContext?
|
||||
.Request.Headers.Origin.ToString();
|
||||
}
|
||||
@@ -215,7 +215,7 @@ public static class Extensions
|
||||
Message = faker.Lorem.Paragraph(faker.Random.Number(2, 5)),
|
||||
TfaEnabled = tfaEnabled,
|
||||
AddedWhen = DateTime.Now,
|
||||
CertificationType = (int)CertificationType.AdvancedElectronicSignature,
|
||||
CertificationType = CertificationType.AdvancedElectronicSignature,
|
||||
UseAccessCode = false,
|
||||
ContractType = (int)ContractType.Contract,
|
||||
Language = "de",
|
||||
|
||||
@@ -71,10 +71,12 @@
|
||||
|
||||
<ItemGroup Condition="'$(TargetFramework)' == 'net8.0'">
|
||||
<ProjectReference Include="..\EnvelopeGenerator.Infrastructure.Crypt\EnvelopeGenerator.Infrastructure.Crypt.csproj" />
|
||||
<ProjectReference Include="..\EnvelopeGenerator.Infrastructure.Notification\EnvelopeGenerator.Infrastructure.Notification.csproj" />
|
||||
</ItemGroup>
|
||||
|
||||
<ItemGroup Condition="'$(TargetFramework)' == 'net7.0'">
|
||||
<Compile Remove="Application\Crypt\**\*.cs" />
|
||||
<Compile Remove="Infrastructure\**\*.cs" />
|
||||
</ItemGroup>
|
||||
|
||||
<ItemGroup Condition="'$(TargetFramework)' == 'net8.0'">
|
||||
|
||||
@@ -0,0 +1,145 @@
|
||||
using System.Text.Json;
|
||||
using System.Text.RegularExpressions;
|
||||
using EnvelopeGenerator.Infrastructure.Notification;
|
||||
using Microsoft.Data.SqlClient;
|
||||
|
||||
namespace EnvelopeGenerator.Tests.Infrastructure;
|
||||
|
||||
[TestFixture]
|
||||
public class MailTemplatePlaceholderDbTests
|
||||
{
|
||||
private static readonly Regex PlaceholderPattern = new(@"\[[A-Z0-9_]+\]", RegexOptions.Compiled);
|
||||
|
||||
private static IEnumerable<TestCaseData> DbTemplateCases()
|
||||
{
|
||||
foreach (var template in ReadTemplates())
|
||||
{
|
||||
yield return new TestCaseData(template)
|
||||
{
|
||||
TestName = $"Template_{template.Name}_{template.LangCode}_{template.Guid}"
|
||||
};
|
||||
}
|
||||
}
|
||||
|
||||
[Test]
|
||||
public void Database_contains_templates()
|
||||
{
|
||||
Assert.That(ReadTemplates(), Is.Not.Empty);
|
||||
}
|
||||
|
||||
[TestCaseSource(nameof(DbTemplateCases))]
|
||||
public void Every_placeholder_in_every_db_template_is_replaced(TemplateRow template)
|
||||
{
|
||||
var data = new TemplatePlaceholders();
|
||||
|
||||
var subject = template.Subject.ReplacePlaceholders(data);
|
||||
var body = template.Body.ReplacePlaceholders(data);
|
||||
|
||||
var originalTokens = PlaceholderPattern
|
||||
.Matches(template.Subject + template.Body)
|
||||
.Select(m => m.Value)
|
||||
.Distinct()
|
||||
.ToArray();
|
||||
|
||||
Assert.Multiple(() =>
|
||||
{
|
||||
Assert.That(Unresolved(subject), Is.Empty,
|
||||
$"'{template.Name}' subject has unresolved placeholders.");
|
||||
Assert.That(Unresolved(body), Is.Empty,
|
||||
$"'{template.Name}' body has unresolved placeholders.");
|
||||
|
||||
foreach (var token in originalTokens)
|
||||
{
|
||||
Assert.That(subject + body, Does.Contain(Expected(token)),
|
||||
$"'{template.Name}' placeholder {token} was not replaced with its value.");
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
private static string[] Unresolved(string text)
|
||||
=> PlaceholderPattern.Matches(text)
|
||||
.Select(m => m.Value)
|
||||
.Distinct()
|
||||
.ToArray();
|
||||
|
||||
private static string Expected(string token) => $"__{token.Trim('[', ']')}__";
|
||||
|
||||
private static List<TemplateRow> ReadTemplates()
|
||||
{
|
||||
const string sql = "SELECT GUID, NAME, SUBJECT, BODY, LANG_CODE FROM TBSIG_EMAIL_TEMPLATE";
|
||||
|
||||
using var connection = new SqlConnection(ReadConnectionString());
|
||||
connection.Open();
|
||||
|
||||
using var command = new SqlCommand(sql, connection);
|
||||
using var reader = command.ExecuteReader();
|
||||
|
||||
var templates = new List<TemplateRow>();
|
||||
while (reader.Read())
|
||||
{
|
||||
templates.Add(new TemplateRow(
|
||||
reader.GetInt32(0),
|
||||
reader.GetString(1),
|
||||
reader.IsDBNull(2) ? string.Empty : reader.GetString(2),
|
||||
reader.IsDBNull(3) ? string.Empty : reader.GetString(3),
|
||||
reader.IsDBNull(4) ? string.Empty : reader.GetString(4)));
|
||||
}
|
||||
|
||||
return templates;
|
||||
}
|
||||
|
||||
private static string ReadConnectionString()
|
||||
{
|
||||
var directory = new DirectoryInfo(AppContext.BaseDirectory);
|
||||
while (directory is not null && !File.Exists(Path.Combine(directory.FullName, "EnvelopeGenerator.sln")))
|
||||
directory = directory.Parent;
|
||||
|
||||
if (directory is null)
|
||||
throw new InvalidOperationException("Solution root (EnvelopeGenerator.sln) was not found.");
|
||||
|
||||
var settingsPath = Path.Combine(
|
||||
directory.FullName,
|
||||
"EnvelopeGenerator.Server",
|
||||
"EnvelopeGenerator.Server",
|
||||
"appsettings.json");
|
||||
|
||||
using var stream = File.OpenRead(settingsPath);
|
||||
using var document = JsonDocument.Parse(stream, new JsonDocumentOptions
|
||||
{
|
||||
CommentHandling = JsonCommentHandling.Skip,
|
||||
AllowTrailingCommas = true
|
||||
});
|
||||
|
||||
return document.RootElement
|
||||
.GetProperty("ConnectionStrings")
|
||||
.GetProperty("Default")
|
||||
.GetString()
|
||||
?? throw new InvalidOperationException($"ConnectionStrings:Default is missing in '{settingsPath}'.");
|
||||
}
|
||||
|
||||
public sealed record TemplateRow(int Guid, string Name, string Subject, string Body, string LangCode);
|
||||
|
||||
/// <summary>
|
||||
/// One property per placeholder used by any row in TBSIG_EMAIL_TEMPLATE.
|
||||
/// The sentinel value equals the placeholder name, so a wrong mapping is detected.
|
||||
/// </summary>
|
||||
private sealed class TemplatePlaceholders
|
||||
{
|
||||
public string DocumentProcess { get; set; } = "__DOCUMENT_PROCESS__";
|
||||
public string DocumentTitle { get; set; } = "__DOCUMENT_TITLE__";
|
||||
public string LinkToDocumentText { get; set; } = "__LINK_TO_DOCUMENT_TEXT__";
|
||||
public string LinkToDocument { get; set; } = "__LINK_TO_DOCUMENT__";
|
||||
public string Message { get; set; } = "__MESSAGE__";
|
||||
public string NamePortal { get; set; } = "__NAME_PORTAL__";
|
||||
public string NameReceiver { get; set; } = "__NAME_RECEIVER__";
|
||||
public string NameSender { get; set; } = "__NAME_SENDER__";
|
||||
public string SignatureType { get; set; } = "__SIGNATURE_TYPE__";
|
||||
public string Reason { get; set; } = "__REASON__";
|
||||
public string ReceiverAction { get; set; } = "__RECEIVER_ACTION__";
|
||||
public string FinalAction { get; set; } = "__FINAL_ACTION__";
|
||||
public string FinalStatus { get; set; } = "__FINAL_STATUS__";
|
||||
public string DocumentAccessCode { get; set; } = "__DOCUMENT_ACCESS_CODE__";
|
||||
public string TfaExpiration { get; set; } = "__TFA_EXPIRATION__";
|
||||
public string TfaQrCode { get; set; } = "__TFA_QR_CODE__";
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,478 @@
|
||||
using EnvelopeGenerator.Application.Common.Interfaces.Services.Notification;
|
||||
using EnvelopeGenerator.Infrastructure.Notification;
|
||||
|
||||
namespace EnvelopeGenerator.Tests.Infrastructure;
|
||||
|
||||
[TestFixture]
|
||||
public class ReplacePlaceholderExtensionsTests
|
||||
{
|
||||
#region Naming
|
||||
|
||||
private static IEnumerable<TestCaseData> NamingCases()
|
||||
{
|
||||
yield return Naming<PersonModel>("[FIRST_NAME]");
|
||||
yield return Naming<PersonModel>("[LAST_NAME]");
|
||||
yield return Naming<IdModel>("[ID]");
|
||||
yield return Naming<UpperIdModel>("[ID]");
|
||||
yield return Naming<AcronymModel>("[URL_VALUE]");
|
||||
yield return Naming<AcronymModel>("[HTTP_STATUS_CODE]");
|
||||
yield return Naming<AcronymModel>("[XML_HTTP_REQUEST]");
|
||||
yield return Naming<AcronymModel>("[OTP]");
|
||||
yield return Naming<DigitModel>("[FIELD1]");
|
||||
yield return Naming<DigitModel>("[VALUE2_TEXT]");
|
||||
yield return Naming<DigitModel>("[A1_B2]");
|
||||
yield return Naming<DigitModel>("[NAME2]");
|
||||
yield return Naming<MyUrl2ValueModel>("[MY_URL2_VALUE]");
|
||||
yield return Naming<SingleLetterModel>("[X]");
|
||||
yield return Naming<LowerCaseModel>("[FIRST_NAME]");
|
||||
yield return Naming<SnakeCaseModel>("[FIRST_NAME]");
|
||||
yield return Naming<TfaModel>("[TFA_EXPIRATION]");
|
||||
}
|
||||
|
||||
private static TestCaseData Naming<T>(string placeholder) where T : new()
|
||||
=> new(new T(), placeholder)
|
||||
{
|
||||
TestName = $"Placeholder_{typeof(T).Name}_{placeholder.Trim('[', ']')}"
|
||||
};
|
||||
|
||||
[TestCaseSource(nameof(NamingCases))]
|
||||
public void Property_names_are_converted_to_upper_snake_case(object data, string placeholder)
|
||||
{
|
||||
var result = placeholder.ReplacePlaceholders(data);
|
||||
|
||||
Assert.That(result, Is.EqualTo("v"));
|
||||
}
|
||||
|
||||
[Test]
|
||||
[SetCulture("tr-TR")]
|
||||
public void Placeholder_names_are_culture_invariant()
|
||||
{
|
||||
var result = "[INFO]".ReplacePlaceholders(new LowerCaseInfoModel());
|
||||
|
||||
Assert.That(result, Is.EqualTo("v"), "Turkish casing would produce [\u0130NFO]");
|
||||
}
|
||||
|
||||
#endregion
|
||||
|
||||
#region Basic replacement
|
||||
|
||||
[Test]
|
||||
public void Replaces_single_placeholder()
|
||||
{
|
||||
var result = "[FIRST_NAME]".ReplacePlaceholders(new PersonModel { FirstName = "Ada" });
|
||||
|
||||
Assert.That(result, Is.EqualTo("Ada"));
|
||||
}
|
||||
|
||||
[Test]
|
||||
public void Replaces_multiple_placeholders()
|
||||
{
|
||||
var data = new PersonModel { FirstName = "Ada", LastName = "Lovelace" };
|
||||
|
||||
var result = "[FIRST_NAME] [LAST_NAME]".ReplacePlaceholders(data);
|
||||
|
||||
Assert.That(result, Is.EqualTo("Ada Lovelace"));
|
||||
}
|
||||
|
||||
[Test]
|
||||
public void Replaces_all_repeated_occurrences()
|
||||
{
|
||||
var data = new PersonModel { FirstName = "Ada" };
|
||||
|
||||
var result = "[FIRST_NAME]-[FIRST_NAME]-[FIRST_NAME]".ReplacePlaceholders(data);
|
||||
|
||||
Assert.That(result, Is.EqualTo("Ada-Ada-Ada"));
|
||||
}
|
||||
|
||||
[Test]
|
||||
public void Leaves_unknown_placeholder_untouched()
|
||||
{
|
||||
var result = "[UNKNOWN_TOKEN]".ReplacePlaceholders(new PersonModel());
|
||||
|
||||
Assert.That(result, Is.EqualTo("[UNKNOWN_TOKEN]"));
|
||||
}
|
||||
|
||||
[Test]
|
||||
public void Returns_template_unchanged_when_it_has_no_placeholders()
|
||||
{
|
||||
var result = "Hello world".ReplacePlaceholders(new PersonModel());
|
||||
|
||||
Assert.That(result, Is.EqualTo("Hello world"));
|
||||
}
|
||||
|
||||
[Test]
|
||||
public void Returns_empty_string_for_empty_template()
|
||||
{
|
||||
var result = string.Empty.ReplacePlaceholders(new PersonModel());
|
||||
|
||||
Assert.That(result, Is.Empty);
|
||||
}
|
||||
|
||||
[Test]
|
||||
public void Returns_template_unchanged_when_data_has_no_readable_properties()
|
||||
{
|
||||
var result = "[ANYTHING]".ReplacePlaceholders(new object());
|
||||
|
||||
Assert.That(result, Is.EqualTo("[ANYTHING]"));
|
||||
}
|
||||
|
||||
[Test]
|
||||
public void Matching_is_case_sensitive()
|
||||
{
|
||||
var result = "[name]|[Name]".ReplacePlaceholders(new PersonNameModel { Name = "v" });
|
||||
|
||||
Assert.That(result, Is.EqualTo("[name]|[Name]"));
|
||||
}
|
||||
|
||||
[Test]
|
||||
public void Placeholder_without_brackets_is_untouched()
|
||||
{
|
||||
var result = "NAME Receiver".ReplacePlaceholders(new PersonNameModel { Name = "v" });
|
||||
|
||||
Assert.That(result, Is.EqualTo("NAME Receiver"));
|
||||
}
|
||||
|
||||
[Test]
|
||||
public void Double_brackets_leave_the_outer_brackets()
|
||||
{
|
||||
var result = "[[NAME]]".ReplacePlaceholders(new PersonNameModel { Name = "v" });
|
||||
|
||||
Assert.That(result, Is.EqualTo("[v]"));
|
||||
}
|
||||
|
||||
#endregion
|
||||
|
||||
#region Values
|
||||
|
||||
[Test]
|
||||
public void Null_value_is_replaced_with_empty_string()
|
||||
{
|
||||
var result = "[NAME]".ReplacePlaceholders(new { Name = (string?)null });
|
||||
|
||||
Assert.That(result, Is.Empty);
|
||||
}
|
||||
|
||||
[Test]
|
||||
public void Custom_ToString_is_used()
|
||||
{
|
||||
var result = "[VALUE]".ReplacePlaceholders(new { Value = new CustomValue() });
|
||||
|
||||
Assert.That(result, Is.EqualTo("custom"));
|
||||
}
|
||||
|
||||
[Test]
|
||||
public void Primitive_values_use_ToString()
|
||||
{
|
||||
var result = "[COUNT]|[ENABLED]".ReplacePlaceholders(new { Count = 3, Enabled = true });
|
||||
|
||||
Assert.That(result, Is.EqualTo("3|True"));
|
||||
}
|
||||
|
||||
[Test]
|
||||
public void Regex_like_characters_are_inserted_literally()
|
||||
{
|
||||
var result = "[PATTERN]".ReplacePlaceholders(new { Pattern = @"$1 {0} \ $&" });
|
||||
|
||||
Assert.That(result, Is.EqualTo(@"$1 {0} \ $&"));
|
||||
}
|
||||
|
||||
[Test]
|
||||
public void Value_containing_its_own_placeholder_is_not_expanded_recursively()
|
||||
{
|
||||
var result = "[NAME]".ReplacePlaceholders(new EchoNameModel());
|
||||
|
||||
Assert.That(result, Is.EqualTo("[NAME]"));
|
||||
}
|
||||
|
||||
[Test]
|
||||
public void Unicode_value_is_preserved()
|
||||
{
|
||||
var result = "[NAME]".ReplacePlaceholders(new PersonNameModel { Name = "Z\u00fcrich \ud83d\ude00" });
|
||||
|
||||
Assert.That(result, Is.EqualTo("Z\u00fcrich \ud83d\ude00"));
|
||||
}
|
||||
|
||||
#endregion
|
||||
|
||||
#region Property discovery
|
||||
|
||||
[Test]
|
||||
public void Public_readable_property_is_replaced()
|
||||
{
|
||||
var result = "[SHOWN]".ReplacePlaceholders(new DiscoveryModel());
|
||||
|
||||
Assert.That(result, Is.EqualTo("shown"));
|
||||
}
|
||||
|
||||
[Test]
|
||||
public void Get_only_property_is_replaced()
|
||||
{
|
||||
var result = "[READ_ONLY]".ReplacePlaceholders(new DiscoveryModel());
|
||||
|
||||
Assert.That(result, Is.EqualTo("computed"));
|
||||
}
|
||||
|
||||
[Test]
|
||||
public void Static_private_write_only_and_indexer_properties_are_ignored()
|
||||
{
|
||||
const string template = "[HIDDEN]|[STATIC]|[WRITE_ONLY]|[ITEM]";
|
||||
|
||||
var result = template.ReplacePlaceholders(new DiscoveryModel());
|
||||
|
||||
Assert.That(result, Is.EqualTo(template));
|
||||
}
|
||||
|
||||
[Test]
|
||||
public void Inherited_public_property_is_replaced()
|
||||
{
|
||||
var result = "[ID]|[NAME]".ReplacePlaceholders(new DerivedModel());
|
||||
|
||||
Assert.That(result, Is.EqualTo("base|derived"));
|
||||
}
|
||||
|
||||
[Test]
|
||||
public void Record_properties_are_replaced()
|
||||
{
|
||||
var result = "[FIRST_NAME]/[AGE]".ReplacePlaceholders(new PersonRecord("Ada", 36));
|
||||
|
||||
Assert.That(result, Is.EqualTo("Ada/36"));
|
||||
}
|
||||
|
||||
[Test]
|
||||
public void Struct_data_is_supported()
|
||||
{
|
||||
var result = "[NAME]".ReplacePlaceholders(new StructModel { Name = "struct" });
|
||||
|
||||
Assert.That(result, Is.EqualTo("struct"));
|
||||
}
|
||||
|
||||
[Test]
|
||||
public void Anonymous_type_is_supported()
|
||||
{
|
||||
var data = new { Name = "anon", Age = 42 };
|
||||
|
||||
var result = "[NAME]|[AGE]".ReplacePlaceholders(data);
|
||||
|
||||
Assert.That(result, Is.EqualTo("anon|42"));
|
||||
}
|
||||
|
||||
[Test]
|
||||
public void Generic_type_is_supported_for_reference_type()
|
||||
{
|
||||
var result = "[VALUE]".ReplacePlaceholders(new Box<string> { Value = "boxed" });
|
||||
|
||||
Assert.That(result, Is.EqualTo("boxed"));
|
||||
}
|
||||
|
||||
[Test]
|
||||
public void Generic_type_is_supported_for_value_type()
|
||||
{
|
||||
var result = "[VALUE]".ReplacePlaceholders(new Box<int> { Value = 5 });
|
||||
|
||||
Assert.That(result, Is.EqualTo("5"));
|
||||
}
|
||||
|
||||
#endregion
|
||||
|
||||
#region Cache and thread safety
|
||||
|
||||
[Test]
|
||||
public void Cached_metadata_uses_values_of_current_instance()
|
||||
{
|
||||
var first = "[FIRST_NAME]".ReplacePlaceholders(new PersonModel { FirstName = "first" });
|
||||
var second = "[FIRST_NAME]".ReplacePlaceholders(new PersonModel { FirstName = "second" });
|
||||
|
||||
Assert.That(new[] { first, second }, Is.EqualTo(new[] { "first", "second" }));
|
||||
}
|
||||
|
||||
[Test]
|
||||
public void Two_types_with_same_property_name_are_resolved_independently()
|
||||
{
|
||||
var a = "[NAME]".ReplacePlaceholders(new TypeA());
|
||||
var b = "[NAME]".ReplacePlaceholders(new TypeB());
|
||||
|
||||
Assert.That(new[] { a, b }, Is.EqualTo(new[] { "a", "b" }));
|
||||
}
|
||||
|
||||
[Test]
|
||||
public void Concurrent_first_calls_are_thread_safe()
|
||||
{
|
||||
var failures = 0;
|
||||
|
||||
Parallel.For(0, 500, i =>
|
||||
{
|
||||
var expected = $"n{i}";
|
||||
var actual = "[NAME]".ReplacePlaceholders(new ConcurrentModel { Name = expected });
|
||||
|
||||
if (actual != expected)
|
||||
Interlocked.Increment(ref failures);
|
||||
});
|
||||
|
||||
Assert.That(failures, Is.Zero);
|
||||
}
|
||||
|
||||
#endregion
|
||||
|
||||
#region Real DTO
|
||||
|
||||
[Test]
|
||||
public void Document_received_notification_is_fully_replaced()
|
||||
{
|
||||
var data = new DocumentReceivedNotification
|
||||
{
|
||||
DocumentTitle = "Vertrag",
|
||||
NameReceiver = "Max",
|
||||
NameSender = "Erika",
|
||||
IsReadAndConfirm = true,
|
||||
AdvancedSignature = false,
|
||||
LinkToDocument = "https://x.io/a",
|
||||
Message = "Bitte",
|
||||
NamePortal = "Portal"
|
||||
};
|
||||
|
||||
const string template =
|
||||
"[NAME_RECEIVER]|[NAME_SENDER]|[SIGNATURE_TYPE]|[DOCUMENT_TITLE]|[MESSAGE]|[NAME_PORTAL]|[LINK_TO_DOCUMENT]|[LINK_TO_DOCUMENT_TEXT]";
|
||||
|
||||
var result = template.ReplacePlaceholders(data);
|
||||
|
||||
Assert.That(result, Is.EqualTo("Max|Erika|Signieren|Vertrag|Bitte|Portal|https://x.io/a|https://x.io/a"));
|
||||
}
|
||||
|
||||
#endregion
|
||||
|
||||
#region Models
|
||||
|
||||
private sealed class PersonModel
|
||||
{
|
||||
public string FirstName { get; set; } = "v";
|
||||
public string LastName { get; set; } = "v";
|
||||
}
|
||||
|
||||
private sealed class PersonNameModel
|
||||
{
|
||||
public string Name { get; set; } = "v";
|
||||
}
|
||||
|
||||
private sealed class IdModel
|
||||
{
|
||||
public string Id { get; set; } = "v";
|
||||
}
|
||||
|
||||
private sealed class UpperIdModel
|
||||
{
|
||||
public string ID { get; set; } = "v";
|
||||
}
|
||||
|
||||
private sealed class AcronymModel
|
||||
{
|
||||
public string URLValue { get; set; } = "v";
|
||||
public string HTTPStatusCode { get; set; } = "v";
|
||||
public string XMLHttpRequest { get; set; } = "v";
|
||||
public string OTP { get; set; } = "v";
|
||||
}
|
||||
|
||||
private sealed class DigitModel
|
||||
{
|
||||
public string Field1 { get; set; } = "v";
|
||||
public string Value2Text { get; set; } = "v";
|
||||
public string A1B2 { get; set; } = "v";
|
||||
public string Name2 { get; set; } = "v";
|
||||
}
|
||||
|
||||
private sealed class MyUrl2ValueModel
|
||||
{
|
||||
public string MyURL2Value { get; set; } = "v";
|
||||
}
|
||||
|
||||
private sealed class SingleLetterModel
|
||||
{
|
||||
public string X { get; set; } = "v";
|
||||
}
|
||||
|
||||
private sealed class LowerCaseModel
|
||||
{
|
||||
public string firstName { get; set; } = "v";
|
||||
}
|
||||
|
||||
private sealed class LowerCaseInfoModel
|
||||
{
|
||||
public string info { get; set; } = "v";
|
||||
}
|
||||
|
||||
private sealed class SnakeCaseModel
|
||||
{
|
||||
public string First_Name { get; set; } = "v";
|
||||
}
|
||||
|
||||
private sealed class TfaModel
|
||||
{
|
||||
public string TFAExpiration { get; set; } = "v";
|
||||
}
|
||||
|
||||
private sealed class CustomValue
|
||||
{
|
||||
public override string ToString() => "custom";
|
||||
}
|
||||
|
||||
private sealed class EchoNameModel
|
||||
{
|
||||
public string Name { get; set; } = "[NAME]";
|
||||
}
|
||||
|
||||
private sealed class DiscoveryModel
|
||||
{
|
||||
public static string Static { get; set; } = "static";
|
||||
|
||||
public string ReadOnly => "computed";
|
||||
|
||||
public string WriteOnly
|
||||
{
|
||||
set { }
|
||||
}
|
||||
|
||||
public string this[int index] => "indexer";
|
||||
|
||||
public string Shown { get; set; } = "shown";
|
||||
|
||||
private string Hidden { get; set; } = "hidden";
|
||||
}
|
||||
|
||||
private class BaseModel
|
||||
{
|
||||
public string Id { get; set; } = "base";
|
||||
}
|
||||
|
||||
private sealed class DerivedModel : BaseModel
|
||||
{
|
||||
public string Name { get; set; } = "derived";
|
||||
}
|
||||
|
||||
private sealed record PersonRecord(string FirstName, int Age);
|
||||
|
||||
private struct StructModel
|
||||
{
|
||||
public string Name { get; set; }
|
||||
}
|
||||
|
||||
private sealed class Box<T>
|
||||
{
|
||||
public T Value { get; set; } = default!;
|
||||
}
|
||||
|
||||
private sealed class TypeA
|
||||
{
|
||||
public string Name { get; set; } = "a";
|
||||
}
|
||||
|
||||
private sealed class TypeB
|
||||
{
|
||||
public string Name { get; set; } = "b";
|
||||
}
|
||||
|
||||
private sealed class ConcurrentModel
|
||||
{
|
||||
public string Name { get; set; } = string.Empty;
|
||||
}
|
||||
|
||||
#endregion
|
||||
}
|
||||
Reference in New Issue
Block a user