refactor(form): vbproj aktualisieren, um mit .net 8 zu konfigurieren.

- Verwandte Referenzen für net 9 hinzufügen.
 - Backup-XML-Datei für altes vbproj erstellen.

EnvelopeGenerator.Application.VB/EnvelopeGenerator.Application.VB.vbproj

@@ -1,8 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
-  <PropertyGroup>
-    <RootNamespace>EnvelopeGenerator.Application.VB</RootNamespace>
-    <TargetFrameworks>net7.0;net8.0;net9.0</TargetFrameworks>
-  </PropertyGroup>
-
-</Project>

EnvelopeGenerator.Application/Common/Configurations/DbTriggerParams.cs

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

EnvelopeGenerator.Application/Common/Configurations/GdPictureParams.cs

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

EnvelopeGenerator.Application/Common/Configurations/PDFBurnerParams.cs

@@ -1,78 +0,0 @@
-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

@@ -1,73 +0,0 @@
-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/EnvelopeReportDto.cs

@@ -1,44 +0,0 @@
-namespace EnvelopeGenerator.Application.Common.Dto;
-
-/// <summary>
-/// 
-/// </summary>
-public record EnvelopeReportDto
-{
-    /// <summary>
-    /// 
-    /// </summary>
-    public int EnvelopeId { get; set; }
-
-    // --- HEAD ---
-    /// <summary>
-    /// 
-    /// </summary>
-    public string HeadUuid { get; set; } = null!;
-
-    /// <summary>
-    /// 
-    /// </summary>
-    public string EnvelopeTitle { get; set; } = string.Empty;
-
-    /// <summary>
-    /// 
-    /// </summary>
-    public string HeadMessage { get; set; } = null!;
-
-    // --- POSITIONS ---
-    /// <summary>
-    /// 
-    /// </summary>
-    public int ItemStatus { get; set; }
-
-    /// <summary>
-    /// 
-    /// </summary>
-    public DateTime? ItemDate { get; set; }
-
-    /// <summary>
-    /// 
-    /// </summary>
-    public string ItemUserReference { get; set; } = null!;
-}

EnvelopeGenerator.Application/Common/Dto/MappingProfile.cs

@@ -35,9 +35,6 @@ public class MappingProfile : Profile
         CreateMap<EnvelopeType, EnvelopeTypeDto>();
         CreateMap<Domain.Entities.Receiver, ReceiverDto>();
         CreateMap<Domain.Entities.EnvelopeReceiverReadOnly, EnvelopeReceiverReadOnlyDto>();
-        CreateMap<ElementAnnotation, AnnotationDto>();
-        CreateMap<ThirdPartyModule, ThirdPartyModuleDto>();
-        CreateMap<EnvelopeReport, EnvelopeReportDto>();
 
         // DTO to Entity mappings
         CreateMap<ConfigDto, Config>();
@@ -53,8 +50,6 @@ 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

@@ -1,122 +0,0 @@
-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

@@ -1,8 +0,0 @@
-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

@@ -1,8 +0,0 @@
-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

@@ -1,8 +0,0 @@
-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

@@ -1,50 +0,0 @@
-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

@@ -1,7 +0,0 @@
-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,5 +1,4 @@
-using EnvelopeGenerator.Domain.Interfaces;
-using Microsoft.AspNetCore.Mvc;
+using Microsoft.AspNetCore.Mvc;
 
 namespace EnvelopeGenerator.Application.Common.Dto;
 
@@ -7,7 +6,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 : ISignature
+public class SignatureDto
 {
     /// <summary>
     /// Gets or sets the unique identifier of the element.

EnvelopeGenerator.Application/Common/Dto/ThirdPartyModuleDto.cs

@@ -1,57 +0,0 @@
-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

@@ -1,176 +0,0 @@
-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

@@ -1,18 +0,0 @@
-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

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

@@ -1,27 +0,0 @@
-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/Notifications/DocSigned/DocSignedNotification.cs

@@ -1,20 +1,11 @@
-using EnvelopeGenerator.Application.Common.Dto;
-using EnvelopeGenerator.Application.Common.Dto.EnvelopeReceiver;
-using EnvelopeGenerator.Application.Common.Extensions;
-using EnvelopeGenerator.Application.Common.Notifications.RemoveSignature;
+using EnvelopeGenerator.Application.Common.Dto.EnvelopeReceiver;
 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>
@@ -24,7 +15,7 @@ public record DocSignedNotification(EnvelopeReceiverDto Original) : EnvelopeRece
     /// <summary>
     /// 
     /// </summary>
-    public PsPdfKitAnnotation PsPdfKitAnnotation { get; init; } = null!;
+    public required ExpandoObject Annotations { get; init; }
 
     /// <summary>
     /// 
@@ -36,7 +27,7 @@ public record DocSignedNotification(EnvelopeReceiverDto Original) : EnvelopeRece
     /// </summary>
     public string EmailAddress => Receiver?.EmailAddress
         ?? throw new InvalidOperationException($"Receiver is null." +
-            $"DocSignedNotification:\n{this.ToJson(Format.Json.ForDiagnostics)}");
+            $"DocSignedNotification:\n{JsonConvert.SerializeObject(this, Format.Json.ForDiagnostics)}");
 }
 
 /// <summary>
@@ -48,41 +39,17 @@ 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="psPdfKitAnnotation"></param>
+    /// <param name="annotations"></param>
     /// <returns>A new <see cref="DocSignedNotification"/> instance.</returns>
-    public static DocSignedNotification ToDocSignedNotification(this EnvelopeReceiverDto dto, PsPdfKitAnnotation psPdfKitAnnotation)
-        => new(dto) { PsPdfKitAnnotation = psPdfKitAnnotation };
+    public static DocSignedNotification ToDocSignedNotification(this EnvelopeReceiverDto dto, ExpandoObject annotations)
+        => new(dto) { Annotations = annotations };
 
     /// <summary>
-    /// 
+    /// Asynchronously converts a <see cref="Task{EnvelopeReceiverDto}"/> to a <see cref="DocSignedNotification"/>.
     /// </summary>
-    /// <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;
-        }
-    }
+    /// <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;
 }

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

@@ -1,6 +1,8 @@
-using DigitalData.Core.Abstraction.Application.Repository;
-using EnvelopeGenerator.Domain.Entities;
+using EnvelopeGenerator.Application.Common.Notifications.DocSigned;
+using EnvelopeGenerator.Application.DocStatus.Commands;
+using EnvelopeGenerator.Domain.Constants;
 using MediatR;
+using Newtonsoft.Json;
 
 namespace EnvelopeGenerator.Application.Common.Notifications.DocSigned.Handlers;
 
@@ -9,18 +11,15 @@ namespace EnvelopeGenerator.Application.Common.Notifications.DocSigned.Handlers;
 /// </summary>
 public class AnnotationHandler : INotificationHandler<DocSignedNotification>
 {
-    /// <summary>
-    /// 
-    /// </summary>
-    private readonly IRepository<ElementAnnotation> _repo;
+    private readonly ISender _sender;
 
     /// <summary>
     /// 
     /// </summary>
-    /// <param name="repository"></param>
-    public AnnotationHandler(IRepository<ElementAnnotation> repository)
+    /// <param name="sender"></param>
+    public AnnotationHandler(ISender sender)
     {
-        _repo = repository;
+        _sender = sender;
     }
 
     /// <summary>
@@ -29,6 +28,13 @@ public class AnnotationHandler : INotificationHandler<DocSignedNotification>
     /// <param name="notification"></param>
     /// <param name="cancel"></param>
     /// <returns></returns>
-    public Task Handle(DocSignedNotification notification, CancellationToken cancel)
-        => _repo.CreateAsync(notification.PsPdfKitAnnotation.Structured, cancel);
+    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);
+    }
 }

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

@@ -1,39 +0,0 @@
-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,7 +1,8 @@
-using EnvelopeGenerator.Application.Common.Extensions;
+using EnvelopeGenerator.Application.Common.Notifications.DocSigned;
 using EnvelopeGenerator.Application.Histories.Commands;
 using EnvelopeGenerator.Domain.Constants;
 using MediatR;
+using Newtonsoft.Json;
 
 namespace EnvelopeGenerator.Application.Common.Notifications.DocSigned.Handlers;
 
@@ -29,14 +30,16 @@ public class HistoryHandler : INotificationHandler<DocSignedNotification>
     /// <returns></returns>
     public async Task Handle(DocSignedNotification notification, CancellationToken cancel)
     {
-        if (notification.Receiver is null)
-            throw new InvalidOperationException($"Receiver information is missing in the notification. DocSignedNotification:\n {notification.ToJson(Format.Json.ForDiagnostics)}");
+        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)}");
 
         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

@@ -1,53 +0,0 @@
-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

@@ -1,47 +0,0 @@
-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

@@ -1,53 +0,0 @@
-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

@@ -1,56 +0,0 @@
-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

@@ -1,37 +0,0 @@
-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,7 +1,6 @@
 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;
@@ -99,10 +98,10 @@ public abstract class SendMailHandler<TNotification> : INotificationHandler<TNot
         var placeHolders = CreatePlaceHolders(notification);
 
         var temp = await TempRepo
-            .Where(x => x.Name == notification.TemplateType.ToString())
-            .SingleOrDefaultAsync(cancel)
+            .ReadOnly()
+            .SingleOrDefaultAsync(x => x.Name == notification.TemplateType.ToString(), cancel)
                 ?? throw new InvalidOperationException($"Receiver information is missing in the notification." +
-                $"{typeof(TNotification)}:\n {notification.ToJson(Format.Json.ForDiagnostics)}");
+                $"{typeof(TNotification)}:\n {JsonConvert.SerializeObject(notification, Format.Json.ForDiagnostics)}");
 
         temp.Subject = ReplacePlaceHolders(temp.Subject, placeHolders, MailParams.Placeholders);
 
@@ -111,7 +110,7 @@ public abstract class SendMailHandler<TNotification> : INotificationHandler<TNot
         var emailOut = new EmailOut
         {
             EmailAddress = notification.EmailAddress,
-            EmailBody = temp.Body,
+            EmailBody = TextToHtml(temp.Body),
             EmailSubj = temp.Subject,
             AddedWhen = DateTime.UtcNow,
             AddedWho = DispatcherParams.AddedWho,
@@ -132,4 +131,22 @@ 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,14 +20,4 @@ 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.Common.Interfaces.SQLExecutor;
+using EnvelopeGenerator.Application.Interfaces.SQLExecutor;
 using EnvelopeGenerator.Domain.Entities;
 using System.Data;
 

EnvelopeGenerator.Application/Common/SQL/EnvelopeReceiverAddReadSQL.cs

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

EnvelopeGenerator.Application/DependencyInjection.cs

@@ -1,17 +1,12 @@
 using DigitalData.Core.Client;
 using EnvelopeGenerator.Application.Common.Configurations;
-using EnvelopeGenerator.Application.Common.Interfaces.Services;
+using EnvelopeGenerator.Application.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;
 
@@ -25,10 +20,9 @@ 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, bool usePdfBurner = false)
+    public static IServiceCollection AddEnvelopeGeneratorServices(this IServiceCollection services, IConfiguration config)
     {
         //Inject CRUD Service and repositoriesad
         services.TryAddScoped<IConfigService, ConfigService>();
@@ -52,31 +46,7 @@ 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)));
-
-        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.Configure<DbTriggerParams>(config.GetSection(nameof(DbTriggerParams)));
 
         services.AddHttpClientService<GtxMessagingParams>(config.GetSection(nameof(GtxMessagingParams)));
         services.TryAddSingleton<ISmsSender, GTXSmsSender>();
@@ -87,15 +57,8 @@ 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.Common.Interfaces.Repositories;
+using EnvelopeGenerator.Application.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.5.0" />
+		<PackageReference Include="DigitalData.Core.Abstraction.Application" Version="1.2.1" />
 		<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,35 +25,23 @@
 		<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,8 +91,6 @@ public class ReadEnvelopeReceiverQueryHandler : IRequestHandler<ReadEnvelopeRece
 {
     private readonly IRepository<EnvelopeReceiver> _repo;
 
-    private readonly IRepository<Receiver> _rcvRepo;
-
     private readonly IMapper _mapper;
 
     /// <summary>
@@ -100,11 +98,10 @@ public class ReadEnvelopeReceiverQueryHandler : IRequestHandler<ReadEnvelopeRece
     /// </summary>
     /// <param name="envelopeReceiver"></param>
     /// <param name="mapper"></param>
-    public ReadEnvelopeReceiverQueryHandler(IRepository<EnvelopeReceiver> envelopeReceiver, IRepository<Receiver> rcvRepo, IMapper mapper)
+    public ReadEnvelopeReceiverQueryHandler(IRepository<EnvelopeReceiver> envelopeReceiver, IMapper mapper)
     {
         _repo = envelopeReceiver;
         _mapper = mapper;
-        _rcvRepo = rcvRepo;
     }
 
     /// <summary>
@@ -141,14 +138,6 @@ 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/EnvelopeReports/ReadEnvelopeReportQuery.cs

@@ -1,92 +0,0 @@
-using AutoMapper;
-using DigitalData.Core.Abstraction.Application.Repository;
-using DigitalData.Core.Exceptions;
-using EnvelopeGenerator.Domain.Entities;
-using MediatR;
-using Microsoft.EntityFrameworkCore;
-using System;
-using System.Collections.Generic;
-using System.ComponentModel.DataAnnotations.Schema;
-using System.Linq;
-using System.Text;
-using System.Text.Json.Serialization;
-using System.Threading.Tasks;
-
-namespace EnvelopeGenerator.Application.EnvelopeReports;
-
-/// <summary>
-/// 
-/// </summary>
-public record ReadEnvelopeReportQuery(int EnvelopeId) : IRequest<IEnumerable<EnvelopeReport>>
-{
-    /// <summary>
-    /// 
-    /// </summary>
-    [JsonIgnore]
-    [NotMapped]
-    public bool ThrowIfNotFound { get; init; } = true;
-};
-
-/// <summary>
-/// 
-/// </summary>
-public static class ReadEnvelopeReportQueryExtensions
-{
-    /// <summary>
-    /// 
-    /// </summary>
-    /// <param name="sender"></param>
-    /// <param name="envelopeId"></param>
-    /// <param name="throwIfNotFound"></param>
-    /// <param name="cancel"></param>
-    /// <returns></returns>
-    public static Task<IEnumerable<EnvelopeReport>> ReadEnvelopeReportAsync(this ISender sender, int envelopeId, bool throwIfNotFound = true, CancellationToken cancel = default)
-        => sender.Send(new ReadEnvelopeReportQuery(envelopeId)
-        {
-            ThrowIfNotFound = throwIfNotFound
-        }, cancel);
-}
-
-/// <summary>
-/// 
-/// </summary>
-public class ReadEnvelopeReportQueryHandler : IRequestHandler<ReadEnvelopeReportQuery, IEnumerable<EnvelopeReport>>
-{
-    /// <summary>
-    /// 
-    /// </summary>
-    private readonly IRepository<EnvelopeReport> _repo;
-
-    /// <summary>
-    /// 
-    /// </summary>
-    private readonly IMapper _mapper;
-
-    /// <summary>
-    /// 
-    /// </summary>
-    /// <param name="repo"></param>
-    /// <param name="mapper"></param>
-    public ReadEnvelopeReportQueryHandler(IRepository<EnvelopeReport> repo, IMapper mapper)
-    {
-        _repo = repo;
-        _mapper = mapper;
-    }
-
-    /// <summary>
-    /// 
-    /// </summary>
-    /// <param name="request"></param>
-    /// <param name="cancel"></param>
-    /// <returns></returns>
-    public async Task<IEnumerable<EnvelopeReport>> Handle(ReadEnvelopeReportQuery request, CancellationToken cancel = default)
-    {
-        var reports = await _repo.Where(r => r.EnvelopeId == request.EnvelopeId).ToListAsync(cancel);
-        var reportDtos = _mapper.Map<IEnumerable<EnvelopeReport>>(reports);
-
-        if(request.ThrowIfNotFound && !reportDtos.Any())
-            throw new NotFoundException($"EnvelopeReport with EnvelopeId '{request.EnvelopeId}' was not found.");
-
-        return reportDtos;
-    }
-}

EnvelopeGenerator.Application/Envelopes/Commands/CreateEnvelopeCommand.cs

@@ -1,6 +1,6 @@
 using DigitalData.Core.Abstraction.Application.Repository;
 using EnvelopeGenerator.Application.Common.Dto;
-using EnvelopeGenerator.Application.Common.Interfaces.SQLExecutor;
+using EnvelopeGenerator.Application.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,29 +1,18 @@
 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<IEnumerable<EnvelopeDto>>
+public record ReadEnvelopeQuery : EnvelopeQueryBase, IRequest
 {
     /// <summary>
     /// Abfrage des Include des Umschlags
     /// </summary>
     public EnvelopeStatusQuery? Status { get; init; }
-
-    /// <summary>
-    /// 
-    /// </summary>
-    public bool? HasDocResult { get; init; }
 }
 
 /// <summary>
@@ -76,53 +65,4 @@ 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

@@ -1,19 +0,0 @@
-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

@@ -1,28 +0,0 @@
-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

@@ -1,22 +0,0 @@
-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

@@ -1,22 +0,0 @@
-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.UtcNow;
+    public DateTime AddedWhen { get; } = DateTime.Now;
 
     /// <summary>
     /// 

EnvelopeGenerator.Application/Interfaces/Repositories/IConfigRepository.cs

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

EnvelopeGenerator.Application/Interfaces/Repositories/IDocumentReceiverElementRepository.cs

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

EnvelopeGenerator.Application/Interfaces/Repositories/IDocumentStatusRepository.cs

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

EnvelopeGenerator.Application/Interfaces/Repositories/IEmailTemplateRepository.cs

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

EnvelopeGenerator.Application/Interfaces/Repositories/IEnvelopeDocumentRepository.cs

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

EnvelopeGenerator.Application/Interfaces/Repositories/IEnvelopeHistoryRepository.cs

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

EnvelopeGenerator.Application/Interfaces/Repositories/IEnvelopeReceiverReadOnlyRepository.cs

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

EnvelopeGenerator.Application/Interfaces/Repositories/IEnvelopeReceiverRepository.cs

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

EnvelopeGenerator.Application/Interfaces/Repositories/IEnvelopeRepository.cs

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

EnvelopeGenerator.Application/Interfaces/Repositories/IEnvelopeTypeRepository.cs

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

EnvelopeGenerator.Application/Interfaces/Repositories/IReceiverRepository.cs

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

EnvelopeGenerator.Application/Interfaces/SQLExecutor/IDocumentExecutor.cs

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

EnvelopeGenerator.Application/Interfaces/SQLExecutor/IEnvelopeExecutor.cs

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

EnvelopeGenerator.Application/Interfaces/SQLExecutor/IEnvelopeReceiverExecutor.cs

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

EnvelopeGenerator.Application/Interfaces/SQLExecutor/IQuery.cs

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

EnvelopeGenerator.Application/Interfaces/SQLExecutor/ISQL.cs

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

EnvelopeGenerator.Application/Interfaces/SQLExecutor/ISQLExecutor.cs

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

EnvelopeGenerator.Application/Interfaces/SQLExecutor/ISQLExecutorBaseEntity.cs

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

EnvelopeGenerator.Application/Interfaces/Services/IAuthenticator.cs

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

EnvelopeGenerator.Application/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.Common.Interfaces.Services;
+namespace EnvelopeGenerator.Application.Interfaces.Services;
 
 /// <summary>
 /// 

EnvelopeGenerator.Application/Interfaces/Services/IDocumentReceiverElementService.cs

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

EnvelopeGenerator.Application/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.Common.Interfaces.Services;
+namespace EnvelopeGenerator.Application.Interfaces.Services;
 
 /// <summary>
 /// 

EnvelopeGenerator.Application/Interfaces/Services/IEmailTemplateService.cs

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

EnvelopeGenerator.Application/Interfaces/Services/IEnvelopeDocumentService.cs

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

EnvelopeGenerator.Application/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.Common.Interfaces.Services;
+namespace EnvelopeGenerator.Application.Interfaces.Services;
 
 /// <summary>
 /// 

EnvelopeGenerator.Application/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.Common.Interfaces.Services;
+namespace EnvelopeGenerator.Application.Interfaces.Services;
 
 /// <summary>
 /// 

EnvelopeGenerator.Application/Interfaces/Services/IEnvelopeReceiverReadOnlyService.cs

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

EnvelopeGenerator.Application/Interfaces/Services/IEnvelopeReceiverService.cs

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

EnvelopeGenerator.Application/Interfaces/Services/IEnvelopeService.cs

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

EnvelopeGenerator.Application/Interfaces/Services/IEnvelopeSmsHandler.cs

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

EnvelopeGenerator.Application/Interfaces/Services/IEnvelopeTypeService.cs

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

EnvelopeGenerator.Application/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.Common.Interfaces.Services;
+namespace EnvelopeGenerator.Application.Interfaces.Services;
 
 /// <summary>
 /// 

EnvelopeGenerator.Application/Interfaces/Services/ISmsSender.cs

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

EnvelopeGenerator.Application/Pdf/Behaviors/AddReportBehavior.cs

@@ -1,107 +0,0 @@
-using MediatR;
-using EnvelopeGenerator.Application.Histories.Commands;
-using EnvelopeGenerator.Domain.Constants;
-using EnvelopeGenerator.Application.EnvelopeReports;
-using EnvelopeGenerator.Application.Exceptions;
-using EnvelopeGenerator.Domain.Entities;
-using Microsoft.Extensions.Logging;
-
-namespace EnvelopeGenerator.Application.Pdf.Behaviors;
-
-/// <summary>
-/// 
-/// </summary>
-public class AddReportBehavior : IPipelineBehavior<BurnPdfCommand, byte[]>
-{
-    private readonly ISender _sender;
-
-    private readonly ILogger<AddReportBehavior> _logger;
-
-    /// <summary>
-    /// 
-    /// </summary>
-    /// <param name="sender"></param>
-    /// <param name="logger"></param>
-    public AddReportBehavior(ISender sender, ILogger<AddReportBehavior> logger)
-    {
-        _sender = sender;
-        _logger = logger;
-    }
-
-    /// <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);
-
-        if (!request.Debug)
-            await _sender.Send(new CreateHistoryCommand()
-            {
-                EnvelopeId = request.EnvelopeId,
-                UserReference = "System",
-                Status = EnvelopeStatus.EnvelopeReportCreated,
-            }, cancel);
-
-        docResult = await CreateReport(request.Envelope!, cancel);
-
-        return docResult;
-    }
-
-    /// <summary>
-    /// 
-    /// </summary>
-    /// <param name="envelope"></param>
-    /// <param name="cancel"></param>
-    /// <returns></returns>
-    /// <exception cref="CreateReportException"></exception>
-    public async Task<byte[]> CreateReport(Envelope envelope, CancellationToken cancel)
-    {
-        var oItems = await _sender.ReadEnvelopeReportAsync(envelope.Id, cancel: cancel);
-
-        if (!oItems.Any())
-        {
-            throw new CreateReportException("No report data found!");
-        }
-
-        var oBuffer = DoCreateReport(oItems);
-
-        return oBuffer;
-    }
-
-    private byte[] DoCreateReport(IEnumerable<EnvelopeReport> oItems)
-    {
-        var oSource = new ReportSource { Items = oItems };
-        var oReport = new rptEnvelopeHistory
-        {
-            DataSource = oSource,
-            DataMember = "Items"
-        };
-
-        // Creating report in memory
-        oReport.CreateDocument();
-
-        // Exporting report to stream
-        using var oStream = new MemoryStream();
-        oReport.ExportToPdf(oStream);
-
-        // Writing report to buffer
-        return oStream.ToArray();
-    }
-
-    /// <summary>
-    /// 
-    /// </summary>
-    public class ReportSource
-    {
-        /// <summary>
-        /// 
-        /// </summary>
-        public required IEnumerable<EnvelopeReport> Items { get; init; }
-    }
-}

EnvelopeGenerator.Application/Pdf/Behaviors/SavePdfBehavior.cs

@@ -1,23 +0,0 @@
-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

@@ -1,299 +0,0 @@
-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.Configuration;
-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[]>
-{
-    internal bool Debug { get; set; }
-
-    internal Envelope? Envelope { get; set; }
-}
-
-/// <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;
-
-    private readonly IConfiguration _config;
-
-    /// <summary>
-    /// 
-    /// </summary>
-    /// <param name="pdfBurnerParams"></param>
-    /// <param name="manager"></param>
-    /// <param name="logger"></param>
-    /// <param name="envRepo"></param>
-    /// <param name="docStatusRepo"></param>
-    /// <param name="config"></param>
-    public BurnPdfCommandHandler(IOptions<PDFBurnerParams> pdfBurnerParams, AnnotationManager manager, ILogger<BurnPdfCommandHandler> logger, IRepository<Envelope> envRepo, IRepository<Domain.Entities.DocumentStatus> docStatusRepo, IConfiguration config)
-    {
-        _options = pdfBurnerParams.Value;
-        _manager = manager;
-        _docStatusRepo = docStatusRepo;
-        _logger = logger;
-        _envRepo = envRepo;
-        _config = config;
-    }
-
-
-    /// <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)
-    {
-        request.Debug = _config.GetValue<bool>("Debug");
-        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.");
-
-        request.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 = request.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 == request.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.Common.Interfaces.Services;
+using EnvelopeGenerator.Application.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 Microsoft.Extensions.Caching.Distributed;
+using EnvelopeGenerator.Application.Interfaces.Services;
+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

@@ -1,92 +0,0 @@
-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;
-    }
-}