fix(DependencyInjection): change AnnotationManager registration from Scoped to Transient

- Renamed parameter `SourceBuffer` to `Document` in BurnPdfCommand record
- Updated all usages of `request.SourceBuffer` to `request.Document`
- Reorganized method order for better readability (Handle moved up)
- No functional or behavioral changes introduced

EnvelopeGenerator.Application/Common/Configurations/GdPictureParams.cs

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

EnvelopeGenerator.Application/Common/Configurations/PDFBurnerParams.cs

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

@@ -74,11 +74,6 @@ public record EnvelopeDto
     /// </summary>
     public int? EnvelopeTypeId { get; set; }
 
-    /// <summary>
-    /// 
-    /// </summary>
-    public bool ReadOnly => EnvelopeTypeId == 2;
-
     /// <summary>
     /// 
     /// </summary>
@@ -87,7 +82,7 @@ public record EnvelopeDto
     /// <summary>
     /// 
     /// </summary>
-    public bool UseAccessCode { get; set; } = true;
+    public bool? UseAccessCode { get; set; }
 
     /// <summary>
     /// 

EnvelopeGenerator.Application/Common/Dto/MappingProfile.cs

@@ -36,6 +36,7 @@ public class MappingProfile : Profile
         CreateMap<Domain.Entities.Receiver, ReceiverDto>();
         CreateMap<Domain.Entities.EnvelopeReceiverReadOnly, EnvelopeReceiverReadOnlyDto>();
         CreateMap<ElementAnnotation, AnnotationDto>();
+        CreateMap<ThirdPartyModule, ThirdPartyModuleDto>();
 
         // DTO to Entity mappings
         CreateMap<ConfigDto, Config>();

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

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

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

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

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

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

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

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

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

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

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

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

EnvelopeGenerator.Application/Common/Dto/ThirdPartyModuleDto.cs

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

EnvelopeGenerator.Application/Common/Extensions/GdPictureExtensions.cs

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

EnvelopeGenerator.Application/Common/Extensions/MathematExtensions.cs

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

EnvelopeGenerator.Application/Common/Extensions/TaskExtensions.cs

@@ -5,7 +5,6 @@ namespace EnvelopeGenerator.Application.Common.Extensions;
 /// <summary>
 /// Extension methods for tasks
 /// </summary>
-[Obsolete("Implement Mediator behaviors in the Osolete .NET project.")]
 public static class TaskExtensions
 {
     /// <summary>
@@ -18,7 +17,6 @@ public static class TaskExtensions
     /// <param name="factory">Exception provider</param>
     /// <returns>The awaited result if not <c>null</c>.</returns>
     /// <exception>Thrown if the result is <c>null</c>.</exception>
-    [Obsolete("Implement Mediator behaviors in the Osolete .NET project.")]
     public static async Task<T> ThrowIfNull<T, TException>(this Task<T?> task, Func<TException> factory) where TException : Exception
     {
         var result = await task;
@@ -35,7 +33,6 @@ public static class TaskExtensions
     /// <param name="factory">Exception provider</param>
     /// <returns>The awaited collection if it is not <c>null</c> or empty.</returns>
     /// <exception cref="NotFoundException">Thrown if the result is <c>null</c> or empty.</exception>
-    [Obsolete("Implement Mediator behaviors in the Osolete .NET project.")]
     public static async Task<IEnumerable<T>> ThrowIfEmpty<T, TException>(this Task<IEnumerable<T>> task, Func<TException> factory) where TException : Exception
     {
         var result = await task;
@@ -50,33 +47,11 @@ public static class TaskExtensions
     /// <param name="task"></param>
     /// <param name="act"></param>
     /// <returns></returns>
-    [Obsolete("Implement Mediator behaviors in the Osolete .NET project.")]
     public static async Task<I> Then<T, I>(this Task<T> task, Func<T, I> act)
     {
         var res = await task;
         return act(res);
     }
-
-    /// <summary>
-    /// 
-    /// </summary>
-    /// <typeparam name="T"></typeparam>
-    /// <param name="task"></param>
-    /// <returns></returns>
-    [Obsolete("Implement Mediator behaviors in the Osolete .NET project.")]
-    public static Task<T?> FirstOrDefaultAsync<T>(this Task<IEnumerable<T>> task) => task.Then(t => t.FirstOrDefault());
-
-    /// <summary>
-    /// 
-    /// </summary>
-    /// <typeparam name="T"></typeparam>
-    /// <typeparam name="TException"></typeparam>
-    /// <param name="task"></param>
-    /// <param name="factory"></param>
-    /// <returns></returns>
-    public static Task<T> FirstAsync<T, TException>(this Task<IEnumerable<T>> task, Func<TException> factory) 
-        where TException : Exception 
-        => task.Then(t => t.FirstOrDefault() ?? throw factory());
 }
 
 /// <summary>
@@ -93,13 +68,11 @@ public static class Exceptions
     /// 
     /// </summary>
     /// <returns></returns>
-    [Obsolete("Implement Mediator behaviors in the Osolete .NET project.")]
     public static BadRequestException BadRequest() => new();
 
     /// <summary>
     /// 
     /// </summary>
     /// <returns></returns>
-    [Obsolete("Implement Mediator behaviors in the Osolete .NET project.")]
     public static ForbiddenException Forbidden() => new();
 }

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

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

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

@@ -24,7 +24,7 @@ public record DocSignedNotification(EnvelopeReceiverDto Original) : EnvelopeRece
     /// <summary>
     /// 
     /// </summary>
-    public PsPdfKitAnnotation? PsPdfKitAnnotation { get; init; }
+    public PsPdfKitAnnotation PsPdfKitAnnotation { get; init; } = null!;
 
     /// <summary>
     /// 
@@ -59,7 +59,7 @@ public static class DocSignedNotificationExtensions
     /// <param name="dtoTask"></param>
     /// <param name="psPdfKitAnnotation"></param>
     /// <returns></returns>
-    public static async Task<DocSignedNotification?> ToDocSignedNotification(this Task<EnvelopeReceiverDto?> dtoTask, PsPdfKitAnnotation? psPdfKitAnnotation)
+    public static async Task<DocSignedNotification?> ToDocSignedNotification(this Task<EnvelopeReceiverDto?> dtoTask, PsPdfKitAnnotation psPdfKitAnnotation)
         => await dtoTask is EnvelopeReceiverDto dto ? new(dto) { PsPdfKitAnnotation = psPdfKitAnnotation } : null;
 
     /// <summary>

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

@@ -29,9 +29,6 @@ public class AnnotationHandler : INotificationHandler<DocSignedNotification>
     /// <param name="notification"></param>
     /// <param name="cancel"></param>
     /// <returns></returns>
-    public async Task Handle(DocSignedNotification notification, CancellationToken cancel)
-    {
-        if (notification.PsPdfKitAnnotation is PsPdfKitAnnotation annot)
-            await _repo.CreateAsync(annot.Structured, cancel);
-    }
+    public Task Handle(DocSignedNotification notification, CancellationToken cancel)
+        => _repo.CreateAsync(notification.PsPdfKitAnnotation.Structured, cancel);
 }

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

@@ -10,8 +10,6 @@ namespace EnvelopeGenerator.Application.Common.Notifications.DocSigned.Handlers;
 /// </summary>
 public class DocStatusHandler : INotificationHandler<DocSignedNotification>
 {
-    private const string BlankAnnotationJson = "{}";
-
     private readonly ISender _sender;
 
     /// <summary>
@@ -35,9 +33,7 @@ public class DocStatusHandler : INotificationHandler<DocSignedNotification>
         {
             Envelope = new() { Id = notification.EnvelopeId },
             Receiver = new() { Id = notification.ReceiverId},
-            Value = notification.PsPdfKitAnnotation is PsPdfKitAnnotation annot 
-                    ? JsonSerializer.Serialize(annot.Instant, Format.Json.ForAnnotations) 
-                    : BlankAnnotationJson
+            Value = JsonSerializer.Serialize(notification.PsPdfKitAnnotation.Instant, Format.Json.ForAnnotations)
         }, cancel);
     }
 }

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

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

EnvelopeGenerator.Application/DependencyInjection.cs

@@ -2,11 +2,15 @@
 using EnvelopeGenerator.Application.Common.Configurations;
 using EnvelopeGenerator.Application.Common.Interfaces.Services;
 using EnvelopeGenerator.Application.Services;
+using EnvelopeGenerator.Application.ThirdPartyModules.Queries;
+using MediatR;
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.DependencyInjection.Extensions;
+using Microsoft.Extensions.Options;
 using QRCoder;
 using System.Reflection;
+using GdPicture14;
 
 namespace EnvelopeGenerator.Application;
 
@@ -46,6 +50,28 @@ public static class DependencyInjection
         services.Configure<MailParams>(config.GetSection(nameof(MailParams)));
         services.Configure<AuthenticatorParams>(config.GetSection(nameof(AuthenticatorParams)));
         services.Configure<TotpSmsParams>(config.GetSection(nameof(TotpSmsParams)));
+        services.Configure<PDFBurnerParams>(config.GetSection(nameof(PDFBurnerParams)));
+        services.AddOptions<GdPictureParams>()
+        .Configure((GdPictureParams opt, IServiceProvider sp) =>
+        {
+            var licenseKey = "GDPICTURE";
+            using var scope = sp.CreateScope();
+            var mediator = scope.ServiceProvider.GetRequiredService<IMediator>();
+            opt.License = config["GdPictureLicenseKey"]
+                ?? mediator.ReadThirdPartyModuleLicenseAsync(licenseKey).GetAwaiter().GetResult()
+                ?? throw new InvalidOperationException($"License record not found for key: {licenseKey}");
+        });
+        services.AddSingleton(provider =>         {
+            var license = provider.GetRequiredService<IOptions<GdPictureParams>>().Value.License;
+            var licenseManager = new LicenseManager();
+            licenseManager.RegisterKEY(license);
+            return licenseManager;
+        });
+        services.AddTransient(provider => {
+            // Ensure LicenseManager is resolved so that its constructor is called
+            _ = provider.GetRequiredService<LicenseManager>();
+            return new AnnotationManager();
+        });
 
         services.AddHttpClientService<GtxMessagingParams>(config.GetSection(nameof(GtxMessagingParams)));
         services.TryAddSingleton<ISmsSender, GTXSmsSender>();
@@ -58,6 +84,12 @@ public static class DependencyInjection
             cfg.RegisterServicesFromAssembly(Assembly.GetExecutingAssembly());
         });
 
+        // Add memory cache
+        services.AddMemoryCache();
+
+        // Register mail services
+        services.AddScoped<IEnvelopeMailService, EnvelopeMailService>();
+
         return services;
     }
 }

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.6.0" />
+		<PackageReference Include="DigitalData.Core.Abstraction.Application" Version="1.5.0" />
 		<PackageReference Include="DigitalData.Core.Application" Version="3.4.0" />
 		<PackageReference Include="DigitalData.Core.Client" Version="2.1.0" />
 		<PackageReference Include="DigitalData.Core.Exceptions" Version="1.1.0" />
@@ -25,23 +25,94 @@
 		<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" />
 	</ItemGroup>
 
 	<ItemGroup Condition="'$(TargetFramework)' == 'net8.0'">
 		<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="9.0.5" />
+		<PackageReference Include="System.Formats.Asn1" Version="9.0.10" />
 	</ItemGroup>
 
 	<ItemGroup Condition="'$(TargetFramework)' == 'net9.0'">
 		<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="9.0.5" />
+		<PackageReference Include="System.Formats.Asn1" Version="9.0.10" />
 	</ItemGroup>
 
 	<ItemGroup>
 		<ProjectReference Include="..\EnvelopeGenerator.Domain\EnvelopeGenerator.Domain.csproj" />
+		<ProjectReference Include="..\EnvelopeGenerator.PdfEditor\EnvelopeGenerator.PdfEditor.csproj" />
+	</ItemGroup>
+
+	<ItemGroup>
+	  <Reference Include="GdPicture.NET.14">
+	    <HintPath>..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.dll</HintPath>
+	  </Reference>
+	  <Reference Include="GdPicture.NET.14.barcode.1d.writer">
+	    <HintPath>..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.barcode.1d.writer.dll</HintPath>
+	  </Reference>
+	  <Reference Include="GdPicture.NET.14.barcode.2d.writer">
+	    <HintPath>..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.barcode.2d.writer.dll</HintPath>
+	  </Reference>
+	  <Reference Include="GdPicture.NET.14.CAD">
+	    <HintPath>..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.CAD.dll</HintPath>
+	  </Reference>
+	  <Reference Include="GdPicture.NET.14.CAD.DWG">
+	    <HintPath>..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.CAD.DWG.dll</HintPath>
+	  </Reference>
+	  <Reference Include="GdPicture.NET.14.Common">
+	    <HintPath>..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.Common.dll</HintPath>
+	  </Reference>
+	  <Reference Include="GdPicture.NET.14.Document">
+	    <HintPath>..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.Document.dll</HintPath>
+	  </Reference>
+	  <Reference Include="GdPicture.NET.14.Email">
+	    <HintPath>..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.Email.dll</HintPath>
+	  </Reference>
+	  <Reference Include="GdPicture.NET.14.HTML">
+	    <HintPath>..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.HTML.dll</HintPath>
+	  </Reference>
+	  <Reference Include="GdPicture.NET.14.Imaging">
+	    <HintPath>..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.Imaging.dll</HintPath>
+	  </Reference>
+	  <Reference Include="GdPicture.NET.14.Imaging.Formats">
+	    <HintPath>..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.Imaging.Formats.dll</HintPath>
+	  </Reference>
+	  <Reference Include="GdPicture.NET.14.Imaging.Formats.Conversion">
+	    <HintPath>..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.Imaging.Formats.Conversion.dll</HintPath>
+	  </Reference>
+	  <Reference Include="GdPicture.NET.14.Imaging.Rendering">
+	    <HintPath>..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.Imaging.Rendering.dll</HintPath>
+	  </Reference>
+	  <Reference Include="GdPicture.NET.14.MSOfficeBinary">
+	    <HintPath>..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.MSOfficeBinary.dll</HintPath>
+	  </Reference>
+	  <Reference Include="GdPicture.NET.14.OpenDocument">
+	    <HintPath>..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.OpenDocument.dll</HintPath>
+	  </Reference>
+	  <Reference Include="GdPicture.NET.14.OpenXML">
+	    <HintPath>..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.OpenXML.dll</HintPath>
+	  </Reference>
+	  <Reference Include="GdPicture.NET.14.OpenXML.Templating">
+	    <HintPath>..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.OpenXML.Templating.dll</HintPath>
+	  </Reference>
+	  <Reference Include="GdPicture.NET.14.PDF">
+	    <HintPath>..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.PDF.dll</HintPath>
+	  </Reference>
+	  <Reference Include="GdPicture.NET.14.RTF">
+	    <HintPath>..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.RTF.dll</HintPath>
+	  </Reference>
+	  <Reference Include="GdPicture.NET.14.SVG">
+	    <HintPath>..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.SVG.dll</HintPath>
+	  </Reference>
+	  <Reference Include="GdPicture.NET.14.wia.gateway">
+	    <HintPath>..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.wia.gateway.dll</HintPath>
+	  </Reference>
 	</ItemGroup>
 
 	<ItemGroup>

EnvelopeGenerator.Application/EnvelopeReceivers/Queries/ReadEnvelopeReceiverQuery.cs

@@ -1,4 +1,4 @@
-using AutoMapper;
+using AutoMapper;
 using DigitalData.Core.Abstraction.Application.Repository;
 using DigitalData.Core.Exceptions;
 using EnvelopeGenerator.Application.Envelopes.Queries;
@@ -47,13 +47,7 @@ namespace EnvelopeGenerator.Application.EnvelopeReceivers.Queries;
 /// Die Antwort enthält Details wie den Include, die Zuordnung zwischen Umschlag und Empfänger 
 /// sowie zusätzliche Metadaten.
 /// </remarks>
-public record ReadEnvelopeReceiverQuery : EnvelopeReceiverQueryBase<ReadEnvelopeQuery, ReadReceiverQuery>, IRequest<IEnumerable<EnvelopeReceiverDto>>
-{
-    /// <summary>
-    /// Optionaler Benutzernamefilter, um Ergebnisse auf Umschläge eines bestimmten Besitzers einzuschränken.
-    /// </summary>
-    public string? Username { get; init; }
-}
+public record ReadEnvelopeReceiverQuery : EnvelopeReceiverQueryBase<ReadEnvelopeQuery, ReadReceiverQuery>, IRequest<IEnumerable<EnvelopeReceiverDto>>;
 
 /// <summary>
 /// 
@@ -88,74 +82,73 @@ public static class Extensions
         q.Receiver.Signature = signature;
         return mediator.Send(q, cancel).Then(envRcvs => envRcvs.FirstOrDefault());
     }
+}
+
+/// <summary>
+/// 
+/// </summary>
+public class ReadEnvelopeReceiverQueryHandler : IRequestHandler<ReadEnvelopeReceiverQuery, IEnumerable<EnvelopeReceiverDto>>
+{
+    private readonly IRepository<EnvelopeReceiver> _repo;
+
+    private readonly IRepository<Receiver> _rcvRepo;
+
+    private readonly IMapper _mapper;
+
     /// <summary>
-    /// Verarbeitet <see cref="ReadEnvelopeReceiverQuery"/> und liefert passende <see cref="EnvelopeReceiverDto"/>-Ergebnisse.
+    /// 
     /// </summary>
-    public class ReadEnvelopeReceiverQueryHandler : IRequestHandler<ReadEnvelopeReceiverQuery, IEnumerable<EnvelopeReceiverDto>>
+    /// <param name="envelopeReceiver"></param>
+    /// <param name="mapper"></param>
+    public ReadEnvelopeReceiverQueryHandler(IRepository<EnvelopeReceiver> envelopeReceiver, IRepository<Receiver> rcvRepo, IMapper mapper)
     {
-        private readonly IRepository<EnvelopeReceiver> _repo;
-        private readonly IRepository<Receiver> _rcvRepo;
-        private readonly IMapper _mapper;
-
-        /// <summary>
-        /// 
-        /// </summary>
-        /// <param name="envelopeReceiver"></param>
-        /// <param name="rcvRepo"></param>
-        /// <param name="mapper"></param>
-        public ReadEnvelopeReceiverQueryHandler(IRepository<EnvelopeReceiver> envelopeReceiver, IRepository<Receiver> rcvRepo, IMapper mapper)
-        {
-            _repo = envelopeReceiver;
-            _mapper = mapper;
-            _rcvRepo = rcvRepo;
-        }
-
-        /// <summary>
-        /// 
-        /// </summary>
-        /// <param name="request"></param>
-        /// <param name="cancel"></param>
-        /// <returns></returns>
-        /// <exception cref="BadRequestException"></exception>
-        public async Task<IEnumerable<EnvelopeReceiverDto>> Handle(ReadEnvelopeReceiverQuery request, CancellationToken cancel)
-        {
-            var q = _repo.Query.Where(request, notnull: false);
-
-            if (request.Username is string username)
-                q = q.Where(er => er.Envelope!.User.Username == username);
-
-            if (request.Envelope.Status is not null)
-            {
-                var status = request.Envelope.Status;
-                if (status.Min is not null)
-                    q = q.Where(er => er.Envelope!.Status >= status.Min);
-
-                if (status.Max is not null)
-                    q = q.Where(er => er.Envelope!.Status <= status.Max);
-
-                if (status.Include?.Length > 0)
-                    q = q.Where(er => status.Include.Contains(er.Envelope!.Status));
-
-                if (status.Ignore is not null)
-                    q = q.Where(er => !status.Ignore.Contains(er.Envelope!.Status));
-            }
-
-            var envRcvs = await q
-                            .Include(er => er.Envelope).ThenInclude(e => e!.Documents!).ThenInclude(d => d.Elements)
-                            .Include(er => er.Envelope).ThenInclude(e => e!.Histories)
-                            .Include(er => er.Envelope).ThenInclude(e => e!.User)
-                            .Include(er => er.Receiver)
-                            .ToListAsync(cancel);
-
-            if (request.Receiver.HasAnyCriteria && envRcvs.Count != 0)
-            {
-                var receiver = await _rcvRepo.Query.Where(request.Receiver).FirstAsync(cancel);
-
-                foreach (var envRcv in envRcvs)
-                    envRcv.Envelope?.Documents?.FirstOrDefault()?.Elements?.RemoveAll(s => s.ReceiverId != receiver.Id);
-            }
-
-            return _mapper.Map<List<EnvelopeReceiverDto>>(envRcvs);
-        }
+        _repo = envelopeReceiver;
+        _mapper = mapper;
+        _rcvRepo = rcvRepo;
     }
-}
+
+    /// <summary>
+    /// 
+    /// </summary>
+    /// <param name="request"></param>
+    /// <param name="cancel"></param>
+    /// <returns></returns>
+    /// <exception cref="BadRequestException"></exception>
+    public async Task<IEnumerable<EnvelopeReceiverDto>> Handle(ReadEnvelopeReceiverQuery request, CancellationToken cancel)
+    {
+        var q = _repo.ReadOnly().Where(request, notnull: false);
+
+        if (request.Envelope.Status is not null)
+        {
+            var status = request.Envelope.Status;
+            if (status.Min is not null)
+                q = q.Where(er => er.Envelope!.Status >= status.Min);
+
+            if (status.Max is not null)
+                q = q.Where(er => er.Envelope!.Status <= status.Max);
+
+            if (status.Include?.Length > 0)
+                q = q.Where(er => status.Include.Contains(er.Envelope!.Status));
+
+            if (status.Ignore is not null)
+                q = q.Where(er => !status.Ignore.Contains(er.Envelope!.Status));
+        }
+
+        var envRcvs = await q
+                        .Include(er => er.Envelope).ThenInclude(e => e!.Documents!).ThenInclude(d => d.Elements)
+                        .Include(er => er.Envelope).ThenInclude(e => e!.Histories)
+                        .Include(er => er.Envelope).ThenInclude(e => e!.User)
+                        .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/EnvelopeTypes/Queries/ReadEnvelopeTypesQuery.cs

@@ -1,45 +0,0 @@
-using EnvelopeGenerator.Application.Common.Dto;
-using MediatR;
-using AutoMapper;
-using DigitalData.Core.Abstraction.Application.Repository;
-using EnvelopeGenerator.Domain.Entities;
-using Microsoft.EntityFrameworkCore;
-
-namespace EnvelopeGenerator.Application.EnvelopeTypes.Queries;
-
-/// <summary>
-/// 
-/// </summary>
-public record ReadEnvelopeTypesQuery : IRequest<IEnumerable<EnvelopeTypeDto>>;
-
-/// <summary>
-/// 
-/// </summary>
-public class ReadEnvelopeTypesQueryHandler : IRequestHandler<ReadEnvelopeTypesQuery, IEnumerable<EnvelopeTypeDto>>
-{
-    private readonly IRepository<EnvelopeType> _repository;
-    private readonly IMapper _mapper;
-
-    /// <summary>
-    /// 
-    /// </summary>
-    /// <param name="repository"></param>
-    /// <param name="mapper"></param>
-    public ReadEnvelopeTypesQueryHandler(IRepository<EnvelopeType> repository, IMapper mapper)
-    {
-        _repository = repository;
-        _mapper = mapper;
-    }
-
-    /// <summary>
-    /// 
-    /// </summary>
-    /// <param name="request"></param>
-    /// <param name="cancellationToken"></param>
-    /// <returns></returns>
-    public async Task<IEnumerable<EnvelopeTypeDto>> Handle(ReadEnvelopeTypesQuery request, CancellationToken cancellationToken)
-    {
-        var types = await _repository.Query.ToListAsync(cancellationToken);
-        return _mapper.Map<IEnumerable<EnvelopeTypeDto>>(types);
-    }
-}

EnvelopeGenerator.Application/Envelopes/Commands/CreateEnvelopeCommand.cs

@@ -33,18 +33,7 @@ public record CreateEnvelopeCommand : IRequest<EnvelopeDto?>
     /// <summary>
     /// ID des Absenders
     /// </summary>
-    internal int UserId { get; private set; }
-
-    /// <summary>
-    /// 
-    /// </summary>
-    /// <param name="userId"></param>
-    /// <returns></returns>
-    public bool Authorize(int userId)
-    {
-        UserId = userId;
-        return true;
-    }
+    public int UserId { get; set; }
 
     /// <summary>
     /// Determines which component is used for envelope processing.

EnvelopeGenerator.Application/Envelopes/Queries/ReadEnvelopeQuery.cs

@@ -4,6 +4,7 @@ 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;
 
@@ -20,14 +21,9 @@ public record ReadEnvelopeQuery : EnvelopeQueryBase, IRequest<IEnumerable<Envelo
     public EnvelopeStatusQuery? Status { get; init; }
 
     /// <summary>
-    /// Optionaler Benutzerfilter; wenn gesetzt, werden nur Umschläge des Benutzers geladen.
+    /// 
     /// </summary>
-    public int? UserId { get; init; }
-
-    /// <summary>
-    /// Setzt den Benutzerkontext für die Abfrage.
-    /// </summary>
-    public ReadEnvelopeQuery Authorize(int userId) => this with { UserId = userId };
+    public bool? HasDocResult { get; init; }
 }
 
 /// <summary>
@@ -83,22 +79,23 @@ public record EnvelopeStatusQuery
 }
 
 /// <summary>
-/// Verarbeitet <see cref="ReadEnvelopeQuery"/> und liefert passende <see cref="EnvelopeDto"/>-Ergebnisse.
+/// 
 /// </summary>
 public class ReadEnvelopeQueryHandler : IRequestHandler<ReadEnvelopeQuery, IEnumerable<EnvelopeDto>>
 {
-    private readonly IRepository<Envelope> _repository;
     private readonly IMapper _mapper;
 
+    private readonly IRepository<Envelope> _repo;
+
     /// <summary>
     /// 
     /// </summary>
-    /// <param name="repository"></param>
     /// <param name="mapper"></param>
-    public ReadEnvelopeQueryHandler(IRepository<Envelope> repository, IMapper mapper)
+    /// <param name="repo"></param>
+    public ReadEnvelopeQueryHandler(IMapper mapper, IRepository<Envelope> repo)
     {
-        _repository = repository;
         _mapper = mapper;
+        _repo = repo;
     }
 
     /// <summary>
@@ -107,34 +104,24 @@ public class ReadEnvelopeQueryHandler : IRequestHandler<ReadEnvelopeQuery, IEnum
     /// <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 query = _repository.Query;
+        var envelopesQ = _repo.Query.Where(request, notnull: false);
 
-        if (request.UserId is int userId)
-            query = query.Where(e => e.UserId == userId);
+        EnvelopeStatusQuery? statusQ = request.Status;
+        bool? hasDocResult = request.HasDocResult;
 
-        if (request.Id is int id)
-            query = query.Where(e => e.Id == id);
+        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;
 
-        if (request.Uuid is string uuid)
-            query = query.Where(e => e.Uuid == uuid);
-
-        if (request.Status is { } status)
-        {
-            if (status.Min is not null)
-                query = query.Where(e => e.Status >= status.Min);
-            if (status.Max is not null)
-                query = query.Where(e => e.Status <= status.Max);
-            if (status.Include?.Length > 0)
-                query = query.Where(e => status.Include.Contains(e.Status));
-            if (status.Ignore?.Length > 0)
-                query = query.Where(e => !status.Ignore.Contains(e.Status));
-        }
-
-        var envelopes = await query
-            .Include(e => e.Documents)
-            .ToListAsync(cancel);
+        var envelopes = await filtered.ToListAsync(cancel);
 
         return _mapper.Map<IEnumerable<EnvelopeDto>>(envelopes);
     }

EnvelopeGenerator.Application/Envelopes/Queries/ReadReceiverNameQuery.cs

@@ -1,8 +1,4 @@
-using DigitalData.Core.Abstraction.Application.Repository;
-using EnvelopeGenerator.Application.Common.Query;
-using MediatR;
-using EnvelopeGenerator.Domain.Entities;
-using Microsoft.EntityFrameworkCore;
+using EnvelopeGenerator.Application.Receivers.Queries;
 
 namespace EnvelopeGenerator.Application.Envelopes.Queries;
 
@@ -10,54 +6,6 @@ namespace EnvelopeGenerator.Application.Envelopes.Queries;
 /// Eine Abfrage, um die zuletzt verwendete Anrede eines Empfängers zu ermitteln, 
 /// damit diese für zukünftige Umschläge wiederverwendet werden kann.
 /// </summary>
-public record ReadReceiverNameQuery() : ReceiverQueryBase, IRequest<string?>;
-
-/// <summary>
-/// 
-/// </summary>
-public class ReadReceiverNameQueryHandler : IRequestHandler<ReadReceiverNameQuery, string?>
+public record ReadReceiverNameQuery() : ReadReceiverQuery
 {
-    private readonly IRepository<EnvelopeReceiver> _envelopeReceiverRepository;
-    private readonly IRepository<Receiver> _receiverRepository;
-
-    /// <summary>
-    /// 
-    /// </summary>
-    /// <param name="envelopeReceiverRepository"></param>
-    /// <param name="receiverRepository"></param>
-    public ReadReceiverNameQueryHandler(IRepository<EnvelopeReceiver> envelopeReceiverRepository, IRepository<Receiver> receiverRepository)
-    {
-        _envelopeReceiverRepository = envelopeReceiverRepository;
-        _receiverRepository = receiverRepository;
-    }
-
-    /// <summary>
-    /// 
-    /// </summary>
-    /// <param name="request"></param>
-    /// <param name="cancellationToken"></param>
-    /// <returns></returns>
-    public async Task<string?> Handle(ReadReceiverNameQuery request, CancellationToken cancellationToken)
-    {
-        var receiverQuery = _receiverRepository.Query.AsNoTracking();
-
-        if (request.Id is int id)
-            receiverQuery = receiverQuery.Where(r => r.Id == id);
-        if (request.EmailAddress is string email)
-            receiverQuery = receiverQuery.Where(r => r.EmailAddress == email);
-        if (request.Signature is string signature)
-            receiverQuery = receiverQuery.Where(r => r.Signature == signature);
-
-        var receiver = await receiverQuery.FirstOrDefaultAsync(cancellationToken);
-        if (receiver is null)
-            return null;
-
-        var erName = await _envelopeReceiverRepository.Query
-            .Where(er => er.ReceiverId == receiver.Id)
-            .OrderByDescending(er => er.AddedWhen)
-            .Select(er => er.Name)
-            .FirstOrDefaultAsync(cancellationToken);
-
-        return erName;
-    }
-}
+}

EnvelopeGenerator.Application/Exceptions/BurnAnnotationException.cs

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

EnvelopeGenerator.Application/Exceptions/CreateReportException.cs

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

EnvelopeGenerator.Application/Exceptions/ExportDocumentException.cs

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

EnvelopeGenerator.Application/Exceptions/MergeDocumentException.cs

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

EnvelopeGenerator.Application/Histories/Queries/CountHistoryQuery.cs

@@ -1,101 +0,0 @@
-using DigitalData.Core.Abstraction.Application.Repository;
-using DigitalData.Core.Exceptions;
-using EnvelopeGenerator.Domain.Constants;
-using EnvelopeGenerator.Domain.Entities;
-using MediatR;
-using Microsoft.EntityFrameworkCore;
-
-namespace EnvelopeGenerator.Application.Histories.Queries;
-
-//TODO: Add sender query
-/// <summary>
-/// Repräsentiert eine Abfrage für die Verlaufshistorie eines Umschlags.
-/// </summary>
-public record CountHistoryQuery : HistoryQueryBase, IRequest<int>;
-
-/// <summary>
-/// 
-/// </summary>
-public static class CountHistoryQueryExtensions
-{
-    /// <summary>
-    /// 
-    /// </summary>
-    /// <param name="sender"></param>
-    /// <param name="uuid"></param>
-    /// <param name="statuses"></param>
-    /// <param name="cancel"></param>
-    /// <returns></returns>
-    public static async Task<bool> AnyHistoryAsync(this ISender sender, string uuid, IEnumerable<EnvelopeStatus> statuses, CancellationToken cancel = default)
-    {
-        var count = await sender.Send(new CountHistoryQuery
-        {
-            Envelope = new() { Uuid = uuid },
-            Statuses = new() { Include = statuses }
-        }, cancel);
-        return count > 0;
-    }
-}
-
-/// <summary>
-/// 
-/// </summary>
-public class CountHistoryQueryHandler : IRequestHandler<CountHistoryQuery, int>
-{
-    private readonly IRepository<History> _repo;
-
-    /// <summary>
-    /// 
-    /// </summary>
-    /// <param name="repo"></param>
-    public CountHistoryQueryHandler(IRepository<History> repo)
-    {
-        _repo = repo;
-    }
-
-    /// <summary>
-    /// 
-    /// </summary>
-    /// <param name="request"></param>
-    /// <param name="cancel"></param>
-    /// <returns></returns>
-    /// <exception cref="NotFoundException"></exception>
-    public Task<int> Handle(CountHistoryQuery request, CancellationToken cancel = default)
-    {
-        var query = _repo.Query;
-
-        if (request.Envelope.Id is int envId)
-            query = query.Where(e => e.Id == envId);
-        else if (request.Envelope.Uuid is string uuid)
-            query = query.Where(e => e.Envelope!.Uuid == uuid);
-#pragma warning disable CS0618 // Type or member is obsolete
-        else if (request.EnvelopeId is not null)
-            query = query.Where(h => h.EnvelopeId == request.EnvelopeId);
-#pragma warning restore CS0618 // Type or member is obsolete
-        else
-            throw new BadRequestException("Invalid request: An Envelope object or a valid EnvelopeId/UUID must be supplied.");
-
-#pragma warning disable CS0618 // Type or member is obsolete
-        if (request.Status is not null)
-            query = query.Where(h => h.Status == request.Status);
-#pragma warning restore CS0618 // Type or member is obsolete
-
-        if (request.Statuses is not null)
-        {
-            var status = request.Statuses;
-            if (status.Min is not null)
-                query = query.Where(er => er.Envelope!.Status >= status.Min);
-
-            if (status.Max is not null)
-                query = query.Where(er => er.Envelope!.Status <= status.Max);
-
-            if (status.Include?.Count() > 0)
-                query = query.Where(er => status.Include.Contains(er.Envelope!.Status));
-
-            if (status.Ignore is not null)
-                query = query.Where(er => !status.Ignore.Contains(er.Envelope!.Status));
-        }
-
-        return query.CountAsync(cancel);
-    }
-}

EnvelopeGenerator.Application/Histories/Queries/HistoryQueryBase.cs

@@ -1,60 +0,0 @@
-using EnvelopeGenerator.Application.Common.Query;
-using EnvelopeGenerator.Domain.Constants;
-using System.ComponentModel.DataAnnotations;
-
-namespace EnvelopeGenerator.Application.Histories.Queries;
-
-//TODO: Add sender query
-/// <summary>
-/// 
-/// </summary>
-public record HistoryQueryBase
-{
-    /// <summary>
-    /// Die eindeutige Kennung des Umschlags.
-    /// </summary>
-    [Obsolete("Use Envelope property")]
-    public int? EnvelopeId { get; set; }
-
-    /// <summary>
-    /// Der Include des Umschlags, der abgefragt werden soll. Kann optional angegeben werden, um die Ergebnisse zu filtern.
-    /// </summary>
-    [Obsolete("Use statuses")]
-    public EnvelopeStatus? Status { get; set; }
-
-    /// <summary>
-    /// 
-    /// </summary>
-    public EnvelopeStatusQuery Statuses { get; set; } = new();
-
-    /// <summary>
-    /// 
-    /// </summary>
-    public EnvelopeQueryBase Envelope { get; set; } = new EnvelopeQueryBase();
-}
-
-/// <summary>
-/// 
-/// </summary>
-public record EnvelopeStatusQuery
-{
-    /// <summary>
-    /// Der minimale Statuswert, der berücksichtigt werden.
-    /// </summary>
-    public EnvelopeStatus? Min { get; init; }
-
-    /// <summary>
-    /// Der maximale Statuswert, der berücksichtigt werden.
-    /// </summary>
-    public EnvelopeStatus? Max { get; init; }
-
-    /// <summary>
-    /// Eine Liste von Statuswerten, die einbezogen werden.
-    /// </summary>
-    public IEnumerable<EnvelopeStatus>? Include { get; init; }
-
-    /// <summary>
-    /// Eine Liste von Statuswerten, die ignoriert werden werden.
-    /// </summary>
-    public IEnumerable<EnvelopeStatus>? Ignore { get; init; }
-}

EnvelopeGenerator.Application/Histories/Queries/ReadHistoryQuery.cs

@@ -1,10 +1,7 @@
-using AutoMapper;
-using DigitalData.Core.Abstraction.Application.Repository;
-using DigitalData.Core.Exceptions;
-using EnvelopeGenerator.Application.Common.Dto.History;
+using EnvelopeGenerator.Application.Common.Dto.History;
+using EnvelopeGenerator.Domain.Constants;
 using MediatR;
-using EnvelopeGenerator.Domain.Entities;
-using Microsoft.EntityFrameworkCore;
+using System.ComponentModel.DataAnnotations;
 
 namespace EnvelopeGenerator.Application.Histories.Queries;
 
@@ -12,81 +9,21 @@ namespace EnvelopeGenerator.Application.Histories.Queries;
 /// <summary>
 /// Repräsentiert eine Abfrage für die Verlaufshistorie eines Umschlags.
 /// </summary>
-public record ReadHistoryQuery : HistoryQueryBase, IRequest<IEnumerable<HistoryDto>>
+public record ReadHistoryQuery : IRequest<IEnumerable<HistoryDto>>
 {
+    /// <summary>
+    /// Die eindeutige Kennung des Umschlags.
+    /// </summary>
+    [Required]
+    public int EnvelopeId { get; init; }
+
+    /// <summary>
+    /// Der Include des Umschlags, der abgefragt werden soll. Kann optional angegeben werden, um die Ergebnisse zu filtern.
+    /// </summary>
+    public EnvelopeStatus? Status { get; init; }
+
     /// <summary>
     /// Abfrage zur Steuerung, ob nur der aktuelle Include oder der gesamte Datensatz zurückgegeben wird.
     /// </summary>
-    public bool OnlyLast { get; init; } = true;
-}
-
-/// <summary>
-/// 
-/// </summary>
-public class ReadHistoryQueryHandler : IRequestHandler<ReadHistoryQuery, IEnumerable<HistoryDto>>
-{
-    private readonly IRepository<History> _repo;
-
-    private readonly IMapper _mapper;
-
-    /// <summary>
-    /// 
-    /// </summary>
-    /// <param name="repo"></param>
-    /// <param name="mapper"></param>
-    public ReadHistoryQueryHandler(IRepository<History> repo, IMapper mapper)
-    {
-        _repo = repo;
-        _mapper = mapper;
-    }
-
-    /// <summary>
-    /// 
-    /// </summary>
-    /// <param name="request"></param>
-    /// <param name="cancel"></param>
-    /// <returns></returns>
-    /// <exception cref="NotFoundException"></exception>
-    public async Task<IEnumerable<HistoryDto>> Handle(ReadHistoryQuery request, CancellationToken cancel = default)
-    {
-        var query = _repo.Query;
-
-        if (request.Envelope.Id is int envId)
-            query = query.Where(e => e.Id == envId);
-        else if (request.Envelope.Uuid is string uuid)
-            query = query.Where(e => e.Envelope!.Uuid == uuid);
-#pragma warning disable CS0618 // Type or member is obsolete
-        else if (request.EnvelopeId is not null)
-            query = query.Where(h => h.EnvelopeId == request.EnvelopeId);
-#pragma warning restore CS0618 // Type or member is obsolete
-        else
-            throw new BadRequestException("Invalid request: An Envelope object or a valid EnvelopeId/UUID must be supplied.");
-
-#pragma warning disable CS0618 // Type or member is obsolete
-        if (request.Status is not null)
-            query = query.Where(h => h.Status == request.Status);
-#pragma warning restore CS0618 // Type or member is obsolete
-
-        if (request.Statuses is not null)
-        {
-            var status = request.Statuses;
-            if (status.Min is not null)
-                query = query.Where(er => er.Envelope!.Status >= status.Min);
-
-            if (status.Max is not null)
-                query = query.Where(er => er.Envelope!.Status <= status.Max);
-
-            if (status.Include?.Count() > 0)
-                query = query.Where(er => status.Include.Contains(er.Envelope!.Status));
-
-            if (status.Ignore is not null)
-                query = query.Where(er => !status.Ignore.Contains(er.Envelope!.Status));
-        }
-
-        if (request.OnlyLast)
-            query = query.OrderByDescending(x => x.AddedWhen);
-
-        var hists = await query.ToListAsync(cancel);
-        return _mapper.Map<List<HistoryDto>>(hists);
-    }
+    public bool? OnlyLast { get; init; } = true;
 }

EnvelopeGenerator.Application/Histories/Queries/ReadHistoryQueryHandler.cs

@@ -0,0 +1,47 @@
+using AutoMapper;
+using DigitalData.Core.Abstraction.Application.Repository;
+using DigitalData.Core.Exceptions;
+using EnvelopeGenerator.Application.Common.Dto.History;
+using EnvelopeGenerator.Domain.Entities;
+using MediatR;
+using Microsoft.EntityFrameworkCore;
+
+namespace EnvelopeGenerator.Application.Histories.Queries;
+
+/// <summary>
+/// 
+/// </summary>
+public class ReadHistoryQueryHandler : IRequestHandler<ReadHistoryQuery, IEnumerable<HistoryDto>>
+{
+    private readonly IRepository<History> _repo;
+
+    private readonly IMapper _mapper;
+
+    /// <summary>
+    /// 
+    /// </summary>
+    /// <param name="repo"></param>
+    /// <param name="mapper"></param>
+    public ReadHistoryQueryHandler(IRepository<History> repo, IMapper mapper)
+    {
+        _repo = repo;
+        _mapper = mapper;
+    }
+
+    /// <summary>
+    /// 
+    /// </summary>
+    /// <param name="request"></param>
+    /// <param name="cancel"></param>
+    /// <returns></returns>
+    /// <exception cref="NotFoundException"></exception>
+    public async Task<IEnumerable<HistoryDto>> Handle(ReadHistoryQuery request, CancellationToken cancel = default)
+    {
+        var query = _repo.ReadOnly().Where(h => h.EnvelopeId == request.EnvelopeId);
+        if (request.Status is not null)
+            query = query.Where(h => h.Status == request.Status);
+
+        var hists = await query.ToListAsync(cancel);
+        return _mapper.Map<List<HistoryDto>>(hists);
+    }
+}

EnvelopeGenerator.Application/Pdf/BurnPdfCommand.cs

@@ -0,0 +1,241 @@
+using DigitalData.Core.Abstraction.Application.Repository;
+using EnvelopeGenerator.Application.Common.Configurations;
+using EnvelopeGenerator.Application.Exceptions;
+using EnvelopeGenerator.Application.Common.Dto.PSPDFKitInstant;
+using EnvelopeGenerator.Domain.Constants;
+using EnvelopeGenerator.Domain.Entities;
+using GdPicture14;
+using MediatR;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.Extensions.Logging;
+using Microsoft.Extensions.Options;
+using Newtonsoft.Json;
+using EnvelopeGenerator.Application.Common.Extensions;
+
+namespace EnvelopeGenerator.Application.Pdf;
+
+/// <summary>
+/// 
+/// </summary>
+public record BurnPdfCommand(byte[] Document, List<string> InstantJSONList, int EnvelopeId) : IRequest<byte[]>;
+
+/// <summary>
+/// 
+/// </summary>
+public class BurnPdfCommandHandler : IRequestHandler<BurnPdfCommand, byte[]>
+{
+    private readonly PDFBurnerParams _options;
+
+    private readonly AnnotationManager _manager;
+
+    private readonly IRepository<Signature> _signRepo;
+
+    private readonly ILogger<BurnPdfCommandHandler> _logger;
+
+    /// <summary>
+    /// 
+    /// </summary>
+    /// <param name="pdfBurnerParams"></param>
+    /// <param name="manager"></param>
+    /// <param name="signRepo"></param>
+    /// <param name="logger"></param>
+    public BurnPdfCommandHandler(IOptions<PDFBurnerParams> pdfBurnerParams, AnnotationManager manager, IRepository<Signature> signRepo, ILogger<BurnPdfCommandHandler> logger)
+    {
+        _options = pdfBurnerParams.Value;
+        _manager = manager;
+        _signRepo = signRepo;
+        _logger = logger;
+    }
+
+
+    /// <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)
+    {
+        // read the elements of envelope with their annotations
+        var elements = await _signRepo
+            .Where(sig => sig.Document.EnvelopeId == request.EnvelopeId)
+            .Include(sig => sig.Annotations)
+            .ToListAsync(cancel);
+
+        return elements.Count > 0
+            ? BurnElementAnnotsToPDF(request.Document, elements)
+            : BurnInstantJSONAnnotsToPDF(request.Document, request.InstantJSONList);
+    }
+
+    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/Receivers/Queries/ReadReceiverQuery.cs

@@ -1,10 +1,4 @@
-using AutoMapper;
-using DigitalData.Core.Abstraction.Application.Repository;
-using EnvelopeGenerator.Application.Common.Dto.Receiver;
-using EnvelopeGenerator.Application.Common.Query;
-using MediatR;
-using EnvelopeGenerator.Domain.Entities;
-using Microsoft.EntityFrameworkCore;
+using EnvelopeGenerator.Application.Common.Query;
 
 namespace EnvelopeGenerator.Application.Receivers.Queries;
 
@@ -12,53 +6,4 @@ namespace EnvelopeGenerator.Application.Receivers.Queries;
 /// Stellt eine Abfrage dar, um die Details eines Empfängers zu lesen.
 /// um spezifische Informationen über einen Empfänger abzurufen.
 /// </summary>
-public record ReadReceiverQuery : ReceiverQueryBase, IRequest<IEnumerable<ReceiverDto>>;
-
-/// <summary>
-/// 
-/// </summary>
-public class ReadReceiverQueryHandler : IRequestHandler<ReadReceiverQuery, IEnumerable<ReceiverDto>>
-{
-    private readonly IRepository<Receiver> _repository;
-    private readonly IMapper _mapper;
-
-    /// <summary>
-    /// 
-    /// </summary>
-    /// <param name="repository"></param>
-    /// <param name="mapper"></param>
-    public ReadReceiverQueryHandler(IRepository<Receiver> repository, IMapper mapper)
-    {
-        _repository = repository;
-        _mapper = mapper;
-    }
-
-    /// <summary>
-    /// 
-    /// </summary>
-    /// <param name="request"></param>
-    /// <param name="cancellationToken"></param>
-    /// <returns></returns>
-    public async Task<IEnumerable<ReceiverDto>> Handle(ReadReceiverQuery request, CancellationToken cancellationToken)
-    {
-        var query = _repository.Query;
-
-        if (request.Id is int id)
-        {
-            query = query.Where(r => r.Id == id);
-        }
-
-        if (request.EmailAddress is string email)
-        {
-            query = query.Where(r => r.EmailAddress == email);
-        }
-
-        if (request.Signature is string signature)
-        {
-            query = query.Where(r => r.Signature == signature);
-        }
-
-        var receiver = await query.ToListAsync(cancellationToken);
-        return _mapper.Map<IEnumerable<ReceiverDto>>(receiver);
-    }
-}
+public record ReadReceiverQuery : ReceiverQueryBase;

EnvelopeGenerator.Application/ThirdPartyModules/Queries/ReadThirdPartyModuleQuery.cs

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

EnvelopeGenerator.BBTests/EnvelopeGenerator.BBTests.vbproj

@@ -70,8 +70,8 @@
     <Reference Include="DigitalData.Controls.DocumentViewer, Version=1.9.8.0, Culture=neutral, processorArchitecture=MSIL">
       <HintPath>..\packages\DigitalData.Controls.DocumentViewer.1.9.8\lib\net462\DigitalData.Controls.DocumentViewer.dll</HintPath>
     </Reference>
-    <Reference Include="DigitalData.Core.Abstraction.Application, Version=1.6.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\DigitalData.Core.Abstraction.Application.1.6.0\lib\net462\DigitalData.Core.Abstraction.Application.dll</HintPath>
+    <Reference Include="DigitalData.Core.Abstraction.Application, Version=1.5.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\DigitalData.Core.Abstraction.Application.1.5.0\lib\net462\DigitalData.Core.Abstraction.Application.dll</HintPath>
     </Reference>
     <Reference Include="DigitalData.Core.Abstractions, Version=4.3.0.0, Culture=neutral, processorArchitecture=MSIL">
       <HintPath>..\packages\DigitalData.Core.Abstractions.4.3.0\lib\net462\DigitalData.Core.Abstractions.dll</HintPath>
@@ -109,6 +109,9 @@
     <Reference Include="EntityFramework.SqlServer, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL">
       <HintPath>..\packages\EntityFramework.6.5.1\lib\net45\EntityFramework.SqlServer.dll</HintPath>
     </Reference>
+    <Reference Include="EnvelopeGenerator.CommonServices">
+      <HintPath>..\EnvelopeGenerator.CommonServices\bin\Debug\EnvelopeGenerator.CommonServices.dll</HintPath>
+    </Reference>
     <Reference Include="FirebirdSql.Data.FirebirdClient, Version=7.5.0.0, Culture=neutral, PublicKeyToken=3750abcc3150b00c, processorArchitecture=MSIL">
       <HintPath>..\packages\FirebirdSql.Data.FirebirdClient.7.5.0\lib\net452\FirebirdSql.Data.FirebirdClient.dll</HintPath>
     </Reference>
@@ -463,12 +466,8 @@
       <Project>{6EA0C51F-C2B1-4462-8198-3DE0B32B74F8}</Project>
       <Name>EnvelopeGenerator.CommonServices</Name>
     </ProjectReference>
-    <ProjectReference Include="..\EnvelopeGenerator.CommonServices\EnvelopeGenerator.CommonServices.vbproj">
-      <Project>{6ea0c51f-c2b1-4462-8198-3de0b32b74f8}</Project>
-      <Name>EnvelopeGenerator.CommonServices</Name>
-    </ProjectReference>
     <ProjectReference Include="..\EnvelopeGenerator.Domain\EnvelopeGenerator.Domain.csproj">
-      <Project>{4f32a98d-e6f0-4a09-bd97-1cf26107e837}</Project>
+      <Project>{4F32A98D-E6F0-4A09-BD97-1CF26107E837}</Project>
       <Name>EnvelopeGenerator.Domain</Name>
     </ProjectReference>
     <ProjectReference Include="..\EnvelopeGenerator.Infrastructure\EnvelopeGenerator.Infrastructure.csproj">
@@ -496,9 +495,6 @@
     <Content Include="MailLicense.xml" />
     <Content Include="README.txt" />
   </ItemGroup>
-  <ItemGroup>
-    <WCFMetadata Include="Connected Services\" />
-  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.VisualBasic.targets" />
   <Import Project="..\packages\GdPicture.runtimes.windows.14.3.3\build\net462\GdPicture.runtimes.windows.targets" Condition="Exists('..\packages\GdPicture.runtimes.windows.14.3.3\build\net462\GdPicture.runtimes.windows.targets')" />
   <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">

EnvelopeGenerator.BBTests/frmFinalizePDF.vb

@@ -32,7 +32,7 @@ Public Class frmFinalizePDF
 #Disable Warning BC40000 ' Type or member is obsolete
         Factory.Shared _
             .BehaveOnPostBuild(PostBuildBehavior.Ignore) _
-            .AddEnvelopeGeneratorInfrastructureServices(
+            .AddEGInfrastructureServices(
                 Sub(opt)
                     opt.AddDbTriggerParams(
                         Sub(triggers)

EnvelopeGenerator.BBTests/packages.config

@@ -3,7 +3,7 @@
   <package id="AutoMapper" version="10.1.1" targetFramework="net462" />
   <package id="BouncyCastle.Cryptography" version="2.5.0" targetFramework="net462" />
   <package id="DigitalData.Controls.DocumentViewer" version="1.9.8" targetFramework="net462" />
-  <package id="DigitalData.Core.Abstraction.Application" version="1.6.0" targetFramework="net462" />
+  <package id="DigitalData.Core.Abstraction.Application" version="1.5.0" targetFramework="net462" />
   <package id="DigitalData.Core.Abstractions" version="4.3.0" targetFramework="net462" />
   <package id="DigitalData.Modules.Base" version="1.3.8" targetFramework="net462" />
   <package id="DigitalData.Modules.Config" version="1.3.0" targetFramework="net462" />

EnvelopeGenerator.CommonServices/EnvelopeGenerator.CommonServices.vbproj

@@ -72,8 +72,8 @@
     <Reference Include="DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
     <Reference Include="DevExpress.XtraGauges.v21.2.Core, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
     <Reference Include="DevExpress.XtraReports.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
-    <Reference Include="DigitalData.Core.Abstraction.Application, Version=1.6.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\DigitalData.Core.Abstraction.Application.1.6.0\lib\net462\DigitalData.Core.Abstraction.Application.dll</HintPath>
+    <Reference Include="DigitalData.Core.Abstraction.Application, Version=1.5.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\DigitalData.Core.Abstraction.Application.1.5.0\lib\net462\DigitalData.Core.Abstraction.Application.dll</HintPath>
     </Reference>
     <Reference Include="DigitalData.Core.Abstractions, Version=4.3.0.0, Culture=neutral, processorArchitecture=MSIL">
       <HintPath>..\packages\DigitalData.Core.Abstractions.4.3.0\lib\net462\DigitalData.Core.Abstractions.dll</HintPath>

EnvelopeGenerator.CommonServices/Jobs/FinalizeDocument/FinalizeDocumentJob.vb

@@ -72,7 +72,7 @@ Namespace Jobs
 #Disable Warning BC40000 ' Type or member is obsolete
                 Factory.Shared _
                 .BehaveOnPostBuild(PostBuildBehavior.Ignore) _
-                .AddEnvelopeGeneratorInfrastructureServices(
+                .AddEGInfrastructureServices(
                 Sub(opt)
                     opt.AddDbTriggerParams(
                         Sub(triggers)
@@ -422,7 +422,7 @@ Namespace Jobs
         End Function
 
         Private Function GetEnvelopeData(pEnvelopeId As Integer) As EnvelopeData
-            Dim oSql = $"SELECT T.GUID, T.ENVELOPE_UUID, T.ENVELOPE_TYPE, T2.FILEPATH, T2.BYTE_DATA FROM [dbo].[TBSIG_ENVELOPE] T
+            Dim oSql = $"SELECT T.GUID, T.ENVELOPE_UUID,T2.FILEPATH, T2.BYTE_DATA FROM [dbo].[TBSIG_ENVELOPE] T
                 JOIN TBSIG_ENVELOPE_DOCUMENT T2 ON T.GUID = T2.ENVELOPE_ID
                 WHERE T.GUID = {pEnvelopeId}"
             Dim oTable As DataTable = Database.GetDatatable(oSql)

EnvelopeGenerator.CommonServices/Jobs/FinalizeDocument/PDFBurner.vb

@@ -37,15 +37,6 @@ Namespace Jobs.FinalizeDocument
         Public Function BurnAnnotsToPDF(pSourceBuffer As Byte(), pInstantJSONList As List(Of String), envelopeId As Integer) As Byte()
             'read the elements of envelope with their annotations
             Using scope = Factory.Shared.ScopeFactory.CreateScope()
-
-                Dim envRepo = scope.ServiceProvider.Repository(Of Envelope)()
-                Dim envelope = envRepo.Where(Function(env) env.Id = envelopeId).FirstOrDefault()
-                If envelope Is Nothing Then
-                    Throw New BurnAnnotationException($"Envelope with Id {envelopeId} not found.")
-                ElseIf envelope.ReadOnly Then
-                    Return pSourceBuffer
-                End If
-
                 Dim sigRepo = scope.ServiceProvider.Repository(Of Signature)()
                 Dim elements = sigRepo _
                     .Where(Function(sig) sig.Document.EnvelopeId = envelopeId) _

EnvelopeGenerator.CommonServices/packages.config

@@ -2,7 +2,7 @@
 <packages>
   <package id="AutoMapper" version="10.1.1" targetFramework="net462" />
   <package id="BouncyCastle.Cryptography" version="2.5.0" targetFramework="net462" />
-  <package id="DigitalData.Core.Abstraction.Application" version="1.6.0" targetFramework="net462" />
+  <package id="DigitalData.Core.Abstraction.Application" version="1.5.0" targetFramework="net462" />
   <package id="DigitalData.Core.Abstractions" version="4.3.0" targetFramework="net462" />
   <package id="DigitalData.Modules.Base" version="1.3.8" targetFramework="net462" />
   <package id="DigitalData.Modules.Config" version="1.3.0" targetFramework="net462" />

EnvelopeGenerator.DependencyInjection/DependencyInjection.cs

@@ -0,0 +1,98 @@
+using DigitalData.EmailProfilerDispatcher;
+using DigitalData.UserManager.DependencyInjection;
+using EnvelopeGenerator.Application;
+using EnvelopeGenerator.Infrastructure;
+using Microsoft.Extensions.Caching.SqlServer;
+using Microsoft.Extensions.Configuration;
+using Microsoft.Extensions.DependencyInjection;
+using static EnvelopeGenerator.Infrastructure.DependencyInjection;
+
+namespace EnvelopeGenerator.DependencyInjection;
+
+public static class DependencyInjection
+{
+    public static IServiceCollection AddEnvelopeGenerator(this IServiceCollection services, Action<EGConfiguration> options)
+    {
+        var egConfig = new EGConfiguration();
+        options.Invoke(egConfig);
+        egConfig.EnsureAllServicesConfigured();
+        egConfig.RegisterAll(services);
+
+        // Add envelope generator services
+#pragma warning disable CS0618
+        services.AddUserManager<EGDbContext>();
+#pragma warning restore CS0618
+
+        services.AddDispatcher<EGDbContext>();
+
+        return services;
+    }
+
+    public record EGConfiguration
+    {
+        internal readonly Queue<Action<IServiceCollection>> _serviceRegs = new();
+
+        internal void RegisterAll(IServiceCollection services)
+        {
+            while (_serviceRegs.Count > 0)
+                _serviceRegs.Dequeue().Invoke(services);
+        }
+
+        // TODO: update to use attributes and reflections instead of _addingStatus-dictionary
+        private readonly Dictionary<string, bool> _addingStatus = new ()
+        {
+            { nameof(AddLocalization), false },
+            { nameof(AddDistributedSqlServerCache), false },
+            { nameof(AddInfrastructure), false },
+            { nameof(AddServices), false },
+        };
+
+        public EGConfiguration AddLocalization(Action<IServiceCollection>? customLocalizationOptions = null)
+        {
+            _serviceRegs.Enqueue(customLocalizationOptions ?? (s => s.AddLocalization()));
+            _addingStatus[nameof(AddLocalization)] = true;
+            return this;
+        }
+
+        public EGConfiguration AddDistributedSqlServerCache(Action<SqlServerCacheOptions> setupAction)
+        {
+            _serviceRegs.Enqueue(s => s.AddDistributedSqlServerCache(setupAction));
+            _addingStatus[nameof(AddDistributedSqlServerCache)] = true;
+            return this;
+        }
+
+        public EGConfiguration AddInfrastructure(Action<EGInfrastructureConfiguration> options)
+        {
+#pragma warning disable CS0618
+            _serviceRegs.Enqueue(s => s.AddEGInfrastructureServices(options));
+#pragma warning restore CS0618
+            _addingStatus[nameof(AddInfrastructure)] = true;
+            return this;
+        }
+
+        public EGConfiguration AddServices(IConfiguration config)
+        {
+#pragma warning disable CS0618
+            _serviceRegs.Enqueue(s => s.AddEnvelopeGeneratorServices(config));
+#pragma warning restore CS0618
+            _addingStatus[nameof(AddServices)] = true;
+            return this;
+        }
+
+        internal void EnsureAllServicesConfigured()
+        {
+            var missingServices = _addingStatus
+                .Where(kv => !kv.Value)
+                .Select(kv => kv.Key)
+                .ToList();
+
+            if (missingServices.Count > 0)
+            {
+                var missingList = string.Join(", ", missingServices);
+                throw new InvalidOperationException(
+                    $"Service configuration incomplete. The following required service methods were not called: {missingList}. " +
+                    "Please ensure all necessary configuration methods are invoked before building the application.");
+            }
+        }
+    }
+}

EnvelopeGenerator.DependencyInjection/EnvelopeGenerator.DependencyInjection.csproj

@@ -0,0 +1,20 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>net8.0</TargetFramework>
+    <ImplicitUsings>enable</ImplicitUsings>
+    <Nullable>enable</Nullable>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="9.0.10" />
+    <PackageReference Include="Microsoft.Extensions.Caching.SqlServer" Version="9.0.10" />
+    <PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="9.0.10" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\EnvelopeGenerator.Application\EnvelopeGenerator.Application.csproj" />
+    <ProjectReference Include="..\EnvelopeGenerator.Infrastructure\EnvelopeGenerator.Infrastructure.csproj" />
+  </ItemGroup>
+
+</Project>

EnvelopeGenerator.Domain/Constants/AnnotationType.cs

@@ -0,0 +1,13 @@
+namespace EnvelopeGenerator.Domain.Constants
+{
+    public static class AnnotationType
+    {
+        public static class PSPDFKit
+        {
+            public const string Image = "pspdfkit/image";
+            public const string Ink = "pspdfkit/ink";
+            public const string Widget = "pspdfkit/widget";
+            public const string FormField = "pspdfkit/form-field-value";
+        }
+    }
+}

EnvelopeGenerator.Domain/Entities/Envelope.cs

@@ -2,8 +2,6 @@
 using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
 using EnvelopeGenerator.Domain.Constants;
-using Newtonsoft.Json;
-
 #if NETFRAMEWORK
 using System;
 using System.Collections.Generic;
@@ -108,10 +106,6 @@ public class Envelope
     [Column("ENVELOPE_TYPE")]
     public int? EnvelopeTypeId { get; set; }
 
-    [JsonIgnore]
-    [NotMapped]
-    public bool ReadOnly => EnvelopeTypeId == 2;
-    
     [Column("CERTIFICATION_TYPE")]
     public int? CertificationType { get; set; }
 
@@ -139,14 +133,12 @@ public class Envelope
         = false;
 #endif
 
-    [NotMapped]
     [Column("DOC_RESULT")]
     public byte[]
 #if NET
         ?
 #endif
-        DocResult
-    { get; set; }
+        DocResult { get; set; }
 
     [ForeignKey("EnvelopeTypeId")]
     public virtual EnvelopeType

EnvelopeGenerator.Domain/Entities/Signature.cs

@@ -5,6 +5,8 @@ using System.ComponentModel.DataAnnotations.Schema;
 #if NETFRAMEWORK
 using System;
 using System.Collections.Generic;
+#elif NET
+using System.Text.Json.Serialization;
 #endif
 
 namespace EnvelopeGenerator.Domain.Entities
@@ -120,13 +122,17 @@ public class Signature : ISignature, IHasReceiver
 #endif
         Annotations { get; set; }
 
-#if NETFRAMEWORK
+#if NET
+    [JsonIgnore]
+#endif
     [NotMapped]
     public double Top => Math.Round(Y, 5);
 
+#if NET
+    [JsonIgnore]
+#endif
     [NotMapped]
     public double Left => Math.Round(X, 5);
-#endif
 }
 
 #if NETFRAMEWORK

EnvelopeGenerator.Domain/Entities/ThirdPartyModule.cs

@@ -0,0 +1,73 @@
+using System.ComponentModel.DataAnnotations;
+using System.ComponentModel.DataAnnotations.Schema;
+#if NETFRAMEWORK
+using System;
+#endif
+
+namespace EnvelopeGenerator.Domain.Entities
+{
+    [Table("TBDD_3RD_PARTY_MODULES")]
+    public class ThirdPartyModule
+    {
+        [Key]
+        [DatabaseGenerated(DatabaseGeneratedOption.Identity)]
+        [Column("GUID")]
+        public int Id { get; set; }
+
+        [Required]
+        [Column("ACTIVE")]
+        public bool Active { get; set; }
+
+        [Required]
+        [StringLength(50)]
+        [Column("NAME")]
+        public string Name { get; set; }
+
+        [StringLength(500)]
+        [Column("DESCRIPTION")]
+        public string
+#if nullable
+            ?
+#endif
+            Description { get; set; }
+
+        [Required]
+        [Column("LICENSE", TypeName = "varchar(max)")]
+        public string License { get; set; }
+
+        [Required]
+        [StringLength(20)]
+        [Column("VERSION")]
+        public string Version { get; set; }
+
+        [StringLength(50)]
+        [Column("ADDED_WHO")]
+        public string
+#if nullable
+            ?
+#endif
+            AddedWho { get; set; }
+
+        [Column("ADDED_WHEN")]
+        public DateTime
+#if nullable
+            ?
+#endif
+            AddedWhen { get; set; }
+
+        [StringLength(50)]
+        [Column("CHANGED_WHO")]
+        public string
+#if nullable
+            ?
+#endif
+            ChangedWho { get; set; }
+
+        [Column("CHANGED_WHEN")]
+        public DateTime
+#if nullable
+            ?
+#endif
+            ChangedWhen { get; set; }
+    }
+}

EnvelopeGenerator.Finalizer/EnvelopeGenerator.Finalizer.csproj

@@ -0,0 +1,44 @@
+<Project Sdk="Microsoft.NET.Sdk.Web">
+
+  <PropertyGroup>
+    <TargetFramework>net8.0</TargetFramework>
+    <Nullable>enable</Nullable>
+    <ImplicitUsings>enable</ImplicitUsings>
+    <UserSecretsId>dotnet-EnvelopeGenerator.Finalizer-6d5cc618-4159-4ff2-b600-8a15fbfa8099</UserSecretsId>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Quartz.AspNetCore" Version="3.15.1" />
+    <PackageReference Include="Quartzmon" Version="1.0.5" />
+    <PackageReference Include="Swashbuckle.AspNetCore" Version="6.6.2" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="9.0.10" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="9.0.10" />
+    <PackageReference Include="Microsoft.Extensions.Hosting" Version="8.0.1" />
+    <PackageReference Include="Quartz" Version="3.15.1" />
+    <PackageReference Include="Quartz.Extensions.Hosting" Version="3.15.1" />
+    <PackageReference Include="Serilog.AspNetCore" Version="9.0.0" />
+    <PackageReference Include="Serilog.Settings.Configuration" Version="9.0.0" />
+    <PackageReference Include="Serilog.Sinks.Console" Version="6.0.0" />
+    <PackageReference Include="Serilog.Sinks.File" Version="7.0.0" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\EnvelopeGenerator.Application\EnvelopeGenerator.Application.csproj" />
+    <ProjectReference Include="..\EnvelopeGenerator.DependencyInjection\EnvelopeGenerator.DependencyInjection.csproj" />
+    <ProjectReference Include="..\EnvelopeGenerator.Infrastructure\EnvelopeGenerator.Infrastructure.csproj" />
+  </ItemGroup>
+	
+  <ItemGroup>
+    <Folder Include="Controllers\" />
+    <Folder Include="Controllers\" />
+  </ItemGroup>
+	
+  <ItemGroup>
+    <Content Update="appsettings.Database.json">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Update="appsettings.Logging.json">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+  </ItemGroup>
+</Project>

EnvelopeGenerator.Finalizer/Extensions.cs

@@ -0,0 +1,35 @@
+using EnvelopeGenerator.Finalizer.Job;
+using Quartz;
+
+namespace EnvelopeGenerator.Finalizer;
+
+public static class Extensions
+{
+    public static IServiceCollectionQuartzConfigurator ScheduleJobDefault<TJob>(this IServiceCollectionQuartzConfigurator q,
+        string croneEpression)
+        where TJob : IJob
+    {
+        var name = $"{typeof(TJob).FullName}";
+        var jobKey = new JobKey(name);
+
+        return q.ScheduleJob<TJob>(trigger => trigger
+            .WithIdentity(name + "-trigger")
+            .WithCronSchedule(croneEpression),
+            job => job.WithIdentity(jobKey)
+        );
+    }
+
+    public static IServiceCollectionQuartzConfigurator ScheduleJobDefault<TJob>(this IServiceCollectionQuartzConfigurator q,
+        IConfiguration configuration)
+        where TJob : IJob
+    {
+        var expression = configuration[$"{typeof(TJob).Name}:CronExpression"];
+        if (string.IsNullOrWhiteSpace(expression))
+            throw new InvalidOperationException(
+                "Cron expression for the Worker job is not configured. " +
+                "Please provide a valid cron schedule in the configuration under " +
+                $"'{typeof(TJob).FullName}:CronExpression'.");
+
+        return q.ScheduleJobDefault<TJob>(expression);
+    }
+}

EnvelopeGenerator.Finalizer/Job/EnvelopeTaskApiJob.cs

@@ -0,0 +1,24 @@
+using Quartz;
+
+namespace EnvelopeGenerator.Finalizer.Job
+{
+    public class EnvelopeTaskApiJob : IJob
+    {
+        private readonly ILogger<EnvelopeTaskApiJob> _logger;
+
+        public EnvelopeTaskApiJob(ILogger<EnvelopeTaskApiJob> logger)
+        {
+            _logger = logger;
+        }
+
+        public Task Execute(IJobExecutionContext context)
+        {
+            if (_logger.IsEnabled(LogLevel.Information))
+            {
+                _logger.LogInformation("{jobName} running at: {time}", context.JobDetail.Key, DateTimeOffset.Now);
+            }
+
+            return Task.CompletedTask;
+        }
+    }
+}

EnvelopeGenerator.Finalizer/Job/FinishEnvelopeJob.cs

@@ -0,0 +1,55 @@
+using EnvelopeGenerator.Application.Envelopes.Queries;
+using EnvelopeGenerator.Domain.Constants;
+using EnvelopeGenerator.Finalizer.Models;
+using MediatR;
+using Microsoft.Extensions.Options;
+using Quartz;
+
+namespace EnvelopeGenerator.Finalizer.Job
+{
+    public class FinishEnvelopeJob : IJob
+    {
+        private readonly ILogger<FinishEnvelopeJob> _logger;
+
+        private readonly GdPictureOptions _gdPictureOptions;
+
+        private readonly IMediator _mediator;
+
+        public FinishEnvelopeJob(ILogger<FinishEnvelopeJob> logger, IOptions<GdPictureOptions> gdPictureOptions, IMediator mediator)
+        {
+            _logger = logger;
+            _gdPictureOptions = gdPictureOptions.Value;
+            _mediator = mediator;
+        }
+
+        public async Task Execute(IJobExecutionContext context)
+        {
+            var cancel = context.CancellationToken;
+
+            var envelopes = await _mediator.Send(new ReadEnvelopeQuery()
+            {
+                Status = new() { Include = [EnvelopeStatus.EnvelopeCompletelySigned] },
+                HasDocResult = false
+            }, cancel);
+
+            foreach (var envelope in envelopes) 
+            {
+                // add sub-steps
+            }
+
+            if (envelopes.Any())
+                _logger.LogInformation(
+                    "Job '{JobName}' executed at {Timestamp}. {EnvelopeCount} envelope(s) successfully finalized. UUID(s): {EnvelopeUuids}",
+                    context.JobDetail.Key.Name,
+                    DateTimeOffset.Now,
+                    envelopes.Count(),
+                    string.Join(", ", envelopes.Select(e => e.Uuid))
+                );
+            else
+                _logger.LogInformation("Job '{JobName}' executed successfully at {Timestamp}. No envelopes were finalized.",
+                    context.JobDetail.Key.Name,
+                    DateTimeOffset.Now
+                );
+        }
+    }
+}

EnvelopeGenerator.Finalizer/Program.cs

@@ -0,0 +1,134 @@
+using CommandDotNet.Execution;
+using EnvelopeGenerator.Application.ThirdPartyModules.Queries;
+using EnvelopeGenerator.DependencyInjection;
+using EnvelopeGenerator.Finalizer;
+using EnvelopeGenerator.Finalizer.Job;
+using EnvelopeGenerator.Finalizer.Models;
+using EnvelopeGenerator.Infrastructure;
+using MediatR;
+using Microsoft.EntityFrameworkCore;
+using Quartz;
+using Quartz.AspNetCore;
+using Quartz.Impl;
+using Quartzmon;
+using Serilog;
+
+// Load Serilog from appsettings.json
+Log.Logger = new LoggerConfiguration()
+    .ReadFrom.Configuration(new ConfigurationBuilder()
+        .AddJsonFile("appsettings.Logging.json", optional: false, reloadOnChange: true)
+        .Build())
+        .CreateLogger();
+
+try
+{
+    Log.Information("Application is starting...");
+
+    var builder = WebApplication.CreateBuilder(args);
+
+    #region Logging
+    builder.Logging.ClearProviders();
+    builder.Logging.AddSerilog();
+    #endregion
+
+    #region Configuration
+    var config = builder.Configuration;
+    Directory
+        .GetFiles(builder.Environment.ContentRootPath, "appsettings.*.json", SearchOption.TopDirectoryOnly)
+        .Where(file => Path.GetFileName(file) != $"appsettings.Development.json")
+        .Where(file => Path.GetFileName(file) != $"appsettings.migration.json")
+        .ToList()
+        .ForEach(file => config.AddJsonFile(file, true, true));
+    #endregion
+
+    #region Web API Services
+    builder.Services.AddControllers();
+    builder.Services.AddEndpointsApiExplorer();
+    builder.Services.AddSwaggerGen();
+    #endregion
+
+    #region Quartz
+    builder.Services.AddQuartz(q =>
+    {
+        q.ScheduleJobDefault<FinishEnvelopeJob>(config);
+        q.ScheduleJobDefault<EnvelopeTaskApiJob>(config);
+    });
+
+    builder.Services.AddQuartzServer(options =>
+    {
+        options.WaitForJobsToComplete = true;
+    });
+
+    builder.Services.AddQuartzmon();
+
+    builder.Services.AddSingleton(provider =>
+        provider.GetRequiredService<ISchedulerFactory>().GetScheduler().Result
+    );
+    #endregion
+
+    #region Add DB Context, EG Inf. and Services
+    var cnnStrName = "Default";
+    var connStr = config.GetConnectionString(cnnStrName)
+        ?? throw new InvalidOperationException($"Connection string '{cnnStrName}' is missing in the application configuration.");
+
+    builder.Services.AddEnvelopeGenerator(egOptions => egOptions
+        .AddLocalization()
+        .AddDistributedSqlServerCache(options =>
+        {
+            options.ConnectionString = connStr;
+            options.SchemaName = "dbo";
+            options.TableName = "TBDD_CACHE";
+        })
+        .AddInfrastructure(opt =>
+        {
+            opt.AddDbTriggerParams(config);
+            opt.AddDbContext((provider, options) =>
+            {
+                var logger = provider.GetRequiredService<ILogger<EGDbContext>>();
+                var useInMemoryDb = config.GetValue<bool>("UseInMemoryDb");
+                var dbCtxOpt = useInMemoryDb ? options.UseInMemoryDatabase("EGInMemoryDb") : options.UseSqlServer(connStr);
+                dbCtxOpt.LogTo(log => logger.LogInformation("{log}", log), LogLevel.Trace)
+                        .EnableSensitiveDataLogging()
+                        .EnableDetailedErrors();
+            });
+        })
+        .AddServices(config)
+    );
+    #endregion  Add DB Context, EG Inf. and Services
+
+    var app = builder.Build();
+
+    #region Web API Middleware
+    if (app.Environment.IsDevelopment())
+    {
+        app.UseSwagger();
+        app.UseSwaggerUI();
+    }
+
+    app.UseHttpsRedirection();
+
+    app.UseRouting();
+
+    app.UseAuthorization();
+
+    app.UseQuartzmon(new QuartzmonOptions()
+    {
+        Scheduler = app.Services.GetRequiredService<IScheduler>(),
+        VirtualPathRoot = "/quartz"
+    });
+
+    app.MapControllers();
+    #endregion
+
+    app.Run();
+
+    Log.Information("The worker was stopped.");
+}
+catch (Exception ex)
+{
+    Log.Fatal(ex, "Worker could not be started!");
+}
+finally
+{
+    Log.CloseAndFlush();
+}

EnvelopeGenerator.Finalizer/Properties/launchSettings.json

@@ -0,0 +1,41 @@
+{
+  "$schema": "http://json.schemastore.org/launchsettings.json",
+  "iisSettings": {
+    "windowsAuthentication": false,
+    "anonymousAuthentication": true,
+    "iisExpress": {
+      "applicationUrl": "http://localhost:17119",
+      "sslPort": 44321
+    }
+  },
+  "profiles": {
+    "http": {
+      "commandName": "Project",
+      "dotnetRunMessages": true,
+      "launchBrowser": false,
+      "launchUrl": "swagger",
+      "applicationUrl": "http://localhost:5010",
+      "environmentVariables": {
+        "ASPNETCORE_ENVIRONMENT": "Development"
+      }
+    },
+    "https": {
+      "commandName": "Project",
+      "dotnetRunMessages": true,
+      "launchBrowser": true,
+      "launchUrl": "quartz",
+      "applicationUrl": "https://localhost:7141;http://localhost:5010",
+      "environmentVariables": {
+        "ASPNETCORE_ENVIRONMENT": "Development"
+      }
+    },
+    "IIS Express": {
+      "commandName": "IISExpress",
+      "launchBrowser": false,
+      "launchUrl": "swagger",
+      "environmentVariables": {
+        "ASPNETCORE_ENVIRONMENT": "Development"
+      }
+    }
+  }
+}

EnvelopeGenerator.Finalizer/appsettings.Database.json

@@ -0,0 +1,22 @@
+{
+  "Logging": {
+    "LogLevel": {
+      "Default": "Information",
+      "Microsoft.Hosting.Lifetime": "Information"
+    }
+  },
+  "UseDbMigration": false,
+  "ConnectionStrings": {
+    "Default": "Server=SDD-VMP04-SQL17\\DD_DEVELOP01;Database=DD_ECM;User Id=sa;Password=dd;Encrypt=false;TrustServerCertificate=True;",
+    "DbMigrationTest": "Server=SDD-VMP04-SQL17\\DD_DEVELOP01;Database=DD_ECM_DATA_MIGR_TEST;User Id=sa;Password=dd;Encrypt=false;TrustServerCertificate=True;"
+  },
+  "DbTriggerParams": {
+    "Envelope": [ "TBSIG_ENVELOPE_AFT_INS" ],
+    "History": [ "TBSIG_ENVELOPE_HISTORY_AFT_INS" ],
+    "EmailOut": [ "TBEMLP_EMAIL_OUT_AFT_INS", "TBEMLP_EMAIL_OUT_AFT_UPD" ],
+    "EnvelopeReceiverReadOnly": [ "TBSIG_ENVELOPE_RECEIVER_READ_ONLY_UPD" ],
+    "Receiver": [],
+    "EmailTemplate": [ "TBSIG_EMAIL_TEMPLATE_AFT_UPD" ]
+  },
+  "UseInMemoryDb": false
+}

EnvelopeGenerator.Finalizer/appsettings.Development.json

@@ -0,0 +1,8 @@
+{
+  "Logging": {
+    "LogLevel": {
+      "Default": "Information",
+      "Microsoft.Hosting.Lifetime": "Information"
+    }
+  }
+}

EnvelopeGenerator.Finalizer/appsettings.Job.json

@@ -0,0 +1,8 @@
+{
+  "FinishEnvelopeJob": {
+    "CronExpression": "* * * * * ?"
+  },
+  "EnvelopeTaskApiJob": {
+    "CronExpression": "* * * * * ?"
+  }
+}

EnvelopeGenerator.Finalizer/appsettings.Logging.json

@@ -0,0 +1,81 @@
+{
+  "Serilog": {
+    "Using": [ "Serilog.Sinks.Console", "Serilog.Sinks.File" ],
+    "MinimumLevel": {
+      "Default": "Verbose",
+      "Override": {
+        "Microsoft": "Warning",
+        "System": "Warning"
+      }
+    },
+    "WriteTo": [
+      {
+        "Name": "Console",
+        "Args": {
+          "outputTemplate": "[{Timestamp:HH:mm:ss} {Level:u3}] {Message:lj}{NewLine}{Exception}"
+        }
+      },
+      {
+        "Name": "File",
+        "Args": {
+          "path": "E:/LogFiles/Digital Data/signFlow.Finalizer/log.Verbose-.txt",
+          "rollingInterval": "Day",
+          "restrictedToMinimumLevel": "Verbose",
+          "retainedFileCountLimit": 30,
+          "outputTemplate": "[{Timestamp:yyyy-MM-dd HH:mm:ss} {Level:u3}] {Message:lj}{NewLine}{Exception}"
+        }
+      },
+      {
+        "Name": "File",
+        "Args": {
+          "path": "E:/LogFiles/Digital Data/signFlow.Finalizer/log.Debug-.txt",
+          "rollingInterval": "Day",
+          "restrictedToMinimumLevel": "Debug",
+          "retainedFileCountLimit": 30,
+          "outputTemplate": "[{Timestamp:yyyy-MM-dd HH:mm:ss} {Level:u3}] {Message:lj}{NewLine}{Exception}"
+        }
+      },
+      {
+        "Name": "File",
+        "Args": {
+          "path": "E:/LogFiles/Digital Data/signFlow.Finalizer/log.Info-.txt",
+          "rollingInterval": "Day",
+          "restrictedToMinimumLevel": "Information",
+          "retainedFileCountLimit": 30,
+          "outputTemplate": "[{Timestamp:yyyy-MM-dd HH:mm:ss} {Level:u3}] {Message:lj}{NewLine}{Exception}"
+        }
+      },
+      {
+        "Name": "File",
+        "Args": {
+          "path": "E:/LogFiles/Digital Data/signFlow.Finalizer/log.Warning-.txt",
+          "rollingInterval": "Day",
+          "restrictedToMinimumLevel": "Warning",
+          "retainedFileCountLimit": 30,
+          "outputTemplate": "[{Timestamp:yyyy-MM-dd HH:mm:ss} {Level:u3}] {Message:lj}{NewLine}{Exception}"
+        }
+      },
+      {
+        "Name": "File",
+        "Args": {
+          "path": "E:/LogFiles/Digital Data/signFlow.Finalizer/log.Error-.txt",
+          "rollingInterval": "Day",
+          "restrictedToMinimumLevel": "Error",
+          "retainedFileCountLimit": 30,
+          "outputTemplate": "[{Timestamp:yyyy-MM-dd HH:mm:ss} {Level:u3}] {Message:lj}{NewLine}{Exception}"
+        }
+      },
+      {
+        "Name": "File",
+        "Args": {
+          "path": "E:/LogFiles/Digital Data/signFlow.Finalizer/log.Fatal-.txt",
+          "rollingInterval": "Day",
+          "restrictedToMinimumLevel": "Fatal",
+          "retainedFileCountLimit": 30,
+          "outputTemplate": "[{Timestamp:yyyy-MM-dd HH:mm:ss} {Level:u3}] {Message:lj}{NewLine}{Exception}"
+        }
+      }
+    ],
+    "Enrich": [ "FromLogContext", "WithMachineName", "WithThreadId" ]
+  }
+}

EnvelopeGenerator.Finalizer/appsettings.PdfBurner.json

@@ -0,0 +1,14 @@
+{
+  "IgnoredLabels": {
+    "Label": [
+      "Date",
+      "Datum",
+      "ZIP",
+      "PLZ",
+      "Place",
+      "Ort",
+      "Position",
+      "Stellung"
+    ]
+  }
+}

EnvelopeGenerator.Finalizer/appsettings.json

@@ -0,0 +1,3 @@
+{
+  "GdPictureLicenseKey": "kG1Qf9PwmqgR8aDmIW2zI_ebj48RzqAJegRxcystEmkbTGQqfkNBdFOXIb6C_A00Ra8zZkrHdfjqzOPXK7kgkF2YDhvrqKfqh4WDug2vOt0qO31IommzkANSuLjZ4zmraoubyEVd25rE3veQ2h_j7tGIoH_LyIHmy24GaXsxdG0yCzIBMdiLbMMMDwcPY-809KeZ83Grv76OVhFvcbBWyYc251vou1N-kGg5_ZlHDgfWoY85gTLRxafjD3KS_i9ARW4BMiy36y8n7UP2jN8kGRnW_04ubpFtfjJqvtsrP_J9D0x7bqV8xtVtT5JI6dpKsVTiMgDCrIcoFSo5gCC1fw9oUopX4TDCkBQttO4-WHBlOeq9dG5Yb0otonVmJKaQA2tP6sMR-lZDs3ql_WI9t91yPWgpssrJUxSHDd27_LMTH_owJIqkF3NOJd9mYQuAv22oNKFYbH8e41pVKb8cT33Y9CgcQ_sy6YDA5PTuIRi67mjKge_nD9rd0IN213Ir9M_EFWqg9e4haWzIdHXQUo0md70kVhPX4UIH_BKJnxEEnFfoFRNMh77bB0N4jkcBEHPl-ghOERv8dOztf4vCnNpzzWvcLD2cqWIm6THy8XGGq9h4hp8aEreRleSMwv9QQAC7mjLwhQ1rBYkpUHlpTjhTLnMwHknl6HH0Z6zzmsgkRKVyfquv94Pd7QbQfZrRka0ss_48pf9p8hAywEn81Q=="
+}

EnvelopeGenerator.GeneratorAPI/Controllers/AnnotationController.cs

@@ -1,130 +0,0 @@
-using DigitalData.Core.Abstraction.Application.DTO;
-using DigitalData.Core.Exceptions;
-using EnvelopeGenerator.Application.Common.Extensions;
-using EnvelopeGenerator.Application.Common.Interfaces.Services;
-using EnvelopeGenerator.Application.Common.Notifications.DocSigned;
-using EnvelopeGenerator.Application.EnvelopeReceivers.Queries;
-using EnvelopeGenerator.Application.Histories.Queries;
-using EnvelopeGenerator.Domain.Constants;
-using EnvelopeGenerator.GeneratorAPI.Extensions;
-using MediatR;
-using Microsoft.AspNetCore.Authentication;
-using Microsoft.AspNetCore.Authentication.Cookies;
-using Microsoft.AspNetCore.Authorization;
-using Microsoft.AspNetCore.Mvc;
-
-namespace EnvelopeGenerator.GeneratorAPI.Controllers;
-
-/// <summary>
-/// Manages annotations and signature lifecycle for envelopes.
-/// </summary>
-[Authorize(Roles = ReceiverRole.FullyAuth)]
-[ApiController]
-[Route("api/[controller]")]
-public class AnnotationController : ControllerBase
-{
-    [Obsolete("Use MediatR")]
-    private readonly IEnvelopeHistoryService _historyService;
-
-    [Obsolete("Use MediatR")]
-    private readonly IEnvelopeReceiverService _envelopeReceiverService;
-
-    private readonly IMediator _mediator;
-
-    private readonly ILogger<AnnotationController> _logger;
-
-    /// <summary>
-    /// Initializes a new instance of <see cref="AnnotationController"/>.
-    /// </summary>
-    [Obsolete("Use MediatR")]
-    public AnnotationController(
-        ILogger<AnnotationController> logger,
-        IEnvelopeHistoryService envelopeHistoryService,
-        IEnvelopeReceiverService envelopeReceiverService,
-        IMediator mediator)
-    {
-        _historyService = envelopeHistoryService;
-        _envelopeReceiverService = envelopeReceiverService;
-        _mediator = mediator;
-        _logger = logger;
-    }
-
-    /// <summary>
-    /// Creates or updates annotations for the authenticated envelope receiver.
-    /// </summary>
-    /// <param name="psPdfKitAnnotation">Annotation payload.</param>
-    /// <param name="cancel">Cancellation token.</param>
-    [Authorize(Roles = ReceiverRole.FullyAuth)]
-    [HttpPost]
-    [Obsolete("This endpoint is for PSPDF Kit.")]
-    public async Task<IActionResult> CreateOrUpdate([FromBody] PsPdfKitAnnotation? psPdfKitAnnotation = null, CancellationToken cancel = default)
-    {
-        var signature = User.GetAuthReceiverSignature();
-        var uuid = User.GetAuthEnvelopeUuid();
-
-        if (signature is null || uuid is null)
-        {
-            _logger.LogError("Authorization failed: authenticated user does not have a valid signature or envelope UUID.");
-            return Unauthorized("User authentication is incomplete. Missing required claims for processing this request.");
-        }
-
-        var envelopeReceiver = await _mediator.ReadEnvelopeReceiverAsync(uuid, signature, cancel).ThrowIfNull(Exceptions.NotFound);
-
-        if (!envelopeReceiver.Envelope!.ReadOnly && psPdfKitAnnotation is null)
-            return BadRequest();
-
-        if (await _mediator.IsSignedAsync(uuid, signature, cancel))
-            return Problem(statusCode: StatusCodes.Status409Conflict);
-        else if (await _mediator.AnyHistoryAsync(uuid, new[] { EnvelopeStatus.EnvelopeRejected, EnvelopeStatus.DocumentRejected }, cancel))
-            return Problem(statusCode: StatusCodes.Status423Locked);
-
-        var docSignedNotification = await _mediator
-            .ReadEnvelopeReceiverAsync(uuid, signature, cancel)
-            .ToDocSignedNotification(psPdfKitAnnotation)
-            ?? throw new NotFoundException("Envelope receiver is not found.");
-
-        await _mediator.PublishSafely(docSignedNotification, cancel);
-        await HttpContext.SignOutAsync(CookieAuthenticationDefaults.AuthenticationScheme);
-
-        return Ok();
-    }
-
-    /// <summary>
-    /// Rejects the document for the current receiver.
-    /// </summary>
-    /// <param name="reason">Optional rejection reason.</param>
-    [Authorize(Roles = ReceiverRole.FullyAuth)]
-    [HttpPost("reject")]
-    [Obsolete("Use MediatR")]
-    public async Task<IActionResult> Reject([FromBody] string? reason = null)
-    {
-        var signature = User.GetAuthReceiverSignature();
-        var uuid = User.GetAuthEnvelopeUuid();
-        var mail = User.GetAuthReceiverMail();
-        if (uuid is null || signature is null || mail is null)
-        {
-            _logger.LogEnvelopeError(uuid: uuid, signature: signature,
-                message: @$"Unauthorized POST request in api\\envelope\\reject. One of claims, Envelope, signature or mail ({mail}) is null.");
-            return Unauthorized();
-        }
-
-        var envRcvRes = await _envelopeReceiverService.ReadByUuidSignatureAsync(uuid: uuid, signature: signature);
-
-        if (envRcvRes.IsFailed)
-        {
-            _logger.LogNotice(envRcvRes.Notices);
-            return Unauthorized("you are not authorized");
-        }
-
-        var histRes = await _historyService.RecordAsync(envRcvRes.Data.EnvelopeId, userReference: mail, EnvelopeStatus.DocumentRejected, comment: reason);
-        if (histRes.IsSuccess)
-        {
-            await HttpContext.SignOutAsync(CookieAuthenticationDefaults.AuthenticationScheme);
-            return NoContent();
-        }
-
-        _logger.LogEnvelopeError(uuid: uuid, signature: signature, message: "Unexpected error happened in api/envelope/reject");
-        _logger.LogNotice(histRes.Notices);
-        return StatusCode(500, histRes.Messages);
-    }
-}

EnvelopeGenerator.GeneratorAPI/Controllers/ConfigController.cs

@@ -1,29 +0,0 @@
-using EnvelopeGenerator.GeneratorAPI.Models.PsPdfKitAnnotation;
-using Microsoft.AspNetCore.Authorization;
-using Microsoft.AspNetCore.Mvc;
-using Microsoft.Extensions.Options;
-
-namespace EnvelopeGenerator.GeneratorAPI.Controllers;
-
-/// <summary>
-/// Exposes configuration data required by the client applications.
-/// </summary>
-/// <remarks>
-/// Initializes a new instance of <see cref="ConfigController"/>.
-/// </remarks>
-[Route("api/[controller]")]
-[ApiController]
-[Authorize]
-public class ConfigController(IOptionsMonitor<AnnotationParams> annotationParamsOptions) : ControllerBase
-{
-    private readonly AnnotationParams _annotationParams = annotationParamsOptions.CurrentValue;
-
-    /// <summary>
-    /// Returns annotation configuration that was previously rendered by MVC.
-    /// </summary>
-    [HttpGet("Annotations")]
-    public IActionResult GetAnnotationParams()
-    {
-        return Ok(_annotationParams.AnnotationJSObject);
-    }
-}

EnvelopeGenerator.GeneratorAPI/Controllers/DocumentController.cs

@@ -1,43 +0,0 @@
-using DigitalData.Core.Exceptions;
-using EnvelopeGenerator.Application.Common.Extensions;
-using EnvelopeGenerator.Application.EnvelopeReceivers.Queries;
-using EnvelopeGenerator.Domain.Constants;
-using MediatR;
-using Microsoft.AspNetCore.Authorization;
-using Microsoft.AspNetCore.Mvc;
-
-namespace EnvelopeGenerator.GeneratorAPI.Controllers;
-
-/// <summary>
-/// Provides access to envelope documents for authenticated receivers.
-/// </summary>
-/// <remarks>
-/// Initializes a new instance of the <see cref="DocumentController"/> class.
-/// </remarks>
-[Authorize(Roles = ReceiverRole.FullyAuth)]
-[ApiController]
-[Route("api/[controller]")]
-public class DocumentController(IMediator mediator, ILogger<DocumentController> logger) : ControllerBase
-{
-    /// <summary>
-    /// Returns the document bytes for the specified envelope receiver key.
-    /// </summary>
-    /// <param name="query">Encoded envelope key.</param>
-    /// <param name="cancel">Cancellation token.</param>
-    [HttpGet]
-    public async Task<IActionResult> GetDocument(ReadEnvelopeReceiverQuery query, CancellationToken cancel)
-    {
-        var envRcv = await mediator.Send(query, cancel).FirstAsync(Exceptions.NotFound);
-
-        var byteData = envRcv.Envelope?.Documents?.FirstOrDefault()?.ByteData;
-
-        if (byteData is null || byteData.Length == 0)
-        {
-            logger.LogError("Document byte data is null or empty for envelope-receiver entity:\n{envelopeKey}.",
-                envRcv.ToJson(Format.Json.ForDiagnostics));
-            throw new NotFoundException("Document is empty.");
-        }
-
-        return File(byteData, "application/octet-stream");
-    }
-}

EnvelopeGenerator.GeneratorAPI/Controllers/EmailTemplateController.cs

@@ -7,10 +7,10 @@ using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
 using MediatR;
 using System.Threading.Tasks;
+using DigitalData.UserManager.Application.Services;
+using DigitalData.Core.Exceptions;
 using EnvelopeGenerator.Application.Common.Dto;
-using DigitalData.Core.Abstraction.Application.Repository;
-using EnvelopeGenerator.Domain.Entities;
-using Microsoft.EntityFrameworkCore;
+using EnvelopeGenerator.Application.Common.Interfaces.Repositories;
 
 namespace EnvelopeGenerator.GeneratorAPI.Controllers;
 
@@ -23,9 +23,12 @@ namespace EnvelopeGenerator.GeneratorAPI.Controllers;
 [Authorize]
 public class EmailTemplateController : ControllerBase
 {
+    private readonly ILogger<EmailTemplateController> _logger;
+
     private readonly IMapper _mapper;
 
-    private readonly IRepository<EmailTemplate> _repository;
+    [Obsolete("Use IRepository")]
+    private readonly IEmailTemplateRepository _repository;
 
     private readonly IMediator _mediator;
 
@@ -36,11 +39,12 @@ public class EmailTemplateController : ControllerBase
     /// <param name="repository">
     /// Die AutoMapper-Instanz, die zum Zuordnen von Objekten verwendet wird.
     /// </param>
-    [Obsolete("Use MediatR")]
-    public EmailTemplateController(IMapper mapper, IRepository<EmailTemplate> repository, IMediator mediator)
+    [Obsolete("Use IRepository")]
+    public EmailTemplateController(IMapper mapper, IEmailTemplateRepository repository, ILogger<EmailTemplateController> logger, IMediator mediator)
     {
         _mapper = mapper;
         _repository = repository;
+        _logger = logger;
         _mediator = mediator;
     }
 
@@ -63,7 +67,7 @@ public class EmailTemplateController : ControllerBase
     {
         if (emailTemplate is null || (emailTemplate.Id is null && emailTemplate.Type is null))
         {
-            var temps = await _repository.Query.ToListAsync();
+            var temps = await _repository.ReadAllAsync();
             return Ok(_mapper.Map<IEnumerable<EmailTemplateDto>>(temps));
         }
         else

EnvelopeGenerator.GeneratorAPI/Controllers/EnvelopeController.cs

@@ -1,9 +1,11 @@
-using EnvelopeGenerator.Application.Envelopes.Commands;
+using DigitalData.Core.Abstraction.Application.DTO;
+using EnvelopeGenerator.Application.Envelopes.Commands;
 using EnvelopeGenerator.Application.Envelopes.Queries;
 using MediatR;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
 using Newtonsoft.Json;
+using EnvelopeGenerator.Application.Common.Interfaces.Services;
 
 namespace EnvelopeGenerator.GeneratorAPI.Controllers;
 
@@ -27,16 +29,21 @@ namespace EnvelopeGenerator.GeneratorAPI.Controllers;
 public class EnvelopeController : ControllerBase
 {
     private readonly ILogger<EnvelopeController> _logger;
+    [Obsolete("Use MediatR")]
+    private readonly IEnvelopeService _envelopeService;
     private readonly IMediator _mediator;
 
     /// <summary>
     /// Erstellt eine neue Instanz des EnvelopeControllers.
     /// </summary>
     /// <param name="logger">Der Logger, der für das Protokollieren von Informationen verwendet wird.</param>
+    /// <param name="envelopeService">Der Dienst, der für die Verarbeitung von Umschlägen zuständig ist.</param>
     /// <param name="mediator"></param>
-    public EnvelopeController(ILogger<EnvelopeController> logger, IMediator mediator)
+    [Obsolete("Use MediatR")]
+    public EnvelopeController(ILogger<EnvelopeController> logger, IEnvelopeService envelopeService, IMediator mediator)
     {
         _logger = logger;
+        _envelopeService = envelopeService;
         _mediator = mediator;
     }
 
@@ -52,56 +59,98 @@ public class EnvelopeController : ControllerBase
     /// <response code="500">Ein unerwarteter Fehler ist aufgetreten.</response>
     [Authorize]
     [HttpGet]
+    [Obsolete("Use MediatR")]
     public async Task<IActionResult> GetAsync([FromQuery] ReadEnvelopeQuery envelope)
     {
-        var result = await _mediator.Send(envelope.Authorize(User.GetId()));
-        return result.Any() ? Ok(result) : NotFound();
+        if (User.GetId() is int intId)
+            return await _envelopeService.ReadByUserAsync(intId, min_status: envelope.Status?.Min, max_status: envelope.Status?.Max).ThenAsync(
+                Success: envelopes =>
+                {
+                    if (envelope.Id is int id)
+                        envelopes = envelopes.Where(e => e.Id == id);
+
+                    if (envelope.Status is EnvelopeStatusQuery status)
+                        envelopes = envelopes.Where(e => e.Status == status);
+
+                    if (envelope.Uuid is string uuid)
+                        envelopes = envelopes.Where(e => e.Uuid == uuid);
+
+                    return envelopes.Any() ? Ok(envelopes) : NotFound();
+                },
+                Fail: IActionResult (msg, ntc) =>
+                {
+                    _logger.LogNotice(ntc);
+                    return StatusCode(StatusCodes.Status500InternalServerError);
+                });
+        else
+        {
+            _logger.LogError("Trotz erfolgreicher Autorisierung wurde die Benutzer-ID nicht als Ganzzahl erkannt. Dies könnte auf eine fehlerhafte Erstellung der Anspruchsliste zurückzuführen sein.");
+            return StatusCode(StatusCodes.Status500InternalServerError);
+        }
     }
 
     /// <summary>
     /// Ruft das Ergebnis eines Dokuments basierend auf der ID ab.
     /// </summary>
-    /// <param name="query"></param>
+    /// <param name="id">Die eindeutige ID des Umschlags.</param>
     /// <param name="view">Gibt an, ob das Dokument inline angezeigt werden soll (true) oder als Download bereitgestellt wird (false).</param>
     /// <returns>Eine IActionResult-Instanz, die das Dokument oder einen Fehlerstatus enthält.</returns>
     /// <response code="200">Das Dokument wurde erfolgreich abgerufen.</response>
     /// <response code="404">Das Dokument wurde nicht gefunden oder ist nicht verfügbar.</response>
     /// <response code="500">Ein unerwarteter Fehler ist aufgetreten.</response>
     [HttpGet("doc-result")]
-    public async Task<IActionResult> GetDocResultAsync([FromQuery] ReadEnvelopeQuery query, [FromQuery] bool view = false)
+    [Obsolete("Use MediatR")]
+    public async Task<IActionResult> GetDocResultAsync([FromQuery] int id, [FromQuery] bool view = false)
     {
-        var envelopes = await _mediator.Send(query.Authorize(User.GetId()));
-        var envelope = envelopes.FirstOrDefault();
+        if (User.GetId() is int intId)
+            return await _envelopeService.ReadByUserAsync(intId).ThenAsync(
+                Success: envelopes =>
+                {
+                    var envelope = envelopes.Where(e => e.Id == id).FirstOrDefault();
 
-        if (envelope is null)
-            return NotFound("Envelope not available.");
-        if (envelope.DocResult is null)
-            return NotFound("The document has not been fully signed or the result has not yet been released.");
-
-        if (view)
+                    if (envelope is null)
+                        return NotFound("Envelope not available.");
+                    else if (envelope?.DocResult is null)
+                        return NotFound("The document has not been fully signed or the result has not yet been released.");
+                    else
+                    {
+                        if (view)
+                        {
+                            Response.Headers.Append("Content-Disposition", "inline; filename=\"" + envelope.Uuid + ".pdf\"");
+                            return File(envelope.DocResult, "application/pdf");
+                        }
+                        else
+                            return File(envelope.DocResult, "application/pdf", $"{envelope.Uuid}.pdf");
+                    }
+                },
+                Fail: IActionResult (msg, ntc) =>
+                {
+                    _logger.LogNotice(ntc);
+                    return StatusCode(StatusCodes.Status500InternalServerError);
+                });
+        else
         {
-            Response.Headers.Append("Content-Disposition", "inline; filename=\"" + envelope.Uuid + ".pdf\"");
-            return File(envelope.DocResult, "application/pdf");
+            _logger.LogError("Trotz erfolgreicher Autorisierung wurde die Benutzer-ID nicht als Ganzzahl erkannt. Dies könnte auf eine fehlerhafte Erstellung der Anspruchsliste zurückzuführen sein.");
+            return StatusCode(StatusCodes.Status500InternalServerError);
         }
-
-        return File(envelope.DocResult, "application/pdf", $"{envelope.Uuid}.pdf");
     }
 
     /// <summary>
     /// 
     /// </summary>
-    /// <param name="command"></param>
+    /// <param name="envelope"></param>
     /// <returns></returns>
     [NonAction]
     [Authorize]
     [HttpPost]
-    public async Task<IActionResult> CreateAsync([FromBody] CreateEnvelopeCommand command)
+    public async Task<IActionResult> CreateAsync([FromQuery] CreateEnvelopeCommand envelope)
     {
-        var res = await _mediator.Send(command.Authorize(User.GetId()));
+        envelope.UserId = User.GetId();
+        var res = await _mediator.Send(envelope);
 
         if (res is null)
         {
-            _logger.LogError("Failed to create envelope. Envelope details: {EnvelopeDetails}", JsonConvert.SerializeObject(command));
+            _logger.LogError("Failed to create envelope. Envelope details: {EnvelopeDetails}", JsonConvert.SerializeObject(envelope));
             return StatusCode(StatusCodes.Status500InternalServerError);
         }
         else

EnvelopeGenerator.GeneratorAPI/Controllers/EnvelopeReceiverController.cs

@@ -1,4 +1,5 @@
 using AutoMapper;
+using DigitalData.Core.Abstraction.Application.DTO;
 using EnvelopeGenerator.Application.EnvelopeReceivers.Commands;
 using EnvelopeGenerator.Application.EnvelopeReceivers.Queries;
 using EnvelopeGenerator.Application.Envelopes.Queries;
@@ -10,8 +11,12 @@ using Microsoft.AspNetCore.Mvc;
 using Microsoft.Data.SqlClient;
 using Microsoft.Extensions.Options;
 using System.Data;
+using System.Reflection.Metadata;
+using EnvelopeGenerator.Domain;
+using EnvelopeGenerator.Domain.Constants;
 using EnvelopeGenerator.Application.Common.SQL;
 using EnvelopeGenerator.Application.Common.Dto.Receiver;
+using EnvelopeGenerator.Application.Common.Interfaces.Services;
 using EnvelopeGenerator.Application.Common.Interfaces.SQLExecutor;
 
 namespace EnvelopeGenerator.GeneratorAPI.Controllers;
@@ -28,19 +33,38 @@ namespace EnvelopeGenerator.GeneratorAPI.Controllers;
 public class EnvelopeReceiverController : ControllerBase
 {
     private readonly ILogger<EnvelopeReceiverController> _logger;
+
+    [Obsolete("Use MediatR")]
+    private readonly IEnvelopeReceiverService _erService;
+
     private readonly IMediator _mediator;
+
     private readonly IMapper _mapper;
+
     private readonly IEnvelopeExecutor _envelopeExecutor;
+
     private readonly IEnvelopeReceiverExecutor _erExecutor;
+
     private readonly IDocumentExecutor _documentExecutor;
+
     private readonly string _cnnStr;
 
     /// <summary>
     /// Konstruktor für den EnvelopeReceiverController.
     /// </summary>
-    public EnvelopeReceiverController(ILogger<EnvelopeReceiverController> logger, IMediator mediator, IMapper mapper, IEnvelopeExecutor envelopeExecutor, IEnvelopeReceiverExecutor erExecutor, IDocumentExecutor documentExecutor, IOptions<ConnectionString> csOpt)
+    /// <param name="logger">Logger-Instanz zur Protokollierung von Informationen und Fehlern.</param>
+    /// <param name="envelopeReceiverService">Service zur Verwaltung von Umschlagempfängern.</param>
+    /// <param name="mediator">Mediator-Instanz zur Verarbeitung von Befehlen und Abfragen.</param>
+    /// <param name="mapper"></param>
+    /// <param name="envelopeExecutor"></param>
+    /// <param name="erExecutor"></param>
+    /// <param name="documentExecutor"></param>
+    /// <param name="csOpt"></param>
+    [Obsolete("Use MediatR")]
+    public EnvelopeReceiverController(ILogger<EnvelopeReceiverController> logger, IEnvelopeReceiverService envelopeReceiverService, IMediator mediator, IMapper mapper, IEnvelopeExecutor envelopeExecutor, IEnvelopeReceiverExecutor erExecutor, IDocumentExecutor documentExecutor, IOptions<ConnectionString> csOpt)
     {
         _logger = logger;
+        _erService = envelopeReceiverService;
         _mediator = mediator;
         _mapper = mapper;
         _envelopeExecutor = envelopeExecutor;
@@ -63,6 +87,7 @@ public class EnvelopeReceiverController : ControllerBase
     /// <response code="500">Ein unerwarteter Fehler ist aufgetreten.</response>
     [Authorize]
     [HttpGet]
+    [Obsolete("Use MediatR")]
     public async Task<IActionResult> GetEnvelopeReceiver([FromQuery] ReadEnvelopeReceiverQuery envelopeReceiver)
     {
         var username = User.GetUsernameOrDefault();
@@ -74,11 +99,20 @@ public class EnvelopeReceiverController : ControllerBase
             return StatusCode(StatusCodes.Status500InternalServerError);
         }
 
-        envelopeReceiver = envelopeReceiver with { Username = username };
-
-        var result = await _mediator.Send(envelopeReceiver);
-
-        return Ok(result);
+        return await _erService.ReadByUsernameAsync(
+            username: username,
+            min_status: envelopeReceiver.Envelope.Status?.Min,
+            max_status: envelopeReceiver.Envelope.Status?.Max,
+            envelopeQuery: envelopeReceiver.Envelope,
+            receiverQuery: envelopeReceiver.Receiver,
+            ignore_statuses: envelopeReceiver.Envelope.Status?.Ignore ?? Array.Empty<EnvelopeStatus>())
+            .ThenAsync(
+                Success: Ok,
+                Fail: IActionResult (msg, ntc) =>
+                {
+                    _logger.LogNotice(ntc);
+                    return StatusCode(StatusCodes.Status500InternalServerError, msg);
+                });
     }
 
     /// <summary>
@@ -95,17 +129,25 @@ public class EnvelopeReceiverController : ControllerBase
     /// <response code="500">Ein unerwarteter Fehler ist aufgetreten.</response>
     [Authorize]
     [HttpGet("salute")]
+    [Obsolete("Use MediatR")]
     public async Task<IActionResult> GetReceiverName([FromQuery] ReadReceiverNameQuery receiver)
     {
-        var name = await _mediator.Send(receiver);
-        return name is null ? NotFound() : Ok(name);
+        return await _erService.ReadLastUsedReceiverNameByMailAsync(receiver.EmailAddress, receiver.Id, receiver.Signature).ThenAsync(
+                        Success: res => res is null ? NotFound() : Ok(res),
+                        Fail: IActionResult (msg, ntc) =>
+                        {
+                            if (ntc.HasFlag(Flag.NotFound))
+                                return NotFound();
+
+                            _logger.LogNotice(ntc);
+                            return StatusCode(StatusCodes.Status500InternalServerError);
+                        });
     }
 
     /// <summary>
     /// Datenübertragungsobjekt mit Informationen zu Umschlägen, Empfängern und Unterschriften.
     /// </summary>
     /// <param name="request"></param>
-    /// <param name="cancel"></param>
     /// <returns>HTTP-Antwort</returns>
     /// <remarks>
     /// Sample request:
@@ -141,10 +183,13 @@ public class EnvelopeReceiverController : ControllerBase
     /// <response code="500">Es handelt sich um einen unerwarteten Fehler. Die Protokolle sollten überprüft werden.</response>
     [Authorize]
     [HttpPost]
-    public async Task<IActionResult> CreateAsync([FromBody] CreateEnvelopeReceiverCommand request, CancellationToken cancel)
+    public async Task<IActionResult> CreateAsync([FromBody] CreateEnvelopeReceiverCommand request)
     {
+        CancellationToken cancel = default;
+        int userId = User.GetId();
+
         #region Create Envelope
-        var envelope = await _envelopeExecutor.CreateEnvelopeAsync(User.GetId(), request.Title, request.Message, request.TFAEnabled, cancel);
+        var envelope = await _envelopeExecutor.CreateEnvelopeAsync(userId, request.Title, request.Message, request.TFAEnabled, cancel);
         #endregion
 
         #region Add receivers

EnvelopeGenerator.GeneratorAPI/Controllers/EnvelopeTypeController.cs

@@ -1,5 +1,5 @@
-using MediatR;
-using EnvelopeGenerator.Application.EnvelopeTypes.Queries;
+using DigitalData.Core.Abstraction.Application.DTO;
+using EnvelopeGenerator.Application.Common.Interfaces.Services;
 using Microsoft.AspNetCore.Mvc;
 
 namespace EnvelopeGenerator.GeneratorAPI.Controllers;
@@ -13,27 +13,36 @@ namespace EnvelopeGenerator.GeneratorAPI.Controllers;
 public class EnvelopeTypeController : ControllerBase
 {
     private readonly ILogger<EnvelopeTypeController> _logger;
-    private readonly IMediator _mediator;
+
+    [Obsolete("Use MediatR")]
+    private readonly IEnvelopeTypeService _service;
 
     /// <summary>
     /// 
     /// </summary>
     /// <param name="logger"></param>
-    /// <param name="mediator"></param>
-    public EnvelopeTypeController(ILogger<EnvelopeTypeController> logger, IMediator mediator)
+    /// <param name="service"></param>
+    [Obsolete("Use MediatR")]
+    public EnvelopeTypeController(ILogger<EnvelopeTypeController> logger, IEnvelopeTypeService service)
     {
         _logger = logger;
-        _mediator = mediator;
+        _service = service;
     }
 
     /// <summary>
     /// 
     /// </summary>
     /// <returns></returns>
+    [Obsolete("Use MediatR")]
     [HttpGet]
     public async Task<IActionResult> GetAllAsync()
     {
-        var result = await _mediator.Send(new ReadEnvelopeTypesQuery());
-        return Ok(result);
+        return await _service.ReadAllAsync().ThenAsync(
+            Success: Ok,
+            Fail: IActionResult (msg, ntc) =>
+            {
+                _logger.LogNotice(ntc);
+                return ntc.HasFlag(Flag.NotFound) ? NotFound() : StatusCode(StatusCodes.Status500InternalServerError);
+            });
     }
 }

EnvelopeGenerator.GeneratorAPI/Controllers/ReadOnlyController.cs

@@ -1,95 +0,0 @@
-using DigitalData.Core.Abstraction.Application.DTO;
-using EnvelopeGenerator.Application.Common.Dto.EnvelopeReceiverReadOnly;
-using EnvelopeGenerator.Application.Common.Interfaces.Services;
-using EnvelopeGenerator.Domain.Constants;
-using EnvelopeGenerator.GeneratorAPI.Extensions;
-using Microsoft.AspNetCore.Authorization;
-using Microsoft.AspNetCore.Mvc;
-using Newtonsoft.Json;
-
-namespace EnvelopeGenerator.GeneratorAPI.Controllers;
-
-/// <summary>
-/// Manages read-only envelope sharing flows.
-/// </summary>
-[Route("api/[controller]")]
-[ApiController]
-public class ReadOnlyController : ControllerBase
-{
-    private readonly ILogger<ReadOnlyController> _logger;
-    private readonly IEnvelopeReceiverReadOnlyService _readOnlyService;
-    private readonly IEnvelopeMailService _mailService;
-    private readonly IEnvelopeHistoryService _historyService;
-
-    /// <summary>
-    /// Initializes a new instance of the <see cref="ReadOnlyController"/> class.
-    /// </summary>
-    public ReadOnlyController(ILogger<ReadOnlyController> logger, IEnvelopeReceiverReadOnlyService readOnlyService, IEnvelopeMailService mailService, IEnvelopeHistoryService historyService)
-    {
-        _logger = logger;
-        _readOnlyService = readOnlyService;
-        _mailService = mailService;
-        _historyService = historyService;
-    }
-
-    /// <summary>
-    /// Creates a new read-only receiver for the current envelope.
-    /// </summary>
-    /// <param name="createDto">Creation payload.</param>
-    [HttpPost]
-    [Authorize(Roles = ReceiverRole.FullyAuth)]
-    public async Task<IActionResult> CreateAsync([FromBody] EnvelopeReceiverReadOnlyCreateDto createDto)
-    {
-        var authReceiverMail = User.GetAuthReceiverMail();
-        if (authReceiverMail is null)
-        {
-            _logger.LogError("EmailAddress claim is not found in envelope-receiver-read-only creation process. Create DTO is:\n {dto}", JsonConvert.SerializeObject(createDto));
-            return Unauthorized();
-        }
-
-        var envelopeId = User.GetAuthEnvelopeId();
-        if (envelopeId is null)
-        {
-            _logger.LogError("Envelope Id claim is not found in envelope-receiver-read-only creation process. Create DTO is:\n {dto}", JsonConvert.SerializeObject(createDto));
-            return Unauthorized();
-        }
-
-        createDto.AddedWho = authReceiverMail;
-        createDto.EnvelopeId = envelopeId;
-
-        var creationRes = await _readOnlyService.CreateAsync(createDto: createDto);
-
-        if (creationRes.IsFailed)
-        {
-            _logger.LogNotice(creationRes);
-            return StatusCode(StatusCodes.Status500InternalServerError);
-        }
-
-        var readRes = await _readOnlyService.ReadByIdAsync(creationRes.Data.Id);
-        if (readRes.IsFailed)
-        {
-            _logger.LogNotice(creationRes);
-            return StatusCode(StatusCodes.Status500InternalServerError);
-        }
-
-        var newReadOnly = readRes.Data;
-
-        return await _mailService.SendAsync(newReadOnly).ThenAsync<int, IActionResult>(SuccessAsync: async _ =>
-        {
-            var histRes = await _historyService.RecordAsync((int)createDto.EnvelopeId, createDto.AddedWho, EnvelopeStatus.EnvelopeShared);
-            if (histRes.IsFailed)
-            {
-                _logger.LogError("Although the envelope was sent as read-only, the EnvelopeShared history could not be saved. Create DTO:\n{createDto}", JsonConvert.SerializeObject(createDto));
-                _logger.LogNotice(histRes.Notices);
-            }
-
-            return Ok();
-        },
-
-        Fail: (msg, ntc) =>
-        {
-            _logger.LogNotice(ntc);
-            return StatusCode(StatusCodes.Status500InternalServerError);
-        });
-    }
-}

EnvelopeGenerator.GeneratorAPI/Controllers/ReceiverController.cs

@@ -1,7 +1,12 @@
-using MediatR;
+using DigitalData.Core.Abstraction.Application.DTO;
+using DigitalData.Core.API;
 using EnvelopeGenerator.Application.Receivers.Queries;
+using EnvelopeGenerator.Domain.Entities;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
+using EnvelopeGenerator.Application.Receivers.Commands;
+using EnvelopeGenerator.Application.Common.Dto.Receiver;
+using EnvelopeGenerator.Application.Common.Interfaces.Services;
 
 namespace EnvelopeGenerator.GeneratorAPI.Controllers;
 
@@ -9,22 +14,22 @@ namespace EnvelopeGenerator.GeneratorAPI.Controllers;
 /// Controller für die Verwaltung von Empfängern.
 /// </summary>
 /// <remarks>
-/// Dieser Controller bietet Endpunkte für das Abrufen von Empfängern basierend auf E-Mail-Adresse oder Signatur.
+/// Dieser Controller bietet Endpunkte für CRUD-Operationen (Erstellen, Lesen, Aktualisieren, Löschen) 
+/// sowie zusätzliche Funktionen wie das Abrufen von Empfängern basierend auf E-Mail-Adresse oder Signatur.
 /// </remarks>
 [Route("api/[controller]")]
 [ApiController]
 [Authorize]
-public class ReceiverController : ControllerBase
+[Obsolete("Use MediatR")]
+public class ReceiverController : CRUDControllerBaseWithErrorHandling<IReceiverService, CreateReceiverCommand, ReceiverDto, UpdateReceiverCommand, Receiver, int>
 {
-    private readonly IMediator _mediator;
-
     /// <summary>
     /// Initialisiert eine neue Instanz des <see cref="ReceiverController"/>-Controllers.
     /// </summary>
-    /// <param name="mediator">Mediator für Anfragen.</param>
-    public ReceiverController(IMediator mediator)
+    /// <param name="logger">Der Logger für die Protokollierung.</param>
+    /// <param name="service">Der Dienst für Empfängeroperationen.</param>
+    public ReceiverController(ILogger<ReceiverController> logger, IReceiverService service) : base(logger, service)
     {
-        _mediator = mediator;
     }
 
     /// <summary>
@@ -35,13 +40,60 @@ public class ReceiverController : ControllerBase
     [HttpGet]
     public async Task<IActionResult> Get([FromQuery] ReadReceiverQuery receiver)
     {
-        if (!receiver.HasAnyCriteria)
-        {
-            var all = await _mediator.Send(new ReadReceiverQuery());
-            return Ok(all);
-        }
+        if (receiver.Id is null && receiver.EmailAddress is null && receiver.Signature is null)
+            return await base.GetAll();
 
-        var result = await _mediator.Send(receiver);
-        return result is null ? NotFound() : Ok(result);
+        if (receiver.Id is int id)
+            return await _service.ReadByIdAsync(id).ThenAsync(
+                Success: Ok,
+                Fail: IActionResult (msg, ntc) =>
+                {
+                    return NotFound();
+                });
+
+        return await _service.ReadByAsync(emailAddress: receiver.EmailAddress, signature: receiver.Signature).ThenAsync(
+                Success: Ok,
+                Fail: IActionResult (msg, ntc) =>
+                {
+                    return NotFound();
+                });
     }
+
+    #region REMOVED ENDPOINTS
+    /// <summary>
+    /// Diese Methode ist deaktiviert und wird nicht verwendet.
+    /// </summary>
+    [NonAction]
+    public override Task<IActionResult> GetAll() => base.GetAll();
+
+    /// <summary>
+    /// Diese Methode ist deaktiviert und wird nicht verwendet.
+    /// </summary>
+    [NonAction]
+    public override Task<IActionResult> Delete([FromRoute] int id) => base.Delete(id);
+
+    /// <summary>
+    /// Diese Methode ist deaktiviert und wird nicht verwendet.
+    /// </summary>
+    [NonAction]
+    public override Task<IActionResult> Update(UpdateReceiverCommand updateDto) => base.Update(updateDto);
+
+    /// <summary>
+    /// Diese Methode ist deaktiviert und wird nicht verwendet.
+    /// </summary>
+    [NonAction]
+    public override Task<IActionResult> Create(CreateReceiverCommand createDto)
+    {
+        return base.Create(createDto);
+    }
+
+    /// <summary>
+    /// Diese Methode ist deaktiviert und wird nicht verwendet.
+    /// </summary>
+    [NonAction]
+    public override Task<IActionResult> GetById([FromRoute] int id)
+    {
+        return base.GetById(id);
+    }
+    #endregion
 }

EnvelopeGenerator.GeneratorAPI/Controllers/TfaRegistrationController.cs

@@ -1,130 +0,0 @@
-using DigitalData.Core.Abstraction.Application.DTO;
-using EnvelopeGenerator.Application.Common.Extensions;
-using EnvelopeGenerator.Application.Common.Interfaces.Services;
-using EnvelopeGenerator.Application.Resources;
-using EnvelopeGenerator.Domain.Constants;
-using EnvelopeGenerator.GeneratorAPI.Extensions;
-using EnvelopeGenerator.GeneratorAPI.Models;
-using Ganss.Xss;
-using Microsoft.AspNetCore.Authentication;
-using Microsoft.AspNetCore.Authentication.Cookies;
-using Microsoft.AspNetCore.Authorization;
-using Microsoft.AspNetCore.Mvc;
-using Microsoft.Extensions.Localization;
-using Microsoft.Extensions.Options;
-
-namespace EnvelopeGenerator.GeneratorAPI.Controllers;
-
-/// <summary>
-/// Exposes endpoints for registering and managing two-factor authentication for envelope receivers.
-/// </summary>
-[ApiController]
-[Route("api/tfa")]
-public class TfaRegistrationController : ControllerBase
-{
-    private readonly ILogger<TfaRegistrationController> _logger;
-    private readonly IEnvelopeReceiverService _envelopeReceiverService;
-    private readonly IAuthenticator _authenticator;
-    private readonly IReceiverService _receiverService;
-    private readonly TFARegParams _parameters;
-    private readonly IStringLocalizer<Resource> _localizer;
-
-    /// <summary>
-    /// Initializes a new instance of the <see cref="TfaRegistrationController"/> class.
-    /// </summary>
-    public TfaRegistrationController(
-        ILogger<TfaRegistrationController> logger,
-        IEnvelopeReceiverService envelopeReceiverService,
-        IAuthenticator authenticator,
-        IReceiverService receiverService,
-        IOptions<TFARegParams> tfaRegParamsOptions,
-        IStringLocalizer<Resource> localizer)
-    {
-        _logger = logger;
-        _envelopeReceiverService = envelopeReceiverService;
-        _authenticator = authenticator;
-        _receiverService = receiverService;
-        _parameters = tfaRegParamsOptions.Value;
-        _localizer = localizer;
-    }
-
-    /// <summary>
-    /// Generates registration metadata (QR code and deadline) for a receiver.
-    /// </summary>
-    /// <param name="envelopeReceiverId">Encoded envelope receiver id.</param>
-    [Authorize]
-    [HttpGet("{envelopeReceiverId}")]
-    public async Task<IActionResult> RegisterAsync(string envelopeReceiverId)
-    {
-        try
-        {
-            var (uuid, signature) = envelopeReceiverId.DecodeEnvelopeReceiverId();
-
-            if (uuid is null || signature is null)
-            {
-                _logger.LogEnvelopeError(uuid: uuid, signature: signature, message: _localizer.WrongEnvelopeReceiverId());
-                return Unauthorized(new { message = _localizer.WrongEnvelopeReceiverId() });
-            }
-
-            var secretResult = await _envelopeReceiverService.ReadWithSecretByUuidSignatureAsync(uuid: uuid, signature: signature);
-            if (secretResult.IsFailed)
-            {
-                _logger.LogNotice(secretResult.Notices);
-                return NotFound(new { message = _localizer.WrongEnvelopeReceiverId() });
-            }
-
-            var envelopeReceiver = secretResult.Data;
-
-            if (!envelopeReceiver.Envelope!.TFAEnabled)
-                return Unauthorized(new { message = _localizer.WrongAccessCode() });
-
-            var receiver = envelopeReceiver.Receiver;
-            receiver!.TotpSecretkey = _authenticator.GenerateTotpSecretKey();
-            await _receiverService.UpdateAsync(receiver);
-            var totpQr64 = _authenticator.GenerateTotpQrCode(userEmail: receiver.EmailAddress, secretKey: receiver.TotpSecretkey).ToBase64String();
-
-            if (receiver.TfaRegDeadline is null)
-            {
-                receiver.TfaRegDeadline = _parameters.Deadline;
-                await _receiverService.UpdateAsync(receiver);
-            }
-            else if (receiver.TfaRegDeadline <= DateTime.Now)
-            {
-                return StatusCode(StatusCodes.Status410Gone, new { message = _localizer.WrongAccessCode() });
-            }
-
-            return Ok(new
-            {
-                envelopeReceiver.EnvelopeId,
-                envelopeReceiver.Envelope!.Uuid,
-                envelopeReceiver.Receiver!.Signature,
-                receiver.TfaRegDeadline,
-                TotpQR64 = totpQr64
-            });
-        }
-        catch (Exception ex)
-        {
-            _logger.LogEnvelopeError(envelopeReceiverId: envelopeReceiverId, exception: ex, message: _localizer.WrongEnvelopeReceiverId());
-            return StatusCode(StatusCodes.Status500InternalServerError, new { message = _localizer.UnexpectedError() });
-        }
-    }
-
-    /// <summary>
-    /// Logs out the envelope receiver from cookie authentication.
-    /// </summary>
-    [Authorize(Roles = ReceiverRole.FullyAuth)]
-    [HttpPost("auth/logout")]
-    public async Task<IActionResult> LogOutAsync()
-    {
-        try
-        {
-            await HttpContext.SignOutAsync(CookieAuthenticationDefaults.AuthenticationScheme);
-            return Ok();
-        }
-        catch (Exception ex)
-        {
-            _logger.LogError(ex, "{message}", ex.Message);
-            return StatusCode(StatusCodes.Status500InternalServerError, new { message = _localizer.UnexpectedError() });
-        }
-    }
-}

EnvelopeGenerator.GeneratorAPI/EnvelopeClaimTypes.cs

@@ -1,18 +0,0 @@
-namespace EnvelopeGenerator.GeneratorAPI
-{
-    /// <summary>
-    /// Provides custom claim types for envelope-related information.
-    /// </summary>
-    public static class EnvelopeClaimTypes
-    {
-        /// <summary>
-        /// Claim type for the title of an envelope.
-        /// </summary>
-        public static readonly string Title = $"Envelope{nameof(Title)}";
-
-        /// <summary>
-        /// Claim type for the ID of an envelope.
-        /// </summary>
-        public static readonly string Id = $"Envelope{nameof(Id)}";
-    }
-}

EnvelopeGenerator.GeneratorAPI/Extensions/EnvelopeAuthExtensions.cs

@@ -1,87 +0,0 @@
-using System.Security.Claims;
-using EnvelopeGenerator.Application.Common.Dto.EnvelopeReceiver;
-using Microsoft.AspNetCore.Authentication;
-using Microsoft.AspNetCore.Authentication.Cookies;
-
-namespace EnvelopeGenerator.GeneratorAPI.Extensions;
-
-/// <summary>
-/// Provides helper methods for working with envelope-specific authentication claims.
-/// </summary>
-public static class EnvelopeAuthExtensions
-{
-    /// <summary>
-    /// Retrieves a claim value by type.
-    /// </summary>
-    /// <param name="user">The current claims principal.</param>
-    /// <param name="claimType">The claim type to resolve.</param>
-    /// <returns>The claim value or null when missing.</returns>
-    public static string? GetClaimValue(this ClaimsPrincipal user, string claimType) => user.FindFirstValue(claimType);
-
-    /// <summary>
-    /// Gets the authenticated envelope UUID from the claims.
-    /// </summary>
-    public static string? GetAuthEnvelopeUuid(this ClaimsPrincipal user) => user.FindFirstValue(ClaimTypes.NameIdentifier);
-
-    /// <summary>
-    /// Gets the authenticated receiver signature from the claims.
-    /// </summary>
-    public static string? GetAuthReceiverSignature(this ClaimsPrincipal user) => user.FindFirstValue(ClaimTypes.Hash);
-
-    /// <summary>
-    /// Gets the authenticated receiver display name from the claims.
-    /// </summary>
-    public static string? GetAuthReceiverName(this ClaimsPrincipal user) => user.FindFirstValue(ClaimTypes.Name);
-
-    /// <summary>
-    /// Gets the authenticated receiver email address from the claims.
-    /// </summary>
-    public static string? GetAuthReceiverMail(this ClaimsPrincipal user) => user.FindFirstValue(ClaimTypes.Email);
-
-    /// <summary>
-    /// Gets the authenticated envelope title from the claims.
-    /// </summary>
-    public static string? GetAuthEnvelopeTitle(this ClaimsPrincipal user) => user.FindFirstValue(EnvelopeClaimTypes.Title);
-
-    /// <summary>
-    /// Gets the authenticated envelope identifier from the claims.
-    /// </summary>
-    public static int? GetAuthEnvelopeId(this ClaimsPrincipal user)
-    {
-        var envIdStr = user.FindFirstValue(EnvelopeClaimTypes.Id);
-        return int.TryParse(envIdStr, out var envId) ? envId : null;
-    }
-
-    /// <summary>
-    /// Signs in an envelope receiver using cookie authentication and attaches envelope claims.
-    /// </summary>
-    /// <param name="context">The current HTTP context.</param>
-    /// <param name="envelopeReceiver">Envelope receiver DTO to extract claims from.</param>
-    /// <param name="receiverRole">Role to attach to the authentication ticket.</param>
-    public static async Task SignInEnvelopeAsync(this HttpContext context, EnvelopeReceiverDto envelopeReceiver, string receiverRole)
-    {
-        var claims = new List<Claim>
-        {
-            new(ClaimTypes.NameIdentifier, envelopeReceiver.Envelope!.Uuid),
-            new(ClaimTypes.Hash, envelopeReceiver.Receiver!.Signature),
-            new(ClaimTypes.Name, envelopeReceiver.Name ?? string.Empty),
-            new(ClaimTypes.Email, envelopeReceiver.Receiver.EmailAddress),
-            new(EnvelopeClaimTypes.Title, envelopeReceiver.Envelope.Title),
-            new(EnvelopeClaimTypes.Id, envelopeReceiver.Envelope.Id.ToString()),
-            new(ClaimTypes.Role, receiverRole)
-        };
-
-        var claimsIdentity = new ClaimsIdentity(claims, CookieAuthenticationDefaults.AuthenticationScheme);
-
-        var authProperties = new AuthenticationProperties
-        {
-            AllowRefresh = false,
-            IsPersistent = false
-        };
-
-        await context.SignInAsync(
-            CookieAuthenticationDefaults.AuthenticationScheme,
-            new ClaimsPrincipal(claimsIdentity),
-            authProperties);
-    }
-}

EnvelopeGenerator.GeneratorAPI/Models/Auth.cs

@@ -1,14 +0,0 @@
-namespace EnvelopeGenerator.GeneratorAPI.Models;
-
-public record Auth(string? AccessCode = null, string? SmsCode = null, string? AuthenticatorCode = null, bool UserSelectSMS = default)
-{
-    public bool HasAccessCode => AccessCode is not null;
-
-    public bool HasSmsCode => SmsCode is not null;
-
-    public bool HasAuthenticatorCode => AuthenticatorCode is not null;
-
-    public bool HasMulti => new[] { HasAccessCode, HasSmsCode, HasAuthenticatorCode }.Count(state => state) > 1;
-
-    public bool HasNone => !(HasAccessCode || HasSmsCode || HasAuthenticatorCode);
-}

EnvelopeGenerator.GeneratorAPI/Models/ContactLink.cs

@@ -1,60 +0,0 @@
-namespace EnvelopeGenerator.GeneratorAPI.Models
-{
-    /// <summary>
-    /// Represents a hyperlink for contact purposes with various HTML attributes.
-    /// </summary>
-    public class ContactLink
-    {
-        /// <summary>
-        /// Gets or sets the label of the hyperlink.
-        /// </summary>
-        public string Label { get; init; } = "Contact";
-
-        /// <summary>
-        /// Gets or sets the URL that the hyperlink points to.
-        /// </summary>
-        public string Href { get; set; } = string.Empty;
-
-        /// <summary>
-        /// Gets or sets the target where the hyperlink should open.
-        /// Commonly used values are "_blank", "_self", "_parent", "_top".
-        /// </summary>
-        public string Target { get; set; } = "_blank";
-
-        /// <summary>
-        /// Gets or sets the relationship of the linked URL as space-separated link types.
-        /// Examples include "nofollow", "noopener", "noreferrer".
-        /// </summary>
-        public string Rel { get; set; } = string.Empty;
-
-        /// <summary>
-        /// Gets or sets the filename that should be downloaded when clicking the hyperlink.
-        /// This attribute will only have an effect if the href attribute is set.
-        /// </summary>
-        public string Download { get; set; } = string.Empty;
-
-        /// <summary>
-        /// Gets or sets the language of the linked resource. Useful when linking to
-        /// content in another language.
-        /// </summary>
-        public string HrefLang { get; set; } = "en";
-
-        /// <summary>
-        /// Gets or sets the MIME type of the linked URL. Helps browsers to handle
-        /// the type correctly when the link is clicked.
-        /// </summary>
-        public string Type { get; set; } = string.Empty;
-
-        /// <summary>
-        /// Gets or sets additional information about the hyperlink, typically viewed
-        /// as a tooltip when the mouse hovers over the link.
-        /// </summary>
-        public string Title { get; set; } = string.Empty;
-
-        /// <summary>
-        /// Gets or sets an identifier for the hyperlink, unique within the HTML document.
-        /// </summary>
-        public string Id { get; set; } = string.Empty;
-    }
-
-}

EnvelopeGenerator.GeneratorAPI/Models/Culture.cs

@@ -1,17 +0,0 @@
-using System.Globalization;
-
-namespace EnvelopeGenerator.GeneratorAPI.Models;
-
-public class Culture
-{
-    private string _language = string.Empty;
-    public string Language { get => _language;
-        init {
-            _language = value;
-            Info = new(value);
-        } 
-    }
-    public string FIClass { get; init; } = string.Empty;
-
-    public CultureInfo? Info { get; init; }
-}

EnvelopeGenerator.GeneratorAPI/Models/Cultures.cs

@@ -1,12 +0,0 @@
-namespace EnvelopeGenerator.GeneratorAPI.Models;
-
-public class Cultures : List<Culture>
-{
-    public IEnumerable<string> Languages => this.Select(c => c.Language);
-
-    public IEnumerable<string> FIClasses => this.Select(c => c.FIClass);
-
-    public Culture Default => this.First();
-    
-    public Culture? this[string? language] => language is null ? null : this.Where(c => c.Language == language).FirstOrDefault();
-}

EnvelopeGenerator.GeneratorAPI/Models/CustomImages.cs

@@ -1,6 +0,0 @@
-namespace EnvelopeGenerator.GeneratorAPI.Models;
-
-public class CustomImages : Dictionary<string, Image>
-{
-    public new Image this[string key] => TryGetValue(key, out var img) && img is not null ? img : new();
-}

EnvelopeGenerator.GeneratorAPI/Models/ErrorViewModel.cs

@@ -1,10 +0,0 @@
-namespace EnvelopeGenerator.GeneratorAPI.Models;
-
-public class ErrorViewModel
-{
-    public string Title { get; init; } = "404";
-
-    public string Subtitle { get; init; } = "Hmmm...";
-
-    public string Body { get; init; } = "It looks like one of the developers fell asleep";
-}

EnvelopeGenerator.GeneratorAPI/Models/Image.cs

@@ -1,10 +0,0 @@
-namespace EnvelopeGenerator.GeneratorAPI.Models;
-
-public class Image
-{
-    public string Src { get; init; } = string.Empty;
-
-    public Dictionary<string, string> Classes { get; init; } = new();
-
-    public string GetClassIn(string page) => Classes.TryGetValue(page, out var cls) && cls is not null ? cls : string.Empty;
-}

EnvelopeGenerator.GeneratorAPI/Models/MainViewModel.cs

@@ -1,6 +0,0 @@
-namespace EnvelopeGenerator.GeneratorAPI.Models;
-
-public class MainViewModel
-{
-    public string? Title { get; init; }
-}

EnvelopeGenerator.GeneratorAPI/Models/PsPdfKitAnnotation/Annotation.cs

@@ -1,92 +0,0 @@
-using System.Text.Json.Serialization;
-
-namespace EnvelopeGenerator.GeneratorAPI.Models.PsPdfKitAnnotation;
-
-public record Annotation : IAnnotation
-{
-    public required string Name { get; init; }
-
-    #region Bound Annotation
-    [JsonIgnore]
-    public string? HorBoundAnnotName { get; init; }
-
-    [JsonIgnore]
-    public string? VerBoundAnnotName { get; init; }
-    #endregion
-
-    #region Layout
-    [JsonIgnore]
-    public double? MarginLeft { get; set; }
-
-    [JsonIgnore]
-    public double MarginLeftRatio { get; init; } = 1;
-
-    [JsonIgnore]
-    public double? MarginTop { get; set; }
-
-    [JsonIgnore]
-    public double MarginTopRatio { get; init; } = 1;
-
-    public double? Width { get; set; }
-
-    [JsonIgnore]
-    public double WidthRatio { get; init; } = 1;
-
-    public double? Height { get; set; }
-
-    [JsonIgnore]
-    public double HeightRatio { get; init; } = 1;
-    #endregion
-
-    #region Position
-    public double Left => (MarginLeft ?? 0) + (HorBoundAnnot?.HorBoundary ?? 0);
-
-    public double Top => (MarginTop ?? 0) + (VerBoundAnnot?.VerBoundary ?? 0);
-    #endregion
-
-    #region Boundary
-    [JsonIgnore]
-    public double HorBoundary => Left + (Width ?? 0);
-
-    [JsonIgnore]
-    public double VerBoundary => Top + (Height ?? 0);
-    #endregion
-
-    #region BoundAnnot
-    [JsonIgnore]
-    public Annotation? HorBoundAnnot { get; set; }
-
-    [JsonIgnore]
-    public Annotation? VerBoundAnnot { get; set; }
-    #endregion
-
-    public Color? BackgroundColor { get; init; }
-
-    #region Border
-    public Color? BorderColor { get; init; }
-
-    public string? BorderStyle { get; init; }
-
-    public int? BorderWidth { get; set; }
-    #endregion
-
-    [JsonIgnore]
-    internal Annotation Default 
-    { 
-        set 
-        {
-            // To set null value, annotation must have null (0) value but null must has non-null value
-            if (MarginLeft == null && value.MarginLeft != null)
-                MarginLeft = value.MarginLeft * MarginLeftRatio;
-
-            if (MarginTop == null && value.MarginTop != null)
-                MarginTop = value.MarginTop * MarginTopRatio;
-
-            if (Width == null && value.Width != null)
-                Width = value.Width * WidthRatio;
-
-            if (Height == null && value.Height != null)
-                Height = value.Height * HeightRatio;
-        }
-    }
-};

EnvelopeGenerator.GeneratorAPI/Models/PsPdfKitAnnotation/AnnotationParams.cs

@@ -1,79 +0,0 @@
-using System.Text.Json.Serialization;
-
-namespace EnvelopeGenerator.GeneratorAPI.Models.PsPdfKitAnnotation;
-
-public class AnnotationParams
-{
-    public AnnotationParams()
-    {
-        _AnnotationJSObjectInitor = new(CreateAnnotationJSObject);
-    }
-
-    public Background? Background { get; init; }
-
-    #region Annotation
-    [JsonIgnore]
-    public Annotation? DefaultAnnotation { get; init; }
-
-    private readonly List<Annotation> _annots = new List<Annotation>();
-
-    public bool TryGet(string name, out Annotation annotation)
-    {
-#pragma warning disable CS8601 // Possible null reference assignment.
-        annotation = _annots.FirstOrDefault(a => a.Name == name);
-#pragma warning restore CS8601 // Possible null reference assignment.
-        return annotation is not null;
-    }
-
-    public required IEnumerable<Annotation> Annotations
-    {
-        get => _annots;
-        init
-        {
-            _annots = value.ToList();
-
-            if (DefaultAnnotation is not null)
-                foreach (var annot in _annots)
-                    annot.Default = DefaultAnnotation;
-
-            for (int i = 0; i < _annots.Count; i++)
-            {
-                #region set bound annotations
-                // horizontal
-                if (_annots[i].HorBoundAnnotName is string horBoundAnnotName)
-                    if (TryGet(horBoundAnnotName, out var horBoundAnnot))
-                        _annots[i].HorBoundAnnot = horBoundAnnot;
-                    else
-                        throw new InvalidOperationException($"{horBoundAnnotName} added as bound anotation. However, it is not defined.");
-
-                // vertical
-                if (_annots[i].VerBoundAnnotName is string verBoundAnnotName)
-                    if (TryGet(verBoundAnnotName, out var verBoundAnnot))
-                        _annots[i].VerBoundAnnot = verBoundAnnot;
-                    else
-                        throw new InvalidOperationException($"{verBoundAnnotName} added as bound anotation. However, it is not defined.");
-                #endregion
-            }
-        }
-    }
-    #endregion
-
-    #region AnnotationJSObject
-    private Dictionary<string, IAnnotation> CreateAnnotationJSObject()
-    {
-        var dict = _annots.ToDictionary(a => a.Name.ToLower(), a => a as IAnnotation);
-
-        if (Background is not null)
-        {
-            Background.Locate(_annots);
-            dict.Add(Background.Name.ToLower(), Background);
-        }            
-
-        return dict;
-    }
-
-    private readonly Lazy<Dictionary<string, IAnnotation>> _AnnotationJSObjectInitor;
-
-    public Dictionary<string, IAnnotation> AnnotationJSObject => _AnnotationJSObjectInitor.Value;
-    #endregion
-}

EnvelopeGenerator.GeneratorAPI/Models/PsPdfKitAnnotation/Background.cs

@@ -1,58 +0,0 @@
-using System.Text.Json.Serialization;
-
-namespace EnvelopeGenerator.GeneratorAPI.Models.PsPdfKitAnnotation;
-
-/// <summary>
-/// The Background is an annotation for the PSPDF Kit. However, it has no function.
-/// It is only the first annotation as a background for other annotations.
-/// </summary>
-public record Background : IAnnotation
-{
-    [JsonIgnore]
-    public double Margin { get; init; }
-
-    public string Name { get; } = "Background";
-
-    public double? Width { get; set; }
-
-    public double? Height { get; set; }
-
-    public double Left { get; set; }
-
-    public double Top { get; set; }
-
-    public Color? BackgroundColor { get; init; }
-
-    #region Border
-    public Color? BorderColor { get; init; }
-
-    public string? BorderStyle { get; init; }
-
-    public int? BorderWidth { get; set; }
-    #endregion
-
-    public void Locate(IEnumerable<IAnnotation> annotations)
-    {
-        // set Top
-        if (annotations.MinBy(a => a.Top)?.Top is double minTop)
-            Top = minTop;
-
-        // set Left
-        if (annotations.MinBy(a => a.Left)?.Left is double minLeft)
-            Left = minLeft;
-
-        // set Width
-        if(annotations.MaxBy(a => a.GetRight())?.GetRight() is double maxRight)
-            Width = maxRight - Left;
-
-        // set Height
-        if (annotations.MaxBy(a => a.GetBottom())?.GetBottom() is double maxBottom)
-            Height = maxBottom - Top;
-
-        // add margins
-        Top -= Margin;
-        Left -= Margin;
-        Width += Margin * 2;
-        Height += Margin * 2;
-    }
-}

EnvelopeGenerator.GeneratorAPI/Models/PsPdfKitAnnotation/Color.cs

@@ -1,10 +0,0 @@
-namespace EnvelopeGenerator.GeneratorAPI.Models.PsPdfKitAnnotation;
-
-public record Color
-{
-    public int R { get; init; } = 0;
-
-    public int G { get; init; } = 0;
-
-    public int B { get; init; } = 0;
-}

EnvelopeGenerator.GeneratorAPI/Models/PsPdfKitAnnotation/Extensions.cs

@@ -1,8 +0,0 @@
-namespace EnvelopeGenerator.GeneratorAPI.Models.PsPdfKitAnnotation;
-
-public static class Extensions
-{
-    public static double GetRight(this IAnnotation annotation) => annotation.Left + annotation?.Width ?? 0;
-
-    public static double GetBottom(this IAnnotation annotation) => annotation.Top + annotation?.Height ?? 0;
-}

EnvelopeGenerator.GeneratorAPI/Models/PsPdfKitAnnotation/IAnnotation.cs

@@ -1,22 +0,0 @@
-namespace EnvelopeGenerator.GeneratorAPI.Models.PsPdfKitAnnotation;
-
-public interface IAnnotation
-{
-    string Name { get; }
-
-    double? Width { get; }
-
-    double? Height { get; }
-
-    double Left { get; }
-
-    double Top { get; }
-
-    Color? BackgroundColor { get; }
-
-    Color? BorderColor { get; }
-
-    string? BorderStyle { get; }
-
-    int? BorderWidth { get; }
-}

EnvelopeGenerator.GeneratorAPI/Models/TFARegParams.cs

@@ -1,17 +0,0 @@
-namespace EnvelopeGenerator.GeneratorAPI.Models;
-
-/// <summary>
-/// Represents the parameters for two-factor authentication (2FA) registration.
-/// </summary>
-public class TFARegParams
-{
-    /// <summary>
-    /// The maximum allowed time for completing the registration process.
-    /// </summary>
-    public TimeSpan TimeLimit { get; init; } = new(0, 30, 0);
-
-    /// <summary>
-    /// The deadline for registration, calculated as the current time plus the <see cref="TimeLimit"/>.
-    /// </summary>
-    public DateTime Deadline => DateTime.Now.AddTicks(TimeLimit.Ticks);
-}

EnvelopeGenerator.GeneratorAPI/Program.cs

@@ -105,6 +105,7 @@ try
     });
     builder.Services.AddOpenApi();
 
+    // TODO: Update to configure with EnvelopeGenerator.DependencyInjection
     //AddEF Core dbcontext
     var useDbMigration = Environment.GetEnvironmentVariable("MIGRATION_TEST_MODE") == true.ToString() || config.GetValue<bool>("UseDbMigration");
     var cnnStrName = useDbMigration ? "DbMigrationTest" : "Default";
@@ -185,7 +186,7 @@ try
     // Envelope generator serives
 #pragma warning disable CS0618 // Type or member is obsolete
     builder.Services
-        .AddEnvelopeGeneratorInfrastructureServices(opt =>
+        .AddEGInfrastructureServices(opt =>
         {
             opt.AddDbTriggerParams(config);
             opt.AddDbContext((provider, options) =>

EnvelopeGenerator.Infrastructure/DependencyInjection.cs

@@ -38,10 +38,10 @@ namespace EnvelopeGenerator.Infrastructure
         /// will be created per HTTP request (or per scope) within the dependency injection container.
         /// </remarks>
         [Obsolete("Use IRepository")]
-        public static IServiceCollection AddEnvelopeGeneratorInfrastructureServices(this IServiceCollection services, Action<Config> options)
+        public static IServiceCollection AddEGInfrastructureServices(this IServiceCollection services, Action<EGInfrastructureConfiguration> options)
         {
             // configure custom options
-            options(new Config(services));
+            options(new EGInfrastructureConfiguration(services));
 #if NET
             services.TryAddScoped<IConfigRepository, ConfigRepository>();
             services.TryAddScoped<IDocumentReceiverElementRepository, DocumentReceiverElementRepository>();
@@ -160,11 +160,11 @@ namespace EnvelopeGenerator.Infrastructure
         }
 #endif
 
-        public class Config
+        public class EGInfrastructureConfiguration
         {
             private readonly IServiceCollection _services;
 
-            internal Config(IServiceCollection services)
+            internal EGInfrastructureConfiguration(IServiceCollection services)
             {
                 _services = services;
             }

EnvelopeGenerator.Infrastructure/EGDbContext.cs

@@ -79,6 +79,8 @@ public abstract class EGDbContextBase : DbContext
 
     public DbSet<ClientUser> ClientUsers { get; set; }
 
+    public DbSet<ThirdPartyModule> ThirdPartyModules { get; set; }
+
     private readonly DbTriggerParams _triggers;
 
     private readonly ILogger

EnvelopeGenerator.Infrastructure/EGDbContextFactory.cs

@@ -12,7 +12,7 @@ namespace EnvelopeGenerator.Infrastructure
         public EGDbContext CreateDbContext(string[] args)
         {
             var config = new ConfigurationBuilder()
-                .SetBasePath(Directory.GetCurrentDirectory())
+                .SetBasePath(Directory.GetCurrentDirectory()) // Önemli!
                 .AddJsonFile("appsettings.migration.json")
                 .Build();
 

EnvelopeGenerator.Infrastructure/EnvelopeGenerator.Infrastructure.csproj

@@ -22,8 +22,8 @@
 
   <ItemGroup>
     <PackageReference Include="Dapper" Version="2.1.66" />
-    <PackageReference Include="DigitalData.Core.Abstraction.Application" Version="1.6.0" />
-    <PackageReference Include="DigitalData.Core.Infrastructure" Version="2.6.1" />
+    <PackageReference Include="DigitalData.Core.Abstraction.Application" Version="1.5.0" />
+    <PackageReference Include="DigitalData.Core.Infrastructure" Version="2.5.0" />
     <PackageReference Include="QuestPDF" Version="2025.7.1" />
   </ItemGroup>
 

EnvelopeGenerator.Infrastructure/Migrations/20250701151754_InitialCreate.Designer.cs

@@ -525,7 +525,7 @@ namespace EnvelopeGenerator.Infrastructure.Migrations
                 });
             });
 
-            modelBuilder.Entity("EnvelopeGenerator.Domain.Entities.Config", b =>
+            modelBuilder.Entity("EnvelopeGenerator.Domain.Entities.EGInfrastructureConfiguration", b =>
             {
                 b.Property<string>("ExportPath")
                     .HasColumnType("nvarchar(256)")

EnvelopeGenerator.Infrastructure/Migrations/EGDbContextModelSnapshot.cs

@@ -522,7 +522,7 @@ namespace EnvelopeGenerator.Infrastructure.Migrations
                 });
             });
 
-            modelBuilder.Entity("EnvelopeGenerator.Domain.Entities.Config", b =>
+            modelBuilder.Entity("EnvelopeGenerator.Domain.Entities.EGInfrastructureConfiguration", b =>
             {
                 b.Property<string>("ExportPath")
                     .HasColumnType("nvarchar(256)")

EnvelopeGenerator.Jobs/EnvelopeGenerator.Jobs.csproj

@@ -1,22 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
-  <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
-    <ImplicitUsings>enable</ImplicitUsings>
-    <Nullable>enable</Nullable>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <PackageReference Include="Quartz" Version="3.9.0" />
-    <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
-    <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="8.0.2" />
-    <PackageReference Include="Microsoft.Data.SqlClient" Version="6.0.2" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <ProjectReference Include="..\EnvelopeGenerator.Domain\EnvelopeGenerator.Domain.csproj" />
-    <ProjectReference Include="..\EnvelopeGenerator.Infrastructure\EnvelopeGenerator.Infrastructure.csproj" />
-    <ProjectReference Include="..\EnvelopeGenerator.PdfEditor\EnvelopeGenerator.PdfEditor.csproj" />
-  </ItemGroup>
-
-</Project>

EnvelopeGenerator.Jobs/Jobs/APIBackendJobs/APIEnvelopeJob.cs

@@ -1,151 +0,0 @@
-using System.Collections.Generic;
-using System.Data;
-using System.Threading.Tasks;
-using EnvelopeGenerator.Domain.Constants;
-using Microsoft.Data.SqlClient;
-using Microsoft.Extensions.Logging;
-using Microsoft.Extensions.Logging.Abstractions;
-using Quartz;
-
-namespace EnvelopeGenerator.Jobs.APIBackendJobs;
-
-public class APIEnvelopeJob(ILogger<APIEnvelopeJob>? logger = null) : IJob
-{
-    private readonly ILogger<APIEnvelopeJob> _logger = logger ?? NullLogger<APIEnvelopeJob>.Instance;
-
-    public async Task Execute(IJobExecutionContext context)
-    {
-        var jobId = context.JobDetail.Key.ToString();
-        _logger.LogDebug("API Envelopes - Starting job {JobId}", jobId);
-
-        try
-        {
-            var connectionString = context.MergedJobDataMap.GetString(Value.DATABASE);
-            if (string.IsNullOrWhiteSpace(connectionString))
-            {
-                _logger.LogWarning("API Envelopes - Connection string missing");
-                return;
-            }
-
-            await using var connection = new SqlConnection(connectionString);
-            await connection.OpenAsync(context.CancellationToken);
-
-            await ProcessInvitationsAsync(connection, context.CancellationToken);
-            await ProcessWithdrawnAsync(connection, context.CancellationToken);
-
-            _logger.LogDebug("API Envelopes - Completed job {JobId} successfully", jobId);
-        }
-        catch (System.Exception ex)
-        {
-            _logger.LogError(ex, "API Envelopes job failed");
-        }
-        finally
-        {
-            _logger.LogDebug("API Envelopes execution for {JobId} ended", jobId);
-        }
-    }
-
-    private async Task ProcessInvitationsAsync(SqlConnection connection, System.Threading.CancellationToken cancellationToken)
-    {
-        const string sql = "SELECT GUID FROM TBSIG_ENVELOPE WHERE SOURCE = 'API' AND STATUS = 1003 ORDER BY GUID";
-        var envelopeIds = new List<int>();
-
-        await using (var command = new SqlCommand(sql, connection))
-        await using (var reader = await command.ExecuteReaderAsync(cancellationToken))
-        {
-            while (await reader.ReadAsync(cancellationToken))
-            {
-                if (reader[0] is int id)
-                {
-                    envelopeIds.Add(id);
-                }
-            }
-        }
-
-        if (envelopeIds.Count == 0)
-        {
-            _logger.LogDebug("SendInvMail - No envelopes found");
-            return;
-        }
-
-        _logger.LogInformation("SendInvMail - Found {Count} envelopes", envelopeIds.Count);
-        var total = envelopeIds.Count;
-        var current = 1;
-
-        foreach (var id in envelopeIds)
-        {
-            _logger.LogInformation("SendInvMail - Processing Envelope {EnvelopeId} ({Current}/{Total})", id, current, total);
-            try
-            {
-                // Placeholder for invitation email sending logic.
-                _logger.LogDebug("SendInvMail - Marking envelope {EnvelopeId} as queued", id);
-                const string updateSql = "UPDATE TBSIG_ENVELOPE SET CURRENT_WORK_APP = @App WHERE GUID = @Id";
-                await using var updateCommand = new SqlCommand(updateSql, connection);
-                updateCommand.Parameters.AddWithValue("@App", "signFLOW_API_EnvJob_InvMail");
-                updateCommand.Parameters.AddWithValue("@Id", id);
-                await updateCommand.ExecuteNonQueryAsync(cancellationToken);
-            }
-            catch (System.Exception ex)
-            {
-                _logger.LogWarning(ex, "SendInvMail - Unhandled exception while working envelope {EnvelopeId}", id);
-            }
-
-            current++;
-            _logger.LogInformation("SendInvMail - Envelope finalized");
-        }
-    }
-
-    private async Task ProcessWithdrawnAsync(SqlConnection connection, System.Threading.CancellationToken cancellationToken)
-    {
-        const string sql = @"SELECT ENV.GUID, REJ.COMMENT AS REJECTION_REASON FROM 
-                (SELECT * FROM TBSIG_ENVELOPE WHERE STATUS = 1009 AND SOURCE = 'API') ENV INNER JOIN
-                (SELECT MAX(GUID) GUID, ENVELOPE_ID, MAX(ADDED_WHEN) ADDED_WHEN, MAX(ACTION_DATE) ACTION_DATE, COMMENT FROM TBSIG_ENVELOPE_HISTORY WHERE STATUS = 1009 GROUP BY ENVELOPE_ID, COMMENT ) REJ ON ENV.GUID = REJ.ENVELOPE_ID LEFT JOIN
-                (SELECT * FROM TBSIG_ENVELOPE_HISTORY WHERE STATUS = 3004 ) M_Send ON ENV.GUID = M_Send.ENVELOPE_ID
-                WHERE M_Send.GUID IS NULL";
-
-        var withdrawn = new List<(int EnvelopeId, string Reason)>();
-        await using (var command = new SqlCommand(sql, connection))
-        await using (var reader = await command.ExecuteReaderAsync(cancellationToken))
-        {
-            while (await reader.ReadAsync(cancellationToken))
-            {
-                var id = reader.GetInt32(0);
-                var reason = reader.IsDBNull(1) ? string.Empty : reader.GetString(1);
-                withdrawn.Add((id, reason));
-            }
-        }
-
-        if (withdrawn.Count == 0)
-        {
-            _logger.LogDebug("WithdrawnEnv - No envelopes found");
-            return;
-        }
-
-        _logger.LogInformation("WithdrawnEnv - Found {Count} envelopes", withdrawn.Count);
-        var total = withdrawn.Count;
-        var current = 1;
-
-        foreach (var (envelopeId, reason) in withdrawn)
-        {
-            _logger.LogInformation("WithdrawnEnv - Processing Envelope {EnvelopeId} ({Current}/{Total})", envelopeId, current, total);
-            try
-            {
-                // Log withdrawn mail trigger placeholder
-                const string insertHistory = "INSERT INTO TBSIG_ENVELOPE_HISTORY (ENVELOPE_ID, STATUS, USER_REFERENCE, ADDED_WHEN, ACTION_DATE, COMMENT) VALUES (@EnvelopeId, @Status, @UserReference, GETDATE(), GETDATE(), @Comment)";
-                await using var insertCommand = new SqlCommand(insertHistory, connection);
-                insertCommand.Parameters.AddWithValue("@EnvelopeId", envelopeId);
-                insertCommand.Parameters.AddWithValue("@Status", 3004);
-                insertCommand.Parameters.AddWithValue("@UserReference", "API");
-                insertCommand.Parameters.AddWithValue("@Comment", reason ?? string.Empty);
-                await insertCommand.ExecuteNonQueryAsync(cancellationToken);
-            }
-            catch (System.Exception ex)
-            {
-                _logger.LogWarning(ex, "WithdrawnEnv - Unhandled exception while working envelope {EnvelopeId}", envelopeId);
-            }
-
-            current++;
-            _logger.LogInformation("WithdrawnEnv - Envelope finalized");
-        }
-    }
-}

EnvelopeGenerator.Jobs/Jobs/DataRowExtensions.cs

@@ -1,30 +0,0 @@
-using System;
-using System.Data;
-
-namespace EnvelopeGenerator.Jobs;
-
-public static class DataRowExtensions
-{
-    public static T? GetValueOrDefault<T>(this DataRow row, string columnName, T? defaultValue = default)
-    {
-        if (!row.Table.Columns.Contains(columnName))
-        {
-            return defaultValue;
-        }
-
-        var value = row[columnName];
-        if (value == DBNull.Value)
-        {
-            return defaultValue;
-        }
-
-        try
-        {
-            return (T)Convert.ChangeType(value, typeof(T));
-        }
-        catch
-        {
-            return defaultValue;
-        }
-    }
-}

EnvelopeGenerator.Jobs/Jobs/FinalizeDocument/FinalizeDocumentExceptions.cs

@@ -1,28 +0,0 @@
-namespace EnvelopeGenerator.Jobs.FinalizeDocument;
-
-public static class FinalizeDocumentExceptions
-{
-    public class MergeDocumentException : ApplicationException
-    {
-        public MergeDocumentException(string message) : base(message) { }
-        public MergeDocumentException(string message, Exception innerException) : base(message, innerException) { }
-    }
-
-    public class BurnAnnotationException : ApplicationException
-    {
-        public BurnAnnotationException(string message) : base(message) { }
-        public BurnAnnotationException(string message, Exception innerException) : base(message, innerException) { }
-    }
-
-    public class CreateReportException : ApplicationException
-    {
-        public CreateReportException(string message) : base(message) { }
-        public CreateReportException(string message, Exception innerException) : base(message, innerException) { }
-    }
-
-    public class ExportDocumentException : ApplicationException
-    {
-        public ExportDocumentException(string message) : base(message) { }
-        public ExportDocumentException(string message, Exception innerException) : base(message, innerException) { }
-    }
-}