refactor(AddReportBehavior): update to add history record.

- Introduced PDFBurnerParams configuration for concurrency limit.
- Added SemaphoreSlim to handle concurrent PDF burning for envelopes.
- Updated job to call _mediator.BurnPdf for each envelope with error handling.
- Preserved logging of job execution and envelope UUIDs.

EnvelopeGenerator.Application/Common/Configurations/DbTriggerParams.cs

@@ -1,8 +0,0 @@
-namespace EnvelopeGenerator.Application.Common.Configurations;
-
-/// <summary>
-/// 
-/// </summary>
-public class DbTriggerParams : Dictionary<string, ICollection<string>>
-{
-}

EnvelopeGenerator.Application/Common/Configurations/GdPictureParams.cs

@@ -0,0 +1,12 @@
+namespace EnvelopeGenerator.Application.Common.Configurations;
+
+/// <summary>
+/// 
+/// </summary>
+public class GdPictureParams
+{
+    /// <summary>
+    /// 
+    /// </summary>
+    public string License { get; set; } = null!;
+}

EnvelopeGenerator.Application/Common/Configurations/PDFBurnerParams.cs

@@ -0,0 +1,78 @@
+using EnvelopeGenerator.Application.Common.Interfaces.Model;
+using System.Diagnostics.CodeAnalysis;
+using System.Drawing;
+
+namespace EnvelopeGenerator.Application.Common.Configurations;
+
+/// <summary>
+/// 
+/// </summary>
+public class PDFBurnerParams : ITextStyle
+{
+    /// <summary>
+    /// 
+    /// </summary>
+    public int ConcurrencyLimit { get; set; } = 5;
+
+    /// <summary>
+    /// 
+    /// </summary>
+    public IEnumerable<string> IgnoredLabels { get; set; } = new List<string>
+    {
+        "Date", "Datum", "ZIP", "PLZ", "Place", "Ort", "Position", "Stellung"
+    };
+
+    /// <summary>
+    /// 
+    /// </summary>
+
+    public double TopMargin { get; set; } = 0.1;
+
+
+    /// <summary>
+    /// 
+    /// </summary>
+    public double YOffset { get; set; } = -0.3;
+
+
+    /// <summary>
+    /// 
+    /// </summary>
+    public string FontName { get; set; } = "Arial";
+
+
+    /// <summary>
+    /// 
+    /// </summary>
+    public int FontSize { get; set; } = 8;
+
+    /// <summary>
+    /// 
+    /// </summary>
+    [SuppressMessage("Interoperability", "CA1416:Validate platform compatibility", Justification = "<Pending>")]
+    public FontStyle FontStyle { get; set; } = FontStyle.Italic;
+
+    /// <summary>
+    /// 
+    /// </summary>
+    public Dictionary<string, int> IndexOfAnnot { get; init; } = new()
+    {
+        { string.Empty, 0 },
+        { "seal", 0 },
+        { "position", 1 },
+        { "city", 2 },
+        { "date", 3 }
+    };
+
+    /// <summary>
+    /// 
+    /// </summary>
+    public int DefaultIndexOfAnnot { get; set; } = 0;
+
+    /// <summary>
+    /// 
+    /// </summary>
+    /// <param name="name"></param>
+    /// <returns></returns>
+    public int GetAnnotationIndex(string name) => IndexOfAnnot.TryGetValue(name, out var value) ? value : DefaultIndexOfAnnot;
+}

EnvelopeGenerator.Application/Common/Dto/AnnotationDto.cs

@@ -0,0 +1,73 @@
+namespace EnvelopeGenerator.Application.Common.Dto;
+
+/// <summary>
+/// 
+/// </summary>
+public record AnnotationCreateDto
+{
+    /// <summary>
+    /// 
+    /// </summary>
+    public int ElementId { get; init; }
+
+    /// <summary>
+    /// 
+    /// </summary>
+    public string Name { get; init; } = null!;
+
+    /// <summary>
+    /// 
+    /// </summary>
+    public string Value { get; init; } = null!;
+
+    /// <summary>
+    /// 
+    /// </summary>
+    public string Type { get; init; } = null!;
+
+    /// <summary>
+    /// 
+    /// </summary>
+    public double? X { get; init; }
+
+    /// <summary>
+    /// 
+    /// </summary>
+    public double? Y { get; init; }
+
+    /// <summary>
+    /// 
+    /// </summary>
+    public double? Width { get; init; }
+
+    /// <summary>
+    /// 
+    /// </summary>
+    public double? Height { get; init; }
+}
+
+/// <summary>
+/// 
+/// </summary>
+public record AnnotationDto : AnnotationCreateDto
+{
+    /// <summary>
+    /// 
+    /// </summary>
+    public long Id { get; init; }
+
+    /// <summary>
+    /// 
+    /// </summary>
+    public DateTime AddedWhen { get; init; }
+
+    /// <summary>
+    /// 
+    /// </summary>
+    public DateTime? ChangedWhen { get; init; }
+
+    /// <summary>
+    /// 
+    /// </summary>
+    public string? ChangedWho { get; init; }
+}

EnvelopeGenerator.Application/Common/Dto/MappingProfile.cs

@@ -35,6 +35,8 @@ public class MappingProfile : Profile
         CreateMap<EnvelopeType, EnvelopeTypeDto>();
         CreateMap<Domain.Entities.Receiver, ReceiverDto>();
         CreateMap<Domain.Entities.EnvelopeReceiverReadOnly, EnvelopeReceiverReadOnlyDto>();
+        CreateMap<ElementAnnotation, AnnotationDto>();
+        CreateMap<ThirdPartyModule, ThirdPartyModuleDto>();
 
         // DTO to Entity mappings
         CreateMap<ConfigDto, Config>();
@@ -50,6 +52,8 @@ public class MappingProfile : Profile
         CreateMap<ReceiverDto, Domain.Entities.Receiver>().ForMember(rcv => rcv.EnvelopeReceivers, rcvReadDto => rcvReadDto.Ignore());
         CreateMap<EnvelopeReceiverReadOnlyCreateDto, Domain.Entities.EnvelopeReceiverReadOnly>();
         CreateMap<EnvelopeReceiverReadOnlyUpdateDto, Domain.Entities.EnvelopeReceiverReadOnly>();
+        CreateMap<AnnotationCreateDto, ElementAnnotation>()
+            .ForMember(dest => dest.AddedWhen, opt => opt.MapFrom(_ => DateTime.UtcNow));
 
         // Messaging mappings
         // for GTX messaging

EnvelopeGenerator.Application/Common/Dto/PSPDFKitInstant/Annotation.cs

@@ -0,0 +1,122 @@
+using EnvelopeGenerator.Application.Exceptions;
+
+namespace EnvelopeGenerator.Application.Common.Dto.PSPDFKitInstant;
+
+/// <summary>
+/// 
+/// </summary>
+public class Annotation
+{
+    private string? _id;
+
+    /// <summary>
+    /// 
+    /// </summary>
+    public int EnvelopeId { get; private set; } = 0;
+
+    /// <summary>
+    /// 
+    /// </summary>
+    public int ReceiverId { get; private set; } = 0;
+
+    /// <summary>
+    /// 
+    /// </summary>
+    public int Index { get; private set; } = 0;
+
+    /// <summary>
+    /// 
+    /// </summary>
+    public string EgName { get; private set; } = string.Empty;
+
+    /// <summary>
+    /// 
+    /// </summary>
+    public bool HasStructuredID { get; private set; } = false;
+
+    /// <summary>
+    /// 
+    /// </summary>
+    public bool IsLabel
+    {
+        get
+        {
+            if (string.IsNullOrEmpty(EgName))
+                return false;
+
+            var parts = EgName.Split('_');
+            return parts.Length > 1 && parts[1] == "label";
+        }
+    }
+
+    /// <summary>
+    /// 
+    /// </summary>
+    public string? Id
+    {
+        get => _id;
+        set
+        {
+            _id = value;
+
+            if (string.IsNullOrWhiteSpace(value))
+                throw new BurnAnnotationException("The identifier of annotation is null or empty.");
+
+            var parts = value.Split('#');
+
+            if (parts.Length != 4)
+                return;
+            // throw new BurnAnnotationException($"The identifier of annotation has more or less than 4 sub-part. Id: {_id}");
+
+            if (!int.TryParse(parts[0], out int envelopeId))
+                throw new BurnAnnotationException($"The envelope ID of annotation is not integer. Id: {_id}");
+            EnvelopeId = envelopeId;
+
+            if (!int.TryParse(parts[1], out int receiverId))
+                throw new BurnAnnotationException($"The receiver ID of annotation is not integer. Id: {_id}");
+            ReceiverId = receiverId;
+
+            if (!int.TryParse(parts[2], out int index))
+                throw new BurnAnnotationException($"The index of annotation is not integer. Id: {_id}");
+            Index = index;
+
+            EgName = parts[3];
+            HasStructuredID = true;
+        }
+    }
+
+    /// <summary>
+    /// 
+    /// </summary>
+    public List<double>? Bbox { get; set; }
+    
+    /// <summary>
+    /// 
+    /// </summary>
+    public string? Type { get; set; }
+
+    /// <summary>
+    /// 
+    /// </summary>
+    public bool IsSignature { get; set; }
+
+    /// <summary>
+    /// 
+    /// </summary>
+    public string? ImageAttachmentId { get; set; }
+
+    /// <summary>
+    /// 
+    /// </summary>
+    public Lines? Lines { get; set; }
+
+    /// <summary>
+    /// 
+    /// </summary>
+    public int PageIndex { get; set; }
+
+    /// <summary>
+    /// 
+    /// </summary>
+    public string? StrokeColor { get; set; }
+}

EnvelopeGenerator.Application/Common/Dto/PSPDFKitInstant/Attachment.cs

@@ -0,0 +1,8 @@
+namespace EnvelopeGenerator.Application.Common.Dto.PSPDFKitInstant;
+
+/// <summary>
+/// 
+/// </summary>
+/// <param name="Binary"></param>
+/// <param name="ContentType"></param>
+public record Attachment(string Binary, string ContentType);

EnvelopeGenerator.Application/Common/Dto/PSPDFKitInstant/FormFieldValue.cs

@@ -0,0 +1,8 @@
+namespace EnvelopeGenerator.Application.Common.Dto.PSPDFKitInstant;
+
+/// <summary>
+/// 
+/// </summary>
+/// <param name="Name"></param>
+/// <param name="Value"></param>
+public record FormFieldValue(string Name, string? Value = null);

EnvelopeGenerator.Application/Common/Dto/PSPDFKitInstant/Ink.cs

@@ -0,0 +1,8 @@
+namespace EnvelopeGenerator.Application.Common.Dto.PSPDFKitInstant;
+
+/// <summary>
+/// 
+/// </summary>
+/// <param name="Lines"></param>
+/// <param name="StrokeColor"></param>
+public record Ink(Lines Lines, string? StrokeColor = null);

EnvelopeGenerator.Application/Common/Dto/PSPDFKitInstant/InstantData.cs

@@ -0,0 +1,50 @@
+namespace EnvelopeGenerator.Application.Common.Dto.PSPDFKitInstant;
+
+/// <summary>
+/// 
+/// </summary>
+public class InstantData
+{
+    /// <summary>
+    /// 
+    /// </summary>
+    public List<Annotation>? Annotations { get; set; }
+
+    /// <summary>
+    /// 
+    /// </summary>
+    public IEnumerable<List<Annotation>>? AnnotationsByReceiver
+    {
+        get
+        {
+            return Annotations?
+                .Where(a => a.HasStructuredID)
+                .GroupBy(a => a.ReceiverId)
+                .Select(g => g.ToList());
+        }
+    }
+
+    /// <summary>
+    /// 
+    /// </summary>
+    public IEnumerable<List<Annotation>>? UnstructuredAnnotations
+    {
+        get
+        {
+            return Annotations?
+                .Where(a => !a.HasStructuredID)
+                .GroupBy(a => a.ReceiverId)
+                .Select(g => g.ToList());
+        }
+    }
+
+    /// <summary>
+    /// 
+    /// </summary>
+    public Dictionary<string, Attachment>? Attachments { get; set; }
+
+    /// <summary>
+    /// 
+    /// </summary>
+    public List<FormFieldValue>? FormFieldValues { get; set; }
+}

EnvelopeGenerator.Application/Common/Dto/PSPDFKitInstant/Lines.cs

@@ -0,0 +1,7 @@
+namespace EnvelopeGenerator.Application.Common.Dto.PSPDFKitInstant;
+
+/// <summary>
+/// 
+/// </summary>
+/// <param name="Points"></param>
+public record Lines(List<List<List<float>>> Points);

EnvelopeGenerator.Application/Common/Dto/SignatureDto.cs

@@ -1,4 +1,5 @@
-using Microsoft.AspNetCore.Mvc;
+using EnvelopeGenerator.Domain.Interfaces;
+using Microsoft.AspNetCore.Mvc;
 
 namespace EnvelopeGenerator.Application.Common.Dto;
 
@@ -6,7 +7,7 @@ namespace EnvelopeGenerator.Application.Common.Dto;
 /// Data Transfer Object representing a positioned element assigned to a document receiver.
 /// </summary>
 [ApiExplorerSettings(IgnoreApi = true)]
-public class SignatureDto
+public class SignatureDto : ISignature
 {
     /// <summary>
     /// Gets or sets the unique identifier of the element.

EnvelopeGenerator.Application/Common/Dto/ThirdPartyModuleDto.cs

@@ -0,0 +1,57 @@
+namespace EnvelopeGenerator.Application.Common.Dto;
+
+/// <summary>
+/// 
+/// </summary>
+public record ThirdPartyModuleDto
+{
+    /// <summary>
+    /// 
+    /// </summary>
+    public int Id { get; init; }
+
+    /// <summary>
+    /// 
+    /// </summary>
+    public bool Active { get; init; }
+
+    /// <summary>
+    /// 
+    /// </summary>
+    public string Name { get; init; } = default!;
+
+    /// <summary>
+    /// 
+    /// </summary>
+    public string? Description { get; init; }
+
+    /// <summary>
+    /// 
+    /// </summary>
+    public string License { get; init; } = default!;
+
+    /// <summary>
+    /// 
+    /// </summary>
+    public string Version { get; init; } = default!;
+
+    /// <summary>
+    /// 
+    /// </summary>
+    public string? AddedWho { get; init; }
+
+    /// <summary>
+    /// 
+    /// </summary>
+    public DateTime? AddedWhen { get; init; }
+
+    /// <summary>
+    /// 
+    /// </summary>
+    public string? ChangedWho { get; init; }
+
+    /// <summary>
+    /// 
+    /// </summary>
+    public DateTime? ChangedWhen { get; init; }
+}

EnvelopeGenerator.Application/Common/Extensions/GdPictureExtensions.cs

@@ -0,0 +1,176 @@
+using EnvelopeGenerator.Application.Common.Dto.PSPDFKitInstant;
+using EnvelopeGenerator.Domain.Constants;
+using GdPicture14;
+using Microsoft.Extensions.Logging;
+using Newtonsoft.Json;
+using SixLabors.ImageSharp;
+using System.Drawing;
+using EnvelopeGenerator.Application.Common.Extensions;
+using EnvelopeGenerator.Application.Common.Interfaces.Model;
+using EnvelopeGenerator.Application.Common.Configurations;
+
+namespace EnvelopeGenerator.Application.Common.Extensions;
+
+/// <summary>
+/// 
+/// </summary>
+public static class GdPictureExtensions
+{
+    /// <summary>
+    /// 
+    /// </summary>
+    /// <param name="manager"></param>
+    /// <param name="x"></param>
+    /// <param name="y"></param>
+    /// <param name="width"></param>
+    /// <param name="height"></param>
+    /// <param name="page"></param>
+    /// <param name="value"></param>
+    /// <param name="textStyle"></param>
+    public static void AddFormFieldValue(this AnnotationManager manager, double x, double y, double width, double height, int page, string value, ITextStyle textStyle)
+    {
+        manager.SelectPage(page);
+
+        // Add the text annotation
+        var ant = manager.AddTextAnnot((float)x, (float)y, (float)width, (float)height, value);
+
+        // Set the font properties
+        ant.FontName = textStyle.FontName;
+        ant.FontSize = textStyle.FontSize;
+        ant.FontStyle = textStyle.FontStyle;
+
+        manager.SaveAnnotationsToPage();
+    }
+
+    /// <summary>
+    /// 
+    /// </summary>
+    /// <param name="manager"></param>
+    /// <param name="pAnnotation"></param>
+    /// <param name="formFieldValue"></param>
+    /// <param name="options"></param>
+    public static void AddFormFieldValue(this AnnotationManager manager, Annotation pAnnotation, FormFieldValue formFieldValue, PDFBurnerParams options)
+    {
+        var ffIndex = options.GetAnnotationIndex(pAnnotation.EgName);
+
+        // Convert pixels to Inches
+        var oBounds = pAnnotation.Bbox?.Select(points => points.ToInches()).ToList();
+
+        if (oBounds is null || oBounds.Count < 4)
+            return;
+
+        double oX = oBounds[0];
+        double oY = oBounds[1] + options.YOffset * ffIndex + options.TopMargin;
+        double oWidth = oBounds[2];
+        double oHeight = oBounds[3];
+
+        manager.SelectPage(pAnnotation.PageIndex + 1);
+
+        // Add the text annotation
+        var ant = manager.AddTextAnnot((float)oX, (float)oY, (float)oWidth, (float)oHeight, formFieldValue.Value);
+
+        // Set the font properties
+        ant.FontName = options.FontName;
+        ant.FontSize = options.FontSize;
+        ant.FontStyle = options.FontStyle;
+
+        manager.SaveAnnotationsToPage();
+    }
+
+    /// <summary>
+    /// 
+    /// </summary>
+    /// <param name="manager"></param>
+    /// <param name="x"></param>
+    /// <param name="y"></param>
+    /// <param name="width"></param>
+    /// <param name="height"></param>
+    /// <param name="page"></param>
+    /// <param name="base64"></param>
+    public static void AddImageAnnotation(this AnnotationManager manager, double x, double y, double width, double height, int page, string base64)
+    {
+        manager.SelectPage(page);
+        manager.AddEmbeddedImageAnnotFromBase64(base64, (float)x, (float)y, (float)width, (float)height);
+    }
+
+    /// <summary>
+    /// 
+    /// </summary>
+    /// <param name="manager"></param>
+    /// <param name="pAnnotation"></param>
+    /// <param name="pAttachments"></param>
+    public static void AddImageAnnotation(this AnnotationManager manager, Annotation pAnnotation, Dictionary<string, Attachment> pAttachments)
+    {
+        var oAttachment = pAttachments
+            .Where(a => a.Key == pAnnotation.ImageAttachmentId)
+            .SingleOrDefault();
+
+        if (oAttachment.Value == null)
+            return;
+
+        // Convert pixels to Inches
+        var oBounds = pAnnotation.Bbox?.Select(post => post.ToInches()).ToList();
+
+        if (oBounds is null || oBounds.Count < 4)
+            return;
+
+        var oX = oBounds[0];
+        var oY = oBounds[1];
+        var oWidth = oBounds[2];
+        var oHeight = oBounds[3];
+
+        manager.SelectPage(pAnnotation.PageIndex + 1);
+        manager.AddEmbeddedImageAnnotFromBase64(oAttachment.Value.Binary, (float)oX, (float)oY, (float)oWidth, (float)oHeight);
+    }
+
+    /// <summary>
+    /// 
+    /// </summary>
+    /// <param name="manager"></param>
+    /// <param name="page"></param>
+    /// <param name="value"></param>
+    public static void AddInkAnnotation(this AnnotationManager manager, int page, string value)
+    {
+        var ink = JsonConvert.DeserializeObject<Ink>(value);
+
+        var oSegments = ink?.Lines.Points;
+        var oColor = ColorTranslator.FromHtml(ink?.StrokeColor ?? "#000000");
+        manager.SelectPage(page);
+
+        if (oSegments is null)
+            return;
+
+        foreach (var oSegment in oSegments)
+        {
+            var oPoints = oSegment
+                .Select(points => points.ToPointF())
+                .ToArray();
+
+            manager.AddFreeHandAnnot(oColor, oPoints);
+        }
+    }
+
+    /// <summary>
+    /// 
+    /// </summary>
+    /// <param name="manager"></param>
+    /// <param name="pAnnotation"></param>
+    public static void AddInkAnnotation(this AnnotationManager manager, Annotation pAnnotation)
+    {
+        var oSegments = pAnnotation.Lines?.Points;
+        var oColor = ColorTranslator.FromHtml(pAnnotation.StrokeColor ?? "#000000");
+        manager.SelectPage(pAnnotation.PageIndex + 1);
+
+        if (oSegments is null)
+            return;
+
+        foreach (var oSegment in oSegments)
+        {
+            var oPoints = oSegment
+                .Select(points => points.ToPointF())
+                .ToArray();
+
+            manager.AddFreeHandAnnot(oColor, oPoints);
+        }
+    }
+}

EnvelopeGenerator.Application/Common/Extensions/JsonExtensions.cs

@@ -0,0 +1,18 @@
+using System.Text.Json;
+
+namespace EnvelopeGenerator.Application.Common.Extensions;
+
+/// <summary>
+/// 
+/// </summary>
+public static class JsonExtensions
+{
+    /// <summary>
+    /// 
+    /// </summary>
+    /// <param name="obj"></param>
+    /// <param name="options"></param>
+    /// <returns></returns>
+    public static string ToJson(this object obj, JsonSerializerOptions? options = null)
+        => JsonSerializer.Serialize(obj, options);
+}

EnvelopeGenerator.Application/Common/Extensions/MathematExtensions.cs

@@ -0,0 +1,40 @@
+using System.Drawing;
+
+namespace EnvelopeGenerator.Application.Common.Extensions;
+
+/// <summary>
+/// 
+/// </summary>
+public static class MathematExtensions
+{
+    /// <summary>
+    /// 
+    /// </summary>
+    /// <param name="points"></param>
+    /// <returns></returns>
+    public static PointF ToPointF(this List<float> points)
+    {
+        var pointsInch = points.Select(ToInches).ToList();
+        return new PointF(pointsInch[0], pointsInch[1]);
+    }
+
+    /// <summary>
+    /// 
+    /// </summary>
+    /// <param name="value"></param>
+    /// <returns></returns>
+    public static double ToInches(this double value)
+    {
+        return value / 72.0;
+    }
+
+    /// <summary>
+    /// 
+    /// </summary>
+    /// <param name="value"></param>
+    /// <returns></returns>
+    public static float ToInches(this float value)
+    {
+        return value / 72f;
+    }
+}

EnvelopeGenerator.Application/Common/Extensions/StringExtension.cs

@@ -1,14 +1,30 @@
 using OtpNet;
 
-namespace EnvelopeGenerator.Application.Common.Extensions
+namespace EnvelopeGenerator.Application.Common.Extensions;
+
+/// <summary>
+/// 
+/// </summary>
+public static class StringExtension
 {
-    public static class StringExtension
+    /// <summary>
+    /// 
+    /// </summary>
+    /// <param name="totp"></param>
+    /// <param name="secret"></param>
+    /// <returns></returns>
+    public static bool IsValidTotp(this string totp, string secret)
     {
-        public static bool IsValidTotp(this string totp, string secret)
-        {
-            var secret_bytes = Base32Encoding.ToBytes(secret);
-            var secret_totp = new Totp(secret_bytes);
-            return secret_totp.VerifyTotp(totp, out _, VerificationWindow.RfcSpecifiedNetworkDelay);
-        }
+        var secret_bytes = Base32Encoding.ToBytes(secret);
+        var secret_totp = new Totp(secret_bytes);
+        return secret_totp.VerifyTotp(totp, out _, VerificationWindow.RfcSpecifiedNetworkDelay);
     }
+
+    /// <summary>
+    /// 
+    /// </summary>
+    /// <param name="seperator"></param>
+    /// <param name="values"></param>
+    /// <returns></returns>
+    public static string Join(this IEnumerable<string> values, string seperator) => string.Join(seperator, values);
 }

EnvelopeGenerator.Application/Common/Interfaces/Model/ITextStyle.cs

@@ -0,0 +1,27 @@
+using System.Diagnostics.CodeAnalysis;
+using System.Drawing;
+
+namespace EnvelopeGenerator.Application.Common.Interfaces.Model;
+
+/// <summary>
+/// 
+/// </summary>
+public interface ITextStyle
+{
+    /// <summary>
+    /// 
+    /// </summary>
+    public string FontName { get; set; }
+
+
+    /// <summary>
+    /// 
+    /// </summary>
+    public int FontSize { get; set; }
+
+    /// <summary>
+    /// 
+    /// </summary>
+    [SuppressMessage("Interoperability", "CA1416:Validate platform compatibility", Justification = "<Pending>")]
+    public FontStyle FontStyle { get; set; }
+}

EnvelopeGenerator.Application/Common/Interfaces/Repositories/IConfigRepository.cs

@@ -1,7 +1,7 @@
 using DigitalData.Core.Abstraction.Application.Repository;
 using EnvelopeGenerator.Domain.Entities;
 
-namespace EnvelopeGenerator.Application.Interfaces.Repositories;
+namespace EnvelopeGenerator.Application.Common.Interfaces.Repositories;
 
 /// <summary>
 /// 

EnvelopeGenerator.Application/Common/Interfaces/Repositories/IDocumentReceiverElementRepository.cs

@@ -1,7 +1,7 @@
 using DigitalData.Core.Abstraction.Application.Repository;
 using EnvelopeGenerator.Domain.Entities;
 
-namespace EnvelopeGenerator.Application.Interfaces.Repositories;
+namespace EnvelopeGenerator.Application.Common.Interfaces.Repositories;
 /// <summary>
 /// 
 /// </summary>

EnvelopeGenerator.Application/Common/Interfaces/Repositories/IDocumentStatusRepository.cs

@@ -1,7 +1,7 @@
 using DigitalData.Core.Abstraction.Application.Repository;
 using EnvelopeGenerator.Domain.Entities;
 
-namespace EnvelopeGenerator.Application.Interfaces.Repositories;
+namespace EnvelopeGenerator.Application.Common.Interfaces.Repositories;
 
 /// <summary>
 /// 

EnvelopeGenerator.Application/Common/Interfaces/Repositories/IEmailTemplateRepository.cs

@@ -2,7 +2,7 @@
 using EnvelopeGenerator.Domain.Constants;
 using EnvelopeGenerator.Domain.Entities;
 
-namespace EnvelopeGenerator.Application.Interfaces.Repositories;
+namespace EnvelopeGenerator.Application.Common.Interfaces.Repositories;
 
 /// <summary>
 /// 

EnvelopeGenerator.Application/Common/Interfaces/Repositories/IEnvelopeDocumentRepository.cs

@@ -1,7 +1,7 @@
 using DigitalData.Core.Abstraction.Application.Repository;
 using EnvelopeGenerator.Domain.Entities;
 
-namespace EnvelopeGenerator.Application.Interfaces.Repositories;
+namespace EnvelopeGenerator.Application.Common.Interfaces.Repositories;
 
 /// <summary>
 /// 

EnvelopeGenerator.Application/Common/Interfaces/Repositories/IEnvelopeHistoryRepository.cs

@@ -2,7 +2,7 @@
 using EnvelopeGenerator.Domain.Constants;
 using EnvelopeGenerator.Domain.Entities;
 
-namespace EnvelopeGenerator.Application.Interfaces.Repositories;
+namespace EnvelopeGenerator.Application.Common.Interfaces.Repositories;
 
 /// <summary>
 /// 

EnvelopeGenerator.Application/Common/Interfaces/Repositories/IEnvelopeReceiverReadOnlyRepository.cs

@@ -1,7 +1,7 @@
 using DigitalData.Core.Abstraction.Application.Repository;
 using EnvelopeGenerator.Domain.Entities;
 
-namespace EnvelopeGenerator.Application.Interfaces.Repositories;
+namespace EnvelopeGenerator.Application.Common.Interfaces.Repositories;
 
 /// <summary>
 /// 

EnvelopeGenerator.Application/Common/Interfaces/Repositories/IEnvelopeReceiverRepository.cs

@@ -3,7 +3,7 @@ using EnvelopeGenerator.Application.Envelopes.Queries;
 using EnvelopeGenerator.Domain.Constants;
 using EnvelopeGenerator.Domain.Entities;
 
-namespace EnvelopeGenerator.Application.Interfaces.Repositories;
+namespace EnvelopeGenerator.Application.Common.Interfaces.Repositories;
 
 /// <summary>
 /// 

EnvelopeGenerator.Application/Common/Interfaces/Repositories/IEnvelopeRepository.cs

@@ -2,7 +2,7 @@
 using EnvelopeGenerator.Domain.Constants;
 using EnvelopeGenerator.Domain.Entities;
 
-namespace EnvelopeGenerator.Application.Interfaces.Repositories;
+namespace EnvelopeGenerator.Application.Common.Interfaces.Repositories;
 
 /// <summary>
 /// 

EnvelopeGenerator.Application/Common/Interfaces/Repositories/IEnvelopeTypeRepository.cs

@@ -1,7 +1,7 @@
 using DigitalData.Core.Abstraction.Application.Repository;
 using EnvelopeGenerator.Domain.Entities;
 
-namespace EnvelopeGenerator.Application.Interfaces.Repositories;
+namespace EnvelopeGenerator.Application.Common.Interfaces.Repositories;
 
 /// <summary>
 /// 

EnvelopeGenerator.Application/Common/Interfaces/Repositories/IReceiverRepository.cs

@@ -1,7 +1,7 @@
 using DigitalData.Core.Abstraction.Application.Repository;
 using EnvelopeGenerator.Domain.Entities;
 
-namespace EnvelopeGenerator.Application.Interfaces.Repositories;
+namespace EnvelopeGenerator.Application.Common.Interfaces.Repositories;
 
 /// <summary>
 /// 

EnvelopeGenerator.Application/Common/Interfaces/SQLExecutor/IDocumentExecutor.cs

@@ -1,6 +1,6 @@
 using EnvelopeGenerator.Domain.Entities;
 
-namespace EnvelopeGenerator.Application.Interfaces.SQLExecutor;
+namespace EnvelopeGenerator.Application.Common.Interfaces.SQLExecutor;
 
 /// <summary>
 /// 

EnvelopeGenerator.Application/Common/Interfaces/SQLExecutor/IEnvelopeExecutor.cs

@@ -1,7 +1,7 @@
 using Dapper;
 using EnvelopeGenerator.Domain.Entities;
 
-namespace EnvelopeGenerator.Application.Interfaces.SQLExecutor;
+namespace EnvelopeGenerator.Application.Common.Interfaces.SQLExecutor;
 
 /// <summary>
 /// 

EnvelopeGenerator.Application/Common/Interfaces/SQLExecutor/IEnvelopeReceiverExecutor.cs

@@ -1,6 +1,6 @@
 using EnvelopeGenerator.Domain.Entities;
 
-namespace EnvelopeGenerator.Application.Interfaces.SQLExecutor;
+namespace EnvelopeGenerator.Application.Common.Interfaces.SQLExecutor;
 
 /// <summary>
 /// 

EnvelopeGenerator.Application/Common/Interfaces/SQLExecutor/IQuery.cs

@@ -1,4 +1,4 @@
-namespace EnvelopeGenerator.Application.Interfaces.SQLExecutor;
+namespace EnvelopeGenerator.Application.Common.Interfaces.SQLExecutor;
 
 /// <summary>
 /// Provides methods for executing common queries on a given entity type.

EnvelopeGenerator.Application/Common/Interfaces/SQLExecutor/ISQL.cs

@@ -1,4 +1,4 @@
-namespace EnvelopeGenerator.Application.Interfaces.SQLExecutor;
+namespace EnvelopeGenerator.Application.Common.Interfaces.SQLExecutor;
 
 /// <summary>
 /// Represents a raw SQL query contract.

EnvelopeGenerator.Application/Common/Interfaces/SQLExecutor/ISQLExecutor.cs

@@ -1,4 +1,4 @@
-namespace EnvelopeGenerator.Application.Interfaces.SQLExecutor;
+namespace EnvelopeGenerator.Application.Common.Interfaces.SQLExecutor;
 
 /// <summary>
 /// Defines methods for executing raw SQL queries or custom SQL query classes and returning query executors for further operations.

EnvelopeGenerator.Application/Common/Interfaces/SQLExecutor/ISQLExecutorBaseEntity.cs

@@ -1,6 +1,6 @@
 using Dapper;
 
-namespace EnvelopeGenerator.Application.Interfaces.SQLExecutor;
+namespace EnvelopeGenerator.Application.Common.Interfaces.SQLExecutor;
 
 /// <summary>
 /// 

EnvelopeGenerator.Application/Common/Interfaces/Services/IAuthenticator.cs

@@ -1,6 +1,6 @@
 using OtpNet;
 
-namespace EnvelopeGenerator.Application.Interfaces.Services;
+namespace EnvelopeGenerator.Application.Common.Interfaces.Services;
 
 /// <summary>
 /// 

EnvelopeGenerator.Application/Common/Interfaces/Services/IConfigService.cs

@@ -3,7 +3,7 @@ using DigitalData.Core.Abstraction.Application.DTO;
 using EnvelopeGenerator.Application.Common.Dto;
 using EnvelopeGenerator.Domain.Entities;
 
-namespace EnvelopeGenerator.Application.Interfaces.Services;
+namespace EnvelopeGenerator.Application.Common.Interfaces.Services;
 
 /// <summary>
 /// 

EnvelopeGenerator.Application/Common/Interfaces/Services/IDocumentReceiverElementService.cs

@@ -2,7 +2,7 @@
 using EnvelopeGenerator.Application.Common.Dto;
 using EnvelopeGenerator.Domain.Entities;
 
-namespace EnvelopeGenerator.Application.Interfaces.Services;
+namespace EnvelopeGenerator.Application.Common.Interfaces.Services;
 
 /// <summary>
 /// 

EnvelopeGenerator.Application/Common/Interfaces/Services/IDocumentStatusService.cs

@@ -1,7 +1,7 @@
 using DigitalData.Core.Abstraction.Application;
 using EnvelopeGenerator.Application.Common.Dto;
 using EnvelopeGenerator.Domain.Entities;
-namespace EnvelopeGenerator.Application.Interfaces.Services;
+namespace EnvelopeGenerator.Application.Common.Interfaces.Services;
 
 /// <summary>
 /// 

EnvelopeGenerator.Application/Common/Interfaces/Services/IEmailTemplateService.cs

@@ -4,7 +4,7 @@ using EnvelopeGenerator.Application.Common.Dto;
 using EnvelopeGenerator.Domain.Constants;
 using EnvelopeGenerator.Domain.Entities;
 
-namespace EnvelopeGenerator.Application.Interfaces.Services;
+namespace EnvelopeGenerator.Application.Common.Interfaces.Services;
 
 /// <summary>
 /// 

EnvelopeGenerator.Application/Common/Interfaces/Services/IEnvelopeDocumentService.cs

@@ -2,7 +2,7 @@
 using EnvelopeGenerator.Application.Common.Dto;
 using EnvelopeGenerator.Domain.Entities;
 
-namespace EnvelopeGenerator.Application.Interfaces.Services;
+namespace EnvelopeGenerator.Application.Common.Interfaces.Services;
 
 /// <summary>
 /// 

EnvelopeGenerator.Application/Common/Interfaces/Services/IEnvelopeHistoryService.cs

@@ -5,7 +5,7 @@ using EnvelopeGenerator.Application.Common.Dto.Receiver;
 using EnvelopeGenerator.Domain.Constants;
 using EnvelopeGenerator.Domain.Entities;
 
-namespace EnvelopeGenerator.Application.Interfaces.Services;
+namespace EnvelopeGenerator.Application.Common.Interfaces.Services;
 
 /// <summary>
 /// 

EnvelopeGenerator.Application/Common/Interfaces/Services/IEnvelopeMailService.cs

@@ -4,7 +4,7 @@ using EnvelopeGenerator.Application.Common.Dto.EnvelopeReceiver;
 using EnvelopeGenerator.Application.Common.Dto.EnvelopeReceiverReadOnly;
 using EnvelopeGenerator.Domain.Constants;
 
-namespace EnvelopeGenerator.Application.Interfaces.Services;
+namespace EnvelopeGenerator.Application.Common.Interfaces.Services;
 
 /// <summary>
 /// 

EnvelopeGenerator.Application/Common/Interfaces/Services/IEnvelopeReceiverReadOnlyService.cs

@@ -2,7 +2,7 @@
 using EnvelopeGenerator.Application.Common.Dto.EnvelopeReceiverReadOnly;
 using EnvelopeGenerator.Domain.Entities;
 
-namespace EnvelopeGenerator.Application.Interfaces.Services;
+namespace EnvelopeGenerator.Application.Common.Interfaces.Services;
 
 /// <summary>
 /// 

EnvelopeGenerator.Application/Common/Interfaces/Services/IEnvelopeReceiverService.cs

@@ -10,7 +10,7 @@ using EnvelopeGenerator.Domain;
 using EnvelopeGenerator.Domain.Constants;
 using EnvelopeGenerator.Domain.Entities;
 
-namespace EnvelopeGenerator.Application.Interfaces.Services;
+namespace EnvelopeGenerator.Application.Common.Interfaces.Services;
 
 /// <summary>
 /// 

EnvelopeGenerator.Application/Common/Interfaces/Services/IEnvelopeService.cs

@@ -4,7 +4,7 @@ using EnvelopeGenerator.Application.Common.Dto;
 using EnvelopeGenerator.Domain.Constants;
 using EnvelopeGenerator.Domain.Entities;
 
-namespace EnvelopeGenerator.Application.Interfaces.Services;
+namespace EnvelopeGenerator.Application.Common.Interfaces.Services;
 
 /// <summary>
 /// 

EnvelopeGenerator.Application/Common/Interfaces/Services/IEnvelopeSmsHandler.cs

@@ -1,7 +1,7 @@
 using EnvelopeGenerator.Application.Common.Dto.EnvelopeReceiver;
 using EnvelopeGenerator.Application.Common.Dto.Messaging;
 
-namespace EnvelopeGenerator.Application.Interfaces.Services;
+namespace EnvelopeGenerator.Application.Common.Interfaces.Services;
 
 /// <summary>
 /// 

EnvelopeGenerator.Application/Common/Interfaces/Services/IEnvelopeTypeService.cs

@@ -2,7 +2,7 @@
 using EnvelopeGenerator.Application.Common.Dto;
 using EnvelopeGenerator.Domain.Entities;
 
-namespace EnvelopeGenerator.Application.Interfaces.Services;
+namespace EnvelopeGenerator.Application.Common.Interfaces.Services;
 
 /// <summary>
 /// 

EnvelopeGenerator.Application/Common/Interfaces/Services/IReceiverService.cs

@@ -4,7 +4,7 @@ using EnvelopeGenerator.Application.Common.Dto.Receiver;
 using EnvelopeGenerator.Application.Receivers.Commands;
 using EnvelopeGenerator.Domain.Entities;
 
-namespace EnvelopeGenerator.Application.Interfaces.Services;
+namespace EnvelopeGenerator.Application.Common.Interfaces.Services;
 
 /// <summary>
 /// 

EnvelopeGenerator.Application/Common/Interfaces/Services/ISmsSender.cs

@@ -1,6 +1,6 @@
 using EnvelopeGenerator.Application.Common.Dto.Messaging;
 
-namespace EnvelopeGenerator.Application.Interfaces.Services;
+namespace EnvelopeGenerator.Application.Common.Interfaces.Services;
 
 //TODO: move to DigitalData.Core
 /// <summary>

EnvelopeGenerator.Application/Common/Notifications/DocSigned/DocSignedNotification.cs

@@ -1,11 +1,20 @@
-using EnvelopeGenerator.Application.Common.Dto.EnvelopeReceiver;
+using EnvelopeGenerator.Application.Common.Dto;
+using EnvelopeGenerator.Application.Common.Dto.EnvelopeReceiver;
+using EnvelopeGenerator.Application.Common.Extensions;
+using EnvelopeGenerator.Application.Common.Notifications.RemoveSignature;
 using EnvelopeGenerator.Domain.Constants;
 using MediatR;
-using Newtonsoft.Json;
 using System.Dynamic;
 
 namespace EnvelopeGenerator.Application.Common.Notifications.DocSigned;
 
+/// <summary>
+/// 
+/// </summary>
+/// <param name="Instant"></param>
+/// <param name="Structured"></param>
+public record PsPdfKitAnnotation(ExpandoObject Instant, IEnumerable<AnnotationCreateDto> Structured);
+
 /// <summary>
 /// 
 /// </summary>
@@ -15,7 +24,7 @@ public record DocSignedNotification(EnvelopeReceiverDto Original) : EnvelopeRece
     /// <summary>
     /// 
     /// </summary>
-    public required ExpandoObject Annotations { get; init; }
+    public PsPdfKitAnnotation PsPdfKitAnnotation { get; init; } = null!;
 
     /// <summary>
     /// 
@@ -27,7 +36,7 @@ public record DocSignedNotification(EnvelopeReceiverDto Original) : EnvelopeRece
     /// </summary>
     public string EmailAddress => Receiver?.EmailAddress
         ?? throw new InvalidOperationException($"Receiver is null." +
-            $"DocSignedNotification:\n{JsonConvert.SerializeObject(this, Format.Json.ForDiagnostics)}");
+            $"DocSignedNotification:\n{this.ToJson(Format.Json.ForDiagnostics)}");
 }
 
 /// <summary>
@@ -39,17 +48,41 @@ public static class DocSignedNotificationExtensions
     /// Converts an <see cref="EnvelopeReceiverDto"/> to a <see cref="DocSignedNotification"/>.
     /// </summary>
     /// <param name="dto">The DTO to convert.</param>
-    /// <param name="annotations"></param>
+    /// <param name="psPdfKitAnnotation"></param>
     /// <returns>A new <see cref="DocSignedNotification"/> instance.</returns>
-    public static DocSignedNotification ToDocSignedNotification(this EnvelopeReceiverDto dto, ExpandoObject annotations)
-        => new(dto) { Annotations = annotations };
+    public static DocSignedNotification ToDocSignedNotification(this EnvelopeReceiverDto dto, PsPdfKitAnnotation psPdfKitAnnotation)
+        => new(dto) { PsPdfKitAnnotation = psPdfKitAnnotation };
 
     /// <summary>
-    /// Asynchronously converts a <see cref="Task{EnvelopeReceiverDto}"/> to a <see cref="DocSignedNotification"/>.
+    /// 
     /// </summary>
-    /// <param name="dtoTask">The task that returns the DTO to convert.</param>
-    /// <param name="annotations"></param>
-    /// <returns>A task that represents the asynchronous conversion operation.</returns>
-    public static async Task<DocSignedNotification?> ToDocSignedNotification(this Task<EnvelopeReceiverDto?> dtoTask, ExpandoObject annotations)
-        => await dtoTask is EnvelopeReceiverDto dto ? new(dto) { Annotations = annotations } : null;
+    /// <param name="dtoTask"></param>
+    /// <param name="psPdfKitAnnotation"></param>
+    /// <returns></returns>
+    public static async Task<DocSignedNotification?> ToDocSignedNotification(this Task<EnvelopeReceiverDto?> dtoTask, PsPdfKitAnnotation psPdfKitAnnotation)
+        => await dtoTask is EnvelopeReceiverDto dto ? new(dto) { PsPdfKitAnnotation = psPdfKitAnnotation } : null;
+
+    /// <summary>
+    /// 
+    /// </summary>
+    /// <param name="publisher"></param>
+    /// <param name="notification"></param>
+    /// <param name="cancel"></param>
+    /// <returns></returns>
+    public static async Task PublishSafely(this IPublisher publisher, DocSignedNotification notification, CancellationToken cancel = default)
+    {
+        try
+        {
+            await publisher.Publish(notification, cancel);
+        }
+        catch (Exception)
+        {
+            await publisher.Publish(new RemoveSignatureNotification()
+            {
+                EnvelopeId = notification.EnvelopeId,
+                ReceiverId = notification.ReceiverId
+            }, cancel);
+            throw;
+        }
+    }
 }

EnvelopeGenerator.Application/Common/Notifications/DocSigned/Handlers/AnnotationHandler.cs

@@ -1,8 +1,6 @@
-using EnvelopeGenerator.Application.Common.Notifications.DocSigned;
-using EnvelopeGenerator.Application.DocStatus.Commands;
-using EnvelopeGenerator.Domain.Constants;
+using DigitalData.Core.Abstraction.Application.Repository;
+using EnvelopeGenerator.Domain.Entities;
 using MediatR;
-using Newtonsoft.Json;
 
 namespace EnvelopeGenerator.Application.Common.Notifications.DocSigned.Handlers;
 
@@ -11,15 +9,18 @@ namespace EnvelopeGenerator.Application.Common.Notifications.DocSigned.Handlers;
 /// </summary>
 public class AnnotationHandler : INotificationHandler<DocSignedNotification>
 {
-    private readonly ISender _sender;
+    /// <summary>
+    /// 
+    /// </summary>
+    private readonly IRepository<ElementAnnotation> _repo;
 
     /// <summary>
     /// 
     /// </summary>
-    /// <param name="sender"></param>
-    public AnnotationHandler(ISender sender)
+    /// <param name="repository"></param>
+    public AnnotationHandler(IRepository<ElementAnnotation> repository)
     {
-        _sender = sender;
+        _repo = repository;
     }
 
     /// <summary>
@@ -28,13 +29,6 @@ public class AnnotationHandler : INotificationHandler<DocSignedNotification>
     /// <param name="notification"></param>
     /// <param name="cancel"></param>
     /// <returns></returns>
-    public async Task Handle(DocSignedNotification notification, CancellationToken cancel)
-    {
-        await _sender.Send(new SaveDocStatusCommand()
-        {
-            Envelope = new() { Id = notification.EnvelopeId },
-            Receiver = new() { Id = notification.ReceiverId},
-            Value = JsonConvert.SerializeObject(notification.Annotations, Format.Json.ForAnnotations)
-        }, cancel);
-    }
+    public Task Handle(DocSignedNotification notification, CancellationToken cancel)
+        => _repo.CreateAsync(notification.PsPdfKitAnnotation.Structured, cancel);
 }

EnvelopeGenerator.Application/Common/Notifications/DocSigned/Handlers/DocStatusHandler.cs

@@ -0,0 +1,39 @@
+using EnvelopeGenerator.Application.DocStatus.Commands;
+using EnvelopeGenerator.Domain.Constants;
+using MediatR;
+using System.Text.Json;
+
+namespace EnvelopeGenerator.Application.Common.Notifications.DocSigned.Handlers;
+
+/// <summary>
+/// 
+/// </summary>
+public class DocStatusHandler : INotificationHandler<DocSignedNotification>
+{
+    private readonly ISender _sender;
+
+    /// <summary>
+    /// 
+    /// </summary>
+    /// <param name="sender"></param>
+    public DocStatusHandler(ISender sender)
+    {
+        _sender = sender;
+    }
+
+    /// <summary>
+    /// 
+    /// </summary>
+    /// <param name="notification"></param>
+    /// <param name="cancel"></param>
+    /// <returns></returns>
+    public async Task Handle(DocSignedNotification notification, CancellationToken cancel)
+    {
+        await _sender.Send(new SaveDocStatusCommand()
+        {
+            Envelope = new() { Id = notification.EnvelopeId },
+            Receiver = new() { Id = notification.ReceiverId},
+            Value = JsonSerializer.Serialize(notification.PsPdfKitAnnotation.Instant, Format.Json.ForAnnotations)
+        }, cancel);
+    }
+}

EnvelopeGenerator.Application/Common/Notifications/DocSigned/Handlers/HistoryHandler.cs

@@ -1,8 +1,7 @@
-using EnvelopeGenerator.Application.Common.Notifications.DocSigned;
+using EnvelopeGenerator.Application.Common.Extensions;
 using EnvelopeGenerator.Application.Histories.Commands;
 using EnvelopeGenerator.Domain.Constants;
 using MediatR;
-using Newtonsoft.Json;
 
 namespace EnvelopeGenerator.Application.Common.Notifications.DocSigned.Handlers;
 
@@ -30,16 +29,14 @@ public class HistoryHandler : INotificationHandler<DocSignedNotification>
     /// <returns></returns>
     public async Task Handle(DocSignedNotification notification, CancellationToken cancel)
     {
-        if(notification.Receiver is null)
-            if (notification.Receiver is null)
-                throw new InvalidOperationException($"Receiver information is missing in the notification. DocSignedNotification:\n {JsonConvert.SerializeObject(notification, Format.Json.ForDiagnostics)}");
+        if (notification.Receiver is null)
+            throw new InvalidOperationException($"Receiver information is missing in the notification. DocSignedNotification:\n {notification.ToJson(Format.Json.ForDiagnostics)}");
 
         await _sender.Send(new CreateHistoryCommand()
         {
             EnvelopeId = notification.EnvelopeId,
             UserReference = notification.Receiver.EmailAddress,
             Status = EnvelopeStatus.DocumentSigned,
-            Comment = JsonConvert.SerializeObject(notification.Annotations, Format.Json.ForAnnotations)
         }, cancel);
     }
 }

EnvelopeGenerator.Application/Common/Notifications/RemoveSignature/Handlers/RemoveAnnotationHandler.cs

@@ -0,0 +1,53 @@
+using DigitalData.Core.Abstraction.Application.Repository;
+using EnvelopeGenerator.Domain.Entities;
+using MediatR;
+
+namespace EnvelopeGenerator.Application.Common.Notifications.RemoveSignature.Handlers;
+
+/// <summary>
+/// 
+/// </summary>
+public class RemoveAnnotationHandler : INotificationHandler<RemoveSignatureNotification>
+{
+    private readonly IRepository<ElementAnnotation> _repo;
+
+    /// <summary>
+    /// 
+    /// </summary>
+    /// <param name="repository"></param>
+    public RemoveAnnotationHandler(IRepository<ElementAnnotation> repository)
+    {
+        _repo = repository;
+    }
+
+    /// <summary>
+    /// 
+    /// </summary>
+    /// <param name="notification"></param>
+    /// <param name="cancel"></param>
+    /// <returns></returns>
+    public Task Handle(RemoveSignatureNotification notification, CancellationToken cancel)
+    {
+        notification.ThrowIfHasNoFilter();
+        return _repo.DeleteAsync(annots =>
+        {
+            // envelope ID filter
+            if (notification.EnvelopeId is int envelopeId)
+                annots = annots.Where(annot => annot.Element!.Document.EnvelopeId == envelopeId);
+
+            // envelope UUID filter
+            if (notification.EnvelopeUuid is string envelopeUuid)
+                annots = annots.Where(annot => annot.Element!.Document.Envelope!.Uuid == envelopeUuid);
+
+            // receiver ID
+            if (notification.ReceiverId is int receiverId)
+                annots = annots.Where(annot => annot.Element!.ReceiverId == receiverId);
+
+            // receiver signature
+            if (notification.ReceiverSignature is string receiverSignature)
+                annots = annots.Where(annot => annot.Element!.Receiver!.Signature == receiverSignature);
+
+            return annots;
+        }, cancel);
+    }
+}

EnvelopeGenerator.Application/Common/Notifications/RemoveSignature/Handlers/RemoveDocResult.cs

@@ -0,0 +1,47 @@
+using DigitalData.Core.Abstraction.Application.Repository;
+using EnvelopeGenerator.Domain.Entities;
+using MediatR;
+
+namespace EnvelopeGenerator.Application.Common.Notifications.RemoveSignature.Handlers;
+
+/// <summary>
+/// 
+/// </summary>
+public class RemoveDocResult : INotificationHandler<RemoveSignatureNotification>
+{
+    private readonly IRepository<Envelope> _repo;
+
+    /// <summary>
+    /// 
+    /// </summary>
+    /// <param name="repository"></param>
+    public RemoveDocResult(IRepository<Envelope> repository)
+    {
+        _repo = repository;
+    }
+
+    /// <summary>
+    /// 
+    /// </summary>
+    /// <param name="notification"></param>
+    /// <param name="cancel"></param>
+    /// <returns></returns>
+    public Task Handle(RemoveSignatureNotification notification, CancellationToken cancel)
+    {
+        if(notification.EnvelopeId is null && notification.EnvelopeUuid is null)
+            return Task.CompletedTask;
+
+        return _repo.UpdateAsync(
+            envelope => envelope.DocResult = null,
+            query => {
+                if (notification.EnvelopeId is int envelopeId)
+                    query = query.Where(envelope => envelope.Id == envelopeId);
+
+                if (notification.EnvelopeUuid is string uuid)
+                    query = query.Where(envelope => envelope.Uuid == uuid);
+
+                return query;
+            }, cancel);
+
+    }
+}

EnvelopeGenerator.Application/Common/Notifications/RemoveSignature/Handlers/RemoveDocStatusHandler.cs

@@ -0,0 +1,53 @@
+using AngleSharp.Html;
+using DigitalData.Core.Abstraction.Application.Repository;
+using MediatR;
+
+namespace EnvelopeGenerator.Application.Common.Notifications.RemoveSignature.Handlers;
+
+/// <summary>
+/// 
+/// </summary>
+public class RemoveDocStatusHandler : INotificationHandler<RemoveSignatureNotification>
+{
+    private readonly IRepository<Domain.Entities.DocumentStatus> _repo;
+
+    /// <summary>
+    /// 
+    /// </summary>
+    /// <param name="repository"></param>
+    public RemoveDocStatusHandler(IRepository<Domain.Entities.DocumentStatus> repository)
+    {
+        _repo = repository;
+    }
+
+    /// <summary>
+    /// 
+    /// </summary>
+    /// <param name="notification"></param>
+    /// <param name="cancel"></param>
+    /// <returns></returns>
+    public Task Handle(RemoveSignatureNotification notification, CancellationToken cancel)
+    {
+        notification.ThrowIfHasNoFilter();
+        return _repo.DeleteAsync(statuses =>
+        {
+            // envelope ID filter
+            if (notification.EnvelopeId is int envelopeId)
+                statuses = statuses.Where(status => status.EnvelopeId == envelopeId);
+
+            // envelope UUID filter
+            if (notification.EnvelopeUuid is string envelopeUuid)
+                statuses = statuses.Where(status => status.Envelope!.Uuid == envelopeUuid);
+
+            // receiver Id filter
+            if (notification.ReceiverId is int receiverId)
+                statuses = statuses.Where(status => status.ReceiverId == receiverId);
+
+            // receiver signature filter
+            if (notification.ReceiverSignature is string receiverSignature)
+                statuses = statuses.Where(status => status.Receiver!.Signature == receiverSignature);
+
+            return statuses;
+        }, cancel);
+    }
+}

EnvelopeGenerator.Application/Common/Notifications/RemoveSignature/Handlers/RemoveHistoryHandler.cs

@@ -0,0 +1,56 @@
+using DigitalData.Core.Abstraction.Application.Repository;
+using EnvelopeGenerator.Application.Common.Extensions;
+using EnvelopeGenerator.Domain.Constants;
+using MediatR;
+
+namespace EnvelopeGenerator.Application.Common.Notifications.RemoveSignature.Handlers;
+
+/// <summary>
+/// 
+/// </summary>
+public class RemoveHistoryHandler : INotificationHandler<RemoveSignatureNotification>
+{
+    private readonly IRepository<Domain.Entities.History> _repo;
+
+    /// <summary>
+    /// 
+    /// </summary>
+    /// <param name="repository"></param>
+    public RemoveHistoryHandler(IRepository<Domain.Entities.History> repository)
+    {
+        _repo = repository;
+    }
+
+    /// <summary>
+    /// 
+    /// </summary>
+    /// <param name="notification"></param>
+    /// <param name="cancel"></param>
+    /// <returns></returns>
+    public Task Handle(RemoveSignatureNotification notification, CancellationToken cancel)
+    {
+        notification.ThrowIfHasNoFilter();
+        return _repo.DeleteAsync(hists =>
+        {
+            hists = hists.Where(hist => hist.Status == EnvelopeStatus.DocumentSigned);
+
+            // envelope ID filter
+            if (notification.EnvelopeId is int envelopeId)
+                hists = hists.Where(hist => hist.EnvelopeId == envelopeId);
+
+            // envelope UUID filter
+            if (notification.EnvelopeUuid is string envelopeUuid)
+                hists = hists.Where(hist => hist.Envelope!.Uuid == envelopeUuid);
+
+            // receiver ID filter
+            if (notification.ReceiverId is int receiverId)
+                hists = hists.Where(hist => hist.Receiver!.Id == receiverId);
+
+            // receiver signature filter
+            if (notification.ReceiverSignature is string receiverSignature)
+                hists = hists.Where(hist => hist.Receiver!.Signature == receiverSignature);
+
+            return hists;
+        }, cancel);
+    }
+}

EnvelopeGenerator.Application/Common/Notifications/RemoveSignature/RemoveSignatureNotification.cs

@@ -0,0 +1,37 @@
+using MediatR;
+
+namespace EnvelopeGenerator.Application.Common.Notifications.RemoveSignature;
+
+/// <summary>
+/// 
+/// </summary>
+/// <param name="EnvelopeId"></param>
+/// <param name="ReceiverId"></param>
+/// <param name="EnvelopeUuid"></param>
+/// <param name="ReceiverSignature"></param>
+public record RemoveSignatureNotification(
+    int? EnvelopeId = null,
+    int? ReceiverId = null,
+    string? EnvelopeUuid = null,
+    string? ReceiverSignature = null
+    ) : INotification
+{
+    /// <summary>
+    /// 
+    /// </summary>
+    public bool HasFilter => 
+        EnvelopeId is not null 
+        || ReceiverId is not null 
+        || EnvelopeUuid is not null 
+        || ReceiverSignature is not null;
+
+    /// <summary>
+    /// 
+    /// </summary>
+    /// <exception cref="InvalidOperationException"></exception>
+    public void ThrowIfHasNoFilter()
+    {
+        if (!HasFilter)
+            throw new InvalidOperationException("At least one filter parameter must be provided.");
+    }
+}

EnvelopeGenerator.Application/Common/Notifications/SendMailHandler.cs

@@ -1,6 +1,7 @@
 using DigitalData.Core.Abstraction.Application.Repository;
 using DigitalData.EmailProfilerDispatcher.Abstraction.Entities;
 using EnvelopeGenerator.Application.Common.Configurations;
+using EnvelopeGenerator.Application.Common.Extensions;
 using EnvelopeGenerator.Domain.Constants;
 using EnvelopeGenerator.Domain.Entities;
 using MediatR;
@@ -98,10 +99,10 @@ public abstract class SendMailHandler<TNotification> : INotificationHandler<TNot
         var placeHolders = CreatePlaceHolders(notification);
 
         var temp = await TempRepo
-            .ReadOnly()
-            .SingleOrDefaultAsync(x => x.Name == notification.TemplateType.ToString(), cancel)
+            .Where(x => x.Name == notification.TemplateType.ToString())
+            .SingleOrDefaultAsync(cancel)
                 ?? throw new InvalidOperationException($"Receiver information is missing in the notification." +
-                $"{typeof(TNotification)}:\n {JsonConvert.SerializeObject(notification, Format.Json.ForDiagnostics)}");
+                $"{typeof(TNotification)}:\n {notification.ToJson(Format.Json.ForDiagnostics)}");
 
         temp.Subject = ReplacePlaceHolders(temp.Subject, placeHolders, MailParams.Placeholders);
 
@@ -110,7 +111,7 @@ public abstract class SendMailHandler<TNotification> : INotificationHandler<TNot
         var emailOut = new EmailOut
         {
             EmailAddress = notification.EmailAddress,
-            EmailBody = TextToHtml(temp.Body),
+            EmailBody = temp.Body,
             EmailSubj = temp.Subject,
             AddedWhen = DateTime.UtcNow,
             AddedWho = DispatcherParams.AddedWho,
@@ -131,22 +132,4 @@ public abstract class SendMailHandler<TNotification> : INotificationHandler<TNot
                 text = text.Replace(ph.Key, ph.Value);
         return text;
     }
-
-    private static string TextToHtml(string input)
-    {
-        if (string.IsNullOrEmpty(input)) return "";
-
-        // HTML encoding special characters
-        string encoded = System.Net.WebUtility.HtmlEncode(input);
-
-        // Convert tabs to &nbsp; (4 non-breaking spaces)
-        encoded = encoded.Replace("\t", "&nbsp;&nbsp;&nbsp;&nbsp;");
-
-        // Convert line breaks to <br />
-        encoded = encoded.Replace("\r\n", "<br />"); // Windows
-        encoded = encoded.Replace("\r", "<br />");   // Mac old
-        encoded = encoded.Replace("\n", "<br />");   // Unix/Linux
-
-        return encoded;
-    }
 }

EnvelopeGenerator.Application/Common/Query/ReceiverQueryBase.cs

@@ -20,4 +20,14 @@ public record ReceiverQueryBase
     /// Eindeutige Signatur des Empfängers
     /// </summary>
     public virtual string? Signature { get; set; }
+
+    /// <summary>
+    /// Checks whether any of the specified query criteria have a value.
+    /// </summary>
+    /// <remarks>
+    /// This property returns <c>true</c> if at least one of the fields 
+    /// <see cref="Id"/>, <see cref="EmailAddress"/>, or <see cref="Signature"/> is not null.
+    /// <para>Usage example: The query can be executed only if at least one criterion is specified.</para>
+    /// </remarks>
+    public bool HasAnyCriteria => Id is not null || EmailAddress is not null || Signature is not null;
 }

EnvelopeGenerator.Application/Common/SQL/DocumentCreateReadSQL.cs

@@ -1,7 +1,7 @@
 using Dapper;
-using EnvelopeGenerator.Application.Interfaces.SQLExecutor;
 using DigitalData.Core.Exceptions;
 using EnvelopeGenerator.Domain.Entities;
+using EnvelopeGenerator.Application.Common.Interfaces.SQLExecutor;
 
 namespace EnvelopeGenerator.Application.Common.SQL;
 

EnvelopeGenerator.Application/Common/SQL/EnvelopeCreateReadSQL.cs

@@ -1,5 +1,5 @@
 using Dapper;
-using EnvelopeGenerator.Application.Interfaces.SQLExecutor;
+using EnvelopeGenerator.Application.Common.Interfaces.SQLExecutor;
 using EnvelopeGenerator.Domain.Entities;
 using System.Data;
 

EnvelopeGenerator.Application/Common/SQL/EnvelopeReceiverAddReadSQL.cs

@@ -1,5 +1,5 @@
 using Dapper;
-using EnvelopeGenerator.Application.Interfaces.SQLExecutor;
+using EnvelopeGenerator.Application.Common.Interfaces.SQLExecutor;
 using EnvelopeGenerator.Domain.Entities;
 
 namespace EnvelopeGenerator.Application.Common.SQL;

EnvelopeGenerator.Application/DependencyInjection.cs

@@ -1,12 +1,17 @@
 using DigitalData.Core.Client;
 using EnvelopeGenerator.Application.Common.Configurations;
-using EnvelopeGenerator.Application.Interfaces.Services;
+using EnvelopeGenerator.Application.Common.Interfaces.Services;
 using EnvelopeGenerator.Application.Services;
+using EnvelopeGenerator.Application.ThirdPartyModules.Queries;
+using MediatR;
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.DependencyInjection.Extensions;
+using Microsoft.Extensions.Options;
 using QRCoder;
 using System.Reflection;
+using GdPicture14;
+using EnvelopeGenerator.Application.Pdf.Behaviors;
 
 namespace EnvelopeGenerator.Application;
 
@@ -20,9 +25,10 @@ public static class DependencyInjection
     /// </summary>
     /// <param name="services"></param>
     /// <param name="config"></param>
+    /// <param name="usePdfBurner"></param>
     /// <returns></returns>
     [Obsolete("Use MediatR")]
-    public static IServiceCollection AddEnvelopeGeneratorServices(this IServiceCollection services, IConfiguration config)
+    public static IServiceCollection AddEnvelopeGeneratorServices(this IServiceCollection services, IConfiguration config, bool usePdfBurner = false)
     {
         //Inject CRUD Service and repositoriesad
         services.TryAddScoped<IConfigService, ConfigService>();
@@ -46,7 +52,31 @@ public static class DependencyInjection
         services.Configure<MailParams>(config.GetSection(nameof(MailParams)));
         services.Configure<AuthenticatorParams>(config.GetSection(nameof(AuthenticatorParams)));
         services.Configure<TotpSmsParams>(config.GetSection(nameof(TotpSmsParams)));
-        services.Configure<DbTriggerParams>(config.GetSection(nameof(DbTriggerParams)));
+
+        if (usePdfBurner)
+        {
+            services.Configure<PDFBurnerParams>(config.GetSection(nameof(PDFBurnerParams)));
+            services.AddOptions<GdPictureParams>()
+            .Configure((GdPictureParams opt, IServiceProvider provider) =>
+            {
+                opt.License = config["GdPictureLicenseKey"]
+                    ?? provider.GetRequiredService<IMediator>().ReadThirdPartyModuleLicenseAsync("GDPICTURE").GetAwaiter().GetResult()
+                    ?? throw new InvalidOperationException($"License record not found for key: {"GDPICTURE"}");
+            });
+            services.AddSingleton(provider =>
+            {
+                var license = provider.GetRequiredService<IOptions<GdPictureParams>>().Value.License;
+                var licenseManager = new LicenseManager();
+                licenseManager.RegisterKEY(license);
+                return licenseManager;
+            });
+            services.AddTransient(provider =>
+            {
+                // Ensure LicenseManager is resolved so that its constructor is called
+                _ = provider.GetRequiredService<LicenseManager>();
+                return new AnnotationManager();
+            });
+        }
 
         services.AddHttpClientService<GtxMessagingParams>(config.GetSection(nameof(GtxMessagingParams)));
         services.TryAddSingleton<ISmsSender, GTXSmsSender>();
@@ -57,8 +87,15 @@ public static class DependencyInjection
         services.AddMediatR(cfg =>
         {
             cfg.RegisterServicesFromAssembly(Assembly.GetExecutingAssembly());
+            cfg.AddOpenBehaviors(new Type[] { typeof(AddReportBehavior), typeof(SavePdfBehavior) });
         });
 
+        // Add memory cache
+        services.AddMemoryCache();
+
+        // Register mail services
+        services.AddScoped<IEnvelopeMailService, EnvelopeMailService>();
+
         return services;
     }
 }

EnvelopeGenerator.Application/EmailTemplates/Queries/Read/ReadEmailTemplateQueryHandler.cs

@@ -1,5 +1,5 @@
 using AutoMapper;
-using EnvelopeGenerator.Application.Interfaces.Repositories;
+using EnvelopeGenerator.Application.Common.Interfaces.Repositories;
 using EnvelopeGenerator.Domain.Constants;
 using MediatR;
 

EnvelopeGenerator.Application/EnvelopeGenerator.Application.csproj

@@ -14,7 +14,7 @@
 
 	<ItemGroup>
 		<PackageReference Include="Dapper" Version="2.1.66" />
-		<PackageReference Include="DigitalData.Core.Abstraction.Application" Version="1.2.1" />
+		<PackageReference Include="DigitalData.Core.Abstraction.Application" Version="1.5.0" />
 		<PackageReference Include="DigitalData.Core.Application" Version="3.4.0" />
 		<PackageReference Include="DigitalData.Core.Client" Version="2.1.0" />
 		<PackageReference Include="DigitalData.Core.Exceptions" Version="1.1.0" />
@@ -25,23 +25,35 @@
 		<PackageReference Include="Otp.NET" Version="1.4.0" />
 		<PackageReference Include="QRCoder" Version="1.6.0" />
 		<PackageReference Include="QRCoder-ImageSharp" Version="0.10.0" />
+		<PackageReference Include="SixLabors.ImageSharp" Version="3.1.12" />
 		<PackageReference Include="UserManager" Version="1.1.3" />
 	</ItemGroup>
 
 	<ItemGroup Condition="'$(TargetFramework)' == 'net7.0'">
 		<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="8.0.0" />
+		<PackageReference Include="System.Formats.Asn1" Version="8.0.2" />
+		<PackageReference Include="GdPicture" Version="14.3.19.1" />
 	</ItemGroup>
 
 	<ItemGroup Condition="'$(TargetFramework)' == 'net8.0'">
 		<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="9.0.5" />
+		<PackageReference Include="System.Formats.Asn1" Version="9.0.10" />
+		<PackageReference Include="GdPicture" Version="14.3.19.1" />
+		<PackageReference Include="GdPicture.runtimes.windows" Version="14.3.19.1" />
+		<PackageReference Include="GdPicture.runtimes.linux" Version="14.3.19.1" />
 	</ItemGroup>
 
 	<ItemGroup Condition="'$(TargetFramework)' == 'net9.0'">
 		<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="9.0.5" />
+		<PackageReference Include="System.Formats.Asn1" Version="9.0.10" />
+		<PackageReference Include="GdPicture" Version="14.3.19.1" />
+		<PackageReference Include="GdPicture.runtimes.windows" Version="14.3.19.1" />
+		<PackageReference Include="GdPicture.runtimes.linux" Version="14.3.19.1" />
 	</ItemGroup>
 
 	<ItemGroup>
 		<ProjectReference Include="..\EnvelopeGenerator.Domain\EnvelopeGenerator.Domain.csproj" />
+		<ProjectReference Include="..\EnvelopeGenerator.PdfEditor\EnvelopeGenerator.PdfEditor.csproj" />
 	</ItemGroup>
 
 	<ItemGroup>

EnvelopeGenerator.Application/EnvelopeReceivers/Commands/CreateEnvelopeReceiverCommandHandler.cs

@@ -1,8 +1,8 @@
 using AutoMapper;
-using EnvelopeGenerator.Application.Interfaces.SQLExecutor;
 using EnvelopeGenerator.Domain.Entities;
 using MediatR;
 using EnvelopeGenerator.Application.Common.Dto.Receiver;
+using EnvelopeGenerator.Application.Common.Interfaces.SQLExecutor;
 
 namespace EnvelopeGenerator.Application.EnvelopeReceivers.Commands;
 

EnvelopeGenerator.Application/EnvelopeReceivers/Queries/ReadEnvelopeReceiverQuery.cs

@@ -91,6 +91,8 @@ public class ReadEnvelopeReceiverQueryHandler : IRequestHandler<ReadEnvelopeRece
 {
     private readonly IRepository<EnvelopeReceiver> _repo;
 
+    private readonly IRepository<Receiver> _rcvRepo;
+
     private readonly IMapper _mapper;
 
     /// <summary>
@@ -98,10 +100,11 @@ public class ReadEnvelopeReceiverQueryHandler : IRequestHandler<ReadEnvelopeRece
     /// </summary>
     /// <param name="envelopeReceiver"></param>
     /// <param name="mapper"></param>
-    public ReadEnvelopeReceiverQueryHandler(IRepository<EnvelopeReceiver> envelopeReceiver, IMapper mapper)
+    public ReadEnvelopeReceiverQueryHandler(IRepository<EnvelopeReceiver> envelopeReceiver, IRepository<Receiver> rcvRepo, IMapper mapper)
     {
         _repo = envelopeReceiver;
         _mapper = mapper;
+        _rcvRepo = rcvRepo;
     }
 
     /// <summary>
@@ -138,6 +141,14 @@ public class ReadEnvelopeReceiverQueryHandler : IRequestHandler<ReadEnvelopeRece
                         .Include(er => er.Receiver)
                         .ToListAsync(cancel);
 
+        if (request.Receiver.HasAnyCriteria && envRcvs.Any())
+        {
+            var receiver = await _rcvRepo.ReadOnly().Where(request.Receiver).FirstAsync(cancel);
+
+            foreach (var envRcv in envRcvs)
+                envRcv.Envelope?.Documents?.First().Elements.RemoveAll(s => s.ReceiverId != receiver.Id);
+        }
+
         return _mapper.Map<List<EnvelopeReceiverDto>>(envRcvs);
     }
 } 

EnvelopeGenerator.Application/Envelopes/Commands/CreateEnvelopeCommand.cs

@@ -1,6 +1,6 @@
 using DigitalData.Core.Abstraction.Application.Repository;
 using EnvelopeGenerator.Application.Common.Dto;
-using EnvelopeGenerator.Application.Interfaces.SQLExecutor;
+using EnvelopeGenerator.Application.Common.Interfaces.SQLExecutor;
 using MediatR;
 using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;

EnvelopeGenerator.Application/Envelopes/Commands/CreateEnvelopeCommandHandler.cs

@@ -1,10 +1,10 @@
 using AutoMapper;
-using EnvelopeGenerator.Application.Interfaces.SQLExecutor;
 using MediatR;
 using Microsoft.Extensions.DependencyInjection;
 using DigitalData.Core.Abstraction.Application.Repository;
 using EnvelopeGenerator.Domain.Entities;
 using EnvelopeGenerator.Application.Common.Dto;
+using EnvelopeGenerator.Application.Common.Interfaces.SQLExecutor;
 
 namespace EnvelopeGenerator.Application.Envelopes.Commands;
 

EnvelopeGenerator.Application/Envelopes/Queries/ReadEnvelopeQuery.cs

@@ -1,18 +1,29 @@
 using MediatR;
 using EnvelopeGenerator.Domain.Constants;
 using EnvelopeGenerator.Application.Common.Query;
+using EnvelopeGenerator.Application.Common.Dto;
+using AutoMapper;
+using DigitalData.Core.Abstraction.Application.Repository;
+using EnvelopeGenerator.Application.Common.Extensions;
+using EnvelopeGenerator.Domain.Entities;
+using Microsoft.EntityFrameworkCore;
 
 namespace EnvelopeGenerator.Application.Envelopes.Queries;
 
 /// <summary>
 /// Repräsentiert eine Abfrage für Umschläge.
 /// </summary>
-public record ReadEnvelopeQuery : EnvelopeQueryBase, IRequest
+public record ReadEnvelopeQuery : EnvelopeQueryBase, IRequest<IEnumerable<EnvelopeDto>>
 {
     /// <summary>
     /// Abfrage des Include des Umschlags
     /// </summary>
     public EnvelopeStatusQuery? Status { get; init; }
+
+    /// <summary>
+    /// 
+    /// </summary>
+    public bool? HasDocResult { get; init; }
 }
 
 /// <summary>
@@ -65,4 +76,53 @@ public record EnvelopeStatusQuery
     /// Eine Liste von Statuswerten, die ignoriert werden werden.
     /// </summary>
     public EnvelopeStatus[]? Ignore { get; init; }
+}
+
+/// <summary>
+/// 
+/// </summary>
+public class ReadEnvelopeQueryHandler : IRequestHandler<ReadEnvelopeQuery, IEnumerable<EnvelopeDto>>
+{
+    private readonly IMapper _mapper;
+
+    private readonly IRepository<Envelope> _repo;
+
+    /// <summary>
+    /// 
+    /// </summary>
+    /// <param name="mapper"></param>
+    /// <param name="repo"></param>
+    public ReadEnvelopeQueryHandler(IMapper mapper, IRepository<Envelope> repo)
+    {
+        _mapper = mapper;
+        _repo = repo;
+    }
+
+    /// <summary>
+    /// 
+    /// </summary>
+    /// <param name="request"></param>
+    /// <param name="cancel"></param>
+    /// <returns></returns>
+    /// <exception cref="NotImplementedException"></exception>
+    public async Task<IEnumerable<EnvelopeDto>> Handle(ReadEnvelopeQuery request, CancellationToken cancel)
+    {
+        var envelopesQ = _repo.Query.Where(request, notnull: false);
+
+        EnvelopeStatusQuery? statusQ = request.Status;
+        bool? hasDocResult = request.HasDocResult;
+
+        var filtered =
+            from envelope in envelopesQ
+            where (statusQ == null || statusQ.Include == null || statusQ.Include.Contains(envelope.Status))
+               && (statusQ == null || statusQ.Ignore == null || !statusQ.Ignore.Contains(envelope.Status))
+               && (statusQ == null || statusQ.Min == null || envelope.Status > statusQ.Min)
+               && (statusQ == null || statusQ.Max == null || envelope.Status < statusQ.Max)
+               && (!hasDocResult.HasValue || (hasDocResult.Value ? envelope.DocResult != null : envelope.DocResult == null))
+            select envelope;
+
+        var envelopes = await filtered.ToListAsync(cancel);
+
+        return _mapper.Map<IEnumerable<EnvelopeDto>>(envelopes);
+    }
 }

EnvelopeGenerator.Application/Exceptions/BurnAnnotationException.cs

@@ -0,0 +1,19 @@
+namespace EnvelopeGenerator.Application.Exceptions;
+
+/// <summary>
+/// 
+/// </summary>
+public class BurnAnnotationException : ApplicationException
+{
+    /// <summary>
+    /// 
+    /// </summary>
+    public BurnAnnotationException(string message)
+        : base(message) { }
+
+    /// <summary>
+    /// 
+    /// </summary>
+    public BurnAnnotationException(string message, Exception innerException)
+        : base(message, innerException) { }
+}

EnvelopeGenerator.Application/Exceptions/CreateReportException.cs

@@ -0,0 +1,28 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace EnvelopeGenerator.Application.Exceptions;
+
+/// <summary>
+/// 
+/// </summary>
+public class CreateReportException : ApplicationException
+{
+    /// <summary>
+    /// 
+    /// </summary>
+    /// <param name="message"></param>
+    public CreateReportException(string message)
+        : base(message) { }
+
+    /// <summary>
+    /// 
+    /// </summary>
+    /// <param name="message"></param>
+    /// <param name="innerException"></param>
+    public CreateReportException(string message, Exception innerException)
+        : base(message, innerException) { }
+}

EnvelopeGenerator.Application/Exceptions/ExportDocumentException.cs

@@ -0,0 +1,22 @@
+namespace EnvelopeGenerator.Application.Exceptions;
+
+/// <summary>
+/// 
+/// </summary>
+public class ExportDocumentException : ApplicationException
+{
+    /// <summary>
+    /// 
+    /// </summary>
+    /// <param name="message"></param>
+    public ExportDocumentException(string message)
+        : base(message) { }
+
+    /// <summary>
+    /// 
+    /// </summary>
+    /// <param name="message"></param>
+    /// <param name="innerException"></param>
+    public ExportDocumentException(string message, Exception innerException)
+        : base(message, innerException) { }
+}

EnvelopeGenerator.Application/Exceptions/MergeDocumentException.cs

@@ -0,0 +1,22 @@
+namespace EnvelopeGenerator.Application.Exceptions;
+
+/// <summary>
+/// 
+/// </summary>
+public class MergeDocumentException : ApplicationException
+{
+    /// <summary>
+    /// 
+    /// </summary>
+    /// <param name="message"></param>
+    public MergeDocumentException(string message)
+        : base(message) { }
+
+    /// <summary>
+    /// 
+    /// </summary>
+    /// <param name="message"></param>
+    /// <param name="innerException"></param>
+    public MergeDocumentException(string message, Exception innerException)
+        : base(message, innerException) { }
+}

EnvelopeGenerator.Application/Histories/Commands/CreateHistoryCommand.cs

@@ -34,7 +34,7 @@ public record CreateHistoryCommand : EnvelopeReceiverQueryBase, IRequest<History
     /// <summary>
     /// 
     /// </summary>
-    public DateTime AddedWhen { get; } = DateTime.Now;
+    public DateTime AddedWhen { get; } = DateTime.UtcNow;
 
     /// <summary>
     /// 

EnvelopeGenerator.Application/Pdf/Behaviors/AddReportBehavior.cs

@@ -0,0 +1,44 @@
+using MediatR;
+using EnvelopeGenerator.Application.Histories.Commands;
+using EnvelopeGenerator.Domain.Constants;
+
+namespace EnvelopeGenerator.Application.Pdf.Behaviors;
+
+/// <summary>
+/// 
+/// </summary>
+public class AddReportBehavior : IPipelineBehavior<BurnPdfCommand, byte[]>
+{
+    private readonly ISender _sender;
+
+    /// <summary>
+    /// 
+    /// </summary>
+    /// <param name="sender"></param>
+    public AddReportBehavior(ISender sender)
+    {
+        _sender = sender;
+    }
+
+    /// <summary>
+    /// 
+    /// </summary>
+    /// <param name="request"></param>
+    /// <param name="next"></param>
+    /// <param name="cancel"></param>
+    /// <returns></returns>
+    public async Task<byte[]> Handle(BurnPdfCommand request, RequestHandlerDelegate<byte[]> next, CancellationToken cancel)
+    {
+        var docResult = await next(cancel);
+        var base64 = Convert.ToBase64String(docResult);
+
+        await _sender.Send(new CreateHistoryCommand()
+        {
+            EnvelopeId = request.EnvelopeId,
+            UserReference = "System",
+            Status = EnvelopeStatus.EnvelopeReportCreated,
+        }, cancel);
+
+        return docResult;
+    }
+}

EnvelopeGenerator.Application/Pdf/Behaviors/SavePdfBehavior.cs

@@ -0,0 +1,23 @@
+using MediatR;
+
+namespace EnvelopeGenerator.Application.Pdf.Behaviors;
+
+/// <summary>
+/// 
+/// </summary>
+public class SavePdfBehavior : IPipelineBehavior<BurnPdfCommand, byte[]>
+{
+    /// <summary>
+    /// 
+    /// </summary>
+    /// <param name="request"></param>
+    /// <param name="next"></param>
+    /// <param name="cancel"></param>
+    /// <returns></returns>
+    public async Task<byte[]> Handle(BurnPdfCommand request, RequestHandlerDelegate<byte[]> next, CancellationToken cancel)
+    {
+        var docResult = await next(cancel);
+        var base64 = Convert.ToBase64String(docResult);
+        return docResult;
+    }
+}

EnvelopeGenerator.Application/Pdf/BurnPdfCommand.cs

@@ -0,0 +1,288 @@
+using DigitalData.Core.Abstraction.Application.Repository;
+using DigitalData.Core.Exceptions;
+using EnvelopeGenerator.Application.Common.Configurations;
+using EnvelopeGenerator.Application.Common.Dto.PSPDFKitInstant;
+using EnvelopeGenerator.Application.Common.Extensions;
+using EnvelopeGenerator.Application.Exceptions;
+using EnvelopeGenerator.Domain.Constants;
+using EnvelopeGenerator.Domain.Entities;
+using GdPicture14;
+using MediatR;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.Extensions.Logging;
+using Microsoft.Extensions.Options;
+using Newtonsoft.Json;
+
+namespace EnvelopeGenerator.Application.Pdf;
+
+/// <summary>
+/// 
+/// </summary>
+public record BurnPdfCommand(int? EnvelopeId = null, string? EnvelopeUuid = null) : IRequest<byte[]>;
+
+/// <summary>
+/// 
+/// </summary>
+public static class BurnPdfCommandExtensions
+{
+    /// <summary>
+    /// 
+    /// </summary>
+    /// <param name="sender"></param>
+    /// <param name="envelopeId"></param>
+    /// <param name="cancel"></param>
+    /// <returns></returns>
+    public static Task<byte[]> BurnPdf(this ISender sender, int envelopeId, CancellationToken cancel = default) 
+        => sender.Send(new BurnPdfCommand(EnvelopeId: envelopeId), cancel);
+
+    /// <summary>
+    /// 
+    /// </summary>
+    /// <param name="sender"></param>
+    /// <param name="envelopeUuid"></param>
+    /// <param name="cancel"></param>
+    /// <returns></returns>
+    public static Task<byte[]> BurnPdf(this ISender sender, string envelopeUuid, CancellationToken cancel = default)
+        => sender.Send(new BurnPdfCommand(EnvelopeUuid: envelopeUuid), cancel);
+}
+
+/// <summary>
+/// 
+/// </summary>
+public class BurnPdfCommandHandler : IRequestHandler<BurnPdfCommand, byte[]>
+{
+    private readonly PDFBurnerParams _options;
+
+    private readonly AnnotationManager _manager;
+
+    private readonly ILogger<BurnPdfCommandHandler> _logger;
+
+    private readonly IRepository<Envelope> _envRepo;
+
+    private readonly IRepository<Domain.Entities.DocumentStatus> _docStatusRepo;
+
+    /// <summary>
+    /// 
+    /// </summary>
+    /// <param name="pdfBurnerParams"></param>
+    /// <param name="manager"></param>
+    /// <param name="logger"></param>
+    /// <param name="envRepo"></param>
+    /// <param name="docStatusRepo"></param>
+    public BurnPdfCommandHandler(IOptions<PDFBurnerParams> pdfBurnerParams, AnnotationManager manager, ILogger<BurnPdfCommandHandler> logger, IRepository<Envelope> envRepo, IRepository<Domain.Entities.DocumentStatus> docStatusRepo)
+    {
+        _options = pdfBurnerParams.Value;
+        _manager = manager;
+        _docStatusRepo = docStatusRepo;
+        _logger = logger;
+        _envRepo = envRepo;
+    }
+
+
+    /// <summary>
+    /// 
+    /// </summary>
+    /// <param name="request"></param>
+    /// <param name="cancel"></param>
+    /// <returns></returns>
+    /// <exception cref="NotImplementedException"></exception>
+    public async Task<byte[]> Handle(BurnPdfCommand request, CancellationToken cancel)
+    {
+        var envQuery = 
+            request.EnvelopeId is not null ? _envRepo.Where(env => env.Id == request.EnvelopeId) : 
+            request.EnvelopeUuid is not null ? _envRepo.Where(env => env.Uuid == request.EnvelopeUuid) :
+            throw new BadRequestException("Request validation failed: Either Envelope Id or Envelope Uuid must be provided.");
+
+        var envelope = await envQuery
+            .Include(env => env.Documents!).ThenInclude(doc => doc.Elements!).ThenInclude(element => element.Annotations)
+            .FirstOrDefaultAsync(cancel)
+            ?? throw new BadRequestException($"Envelope could not be found. Request details:\n" +
+                request.ToJson(Format.Json.ForDiagnostics));
+
+        var doc = envelope.Documents?.FirstOrDefault()
+            ?? throw new NotFoundException($"Document could not be located within the specified envelope. Request details:\n" +
+                request.ToJson(Format.Json.ForDiagnostics));
+
+        if (doc.ByteData is null)
+            throw new InvalidOperationException($"Document byte data is missing, indicating a potential data integrity issue. Request details:\n" +
+                request.ToJson(Format.Json.ForDiagnostics));
+
+        return doc.Elements?.SelectMany(e => e.Annotations ?? Enumerable.Empty<ElementAnnotation>()).Where(annot => annot is not null).Any() ?? false
+            ? BurnElementAnnotsToPDF(doc.ByteData, doc.Elements)
+            : BurnInstantJSONAnnotsToPDF(doc.ByteData, await _docStatusRepo
+                .Where(status => status.EnvelopeId == envelope.Id)
+                .Select(status => status.Value)
+                .ToListAsync(cancel));
+    }
+
+    private byte[] BurnElementAnnotsToPDF(byte[] pSourceBuffer, List<Signature> elements)
+    {
+        // Add background
+        using var doc = PdfEditor.Pdf.FromMemory(pSourceBuffer);
+        // TODO: take the length from the largest y
+        pSourceBuffer = doc.Background(elements, 1.9500000000000002 * 0.93, 2.52 * 0.67)
+                        .ExportStream()
+                        .ToArray();
+
+        GdPictureStatus oResult;
+        using var oSourceStream = new MemoryStream(pSourceBuffer);
+        // Open PDF
+        oResult = _manager.InitFromStream(oSourceStream);
+        if (oResult != GdPictureStatus.OK)
+            throw new BurnAnnotationException($"Could not open document for burning: [{oResult}]");
+
+        // Imported from background (add to configuration)
+        var margin = 0.2;
+        var inchFactor = 72;
+
+        // Y offset of form fields
+        var keys = new[] { "position", "city", "date" }; // add to configuration
+        var unitYOffsets = 0.2;
+
+        var yOffsetsOfFF = keys
+            .Select((k, i) => new { Key = k, Value = unitYOffsets * i + 1 })
+            .ToDictionary(x => x.Key, x => x.Value);
+
+        // Add annotations
+        foreach (var element in elements)
+        {
+            var frameX = element.Left - 0.7 - margin;
+
+            var frame = element.Annotations?.FirstOrDefault(a => a.Name == "frame");
+            var frameY = element.Top - 0.5 - margin;
+            var frameYShift = (frame!.Y ?? default) - frameY * inchFactor;
+            var frameXShift = (frame.X ?? default) - frameX * inchFactor;
+
+            foreach (var annot in element.Annotations!)
+            {
+                if (!yOffsetsOfFF.TryGetValue(annot.Name, out var yOffsetofFF))
+                    yOffsetofFF = 0;
+
+                var y = frameY + yOffsetofFF;
+
+                if (annot.Type == AnnotationType.PSPDFKit.FormField)
+                {
+                    _manager.AddFormFieldValue(
+                        (annot.X ?? default) / inchFactor,
+                        y,
+                        (annot.Width ?? default) / inchFactor,
+                        (annot.Height ?? default) / inchFactor,
+                        element.Page,
+                        annot.Value,
+                        _options
+                    );
+                }
+                else if (annot.Type == AnnotationType.PSPDFKit.Image)
+                {
+                    _manager.AddImageAnnotation(
+                        (annot.X ?? default) / inchFactor,
+                        annot.Name == "signature" ? ((annot.Y ?? default) - frameYShift) / inchFactor : y,
+                        (annot.Width ?? default) / inchFactor,
+                        (annot.Height ?? default) / inchFactor,
+                        element.Page,
+                        annot.Value
+                    );
+                }
+                else if (annot.Type == AnnotationType.PSPDFKit.Ink)
+                {
+                    _manager.AddInkAnnotation(element.Page, annot.Value);
+                }
+            }
+        }
+
+        // Save PDF
+        using var oNewStream = new MemoryStream();
+        oResult = _manager.SaveDocumentToPDF(oNewStream);
+        if (oResult != GdPictureStatus.OK)
+            throw new BurnAnnotationException($"Could not save document to stream: [{oResult}]");
+
+        _manager.Close();
+
+        return oNewStream.ToArray();
+    }
+
+    private byte[] BurnInstantJSONAnnotsToPDF(byte[] pSourceBuffer, List<string> pInstantJSONList)
+    {
+        GdPictureStatus oResult;
+
+        using var oSourceStream = new MemoryStream(pSourceBuffer);
+        // Open PDF
+        oResult = _manager.InitFromStream(oSourceStream);
+        if (oResult != GdPictureStatus.OK)
+        {
+            throw new BurnAnnotationException($"Could not open document for burning: [{oResult}]");
+        }
+
+        // Add annotation to PDF
+        foreach (var oJSON in pInstantJSONList)
+        {
+            try
+            {
+                if (oJSON is string json)
+                    AddInstantJsonAnnotationToPdf(json);
+            }
+            catch (Exception ex)
+            {
+                _logger.LogWarning("Error in AddInstantJSONAnnotationToPDF - oJson: ");
+                _logger.LogWarning(oJSON);
+                throw new BurnAnnotationException("Adding Annotation failed", ex);
+            }
+        }
+
+        oResult = _manager.BurnAnnotationsToPage(RemoveInitialAnnots: true, VectorMode: true);
+        if (oResult != GdPictureStatus.OK)
+        {
+            throw new BurnAnnotationException($"Could not burn annotations to file: [{oResult}]");
+        }
+
+        // Save PDF
+        using var oNewStream = new MemoryStream();
+        oResult = _manager.SaveDocumentToPDF(oNewStream);
+        if (oResult != GdPictureStatus.OK)
+        {
+            throw new BurnAnnotationException($"Could not save document to stream: [{oResult}]");
+        }
+
+        _manager.Close();
+
+        return oNewStream.ToArray();
+    }
+
+    private void AddInstantJsonAnnotationToPdf(string instantJson)
+    {
+        var annotationData = JsonConvert.DeserializeObject<InstantData>(instantJson);
+
+        annotationData?.Annotations?.Reverse();
+
+        if (annotationData?.Annotations is null)
+            return;
+
+        foreach (var annotation in annotationData.Annotations)
+        {
+            _logger.LogDebug("Adding AnnotationID: {id}", annotation.Id);
+
+            switch (annotation.Type)
+            {
+                case AnnotationType.PSPDFKit.Image:
+                    if (annotationData?.Attachments is not null)
+                        _manager.AddImageAnnotation(annotation, annotationData.Attachments);
+                    break;
+
+                case AnnotationType.PSPDFKit.Ink:
+                    _manager.AddInkAnnotation(annotation);
+                    break;
+
+                case AnnotationType.PSPDFKit.Widget:
+                    // Add form field values
+                    var formFieldValue = annotationData?.FormFieldValues?
+                        .FirstOrDefault(fv => fv.Name == annotation.Id);
+
+                    if (formFieldValue != null && !_options.IgnoredLabels.Contains(formFieldValue.Value))
+                    {
+                        _manager.AddFormFieldValue(annotation, formFieldValue, _options);
+                    }
+                    break;
+            }
+        }
+    }
+}

EnvelopeGenerator.Application/Services/Authenticator.cs

@@ -1,5 +1,5 @@
 using EnvelopeGenerator.Application.Common.Configurations;
-using EnvelopeGenerator.Application.Interfaces.Services;
+using EnvelopeGenerator.Application.Common.Interfaces.Services;
 using Microsoft.Extensions.Options;
 using OtpNet;
 using QRCoder;

EnvelopeGenerator.Application/Services/ConfigService.cs

@@ -1,12 +1,12 @@
 using AutoMapper;
 using DigitalData.Core.Application;
 using DigitalData.Core.Abstraction.Application.DTO;
-using EnvelopeGenerator.Application.Interfaces.Services;
 using EnvelopeGenerator.Domain.Entities;
-using EnvelopeGenerator.Application.Interfaces.Repositories;
 using Microsoft.Extensions.Caching.Memory;
 using Microsoft.Extensions.Logging;
 using EnvelopeGenerator.Application.Common.Dto;
+using EnvelopeGenerator.Application.Common.Interfaces.Repositories;
+using EnvelopeGenerator.Application.Common.Interfaces.Services;
 
 namespace EnvelopeGenerator.Application.Services;
 

EnvelopeGenerator.Application/Services/DocumentReceiverElementService.cs

@@ -1,9 +1,9 @@
 using AutoMapper;
 using DigitalData.Core.Application;
-using EnvelopeGenerator.Application.Interfaces.Services;
 using EnvelopeGenerator.Domain.Entities;
-using EnvelopeGenerator.Application.Interfaces.Repositories;
 using EnvelopeGenerator.Application.Common.Dto;
+using EnvelopeGenerator.Application.Common.Interfaces.Repositories;
+using EnvelopeGenerator.Application.Common.Interfaces.Services;
 
 namespace EnvelopeGenerator.Application.Services;
 

EnvelopeGenerator.Application/Services/DocumentStatusService.cs

@@ -1,9 +1,9 @@
 using AutoMapper;
 using DigitalData.Core.Application;
-using EnvelopeGenerator.Application.Interfaces.Services;
 using EnvelopeGenerator.Domain.Entities;
-using EnvelopeGenerator.Application.Interfaces.Repositories;
 using EnvelopeGenerator.Application.Common.Dto;
+using EnvelopeGenerator.Application.Common.Interfaces.Repositories;
+using EnvelopeGenerator.Application.Common.Interfaces.Services;
 
 namespace EnvelopeGenerator.Application.Services;
 

EnvelopeGenerator.Application/Services/EmailTemplateService.cs

@@ -1,12 +1,12 @@
 using AutoMapper;
 using DigitalData.Core.Application;
 using EnvelopeGenerator.Domain.Entities;
-using EnvelopeGenerator.Application.Interfaces.Repositories;
 using DigitalData.Core.Abstraction.Application.DTO;
 using Microsoft.Extensions.Logging;
-using EnvelopeGenerator.Application.Interfaces.Services;
 using EnvelopeGenerator.Domain.Constants;
 using EnvelopeGenerator.Application.Common.Dto;
+using EnvelopeGenerator.Application.Common.Interfaces.Repositories;
+using EnvelopeGenerator.Application.Common.Interfaces.Services;
 
 namespace EnvelopeGenerator.Application.Services;
 

EnvelopeGenerator.Application/Services/EnvelopeDocumentService.cs

@@ -1,9 +1,9 @@
 using AutoMapper;
 using DigitalData.Core.Application;
-using EnvelopeGenerator.Application.Interfaces.Services;
 using EnvelopeGenerator.Domain.Entities;
-using EnvelopeGenerator.Application.Interfaces.Repositories;
 using EnvelopeGenerator.Application.Common.Dto;
+using EnvelopeGenerator.Application.Common.Interfaces.Repositories;
+using EnvelopeGenerator.Application.Common.Interfaces.Services;
 
 namespace EnvelopeGenerator.Application.Services;
 

EnvelopeGenerator.Application/Services/EnvelopeHistoryService.cs

@@ -1,12 +1,12 @@
 using AutoMapper;
 using DigitalData.Core.Application;
 using EnvelopeGenerator.Domain.Entities;
-using EnvelopeGenerator.Application.Interfaces.Repositories;
-using EnvelopeGenerator.Application.Interfaces.Services;
 using DigitalData.Core.Abstraction.Application.DTO;
 using EnvelopeGenerator.Domain.Constants;
 using EnvelopeGenerator.Application.Common.Dto.History;
 using EnvelopeGenerator.Application.Common.Dto.Receiver;
+using EnvelopeGenerator.Application.Common.Interfaces.Repositories;
+using EnvelopeGenerator.Application.Common.Interfaces.Services;
 
 namespace EnvelopeGenerator.Application.Services;
 

EnvelopeGenerator.Application/Services/EnvelopeMailService.cs

@@ -5,13 +5,13 @@ using DigitalData.EmailProfilerDispatcher.Abstraction.Services;
 using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Options;
 using Newtonsoft.Json;
-using EnvelopeGenerator.Application.Interfaces.Services;
 using DigitalData.Core.Abstraction.Application.DTO;
 using EnvelopeGenerator.Domain.Constants;
 using EnvelopeGenerator.Application.Common.Configurations;
 using EnvelopeGenerator.Application.Common.Dto.EnvelopeReceiver;
 using EnvelopeGenerator.Application.Common.Dto.EnvelopeReceiverReadOnly;
 using EnvelopeGenerator.Application.Common.Extensions;
+using EnvelopeGenerator.Application.Common.Interfaces.Services;
 
 namespace EnvelopeGenerator.Application.Services;
 

EnvelopeGenerator.Application/Services/EnvelopeReceiverReadOnlyService.cs

@@ -1,9 +1,9 @@
 using AutoMapper;
 using DigitalData.Core.Application;
-using EnvelopeGenerator.Application.Interfaces.Services;
 using EnvelopeGenerator.Domain.Entities;
-using EnvelopeGenerator.Application.Interfaces.Repositories;
 using EnvelopeGenerator.Application.Common.Dto.EnvelopeReceiverReadOnly;
+using EnvelopeGenerator.Application.Common.Interfaces.Repositories;
+using EnvelopeGenerator.Application.Common.Interfaces.Services;
 
 namespace EnvelopeGenerator.Application.Services;
 

EnvelopeGenerator.Application/Services/EnvelopeReceiverService.cs

@@ -3,17 +3,17 @@ using DigitalData.Core.Application;
 using DigitalData.Core.Abstraction.Application.DTO;
 using EnvelopeGenerator.Application.Resources;
 using EnvelopeGenerator.Domain.Entities;
-using EnvelopeGenerator.Application.Interfaces.Repositories;
 using Microsoft.Extensions.Localization;
 using Microsoft.Extensions.Logging;
 using EnvelopeGenerator.Application.Common.Extensions;
-using EnvelopeGenerator.Application.Interfaces.Services;
 using EnvelopeGenerator.Application.Envelopes.Queries;
 using EnvelopeGenerator.Application.Receivers.Queries;
 using EnvelopeGenerator.Domain.Constants;
 using EnvelopeGenerator.Application.Common.Dto.EnvelopeReceiver;
 using EnvelopeGenerator.Application.Common.Dto.Messaging;
 using EnvelopeGenerator.Application.Common;
+using EnvelopeGenerator.Application.Common.Interfaces.Repositories;
+using EnvelopeGenerator.Application.Common.Interfaces.Services;
 
 namespace EnvelopeGenerator.Application.Services;
 

EnvelopeGenerator.Application/Services/EnvelopeService.cs

@@ -1,11 +1,11 @@
 using AutoMapper;
 using DigitalData.Core.Application;
 using DigitalData.Core.Abstraction.Application.DTO;
-using EnvelopeGenerator.Application.Interfaces.Services;
 using EnvelopeGenerator.Domain.Entities;
-using EnvelopeGenerator.Application.Interfaces.Repositories;
 using EnvelopeGenerator.Domain.Constants;
 using EnvelopeGenerator.Application.Common.Dto;
+using EnvelopeGenerator.Application.Common.Interfaces.Repositories;
+using EnvelopeGenerator.Application.Common.Interfaces.Services;
 
 namespace EnvelopeGenerator.Application.Services;
 

EnvelopeGenerator.Application/Services/EnvelopeSmsHandler.cs

@@ -1,10 +1,10 @@
-using EnvelopeGenerator.Application.Interfaces.Services;
-using Microsoft.Extensions.Caching.Distributed;
+using Microsoft.Extensions.Caching.Distributed;
 using Microsoft.Extensions.Options;
 using EnvelopeGenerator.Application.Common.Configurations;
 using EnvelopeGenerator.Application.Common.Dto.EnvelopeReceiver;
 using EnvelopeGenerator.Application.Common.Dto.Messaging;
 using EnvelopeGenerator.Application.Common.Extensions;
+using EnvelopeGenerator.Application.Common.Interfaces.Services;
 
 namespace EnvelopeGenerator.Application.Services;
 

EnvelopeGenerator.Application/Services/EnvelopeTypeService.cs

@@ -1,12 +1,12 @@
 using AutoMapper;
 using DigitalData.Core.Application;
 using EnvelopeGenerator.Domain.Entities;
-using EnvelopeGenerator.Application.Interfaces.Repositories;
 using Microsoft.Extensions.Caching.Memory;
 using Microsoft.Extensions.Logging;
-using EnvelopeGenerator.Application.Interfaces.Services;
 using DigitalData.Core.Abstraction.Application.DTO;
 using EnvelopeGenerator.Application.Common.Dto;
+using EnvelopeGenerator.Application.Common.Interfaces.Repositories;
+using EnvelopeGenerator.Application.Common.Interfaces.Services;
 
 namespace EnvelopeGenerator.Application.Services;
 

EnvelopeGenerator.Application/Services/GTXSmsSender.cs

@@ -1,10 +1,10 @@
 using AutoMapper;
 using DigitalData.Core.Client.Interface;
 using DigitalData.Core.Client;
-using EnvelopeGenerator.Application.Interfaces.Services;
 using Microsoft.Extensions.Options;
 using EnvelopeGenerator.Application.Common.Configurations;
 using EnvelopeGenerator.Application.Common.Dto.Messaging;
+using EnvelopeGenerator.Application.Common.Interfaces.Services;
 
 namespace EnvelopeGenerator.Application.Services;
 

EnvelopeGenerator.Application/Services/ReceiverService.cs

@@ -1,11 +1,11 @@
 using AutoMapper;
 using DigitalData.Core.Application;
 using EnvelopeGenerator.Domain.Entities;
-using EnvelopeGenerator.Application.Interfaces.Repositories;
 using DigitalData.Core.Abstraction.Application.DTO;
-using EnvelopeGenerator.Application.Interfaces.Services;
 using EnvelopeGenerator.Application.Receivers.Commands;
 using EnvelopeGenerator.Application.Common.Dto.Receiver;
+using EnvelopeGenerator.Application.Common.Interfaces.Repositories;
+using EnvelopeGenerator.Application.Common.Interfaces.Services;
 
 namespace EnvelopeGenerator.Application.Services;
 

EnvelopeGenerator.Application/ThirdPartyModules/Queries/ReadThirdPartyModuleQuery.cs

@@ -0,0 +1,92 @@
+using AutoMapper;
+using DigitalData.Core.Abstraction.Application.Repository;
+using EnvelopeGenerator.Application.Common.Dto;
+using EnvelopeGenerator.Domain.Entities;
+using MediatR;
+using Microsoft.EntityFrameworkCore;
+
+namespace EnvelopeGenerator.Application.ThirdPartyModules.Queries;
+
+/// <summary>
+/// 
+/// </summary>
+public record ReadThirdPartyModuleQuery : IRequest<IEnumerable<ThirdPartyModuleDto>>
+{
+    /// <summary>
+    /// 
+    /// </summary>
+    public string? Name { get; init; }
+
+    /// <summary>
+    /// 
+    /// </summary>
+    public bool? Active { get; init; }
+}
+
+/// <summary>
+/// 
+/// </summary>
+public record ReadThirdPartyModuleQueryHandler : IRequestHandler<ReadThirdPartyModuleQuery, IEnumerable<ThirdPartyModuleDto>>
+{
+    private readonly IMapper _mapper;
+
+    private readonly IRepository<ThirdPartyModule> _repo;
+
+    /// <summary>
+    /// 
+    /// </summary>
+    /// <param name="mapper"></param>
+    /// <param name="repo"></param>
+    public ReadThirdPartyModuleQueryHandler(IMapper mapper, IRepository<ThirdPartyModule> repo)
+    {
+        _mapper = mapper;
+        _repo = repo;
+    }
+
+    /// <summary>
+    /// 
+    /// </summary>
+    /// <param name="request"></param>
+    /// <param name="cancel"></param>
+    /// <returns></returns>
+    /// <exception cref="NotImplementedException"></exception>
+    public async Task<IEnumerable<ThirdPartyModuleDto>> Handle(ReadThirdPartyModuleQuery request, CancellationToken cancel)
+    {
+        var query = _repo.Query;
+
+        if(request.Name is string name)
+            query = query.Where(m => m.Name == name);
+
+        if (request.Active is bool active)
+            query = query.Where(m => m.Active == active);
+
+        var modules = await query.ToListAsync(cancel);
+
+        return _mapper.Map<IEnumerable<ThirdPartyModuleDto>>(modules);
+    }
+}
+
+/// <summary>
+/// 
+/// </summary>
+public static class ReadThirdPartyModuleQueryExtensions
+{
+    /// <summary>
+    /// 
+    /// </summary>
+    /// <param name="mediator"></param>
+    /// <param name="name"></param>
+    /// <param name="active"></param>
+    /// <param name="cancel"></param>
+    /// <returns></returns>
+    public static async Task<string?> ReadThirdPartyModuleLicenseAsync(this IMediator mediator, string name, bool active = true, CancellationToken cancel = default)
+    {
+        var modules = await mediator.Send(new ReadThirdPartyModuleQuery()
+        {
+            Name = name,
+            Active = active,
+        }, cancel);
+
+        return modules.FirstOrDefault()?.License;
+    }
+}

EnvelopeGenerator.BBTests/EnvelopeGenerator.BBTests.vbproj

@@ -1,5 +1,5 @@
 <Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="..\packages\EntityFramework.6.4.4\build\EntityFramework.props" Condition="Exists('..\packages\EntityFramework.6.4.4\build\EntityFramework.props')" />
+  <Import Project="..\packages\EntityFramework.6.5.1\build\EntityFramework.props" Condition="Exists('..\packages\EntityFramework.6.5.1\build\EntityFramework.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">x86</Platform>
@@ -45,6 +45,9 @@
     <StartupObject>EnvelopeGenerator.My.MyApplication</StartupObject>
   </PropertyGroup>
   <ItemGroup>
+    <Reference Include="AutoMapper, Version=10.0.0.0, Culture=neutral, PublicKeyToken=be96cd2c38ef1005, processorArchitecture=MSIL">
+      <HintPath>..\packages\AutoMapper.10.1.1\lib\net461\AutoMapper.dll</HintPath>
+    </Reference>
     <Reference Include="BouncyCastle.Cryptography, Version=2.0.0.0, Culture=neutral, PublicKeyToken=072edcf4a5328938, processorArchitecture=MSIL">
       <HintPath>..\packages\BouncyCastle.Cryptography.2.5.0\lib\net461\BouncyCastle.Cryptography.dll</HintPath>
     </Reference>
@@ -67,6 +70,12 @@
     <Reference Include="DigitalData.Controls.DocumentViewer, Version=1.9.8.0, Culture=neutral, processorArchitecture=MSIL">
       <HintPath>..\packages\DigitalData.Controls.DocumentViewer.1.9.8\lib\net462\DigitalData.Controls.DocumentViewer.dll</HintPath>
     </Reference>
+    <Reference Include="DigitalData.Core.Abstraction.Application, Version=1.5.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\DigitalData.Core.Abstraction.Application.1.5.0\lib\net462\DigitalData.Core.Abstraction.Application.dll</HintPath>
+    </Reference>
+    <Reference Include="DigitalData.Core.Abstractions, Version=4.3.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\DigitalData.Core.Abstractions.4.3.0\lib\net462\DigitalData.Core.Abstractions.dll</HintPath>
+    </Reference>
     <Reference Include="DigitalData.Modules.Base, Version=1.3.8.0, Culture=neutral, processorArchitecture=MSIL">
       <HintPath>..\packages\DigitalData.Modules.Base.1.3.8\lib\net462\DigitalData.Modules.Base.dll</HintPath>
     </Reference>
@@ -92,13 +101,13 @@
       <HintPath>..\packages\DocumentFormat.OpenXml.Framework.3.2.0\lib\net46\DocumentFormat.OpenXml.Framework.dll</HintPath>
     </Reference>
     <Reference Include="EntityFramework, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL">
-      <HintPath>..\packages\EntityFramework.6.4.4\lib\net45\EntityFramework.dll</HintPath>
+      <HintPath>..\packages\EntityFramework.6.5.1\lib\net45\EntityFramework.dll</HintPath>
     </Reference>
     <Reference Include="EntityFramework.Firebird, Version=6.4.0.0, Culture=neutral, PublicKeyToken=42d22d092898e5f8, processorArchitecture=MSIL">
       <HintPath>..\packages\EntityFramework.Firebird.6.4.0\lib\net452\EntityFramework.Firebird.dll</HintPath>
     </Reference>
     <Reference Include="EntityFramework.SqlServer, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL">
-      <HintPath>..\packages\EntityFramework.6.4.4\lib\net45\EntityFramework.SqlServer.dll</HintPath>
+      <HintPath>..\packages\EntityFramework.6.5.1\lib\net45\EntityFramework.SqlServer.dll</HintPath>
     </Reference>
     <Reference Include="EnvelopeGenerator.CommonServices">
       <HintPath>..\EnvelopeGenerator.CommonServices\bin\Debug\EnvelopeGenerator.CommonServices.dll</HintPath>
@@ -176,11 +185,83 @@
     <Reference Include="Microsoft.Bcl.Cryptography, Version=9.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
       <HintPath>..\packages\Microsoft.Bcl.Cryptography.9.0.0\lib\net462\Microsoft.Bcl.Cryptography.dll</HintPath>
     </Reference>
-    <Reference Include="Microsoft.Identity.Client, Version=4.55.0.0, Culture=neutral, PublicKeyToken=0a613f4dd989e8ae, processorArchitecture=MSIL">
-      <HintPath>..\packages\Microsoft.Identity.Client.4.55.0\lib\net461\Microsoft.Identity.Client.dll</HintPath>
+    <Reference Include="Microsoft.Bcl.HashCode, Version=1.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.Bcl.HashCode.1.1.1\lib\net461\Microsoft.Bcl.HashCode.dll</HintPath>
     </Reference>
-    <Reference Include="Microsoft.IdentityModel.Abstractions, Version=6.22.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\packages\Microsoft.IdentityModel.Abstractions.6.22.0\lib\net461\Microsoft.IdentityModel.Abstractions.dll</HintPath>
+    <Reference Include="Microsoft.Data.SqlClient, Version=1.13.20136.2, Culture=neutral, PublicKeyToken=23ec7fc2d6eaa4a5, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.Data.SqlClient.1.1.3\lib\net46\Microsoft.Data.SqlClient.dll</HintPath>
+    </Reference>
+    <Reference Include="Microsoft.EntityFrameworkCore, Version=3.1.32.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.EntityFrameworkCore.3.1.32\lib\netstandard2.0\Microsoft.EntityFrameworkCore.dll</HintPath>
+    </Reference>
+    <Reference Include="Microsoft.EntityFrameworkCore.Abstractions, Version=3.1.32.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.EntityFrameworkCore.Abstractions.3.1.32\lib\netstandard2.0\Microsoft.EntityFrameworkCore.Abstractions.dll</HintPath>
+    </Reference>
+    <Reference Include="Microsoft.EntityFrameworkCore.Relational, Version=3.1.32.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.EntityFrameworkCore.Relational.3.1.32\lib\netstandard2.0\Microsoft.EntityFrameworkCore.Relational.dll</HintPath>
+    </Reference>
+    <Reference Include="Microsoft.EntityFrameworkCore.SqlServer, Version=3.1.32.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.EntityFrameworkCore.SqlServer.3.1.32\lib\netstandard2.0\Microsoft.EntityFrameworkCore.SqlServer.dll</HintPath>
+    </Reference>
+    <Reference Include="Microsoft.Extensions.Caching.Abstractions, Version=7.0.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.Extensions.Caching.Abstractions.7.0.0\lib\net462\Microsoft.Extensions.Caching.Abstractions.dll</HintPath>
+    </Reference>
+    <Reference Include="Microsoft.Extensions.Caching.Memory, Version=7.0.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.Extensions.Caching.Memory.7.0.0\lib\net462\Microsoft.Extensions.Caching.Memory.dll</HintPath>
+    </Reference>
+    <Reference Include="Microsoft.Extensions.Configuration, Version=7.0.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.Extensions.Configuration.7.0.0\lib\net462\Microsoft.Extensions.Configuration.dll</HintPath>
+    </Reference>
+    <Reference Include="Microsoft.Extensions.Configuration.Abstractions, Version=7.0.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.Extensions.Configuration.Abstractions.7.0.0\lib\net462\Microsoft.Extensions.Configuration.Abstractions.dll</HintPath>
+    </Reference>
+    <Reference Include="Microsoft.Extensions.Configuration.Binder, Version=7.0.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.Extensions.Configuration.Binder.7.0.0\lib\net462\Microsoft.Extensions.Configuration.Binder.dll</HintPath>
+    </Reference>
+    <Reference Include="Microsoft.Extensions.DependencyInjection, Version=7.0.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.Extensions.DependencyInjection.7.0.0\lib\net462\Microsoft.Extensions.DependencyInjection.dll</HintPath>
+    </Reference>
+    <Reference Include="Microsoft.Extensions.DependencyInjection.Abstractions, Version=7.0.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.Extensions.DependencyInjection.Abstractions.7.0.0\lib\net462\Microsoft.Extensions.DependencyInjection.Abstractions.dll</HintPath>
+    </Reference>
+    <Reference Include="Microsoft.Extensions.Localization.Abstractions, Version=7.0.16.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.Extensions.Localization.Abstractions.7.0.16\lib\net462\Microsoft.Extensions.Localization.Abstractions.dll</HintPath>
+    </Reference>
+    <Reference Include="Microsoft.Extensions.Logging, Version=7.0.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.Extensions.Logging.7.0.0\lib\net462\Microsoft.Extensions.Logging.dll</HintPath>
+    </Reference>
+    <Reference Include="Microsoft.Extensions.Logging.Abstractions, Version=7.0.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.Extensions.Logging.Abstractions.7.0.0\lib\net462\Microsoft.Extensions.Logging.Abstractions.dll</HintPath>
+    </Reference>
+    <Reference Include="Microsoft.Extensions.Options, Version=7.0.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.Extensions.Options.7.0.0\lib\net462\Microsoft.Extensions.Options.dll</HintPath>
+    </Reference>
+    <Reference Include="Microsoft.Extensions.Options.ConfigurationExtensions, Version=7.0.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.Extensions.Options.ConfigurationExtensions.7.0.0\lib\net462\Microsoft.Extensions.Options.ConfigurationExtensions.dll</HintPath>
+    </Reference>
+    <Reference Include="Microsoft.Extensions.Primitives, Version=7.0.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.Extensions.Primitives.7.0.0\lib\net462\Microsoft.Extensions.Primitives.dll</HintPath>
+    </Reference>
+    <Reference Include="Microsoft.Identity.Client, Version=4.77.0.0, Culture=neutral, PublicKeyToken=0a613f4dd989e8ae, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.Identity.Client.4.77.0\lib\net462\Microsoft.Identity.Client.dll</HintPath>
+    </Reference>
+    <Reference Include="Microsoft.IdentityModel.Abstractions, Version=8.14.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.IdentityModel.Abstractions.8.14.0\lib\net462\Microsoft.IdentityModel.Abstractions.dll</HintPath>
+    </Reference>
+    <Reference Include="Microsoft.IdentityModel.JsonWebTokens, Version=7.5.1.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.IdentityModel.JsonWebTokens.7.5.1\lib\net462\Microsoft.IdentityModel.JsonWebTokens.dll</HintPath>
+    </Reference>
+    <Reference Include="Microsoft.IdentityModel.Logging, Version=7.5.1.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.IdentityModel.Logging.7.5.1\lib\net462\Microsoft.IdentityModel.Logging.dll</HintPath>
+    </Reference>
+    <Reference Include="Microsoft.IdentityModel.Protocols, Version=5.5.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.IdentityModel.Protocols.5.5.0\lib\net461\Microsoft.IdentityModel.Protocols.dll</HintPath>
+    </Reference>
+    <Reference Include="Microsoft.IdentityModel.Protocols.OpenIdConnect, Version=5.5.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.IdentityModel.Protocols.OpenIdConnect.5.5.0\lib\net461\Microsoft.IdentityModel.Protocols.OpenIdConnect.dll</HintPath>
+    </Reference>
+    <Reference Include="Microsoft.IdentityModel.Tokens, Version=7.5.1.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.IdentityModel.Tokens.7.5.1\lib\net462\Microsoft.IdentityModel.Tokens.dll</HintPath>
     </Reference>
     <Reference Include="Newtonsoft.Json, Version=13.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
       <HintPath>..\packages\Newtonsoft.Json.13.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
@@ -216,16 +297,31 @@
     <Reference Include="System.Collections.Immutable, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
       <HintPath>..\packages\System.Collections.Immutable.9.0.0\lib\net462\System.Collections.Immutable.dll</HintPath>
     </Reference>
+    <Reference Include="System.ComponentModel.Annotations, Version=4.2.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.ComponentModel.Annotations.4.7.0\lib\net461\System.ComponentModel.Annotations.dll</HintPath>
+    </Reference>
     <Reference Include="System.ComponentModel.DataAnnotations" />
     <Reference Include="System.Configuration" />
     <Reference Include="System.Core" />
+    <Reference Include="System.Data.Common, Version=4.1.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Data.Common.4.3.0\lib\net451\System.Data.Common.dll</HintPath>
+      <Private>True</Private>
+      <Private>True</Private>
+    </Reference>
     <Reference Include="System.Data.Odbc, Version=6.0.0.1, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
       <HintPath>..\packages\System.Data.Odbc.6.0.1\lib\net461\System.Data.Odbc.dll</HintPath>
     </Reference>
+    <Reference Include="System.Diagnostics.DiagnosticSource, Version=7.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Diagnostics.DiagnosticSource.7.0.0\lib\net462\System.Diagnostics.DiagnosticSource.dll</HintPath>
+    </Reference>
+    <Reference Include="System.DirectoryServices.AccountManagement" />
     <Reference Include="System.Formats.Asn1, Version=9.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
       <HintPath>..\packages\System.Formats.Asn1.9.0.0\lib\net462\System.Formats.Asn1.dll</HintPath>
     </Reference>
     <Reference Include="System.IdentityModel" />
+    <Reference Include="System.IdentityModel.Tokens.Jwt, Version=7.5.1.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.IdentityModel.Tokens.Jwt.7.5.1\lib\net462\System.IdentityModel.Tokens.Jwt.dll</HintPath>
+    </Reference>
     <Reference Include="System.IO.Compression" />
     <Reference Include="System.IO.Packaging, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
       <HintPath>..\packages\System.IO.Packaging.9.0.0\lib\net462\System.IO.Packaging.dll</HintPath>
@@ -249,9 +345,25 @@
       <HintPath>..\packages\System.Runtime.CompilerServices.Unsafe.6.1.0\lib\net462\System.Runtime.CompilerServices.Unsafe.dll</HintPath>
     </Reference>
     <Reference Include="System.Security" />
+    <Reference Include="System.Security.Cryptography.Algorithms, Version=4.1.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Security.Cryptography.Algorithms.4.3.1\lib\net461\System.Security.Cryptography.Algorithms.dll</HintPath>
+      <Private>True</Private>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="System.Security.Cryptography.Cng, Version=5.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Security.Cryptography.Cng.5.0.0\lib\net462\System.Security.Cryptography.Cng.dll</HintPath>
+    </Reference>
     <Reference Include="System.Security.Cryptography.Pkcs, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
       <HintPath>..\packages\System.Security.Cryptography.Pkcs.9.0.0\lib\net462\System.Security.Cryptography.Pkcs.dll</HintPath>
     </Reference>
+    <Reference Include="System.Security.Cryptography.Primitives, Version=4.0.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Security.Cryptography.Primitives.4.3.0\lib\net46\System.Security.Cryptography.Primitives.dll</HintPath>
+      <Private>True</Private>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="System.Security.Principal.Windows, Version=5.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Security.Principal.Windows.5.0.0\lib\net461\System.Security.Principal.Windows.dll</HintPath>
+    </Reference>
     <Reference Include="System.Text.Encodings.Web, Version=9.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
       <HintPath>..\packages\System.Text.Encodings.Web.9.0.0\lib\net462\System.Text.Encodings.Web.dll</HintPath>
     </Reference>
@@ -358,6 +470,10 @@
       <Project>{4F32A98D-E6F0-4A09-BD97-1CF26107E837}</Project>
       <Name>EnvelopeGenerator.Domain</Name>
     </ProjectReference>
+    <ProjectReference Include="..\EnvelopeGenerator.Infrastructure\EnvelopeGenerator.Infrastructure.csproj">
+      <Project>{63e32615-0eca-42dc-96e3-91037324b7c7}</Project>
+      <Name>EnvelopeGenerator.Infrastructure</Name>
+    </ProjectReference>
   </ItemGroup>
   <ItemGroup>
     <Content Include="GdPicture.NET.14.barcode.1d.reader.64.dll" />
@@ -386,10 +502,12 @@
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
     <Error Condition="!Exists('..\packages\GdPicture.runtimes.windows.14.3.3\build\net462\GdPicture.runtimes.windows.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\GdPicture.runtimes.windows.14.3.3\build\net462\GdPicture.runtimes.windows.targets'))" />
-    <Error Condition="!Exists('..\packages\EntityFramework.6.4.4\build\EntityFramework.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\EntityFramework.6.4.4\build\EntityFramework.props'))" />
-    <Error Condition="!Exists('..\packages\EntityFramework.6.4.4\build\EntityFramework.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\EntityFramework.6.4.4\build\EntityFramework.targets'))" />
+    <Error Condition="!Exists('..\packages\EntityFramework.6.5.1\build\EntityFramework.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\EntityFramework.6.5.1\build\EntityFramework.props'))" />
+    <Error Condition="!Exists('..\packages\EntityFramework.6.5.1\build\EntityFramework.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\EntityFramework.6.5.1\build\EntityFramework.targets'))" />
+    <Error Condition="!Exists('..\packages\Microsoft.Data.SqlClient.SNI.1.1.0\build\net46\Microsoft.Data.SqlClient.SNI.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.Data.SqlClient.SNI.1.1.0\build\net46\Microsoft.Data.SqlClient.SNI.targets'))" />
   </Target>
-  <Import Project="..\packages\EntityFramework.6.4.4\build\EntityFramework.targets" Condition="Exists('..\packages\EntityFramework.6.4.4\build\EntityFramework.targets')" />
+  <Import Project="..\packages\EntityFramework.6.5.1\build\EntityFramework.targets" Condition="Exists('..\packages\EntityFramework.6.5.1\build\EntityFramework.targets')" />
+  <Import Project="..\packages\Microsoft.Data.SqlClient.SNI.1.1.0\build\net46\Microsoft.Data.SqlClient.SNI.targets" Condition="Exists('..\packages\Microsoft.Data.SqlClient.SNI.1.1.0\build\net46\Microsoft.Data.SqlClient.SNI.targets')" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it.
        Other similar extension points exist, see Microsoft.Common.targets.
   <Target Name="BeforeBuild">

EnvelopeGenerator.BBTests/app.config

@@ -107,6 +107,78 @@
         <assemblyIdentity name="GdPicture.NET.14.Imaging" publicKeyToken="f52a2e60ad468dbb" culture="neutral" />
         <bindingRedirect oldVersion="0.0.0.0-14.3.3.0" newVersion="14.3.3.0" />
       </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="Microsoft.Identity.Client" publicKeyToken="0a613f4dd989e8ae" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-4.77.0.0" newVersion="4.77.0.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="System.Diagnostics.DiagnosticSource" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-7.0.0.0" newVersion="7.0.0.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="Microsoft.IdentityModel.Abstractions" publicKeyToken="31bf3856ad364e35" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-8.14.0.0" newVersion="8.14.0.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="Microsoft.Bcl.AsyncInterfaces" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-9.0.0.0" newVersion="9.0.0.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="System.Text.Encodings.Web" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-9.0.0.0" newVersion="9.0.0.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="Microsoft.Extensions.DependencyInjection.Abstractions" publicKeyToken="adb9793829ddae60" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-7.0.0.0" newVersion="7.0.0.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="Microsoft.Extensions.Logging.Abstractions" publicKeyToken="adb9793829ddae60" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-7.0.0.0" newVersion="7.0.0.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="Microsoft.Extensions.Caching.Abstractions" publicKeyToken="adb9793829ddae60" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-7.0.0.0" newVersion="7.0.0.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="System.ComponentModel.Annotations" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-4.2.1.0" newVersion="4.2.1.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="Microsoft.Extensions.DependencyInjection" publicKeyToken="adb9793829ddae60" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-7.0.0.0" newVersion="7.0.0.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="Microsoft.Extensions.Logging" publicKeyToken="adb9793829ddae60" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-7.0.0.0" newVersion="7.0.0.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="Microsoft.Extensions.Caching.Memory" publicKeyToken="adb9793829ddae60" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-7.0.0.0" newVersion="7.0.0.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="Microsoft.Extensions.Options" publicKeyToken="adb9793829ddae60" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-7.0.0.0" newVersion="7.0.0.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="Microsoft.Extensions.Configuration.Abstractions" publicKeyToken="adb9793829ddae60" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-7.0.0.0" newVersion="7.0.0.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="Microsoft.IdentityModel.Logging" publicKeyToken="31bf3856ad364e35" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-7.5.1.0" newVersion="7.5.1.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="Microsoft.IdentityModel.Tokens" publicKeyToken="31bf3856ad364e35" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-7.5.1.0" newVersion="7.5.1.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="System.IdentityModel.Tokens.Jwt" publicKeyToken="31bf3856ad364e35" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-7.5.1.0" newVersion="7.5.1.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="Microsoft.IdentityModel.JsonWebTokens" publicKeyToken="31bf3856ad364e35" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-7.5.1.0" newVersion="7.5.1.0" />
+      </dependentAssembly>
     </assemblyBinding>
   </runtime>
   <entityFramework>

EnvelopeGenerator.BBTests/frmFinalizePDF.vb

@@ -1,10 +1,14 @@
-Imports DigitalData.Modules.Database
+Imports System.IO
+Imports DigitalData.Modules.Database
 Imports DigitalData.Modules.Logging
+Imports EnvelopeGenerator.CommonServices.Jobs
+Imports EnvelopeGenerator.CommonServices.Jobs.FinalizeDocument
 Imports GdPicture14
 Imports Newtonsoft.Json.Linq
-Imports EnvelopeGenerator.CommonServices.Jobs
-Imports System.IO
-Imports EnvelopeGenerator.CommonServices.Jobs.FinalizeDocument
+Imports EnvelopeGenerator.Infrastructure
+Imports Microsoft.EntityFrameworkCore
+Imports System.Text
+Imports DigitalData.Core.Abstractions
 
 Public Class frmFinalizePDF
     Private Const CONNECTIONSTRING = "Server=sDD-VMP04-SQL17\DD_DEVELOP01;Database=DD_ECM;User Id=sa;Password=+bk8oAbbQP1AzoHtvZUbd+Mbok2f8Fl4miEx1qssJ5yEaEWoQJ9prg4L14fURpPnqi1WMNs9fE4=;"
@@ -20,10 +24,35 @@ Public Class frmFinalizePDF
 
     Private Sub frmFinalizePDF_Load(sender As Object, e As EventArgs) Handles MyBase.Load
         LogConfig = New LogConfig(LogConfig.PathType.CustomPath, Application.StartupPath)
-        Database = New MSSQLServer(LogConfig, MSSQLServer.DecryptConnectionString(CONNECTIONSTRING))
 
+        Dim dCnnStr As String = MSSQLServer.DecryptConnectionString(CONNECTIONSTRING)
 
-        PDFBurner = New FinalizeDocument.PDFBurner(LogConfig, pGDPictureLicenseKey, _pdfBurnerParams)
+        Database = New MSSQLServer(LogConfig, dCnnStr)
+
+#Disable Warning BC40000 ' Type or member is obsolete
+        Factory.Shared _
+            .BehaveOnPostBuild(PostBuildBehavior.Ignore) _
+            .AddEGInfrastructureServices(
+                Sub(opt)
+                    opt.AddDbTriggerParams(
+                        Sub(triggers)
+                            triggers("Envelope") = New List(Of String) From {"TBSIG_ENVELOPE_AFT_INS"}
+                            triggers("History") = New List(Of String) From {"TBSIG_ENVELOPE_HISTORY_AFT_INS"}
+                            triggers("EmailOut") = New List(Of String) From {"TBEMLP_EMAIL_OUT_AFT_INS", "TBEMLP_EMAIL_OUT_AFT_UPD"}
+                            triggers("EnvelopeReceiverReadOnly") = New List(Of String) From {"TBSIG_ENVELOPE_RECEIVER_READ_ONLY_UPD"}
+                            triggers("Receiver") = New List(Of String)() ' no tigger
+                            triggers("EmailTemplate") = New List(Of String) From {"TBSIG_EMAIL_TEMPLATE_AFT_UPD"}
+                        End Sub)
+                    opt.AddDbContext(
+                        Sub(options)
+                            options.UseSqlServer(dCnnStr) _
+                                   .EnableSensitiveDataLogging() _
+                                   .EnableDetailedErrors()
+                        End Sub)
+                End Sub)
+#Enable Warning BC40000 ' Type or member is obsolete
+
+        PDFBurner = New PDFBurner(LogConfig, pGDPictureLicenseKey, _pdfBurnerParams)
 
         Viewer = New GdViewer()
         Manager = New AnnotationManager()
@@ -72,8 +101,9 @@ Public Class frmFinalizePDF
                 Select(Function(r As DataRow) r.Item("VALUE").ToString()).
                 ToList()
 
-            Dim oBuffer As Byte() = ReadEnvelope(CInt(txtEnvelope.Text))
-            Dim oNewBuffer = PDFBurner.BurnInstantJSONAnnotationsToPDF(oBuffer, oJsonList)
+            Dim envelopeId As Integer = CInt(txtEnvelope.Text)
+            Dim oBuffer As Byte() = ReadEnvelope(envelopeId)
+            Dim oNewBuffer = PDFBurner.BurnAnnotsToPDF(oBuffer, oJsonList, envelopeId)
             Dim desktopPath As String = Environment.GetFolderPath(Environment.SpecialFolder.Desktop)
             Dim oNewPath = Path.Combine(desktopPath, $"E{txtEnvelope.Text}R{txtReceiver.Text}.burned.pdf")
 
@@ -81,7 +111,15 @@ Public Class frmFinalizePDF
 
             Process.Start(oNewPath)
         Catch ex As Exception
-            MsgBox(ex.Message, MsgBoxStyle.Critical)
+            Dim exMsg As StringBuilder = New StringBuilder(ex.Message).AppendLine()
+
+            Dim innerEx = ex.InnerException
+            While (innerEx IsNot Nothing)
+                exMsg.AppendLine(innerEx.Message)
+                innerEx = innerEx.InnerException
+            End While
+
+            MsgBox(exMsg.ToString(), MsgBoxStyle.Critical)
         End Try
 
     End Sub
@@ -104,7 +142,7 @@ Public Class frmFinalizePDF
 
 
         Catch ex As Exception
-
+            MsgBox(ex.Message, MsgBoxStyle.Critical)
         End Try
     End Sub
 End Class