Refactor: cleanup deprecated Blazor UI, remove placeholders & WASM

Major project cleanup and refactor:
- Removed placeholder and unused .razor components and models.
- Deleted obsolete client-side (WASM) project files and custom auth logic.
- Improved layout and styling for a more professional, responsive UI.
- Consolidated state management and API service patterns.
- Removed favicon and Bootstrap Icons font files; cleaned up static assets.
- Updated solution file to remove references to deleted projects.
- Prepared codebase for a server-side or hybrid Blazor architecture with a maintainable, focused structure.

EnvelopeGenerator.API/Controllers/EnvelopeController.cs

@@ -71,7 +71,6 @@ public class EnvelopeController : ControllerBase
     [HttpGet("doc-result")]
     public async Task<IActionResult> GetDocResultAsync([FromQuery] ReadEnvelopeQuery query, [FromQuery] bool view = false)
     {
-        query.IncludeDocResult = true;
         var envelopes = await _mediator.Send(query.Authorize(User.GetId()));
         var envelope = envelopes.FirstOrDefault();
 

EnvelopeGenerator.API/Controllers/ReceiverAuthController.cs

@@ -0,0 +1,407 @@
+using EnvelopeGenerator.API.Models;
+using EnvelopeGenerator.Application.Common.Extensions;
+using EnvelopeGenerator.Application.Common.Interfaces.Services;
+using EnvelopeGenerator.Application.EnvelopeReceivers.Queries;
+using EnvelopeGenerator.Domain.Constants;
+using EnvelopeGenerator.API.Extensions;
+using MediatR;
+using Microsoft.AspNetCore.Authentication;
+using Microsoft.AspNetCore.Authentication.Cookies;
+using Microsoft.AspNetCore.Mvc;
+using OtpNet;
+
+namespace EnvelopeGenerator.API.Controllers;
+
+/// <summary>
+/// REST-API für den Empfänger-Authentifizierungs-Flow.
+/// 
+/// Entspricht der Logik in EnvelopeGenerator.Web.Controllers.EnvelopeController
+/// (Main + LogInEnvelope), aber gibt JSON statt Views zurück.
+/// 
+/// Der Blazor-Client (ReceiverUI) ruft diese Endpunkte auf.
+/// 
+/// FLOW:
+/// 1. Client ruft GET  /api/receiverauth/{key}/status     → Prüft Status
+/// 2. Client ruft POST /api/receiverauth/{key}/access-code → Sendet AccessCode
+/// 3. Client ruft POST /api/receiverauth/{key}/tfa         → Sendet TFA-Code
+/// 
+/// Nach erfolgreicher Authentifizierung wird ein Cookie gesetzt (SignInEnvelopeAsync).
+/// Danach kann der Client die Dokument-Daten über die bestehenden Envelope-Endpunkte laden.
+/// </summary>
+[Route("api/[controller]")]
+[ApiController]
+public class ReceiverAuthController : ControllerBase
+{
+    private readonly ILogger<ReceiverAuthController> _logger;
+    private readonly IMediator _mediator;
+    private readonly IEnvelopeReceiverService _envRcvService;
+    private readonly IEnvelopeHistoryService _historyService;
+    private readonly IAuthenticator _authenticator;
+    private readonly IReceiverService _rcvService;
+    private readonly IEnvelopeSmsHandler _envSmsHandler;
+
+    public ReceiverAuthController(
+        ILogger<ReceiverAuthController> logger,
+        IMediator mediator,
+        IEnvelopeReceiverService envRcvService,
+        IEnvelopeHistoryService historyService,
+        IAuthenticator authenticator,
+        IReceiverService rcvService,
+        IEnvelopeSmsHandler envSmsHandler)
+    {
+        _logger = logger;
+        _mediator = mediator;
+        _envRcvService = envRcvService;
+        _historyService = historyService;
+        _authenticator = authenticator;
+        _rcvService = rcvService;
+        _envSmsHandler = envSmsHandler;
+    }
+
+    // ══════════════════════════════════════════════════════════════
+    // ENDPUNKT 1: STATUS PRÜFEN
+    // Entspricht: Web.EnvelopeController.Main()
+    // ══════════════════════════════════════════════════════════════
+
+    /// <summary>
+    /// Prüft den aktuellen Status eines Umschlags für den Empfänger.
+    /// Entscheidet ob: NotFound, Rejected, Signed, AccessCode nötig, oder direkt anzeigen.
+    /// </summary>
+    /// <param name="key">Der EnvelopeReceiver-Key aus der URL (Base64-kodiert)</param>
+    /// <param name="cancel">Cancellation-Token</param>
+    /// <returns>ReceiverAuthResponse mit dem aktuellen Status</returns>
+    [HttpGet("{key}/status")]
+    public async Task<IActionResult> GetStatus([FromRoute] string key, CancellationToken cancel)
+    {
+        try
+        {
+            // ── Key dekodieren ──
+            if (!key.TryDecode(out var decoded))
+                return NotFound(new ReceiverAuthResponse { Status = "not_found" });
+
+            // ── ReadOnly-Links ──
+            if (decoded.GetEncodeType() == EncodeType.EnvelopeReceiverReadOnly)
+            {
+                return Ok(new ReceiverAuthResponse
+                {
+                    Status = "show_document",
+                    ReadOnly = true
+                });
+            }
+
+            // ── EnvelopeReceiver laden (Light-Query: ohne Documents/Elements) ──
+            var er = await _mediator.Send(
+                new ReadEnvelopeReceiverLightQuery { Key = key }, cancel);
+            if (er is null)
+                return NotFound(new ReceiverAuthResponse { Status = "not_found" });
+
+            // ── Abgelehnt? ──
+            var rejRcvrs = await _historyService.ReadRejectingReceivers(er.Envelope!.Id);
+            if (rejRcvrs.Any())
+            {
+                await HttpContext.SignOutAsync(CookieAuthenticationDefaults.AuthenticationScheme);
+                return Ok(new ReceiverAuthResponse
+                {
+                    Status = "rejected",
+                    Title = er.Envelope.Title,
+                    SenderEmail = er.Envelope.User?.Email
+                });
+            }
+
+            // ── Bereits signiert? ──
+            if (await _historyService.IsSigned(
+                    envelopeId: er.Envelope.Id,
+                    userReference: er.Receiver!.EmailAddress))
+            {
+                await HttpContext.SignOutAsync(CookieAuthenticationDefaults.AuthenticationScheme);
+                return Ok(new ReceiverAuthResponse
+                {
+                    Status = "already_signed",
+                    Title = er.Envelope.Title,
+                    SenderEmail = er.Envelope.User?.Email
+                });
+            }
+
+            // ── Kein AccessCode nötig? → Direkt SignIn ──
+            if (!er.Envelope.UseAccessCode)
+            {
+                (string? uuid, string? signature) = decoded.ParseEnvelopeReceiverId();
+                var erSecretRes = await _envRcvService.ReadWithSecretByUuidSignatureAsync(
+                    uuid: uuid!, signature: signature!);
+
+                if (erSecretRes.IsFailed)
+                    return NotFound(new ReceiverAuthResponse { Status = "not_found" });
+
+                await HttpContext.SignInEnvelopeAsync(erSecretRes.Data, Role.ReceiverFull);
+
+                return Ok(new ReceiverAuthResponse
+                {
+                    Status = "show_document",
+                    Title = er.Envelope.Title,
+                    Message = er.Envelope.Message,
+                    SenderEmail = er.Envelope.User?.Email,
+                    ReadOnly = er.Envelope.ReadOnly
+                });
+            }
+
+            // ── AccessCode nötig ──
+            // HINWEIS: Die E-Mail mit dem AccessCode wird NICHT hier gesendet.
+            // Das passiert bereits im Web-Projekt, wenn der Link generiert wird.
+            // Der Blazor-Flow übernimmt erst NACH dem E-Mail-Versand.
+            bool accessCodeAlreadyRequested = await _historyService.AccessCodeAlreadyRequested(
+                envelopeId: er.Envelope.Id,
+                userReference: er.Receiver.EmailAddress);
+
+            if (!accessCodeAlreadyRequested)
+            {
+                // AccessCode wurde noch nie angefordert — das bedeutet der Empfänger
+                // kommt zum ersten Mal. Wir zeichnen es auf, aber die E-Mail
+                // wurde bereits vom Web-Projekt gesendet.
+                await _historyService.RecordAsync(
+                    er.EnvelopeId, er.Receiver.EmailAddress, EnvelopeStatus.AccessCodeRequested);
+            }
+
+            // ── Prüfe ob der Nutzer bereits eingeloggt ist ──
+            if (User.IsInRole(Role.ReceiverFull))
+            {
+                return Ok(new ReceiverAuthResponse
+                {
+                    Status = "show_document",
+                    Title = er.Envelope.Title,
+                    Message = er.Envelope.Message,
+                    SenderEmail = er.Envelope.User?.Email,
+                    ReadOnly = er.Envelope.ReadOnly
+                });
+            }
+
+            return Ok(new ReceiverAuthResponse
+            {
+                Status = "requires_access_code",
+                Title = er.Envelope.Title,
+                SenderEmail = er.Envelope.User?.Email,
+                TfaEnabled = er.Envelope.TFAEnabled,
+                HasPhoneNumber = er.HasPhoneNumber
+            });
+        }
+        catch (Exception ex)
+        {
+            _logger.LogError(ex, "Error checking status for key {Key}", key);
+            return StatusCode(500, new ReceiverAuthResponse
+            {
+                Status = "error",
+                ErrorMessage = "Ein unerwarteter Fehler ist aufgetreten."
+            });
+        }
+    }
+
+    // ══════════════════════════════════════════════════════════════
+    // ENDPUNKT 2: ACCESS-CODE PRÜFEN
+    // ══════════════════════════════════════════════════════════════
+
+    /// <summary>
+    /// Prüft den eingegebenen Zugangscode.
+    /// Bei Erfolg: SignIn oder TFA-Weiterleitung.
+    /// Bei Fehler: Fehlermeldung zurückgeben.
+    /// </summary>
+    [HttpPost("{key}/access-code")]
+    public async Task<IActionResult> SubmitAccessCode(
+        [FromRoute] string key,
+        [FromBody] AccessCodeRequest request,
+        CancellationToken cancel)
+    {
+        try
+        {
+            // ── Key dekodieren + Daten laden ──
+            (string? uuid, string? signature) = key.DecodeEnvelopeReceiverId();
+            if (uuid is null || signature is null)
+                return NotFound(new ReceiverAuthResponse { Status = "not_found" });
+
+            var erSecretRes = await _envRcvService.ReadWithSecretByUuidSignatureAsync(
+                uuid: uuid, signature: signature);
+
+            if (erSecretRes.IsFailed)
+                return NotFound(new ReceiverAuthResponse { Status = "not_found" });
+
+            var erSecret = erSecretRes.Data;
+
+            // ── AccessCode prüfen ──
+            if (erSecret.AccessCode != request.AccessCode)
+            {
+                await _historyService.RecordAsync(
+                    erSecret.EnvelopeId,
+                    erSecret.Receiver!.EmailAddress,
+                    EnvelopeStatus.AccessCodeIncorrect);
+
+                return Unauthorized(new ReceiverAuthResponse
+                {
+                    Status = "requires_access_code",
+                    Title = erSecret.Envelope!.Title,
+                    SenderEmail = erSecret.Envelope.User?.Email,
+                    TfaEnabled = erSecret.Envelope.TFAEnabled,
+                    HasPhoneNumber = erSecret.HasPhoneNumber,
+                    ErrorMessage = "Falscher Zugangscode."
+                });
+            }
+
+            // ── AccessCode korrekt ──
+            await _historyService.RecordAsync(
+                erSecret.EnvelopeId,
+                erSecret.Receiver!.EmailAddress,
+                EnvelopeStatus.AccessCodeCorrect);
+
+            // ── TFA erforderlich? ──
+            if (erSecret.Envelope!.TFAEnabled)
+            {
+                var rcv = erSecret.Receiver;
+                if (rcv.TotpSecretkey is null)
+                {
+                    rcv.TotpSecretkey = _authenticator.GenerateTotpSecretKey();
+                    await _rcvService.UpdateAsync(rcv);
+                }
+
+                await HttpContext.SignInEnvelopeAsync(erSecret, Role.ReceiverTFA);
+
+                if (request.PreferSms)
+                {
+                    var (smsRes, expiration) = await _envSmsHandler.SendTotpAsync(erSecret);
+
+                    return Ok(new ReceiverAuthResponse
+                    {
+                        Status = "requires_tfa",
+                        TfaType = "sms",
+                        TfaExpiration = expiration,
+                        Title = erSecret.Envelope.Title,
+                        SenderEmail = erSecret.Envelope.User?.Email,
+                        HasPhoneNumber = erSecret.HasPhoneNumber
+                    });
+                }
+                else
+                {
+                    return Ok(new ReceiverAuthResponse
+                    {
+                        Status = "requires_tfa",
+                        TfaType = "authenticator",
+                        Title = erSecret.Envelope.Title,
+                        SenderEmail = erSecret.Envelope.User?.Email,
+                        HasPhoneNumber = erSecret.HasPhoneNumber
+                    });
+                }
+            }
+
+            // ── Kein TFA → Direkt SignIn ──
+            await HttpContext.SignInEnvelopeAsync(erSecret, Role.ReceiverFull);
+
+            return Ok(new ReceiverAuthResponse
+            {
+                Status = "show_document",
+                Title = erSecret.Envelope.Title,
+                Message = erSecret.Envelope.Message,
+                SenderEmail = erSecret.Envelope.User?.Email,
+                ReadOnly = erSecret.Envelope.ReadOnly
+            });
+        }
+        catch (Exception ex)
+        {
+            _logger.LogError(ex, "Error submitting access code for key {Key}", key);
+            return StatusCode(500, new ReceiverAuthResponse
+            {
+                Status = "error",
+                ErrorMessage = "Ein unerwarteter Fehler ist aufgetreten."
+            });
+        }
+    }
+
+    // ══════════════════════════════════════════════════════════════
+    // ENDPUNKT 3: TFA-CODE PRÜFEN
+    // ══════════════════════════════════════════════════════════════
+
+    /// <summary>
+    /// Prüft den TFA-Code (SMS oder Authenticator).
+    /// Setzt voraus, dass der Nutzer bereits mit ReceiverTFA-Rolle eingeloggt ist.
+    /// </summary>
+    [HttpPost("{key}/tfa")]
+    public async Task<IActionResult> SubmitTfaCode(
+        [FromRoute] string key,
+        [FromBody] TfaCodeRequest request,
+        CancellationToken cancel)
+    {
+        try
+        {
+            if (!User.IsInRole(Role.ReceiverTFA))
+                return Unauthorized(new ReceiverAuthResponse
+                {
+                    Status = "requires_access_code",
+                    ErrorMessage = "Bitte zuerst den Zugangscode eingeben."
+                });
+
+            (string? uuid, string? signature) = key.DecodeEnvelopeReceiverId();
+            if (uuid is null || signature is null)
+                return NotFound(new ReceiverAuthResponse { Status = "not_found" });
+
+            var erSecretRes = await _envRcvService.ReadWithSecretByUuidSignatureAsync(
+                uuid: uuid, signature: signature);
+
+            if (erSecretRes.IsFailed)
+                return NotFound(new ReceiverAuthResponse { Status = "not_found" });
+
+            var erSecret = erSecretRes.Data;
+
+            if (erSecret.Receiver!.TotpSecretkey is null)
+            {
+                _logger.LogError("TotpSecretkey is null for receiver {Signature}", signature);
+                return StatusCode(500, new ReceiverAuthResponse
+                {
+                    Status = "error",
+                    ErrorMessage = "TFA-Konfiguration fehlt."
+                });
+            }
+
+            bool codeValid;
+
+            if (request.Type == "sms")
+            {
+                codeValid = _envSmsHandler.VerifyTotp(request.Code, erSecret.Receiver.TotpSecretkey);
+            }
+            else
+            {
+                codeValid = _authenticator.VerifyTotp(
+                    request.Code,
+                    erSecret.Receiver.TotpSecretkey,
+                    window: VerificationWindow.RfcSpecifiedNetworkDelay);
+            }
+
+            if (!codeValid)
+            {
+                return Unauthorized(new ReceiverAuthResponse
+                {
+                    Status = "requires_tfa",
+                    TfaType = request.Type,
+                    Title = erSecret.Envelope!.Title,
+                    SenderEmail = erSecret.Envelope.User?.Email,
+                    HasPhoneNumber = erSecret.HasPhoneNumber,
+                    ErrorMessage = "Falscher Code."
+                });
+            }
+
+            await HttpContext.SignInEnvelopeAsync(erSecret, Role.ReceiverFull);
+
+            return Ok(new ReceiverAuthResponse
+            {
+                Status = "show_document",
+                Title = erSecret.Envelope!.Title,
+                Message = erSecret.Envelope.Message,
+                SenderEmail = erSecret.Envelope.User?.Email,
+                ReadOnly = erSecret.Envelope.ReadOnly
+            });
+        }
+        catch (Exception ex)
+        {
+            _logger.LogError(ex, "Error submitting TFA code for key {Key}", key);
+            return StatusCode(500, new ReceiverAuthResponse
+            {
+                Status = "error",
+                ErrorMessage = "Ein unerwarteter Fehler ist aufgetreten."
+            });
+        }
+    }
+}

EnvelopeGenerator.API/Models/ReceiverAuthResponse.cs

@@ -0,0 +1,78 @@
+namespace EnvelopeGenerator.API.Models;
+
+/// <summary>
+/// Einheitliche Antwort des ReceiverAuthControllers.
+/// 
+/// WARUM ein einziges Response-Objekt für alle Endpunkte?
+/// - Der Client braucht nur ein Format zu verstehen
+/// - Der Status-String bestimmt, welche Felder relevant sind
+/// - Entspricht dem, was der Web-Controller bisher über ViewData verteilt hat
+/// 
+/// Status-Werte und was sie bedeuten:
+/// - "requires_access_code" → AccessCode-Eingabe zeigen
+/// - "requires_tfa"         → TFA-Code-Eingabe zeigen (nach AccessCode)
+/// - "show_document"        → Dokument laden und anzeigen
+/// - "already_signed"       → Info-Seite "Bereits unterschrieben"
+/// - "rejected"             → Info-Seite "Abgelehnt"
+/// - "not_found"            → Fehler-Seite "Nicht gefunden"
+/// - "expired"              → Fehler-Seite "Link abgelaufen"
+/// </summary>
+public class ReceiverAuthResponse
+{
+    /// <summary>Aktueller Status des Empfänger-Flows</summary>
+    public required string Status { get; init; }
+
+    /// <summary>Titel des Umschlags (z.B. "Vertragsdokument")</summary>
+    public string? Title { get; init; }
+
+    /// <summary>Nachricht des Absenders</summary>
+    public string? Message { get; init; }
+
+    /// <summary>E-Mail des Absenders (für Rückfragen-Hinweis)</summary>
+    public string? SenderEmail { get; init; }
+
+    /// <summary>Name des Empfängers</summary>
+    public string? ReceiverName { get; init; }
+
+    /// <summary>Ob TFA für diesen Umschlag aktiviert ist</summary>
+    public bool TfaEnabled { get; init; }
+
+    /// <summary>Ob der Empfänger eine Telefonnummer hat (für SMS-TFA)</summary>
+    public bool HasPhoneNumber { get; init; }
+
+    /// <summary>Ob das Dokument nur gelesen werden soll (ReadAndConfirm)</summary>
+    public bool ReadOnly { get; init; }
+
+    /// <summary>TFA-Typ: "sms" oder "authenticator" (wenn Status = "requires_tfa")</summary>
+    public string? TfaType { get; init; }
+
+    /// <summary>Ablaufzeit des SMS-Codes (für Countdown-Timer)</summary>
+    public DateTime? TfaExpiration { get; init; }
+
+    /// <summary>Fehlermeldung (z.B. "Falscher Zugangscode")</summary>
+    public string? ErrorMessage { get; init; }
+}
+
+/// <summary>
+/// Request-Body für POST /api/receiverauth/{key}/access-code
+/// </summary>
+public class AccessCodeRequest
+{
+    /// <summary>Der vom Empfänger eingegebene Zugangscode</summary>
+    public required string AccessCode { get; init; }
+
+    /// <summary>Ob SMS statt Authenticator bevorzugt wird</summary>
+    public bool PreferSms { get; init; }
+}
+
+/// <summary>
+/// Request-Body für POST /api/receiverauth/{key}/tfa
+/// </summary>
+public class TfaCodeRequest
+{
+    /// <summary>Der eingegebene TFA-Code (6-stellig)</summary>
+    public required string Code { get; init; }
+
+    /// <summary>"sms" oder "authenticator"</summary>
+    public required string Type { get; init; }
+}

EnvelopeGenerator.Application/Common/CacheKey.cs

@@ -1,13 +0,0 @@
-namespace EnvelopeGenerator.Application.Common;
-
-// TODO: merge other cache keys here as well, e.g. for templates, etc.
-/// <summary>
-/// 
-/// </summary>
-public static class CacheKey
-{
-    /// <summary>
-    /// 
-    /// </summary>
-    public static readonly Guid DefaultConfig = Guid.NewGuid();
-}

EnvelopeGenerator.Application/Common/Dto/ConfigDto.cs

@@ -8,11 +8,6 @@ namespace EnvelopeGenerator.Application.Common.Dto;
 [ApiExplorerSettings(IgnoreApi = true)]
 public class ConfigDto
 {
-    /// <summary>
-    /// Gets or sets the default document path.
-    /// </summary>
-    public string? DocumentPath { get; set; }
-
     /// <summary>
     /// Gets or sets the sending profile identifier.
     /// </summary>
@@ -31,30 +26,5 @@ public class ConfigDto
     /// <summary>
     /// Gets or sets the path where exports will be saved.
     /// </summary>
-    public string ExportPath { get; set; } = null!;
+    public string? ExportPath { get; set; }
-
-    /// <summary>
-    /// Gets or sets the creation timestamp.
-    /// </summary>
-    public DateTime AddedWhen { get; set; }
-
-    /// <summary>
-    /// Gets or sets the last update timestamp.
-    /// </summary>
-    public DateTime? ChangedWhen { get; set; }
-
-    /// <summary>
-    /// Gets or sets the legacy tinyint GUID field.
-    /// </summary>
-    public byte Guid { get; set; }
-
-    /// <summary>
-    /// Gets or sets whether default TFA is enabled.
-    /// </summary>
-    public bool DefTfaEnabled { get; set; }
-
-    /// <summary>
-    /// Gets or sets whether default TFA uses phone.
-    /// </summary>
-    public bool DefTfaWithPhone { get; set; }
 }

EnvelopeGenerator.Application/Common/Dto/EnvelopeDto.cs

@@ -1,9 +1,7 @@
 using DigitalData.EmailProfilerDispatcher.Abstraction.Attributes;
 using DigitalData.UserManager.Application.DTOs.User;
-using EnvelopeGenerator.Application.Common.Dto.EnvelopeReceiver;
 using EnvelopeGenerator.Domain.Constants;
 using EnvelopeGenerator.Domain.Entities;
-using EnvelopeGenerator.Domain.Interfaces;
 using Microsoft.AspNetCore.Mvc;
 
 namespace EnvelopeGenerator.Application.Common.Dto;
@@ -12,7 +10,7 @@ namespace EnvelopeGenerator.Application.Common.Dto;
 /// 
 /// </summary>
 [ApiExplorerSettings(IgnoreApi = true)]
-public record EnvelopeDto : IEnvelope
+public record EnvelopeDto
 {
 	/// <summary>
 	/// 
@@ -45,16 +43,6 @@ public record EnvelopeDto : IEnvelope
     [TemplatePlaceholder("[MESSAGE]")]
     public string Message { get; set; } = string.Empty;
 
-    /// <summary>
-    /// 
-    /// </summary>
-    public DateTime? ExpiresWhen { get; set; }
-
-    /// <summary>
-    /// 
-    /// </summary>
-    public DateTime? ExpiresWarningWhen { get; set; }
-
     /// <summary>
     /// 
     /// </summary>
@@ -71,11 +59,6 @@ public record EnvelopeDto : IEnvelope
     [TemplatePlaceholder("[DOCUMENT_TITLE]")]
     public string Title { get; set; } = string.Empty;
 
-    /// <summary>
-    /// Default value is string.Empty
-    /// </summary>
-    public string? Comment { get; set; }
-
     /// <summary>
     /// 
     /// </summary>
@@ -86,21 +69,6 @@ public record EnvelopeDto : IEnvelope
     /// </summary>
     public string Language { get; set; } = "de-DE";
 
-    /// <summary>
-    /// 
-    /// </summary>
-    public bool SendReminderEmails { get; set; }
-
-    /// <summary>
-    /// 
-    /// </summary>
-    public int? FirstReminderDays { get; set; }
-
-    /// <summary>
-    /// 
-    /// </summary>
-    public int? ReminderIntervalDays { get; set; }
-
     /// <summary>
     /// 
     /// </summary>
@@ -121,26 +89,6 @@ public record EnvelopeDto : IEnvelope
     /// </summary>
     public bool UseAccessCode { get; set; } = true;
 
-    /// <summary>
-    /// 
-    /// </summary>
-    public int? FinalEmailToCreator { get; set; }
-
-    /// <summary>
-    /// 
-    /// </summary>
-    public int? FinalEmailToReceivers { get; set; }
-
-    /// <summary>
-    /// 
-    /// </summary>
-    public int? ExpiresWhenDays { get; set; }
-
-    /// <summary>
-    /// 
-    /// </summary>
-    public int? ExpiresWarningWhenDays { get; set; }
-
     /// <summary>
     /// 
     /// </summary>
@@ -175,9 +123,4 @@ public record EnvelopeDto : IEnvelope
     /// 
     /// </summary>
     public IEnumerable<DocumentDto>? Documents { get; set; }
-
-    /// <summary>
-    /// 
-    /// </summary>
-    public IEnumerable<EnvelopeReceiverDto>? EnvelopeReceivers { get; set; }
 }

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

@@ -29,12 +29,15 @@ public class DocStatusHandler : INotificationHandler<DocSignedNotification>
     /// <param name="notification"></param>
     /// <param name="cancel"></param>
     /// <returns></returns>
-    public Task Handle(DocSignedNotification notification, CancellationToken cancel) => _sender.Send(new CreateDocStatusCommand()
+    public async Task Handle(DocSignedNotification notification, CancellationToken cancel)
     {
-        EnvelopeId = notification.EnvelopeId,
+        await _sender.Send(new SaveDocStatusCommand()
-        ReceiverId = notification.ReceiverId,
+        {
-        Value = notification.PsPdfKitAnnotation is PsPdfKitAnnotation annot
+            Envelope = new() { Id = notification.EnvelopeId },
+            Receiver = new() { Id = notification.ReceiverId},
+            Value = notification.PsPdfKitAnnotation is PsPdfKitAnnotation annot 
                     ? JsonSerializer.Serialize(annot.Instant, Format.Json.ForAnnotations) 
                     : BlankAnnotationJson
-    }, cancel);
+        }, cancel);
+    }
 }

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

@@ -3,7 +3,6 @@ using DigitalData.EmailProfilerDispatcher.Abstraction.Entities;
 using EnvelopeGenerator.Application.Common.Configurations;
 using EnvelopeGenerator.Domain.Entities;
 using Microsoft.Extensions.Options;
-using EnvelopeGenerator.Domain.Interfaces;
 
 namespace EnvelopeGenerator.Application.Common.Notifications.DocSigned.Handlers;
 
@@ -46,25 +45,6 @@ public class SendSignedMailHandler : SendMailHandler<DocSignedNotification>
             { "[DOCUMENT_TITLE]", notification.Envelope?.Title ?? string.Empty },
         };
 
-        if (notification.Envelope.IsReadAndConfirm())
-        {
-            placeHolders["[SIGNATURE_TYPE]"] = "Lesen und bestätigen";
-            placeHolders["[DOCUMENT_PROCESS]"] = string.Empty;
-            placeHolders["[FINAL_STATUS]"] = "Lesebestätigung";
-            placeHolders["[FINAL_ACTION]"] = "Empfänger bestätigt";
-            placeHolders["[REJECTED_BY_OTHERS]"] = "anderen Empfänger abgelehnt!";
-            placeHolders["[RECEIVER_ACTION]"] = "bestätigt";
-        }
-        else
-        {
-            placeHolders["[SIGNATURE_TYPE]"] = "Signieren";
-            placeHolders["[DOCUMENT_PROCESS]"] = " und elektronisch unterschreiben";
-            placeHolders["[FINAL_STATUS]"] = "Signatur";
-            placeHolders["[FINAL_ACTION]"] = "Vertragspartner unterzeichnet";
-            placeHolders["[REJECTED_BY_OTHERS]"] = "anderen Vertragspartner abgelehnt! Ihre notwendige Unterzeichnung wurde verworfen.";
-            placeHolders["[RECEIVER_ACTION]"] = "unterschrieben";
-        }
-
         return placeHolders;
     }
 }

EnvelopeGenerator.Application/Common/Query/EnvelopeQueryBase.cs

@@ -14,10 +14,4 @@ public record EnvelopeQueryBase
     /// Die universell eindeutige Kennung des Umschlags.
     /// </summary>
     public virtual string? Uuid { get; set; }
-
-    /// <summary>
-    /// Wenn gesetzt, wird das DocResult-Feld in der Abfrage einbezogen.
-    /// Standardmäßig wird DocResult nicht geladen, um große Binärdaten zu vermeiden.
-    /// </summary>
-    public bool IncludeDocResult { get; set; } = false;
 }

EnvelopeGenerator.Application/Configuration/Queries/ReadDefaultConfigQuery.cs

@@ -1,69 +0,0 @@
-using AutoMapper;
-using DigitalData.Core.Abstraction.Application.Repository;
-using DigitalData.Core.Exceptions;
-using EnvelopeGenerator.Application.Common;
-using EnvelopeGenerator.Application.Common.Dto;
-using EnvelopeGenerator.Domain.Entities;
-using MediatR;
-using Microsoft.EntityFrameworkCore;
-using Microsoft.Extensions.Caching.Distributed;
-using Microsoft.Extensions.Caching.Memory;
-
-namespace EnvelopeGenerator.Application.Configuration.Queries;
-
-/// <summary>
-/// 
-/// </summary>
-public record ReadDefaultConfigQuery : IRequest<ConfigDto>
-{
-    /// <summary>
-    /// 
-    /// </summary>
-    public bool EnforceSingleResult { get; init; }
-}
-
-/// <summary>
-/// 
-/// </summary>
-public class ReadDefaultConfigQueryHandler : IRequestHandler<ReadDefaultConfigQuery, ConfigDto>
-{
-    private readonly IRepository<Config> _repo;
-
-    private readonly IMapper _mapper;
-
-    private readonly IMemoryCache _cache;
-
-    /// <summary>
-    /// 
-    /// </summary>
-    /// <param name="repo"></param>
-    /// <param name="mapper"></param>
-    /// <param name="cache"></param>
-    public ReadDefaultConfigQueryHandler(IRepository<Config> repo, IMapper mapper, IMemoryCache cache)
-    {
-        _repo = repo;
-        _mapper = mapper;
-        _cache = cache;
-    }
-
-    /// <summary>
-    /// 
-    /// </summary>
-    /// <param name="request"></param>
-    /// <param name="cancel"></param>
-    /// <returns></returns>
-    /// <exception cref="InvalidOperationException"></exception>
-    public async Task<ConfigDto> Handle(ReadDefaultConfigQuery request, CancellationToken cancel)
-    {
-        var config = await _cache.GetOrCreateAsync(CacheKey.DefaultConfig, entry =>
-        {
-            entry.AbsoluteExpirationRelativeToNow = TimeSpan.FromMinutes(30);
-            return request.EnforceSingleResult
-            ? _repo.Query.SingleOrDefaultAsync(cancel)
-            : _repo.Query.FirstOrDefaultAsync(cancel)
-            ?? throw new NotFoundException("Default configuration could not be found. Ensure at least one configuration record exists in the database.");
-        });
-
-        return _mapper.Map<ConfigDto>(config);
-    }
-}

EnvelopeGenerator.Application/DocStatus/Commands/CreateDocStatusCommand.cs

@@ -8,22 +8,12 @@ namespace EnvelopeGenerator.Application.DocStatus.Commands;
 /// <summary>
 /// 
 /// </summary>
-public record CreateDocStatusCommand : IRequest<DocumentStatus>
+public record CreateDocStatusCommand : ModifyDocStatusCommandBase, IRequest<DocumentStatus>
 {
     /// <summary>
-    /// 
+    /// Gets timestamp when this record was added. Returns the StatusChangedWhen value.
     /// </summary>
-    public int EnvelopeId { get; set; }
+    public DateTime AddedWhen => StatusChangedWhen;
-
-    /// <summary>
-    /// 
-    /// </summary>
-    public int ReceiverId { get; set; }
-
-    /// <summary>
-    /// Gets or sets the display value associated with the status.
-    /// </summary>
-    public string? Value { get; set; }
 }
 
 /// <summary>

EnvelopeGenerator.Application/DocStatus/Commands/ModifyDocStatusCommandBase.cs

@@ -0,0 +1,54 @@
+using EnvelopeGenerator.Application.Common.Query;
+using EnvelopeGenerator.Domain.Constants;
+
+namespace EnvelopeGenerator.Application.DocStatus.Commands;
+
+/// <summary>
+/// 
+/// </summary>
+public record ModifyDocStatusCommandBase : EnvelopeReceiverQueryBase
+{
+    /// <summary>
+    /// 
+    /// </summary>
+    public int? EnvelopeId => Envelope.Id;
+
+    /// <summary>
+    /// 
+    /// </summary>
+    public int? ReceiverId => Receiver.Id;
+
+    /// <summary>
+    /// 
+    /// </summary>
+    public override ReceiverQueryBase Receiver { get => base.Receiver; set => base.Receiver = value; }
+
+    /// <summary>
+    /// Gets the current status code.
+    /// </summary>
+    public DocumentStatus Status => Value is null ? DocumentStatus.Created : DocumentStatus.Signed;
+
+    /// <summary>
+    /// Gets or sets the display value associated with the status.
+    /// </summary>
+    public string? Value { get; set; }
+
+    /// <summary>
+    /// Gets timestamp when this record was added.
+    /// </summary>
+    public DateTime StatusChangedWhen { get; } = DateTime.Now;
+
+    /// <summary>
+    /// Maps the current command to a new instance of the specified type.
+    /// </summary>
+    /// <typeparam name="TDest"></typeparam>
+    /// <returns></returns>
+    public TDest To<TDest>() where TDest : ModifyDocStatusCommandBase, new()
+        => new()
+        {
+            Key = Key,
+            Envelope = Envelope,
+            Receiver = Receiver,
+            Value = Value
+        };
+}

EnvelopeGenerator.Application/DocStatus/Commands/SaveDocStatusCommand.cs

@@ -0,0 +1,77 @@
+using DigitalData.Core.Abstraction.Application.Repository;
+using EnvelopeGenerator.Domain.Entities;
+using MediatR;
+using Microsoft.EntityFrameworkCore;
+using AutoMapper;
+using EnvelopeGenerator.Application.Common.Dto;
+using EnvelopeGenerator.Application.Common.Extensions;
+
+namespace EnvelopeGenerator.Application.DocStatus.Commands;
+
+/// <summary>
+/// Represents a command to save the status of a document, either by creating a new status or updating an existing one based on the provided envelope and receiver identifiers.
+/// It returns the identifier of the saved document status.
+/// </summary>
+public record SaveDocStatusCommand : ModifyDocStatusCommandBase, IRequest<DocumentStatusDto?>;
+
+/// <summary>
+/// 
+/// </summary>
+public class SaveDocStatusCommandHandler : IRequestHandler<SaveDocStatusCommand, DocumentStatusDto?>
+{
+    private readonly IMapper _mapper;
+
+    private readonly IRepository<DocumentStatus> _repo;
+
+    private readonly IRepository<Envelope> _envRepo;
+
+    private readonly IRepository<Receiver> _rcvRepo;
+
+    /// <summary>
+    /// 
+    /// </summary>
+    /// <param name="mapper"></param>
+    /// <param name="repo"></param>
+    /// <param name="rcvRepo"></param>
+    /// <param name="envRepo"></param>
+    public SaveDocStatusCommandHandler(IMapper mapper, IRepository<DocumentStatus> repo, IRepository<Receiver> rcvRepo, IRepository<Envelope> envRepo)
+    {
+        _mapper = mapper;
+        _repo = repo;
+        _rcvRepo = rcvRepo;
+        _envRepo = envRepo;
+    }
+
+    /// <summary>
+    /// 
+    /// </summary>
+    /// <param name="request"></param>
+    /// <param name="cancel"></param>
+    /// <returns></returns>
+    public async Task<DocumentStatusDto?> Handle(SaveDocStatusCommand request, CancellationToken cancel)
+    {
+        // ceck if exists
+        bool isExists = await _repo.ReadOnly().Where(request).AnyAsync(cancel);
+
+        var env = await _envRepo.ReadOnly().Where(request.Envelope).FirstAsync(cancel);
+        var rcv = await _rcvRepo.ReadOnly().Where(request.Receiver).FirstAsync(cancel);
+
+        request.Envelope.Id = env.Id;
+        request.Receiver.Id = rcv.Id;
+
+        if (isExists)
+        {
+            var uReq = request.To<UpdateDocStatusCommand>();
+            await _repo.UpdateAsync(uReq, q => q.Where(request), cancel);
+        }
+        else
+        {
+            var cReq = request.To<CreateDocStatusCommand>();
+            await _repo.CreateAsync(cReq, cancel);
+        }
+
+        var docStatus = await _repo.ReadOnly().Where(request).SingleOrDefaultAsync(cancel);
+        
+        return _mapper.Map<DocumentStatusDto>(docStatus);
+    }
+}

EnvelopeGenerator.Application/DocStatus/Commands/UpdateDocStatusCommand.cs

@@ -1,41 +1,14 @@
-using EnvelopeGenerator.Application.Common.Commands;
+using EnvelopeGenerator.Domain;
-using EnvelopeGenerator.Domain.Entities;
-using System.Linq.Expressions;
 
 namespace EnvelopeGenerator.Application.DocStatus.Commands;
 
 /// <summary>
 /// 
 /// </summary>
-/// <param name="Value"></param>
+public record UpdateDocStatusCommand : ModifyDocStatusCommandBase
-public record DocStatusUpdateDto(string? Value);
-
-/// <summary>
-/// 
-/// </summary>
-public record UpdateDocStatusCommand : UpdateCommand<DocStatusUpdateDto, DocumentStatus>
 {
     /// <summary>
-    /// 
+    /// Gets timestamp when this record was added. Returns the StatusChangedWhen value.
     /// </summary>
-    public int EnvelopeId { get; set; }
+    public DateTime? ChangedWhen => StatusChangedWhen;
-
-    /// <summary>
-    /// 
-    /// </summary>
-    public int ReceiverId { get; set; }
-
-    /// <summary>
-    /// Gets or sets the display value associated with the status.
-    /// </summary>
-    public string? Value { get; set; }
-
-    /// <summary>
-    /// 
-    /// </summary>
-    /// <returns></returns>
-    public override Expression<Func<DocumentStatus, bool>> BuildQueryExpression()
-    {
-        return ds => ds.EnvelopeId == EnvelopeId && ds.ReceiverId == ReceiverId;
-    }
 }

EnvelopeGenerator.Application/DocStatus/MappingProfile.cs

@@ -18,16 +18,11 @@ public class MappingProfile : Profile
         CreateMap<CreateDocStatusCommand, DocumentStatus>()
         .ForMember(dest => dest.Envelope, opt => opt.Ignore())
         .ForMember(dest => dest.Receiver, opt => opt.Ignore())
-        .ForMember(dest => dest.Status, opt => opt.MapFrom(
-            src => src.Value == null 
-                ? Domain.Constants.DocumentStatus.Created 
-                : Domain.Constants.DocumentStatus.Signed))
         .MapAddedWhen();
 
         CreateMap<UpdateDocStatusCommand, DocumentStatus>()
         .ForMember(dest => dest.Envelope, opt => opt.Ignore())
         .ForMember(dest => dest.Receiver, opt => opt.Ignore())
-        .ForMember(dest => dest.StatusChangedWhen, opt => opt.MapFrom(src => DateTime.UtcNow))
         .MapChangedWhen();
     }
 }

EnvelopeGenerator.Application/EnvelopeGenerator.Application.csproj

@@ -37,11 +37,11 @@
 	</ItemGroup>
 
 	<ItemGroup Condition="'$(TargetFramework)' == 'net8.0'">
-		<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="8.0.1" />
+		<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="9.0.5" />
 	</ItemGroup>
 
 	<ItemGroup Condition="'$(TargetFramework)' == 'net9.0'">
-		<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="9.0.6" />
+		<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="9.0.5" />
 	</ItemGroup>
 
 	<ItemGroup>
@@ -78,29 +78,28 @@
 		</EmbeddedResource>
 	</ItemGroup>
 
-  <ItemGroup Condition="'$(TargetFramework)' == 'net7.0'">
+	<ItemGroup Condition="'$(TargetFramework)' == 'net7.0'">
-	<PackageReference Include="AutoMapper" Version="13.0.1" />
+	  <PackageReference Include="AutoMapper" Version="13.0.1" />
-	<PackageReference Include="Microsoft.Data.SqlClient" Version="5.2.2" />
+	  <PackageReference Include="Microsoft.Data.SqlClient" Version="6.1.4" />
-	<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="7.0.20" />
+	  <PackageReference Include="CommandDotNet">
-	<PackageReference Include="CommandDotNet">
 		<Version>7.0.5</Version>
-	</PackageReference>
+	  </PackageReference>
-  </ItemGroup>
+	</ItemGroup>
 
-  <ItemGroup Condition="'$(TargetFramework)' == 'net8.0'">
+	<ItemGroup Condition="'$(TargetFramework)' == 'net8.0'">
-	<PackageReference Include="AutoMapper" Version="14.0.0" />
+	  <PackageReference Include="AutoMapper" Version="14.0.0" />
-	<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="8.0.17" />
+	  <PackageReference Include="Microsoft.Data.SqlClient" Version="6.0.2" />
-	<PackageReference Include="CommandDotNet">
+	  <PackageReference Include="CommandDotNet">
-	  <Version>8.1.1</Version>
+	    <Version>8.1.1</Version>
-	</PackageReference>
+	  </PackageReference>
-  </ItemGroup>
+	</ItemGroup>
 
-  <ItemGroup Condition="'$(TargetFramework)' == 'net9.0'">
+	<ItemGroup Condition="'$(TargetFramework)' == 'net9.0'">
-	<PackageReference Include="AutoMapper" Version="14.0.0" />
+	  <PackageReference Include="AutoMapper" Version="14.0.0" />
-	<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="9.0.6" />
+	  <PackageReference Include="Microsoft.Data.SqlClient" Version="6.0.2" />
-	<PackageReference Include="CommandDotNet">
+	  <PackageReference Include="CommandDotNet">
-	  <Version>8.1.1</Version>
+	    <Version>8.1.1</Version>
-	</PackageReference>
+	  </PackageReference>
-  </ItemGroup>
+	</ItemGroup>
 
 </Project>

EnvelopeGenerator.Application/EnvelopeReceivers/Queries/ReadEnvelopeReceiverLightQuery.cs

@@ -0,0 +1,60 @@
+using AutoMapper;
+using DigitalData.Core.Abstraction.Application.Repository;
+using EnvelopeGenerator.Application.Common.Dto.EnvelopeReceiver;
+using EnvelopeGenerator.Application.Common.Extensions;
+using EnvelopeGenerator.Application.Common.Query;
+using EnvelopeGenerator.Application.Envelopes.Queries;
+using EnvelopeGenerator.Application.Receivers.Queries;
+using EnvelopeGenerator.Domain.Entities;
+using MediatR;
+using Microsoft.EntityFrameworkCore;
+
+namespace EnvelopeGenerator.Application.EnvelopeReceivers.Queries;
+
+/// <summary>
+/// Leichte Variante von <see cref="ReadEnvelopeReceiverQuery"/>:
+/// Lädt NUR Envelope (mit Histories + User) und Receiver.
+/// Lädt NICHT Documents/Elements.
+/// 
+/// Verwendung: Status-Prüfungen wo keine Dokument-Daten benötigt werden
+/// (z.B. ReceiverAuthController.GetStatus).
+/// </summary>
+public record ReadEnvelopeReceiverLightQuery
+    : EnvelopeReceiverQueryBase<ReadEnvelopeQuery, ReadReceiverQuery>, IRequest<EnvelopeReceiverDto?>;
+
+/// <summary>
+/// Handler für <see cref="ReadEnvelopeReceiverLightQuery"/>.
+/// </summary>
+public class ReadEnvelopeReceiverLightQueryHandler
+    : IRequestHandler<ReadEnvelopeReceiverLightQuery, EnvelopeReceiverDto?>
+{
+    private readonly IRepository<EnvelopeReceiver> _repo;
+    private readonly IMapper _mapper;
+
+    /// <summary>
+    /// Konstruktor.
+    /// </summary>
+    /// <param name="repo">EnvelopeReceiver-Repository</param>
+    /// <param name="mapper">AutoMapper</param>
+    public ReadEnvelopeReceiverLightQueryHandler(IRepository<EnvelopeReceiver> repo, IMapper mapper)
+    {
+        _repo = repo;
+        _mapper = mapper;
+    }
+
+    /// <summary>
+    /// Lädt einen EnvelopeReceiver ohne Documents/Elements.
+    /// </summary>
+    public async Task<EnvelopeReceiverDto?> Handle(ReadEnvelopeReceiverLightQuery request, CancellationToken cancel)
+    {
+        var envRcv = await _repo.Query
+            .Where(request, notnull: false)
+            .AsNoTracking()
+            .Include(er => er.Envelope).ThenInclude(e => e!.Histories)
+            .Include(er => er.Envelope).ThenInclude(e => e!.User)
+            .Include(er => er.Receiver)
+            .FirstOrDefaultAsync(cancel);
+
+        return envRcv is null ? null : _mapper.Map<EnvelopeReceiverDto>(envRcv);
+    }
+}

EnvelopeGenerator.Application/Envelopes/Queries/ReadEnvelopeQuery.cs

@@ -24,12 +24,6 @@ public record ReadEnvelopeQuery : EnvelopeQueryBase, IRequest<IEnumerable<Envelo
     /// </summary>
     public int? UserId { get; init; }
 
-    /// <summary>
-    /// Optionaler Zeitfilter in Minuten; wenn gesetzt, werden nur Umschläge zurückgegeben,
-    /// deren letzte Änderung mindestens diese Anzahl an Minuten zurückliegt.
-    /// </summary>
-    public int? MinMinutesSinceLastChange { get; init; }
-
     /// <summary>
     /// Setzt den Benutzerkontext für die Abfrage.
     /// </summary>
@@ -138,12 +132,6 @@ public class ReadEnvelopeQueryHandler : IRequestHandler<ReadEnvelopeQuery, IEnum
                 query = query.Where(e => !status.Ignore.Contains(e.Status));
         }
 
-        if (request.MinMinutesSinceLastChange is int minMinutesSinceLastChange)
-        {
-            query = query.Where(e => e.ChangedWhen.HasValue
-                && EF.Functions.DateDiffMinute(e.ChangedWhen.Value, DateTime.Now) >= minMinutesSinceLastChange);
-        }
-
         var envelopes = await query
             .Include(e => e.Documents)
             .ToListAsync(cancel);

EnvelopeGenerator.Application/Envelopes/Queries/ReadSingleEnvelopeDocResultQuery.cs

@@ -1,48 +0,0 @@
-using MediatR;
-using EnvelopeGenerator.Application.Common.Dto;
-using DigitalData.Core.Exceptions;
-
-namespace EnvelopeGenerator.Application.Envelopes.Queries;
-
-/// <summary>
-/// Repräsentiert eine Abfrage für Umschläge.
-/// </summary>
-public record ReadSingleEnvelopeDocResultQuery() : IRequest<byte[]>
-{
-    /// <summary>
-    /// 
-    /// </summary>
-    public ReadSingleEnvelopeQuery Envelope { get; set; } = null!;
-}
-
-/// <summary>
-/// Verarbeitet <see cref="ReadEnvelopeQuery"/> und liefert passende <see cref="EnvelopeDto"/>-Ergebnisse.
-/// </summary>
-public class ReadSingleEnvelopeDocResultQueryHandler : IRequestHandler<ReadSingleEnvelopeDocResultQuery, byte[]>
-{
-    private readonly IMediator _mediator;
-
-    /// <summary>
-    /// 
-    /// </summary>
-    /// <param name="mediator"></param>
-    public ReadSingleEnvelopeDocResultQueryHandler(IMediator mediator)
-    {
-        _mediator = mediator;
-    }
-
-    /// <summary>
-    /// 
-    /// </summary>
-    /// <param name="request"></param>
-    /// <param name="cancellationToken"></param>
-    /// <returns></returns>
-    public async Task<byte[]> Handle(ReadSingleEnvelopeDocResultQuery request, CancellationToken cancellationToken)
-    {
-        request.Envelope.IncludeDocResult = true;
-        var result = await _mediator.Send(request.Envelope, cancellationToken);
-        return result.DocResult is byte[] docResult && docResult.Length > 0 
-            ? docResult 
-            : throw new NotFoundException($"Document for Envelope with ID {request.Envelope.Id} not found");
-    }
-}

EnvelopeGenerator.Application/Envelopes/Queries/ReadSingleEnvelopeQuery.cs

@@ -1,78 +0,0 @@
-using MediatR;
-using EnvelopeGenerator.Application.Common.Query;
-using EnvelopeGenerator.Application.Common.Dto;
-using AutoMapper;
-using DigitalData.Core.Abstraction.Application.Repository;
-using EnvelopeGenerator.Domain.Entities;
-using Microsoft.EntityFrameworkCore;
-using DigitalData.Core.Exceptions;
-
-namespace EnvelopeGenerator.Application.Envelopes.Queries;
-
-/// <summary>
-/// Repräsentiert eine Abfrage für einen einzelnen Umschlag.
-/// </summary>
-public record ReadSingleEnvelopeQuery : EnvelopeQueryBase, IRequest<EnvelopeDto>
-{
-    /// <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 ReadSingleEnvelopeQuery Authorize(int userId) => this with { UserId = userId };
-}
-
-/// <summary>
-/// Verarbeitet <see cref="ReadSingleEnvelopeQuery"/> und liefert ein einzelnes <see cref="EnvelopeDto"/>-Ergebnis.
-/// </summary>
-public class ReadSingleEnvelopeQueryHandler : IRequestHandler<ReadSingleEnvelopeQuery, EnvelopeDto>
-{
-    private readonly IRepository<Envelope> _repository;
-    private readonly IMapper _mapper;
-
-    /// <summary>
-    /// 
-    /// </summary>
-    /// <param name="repository"></param>
-    /// <param name="mapper"></param>
-    public ReadSingleEnvelopeQueryHandler(IRepository<Envelope> repository, IMapper mapper)
-    {
-        _repository = repository;
-        _mapper = mapper;
-    }
-
-    /// <summary>
-    /// 
-    /// </summary>
-    /// <param name="request"></param>
-    /// <param name="cancel"></param>
-    /// <returns></returns>
-    public async Task<EnvelopeDto> Handle(ReadSingleEnvelopeQuery request, CancellationToken cancel)
-    {
-        var query = _repository.Query;
-
-        if (request.UserId is int userId)
-            query = query.Where(e => e.UserId == userId);
-
-        if (request.Id is int id)
-            query = query.Where(e => e.Id == id);
-
-        if (request.Uuid is string uuid)
-            query = query.Where(e => e.Uuid == uuid);
-        
-        var envelopes = await query
-            .Include(e => e.Documents)
-            .Take(2)
-            .ToListAsync(cancel);
-
-        if (envelopes.Count > 1)
-            throw new BadRequestException($"Multiple envelopes found for the given criteria: Id={request.Id}, Uuid={request.Uuid}, UserId={request.UserId}");
-
-        return envelopes.SingleOrDefault() is Envelope envelope
-            ? _mapper.Map<EnvelopeDto>(envelope)
-            : throw new NotFoundException($"Envelope with Id={request.Id}, Uuid={request.Uuid} not found");
-    }
-}

EnvelopeGenerator.Application/Histories/Commands/CreateHistoryCommand.cs

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

EnvelopeGenerator.Application/Histories/MappingProfile.cs

@@ -1,5 +1,4 @@
 using AutoMapper;
-using EnvelopeGenerator.Application.Common.Extensions;
 using EnvelopeGenerator.Application.Histories.Commands;
 using EnvelopeGenerator.Domain.Entities;
 
@@ -18,7 +17,6 @@ public class MappingProfile: Profile
         CreateMap<CreateHistoryCommand, History>()
             .ForMember(dest => dest.Envelope, opt => opt.Ignore())
             .ForMember(dest => dest.Sender, opt => opt.Ignore())
-            .ForMember(dest => dest.Receiver, opt => opt.Ignore())
+            .ForMember(dest => dest.Receiver, opt => opt.Ignore());
-            .MapAddedWhen();
     }
 }

EnvelopeGenerator.Application/Resources/Resource.cs

@@ -190,13 +190,6 @@ public static class Extensions
     /// <returns></returns>
     public static string SignDoc(this IStringLocalizer localizer) => localizer[nameof(SignDoc)].Value;
 
-    /// <summary>
-    /// 
-    /// </summary>
-    /// <param name="localizer"></param>
-    /// <returns></returns>
-    public static string ConfirmDoc(this IStringLocalizer localizer) => localizer[nameof(ConfirmDoc)].Value;
-
     /// <summary>
     /// 
     /// </summary>
@@ -211,13 +204,6 @@ public static class Extensions
     /// <returns></returns>
     public static string DocSigned(this IStringLocalizer localizer) => localizer[nameof(DocSigned)].Value;
 
-    /// <summary>
-    /// 
-    /// </summary>
-    /// <param name="localizer"></param>
-    /// <returns></returns>
-    public static string DocConfirmed(this IStringLocalizer localizer) => localizer[nameof(DocConfirmed)].Value;
-
     /// <summary>
     /// 
     /// </summary>
@@ -253,13 +239,6 @@ public static class Extensions
     /// <returns></returns>
     public static string SigAgree(this IStringLocalizer localizer) => localizer[nameof(SigAgree)].Value;
 
-    /// <summary>
-    /// 
-    /// </summary>
-    /// <param name="localizer"></param>
-    /// <returns></returns>
-    public static string ConfirmAgree(this IStringLocalizer localizer) => localizer[nameof(ConfirmAgree)].Value;
-
     /// <summary>
     /// 
     /// </summary>
@@ -288,13 +267,6 @@ public static class Extensions
     /// <returns></returns>
     public static string RejectionInfo1(this IStringLocalizer localizer) => localizer[nameof(RejectionInfo1)].Value;
 
-    /// <summary>
-    /// 
-    /// </summary>
-    /// <param name="localizer"></param>
-    /// <returns></returns>
-    public static string RejectionInfo1ForConfirmation(this IStringLocalizer localizer) => localizer[nameof(RejectionInfo1ForConfirmation)].Value;
-
     /// <summary>
     /// 
     /// </summary>
@@ -323,13 +295,6 @@ public static class Extensions
     /// <returns></returns>
     public static string SigningProcessTitle(this IStringLocalizer localizer) => localizer[nameof(SigningProcessTitle)].Value;
 
-    /// <summary>
-    /// 
-    /// </summary>
-    /// <param name="localizer"></param>
-    /// <returns></returns>
-    public static string ConfirmationProcessTitle(this IStringLocalizer localizer) => localizer[nameof(ConfirmationProcessTitle)].Value;
-
     /// <summary>
     /// 
     /// </summary>

EnvelopeGenerator.Application/Resources/Resource.de-DE.resx

@@ -250,7 +250,7 @@
     <value>Sie können bei Bedarf mit {0}, &lt;a href="mailto:{1}?subject={2}&amp;body=Sehr geehrte(r)%20{0},%0A%0A%0A"&gt;{1}&lt;/a&gt; Kontakt aufnehmen.</value>
   </data>
   <data name="RejectionInfo2_ext" xml:space="preserve">
-    <value>Der Vorgang wurde von einer der beteiligten Parteien abgelehnt. Sie können bei Bedarf mit {0}, &lt;a href="mailto:{1}?subject={2}&amp;body=Sehr geehrte(r)%20{0},%0A%0A%0A"&gt;{1}&lt;/a&gt; Kontakt aufnehmen.</value>
+    <value>Das Vorgang wurde von einer der beteiligten Parteien abgelehnt. Sie können bei Bedarf mit {0}, &lt;a href="mailto:{1}?subject={2}&amp;body=Sehr geehrte(r)%20{0},%0A%0A%0A"&gt;{1}&lt;/a&gt; Kontakt aufnehmen.</value>
   </data>
   <data name="RejectionReasonQ" xml:space="preserve">
     <value>Bitte geben Sie einen Grund an:</value>
@@ -447,34 +447,4 @@
   <data name="DocumentReset" xml:space="preserve">
     <value>Dokument wurde zurückgesetzt.</value>
   </data>
-  <data name="DocumentSuccessfullyConfirmed" xml:space="preserve">
-    <value>Dokument erfolgreich gelesen und bestätigt!</value>
-  </data>
-  <data name="DocumentConfirmedConfirmationMessage" xml:space="preserve">
-    <value>Sie haben das Dokument gelesen und bestätigt. Im Anschluss erhalten Sie eine schriftliche Bestätigung.</value>
-  </data>
-  <data name="Confirm" xml:space="preserve">
-    <value>Bestätigen</value>
-  </data>
-  <data name="RejectionInfo1Confirmation" xml:space="preserve">
-    <value>Dieser Bestätigungsvorgang wurde abgelehnt!</value>
-  </data>
-  <data name="ConfirmDoc" xml:space="preserve">
-    <value>Dokument bestätigen</value>
-  </data>
-  <data name="DocConfirmed" xml:space="preserve">
-    <value>Dokument bestätigt</value>
-  </data>
-  <data name="ConfirmAgree" xml:space="preserve">
-    <value>Durch Klick auf Abschließen bestätige ich, das Dokument gelesen und zur Kenntnis genommen zu haben.</value>
-  </data>
-  <data name="ConfirmedBy" xml:space="preserve">
-    <value>Bestätigt von</value>
-  </data>
-  <data name="ConfirmationProcessTitle" xml:space="preserve">
-    <value>Titel des Lesebetätigungs-Vorgangs</value>
-  </data>
-  <data name="Confirmations" xml:space="preserve">
-    <value>Bestätigungen</value>
-  </data>
 </root>

EnvelopeGenerator.Application/Resources/Resource.en-US.resx

@@ -447,34 +447,4 @@
   <data name="DocumentReset" xml:space="preserve">
     <value>Document has been reset.</value>
   </data>
-  <data name="DocumentSuccessfullyConfirmed" xml:space="preserve">
-    <value>Document successfully red and confirmed!</value>
-  </data>
-  <data name="DocumentConfirmedConfirmationMessage" xml:space="preserve">
-    <value>You have read and confirmed the document. You will receive a written confirmation afterwards.</value>
-  </data>
-  <data name="Confirm" xml:space="preserve">
-    <value>Confirm</value>
-  </data>
-  <data name="RejectionInfo1Confirmation" xml:space="preserve">
-    <value>This confirmation process has been rejected!</value>
-  </data>
-  <data name="ConfirmDoc" xml:space="preserve">
-    <value>Confirm Document</value>
-  </data>
-  <data name="DocConfirmed" xml:space="preserve">
-    <value>Document confirmed</value>
-  </data>
-  <data name="ConfirmAgree" xml:space="preserve">
-    <value>By clicking on “Complete”, I confirm that I have read and taken note of the document.</value>
-  </data>
-  <data name="ConfirmedBy" xml:space="preserve">
-    <value>Confirmed by</value>
-  </data>
-  <data name="ConfirmationProcessTitle" xml:space="preserve">
-    <value>Title of the read confirmation process</value>
-  </data>
-  <data name="Confirmations" xml:space="preserve">
-    <value>Confirmations</value>
-  </data>
 </root>

EnvelopeGenerator.Application/Resources/Resource.fr-FR.resx

@@ -447,34 +447,4 @@
   <data name="DocumentReset" xml:space="preserve">
     <value>Le document a été réinitialisé.</value>
   </data>
-  <data name="DocumentSuccessfullyConfirmed" xml:space="preserve">
-    <value>Document lu et confirmé avec succès !</value>
-  </data>
-  <data name="DocumentConfirmedConfirmationMessage" xml:space="preserve">
-    <value>Vous avez lu et confirmé le document. Vous recevrez une confirmation écrite par la suite.</value>
-  </data>
-  <data name="Confirm" xml:space="preserve">
-    <value>Confirmer</value>
-  </data>
-  <data name="RejectionInfo1Confirmation" xml:space="preserve">
-    <value>Cette procédure de confirmation a été rejetée !</value>
-  </data>
-  <data name="ConfirmDoc" xml:space="preserve">
-    <value>Confirmer le document</value>
-  </data>
-  <data name="DocConfirmed" xml:space="preserve">
-    <value>Document confirmé</value>
-  </data>
-  <data name="ConfirmAgree" xml:space="preserve">
-    <value>En cliquant sur « Terminer », je confirme avoir lu et pris connaissance du document.</value>
-  </data>
-  <data name="ConfirmedBy" xml:space="preserve">
-    <value>Confirmé par</value>
-  </data>
-  <data name="ConfirmationProcessTitle" xml:space="preserve">
-    <value>Titre de la procédure de confirmation de lecture</value>
-  </data>
-  <data name="Confirmations" xml:space="preserve">
-    <value>Confirmations</value>
-  </data>
 </root>

EnvelopeGenerator.Application/Services/ConfigService.cs

@@ -7,7 +7,6 @@ using Microsoft.Extensions.Logging;
 using EnvelopeGenerator.Application.Common.Dto;
 using EnvelopeGenerator.Application.Common.Interfaces.Repositories;
 using EnvelopeGenerator.Application.Common.Interfaces.Services;
-using EnvelopeGenerator.Application.Common;
 
 namespace EnvelopeGenerator.Application.Services;
 
@@ -17,6 +16,8 @@ namespace EnvelopeGenerator.Application.Services;
 [Obsolete("Use MediatR")]
 public class ConfigService : ReadService<IConfigRepository, ConfigDto, Config, int>, IConfigService
 {
+	private static readonly Guid DefaultConfigCacheId = Guid.NewGuid();
+
 	private readonly IMemoryCache _cache;
 
     private readonly ILogger<ConfigService> _logger;
@@ -61,7 +62,7 @@ public class ConfigService : ReadService<IConfigRepository, ConfigDto, Config, i
 	/// </exception>
 	public async Task<ConfigDto> ReadDefaultAsync()
     {
-        var config = await _cache.GetOrCreateAsync(CacheKey.DefaultConfig, _ => ReadFirstAsync().ThenAsync(
+        var config = await _cache.GetOrCreateAsync(DefaultConfigCacheId, _ => ReadFirstAsync().ThenAsync(
             Success: config => config,
             Fail: (mssg, ntc) =>
             {

EnvelopeGenerator.Application/Services/EnvelopeMailService.cs

@@ -12,7 +12,6 @@ using EnvelopeGenerator.Application.Common.Dto.EnvelopeReceiverReadOnly;
 using EnvelopeGenerator.Application.Common.Extensions;
 using EnvelopeGenerator.Application.Common.Interfaces.Services;
 using MediatR;
-using EnvelopeGenerator.Domain.Interfaces;
 
 namespace EnvelopeGenerator.Application.Services;
 
@@ -50,33 +49,14 @@ public class EnvelopeMailService : EmailOutService, IEnvelopeMailService
 		_sender = sender;
     }
 
-	private async Task<Dictionary<string, string>> CreatePlaceholders(string? accessCode = null, EnvelopeReceiverDto? er = null)
+	private async Task<Dictionary<string, string>> CreatePlaceholders(string? accessCode = null, EnvelopeReceiverDto? envelopeReceiverDto = null)
 	{
-		if (er!.Envelope.IsReadAndConfirm())
-		{
-			_placeholders["[SIGNATURE_TYPE]"] = "Lesen und bestätigen";
-			_placeholders["[DOCUMENT_PROCESS]"] = string.Empty;
-            _placeholders["[FINAL_STATUS]"] = "Lesebestätigung";
-            _placeholders["[FINAL_ACTION]"] = "Empfänger bestätigt";
-            _placeholders["[REJECTED_BY_OTHERS]"] = "anderen Empfänger abgelehnt!";
-            _placeholders["[RECEIVER_ACTION]"] = "bestätigt";
-        }
-		else
-        {
-            _placeholders["[SIGNATURE_TYPE]"] = "Signieren";
-            _placeholders["[DOCUMENT_PROCESS]"] = " und elektronisch unterschreiben";
-            _placeholders["[FINAL_STATUS]"] = "Signatur";
-            _placeholders["[FINAL_ACTION]"] = "Vertragspartner unterzeichnet";
-            _placeholders["[REJECTED_BY_OTHERS]"] = "anderen Vertragspartner abgelehnt! Ihre notwendige Unterzeichnung wurde verworfen.";
-            _placeholders["[RECEIVER_ACTION]"] = "unterschrieben";
-        }
-
 		if (accessCode is not null)
 			_placeholders["[DOCUMENT_ACCESS_CODE]"] = accessCode;
 
-		if (er?.Envelope is not null && er.Receiver is not null)
+		if (envelopeReceiverDto?.Envelope is not null && envelopeReceiverDto.Receiver is not null)
 		{
-			var erId = (er.Envelope.Uuid, er.Receiver.Signature).ToEnvelopeKey();
+			var erId = (envelopeReceiverDto.Envelope.Uuid, envelopeReceiverDto.Receiver.Signature).ToEnvelopeKey();
 			var sigHost = await _configService.ReadDefaultSignatureHost();
 			var linkToDoc = $"{sigHost}/EnvelopeKey/{erId}";
 			_placeholders["[LINK_TO_DOCUMENT]"] = linkToDoc;
@@ -86,8 +66,7 @@ public class EnvelopeMailService : EmailOutService, IEnvelopeMailService
 		return _placeholders;
 	}
 
-    // TODO: merge the two CreatePlaceholders methods by using a common parameter object containing all the required information to create the place holders.
+	private async Task<Dictionary<string, string>> CreatePlaceholders(EnvelopeReceiverReadOnlyDto? readOnlyDto = null)
-    private async Task<Dictionary<string, string>> CreatePlaceholders(EnvelopeReceiverReadOnlyDto? readOnlyDto = null)
 	{
 		if (readOnlyDto?.Envelope is not null && readOnlyDto.Receiver is not null)
 		{
@@ -145,7 +124,7 @@ public class EnvelopeMailService : EmailOutService, IEnvelopeMailService
 			return acResult.ToFail<int>().Notice(LogLevel.Error, "Therefore, access code cannot be sent");
 		var accessCode = acResult.Data;
 
-		var placeholders = await CreatePlaceholders(accessCode: accessCode, er: dto);
+		var placeholders = await CreatePlaceholders(accessCode: accessCode, envelopeReceiverDto: dto);
 
 		// Add optional place holders.
 		if (optionalPlaceholders is not null)

EnvelopeGenerator.Application/ThirdPartyModules/Queries/ReadThirdPartyModuleLicenseQuery.cs

@@ -1,92 +0,0 @@
-using DigitalData.Core.Abstraction.Application.Repository;
-using DigitalData.Core.Exceptions;
-using EnvelopeGenerator.Domain.Entities;
-using MediatR;
-using Microsoft.EntityFrameworkCore;
-
-namespace EnvelopeGenerator.Application.ThirdPartyModules.Queries;
-
-/// <summary>
-/// Query to read the license text of a third-party module.
-/// Either <see cref="Id"/> or <see cref="Name"/> must be provided, but not both.
-/// </summary>
-public record ReadThirdPartyModuleLicenseQuery : IRequest<string>
-{
-    /// <summary>
-    /// The unique identifier of the third-party module (optional).
-    /// </summary>
-    public int? Id { get; init; }
-
-    /// <summary>
-    /// The name of the third-party module (optional).
-    /// </summary>
-    public string? Name { get; init; }
-
-    /// <summary>
-    /// Whether to filter only active modules. Defaults to <c>true</c>.
-    /// </summary>
-    public bool Active { get; init; } = true;
-}
-
-/// <summary>
-/// Handles <see cref="ReadThirdPartyModuleLicenseQuery"/> and returns the license text of a third-party module.
-/// </summary>
-public class ReadThirdPartyModuleLicenseQueryHandler : IRequestHandler<ReadThirdPartyModuleLicenseQuery, string>
-{
-    private readonly IRepository<ThirdPartyModule> _repository;
-
-    /// <summary>
-    /// Initializes a new instance of the <see cref="ReadThirdPartyModuleLicenseQueryHandler"/> class.
-    /// </summary>
-    /// <param name="repository">The repository for accessing third-party modules.</param>
-    public ReadThirdPartyModuleLicenseQueryHandler(IRepository<ThirdPartyModule> repository)
-    {
-        _repository = repository;
-    }
-
-    /// <summary>
-    /// Handles the query by filtering on Id or Name and returning the license text.
-    /// </summary>
-    /// <param name="request">The query parameters.</param>
-    /// <param name="cancel">A cancellation token.</param>
-    /// <returns>The license text of the matching third-party module.</returns>
-    /// <exception cref="BadRequestException">
-    /// Thrown when neither Id nor Name is provided, or when both are provided.
-    /// </exception>
-    /// <exception cref="InvalidOperationException">
-    /// Thrown when multiple modules match the given criteria, indicating a data integrity issue.
-    /// </exception>
-    /// <exception cref="NotFoundException">
-    /// Thrown when no module matches the given criteria.
-    /// </exception>
-    public async Task<string> Handle(ReadThirdPartyModuleLicenseQuery request, CancellationToken cancel)
-    {
-        if (request.Id is null && request.Name is null)
-            throw new BadRequestException("Either Id or Name must be provided.");
-
-        if (request.Id is not null && request.Name is not null)
-            throw new BadRequestException("Only one of Id or Name must be provided, not both.");
-
-        var query = _repository.Query
-            .Where(m => m.Active == request.Active);
-
-        if (request.Id is int id)
-            query = query.Where(m => m.Id == id);
-
-        if (request.Name is string name)
-            query = query.Where(m => m.Name == name);
-
-        var modules = await query
-            .Take(2)
-            .ToListAsync(cancel);
-
-        if (modules.Count > 1)
-            throw new InvalidOperationException(
-                $"Data integrity violation: multiple third-party modules found for the given criteria (Id={request.Id}, Name={request.Name}, Active={request.Active}).");
-
-        return modules.SingleOrDefault() is ThirdPartyModule module
-            ? module.License
-            : throw new NotFoundException(
-                $"Third-party module not found for the given criteria (Id={request.Id}, Name={request.Name}, Active={request.Active}).");
-    }
-}

EnvelopeGenerator.BBTests/frmFinalizePDF.vb

@@ -7,10 +7,11 @@ Imports GdPicture14
 Imports Newtonsoft.Json.Linq
 Imports EnvelopeGenerator.Infrastructure
 Imports Microsoft.EntityFrameworkCore
+Imports System.Text
 Imports DigitalData.Core.Abstractions
 
 Public Class frmFinalizePDF
-    Private Const CONNECTIONSTRING = "Server=sDD-VMP04-SQL17\DD_DEVELOP01;Database=DD_ECM;User Id=sa;Password=+bk8oAbbQP1AzoHtvZUbd+Mbok2f8Fl4miEx1qssJ5yEaEWoQJ9prg4L14fURpPnqi1WMNs9fE4=;" + "Encrypt=True;TrustServerCertificate=True;"
+    Private Const CONNECTIONSTRING = "Server=sDD-VMP04-SQL17\DD_DEVELOP01;Database=DD_ECM;User Id=sa;Password=+bk8oAbbQP1AzoHtvZUbd+Mbok2f8Fl4miEx1qssJ5yEaEWoQJ9prg4L14fURpPnqi1WMNs9fE4=;"
 
     Private Database As MSSQLServer
     Private LogConfig As LogConfig
@@ -92,36 +93,56 @@ Public Class frmFinalizePDF
     End Function
 
     Private Sub Button1_Click(sender As Object, e As EventArgs) Handles Button1.Click
-        Dim oTable = LoadAnnotationDataForEnvelope()
+        Try
-        Dim oJsonList = oTable.Rows.
-            Cast(Of DataRow).
-            Select(Function(r As DataRow) r.Item("VALUE").ToString()).
-            ToList()
 
-        Dim envelopeId As Integer = CInt(txtEnvelope.Text)
+            Dim oTable = LoadAnnotationDataForEnvelope()
-        Dim oBuffer As Byte() = ReadEnvelope(envelopeId)
+            Dim oJsonList = oTable.Rows.
-        Dim oNewBuffer = PDFBurner.BurnAnnotsToPDF(oBuffer, oJsonList, envelopeId)
+                Cast(Of DataRow).
-        Dim desktopPath As String = Environment.GetFolderPath(Environment.SpecialFolder.Desktop)
+                Select(Function(r As DataRow) r.Item("VALUE").ToString()).
-        Dim oNewPath = Path.Combine(desktopPath, $"E{txtEnvelope.Text}R{txtReceiver.Text}.burned.pdf")
+                ToList()
 
-        File.WriteAllBytes(oNewPath, oNewBuffer)
+            Dim envelopeId As Integer = CInt(txtEnvelope.Text)
+            Dim oBuffer As Byte() = ReadEnvelope(envelopeId)
+            Dim oNewBuffer = PDFBurner.BurnAnnotsToPDF(oBuffer, oJsonList, envelopeId)
+            Dim desktopPath As String = Environment.GetFolderPath(Environment.SpecialFolder.Desktop)
+            Dim oNewPath = Path.Combine(desktopPath, $"E{txtEnvelope.Text}R{txtReceiver.Text}.burned.pdf")
+
+            File.WriteAllBytes(oNewPath, oNewBuffer)
+
+            Process.Start(oNewPath)
+        Catch ex As Exception
+            Dim exMsg As StringBuilder = New StringBuilder(ex.Message).AppendLine()
+
+            Dim innerEx = ex.InnerException
+            While (innerEx IsNot Nothing)
+                exMsg.AppendLine(innerEx.Message)
+                innerEx = innerEx.InnerException
+            End While
+
+            MsgBox(exMsg.ToString(), MsgBoxStyle.Critical)
+        End Try
 
-        Process.Start(oNewPath)
     End Sub
 
     Private Sub Button2_Click(sender As Object, e As EventArgs) Handles Button2.Click
-        Dim oTable = LoadAnnotationDataForEnvelope()
+        Try
-        Dim oJsonList = oTable.Rows.
+            Dim oTable = LoadAnnotationDataForEnvelope()
-            Cast(Of DataRow).
+            Dim oJsonList = oTable.Rows.
-            Select(Function(r As DataRow) r.Item("VALUE").ToString()).
+                Cast(Of DataRow).
-            Select(Function(s As String) JObject.Parse(s)).
+                Select(Function(r As DataRow) r.Item("VALUE").ToString()).
-            ToList()
+                Select(Function(s As String) JObject.Parse(s)).
+                ToList()
 
-        Dim oJObject1 = oJsonList.First()
+            Dim oJObject1 = oJsonList.First()
-        Dim oJObject2 = oJsonList.ElementAt(1)
+            Dim oJObject2 = oJsonList.ElementAt(1)
 
-        oJObject1.Merge(oJObject2)
+            oJObject1.Merge(oJObject2)
 
-        txtResult.Text = oJObject1.ToString()
+            txtResult.Text = oJObject1.ToString()
+
+
+        Catch ex As Exception
+            MsgBox(ex.Message, MsgBoxStyle.Critical)
+        End Try
     End Sub
 End Class

EnvelopeGenerator.Domain/Entities/Config.cs

@@ -1,17 +1,11 @@
 using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
-#if NETFRAMEWORK
-using System;
-#endif
 
 namespace EnvelopeGenerator.Domain.Entities
 {
     [Table("TBSIG_CONFIG", Schema = "dbo")]
     public class Config
     {
-        [Column("DOCUMENT_PATH", TypeName = "nvarchar(256)")]
-        public string DocumentPath { get; set; }
-
         [Column("SENDING_PROFILE", TypeName = "int")]
         [Required]
         public int SendingProfile { get; set; }
@@ -25,24 +19,5 @@ namespace EnvelopeGenerator.Domain.Entities
 
         [Column("EXPORT_PATH", TypeName = "nvarchar(256)")]
         public string ExportPath { get; set; }
-
-        [Column("ADDED_WHEN", TypeName = "datetime")]
-        [Required]
-        public DateTime AddedWhen { get; set; }
-
-        [Column("CHANGED_WHEN", TypeName = "datetime")]
-        public DateTime? ChangedWhen { get; set; }
-
-        [Column("GUID", TypeName = "tinyint")]
-        [Required]
-        public byte Guid { get; set; }
-
-        [Column("DEF_TFA_ENABLED", TypeName = "bit")]
-        [Required]
-        public bool DefTfaEnabled { get; set; }
-
-        [Column("DEF_TFA_WITH_PHONE", TypeName = "bit")]
-        [Required]
-        public bool DefTfaWithPhone { get; set; }
     }
 }

EnvelopeGenerator.Domain/Entities/DocumentStatus.cs

@@ -35,10 +35,6 @@ namespace EnvelopeGenerator.Domain.Entities
         [Column("STATUS")]
         public Constants.DocumentStatus Status { get; set; }
 
-        [Required]
-        [Column("STATUS_CHANGED_WHEN", TypeName = "datetime")]
-        public DateTime? StatusChangedWhen { get; set; }
-
         [Required]
         [Column("ADDED_WHEN", TypeName = "datetime")]
         public DateTime AddedWhen { get; set; }

EnvelopeGenerator.Domain/Entities/Envelope.cs

@@ -5,7 +5,6 @@ using System.ComponentModel.DataAnnotations.Schema;
 using EnvelopeGenerator.Domain.Constants;
 using Newtonsoft.Json;
 using EnvelopeGenerator.Domain.Interfaces.Auditing;
-using EnvelopeGenerator.Domain.Interfaces;
 #if NETFRAMEWORK
 using System.Collections.Generic;
 using System.Linq;
@@ -14,7 +13,7 @@ using System.Linq;
 namespace EnvelopeGenerator.Domain.Entities
 {
     [Table("TBSIG_ENVELOPE", Schema = "dbo")]
-    public class Envelope : IHasAddedWhen, IHasChangedWhen, IEnvelope
+    public class Envelope : IHasAddedWhen, IHasChangedWhen
     {
         public Envelope()
         {
@@ -76,14 +75,11 @@ namespace EnvelopeGenerator.Domain.Entities
 #if nullable
         ?
 #endif
-            Title { get; set; }
+            Title
+        { get; set; }
 
         [Column("COMMENT", TypeName = "nvarchar(128)")]
-        public string
+        public string Comment { get; set; }
-#if nullable
-        ?
-#endif
-            Comment { get; set; }
 
         [Column("CONTRACT_TYPE")]
         public int? ContractType { get; set; }
@@ -110,8 +106,7 @@ namespace EnvelopeGenerator.Domain.Entities
 
         [JsonIgnore]
         [NotMapped]
-        [Obsolete("Use EnvelopeGenerator.Domain.Interfaces.EnvelopeExtensions.IsReadAndConfirm extension method instead.")]
+        public bool ReadOnly => EnvelopeTypeId == 2;
-        public bool ReadOnly => this.IsReadAndConfirm();
 
         [Column("CERTIFICATION_TYPE")]
         public int? CertificationType { get; set; }
@@ -140,9 +135,7 @@ namespace EnvelopeGenerator.Domain.Entities
             = false;
 #endif
 
-#if NETFRAMEWORK
         [NotMapped]
-#endif
         [Column("DOC_RESULT")]
         public byte[]
 #if nullable
@@ -156,7 +149,8 @@ namespace EnvelopeGenerator.Domain.Entities
 #if nullable
         ?
 #endif
-            Type { get; set; }
+            Type
+        { get; set; }
 
 #if NETFRAMEWORK
         [NotMapped]
@@ -170,26 +164,22 @@ namespace EnvelopeGenerator.Domain.Entities
 #if nullable
         ?
 #endif
-            Documents { get; set; }
+            Documents
-
+        { get; set; }
-        [NotMapped]
-        public Document
-#if nullable
-        ?
-#endif
-            DefaultDocument => Documents?.FirstOrDefault();
 
         public List<History>
 #if nullable
         ?
 #endif
-            Histories { get; set; }
+            Histories
+        { get; set; }
 
         public List<EnvelopeReceiver>
 #if nullable
         ?
 #endif
-            EnvelopeReceivers { get; set; }
+            EnvelopeReceivers
+        { get; set; }
 
         //#if NETFRAMEWORK
         /// <summary>

EnvelopeGenerator.Domain/Entities/EnvelopeReport.cs

@@ -1,36 +0,0 @@
-using System;
-using System.ComponentModel.DataAnnotations;
-using System.ComponentModel.DataAnnotations.Schema;
-
-namespace EnvelopeGenerator.Domain.Entities
-{
-    [Table("VWSIG_ENVELOPE_REPORT", Schema = "dbo")]
-    public class EnvelopeReport
-    {
-        [Column("ENVELOPE_ID", TypeName = "int")]
-        [Required]
-        public int EnvelopeId { get; set; }
-
-        [Column("HEAD_UUID", TypeName = "nvarchar(36)")]
-        [Required]
-        public string HeadUuid { get; set; }
-
-        [Column("HEAD_TITLE", TypeName = "nvarchar(128)")]
-        public string HeadTitle { get; set; }
-
-        [Column("HEAD_MESSAGE", TypeName = "nvarchar(max)")]
-        [Required]
-        public string HeadMessage { get; set; }
-
-        [Column("POS_STATUS", TypeName = "int")]
-        [Required]
-        public int PosStatus { get; set; }
-
-        [Column("POS_WHEN", TypeName = "datetime")]
-        public DateTime? PosWhen { get; set; }
-
-        [Column("POS_WHO", TypeName = "nvarchar(128)")]
-        [Required]
-        public string PosWho { get; set; }
-    }
-}

EnvelopeGenerator.Domain/Entities/History.cs

@@ -35,10 +35,7 @@ namespace EnvelopeGenerator.Domain.Entities
         public DateTime AddedWhen { get; set; }
 
         [Column("ACTION_DATE", TypeName = "datetime")]
-        public DateTime? ActionDate { get; set; }
+        public DateTime? ChangedWhen { get; set; }
-
-        [NotMapped]
-        public DateTime? ChangedWhen { get => ActionDate; set => ActionDate = value; }
         
         [Column("COMMENT", TypeName = "nvarchar(max)")]
         public string

EnvelopeGenerator.Domain/Entities/Signature.cs

@@ -4,9 +4,6 @@ using System.ComponentModel;
 using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
 using EnvelopeGenerator.Domain.Interfaces.Auditing;
-#if NET
-using System.Text.Json.Serialization;
-#endif
 #if NETFRAMEWORK
 using System.Collections.Generic;
 #endif
@@ -112,25 +109,22 @@ namespace EnvelopeGenerator.Domain.Entities
 #if nullable
         ?
 #endif
-            Receiver { get; set; }
+            Receiver
+        { get; set; }
 
         public virtual IEnumerable<ElementAnnotation>
 #if nullable
         ?
 #endif
-            Annotations { get; set; }
+            Annotations
+        { get; set; }
 
-#if NET
+#if NETFRAMEWORK
-        [JsonIgnore]
-#endif
         [NotMapped]
         public double Top => Math.Round(Y, 5);
 
-
-#if NET
-        [JsonIgnore]
-#endif
         [NotMapped]
         public double Left => Math.Round(X, 5);
+#endif
     }
 }

EnvelopeGenerator.Domain/Entities/ThirdPartyModule.cs

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

EnvelopeGenerator.Domain/Interfaces/IEnvelope.cs

@@ -1,15 +0,0 @@
-namespace EnvelopeGenerator.Domain.Interfaces
-{
-    public interface IEnvelope
-    {
-        int? EnvelopeTypeId { get; set; }
-    }
-
-    public static class EnvelopeExtensions
-    {
-        public static bool IsReadAndConfirm(this IEnvelope envelope)
-        {
-            return envelope.EnvelopeTypeId == 2;
-        }
-    }
-}

EnvelopeGenerator.Infrastructure/EGDbContext.cs

@@ -79,10 +79,6 @@ public abstract class EGDbContextBase : DbContext
 
     public DbSet<ClientUser> ClientUsers { get; set; }
 
-    public DbSet<EnvelopeReport> EnvelopeReports { get; set; }
-
-    public DbSet<ThirdPartyModule> ThirdPartyModules { get; set; }
-
     private readonly DbTriggerParams _triggers;
 
     private readonly ILogger
@@ -204,10 +200,6 @@ public abstract class EGDbContextBase : DbContext
             .HasForeignKey(annot => annot.ElementId);
         #endregion
 
-        #region EnvelopeReport
-        modelBuilder.Entity<EnvelopeReport>().HasNoKey();
-        #endregion
-
         #region Trigger
         // Configure entities to handle database triggers
         void AddTrigger<T>() where T : class => _triggers

EnvelopeGenerator.Infrastructure/EnvelopeGenerator.Infrastructure.csproj

@@ -25,7 +25,7 @@
     <PackageReference Include="DigitalData.Core.Abstraction.Application" Version="1.6.0" />
     <PackageReference Include="DigitalData.Core.Infrastructure" Version="2.6.1" />
     <PackageReference Include="HtmlSanitizer" Version="9.0.892" />
-    <PackageReference Include="Microsoft.Data.SqlClient" Version="5.2.2" />
+    <PackageReference Include="Microsoft.Data.SqlClient" Version="6.1.4" />
     <PackageReference Include="Microsoft.Identity.Client" Version="4.82.1" />
     <PackageReference Include="QuestPDF" Version="2025.7.1" />
     <PackageReference Include="SixLabors.ImageSharp" Version="3.1.12" />

EnvelopeGenerator.Jobs/EnvelopeGenerator.Jobs.csproj

@@ -0,0 +1,26 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>net8.0</TargetFramework>
+    <ImplicitUsings>enable</ImplicitUsings>
+    <Nullable>enable</Nullable>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="BouncyCastle.Cryptography" Version="2.6.2" />
+    <PackageReference Include="HtmlSanitizer" Version="9.0.892" />
+    <PackageReference Include="Microsoft.Identity.Client" Version="4.82.1" />
+    <PackageReference Include="Quartz" Version="3.9.0" />
+    <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
+    <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="8.0.3" />
+    <PackageReference Include="Microsoft.Data.SqlClient" Version="6.1.4" />
+    <PackageReference Include="SixLabors.ImageSharp" Version="3.1.12" />
+  </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

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

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

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

EnvelopeGenerator.Jobs/Jobs/FinalizeDocument/FinalizeDocumentJob.cs

@@ -0,0 +1,229 @@
+using System.Collections.Generic;
+using System.Data;
+using System.IO;
+using System.Linq;
+using System.Threading;
+using System.Threading.Tasks;
+using EnvelopeGenerator.Domain.Constants;
+using EnvelopeGenerator.Domain.Entities;
+using Microsoft.Data.SqlClient;
+using Microsoft.Extensions.Logging;
+using Quartz;
+using static EnvelopeGenerator.Jobs.FinalizeDocument.FinalizeDocumentExceptions;
+
+namespace EnvelopeGenerator.Jobs.FinalizeDocument;
+
+public class FinalizeDocumentJob : IJob
+{
+    private readonly ILogger<FinalizeDocumentJob> _logger;
+    private readonly PDFBurner _pdfBurner;
+    private readonly PDFMerger _pdfMerger;
+    private readonly ReportCreator _reportCreator;
+
+    private record ConfigSettings(string DocumentPath, string DocumentPathOrigin, string ExportPath);
+
+    public FinalizeDocumentJob(
+        ILogger<FinalizeDocumentJob> logger,
+        PDFBurner pdfBurner,
+        PDFMerger pdfMerger,
+        ReportCreator reportCreator)
+    {
+        _logger = logger;
+        _pdfBurner = pdfBurner;
+        _pdfMerger = pdfMerger;
+        _reportCreator = reportCreator;
+    }
+
+    public async Task Execute(IJobExecutionContext context)
+    {
+        var jobId = context.JobDetail.Key.ToString();
+        _logger.LogDebug("Starting job {JobId}", jobId);
+
+        try
+        {
+            var connectionString = context.MergedJobDataMap.GetString(Value.DATABASE);
+            if (string.IsNullOrWhiteSpace(connectionString))
+            {
+                _logger.LogWarning("FinalizeDocument - Connection string missing");
+                return;
+            }
+
+            await using var connection = new SqlConnection(connectionString);
+            await connection.OpenAsync(context.CancellationToken);
+
+            var config = await LoadConfigurationAsync(connection, context.CancellationToken);
+            var envelopes = await LoadCompletedEnvelopesAsync(connection, context.CancellationToken);
+
+            if (envelopes.Count == 0)
+            {
+                _logger.LogInformation("No completed envelopes found");
+                return;
+            }
+
+            var total = envelopes.Count;
+            var current = 1;
+
+            foreach (var envelopeId in envelopes)
+            {
+                _logger.LogInformation("Finalizing Envelope {EnvelopeId} ({Current}/{Total})", envelopeId, current, total);
+                try
+                {
+                    var envelopeData = await GetEnvelopeDataAsync(connection, envelopeId, context.CancellationToken);
+                    if (envelopeData is null)
+                    {
+                        _logger.LogWarning("Envelope data not found for {EnvelopeId}", envelopeId);
+                        continue;
+                    }
+
+                    var data = envelopeData.Value;
+
+                    var envelope = new Envelope
+                    {
+                        Id = envelopeId,
+                        Uuid = data.EnvelopeUuid ?? string.Empty,
+                        Title = data.Title ?? string.Empty,
+                        FinalEmailToCreator = (int)FinalEmailType.No,
+                        FinalEmailToReceivers = (int)FinalEmailType.No
+                    };
+
+                    var burned = _pdfBurner.BurnAnnotsToPDF(data.DocumentBytes, data.AnnotationData, envelopeId);
+                    var report = _reportCreator.CreateReport(connection, envelope);
+                    var merged = _pdfMerger.MergeDocuments(burned, report);
+
+                    var outputDirectory = Path.Combine(config.ExportPath, data.ParentFolderUid);
+                    Directory.CreateDirectory(outputDirectory);
+                    var outputPath = Path.Combine(outputDirectory, $"{envelope.Uuid}.pdf");
+                    await File.WriteAllBytesAsync(outputPath, merged, context.CancellationToken);
+
+                    await UpdateDocumentResultAsync(connection, envelopeId, merged, context.CancellationToken);
+                    await ArchiveEnvelopeAsync(connection, envelopeId, context.CancellationToken);
+                }
+                catch (MergeDocumentException ex)
+                {
+                    _logger.LogWarning(ex, "Certificate Document job failed at merging documents");
+                }
+                catch (ExportDocumentException ex)
+                {
+                    _logger.LogWarning(ex, "Certificate Document job failed at exporting document");
+                }
+                catch (Exception ex)
+                {
+                    _logger.LogError(ex, "Unhandled exception while working envelope {EnvelopeId}", envelopeId);
+                }
+
+                current++;
+                _logger.LogInformation("Envelope {EnvelopeId} finalized", envelopeId);
+            }
+
+            _logger.LogDebug("Completed job {JobId} successfully", jobId);
+        }
+        catch (Exception ex)
+        {
+            _logger.LogError(ex, "Certificate Document job failed");
+        }
+        finally
+        {
+            _logger.LogDebug("Job execution for {JobId} ended", jobId);
+        }
+    }
+
+    private async Task<ConfigSettings> LoadConfigurationAsync(SqlConnection connection, CancellationToken cancellationToken)
+    {
+        const string sql = "SELECT TOP 1 DOCUMENT_PATH, EXPORT_PATH FROM TBSIG_CONFIG";
+        await using var command = new SqlCommand(sql, connection);
+        await using var reader = await command.ExecuteReaderAsync(cancellationToken);
+        if (await reader.ReadAsync(cancellationToken))
+        {
+            var documentPath = reader.IsDBNull(0) ? string.Empty : reader.GetString(0);
+            var exportPath = reader.IsDBNull(1) ? string.Empty : reader.GetString(1);
+            return new ConfigSettings(documentPath, documentPath, exportPath);
+        }
+
+        return new ConfigSettings(string.Empty, string.Empty, Path.GetTempPath());
+    }
+
+    private async Task<List<int>> LoadCompletedEnvelopesAsync(SqlConnection connection, CancellationToken cancellationToken)
+    {
+        const string sql = "SELECT GUID FROM TBSIG_ENVELOPE WHERE STATUS = @Status AND DATEDIFF(minute, CHANGED_WHEN, GETDATE()) >= 1 ORDER BY GUID";
+        var ids = new List<int>();
+        await using var command = new SqlCommand(sql, connection);
+        command.Parameters.AddWithValue("@Status", (int)EnvelopeStatus.EnvelopeCompletelySigned);
+        await using var reader = await command.ExecuteReaderAsync(cancellationToken);
+        while (await reader.ReadAsync(cancellationToken))
+        {
+            ids.Add(reader.GetInt32(0));
+        }
+
+        return ids;
+    }
+
+    private async Task<(int EnvelopeId, string? EnvelopeUuid, string? Title, byte[] DocumentBytes, List<string> AnnotationData, string ParentFolderUid)?> GetEnvelopeDataAsync(SqlConnection connection, int envelopeId, CancellationToken cancellationToken)
+    {
+        const string sql = @"SELECT T.GUID, T.ENVELOPE_UUID, T.TITLE, T2.FILEPATH, T2.BYTE_DATA FROM [dbo].[TBSIG_ENVELOPE] T
+                JOIN TBSIG_ENVELOPE_DOCUMENT T2 ON T.GUID = T2.ENVELOPE_ID
+                WHERE T.GUID = @EnvelopeId";
+
+        await using var command = new SqlCommand(sql, connection);
+        command.Parameters.AddWithValue("@EnvelopeId", envelopeId);
+        await using var reader = await command.ExecuteReaderAsync(CommandBehavior.SingleRow, cancellationToken);
+        if (!await reader.ReadAsync(cancellationToken))
+        {
+            return null;
+        }
+
+        var envelopeUuid = reader.IsDBNull(1) ? string.Empty : reader.GetString(1);
+        var title = reader.IsDBNull(2) ? string.Empty : reader.GetString(2);
+        var filePath = reader.IsDBNull(3) ? string.Empty : reader.GetString(3);
+        var bytes = reader.IsDBNull(4) ? Array.Empty<byte>() : (byte[])reader[4];
+        await reader.CloseAsync();
+
+        if (bytes.Length == 0 && !string.IsNullOrWhiteSpace(filePath) && File.Exists(filePath))
+        {
+            bytes = await File.ReadAllBytesAsync(filePath, cancellationToken);
+        }
+
+        var annotations = await GetAnnotationDataAsync(connection, envelopeId, cancellationToken);
+
+        var parentFolderUid = !string.IsNullOrWhiteSpace(filePath)
+            ? Path.GetFileName(Path.GetDirectoryName(filePath) ?? string.Empty)
+            : envelopeUuid;
+
+        return (envelopeId, envelopeUuid, title, bytes, annotations, parentFolderUid ?? envelopeUuid ?? envelopeId.ToString());
+    }
+
+    private async Task<List<string>> GetAnnotationDataAsync(SqlConnection connection, int envelopeId, CancellationToken cancellationToken)
+    {
+        const string sql = "SELECT VALUE FROM TBSIG_DOCUMENT_STATUS WHERE ENVELOPE_ID = @EnvelopeId";
+        var result = new List<string>();
+        await using var command = new SqlCommand(sql, connection);
+        command.Parameters.AddWithValue("@EnvelopeId", envelopeId);
+        await using var reader = await command.ExecuteReaderAsync(cancellationToken);
+        while (await reader.ReadAsync(cancellationToken))
+        {
+            if (!reader.IsDBNull(0))
+            {
+                result.Add(reader.GetString(0));
+            }
+        }
+
+        return result;
+    }
+
+    private static async Task UpdateDocumentResultAsync(SqlConnection connection, int envelopeId, byte[] bytes, CancellationToken cancellationToken)
+    {
+        const string sql = "UPDATE TBSIG_ENVELOPE SET DOC_RESULT = @ImageData WHERE GUID = @EnvelopeId";
+        await using var command = new SqlCommand(sql, connection);
+        command.Parameters.AddWithValue("@ImageData", bytes);
+        command.Parameters.AddWithValue("@EnvelopeId", envelopeId);
+        await command.ExecuteNonQueryAsync(cancellationToken);
+    }
+
+    private static async Task ArchiveEnvelopeAsync(SqlConnection connection, int envelopeId, CancellationToken cancellationToken)
+    {
+        const string sql = "UPDATE TBSIG_ENVELOPE SET STATUS = @Status, CHANGED_WHEN = GETDATE() WHERE GUID = @EnvelopeId";
+        await using var command = new SqlCommand(sql, connection);
+        command.Parameters.AddWithValue("@Status", (int)EnvelopeStatus.EnvelopeArchived);
+        command.Parameters.AddWithValue("@EnvelopeId", envelopeId);
+        await command.ExecuteNonQueryAsync(cancellationToken);
+    }
+}

EnvelopeGenerator.Jobs/Jobs/FinalizeDocument/PDFBurner.cs

@@ -0,0 +1,277 @@
+using System.Collections.Generic;
+using System.Drawing;
+using System.Linq;
+using iText.IO.Image;
+using iText.Kernel.Colors;
+using iText.Kernel.Pdf;
+using iText.Kernel.Pdf.Canvas;
+using iText.Layout;
+using iText.Layout.Element;
+using iText.Layout.Font;
+using iText.Layout.Properties;
+using Microsoft.Extensions.Logging;
+using Microsoft.Extensions.Logging.Abstractions;
+using Newtonsoft.Json;
+using static EnvelopeGenerator.Jobs.FinalizeDocument.FinalizeDocumentExceptions;
+using LayoutImage = iText.Layout.Element.Image;
+
+namespace EnvelopeGenerator.Jobs.FinalizeDocument;
+
+public class PDFBurner
+{
+    private static readonly FontProvider FontProvider = CreateFontProvider();
+    private readonly ILogger<PDFBurner> _logger;
+    private readonly PDFBurnerParams _pdfBurnerParams;
+
+    public PDFBurner() : this(NullLogger<PDFBurner>.Instance, new PDFBurnerParams())
+    {
+    }
+
+    public PDFBurner(ILogger<PDFBurner> logger, PDFBurnerParams? pdfBurnerParams = null)
+    {
+        _logger = logger;
+        _pdfBurnerParams = pdfBurnerParams ?? new PDFBurnerParams();
+    }
+
+    public byte[] BurnAnnotsToPDF(byte[] sourceBuffer, IList<string> instantJsonList, int envelopeId)
+    {
+        if (sourceBuffer is null || sourceBuffer.Length == 0)
+        {
+            throw new BurnAnnotationException("Source document is empty");
+        }
+
+        try
+        {
+            using var inputStream = new MemoryStream(sourceBuffer);
+            using var outputStream = new MemoryStream();
+            using var reader = new PdfReader(inputStream);
+            using var writer = new PdfWriter(outputStream);
+            using var pdf = new PdfDocument(reader, writer);
+
+            foreach (var json in instantJsonList ?? Enumerable.Empty<string>())
+            {
+                if (string.IsNullOrWhiteSpace(json))
+                {
+                    continue;
+                }
+
+                var annotationData = JsonConvert.DeserializeObject<AnnotationData>(json);
+                if (annotationData?.annotations is null)
+                {
+                    continue;
+                }
+
+                annotationData.annotations.Reverse();
+
+                foreach (var annotation in annotationData.annotations)
+                {
+                    try
+                    {
+                        switch (annotation.type)
+                        {
+                            case AnnotationType.Image:
+                                AddImageAnnotation(pdf, annotation, annotationData.attachments);
+                                break;
+                            case AnnotationType.Ink:
+                                AddInkAnnotation(pdf, annotation);
+                                break;
+                            case AnnotationType.Widget:
+                                var formFieldValue = annotationData.formFieldValues?.FirstOrDefault(fv => fv.name == annotation.id);
+                                if (formFieldValue is not null && !_pdfBurnerParams.IgnoredLabels.Contains(formFieldValue.value))
+                                {
+                                    AddFormFieldValue(pdf, annotation, formFieldValue.value);
+                                }
+                                break;
+                        }
+                    }
+                    catch (Exception ex)
+                    {
+                        _logger.LogWarning(ex, "Error applying annotation {AnnotationId} on envelope {EnvelopeId}", annotation.id, envelopeId);
+                        throw new BurnAnnotationException("Adding annotation failed", ex);
+                    }
+                }
+            }
+
+            pdf.Close();
+            return outputStream.ToArray();
+        }
+        catch (BurnAnnotationException)
+        {
+            throw;
+        }
+        catch (Exception ex)
+        {
+            _logger.LogError(ex, "Failed to burn annotations for envelope {EnvelopeId}", envelopeId);
+            throw new BurnAnnotationException("Annotations could not be burned", ex);
+        }
+    }
+
+    private void AddImageAnnotation(PdfDocument pdf, Annotation annotation, Dictionary<string, Attachment>? attachments)
+    {
+        if (attachments is null || string.IsNullOrWhiteSpace(annotation.imageAttachmentId) || !attachments.TryGetValue(annotation.imageAttachmentId, out var attachment))
+        {
+            return;
+        }
+
+        var page = pdf.GetPage(annotation.pageIndex + 1);
+        var bounds = annotation.bbox.Select(ToInches).ToList();
+        var x = (float)bounds[0];
+        var y = (float)bounds[1];
+        var width = (float)bounds[2];
+        var height = (float)bounds[3];
+
+        var imageBytes = Convert.FromBase64String(attachment.binary);
+        var imageData = ImageDataFactory.Create(imageBytes);
+        var image = new LayoutImage(imageData)
+            .ScaleAbsolute(width, height)
+            .SetFixedPosition(annotation.pageIndex + 1, x, y);
+
+        using var canvas = new Canvas(new PdfCanvas(page), page.GetPageSize());
+        canvas.Add(image);
+    }
+
+    private void AddInkAnnotation(PdfDocument pdf, Annotation annotation)
+    {
+        if (annotation.lines?.points is null)
+        {
+            return;
+        }
+
+        var page = pdf.GetPage(annotation.pageIndex + 1);
+        var canvas = new PdfCanvas(page);
+        var color = ParseColor(annotation.strokeColor);
+        canvas.SetStrokeColor(color);
+        canvas.SetLineWidth(1);
+
+        foreach (var segment in annotation.lines.points)
+        {
+            var first = true;
+            foreach (var point in segment)
+            {
+                var (px, py) = (ToInches(point[0]), ToInches(point[1]));
+                if (first)
+                {
+                    canvas.MoveTo(px, py);
+                    first = false;
+                }
+                else
+                {
+                    canvas.LineTo(px, py);
+                }
+            }
+            canvas.Stroke();
+        }
+    }
+
+    private static FontProvider CreateFontProvider()
+    {
+        var provider = new FontProvider();
+        provider.AddStandardPdfFonts();
+        provider.AddSystemFonts();
+        return provider;
+    }
+
+    private void AddFormFieldValue(PdfDocument pdf, Annotation annotation, string value)
+    {
+        var bounds = annotation.bbox.Select(ToInches).ToList();
+        var x = (float)bounds[0];
+        var y = (float)bounds[1];
+        var width = (float)bounds[2];
+        var height = (float)bounds[3];
+
+        var page = pdf.GetPage(annotation.pageIndex + 1);
+        var canvas = new Canvas(new PdfCanvas(page), page.GetPageSize());
+        canvas.SetProperty(Property.FONT_PROVIDER, FontProvider);
+        canvas.SetProperty(Property.FONT, FontProvider.GetFontSet());
+
+        var paragraph = new Paragraph(value)
+            .SetFontSize(_pdfBurnerParams.FontSize)
+            .SetFontColor(ColorConstants.BLACK)
+            .SetFontFamily(_pdfBurnerParams.FontName);
+
+        if (_pdfBurnerParams.FontStyle.HasFlag(FontStyle.Italic))
+        {
+            paragraph.SetItalic();
+        }
+
+        if (_pdfBurnerParams.FontStyle.HasFlag(FontStyle.Bold))
+        {
+            paragraph.SetBold();
+        }
+
+        canvas.ShowTextAligned(
+            paragraph,
+            x + (float)_pdfBurnerParams.TopMargin,
+            y + (float)_pdfBurnerParams.YOffset,
+            annotation.pageIndex + 1,
+            iText.Layout.Properties.TextAlignment.LEFT,
+            iText.Layout.Properties.VerticalAlignment.TOP,
+            0);
+    }
+
+    private static DeviceRgb ParseColor(string? color)
+    {
+        if (string.IsNullOrWhiteSpace(color))
+        {
+            return new DeviceRgb(0, 0, 0);
+        }
+
+        try
+        {
+            var drawingColor = ColorTranslator.FromHtml(color);
+            return new DeviceRgb(drawingColor.R, drawingColor.G, drawingColor.B);
+        }
+        catch
+        {
+            return new DeviceRgb(0, 0, 0);
+        }
+    }
+
+    private static double ToInches(double value) => value / 72d;
+    private static double ToInches(float value) => value / 72d;
+
+    #region Model
+    private static class AnnotationType
+    {
+        public const string Image = "pspdfkit/image";
+        public const string Ink = "pspdfkit/ink";
+        public const string Widget = "pspdfkit/widget";
+    }
+
+    private sealed class AnnotationData
+    {
+        public List<Annotation>? annotations { get; set; }
+        public Dictionary<string, Attachment>? attachments { get; set; }
+        public List<FormFieldValue>? formFieldValues { get; set; }
+    }
+
+    private sealed class Annotation
+    {
+        public string id { get; set; } = string.Empty;
+        public List<double> bbox { get; set; } = new();
+        public string type { get; set; } = string.Empty;
+        public string imageAttachmentId { get; set; } = string.Empty;
+        public Lines? lines { get; set; }
+        public int pageIndex { get; set; }
+        public string strokeColor { get; set; } = string.Empty;
+        public string egName { get; set; } = string.Empty;
+    }
+
+    private sealed class Lines
+    {
+        public List<List<List<float>>> points { get; set; } = new();
+    }
+
+    private sealed class Attachment
+    {
+        public string binary { get; set; } = string.Empty;
+        public string contentType { get; set; } = string.Empty;
+    }
+
+    private sealed class FormFieldValue
+    {
+        public string name { get; set; } = string.Empty;
+        public string value { get; set; } = string.Empty;
+    }
+    #endregion
+}

EnvelopeGenerator.Jobs/Jobs/FinalizeDocument/PDFBurnerParams.cs

@@ -0,0 +1,19 @@
+using System.Collections.Generic;
+using System.Drawing;
+
+namespace EnvelopeGenerator.Jobs.FinalizeDocument;
+
+public class PDFBurnerParams
+{
+    public List<string> IgnoredLabels { get; } = new() { "Date", "Datum", "ZIP", "PLZ", "Place", "Ort", "Position", "Stellung" };
+
+    public double TopMargin { get; set; } = 0.1;
+
+    public double YOffset { get; set; } = -0.3;
+
+    public string FontName { get; set; } = "Arial";
+
+    public int FontSize { get; set; } = 8;
+
+    public FontStyle FontStyle { get; set; } = FontStyle.Italic;
+}

EnvelopeGenerator.Jobs/Jobs/FinalizeDocument/PDFMerger.cs

@@ -0,0 +1,46 @@
+using System.IO;
+using iText.Kernel.Pdf;
+using iText.Kernel.Utils;
+using Microsoft.Extensions.Logging;
+using Microsoft.Extensions.Logging.Abstractions;
+using static EnvelopeGenerator.Jobs.FinalizeDocument.FinalizeDocumentExceptions;
+
+namespace EnvelopeGenerator.Jobs.FinalizeDocument;
+
+public class PDFMerger
+{
+    private readonly ILogger<PDFMerger> _logger;
+
+    public PDFMerger() : this(NullLogger<PDFMerger>.Instance)
+    {
+    }
+
+    public PDFMerger(ILogger<PDFMerger> logger)
+    {
+        _logger = logger;
+    }
+
+    public byte[] MergeDocuments(byte[] document, byte[] report)
+    {
+        try
+        {
+            using var finalStream = new MemoryStream();
+            using var documentReader = new PdfReader(new MemoryStream(document));
+            using var reportReader = new PdfReader(new MemoryStream(report));
+            using var writer = new PdfWriter(finalStream);
+            using var targetDoc = new PdfDocument(documentReader, writer);
+            using var reportDoc = new PdfDocument(reportReader);
+
+            var merger = new PdfMerger(targetDoc);
+            merger.Merge(reportDoc, 1, reportDoc.GetNumberOfPages());
+
+            targetDoc.Close();
+            return finalStream.ToArray();
+        }
+        catch (Exception ex)
+        {
+            _logger.LogError(ex, "Failed to merge PDF documents");
+            throw new MergeDocumentException("Documents could not be merged", ex);
+        }
+    }
+}

EnvelopeGenerator.Jobs/Jobs/FinalizeDocument/ReportCreator.cs

@@ -0,0 +1,91 @@
+using System.Data;
+using System.IO;
+using EnvelopeGenerator.Domain.Entities;
+using iText.Kernel.Pdf;
+using iText.Layout.Element;
+using Microsoft.Data.SqlClient;
+using Microsoft.Extensions.Logging;
+using Microsoft.Extensions.Logging.Abstractions;
+using static EnvelopeGenerator.Jobs.FinalizeDocument.FinalizeDocumentExceptions;
+using LayoutDocument = iText.Layout.Document;
+
+namespace EnvelopeGenerator.Jobs.FinalizeDocument;
+
+public class ReportCreator
+{
+    private readonly ILogger<ReportCreator> _logger;
+
+    public ReportCreator() : this(NullLogger<ReportCreator>.Instance)
+    {
+    }
+
+    public ReportCreator(ILogger<ReportCreator> logger)
+    {
+        _logger = logger;
+    }
+
+    public byte[] CreateReport(SqlConnection connection, Envelope envelope)
+    {
+        try
+        {
+            var reportItems = LoadReportItems(connection, envelope.Id);
+            using var stream = new MemoryStream();
+            using var writer = new PdfWriter(stream);
+            using var pdf = new PdfDocument(writer);
+            using var document = new LayoutDocument(pdf);
+
+            document.Add(new Paragraph("Envelope Finalization Report").SetFontSize(16));
+            document.Add(new Paragraph($"Envelope Id: {envelope.Id}"));
+            document.Add(new Paragraph($"UUID: {envelope.Uuid}"));
+            document.Add(new Paragraph($"Title: {envelope.Title}"));
+            document.Add(new Paragraph($"Subject: {envelope.Comment}"));
+            document.Add(new Paragraph($"Generated: {DateTime.UtcNow:O}"));
+            document.Add(new Paragraph(" "));
+
+            var table = new Table(4).UseAllAvailableWidth();
+            table.AddHeaderCell("Date");
+            table.AddHeaderCell("Status");
+            table.AddHeaderCell("User");
+            table.AddHeaderCell("EnvelopeId");
+
+            foreach (var item in reportItems.OrderByDescending(r => r.ItemDate))
+            {
+                table.AddCell(item.ItemDate.ToString("u"));
+                table.AddCell(item.ItemStatus.ToString());
+                table.AddCell(item.ItemUserReference);
+                table.AddCell(item.EnvelopeId.ToString());
+            }
+
+            document.Add(table);
+            document.Close();
+            return stream.ToArray();
+        }
+        catch (Exception ex)
+        {
+            _logger.LogError(ex, "Could not create report for envelope {EnvelopeId}", envelope.Id);
+            throw new CreateReportException("Could not prepare report data", ex);
+        }
+    }
+
+    private List<ReportItem> LoadReportItems(SqlConnection connection, int envelopeId)
+    {
+        const string sql = "SELECT ENVELOPE_ID, POS_WHEN, POS_STATUS, POS_WHO FROM VWSIG_ENVELOPE_REPORT WHERE ENVELOPE_ID = @EnvelopeId";
+        var result = new List<ReportItem>();
+
+        using var command = new SqlCommand(sql, connection);
+        command.Parameters.AddWithValue("@EnvelopeId", envelopeId);
+        using var reader = command.ExecuteReader();
+        while (reader.Read())
+        {
+            result.Add(new ReportItem
+            {
+                EnvelopeId = reader.GetInt32(0),
+                ItemDate = reader.IsDBNull(1) ? DateTime.MinValue : reader.GetDateTime(1),
+                ItemStatus = reader.IsDBNull(2) ? default : (EnvelopeGenerator.Domain.Constants.EnvelopeStatus)reader.GetInt32(2),
+                ItemUserReference = reader.IsDBNull(3) ? string.Empty : reader.GetString(3)
+            });
+        }
+
+        return result;
+    }
+}

EnvelopeGenerator.Jobs/Jobs/FinalizeDocument/ReportItem.cs

@@ -0,0 +1,19 @@
+using EnvelopeGenerator.Domain.Constants;
+using EnvelopeGenerator.Domain.Entities;
+
+namespace EnvelopeGenerator.Jobs.FinalizeDocument;
+
+public class ReportItem
+{
+    public Envelope? Envelope { get; set; }
+    public int EnvelopeId { get; set; }
+    public string EnvelopeTitle { get; set; } = string.Empty;
+    public string EnvelopeSubject { get; set; } = string.Empty;
+
+    public EnvelopeStatus ItemStatus { get; set; }
+
+    public string ItemStatusTranslated => ItemStatus.ToString();
+
+    public string ItemUserReference { get; set; } = string.Empty;
+    public DateTime ItemDate { get; set; }
+}

EnvelopeGenerator.Jobs/Jobs/FinalizeDocument/ReportSource.cs

@@ -1,4 +1,6 @@
-namespace EnvelopeGenerator.ServiceHost.Jobs.FinalizeDocument;
+using System.Collections.Generic;
+
+namespace EnvelopeGenerator.Jobs.FinalizeDocument;
 
 public class ReportSource
 {

EnvelopeGenerator.Service/App.config

@@ -23,7 +23,7 @@
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="System.Memory" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-4.0.5.0" newVersion="4.0.2.0" />
+        <bindingRedirect oldVersion="0.0.0.0-4.0.2.0" newVersion="4.0.2.0" />
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="System.Runtime.CompilerServices.Unsafe" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
@@ -31,7 +31,7 @@
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="System.Buffers" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-4.0.5.0" newVersion="4.0.4.0" />
+        <bindingRedirect oldVersion="0.0.0.0-4.0.4.0" newVersion="4.0.4.0" />
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="System.Collections.Immutable" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
@@ -59,7 +59,7 @@
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="Microsoft.Extensions.Logging.Abstractions" publicKeyToken="adb9793829ddae60" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-8.0.0.3" newVersion="8.0.0.3" />
+        <bindingRedirect oldVersion="0.0.0.0-7.0.0.0" newVersion="7.0.0.0" />
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="System.Text.Encodings.Web" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
@@ -67,7 +67,7 @@
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="Microsoft.Extensions.DependencyInjection.Abstractions" publicKeyToken="adb9793829ddae60" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-8.0.0.2" newVersion="8.0.0.2" />
+        <bindingRedirect oldVersion="0.0.0.0-7.0.0.0" newVersion="7.0.0.0" />
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="Microsoft.Extensions.Caching.Abstractions" publicKeyToken="adb9793829ddae60" culture="neutral" />

EnvelopeGenerator.Service/EnvelopeGenerator.Service.vbproj

@@ -181,11 +181,11 @@
     <Reference Include="Microsoft.Extensions.DependencyInjection, Version=7.0.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
       <HintPath>..\packages\Microsoft.Extensions.DependencyInjection.7.0.0\lib\net462\Microsoft.Extensions.DependencyInjection.dll</HintPath>
     </Reference>
-    <Reference Include="Microsoft.Extensions.DependencyInjection.Abstractions, Version=8.0.0.2, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
+    <Reference Include="Microsoft.Extensions.DependencyInjection.Abstractions, Version=7.0.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
-      <HintPath>..\packages\Microsoft.Extensions.DependencyInjection.Abstractions.8.0.2\lib\net462\Microsoft.Extensions.DependencyInjection.Abstractions.dll</HintPath>
+      <HintPath>..\packages\Microsoft.Extensions.DependencyInjection.Abstractions.7.0.0\lib\net462\Microsoft.Extensions.DependencyInjection.Abstractions.dll</HintPath>
     </Reference>
-    <Reference Include="Microsoft.Extensions.Logging.Abstractions, Version=8.0.0.3, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
+    <Reference Include="Microsoft.Extensions.Logging.Abstractions, Version=7.0.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
-      <HintPath>..\packages\Microsoft.Extensions.Logging.Abstractions.8.0.3\lib\net462\Microsoft.Extensions.Logging.Abstractions.dll</HintPath>
+      <HintPath>..\packages\Microsoft.Extensions.Logging.Abstractions.7.0.0\lib\net462\Microsoft.Extensions.Logging.Abstractions.dll</HintPath>
     </Reference>
     <Reference Include="Newtonsoft.Json, Version=13.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
       <HintPath>..\packages\Newtonsoft.Json.13.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>

EnvelopeGenerator.Service/packages.config

@@ -13,8 +13,8 @@
   <package id="Microsoft.Bcl.AsyncInterfaces" version="8.0.0" targetFramework="net48" />
   <package id="Microsoft.CSharp" version="4.7.0" targetFramework="net48" />
   <package id="Microsoft.Extensions.DependencyInjection" version="7.0.0" targetFramework="net462" />
-  <package id="Microsoft.Extensions.DependencyInjection.Abstractions" version="8.0.2" targetFramework="net462" />
+  <package id="Microsoft.Extensions.DependencyInjection.Abstractions" version="7.0.0" targetFramework="net462" />
-  <package id="Microsoft.Extensions.Logging.Abstractions" version="8.0.3" targetFramework="net462" />
+  <package id="Microsoft.Extensions.Logging.Abstractions" version="7.0.0" targetFramework="net462" />
   <package id="Microsoft.VisualBasic" version="10.3.0" targetFramework="net48" />
   <package id="Newtonsoft.Json" version="13.0.3" targetFramework="net48" />
   <package id="Newtonsoft.Json.Bson" version="1.0.2" targetFramework="net48" />

EnvelopeGenerator.ServiceHost/Controllers/DocResultController.cs

@@ -1,21 +0,0 @@
-using EnvelopeGenerator.Application.Envelopes.Queries;
-using MediatR;
-using Microsoft.AspNetCore.Mvc;
-
-namespace EnvelopeGenerator.ServiceHost.Controllers;
-
-[Route("api/[controller]")]
-[ApiController]
-public class DocResultController(IMediator mediator) : ControllerBase
-{
-    [HttpGet]
-    public async Task<IActionResult> GetAsync([FromQuery] ReadSingleEnvelopeDocResultQuery query, [FromQuery] bool download = false, CancellationToken cancel = default)
-    {
-        var bytes = await mediator.Send(query, cancel);
-
-        if (download)
-            return File(bytes, "application/pdf", $"envelope_{query.Envelope.Uuid}.pdf");
-
-        return File(bytes, "application/pdf");
-    }
-}

EnvelopeGenerator.ServiceHost/Controllers/FinalizeDocumentController.cs

@@ -1,29 +0,0 @@
-using EnvelopeGenerator.Application.Envelopes.Queries;
-using EnvelopeGenerator.ServiceHost.Jobs;
-using MediatR;
-using Microsoft.AspNetCore.Mvc;
-
-namespace EnvelopeGenerator.ServiceHost.Controllers;
-
-/// <summary>
-/// 
-/// </summary>
-/// <param name="mediator"></param>
-/// <param name="job"></param>
-[Route("api/[controller]")]
-[ApiController]
-public class FinalizeDocumentController(IMediator mediator, FinalizeDocumentJob job) : ControllerBase
-{
-    [HttpGet]
-    public async Task<IActionResult> FinalizeEnvelopeDocument([FromQuery] ReadSingleEnvelopeQuery query, [FromQuery] bool forceRegenerate = false, CancellationToken cancel = default)
-    {
-        var envelope = await mediator.Send(query, cancel);
-
-        // TODO: migrate forceRegenerate input to FinalizeDocumentJob as property and remove this check from controller
-        if (envelope.DocResult is null || forceRegenerate)
-            await job.ExecuteAsync(envelope, cancel);
-
-        var docResult = await mediator.Send(new ReadSingleEnvelopeDocResultQuery() { Envelope = query }, cancel);
-        return File(docResult, "application/pdf", $"envelope_{query.Uuid}.pdf");
-    }
-}

EnvelopeGenerator.ServiceHost/Controllers/WorkerController.cs

@@ -1,21 +0,0 @@
-using EnvelopeGenerator.ServiceHost.Jobs;
-using Microsoft.AspNetCore.Mvc;
-
-namespace EnvelopeGenerator.ServiceHost.Controllers;
-
-[Route("api/[controller]")]
-[ApiController]
-public class WorkerController(JobStateManager jobStateManager) : ControllerBase
-{
-    private readonly JobStateManager _jobStateManager = jobStateManager;
-
-    [HttpGet(nameof(FinalizeDocumentJob))]
-    public IActionResult GetStateOfFinalizeDocumentJob() => Ok(_jobStateManager.GetState<FinalizeDocumentJob>());
-
-    [HttpPost(nameof(FinalizeDocumentJob))]
-    public IActionResult SetStateOfFinalizeDocumentJob([FromQuery] State state)
-    {
-        _jobStateManager.SetState<FinalizeDocumentJob>(state);
-        return Ok();
-    }
-}

EnvelopeGenerator.ServiceHost/EnvelopeGenerator.ServiceHost.csproj

@@ -1,46 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk.Web">
-
-  <PropertyGroup>
-    <TargetFramework>net8.0-windows</TargetFramework>
-    <UseWindowsForms>true</UseWindowsForms>
-    <Nullable>enable</Nullable>
-    <ImplicitUsings>enable</ImplicitUsings>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <PackageReference Include="DigitalData.Core.API" Version="2.2.1" />
-    <PackageReference Include="Swashbuckle.AspNetCore" Version="6.6.2" />
-    <PackageReference Include="GdPicture" Version="14.3.3" />
-    <PackageReference Include="Microsoft.Data.SqlClient" Version="6.1.4" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore" Version="8.0.17" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="8.0.17" />
-    <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
-    <PackageReference Include="Quartz" Version="3.8.0" />
-    <PackageReference Include="System.Collections.Immutable" Version="8.0.0" />
-    <PackageReference Include="System.Drawing.Common" Version="8.0.16" />
-    <PackageReference Include="Microsoft.Extensions.Options" Version="8.0.2" />
-    <PackageReference Include="DevExpress.Reporting.Core" Version="24.2.*" />
-    <PackageReference Include="Microsoft.Extensions.Caching.SqlServer" Version="8.0.17" />
-	<PackageReference Include="Microsoft.Extensions.Hosting.WindowsServices" Version="8.0.1" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <ProjectReference Include="..\EnvelopeGenerator.Application\EnvelopeGenerator.Application.csproj" />
-    <ProjectReference Include="..\EnvelopeGenerator.Domain\EnvelopeGenerator.Domain.csproj" />
-    <ProjectReference Include="..\EnvelopeGenerator.Infrastructure\EnvelopeGenerator.Infrastructure.csproj" />
-    <ProjectReference Include="..\EnvelopeGenerator.PdfEditor\EnvelopeGenerator.PdfEditor.csproj" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <Compile Update="Jobs\FinalizeDocument\rptEnvelopeHistory.cs">
-      <SubType>Component</SubType>
-    </Compile>
-    <Compile Update="Jobs\FinalizeDocument\rptEnvelopeHistory.Designer.cs">
-      <DependentUpon>rptEnvelopeHistory.cs</DependentUpon>
-    </Compile>
-    <EmbeddedResource Update="Jobs\FinalizeDocument\rptEnvelopeHistory.resx">
-      <DependentUpon>rptEnvelopeHistory.cs</DependentUpon>
-    </EmbeddedResource>
-  </ItemGroup>
-
-</Project>

EnvelopeGenerator.ServiceHost/Exceptions/BurnAnnotationException.cs

@@ -1,12 +0,0 @@
-namespace EnvelopeGenerator.ServiceHost.Exceptions;
-
-public class BurnAnnotationException : ApplicationException
-{
-    public BurnAnnotationException(string message) : base(message)
-    {
-    }
-
-    public BurnAnnotationException(string message, Exception innerException) : base(message, innerException)
-    {
-    }
-}

EnvelopeGenerator.ServiceHost/Exceptions/CreateReportException.cs

@@ -1,12 +0,0 @@
-namespace EnvelopeGenerator.ServiceHost.Exceptions;
-
-public class CreateReportException : ApplicationException
-{
-    public CreateReportException(string message) : base(message)
-    {
-    }
-
-    public CreateReportException(string message, Exception innerException) : base(message, innerException)
-    {
-    }
-}

EnvelopeGenerator.ServiceHost/Exceptions/ExportDocumentException.cs

@@ -1,12 +0,0 @@
-namespace EnvelopeGenerator.ServiceHost.Exceptions;
-
-public class ExportDocumentException : ApplicationException
-{
-    public ExportDocumentException(string message) : base(message)
-    {
-    }
-
-    public ExportDocumentException(string message, Exception innerException) : base(message, innerException)
-    {
-    }
-}

EnvelopeGenerator.ServiceHost/Exceptions/MergeDocumentException.cs

@@ -1,12 +0,0 @@
-namespace EnvelopeGenerator.ServiceHost.Exceptions;
-
-public class MergeDocumentException : ApplicationException
-{
-    public MergeDocumentException(string message) : base(message)
-    {
-    }
-
-    public MergeDocumentException(string message, Exception innerException) : base(message, innerException)
-    {
-    }
-}

EnvelopeGenerator.ServiceHost/Extensions/DataRowExtensions.cs

@@ -1,27 +0,0 @@
-using System.Data;
-
-namespace EnvelopeGenerator.ServiceHost.Extensions;
-
-public static class DataRowExtensions
-{
-    public static T ItemEx<T>(this DataRow row, string columnName, T defaultValue)
-    {
-        if (!row.Table.Columns.Contains(columnName))
-        {
-            return defaultValue;
-        }
-
-        var value = row[columnName];
-        if (value is DBNull or null)
-        {
-            return defaultValue;
-        }
-
-        return (T)Convert.ChangeType(value, typeof(T));
-    }
-
-    public static string ItemEx(this DataRow row, string columnName, string defaultValue)
-    {
-        return row.ItemEx<string>(columnName, defaultValue);
-    }
-}

EnvelopeGenerator.ServiceHost/Extensions/DependencyInjection.cs

@@ -1,34 +0,0 @@
-using EnvelopeGenerator.ServiceHost.Jobs;
-using EnvelopeGenerator.ServiceHost.Jobs.FinalizeDocument;
-using GdPicture14;
-using Microsoft.Extensions.Options;
-
-namespace EnvelopeGenerator.ServiceHost.Extensions;
-
-public static class DependencyInjection
-{
-    [Obsolete("Check obsoleted services")]
-    public static IServiceCollection AddFinalizeDocumentJob(this IServiceCollection services, IConfiguration configuration)
-    {
-        services.Configure<WorkerOptions>(configuration.GetSection("Worker"));
-        services.AddSingleton(provider =>
-        {
-            var options = provider.GetRequiredService<IOptions<WorkerOptions>>().Value;
-            var manager = new JobStateManager(options.InitialJobState);
-            return manager;
-        });
-        services.AddScoped<FinalizeDocumentJob>();
-        services.AddScoped<ActionService>();
-        services.AddSingleton<TempFiles>();
-        services.AddScoped<PDFBurner>();
-        services.AddScoped<PDFMerger>();
-        services.AddScoped<ReportCreator>();
-
-        //TODO: Check lifetime of services. They might be singleton or scoped.
-        services.AddTransient<GdViewer>();
-        services.AddSingleton<LicenseManagerFactory>();
-        services.AddTransient<AnnotationManager>();
-
-        return services;
-    }
-}

EnvelopeGenerator.ServiceHost/Extensions/LoggerExtensions.cs

@@ -1,11 +0,0 @@
-using EnvelopeGenerator.ServiceHost.Extensions;
-
-namespace EnvelopeGenerator.ServiceHost.Extensions;
-
-public static class LoggerExtensions
-{
-    public static void LogError(this ILogger logger, Exception exception)
-    {
-        logger.LogError(exception, "{message}", exception.Message);
-    }
-}

EnvelopeGenerator.ServiceHost/Jobs/ActionService.cs

@@ -1,37 +0,0 @@
-using DigitalData.Core.Abstraction.Application.Repository;
-using EnvelopeGenerator.Application.Common.Dto;
-using EnvelopeGenerator.Application.Common.Dto.Receiver;
-using EnvelopeGenerator.Domain.Entities;
-
-namespace EnvelopeGenerator.ServiceHost.Jobs;
-
-/// <summary>
-/// migrate from EnvelopeGenerator.CommonServices.Services.ActionService
-/// </summary>
-[Obsolete("This is a placeholder service added by copilot. Migrate the actual logic from CommonServices.Jobs")]
-public class ActionService(IRepository<History> histRepo)
-{
-    [Obsolete("This is a placeholder service added by copilot. Migrate the actual logic from CommonServices.Jobs")]
-    public bool CreateReport(EnvelopeDto envelope, CancellationToken cancel = default)
-    {
-        throw new NotImplementedException();
-    }
-
-    [Obsolete("This is a placeholder service added by copilot. Migrate the actual logic from CommonServices.Jobs")]
-    public bool FinalizeEnvelope(EnvelopeDto envelope, CancellationToken cancel = default)
-    {
-        throw new NotImplementedException();
-    }
-
-    [Obsolete("This is a placeholder service added by copilot. Migrate the actual logic from CommonServices.Jobs")]
-    public bool CompleteEnvelope(EnvelopeDto envelope, CancellationToken cancel = default)
-    {
-        throw new NotImplementedException();
-    }
-
-    [Obsolete("This is a placeholder service added by copilot. Migrate the actual logic from CommonServices.Jobs")]
-    public bool CompleteEnvelope(EnvelopeDto envelope, ReceiverDto receiver, CancellationToken cancel = default)
-    {
-        throw new NotImplementedException();
-    }
-}

EnvelopeGenerator.ServiceHost/Jobs/FinalizeDocument/PDFBurner.cs

@@ -1,422 +0,0 @@
-using System.Collections.Immutable;
-using System.Drawing;
-using EnvelopeGenerator.Domain.Entities;
-using EnvelopeGenerator.Infrastructure;
-using EnvelopeGenerator.PdfEditor;
-using EnvelopeGenerator.ServiceHost.Exceptions;
-using EnvelopeGenerator.ServiceHost.Jobs;
-using GdPicture14;
-using Microsoft.EntityFrameworkCore;
-using Microsoft.Extensions.Options;
-using Newtonsoft.Json;
-
-namespace EnvelopeGenerator.ServiceHost.Jobs.FinalizeDocument;
-
-public class PDFBurner(IOptions<WorkerOptions> workerOptions, EGDbContext context, ILogger<PDFBurner> logger, LicenseManagerFactory licenseManagerFactory, AnnotationManager manager)
-{
-    private readonly WorkerOptions.PDFBurnerOptions _options = workerOptions.Value.PdfBurner;
-    
-    public byte[] BurnAnnotsToPDF(byte[] sourceBuffer, List<string> instantJsonList, int envelopeId)
-    {
-        var envelope = context.Envelopes.FirstOrDefault(env => env.Id == envelopeId);
-        if (envelope is null)
-        {
-            throw new BurnAnnotationException($"Envelope with Id {envelopeId} not found.");
-        }
-
-        if (envelope.ReadOnly)
-        {
-            return sourceBuffer;
-        }
-
-        var elements = context.DocumentReceiverElements
-            .Where(sig => sig.Document.EnvelopeId == envelopeId)
-            .Include(sig => sig.Annotations)
-            .ToList();
-
-        return elements.Any()
-            ? BurnElementAnnotsToPDF(sourceBuffer, elements)
-            : BurnInstantJSONAnnotsToPDF(sourceBuffer, instantJsonList);
-    }
-
-    public byte[] BurnElementAnnotsToPDF(byte[] sourceBuffer, List<Signature> elements)
-    {
-        using (var doc = Pdf.FromMemory(sourceBuffer))
-        {
-            sourceBuffer = doc.Background(elements, 1.9500000000000002 * 0.93, 2.52 * 0.67).ExportStream().ToArray();
-
-            using var sourceStream = new MemoryStream(sourceBuffer);
-            var result = manager.InitFromStream(sourceStream);
-            if (result != GdPictureStatus.OK)
-            {
-                throw new BurnAnnotationException($"Could not open document for burning: [{result}]");
-            }
-
-            var margin = 0.2;
-            var inchFactor = 72d;
-
-            var keys = new[] { "position", "city", "date" };
-            var unitYOffsets = 0.2;
-            var yOffsetsOfFF = keys
-                .Select((k, i) => new { Key = k, Value = unitYOffsets * i + 1 })
-                .ToDictionary(x => x.Key, x => x.Value);
-
-            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 ?? 0) - frameY * inchFactor;
-                var frameXShift = (frame?.X ?? 0) - frameX * inchFactor;
-
-                foreach (var annot in element.Annotations)
-                {
-                    var yOffsetOfFF = yOffsetsOfFF.TryGetValue(annot.Name, out var offset) ? offset : 0;
-                    var y = frameY + yOffsetOfFF;
-
-                    if (annot.Type == AnnotationType.FormField)
-                    {
-                        AddFormFieldValue(annot.X / inchFactor, y, annot.Width / inchFactor, annot.Height / inchFactor, element.Page, annot.Value);
-                    }
-                    else if (annot.Type == AnnotationType.Image)
-                    {
-                        AddImageAnnotation(
-                            annot.X / inchFactor,
-                            annot.Name == "signature" ? (annot.Y - frameYShift) / inchFactor : y,
-                            annot.Width / inchFactor,
-                            annot.Height / inchFactor,
-                            element.Page,
-                            annot.Value);
-                    }
-                    else if (annot.Type == AnnotationType.Ink)
-                    {
-                        AddInkAnnotation(element.Page, annot.Value);
-                    }
-                }
-            }
-
-            using var newStream = new MemoryStream();
-            result = manager.SaveDocumentToPDF(newStream);
-            if (result != GdPictureStatus.OK)
-            {
-                throw new BurnAnnotationException($"Could not save document to stream: [{result}]");
-            }
-
-            manager.Close();
-
-            return newStream.ToArray();
-        }
-    }
-
-    public byte[] BurnInstantJSONAnnotsToPDF(byte[] sourceBuffer, List<string> instantJsonList)
-    {
-        using var sourceStream = new MemoryStream(sourceBuffer);
-        var result = manager.InitFromStream(sourceStream);
-        if (result != GdPictureStatus.OK)
-        {
-            throw new BurnAnnotationException($"Could not open document for burning: [{result}]");
-        }
-
-        foreach (var json in instantJsonList)
-        {
-            try
-            {
-                AddInstantJSONAnnotationToPDF(json);
-            }
-            catch (Exception ex)
-            {
-                logger.LogWarning("Error in AddInstantJSONAnnotationToPDF - oJson: ");
-                logger.LogWarning(json);
-                throw new BurnAnnotationException("Adding Annotation failed", ex);
-            }
-        }
-
-        result = manager.BurnAnnotationsToPage(RemoveInitialAnnots: true, VectorMode: true);
-        if (result != GdPictureStatus.OK)
-        {
-            throw new BurnAnnotationException($"Could not burn annotations to file: [{result}]");
-        }
-
-        using var newStream = new MemoryStream();
-        result = manager.SaveDocumentToPDF(newStream);
-        if (result != GdPictureStatus.OK)
-        {
-            throw new BurnAnnotationException($"Could not save document to stream: [{result}]");
-        }
-
-        manager.Close();
-
-        return newStream.ToArray();
-    }
-
-    private void AddInstantJSONAnnotationToPDF(string instantJson)
-    {
-        var annotationData = JsonConvert.DeserializeObject<AnnotationData>(instantJson);
-        if (annotationData is null)
-        {
-            return;
-        }
-
-        annotationData.annotations.Reverse();
-
-        foreach (var annotation in annotationData.annotations)
-        {
-            logger.LogDebug("Adding AnnotationID: " + annotation.id);
-
-            switch (annotation.type)
-            {
-                case AnnotationType.Image:
-                    AddImageAnnotation(annotation, annotationData.attachments);
-                    break;
-                case AnnotationType.Ink:
-                    AddInkAnnotation(annotation);
-                    break;
-                case AnnotationType.Widget:
-                    var formFieldValue = annotationData.formFieldValues.FirstOrDefault(fv => fv.name == annotation.id);
-                    if (formFieldValue is not null && !_options.IgnoredLabels.Contains(formFieldValue.value))
-                    {
-                        AddFormFieldValue(annotation, formFieldValue);
-                    }
-                    break;
-            }
-        }
-    }
-
-    private void AddImageAnnotation(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);
-    }
-
-    private void AddImageAnnotation(Annotation annotation, Dictionary<string, Attachment> attachments)
-    {
-        var attachment = attachments.Where(a => a.Key == annotation.imageAttachmentId).SingleOrDefault();
-
-        var bounds = annotation.bbox.Select(ToInches).ToList();
-
-        var x = bounds[0];
-        var y = bounds[1];
-        var width = bounds[2];
-        var height = bounds[3];
-
-        manager.SelectPage(annotation.pageIndex + 1);
-        manager.AddEmbeddedImageAnnotFromBase64(attachment.Value.binary, (float) x, (float) y, (float) width, (float) height);
-    }
-
-    private void AddInkAnnotation(int page, string value)
-    {
-        var ink = JsonConvert.DeserializeObject<Ink>(value);
-        if (ink is null)
-        {
-            return;
-        }
-
-        var segments = ink.lines.points;
-        var color = ColorTranslator.FromHtml(ink.strokeColor);
-        manager.SelectPage(page);
-
-        foreach (var segment in segments)
-        {
-            var points = segment.Select(ToPointF).ToArray();
-            manager.AddFreeHandAnnot(color, points);
-        }
-    }
-
-    private void AddInkAnnotation(Annotation annotation)
-    {
-        var segments = annotation.lines.points;
-        var color = ColorTranslator.FromHtml(annotation.strokeColor);
-        manager.SelectPage(annotation.pageIndex + 1);
-
-        foreach (var segment in segments)
-        {
-            var points = segment.Select(ToPointF).ToArray();
-            manager.AddFreeHandAnnot(color, points);
-        }
-    }
-
-    private void AddFormFieldValue(double x, double y, double width, double height, int page, string value)
-    {
-        manager.SelectPage(page);
-
-        var annot = manager.AddTextAnnot((float) x, (float) y, (float) width, (float) height, value);
-        annot.FontName = _options.FontName;
-        annot.FontSize = _options.FontSize;
-        annot.FontStyle = _options.FontStyle;
-        manager.SaveAnnotationsToPage();
-    }
-
-    private void AddFormFieldValue(Annotation annotation, FormFieldValue formFieldValue)
-    {
-        var ffIndex = EGName.Index[annotation.egName];
-
-        var bounds = annotation.bbox.Select(ToInches).ToList();
-
-        var x = bounds[0];
-        var y = bounds[1] + _options.YOffset * ffIndex + _options.TopMargin;
-        var width = bounds[2];
-        var height = bounds[3];
-
-        manager.SelectPage(annotation.pageIndex + 1);
-        var annot = manager.AddTextAnnot((float) x, (float) y, (float) width, (float) height, formFieldValue.value);
-        annot.FontName = _options.FontName;
-        annot.FontSize = _options.FontSize;
-        annot.FontStyle = _options.FontStyle;
-        manager.SaveAnnotationsToPage();
-    }
-
-    private static PointF ToPointF(List<float> points)
-    {
-        var convertedPoints = points.Select(ToInches).ToList();
-        return new PointF(convertedPoints[0], convertedPoints[1]);
-    }
-
-    private static double ToInches(double value) => value / 72;
-
-    private static float ToInches(float value) => value / 72;
-
-    internal static class AnnotationType
-    {
-        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";
-    }
-
-    internal class AnnotationData
-    {
-        public List<Annotation> annotations { get; set; } = new();
-
-        public IEnumerable<List<Annotation>> AnnotationsByReceiver => annotations
-            .Where(annot => annot.hasStructuredID)
-            .GroupBy(a => a.receiverId)
-            .Select(g => g.ToList());
-
-        public IEnumerable<List<Annotation>> UnstructuredAnnotations => annotations
-            .Where(annot => !annot.hasStructuredID)
-            .GroupBy(a => a.receiverId)
-            .Select(g => g.ToList());
-
-        public Dictionary<string, Attachment> attachments { get; set; } = new();
-        public List<FormFieldValue> formFieldValues { get; set; } = new();
-    }
-
-    internal class Annotation
-    {
-        private string? _id;
-
-        public int envelopeId;
-        public int receiverId;
-        public int index;
-        public string egName = EGName.NoName;
-        public bool hasStructuredID;
-
-        public bool isLabel
-        {
-            get
-            {
-                if (string.IsNullOrEmpty(egName))
-                {
-                    return false;
-                }
-
-                var parts = egName.Split('_');
-                return parts.Length > 1 && parts[1] == "label";
-            }
-        }
-
-        public string id
-        {
-            get => _id ?? string.Empty;
-            set
-            {
-                _id = value;
-
-                if (string.IsNullOrWhiteSpace(_id))
-                {
-                    throw new BurnAnnotationException("The identifier of annotation is null or empty.");
-                }
-
-                var parts = value.Split('#');
-
-                if (parts.Length != 4)
-                {
-                    return;
-                }
-
-                if (!int.TryParse(parts[0], out envelopeId))
-                {
-                    throw new BurnAnnotationException($"The envelope ID of annotation is not integer. Id: {_id}");
-                }
-
-                if (!int.TryParse(parts[1], out receiverId))
-                {
-                    throw new BurnAnnotationException($"The receiver ID of annotation is not integer. Id: {_id}");
-                }
-
-                if (!int.TryParse(parts[2], out index))
-                {
-                    throw new BurnAnnotationException($"The index of annotation is not integer. Id: {_id}");
-                }
-
-                egName = parts[3];
-
-                hasStructuredID = true;
-            }
-        }
-
-        public List<double> bbox { get; set; } = new();
-
-        public string type { get; set; } = string.Empty;
-
-        public bool isSignature { get; set; }
-
-        public string imageAttachmentId { get; set; } = string.Empty;
-
-        public Lines lines { get; set; } = new();
-
-        public int pageIndex { get; set; }
-
-        public string strokeColor { get; set; } = string.Empty;
-    }
-
-    internal class Ink
-    {
-        public Lines lines { get; set; } = new();
-
-        public string strokeColor { get; set; } = string.Empty;
-    }
-
-    public class EGName
-    {
-        public static readonly string NoName = Guid.NewGuid().ToString();
-        public static readonly string Seal = "signature";
-
-        public static readonly ImmutableDictionary<string, int> Index = new Dictionary<string, int>
-        {
-            { NoName, 0 },
-            { Seal, 0 },
-            { "position", 1 },
-            { "city", 2 },
-            { "date", 3 }
-        }.ToImmutableDictionary();
-    }
-
-    internal class Lines
-    {
-        public List<List<List<float>>> points { get; set; } = new();
-    }
-
-    internal class Attachment
-    {
-        public string binary { get; set; } = string.Empty;
-        public string contentType { get; set; } = string.Empty;
-    }
-
-    internal class FormFieldValue
-    {
-        public string name { get; set; } = string.Empty;
-        public string value { get; set; } = string.Empty;
-    }
-}

EnvelopeGenerator.ServiceHost/Jobs/FinalizeDocument/PDFMerger.cs

@@ -1,62 +0,0 @@
-using EnvelopeGenerator.ServiceHost.Exceptions;
-using EnvelopeGenerator.ServiceHost.Jobs;
-using GdPicture14;
-using Microsoft.Extensions.Options;
-
-namespace EnvelopeGenerator.ServiceHost.Jobs.FinalizeDocument;
-
-public class PDFMerger
-{
-    private readonly AnnotationManager _manager;
-    private readonly LicenseManagerFactory _licenseManagerFactory;
-
-    private const bool AllowRasterization = true;
-    private const bool AllowVectorization = true;
-
-    private readonly PdfConversionConformance _pdfaConformanceLevel = PdfConversionConformance.PDF_A_1b;
-
-    public PDFMerger(LicenseManagerFactory licenseManagerFactory, AnnotationManager annotationManager)
-    {
-        _licenseManagerFactory = licenseManagerFactory;
-        _manager = annotationManager;
-    }
-
-    public byte[] MergeDocuments(byte[] document, byte[] report)
-    {
-        using var documentStream = new MemoryStream(document);
-        using var reportStream = new MemoryStream(report);
-        using var finalStream = new MemoryStream();
-        using var documentPdf = new GdPicturePDF();
-        using var reportPdf = new GdPicturePDF();
-
-        documentPdf.LoadFromStream(documentStream, true);
-        var status = documentPdf.GetStat();
-        if (status != GdPictureStatus.OK)
-        {
-            throw new MergeDocumentException($"Document could not be loaded: {status}");
-        }
-
-        reportPdf.LoadFromStream(reportStream, true);
-        status = reportPdf.GetStat();
-        if (status != GdPictureStatus.OK)
-        {
-            throw new MergeDocumentException($"Report could not be loaded: {status}");
-        }
-
-        var mergedPdf = documentPdf.Merge2Documents(documentPdf, reportPdf);
-        status = mergedPdf.GetStat();
-        if (status != GdPictureStatus.OK)
-        {
-            throw new MergeDocumentException($"Documents could not be merged: {status}");
-        }
-
-        mergedPdf.ConvertToPDFA(finalStream, _pdfaConformanceLevel, AllowVectorization, AllowRasterization);
-        status = documentPdf.GetStat();
-        if (status != GdPictureStatus.OK)
-        {
-            throw new MergeDocumentException($"Document could not be converted to PDF/A: {status}");
-        }
-
-        return finalStream.ToArray();
-    }
-}

EnvelopeGenerator.ServiceHost/Jobs/FinalizeDocument/ReportCreator.cs

@@ -1,30 +0,0 @@
-using DevExpress.Xpo;
-using DigitalData.Core.Abstraction.Application.Repository;
-using EnvelopeGenerator.Application.Common.Dto;
-using EnvelopeGenerator.Domain.Entities;
-using EnvelopeGenerator.ServiceHost.Exceptions;
-
-namespace EnvelopeGenerator.ServiceHost.Jobs.FinalizeDocument;
-
-public class ReportCreator(IRepository<EnvelopeReport> reportRepo)
-{
-    public async Task<byte[]> CreateReportAsync(EnvelopeDto envelope, CancellationToken cancel = default)
-    {
-        var reports = await reportRepo.Where(r => r.EnvelopeId == envelope.Id).ToListAsync(cancel);
-
-        if (reports.Count == 0)
-            throw new CreateReportException("Could not prepare report data! No report data found!");
-
-        var items = reports
-            .Select(r => new ReportItem(r, envelope))
-            .OrderByDescending(r => r.ItemDate)
-            .ToList();
-
-        var source = new ReportSource { Items = items };
-        var report = new rptEnvelopeHistory { DataSource = source, DataMember = "Items" };
-        report.CreateDocument();
-        using var stream = new MemoryStream();
-        report.ExportToPdf(stream);
-        return stream.ToArray();
-    }
-}

EnvelopeGenerator.ServiceHost/Jobs/FinalizeDocument/ReportItem.cs

@@ -1,37 +0,0 @@
-using EnvelopeGenerator.Application.Common.Dto;
-using EnvelopeGenerator.Domain.Constants;
-using EnvelopeGenerator.Domain.Entities;
-
-namespace EnvelopeGenerator.ServiceHost.Jobs.FinalizeDocument;
-
-public class ReportItem
-{
-    public ReportItem() { }
-
-    public ReportItem(EnvelopeReport report, EnvelopeDto envelope)
-    {
-        CreatorFullName = envelope.User is not null
-            ? $"{envelope.User.Prename} {envelope.User.Name}".Trim()
-            : string.Empty;
-        CreatorEmailAddress = envelope.User?.Email ?? string.Empty;
-        EnvelopeTitle = report.HeadTitle ?? string.Empty;
-        EnvelopeUuid = report.HeadUuid ?? string.Empty;
-        EnvelopeCertificationType = envelope.CertificationType is int certType ? ((CertificationType)certType).ToString() : "null";
-        ItemStatus = (EnvelopeStatus)report.PosStatus;
-        ItemUserReference = report.PosWho ?? string.Empty;
-        ItemDate = report.PosWhen ?? DateTime.MinValue;
-    }
-
-    // Header fields (from Envelope)
-    public string CreatorFullName { get; set; } = string.Empty;
-    public string CreatorEmailAddress { get; set; } = string.Empty;
-    public string EnvelopeTitle { get; set; } = string.Empty;
-    public string EnvelopeUuid { get; set; } = string.Empty;
-    public string EnvelopeCertificationType { get; set; } = string.Empty;
-
-    // Detail fields (from EnvelopeReport)
-    public EnvelopeStatus ItemStatus { get; set; }
-    public string ItemStatusTranslated => ItemStatus.ToString();
-    public string ItemUserReference { get; set; } = string.Empty;
-    public DateTime ItemDate { get; set; }
-}

EnvelopeGenerator.ServiceHost/Jobs/FinalizeDocument/rptEnvelopeHistory.Designer.cs

@@ -1,736 +0,0 @@
-using System.ComponentModel;
-using System.Drawing;
-using System.Drawing.Printing;
-using DevExpress.DataAccess.ObjectBinding;
-using DevExpress.XtraPrinting;
-using DevExpress.XtraReports.UI;
-
-namespace EnvelopeGenerator.ServiceHost.Jobs.FinalizeDocument;
-
-public partial class rptEnvelopeHistory : XtraReport
-{
-    /// <summary>
-    /// Required designer variable.
-    /// </summary>
-    private IContainer components = null;
-
-    /// <summary>
-    /// Clean up any resources being used.
-    /// </summary>
-    protected override void Dispose(bool disposing)
-    {
-        if (disposing && components != null)
-        {
-            components.Dispose();
-        }
-        base.Dispose(disposing);
-    }
-
-    #region Designer generated code
-
-    /// <summary>
-    /// Required method for Designer support - do not modify
-    /// the contents of this method with the code editor.
-    /// </summary>
-    private void InitializeComponent()
-    {
-        this.components = new Container();
-        var resources = new ComponentResourceManager(typeof(rptEnvelopeHistory));
-        this.TopMargin = new TopMarginBand();
-        this.BottomMargin = new BottomMarginBand();
-        this.XrLabel1 = new XRLabel();
-        this.pageInfo1 = new XRPageInfo();
-        this.pageInfo2 = new XRPageInfo();
-        this.ReportHeader = new ReportHeaderBand();
-        this.label1 = new XRLabel();
-        this.XrTable3 = new XRTable();
-        this.XrTableRow8 = new XRTableRow();
-        this.XrTableCell13 = new XRTableCell();
-        this.XrTableCell15 = new XRTableCell();
-        this.XrTableRow9 = new XRTableRow();
-        this.XrTableCell14 = new XRTableCell();
-        this.XrTableCell17 = new XRTableCell();
-        this.XrTableCell16 = new XRTableCell();
-        this.XrTableCell18 = new XRTableCell();
-        this.XrTableRow10 = new XRTableRow();
-        this.XrTableCell19 = new XRTableCell();
-        this.XrTableCell20 = new XRTableCell();
-        this.XrTableCell21 = new XRTableCell();
-        this.XrTableCell22 = new XRTableCell();
-        this.XrTableRow11 = new XRTableRow();
-        this.XrTableCell23 = new XRTableCell();
-        this.XrTableCell24 = new XRTableCell();
-        this.XrTableCell25 = new XRTableCell();
-        this.XrTableCell26 = new XRTableCell();
-        this.GroupHeader1 = new GroupHeaderBand();
-        this.table1 = new XRTable();
-        this.tableRow1 = new XRTableRow();
-        this.tableCell1 = new XRTableCell();
-        this.tableCell2 = new XRTableCell();
-        this.tableCell3 = new XRTableCell();
-        this.Detail = new DetailBand();
-        this.table2 = new XRTable();
-        this.tableRow2 = new XRTableRow();
-        this.tableCell4 = new XRTableCell();
-        this.tableCell5 = new XRTableCell();
-        this.tableCell6 = new XRTableCell();
-        this.Title = new XRControlStyle();
-        this.DetailCaption1 = new XRControlStyle();
-        this.DetailData1 = new XRControlStyle();
-        this.DetailData3_Odd = new XRControlStyle();
-        this.PageInfo = new XRControlStyle();
-        this.ObjectDataSource1 = new ObjectDataSource(this.components);
-        ((ISupportInitialize)this.XrTable3).BeginInit();
-        ((ISupportInitialize)this.table1).BeginInit();
-        ((ISupportInitialize)this.table2).BeginInit();
-        ((ISupportInitialize)this.ObjectDataSource1).BeginInit();
-        ((ISupportInitialize)this).BeginInit();
-        //
-        // TopMargin
-        //
-        this.TopMargin.Dpi = 254F;
-        this.TopMargin.HeightF = 190.6042F;
-        this.TopMargin.Name = "TopMargin";
-        //
-        // BottomMargin
-        //
-        this.BottomMargin.Controls.AddRange(new XRControl[] { this.XrLabel1, this.pageInfo1, this.pageInfo2 });
-        this.BottomMargin.Dpi = 254F;
-        this.BottomMargin.Name = "BottomMargin";
-        //
-        // XrLabel1
-        //
-        this.XrLabel1.BorderColor = Color.FromArgb(165, 36, 49);
-        this.XrLabel1.Borders = BorderSide.Top;
-        this.XrLabel1.Dpi = 254F;
-        this.XrLabel1.Font = new Font("Arial", 8.25F, FontStyle.Bold);
-        this.XrLabel1.LocationFloat = new DevExpress.Utils.PointFloat(896.5417F, 0F);
-        this.XrLabel1.Name = "XrLabel1";
-        this.XrLabel1.Padding = new PaddingInfo(0, 0, 0, 0, 254F);
-        this.XrLabel1.SizeF = new SizeF(645.5836F, 58F);
-        this.XrLabel1.StyleName = "Title";
-        this.XrLabel1.StylePriority.UseBorderColor = false;
-        this.XrLabel1.StylePriority.UseBorders = false;
-        this.XrLabel1.StylePriority.UseFont = false;
-        this.XrLabel1.StylePriority.UsePadding = false;
-        this.XrLabel1.Text = "Erstellt mit SignFlow";
-        //
-        // pageInfo1
-        //
-        this.pageInfo1.BorderColor = Color.FromArgb(165, 36, 49);
-        this.pageInfo1.Borders = BorderSide.Top;
-        this.pageInfo1.Dpi = 254F;
-        this.pageInfo1.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F);
-        this.pageInfo1.Name = "pageInfo1";
-        this.pageInfo1.PageInfo = DevExpress.XtraPrinting.PageInfo.DateTime;
-        this.pageInfo1.SizeF = new SizeF(896.5417F, 58F);
-        this.pageInfo1.StyleName = "PageInfo";
-        this.pageInfo1.StylePriority.UseBorderColor = false;
-        this.pageInfo1.StylePriority.UseBorders = false;
-        this.pageInfo1.TextFormatString = "{0:dddd, d. MMMM yyyy HH:mm}";
-        //
-        // pageInfo2
-        //
-        this.pageInfo2.BorderColor = Color.FromArgb(165, 36, 49);
-        this.pageInfo2.Borders = BorderSide.Top;
-        this.pageInfo2.Dpi = 254F;
-        this.pageInfo2.LocationFloat = new DevExpress.Utils.PointFloat(1542.125F, 0F);
-        this.pageInfo2.Name = "pageInfo2";
-        this.pageInfo2.SizeF = new SizeF(357.875F, 58F);
-        this.pageInfo2.StyleName = "PageInfo";
-        this.pageInfo2.StylePriority.UseBorderColor = false;
-        this.pageInfo2.StylePriority.UseBorders = false;
-        this.pageInfo2.TextAlignment = TextAlignment.TopRight;
-        this.pageInfo2.TextFormatString = "Seite {0} von {1}";
-        //
-        // ReportHeader
-        //
-        this.ReportHeader.Controls.AddRange(new XRControl[] { this.label1, this.XrTable3 });
-        this.ReportHeader.Dpi = 254F;
-        this.ReportHeader.HeightF = 406.0843F;
-        this.ReportHeader.Name = "ReportHeader";
-        //
-        // label1
-        //
-        this.label1.BackColor = Color.FromArgb(224, 224, 224);
-        this.label1.BorderColor = Color.FromArgb(165, 36, 49);
-        this.label1.Borders = BorderSide.Bottom;
-        this.label1.BorderWidth = 2F;
-        this.label1.Dpi = 254F;
-        this.label1.Font = new Font("Segoe UI", 14.25F, FontStyle.Bold, GraphicsUnit.Point, 0);
-        this.label1.ForeColor = Color.Black;
-        this.label1.LocationFloat = new DevExpress.Utils.PointFloat(0.0002422333F, 0F);
-        this.label1.Name = "label1";
-        this.label1.Padding = new PaddingInfo(10, 10, 5, 5, 254F);
-        this.label1.SizeF = new SizeF(1900F, 77.32857F);
-        this.label1.StyleName = "Title";
-        this.label1.StylePriority.UseBackColor = false;
-        this.label1.StylePriority.UseBorderColor = false;
-        this.label1.StylePriority.UseBorders = false;
-        this.label1.StylePriority.UseBorderWidth = false;
-        this.label1.StylePriority.UseFont = false;
-        this.label1.StylePriority.UseForeColor = false;
-        this.label1.StylePriority.UsePadding = false;
-        this.label1.Text = "Signierungszertifikat";
-        //
-        // XrTable3
-        //
-        this.XrTable3.Dpi = 254F;
-        this.XrTable3.LocationFloat = new DevExpress.Utils.PointFloat(0.0002422333F, 96.60422F);
-        this.XrTable3.Name = "XrTable3";
-        this.XrTable3.OddStyleName = "DetailData3_Odd";
-        this.XrTable3.Rows.AddRange(new XRTableRow[] { this.XrTableRow8, this.XrTableRow9, this.XrTableRow10, this.XrTableRow11 });
-        this.XrTable3.SizeF = new SizeF(1900F, 284.4801F);
-        //
-        // XrTableRow8
-        //
-        this.XrTableRow8.Cells.AddRange(new XRTableCell[] { this.XrTableCell13, this.XrTableCell15 });
-        this.XrTableRow8.Dpi = 254F;
-        this.XrTableRow8.Name = "XrTableRow8";
-        this.XrTableRow8.Weight = 1D;
-        //
-        // XrTableCell13
-        //
-        this.XrTableCell13.BackColor = Color.FromArgb(224, 224, 224);
-        this.XrTableCell13.BorderColor = Color.FromArgb(165, 36, 49);
-        this.XrTableCell13.Borders = BorderSide.Bottom;
-        this.XrTableCell13.BorderWidth = 1F;
-        this.XrTableCell13.Dpi = 254F;
-        this.XrTableCell13.ForeColor = Color.Black;
-        this.XrTableCell13.Name = "XrTableCell13";
-        this.XrTableCell13.StyleName = "DetailCaption1";
-        this.XrTableCell13.StylePriority.UseBackColor = false;
-        this.XrTableCell13.StylePriority.UseBorderColor = false;
-        this.XrTableCell13.StylePriority.UseBorders = false;
-        this.XrTableCell13.StylePriority.UseBorderWidth = false;
-        this.XrTableCell13.StylePriority.UseForeColor = false;
-        this.XrTableCell13.Text = "Ersteller";
-        this.XrTableCell13.Weight = 0.38139956730411484D;
-        //
-        // XrTableCell15
-        //
-        this.XrTableCell15.BackColor = Color.FromArgb(224, 224, 224);
-        this.XrTableCell15.BorderColor = Color.FromArgb(165, 36, 49);
-        this.XrTableCell15.Borders = BorderSide.Bottom;
-        this.XrTableCell15.BorderWidth = 1F;
-        this.XrTableCell15.Dpi = 254F;
-        this.XrTableCell15.ForeColor = Color.Black;
-        this.XrTableCell15.Name = "XrTableCell15";
-        this.XrTableCell15.StyleName = "DetailCaption1";
-        this.XrTableCell15.StylePriority.UseBackColor = false;
-        this.XrTableCell15.StylePriority.UseBorderColor = false;
-        this.XrTableCell15.StylePriority.UseBorders = false;
-        this.XrTableCell15.StylePriority.UseBorderWidth = false;
-        this.XrTableCell15.StylePriority.UseForeColor = false;
-        this.XrTableCell15.Text = "Umschlag";
-        this.XrTableCell15.Weight = 0.49859081604996847D;
-        //
-        // XrTableRow9
-        //
-        this.XrTableRow9.Cells.AddRange(new XRTableCell[] { this.XrTableCell14, this.XrTableCell17, this.XrTableCell16, this.XrTableCell18 });
-        this.XrTableRow9.Dpi = 254F;
-        this.XrTableRow9.Name = "XrTableRow9";
-        this.XrTableRow9.Weight = 1D;
-        //
-        // XrTableCell14
-        //
-        this.XrTableCell14.BackColor = Color.White;
-        this.XrTableCell14.BorderColor = Color.Empty;
-        this.XrTableCell14.Borders = BorderSide.None;
-        this.XrTableCell14.Dpi = 254F;
-        this.XrTableCell14.Font = new Font("Arial", 8.25F, FontStyle.Bold, GraphicsUnit.Point, 0);
-        this.XrTableCell14.ForeColor = Color.Black;
-        this.XrTableCell14.Multiline = true;
-        this.XrTableCell14.Name = "XrTableCell14";
-        this.XrTableCell14.StyleName = "DetailCaption1";
-        this.XrTableCell14.StylePriority.UseBackColor = false;
-        this.XrTableCell14.StylePriority.UseBorderColor = false;
-        this.XrTableCell14.StylePriority.UseBorders = false;
-        this.XrTableCell14.StylePriority.UseFont = false;
-        this.XrTableCell14.StylePriority.UseForeColor = false;
-        this.XrTableCell14.Text = "Name";
-        this.XrTableCell14.Weight = 0.11578820509129036D;
-        //
-        // XrTableCell17
-        //
-        this.XrTableCell17.BackColor = Color.White;
-        this.XrTableCell17.BorderColor = Color.Empty;
-        this.XrTableCell17.Borders = BorderSide.None;
-        this.XrTableCell17.Dpi = 254F;
-        this.XrTableCell17.ExpressionBindings.AddRange(new ExpressionBinding[] { new ExpressionBinding("BeforePrint", "Text", "[CreatorFullName]") });
-        this.XrTableCell17.Font = new Font("Arial", 8.25F, FontStyle.Regular, GraphicsUnit.Point, 0);
-        this.XrTableCell17.ForeColor = Color.Black;
-        this.XrTableCell17.Multiline = true;
-        this.XrTableCell17.Name = "XrTableCell17";
-        this.XrTableCell17.StyleName = "DetailCaption1";
-        this.XrTableCell17.StylePriority.UseBackColor = false;
-        this.XrTableCell17.StylePriority.UseBorderColor = false;
-        this.XrTableCell17.StylePriority.UseBorders = false;
-        this.XrTableCell17.StylePriority.UseFont = false;
-        this.XrTableCell17.StylePriority.UseForeColor = false;
-        this.XrTableCell17.Text = "XrTableCell17";
-        this.XrTableCell17.Weight = 0.2656113622128245D;
-        //
-        // XrTableCell16
-        //
-        this.XrTableCell16.BackColor = Color.White;
-        this.XrTableCell16.BorderColor = Color.Empty;
-        this.XrTableCell16.Borders = BorderSide.None;
-        this.XrTableCell16.Dpi = 254F;
-        this.XrTableCell16.Font = new Font("Arial", 8.25F, FontStyle.Bold, GraphicsUnit.Point, 0);
-        this.XrTableCell16.ForeColor = Color.Black;
-        this.XrTableCell16.Multiline = true;
-        this.XrTableCell16.Name = "XrTableCell16";
-        this.XrTableCell16.StyleName = "DetailCaption1";
-        this.XrTableCell16.StylePriority.UseBackColor = false;
-        this.XrTableCell16.StylePriority.UseBorderColor = false;
-        this.XrTableCell16.StylePriority.UseBorders = false;
-        this.XrTableCell16.StylePriority.UseFont = false;
-        this.XrTableCell16.StylePriority.UseForeColor = false;
-        this.XrTableCell16.Text = "Titel";
-        this.XrTableCell16.Weight = 0.11578821158083684D;
-        //
-        // XrTableCell18
-        //
-        this.XrTableCell18.BackColor = Color.White;
-        this.XrTableCell18.BorderColor = Color.Empty;
-        this.XrTableCell18.Borders = BorderSide.None;
-        this.XrTableCell18.Dpi = 254F;
-        this.XrTableCell18.ExpressionBindings.AddRange(new ExpressionBinding[] { new ExpressionBinding("BeforePrint", "Text", "[EnvelopeTitle]") });
-        this.XrTableCell18.Font = new Font("Arial", 8.25F, FontStyle.Regular, GraphicsUnit.Point, 0);
-        this.XrTableCell18.ForeColor = Color.Black;
-        this.XrTableCell18.Multiline = true;
-        this.XrTableCell18.Name = "XrTableCell18";
-        this.XrTableCell18.StyleName = "DetailCaption1";
-        this.XrTableCell18.StylePriority.UseBackColor = false;
-        this.XrTableCell18.StylePriority.UseBorderColor = false;
-        this.XrTableCell18.StylePriority.UseBorders = false;
-        this.XrTableCell18.StylePriority.UseFont = false;
-        this.XrTableCell18.StylePriority.UseForeColor = false;
-        this.XrTableCell18.Text = "XrTableCell18";
-        this.XrTableCell18.Weight = 0.38280260446913167D;
-        //
-        // XrTableRow10
-        //
-        this.XrTableRow10.Cells.AddRange(new XRTableCell[] { this.XrTableCell19, this.XrTableCell20, this.XrTableCell21, this.XrTableCell22 });
-        this.XrTableRow10.Dpi = 254F;
-        this.XrTableRow10.Name = "XrTableRow10";
-        this.XrTableRow10.Weight = 1D;
-        //
-        // XrTableCell19
-        //
-        this.XrTableCell19.BackColor = Color.White;
-        this.XrTableCell19.BorderColor = Color.Empty;
-        this.XrTableCell19.Borders = BorderSide.None;
-        this.XrTableCell19.Dpi = 254F;
-        this.XrTableCell19.Font = new Font("Arial", 8.25F, FontStyle.Bold, GraphicsUnit.Point, 0);
-        this.XrTableCell19.ForeColor = Color.Black;
-        this.XrTableCell19.Multiline = true;
-        this.XrTableCell19.Name = "XrTableCell19";
-        this.XrTableCell19.StyleName = "DetailCaption1";
-        this.XrTableCell19.StylePriority.UseBackColor = false;
-        this.XrTableCell19.StylePriority.UseBorderColor = false;
-        this.XrTableCell19.StylePriority.UseBorders = false;
-        this.XrTableCell19.StylePriority.UseFont = false;
-        this.XrTableCell19.StylePriority.UseForeColor = false;
-        this.XrTableCell19.Text = "EmailAddress";
-        this.XrTableCell19.Weight = 0.11578820509129036D;
-        //
-        // XrTableCell20
-        //
-        this.XrTableCell20.BackColor = Color.White;
-        this.XrTableCell20.BorderColor = Color.Empty;
-        this.XrTableCell20.Borders = BorderSide.None;
-        this.XrTableCell20.Dpi = 254F;
-        this.XrTableCell20.ExpressionBindings.AddRange(new ExpressionBinding[] { new ExpressionBinding("BeforePrint", "Text", "[CreatorEmailAddress]") });
-        this.XrTableCell20.Font = new Font("Arial", 8.25F, FontStyle.Regular, GraphicsUnit.Point, 0);
-        this.XrTableCell20.ForeColor = Color.Black;
-        this.XrTableCell20.Multiline = true;
-        this.XrTableCell20.Name = "XrTableCell20";
-        this.XrTableCell20.StyleName = "DetailCaption1";
-        this.XrTableCell20.StylePriority.UseBackColor = false;
-        this.XrTableCell20.StylePriority.UseBorderColor = false;
-        this.XrTableCell20.StylePriority.UseBorders = false;
-        this.XrTableCell20.StylePriority.UseFont = false;
-        this.XrTableCell20.StylePriority.UseForeColor = false;
-        this.XrTableCell20.Text = "XrTableCell20";
-        this.XrTableCell20.Weight = 0.2656113622128245D;
-        //
-        // XrTableCell21
-        //
-        this.XrTableCell21.BackColor = Color.White;
-        this.XrTableCell21.BorderColor = Color.Empty;
-        this.XrTableCell21.Borders = BorderSide.None;
-        this.XrTableCell21.Dpi = 254F;
-        this.XrTableCell21.Font = new Font("Arial", 8.25F, FontStyle.Bold, GraphicsUnit.Point, 0);
-        this.XrTableCell21.ForeColor = Color.Black;
-        this.XrTableCell21.Multiline = true;
-        this.XrTableCell21.Name = "XrTableCell21";
-        this.XrTableCell21.StyleName = "DetailCaption1";
-        this.XrTableCell21.StylePriority.UseBackColor = false;
-        this.XrTableCell21.StylePriority.UseBorderColor = false;
-        this.XrTableCell21.StylePriority.UseBorders = false;
-        this.XrTableCell21.StylePriority.UseFont = false;
-        this.XrTableCell21.StylePriority.UseForeColor = false;
-        this.XrTableCell21.Text = "Umschlag-ID";
-        this.XrTableCell21.Weight = 0.11578821158083684D;
-        //
-        // XrTableCell22
-        //
-        this.XrTableCell22.BackColor = Color.White;
-        this.XrTableCell22.BorderColor = Color.Empty;
-        this.XrTableCell22.Borders = BorderSide.None;
-        this.XrTableCell22.Dpi = 254F;
-        this.XrTableCell22.ExpressionBindings.AddRange(new ExpressionBinding[] { new ExpressionBinding("BeforePrint", "Text", "[EnvelopeUuid]") });
-        this.XrTableCell22.Font = new Font("Arial", 8.25F, FontStyle.Regular, GraphicsUnit.Point, 0);
-        this.XrTableCell22.ForeColor = Color.Black;
-        this.XrTableCell22.Multiline = true;
-        this.XrTableCell22.Name = "XrTableCell22";
-        this.XrTableCell22.StyleName = "DetailCaption1";
-        this.XrTableCell22.StylePriority.UseBackColor = false;
-        this.XrTableCell22.StylePriority.UseBorderColor = false;
-        this.XrTableCell22.StylePriority.UseBorders = false;
-        this.XrTableCell22.StylePriority.UseFont = false;
-        this.XrTableCell22.StylePriority.UseForeColor = false;
-        this.XrTableCell22.Text = "XrTableCell22";
-        this.XrTableCell22.Weight = 0.38280260446913167D;
-        //
-        // XrTableRow11
-        //
-        this.XrTableRow11.Cells.AddRange(new XRTableCell[] { this.XrTableCell23, this.XrTableCell24, this.XrTableCell25, this.XrTableCell26 });
-        this.XrTableRow11.Dpi = 254F;
-        this.XrTableRow11.Name = "XrTableRow11";
-        this.XrTableRow11.Weight = 1D;
-        //
-        // XrTableCell23
-        //
-        this.XrTableCell23.BackColor = Color.White;
-        this.XrTableCell23.BorderColor = Color.Empty;
-        this.XrTableCell23.Borders = BorderSide.None;
-        this.XrTableCell23.Dpi = 254F;
-        this.XrTableCell23.Font = new Font("Arial", 8.25F, FontStyle.Bold, GraphicsUnit.Point, 0);
-        this.XrTableCell23.ForeColor = Color.Black;
-        this.XrTableCell23.Multiline = true;
-        this.XrTableCell23.Name = "XrTableCell23";
-        this.XrTableCell23.StyleName = "DetailCaption1";
-        this.XrTableCell23.StylePriority.UseBackColor = false;
-        this.XrTableCell23.StylePriority.UseBorderColor = false;
-        this.XrTableCell23.StylePriority.UseBorders = false;
-        this.XrTableCell23.StylePriority.UseFont = false;
-        this.XrTableCell23.StylePriority.UseForeColor = false;
-        this.XrTableCell23.Weight = 0.11578820509129036D;
-        //
-        // XrTableCell24
-        //
-        this.XrTableCell24.BackColor = Color.White;
-        this.XrTableCell24.BorderColor = Color.Empty;
-        this.XrTableCell24.Borders = BorderSide.None;
-        this.XrTableCell24.Dpi = 254F;
-        this.XrTableCell24.Font = new Font("Arial", 8.25F, FontStyle.Regular, GraphicsUnit.Point, 0);
-        this.XrTableCell24.ForeColor = Color.Black;
-        this.XrTableCell24.Multiline = true;
-        this.XrTableCell24.Name = "XrTableCell24";
-        this.XrTableCell24.StyleName = "DetailCaption1";
-        this.XrTableCell24.StylePriority.UseBackColor = false;
-        this.XrTableCell24.StylePriority.UseBorderColor = false;
-        this.XrTableCell24.StylePriority.UseBorders = false;
-        this.XrTableCell24.StylePriority.UseFont = false;
-        this.XrTableCell24.StylePriority.UseForeColor = false;
-        this.XrTableCell24.Weight = 0.2656113622128245D;
-        //
-        // XrTableCell25
-        //
-        this.XrTableCell25.BackColor = Color.White;
-        this.XrTableCell25.BorderColor = Color.Empty;
-        this.XrTableCell25.Borders = BorderSide.None;
-        this.XrTableCell25.Dpi = 254F;
-        this.XrTableCell25.Font = new Font("Arial", 8.25F, FontStyle.Bold, GraphicsUnit.Point, 0);
-        this.XrTableCell25.ForeColor = Color.Black;
-        this.XrTableCell25.Multiline = true;
-        this.XrTableCell25.Name = "XrTableCell25";
-        this.XrTableCell25.StyleName = "DetailCaption1";
-        this.XrTableCell25.StylePriority.UseBackColor = false;
-        this.XrTableCell25.StylePriority.UseBorderColor = false;
-        this.XrTableCell25.StylePriority.UseBorders = false;
-        this.XrTableCell25.StylePriority.UseFont = false;
-        this.XrTableCell25.StylePriority.UseForeColor = false;
-        this.XrTableCell25.Text = "Zertifizierung";
-        this.XrTableCell25.Weight = 0.11578821158083684D;
-        //
-        // XrTableCell26
-        //
-        this.XrTableCell26.BackColor = Color.White;
-        this.XrTableCell26.BorderColor = Color.Empty;
-        this.XrTableCell26.Borders = BorderSide.None;
-        this.XrTableCell26.Dpi = 254F;
-        this.XrTableCell26.ExpressionBindings.AddRange(new ExpressionBinding[] { new ExpressionBinding("BeforePrint", "Text", "[EnvelopeCertificationType]") });
-        this.XrTableCell26.Font = new Font("Arial", 8.25F, FontStyle.Regular, GraphicsUnit.Point, 0);
-        this.XrTableCell26.ForeColor = Color.Black;
-        this.XrTableCell26.Multiline = true;
-        this.XrTableCell26.Name = "XrTableCell26";
-        this.XrTableCell26.StyleName = "DetailCaption1";
-        this.XrTableCell26.StylePriority.UseBackColor = false;
-        this.XrTableCell26.StylePriority.UseBorderColor = false;
-        this.XrTableCell26.StylePriority.UseBorders = false;
-        this.XrTableCell26.StylePriority.UseFont = false;
-        this.XrTableCell26.StylePriority.UseForeColor = false;
-        this.XrTableCell26.Text = "XrTableCell26";
-        this.XrTableCell26.Weight = 0.38280260446913161D;
-        //
-        // GroupHeader1
-        //
-        this.GroupHeader1.Controls.AddRange(new XRControl[] { this.table1 });
-        this.GroupHeader1.Dpi = 254F;
-        this.GroupHeader1.GroupUnion = GroupUnion.WithFirstDetail;
-        this.GroupHeader1.HeightF = 71.12F;
-        this.GroupHeader1.Name = "GroupHeader1";
-        //
-        // table1
-        //
-        this.table1.Dpi = 254F;
-        this.table1.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F);
-        this.table1.Name = "table1";
-        this.table1.Rows.AddRange(new XRTableRow[] { this.tableRow1 });
-        this.table1.SizeF = new SizeF(1900F, 71.12F);
-        //
-        // tableRow1
-        //
-        this.tableRow1.Cells.AddRange(new XRTableCell[] { this.tableCell1, this.tableCell2, this.tableCell3 });
-        this.tableRow1.Dpi = 254F;
-        this.tableRow1.Name = "tableRow1";
-        this.tableRow1.Weight = 1D;
-        //
-        // tableCell1
-        //
-        this.tableCell1.BackColor = Color.FromArgb(224, 224, 224);
-        this.tableCell1.BorderColor = Color.FromArgb(165, 36, 49);
-        this.tableCell1.Borders = BorderSide.Bottom;
-        this.tableCell1.BorderWidth = 1F;
-        this.tableCell1.Dpi = 254F;
-        this.tableCell1.ForeColor = Color.Black;
-        this.tableCell1.Name = "tableCell1";
-        this.tableCell1.StyleName = "DetailCaption1";
-        this.tableCell1.StylePriority.UseBackColor = false;
-        this.tableCell1.StylePriority.UseBorderColor = false;
-        this.tableCell1.StylePriority.UseBorders = false;
-        this.tableCell1.StylePriority.UseBorderWidth = false;
-        this.tableCell1.StylePriority.UseForeColor = false;
-        this.tableCell1.Text = "Ereignis";
-        this.tableCell1.Weight = 0.51726482588176181D;
-        //
-        // tableCell2
-        //
-        this.tableCell2.BackColor = Color.FromArgb(224, 224, 224);
-        this.tableCell2.BorderColor = Color.FromArgb(165, 36, 49);
-        this.tableCell2.Borders = BorderSide.Bottom;
-        this.tableCell2.BorderWidth = 1F;
-        this.tableCell2.Dpi = 254F;
-        this.tableCell2.ForeColor = Color.Black;
-        this.tableCell2.Name = "tableCell2";
-        this.tableCell2.StyleName = "DetailCaption1";
-        this.tableCell2.StylePriority.UseBackColor = false;
-        this.tableCell2.StylePriority.UseBorderColor = false;
-        this.tableCell2.StylePriority.UseBorders = false;
-        this.tableCell2.StylePriority.UseBorderWidth = false;
-        this.tableCell2.StylePriority.UseForeColor = false;
-        this.tableCell2.Text = "Benutzer";
-        this.tableCell2.Weight = 0.45140669898958585D;
-        //
-        // tableCell3
-        //
-        this.tableCell3.BackColor = Color.FromArgb(224, 224, 224);
-        this.tableCell3.BorderColor = Color.FromArgb(165, 36, 49);
-        this.tableCell3.Borders = BorderSide.Bottom;
-        this.tableCell3.BorderWidth = 1F;
-        this.tableCell3.Dpi = 254F;
-        this.tableCell3.ForeColor = Color.Black;
-        this.tableCell3.Name = "tableCell3";
-        this.tableCell3.StyleName = "DetailCaption1";
-        this.tableCell3.StylePriority.UseBackColor = false;
-        this.tableCell3.StylePriority.UseBorderColor = false;
-        this.tableCell3.StylePriority.UseBorders = false;
-        this.tableCell3.StylePriority.UseBorderWidth = false;
-        this.tableCell3.StylePriority.UseForeColor = false;
-        this.tableCell3.Text = "Zeitstempel";
-        this.tableCell3.Weight = 0.22479583469004233D;
-        //
-        // Detail
-        //
-        this.Detail.Controls.AddRange(new XRControl[] { this.table2 });
-        this.Detail.Dpi = 254F;
-        this.Detail.HeightF = 86.174F;
-        this.Detail.HierarchyPrintOptions.Indent = 50.8F;
-        this.Detail.Name = "Detail";
-        //
-        // table2
-        //
-        this.table2.Dpi = 254F;
-        this.table2.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F);
-        this.table2.Name = "table2";
-        this.table2.Rows.AddRange(new XRTableRow[] { this.tableRow2 });
-        this.table2.SizeF = new SizeF(1900F, 63.42F);
-        //
-        // tableRow2
-        //
-        this.tableRow2.Cells.AddRange(new XRTableCell[] { this.tableCell4, this.tableCell5, this.tableCell6 });
-        this.tableRow2.Dpi = 254F;
-        this.tableRow2.Name = "tableRow2";
-        this.tableRow2.Weight = 11.683999633789062D;
-        //
-        // tableCell4
-        //
-        this.tableCell4.Borders = BorderSide.None;
-        this.tableCell4.Dpi = 254F;
-        this.tableCell4.ExpressionBindings.AddRange(new ExpressionBinding[] { new ExpressionBinding("BeforePrint", "Text", "[ItemStatusTranslated]") });
-        this.tableCell4.Name = "tableCell4";
-        this.tableCell4.StyleName = "DetailData1";
-        this.tableCell4.StylePriority.UseBorders = false;
-        this.tableCell4.Weight = 0.51726482142156094D;
-        //
-        // tableCell5
-        //
-        this.tableCell5.Dpi = 254F;
-        this.tableCell5.ExpressionBindings.AddRange(new ExpressionBinding[] { new ExpressionBinding("BeforePrint", "Text", "[ItemUserReference]") });
-        this.tableCell5.Name = "tableCell5";
-        this.tableCell5.StyleName = "DetailData1";
-        this.tableCell5.Weight = 0.45140669932916544D;
-        //
-        // tableCell6
-        //
-        this.tableCell6.Dpi = 254F;
-        this.tableCell6.ExpressionBindings.AddRange(new ExpressionBinding[] { new ExpressionBinding("BeforePrint", "Text", "[ItemDate]") });
-        this.tableCell6.Name = "tableCell6";
-        this.tableCell6.StyleName = "DetailData1";
-        this.tableCell6.StylePriority.UseTextAlignment = false;
-        this.tableCell6.TextAlignment = TextAlignment.MiddleRight;
-        this.tableCell6.Weight = 0.22479581593269077D;
-        //
-        // Title
-        //
-        this.Title.BackColor = Color.Transparent;
-        this.Title.BorderColor = Color.Black;
-        this.Title.Borders = BorderSide.None;
-        this.Title.BorderWidth = 1F;
-        this.Title.Font = new Font("Arial", 14.25F);
-        this.Title.ForeColor = Color.FromArgb(75, 75, 75);
-        this.Title.Name = "Title";
-        this.Title.Padding = new PaddingInfo(15, 15, 0, 0, 254F);
-        //
-        // DetailCaption1
-        //
-        this.DetailCaption1.BackColor = Color.FromArgb(75, 75, 75);
-        this.DetailCaption1.BorderColor = Color.White;
-        this.DetailCaption1.Borders = BorderSide.Left;
-        this.DetailCaption1.BorderWidth = 2F;
-        this.DetailCaption1.Font = new Font("Arial", 8.25F, FontStyle.Bold);
-        this.DetailCaption1.ForeColor = Color.White;
-        this.DetailCaption1.Name = "DetailCaption1";
-        this.DetailCaption1.Padding = new PaddingInfo(15, 15, 0, 0, 254F);
-        this.DetailCaption1.TextAlignment = TextAlignment.MiddleLeft;
-        //
-        // DetailData1
-        //
-        this.DetailData1.BorderColor = Color.Transparent;
-        this.DetailData1.Borders = BorderSide.Left;
-        this.DetailData1.BorderWidth = 2F;
-        this.DetailData1.Font = new Font("Arial", 8.25F);
-        this.DetailData1.ForeColor = Color.Black;
-        this.DetailData1.Name = "DetailData1";
-        this.DetailData1.Padding = new PaddingInfo(15, 15, 0, 0, 254F);
-        this.DetailData1.TextAlignment = TextAlignment.MiddleLeft;
-        //
-        // DetailData3_Odd
-        //
-        this.DetailData3_Odd.BackColor = Color.FromArgb(231, 231, 231);
-        this.DetailData3_Odd.BorderColor = Color.Transparent;
-        this.DetailData3_Odd.Borders = BorderSide.None;
-        this.DetailData3_Odd.BorderWidth = 1F;
-        this.DetailData3_Odd.Font = new Font("Arial", 8.25F);
-        this.DetailData3_Odd.ForeColor = Color.Black;
-        this.DetailData3_Odd.Name = "DetailData3_Odd";
-        this.DetailData3_Odd.Padding = new PaddingInfo(15, 15, 0, 0, 254F);
-        this.DetailData3_Odd.TextAlignment = TextAlignment.MiddleLeft;
-        //
-        // PageInfo
-        //
-        this.PageInfo.Font = new Font("Arial", 8.25F, FontStyle.Bold);
-        this.PageInfo.ForeColor = Color.FromArgb(75, 75, 75);
-        this.PageInfo.Name = "PageInfo";
-        this.PageInfo.Padding = new PaddingInfo(15, 15, 0, 0, 254F);
-        //
-        // ObjectDataSource1
-        //
-        this.ObjectDataSource1.DataMember = "Items";
-        this.ObjectDataSource1.Name = "ObjectDataSource1";
-        //
-        // rptEnvelopeHistory
-        //
-        this.Bands.AddRange(new Band[] { this.TopMargin, this.BottomMargin, this.ReportHeader, this.GroupHeader1, this.Detail });
-        this.ComponentStorage.AddRange(new IComponent[] { this.ObjectDataSource1 });
-        this.DataSource = this.ObjectDataSource1;
-        this.Dpi = 254F;
-        this.Font = new Font("Arial", 9.75F);
-        this.Margins = new Margins(100, 100, 191, 100);
-        this.PageHeight = 2970;
-        this.PageWidth = 2100;
-        this.PaperKind = (DevExpress.Drawing.Printing.DXPaperKind)System.Drawing.Printing.PaperKind.A4;
-        this.ReportUnit = ReportUnit.TenthsOfAMillimeter;
-        this.SnapGridSize = 25F;
-        this.StyleSheet.AddRange(new XRControlStyle[] { this.Title, this.DetailCaption1, this.DetailData1, this.DetailData3_Odd, this.PageInfo });
-        this.Version = "24.2";
-        this.Watermark.ImageSource = new DevExpress.XtraPrinting.Drawing.ImageSource("img", resources.GetString("rptEnvelopeHistory.Watermark.ImageSource"));
-        this.Watermark.ImageTransparency = 220;
-        ((ISupportInitialize)this.XrTable3).EndInit();
-        ((ISupportInitialize)this.table1).EndInit();
-        ((ISupportInitialize)this.table2).EndInit();
-        ((ISupportInitialize)this.ObjectDataSource1).EndInit();
-        ((ISupportInitialize)this).EndInit();
-    }
-
-    #endregion
-
-    private TopMarginBand TopMargin;
-    private BottomMarginBand BottomMargin;
-    private XRPageInfo pageInfo1;
-    private XRPageInfo pageInfo2;
-    private ReportHeaderBand ReportHeader;
-    private XRLabel label1;
-    private GroupHeaderBand GroupHeader1;
-    private XRTable table1;
-    private XRTableRow tableRow1;
-    private XRTableCell tableCell1;
-    private XRTableCell tableCell2;
-    private XRTableCell tableCell3;
-    private DetailBand Detail;
-    private XRTable table2;
-    private XRTableRow tableRow2;
-    private XRTableCell tableCell4;
-    private XRTableCell tableCell5;
-    private XRTableCell tableCell6;
-    private ObjectDataSource ObjectDataSource1;
-    private XRControlStyle Title;
-    private XRControlStyle DetailCaption1;
-    private XRControlStyle DetailData1;
-    private XRControlStyle DetailData3_Odd;
-    private XRControlStyle PageInfo;
-    private XRLabel XrLabel1;
-    private XRTable XrTable3;
-    private XRTableRow XrTableRow8;
-    private XRTableCell XrTableCell13;
-    private XRTableCell XrTableCell15;
-    private XRTableRow XrTableRow9;
-    private XRTableCell XrTableCell14;
-    private XRTableCell XrTableCell17;
-    private XRTableCell XrTableCell16;
-    private XRTableCell XrTableCell18;
-    private XRTableRow XrTableRow10;
-    private XRTableCell XrTableCell19;
-    private XRTableCell XrTableCell20;
-    private XRTableCell XrTableCell21;
-    private XRTableCell XrTableCell22;
-    private XRTableRow XrTableRow11;
-    private XRTableCell XrTableCell23;
-    private XRTableCell XrTableCell24;
-    private XRTableCell XrTableCell25;
-    private XRTableCell XrTableCell26;
-}

EnvelopeGenerator.ServiceHost/Jobs/FinalizeDocument/rptEnvelopeHistory.cs

@@ -1,9 +0,0 @@
-namespace EnvelopeGenerator.ServiceHost.Jobs.FinalizeDocument;
-
-public partial class rptEnvelopeHistory
-{
-    public rptEnvelopeHistory()
-    {
-        InitializeComponent();
-    }
-}

EnvelopeGenerator.ServiceHost/Jobs/FinalizeDocumentJob.cs

@@ -1,154 +0,0 @@
-using DigitalData.Core.Abstraction.Application.Repository;
-using EnvelopeGenerator.Application.Common.Dto;
-using EnvelopeGenerator.Application.Configuration.Queries;
-using EnvelopeGenerator.Application.Envelopes.Queries;
-using EnvelopeGenerator.Domain.Constants;
-using EnvelopeGenerator.Domain.Entities;
-using EnvelopeGenerator.ServiceHost.Exceptions;
-using EnvelopeGenerator.ServiceHost.Extensions;
-using EnvelopeGenerator.ServiceHost.Jobs.FinalizeDocument;
-using GdPicture14;
-using MediatR;
-using Microsoft.EntityFrameworkCore;
-using Microsoft.Extensions.Options;
-using System.Data;
-
-namespace EnvelopeGenerator.ServiceHost.Jobs;
-
-[Obsolete("ActionService is a placeholder service added by copilot. Migrate the actual logic from CommonServices.Jobs")]
-public class FinalizeDocumentJob(IOptions<WorkerOptions> options, ILogger<FinalizeDocumentJob> logger, TempFiles tempFiles, ActionService actionService, PDFBurner pdfBurner, PDFMerger pdfMerger, ReportCreator reportCreator, GdViewer? _gdViewer, LicenseManager licenseManager, IMediator mediator, IRepository<Envelope> envRepo, IRepository<Domain.Entities.DocumentStatus> docStatusRepo)
-{
-    private readonly WorkerOptions _options = options.Value;
-
-    private ConfigDto? _config;
-    
-    private const int CompleteWaitTime = 1;
-    private string _parentFolderUid = string.Empty;
-
-    private sealed class EnvelopeData
-    {
-        public int EnvelopeId { get; set; }
-        public string EnvelopeUuid { get; set; } = string.Empty;
-        public string DocumentPath { get; set; } = string.Empty;
-        public List<string> AnnotationData { get; set; } = new();
-        public byte[]? DocAsByte { get; set; }
-    }
-
-    public bool RethrowOnError { get; set; } = true;
-
-    public async Task ExecuteAsync(IEnumerable<EnvelopeDto> envelopes, CancellationToken cancel = default)
-    {
-        tempFiles.Create();
-        var jobId = typeof(FinalizeDocumentJob).FullName;
-
-        _config = await mediator.Send(new ReadDefaultConfigQuery(), cancel);
-
-        foreach (var envelope in envelopes)
-        {
-            try
-            {
-                await Finalize(envelope, cancel);
-            }
-            catch (Exception ex)
-            {
-                logger.LogWarning(ex, "An unexpected exception was ignored while processing the envelope with ID [{id}].", envelope.Id);
-
-                if(RethrowOnError)
-                    throw;
-            }
-        }
-    }
-
-    public Task ExecuteAsync(EnvelopeDto envelope, CancellationToken cancel = default) => ExecuteAsync([envelope], cancel);
-
-    public async Task ExecuteAsync(CancellationToken cancel = default)
-    {
-        var envelopes = await mediator.Send(new ReadEnvelopeQuery()
-        {
-            Status = new () { Include = [EnvelopeStatus.EnvelopeCompletelySigned] },
-            MinMinutesSinceLastChange = CompleteWaitTime,
-        }, cancel);
-
-        await ExecuteAsync(envelopes, cancel);
-    }
-
-    private async Task Finalize(EnvelopeDto envelope, CancellationToken cancel)
-    {
-        var annotations = await docStatusRepo.Where(s => s.EnvelopeId == envelope.Id).Select(s => s.Value).ToListAsync(cancel);
-        var burnedDocument = pdfBurner!.BurnAnnotsToPDF(envelope.Documents?.FirstOrDefault()?.ByteData!, annotations, envelope.Id)
-            ?? throw new ApplicationException("Document could not be finalized");
-
-        actionService.CreateReport(envelope, cancel);
-
-        var report = await reportCreator!.CreateReportAsync(envelope, cancel);
-
-        var mergedDocument = pdfMerger!.MergeDocuments(burnedDocument, report);
-
-        var outputDirectoryPath = Path.Combine(_config!.ExportPath, _parentFolderUid);
-
-        if (!Directory.Exists(outputDirectoryPath))
-            Directory.CreateDirectory(outputDirectoryPath);
-
-        var outputFilePath = Path.Combine(outputDirectoryPath, $"{envelope.Uuid}.pdf");
-
-        try
-        {
-            File.WriteAllBytes(outputFilePath, mergedDocument);
-        }
-        catch (Exception ex)
-        {
-            throw new ExportDocumentException("Could not export final document to disk. Envelope Id is " + envelope.Id, ex);
-        }
-
-        var outputFile = await File.ReadAllBytesAsync(outputFilePath, cancel);
-        await envRepo.UpdateAsync(e => e.DocResult = outputFile, e => e.Id == envelope.Id, cancel);
-
-        SendFinalEmails(envelope);
-
-        actionService.FinalizeEnvelope(envelope, cancel);
-    }
-
-    private bool SendFinalEmails(EnvelopeDto envelope)
-    {
-        var mailToCreator = (FinalEmailType)(envelope.FinalEmailToCreator ?? 0);
-        var mailToReceivers = (FinalEmailType)(envelope.FinalEmailToReceivers ?? 0);
-
-        if (mailToCreator != FinalEmailType.No)
-            SendFinalEmailToCreator(envelope, mailToCreator);
-        else
-            logger?.LogWarning("No SendFinalEmailToCreator - oMailToCreator [{mailToCreator}] <> [{noFinalEmailType}] ", mailToCreator, FinalEmailType.No);
-
-        if (mailToReceivers != FinalEmailType.No)
-        {
-            SendFinalEmailToReceivers(envelope, mailToReceivers);
-        }
-        else
-        {
-            logger?.LogWarning("No SendFinalEmailToReceivers - oMailToCreator [{mailToReceivers}] <> [{noFinalEmailType}] ", mailToReceivers, FinalEmailType.No);
-        }
-
-        return true;
-    }
-
-    private bool SendFinalEmailToCreator(EnvelopeDto envelope, FinalEmailType mailToCreator)
-    {
-        if (actionService.CompleteEnvelope(envelope) == false)
-        {
-            logger?.LogError(new Exception("CompleteEnvelope failed"), "Envelope could not be completed for receiver [{email}]", envelope.User?.Email);
-            return false;
-        }
-
-        return true;
-    }
-
-    private bool SendFinalEmailToReceivers(EnvelopeDto envelope, FinalEmailType mailToReceivers)
-    {
-        foreach (var receiver in envelope.EnvelopeReceivers ?? [])
-        {
-            if (!actionService.CompleteEnvelope(envelope, receiver.Receiver!))
-                return false;
-        }
-
-        return true;
-    }
-}

EnvelopeGenerator.ServiceHost/Jobs/Infrastructure/Database.cs

@@ -1,60 +0,0 @@
-using System.Data;
-using Microsoft.Data.SqlClient;
-
-namespace EnvelopeGenerator.ServiceHost.Jobs.Infrastructure;
-
-public class MSSQLServer(IConfiguration configuration)
-{
-    private readonly string _connectionString = configuration.GetConnectionString("Default") 
-        ?? throw new InvalidOperationException("Connection string 'Default' not found.");
-
-    public static string DecryptConnectionString(string connectionString) => connectionString;
-
-    public SqlConnection GetConnection
-    {
-        get
-        {
-            var connection = new SqlConnection(_connectionString);
-            if (connection.State != ConnectionState.Open)
-            {
-                connection.Open();
-            }
-
-            return connection;
-        }
-    }
-
-    public DataTable GetDatatable(string sql)
-    {
-        using var connection = new SqlConnection(_connectionString);
-        using var command = new SqlCommand(sql, connection);
-        using var adapter = new SqlDataAdapter(command);
-        var table = new DataTable();
-        adapter.Fill(table);
-        return table;
-    }
-
-    public object? GetScalarValue(string sql)
-    {
-        using var connection = new SqlConnection(_connectionString);
-        using var command = new SqlCommand(sql, connection);
-        connection.Open();
-        return command.ExecuteScalar();
-    }
-
-    public bool ExecuteNonQuery(string sql)
-    {
-        using var connection = new SqlConnection(_connectionString);
-        using var command = new SqlCommand(sql, connection);
-        connection.Open();
-        return command.ExecuteNonQuery() > 0;
-    }
-
-    public bool ExecuteNonQuery(SqlCommand command)
-    {
-        using var connection = new SqlConnection(_connectionString);
-        command.Connection = connection;
-        connection.Open();
-        return command.ExecuteNonQuery() > 0;
-    }
-}

EnvelopeGenerator.ServiceHost/Jobs/JobStateManager.cs

@@ -1,19 +0,0 @@
-using AngleSharp.Common;
-using System.Collections.Concurrent;
-
-namespace EnvelopeGenerator.ServiceHost.Jobs;
-
-public class JobStateManager(Dictionary<string, State>? initialState = null)
-{
-    private readonly ConcurrentDictionary<Type, State> _states = new();
-
-    public State GetState<TJob>() => _states.GetOrAdd(typeof(TJob), type => initialState?.GetOrDefault(type.Name, State.Stopped) ?? State.Stopped);
-
-    public State SetState<TJob>(State state) => _states[typeof(TJob)] = state;
-}
-
-public enum State
-{
-    Running,
-    Stopped
-}

EnvelopeGenerator.ServiceHost/Jobs/LicenseManagerFactory.cs

@@ -1,39 +0,0 @@
-using EnvelopeGenerator.Application.ThirdPartyModules.Queries;
-using GdPicture14;
-using MediatR;
-using Microsoft.Extensions.Caching.Memory;
-
-namespace EnvelopeGenerator.ServiceHost.Jobs;
-
-public class LicenseManagerFactory
-{
-    private static readonly string _cacheKey = Guid.NewGuid().ToString();
-    private readonly IServiceScopeFactory scopeFactory;
-    private readonly IMemoryCache cache;
-
-    public LicenseManagerFactory(IServiceScopeFactory scopeFactory, IMemoryCache cache)
-    {
-        this.scopeFactory = scopeFactory;
-        this.cache = cache;
-        _ = CreateAsync(); // Preload the license key into the cache
-    }
-
-    public async Task<LicenseManager> CreateAsync(CancellationToken cancellationToken = default)
-    {
-        var key = await GetLicenseKeyAsync(cancellationToken);
-        var licenseManager = new LicenseManager();
-        licenseManager.RegisterKEY(key);
-        return licenseManager;
-    }
-
-    public async Task<string> GetLicenseKeyAsync(CancellationToken cancellationToken = default)
-    {
-        return await cache.GetOrCreateAsync(_cacheKey, async entry =>
-        {
-            entry.Priority = CacheItemPriority.NeverRemove;
-            using var scope = scopeFactory.CreateScope();
-            var mediator = scope.ServiceProvider.GetRequiredService<IMediator>();
-            return await mediator.Send(new ReadThirdPartyModuleLicenseQuery { Name = "GdPicture", Active =true }, cancellationToken);
-        }) ?? throw new InvalidOperationException("License key could not be retrieved.");
-    }
-}

EnvelopeGenerator.ServiceHost/Jobs/TempFiles.cs

@@ -1,84 +0,0 @@
-using EnvelopeGenerator.ServiceHost.Extensions;
-
-namespace EnvelopeGenerator.ServiceHost.Jobs;
-
-[Obsolete("Use memory cache instead of temp files.")]
-public class TempFiles
-{
-
-    [Obsolete("Use memory cache instead of temp files.")]
-    public string TempPath { get; }
-
-    private readonly ILogger<TempFiles> _logger;
-
-
-    [Obsolete("Use memory cache instead of temp files.")]
-    public TempFiles(ILogger<TempFiles> logger)
-    {
-        _logger = logger;
-        var tempDirectoryPath = Path.GetTempPath();
-        TempPath = Path.Combine(tempDirectoryPath, "EnvelopeGenerator");
-    }
-
-
-    [Obsolete("Use memory cache instead of temp files.")]
-    public bool Create()
-    {
-        try
-        {
-            if (!Directory.Exists(TempPath))
-            {
-                Directory.CreateDirectory(TempPath);
-            }
-            else
-            {
-                CleanUpFiles();
-            }
-
-            return true;
-        }
-        catch (Exception ex)
-        {
-            _logger.LogError(ex);
-            return false;
-        }
-    }
-
-
-    [Obsolete("Use memory cache instead of temp files.")]
-    private bool CleanUpFiles()
-    {
-        try
-        {
-            foreach (var fileItem in Directory.GetFiles(TempPath))
-            {
-                _logger.LogDebug("Deleting tempPath-file: {fileItem} ...", fileItem);
-                File.Delete(fileItem);
-            }
-
-            return true;
-        }
-        catch (Exception ex)
-        {
-            _logger.LogError(ex);
-            return false;
-        }
-    }
-
-
-    [Obsolete("Use memory cache instead of temp files.")]
-    public bool CleanUp()
-    {
-        try
-        {
-            _logger.LogDebug("Deleting tempPath-Data: {TempPath} ...", TempPath);
-            Directory.Delete(TempPath, true);
-            return true;
-        }
-        catch (Exception ex)
-        {
-            _logger.LogError(ex);
-            return false;
-        }
-    }
-}

EnvelopeGenerator.ServiceHost/Jobs/WorkerOptions.cs

@@ -1,37 +0,0 @@
-namespace EnvelopeGenerator.ServiceHost.Jobs;
-
-public class WorkerOptions
-{
-    private int _delayMilliseconds = 1000;
-
-    public int DelayMilliseconds
-    {
-        get => _delayMilliseconds;
-        set
-        {
-            if (value < 1)
-                throw new ArgumentOutOfRangeException(nameof(value), "Delay must be at least 1 millisecond.");
-
-            _delayMilliseconds = value;
-        }
-    }
-
-    public Dictionary<string, State> InitialJobState { get; set; } = [];
-
-    public PDFBurnerOptions PdfBurner { get; set; } = new();
-
-    public record PDFBurnerOptions
-    {
-        public List<string> IgnoredLabels { get; set; } = ["Date", "Datum", "ZIP", "PLZ", "Place", "Ort", "Position", "Stellung"];
-
-        public double TopMargin { get; set; } = 0.1;
-
-        public double YOffset { get; set; } = -0.3;
-
-        public string FontName { get; set; } = "Arial";
-
-        public int FontSize { get; set; } = 8;
-
-        public FontStyle FontStyle { get; set; } = FontStyle.Italic;
-    }
-}

EnvelopeGenerator.ServiceHost/Middleware/ExceptionHandlingMiddleware.cs

@@ -1,75 +0,0 @@
-namespace EnvelopeGenerator.ServiceHost.Middleware;
-
-using DigitalData.Core.Exceptions;
-using Microsoft.AspNetCore.Http;
-using Microsoft.Extensions.Logging;
-using System.Net;
-using System.Text.Json;
-
-/// <summary>
-/// Middleware for handling exceptions globally in the application.
-/// Captures exceptions thrown during the request pipeline execution,
-/// logs them, and returns an appropriate HTTP response with a JSON error message.
-/// </summary>
-/// <remarks>
-/// Initializes a new instance of the <see cref="ExceptionHandlingMiddleware"/> class.
-/// </remarks>
-/// <param name="next">The next middleware in the request pipeline.</param>
-/// <param name="logger">The logger instance for logging exceptions.</param>
-public class ExceptionHandlingMiddleware(RequestDelegate next, ILogger<ExceptionHandlingMiddleware> logger)
-{
-    /// <summary>
-    /// Invokes the middleware to handle the HTTP request.
-    /// </summary>
-    /// <param name="context">The HTTP context of the current request.</param>
-    /// <returns>A task that represents the asynchronous operation.</returns>
-    public async Task InvokeAsync(HttpContext context)
-    {
-        try
-        {
-            await next(context); // Continue down the pipeline
-        }
-        catch (Exception ex)
-        {
-            await HandleExceptionAsync(context, ex, logger);
-        }
-    }
-
-    /// <summary>
-    /// Handles exceptions by logging them and writing an appropriate JSON response.
-    /// </summary>
-    /// <param name="context">The HTTP context of the current request.</param>
-    /// <param name="exception">The exception that occurred.</param>
-    /// <param name="logger">The logger instance for logging the exception.</param>
-    /// <returns>A task that represents the asynchronous operation.</returns>
-    private static async Task HandleExceptionAsync(HttpContext context, Exception exception, ILogger logger)
-    {
-        context.Response.ContentType = "application/json";
-
-        string message;
-
-        switch (exception)
-        {
-            case BadRequestException badRequestEx:
-                context.Response.StatusCode = (int)HttpStatusCode.BadRequest;
-                message = badRequestEx.Message;
-                break;
-
-            case NotFoundException notFoundEx:
-                context.Response.StatusCode = (int)HttpStatusCode.NotFound;
-                message = notFoundEx.Message;
-                break;
-
-            default:
-                logger.LogError(exception, "Unhandled exception occurred.");
-                context.Response.StatusCode = (int)HttpStatusCode.InternalServerError;
-                message = "An unexpected error occurred.";
-                break;
-        }
-
-        await context.Response.WriteAsync(JsonSerializer.Serialize(new
-        {
-            message
-        }));
-    }
-}

EnvelopeGenerator.ServiceHost/Program.cs

@@ -1,96 +0,0 @@
-using DigitalData.UserManager.DependencyInjection;
-using EnvelopeGenerator.Application;
-using EnvelopeGenerator.Infrastructure;
-using EnvelopeGenerator.ServiceHost;
-using EnvelopeGenerator.ServiceHost.Extensions;
-using EnvelopeGenerator.ServiceHost.Middleware;
-using Microsoft.AspNetCore.Localization;
-using Microsoft.EntityFrameworkCore;
-using System.Globalization;
-
-var builder = WebApplication.CreateBuilder(args);
-
-#region Kestrel & Windows Service Configuration
-if (builder.Configuration.GetValue<bool>("UseWindowsService"))
-{
-    builder.Host.UseWindowsService();
-}
-
-if (builder.Configuration.GetValue<bool>("UseCustomKestrelEndpoints"))
-{
-    builder.WebHost.ConfigureKestrel((context, serverOptions) =>
-    {
-        var serverConfigSection = context.Configuration.GetSection("ServerConfig");
-        serverOptions.Configure(serverConfigSection);
-    });
-}
-#endregion
-
-var config = builder.Configuration;
-var connStr = config.GetConnectionString("Default") ??
-    throw new InvalidOperationException("Connection string 'Default' is missing in the configuration.");
-
-#region Service configuration
-builder.Services.AddControllers();
-builder.Services.AddHostedService<Worker>();
-builder.Services.AddDistributedSqlServerCache(options =>
-{
-    options.ConnectionString = connStr;
-    options.SchemaName = "dbo";
-    options.TableName = "TBDD_CACHE";
-});
-#pragma warning disable CS0618 
-builder.Services.AddFinalizeDocumentJob(config);
-builder.Services.AddEnvelopeGeneratorInfrastructureServices(
-    opt =>
-    {
-        opt.AddDbTriggerParams(config);
-        opt.AddDbContext((provider, options) =>
-        {
-            var logger = provider.GetRequiredService<ILogger<EGDbContext>>();
-            options.UseSqlServer(connStr)
-                    .LogTo(log => logger.LogInformation("{log}", log), Microsoft.Extensions.Logging.LogLevel.Trace)
-                    .EnableSensitiveDataLogging()
-                    .EnableDetailedErrors();
-        });
-    });
-builder.Services.AddEnvelopeGeneratorServices(config);
-builder.Services.AddMemoryCache();
-builder.Services.AddUserManager<EGDbContext>();
-#pragma warning restore CS0618
-builder.Services.AddLocalization();
-#endregion
-
-builder.Services.AddEndpointsApiExplorer();
-builder.Services.AddSwaggerGen();
-
-var app = builder.Build();
-
-app.UseMiddleware<ExceptionHandlingMiddleware>();
-
-// Configure the HTTP request pipeline.
-if (app.Environment.IsDevelopment())
-{
-    app.UseSwagger();
-    app.UseSwaggerUI();
-}
-
-#region Localizer
-var supportedCultureNames = config.GetSection("SupportedCultures").Get<string[]>() ?? ["de-DE", "en-US"];
-var supportedCultures = supportedCultureNames.Select(cName => new CultureInfo(cName)).ToList();
-var requestLocalizationOptions = new RequestLocalizationOptions
-{
-    SupportedCultures = supportedCultures,
-    SupportedUICultures = supportedCultures
-};
-requestLocalizationOptions.RequestCultureProviders.Add(new QueryStringRequestCultureProvider());
-app.UseRequestLocalization(requestLocalizationOptions);
-#endregion
-
-app.UseHttpsRedirection();
-
-app.UseAuthorization();
-
-app.MapControllers();
-
-app.Run();

EnvelopeGenerator.ServiceHost/Properties/launchSettings.json

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

EnvelopeGenerator.ServiceHost/Worker.cs

@@ -1,40 +0,0 @@
-using EnvelopeGenerator.ServiceHost.Jobs;
-using Microsoft.Extensions.Options;
-
-namespace EnvelopeGenerator.ServiceHost;
-
-public class Worker : BackgroundService
-{
-    private readonly ILogger<Worker> _logger;
-    private readonly WorkerOptions _options;
-    private readonly JobStateManager _jobStateManager;
-    private readonly IServiceScopeFactory _scopeFactory;
-
-    public Worker(ILogger<Worker> logger, IOptions<WorkerOptions> options, JobStateManager jobStateManager, IServiceScopeFactory scopeFactory)
-    {
-        _logger = logger;
-        _options = options.Value;
-        _jobStateManager = jobStateManager;
-        _scopeFactory = scopeFactory;
-    }
-
-    protected override async Task ExecuteAsync(CancellationToken stoppingToken)
-    {
-        while (!stoppingToken.IsCancellationRequested)
-        {
-            if (_logger.IsEnabled(LogLevel.Information))
-            {
-                _logger.LogInformation("Worker running at: {time}", DateTimeOffset.Now);
-            }
-
-            if (_jobStateManager.GetState<FinalizeDocumentJob>() == State.Running)
-            {
-                using var scope = _scopeFactory.CreateScope();
-                var finalizeDocumentJob = scope.ServiceProvider.GetRequiredService<FinalizeDocumentJob>();
-                await finalizeDocumentJob.ExecuteAsync(stoppingToken);
-            }
-
-            await Task.Delay(_options.DelayMilliseconds, stoppingToken);
-        }
-    }
-}

EnvelopeGenerator.ServiceHost/appsettings.Development.json

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

EnvelopeGenerator.ServiceHost/appsettings.json

@@ -1,29 +0,0 @@
-{
-  "Logging": {
-    "LogLevel": {
-      "Default": "Information",
-      "Microsoft.AspNetCore": "Warning"
-    }
-  },
-  "Worker": {
-    "DelayMilliseconds": 1000,
-    // InitialJobState: State values are 0 = Running, 1 = Stopped. Defaults to 1 (Stopped) if not specified.
-    "InitialJobState": {
-      "FinalizeDocumentJob": 0
-    }
-  },
-  "AllowedHosts": "*",
-  "SupportedCultures": [ "de-DE", "en-US" ],
-  "ConnectionStrings": {
-    "Default": "Server=SDD-VMP04-SQL17\\DD_DEVELOP01;Database=DD_ECM;User Id=sa;Password=dd;Encrypt=false;TrustServerCertificate=True;"
-  },
-  "UseWindowsService": false,
-  "UseCustomKestrelEndpoints": false,
-  "ServerConfig": {
-    "Endpoints": {
-      "Http": {
-        "Url": "http://localhost:1111"
-      }
-    }
-  }
-}

EnvelopeGenerator.Tests/Application/Fake.cs

@@ -193,17 +193,13 @@ public static class Extensions
     #endregion
 
     #region Envelope
-    public static CreateEnvelopeCommand CreateEnvelopeCommand(this Faker fake, int userId)
+    public static CreateEnvelopeCommand CreateEnvelopeCommand(this Faker fake, int userId) => new()
     {
-        var cmd = new CreateEnvelopeCommand
+        Message = fake.Lorem.Paragraph(fake.Random.Number(2, 5)),
-        {
+        Title = fake.Lorem.Words(fake.Random.Number(3, 4)).Join(" "),
-            Message = fake.Lorem.Paragraph(fake.Random.Number(2, 5)),
+        UserId = userId,
-            Title = fake.Lorem.Words(fake.Random.Number(3, 4)).Join(" "),
+        UseSQLExecutor = false
-            UseSQLExecutor = false
+    };
-        };
-        cmd.Authorize(userId);
-        return cmd;
-    }
 
     public static List<CreateEnvelopeCommand> CreateEnvelopeCommands(this Faker fake, params int[] userIDs)
         => Enumerable.Range(0, userIDs.Length)

EnvelopeGenerator.Tests/Application/MediatorExtensionsTests.cs

@@ -1,308 +0,0 @@
-using DigitalData.Core.Exceptions;
-using EnvelopeGenerator.Application.Common.Extensions;
-using MediatR;
-
-namespace EnvelopeGenerator.Tests.Application;
-
-[TestFixture]
-public class MediatorExtensionsTests
-{
-    #region Stub infrastructure
-
-    private sealed class StubRequest<TResponse> : IRequest<TResponse?> { }
-
-    /// <summary>
-    /// Minimal <see cref="ISender"/> stub that returns a pre-configured response for any <see cref="ISender.Send{TResponse}"/> call.
-    /// </summary>
-    private sealed class StubSender : ISender
-    {
-        private readonly object? _response;
-
-        public StubSender(object? response) => _response = response;
-
-        public Task<TResponse> Send<TResponse>(IRequest<TResponse> request, CancellationToken cancellationToken = default)
-        {
-            cancellationToken.ThrowIfCancellationRequested();
-            return Task.FromResult((TResponse)_response!);
-        }
-
-        public Task Send<TRequest>(TRequest request, CancellationToken cancellationToken = default) where TRequest : IRequest
-        {
-            cancellationToken.ThrowIfCancellationRequested();
-            return Task.CompletedTask;
-        }
-
-        public Task<object?> Send(object request, CancellationToken cancellationToken = default)
-        {
-            cancellationToken.ThrowIfCancellationRequested();
-            return Task.FromResult(_response);
-        }
-
-        public IAsyncEnumerable<TResponse> CreateStream<TResponse>(IStreamRequest<TResponse> request, CancellationToken cancellationToken = default)
-            => throw new NotImplementedException();
-
-        public IAsyncEnumerable<object?> CreateStream(object request, CancellationToken cancellationToken = default)
-            => throw new NotImplementedException();
-    }
-
-    private static ISender CreateSender<T>(T? response) => new StubSender(response);
-
-    #endregion
-
-    #region Throw — non-null scalar
-
-    [Test]
-    public async Task Throw_WithNonNullResponse_ReturnsResponse()
-    {
-        var sender = CreateSender<string>("hello");
-        var request = new StubRequest<string?>();
-
-        var result = await sender.GetOr(request).Throw(() => new InvalidOperationException());
-
-        Assert.That(result, Is.EqualTo("hello"));
-    }
-
-    #endregion
-
-    #region Throw — null response
-
-    [Test]
-    public void Throw_WithNullResponse_ThrowsCustomException()
-    {
-        var sender = CreateSender<string>(null);
-        var request = new StubRequest<string?>();
-
-        var ex = Assert.ThrowsAsync<InvalidOperationException>(
-            () => sender.GetOr(request).Throw(() => new InvalidOperationException("custom")));
-
-        Assert.That(ex!.Message, Is.EqualTo("custom"));
-    }
-
-    #endregion
-
-    #region Throw — empty collection
-
-    [Test]
-    public void Throw_WithEmptyList_ThrowsCustomException()
-    {
-        var sender = CreateSender<List<string>>(new List<string>());
-        var request = new StubRequest<List<string>?>();
-
-        Assert.ThrowsAsync<ArgumentException>(
-            () => sender.GetOr(request).Throw(() => new ArgumentException("empty")));
-    }
-
-    #endregion
-
-    #region Throw — non-empty collection
-
-    [Test]
-    public async Task Throw_WithNonEmptyList_ReturnsResponse()
-    {
-        var expected = new List<int> { 1, 2 };
-        var sender = CreateSender<List<int>>(expected);
-        var request = new StubRequest<List<int>?>();
-
-        var result = await sender.GetOr(request).Throw(() => new InvalidOperationException());
-
-        Assert.That(result, Is.EqualTo(expected));
-    }
-
-    #endregion
-
-    #region Throw — string edge case (string implements IEnumerable)
-
-    [Test]
-    public async Task Throw_WithEmptyString_ReturnsEmptyString()
-    {
-        var sender = CreateSender<string>("");
-        var request = new StubRequest<string?>();
-
-        var result = await sender.GetOr(request).Throw(() => new InvalidOperationException("should not throw"));
-
-        Assert.That(result, Is.EqualTo(""));
-    }
-
-    #endregion
-
-    #region ThrowNotFound — non-null scalar
-
-    [Test]
-    public async Task ThrowNotFound_WithNonNullResponse_ReturnsResponse()
-    {
-        var sender = CreateSender<string>("hello");
-        var request = new StubRequest<string?>();
-
-        var result = await sender.GetOr(request).ThrowNotFound();
-
-        Assert.That(result, Is.EqualTo("hello"));
-    }
-
-    [Test]
-    public async Task ThrowNotFound_WithExceptionMessage_AndNonNullResponse_ReturnsResponse()
-    {
-        var sender = CreateSender<int>(42);
-        var request = new StubRequest<int?>();
-
-        var result = await sender.GetOr(request).ThrowNotFound("not found");
-
-        Assert.That(result, Is.EqualTo(42));
-    }
-
-    #endregion
-
-    #region ThrowNotFound — null response
-
-    [Test]
-    public void ThrowNotFound_WithNullResponse_ThrowsNotFoundException()
-    {
-        var sender = CreateSender<string>(null);
-        var request = new StubRequest<string?>();
-
-        Assert.ThrowsAsync<NotFoundException>(() => sender.GetOr(request).ThrowNotFound());
-    }
-
-    [Test]
-    public void ThrowNotFound_WithNullResponse_AndCustomMessage_ContainsMessage()
-    {
-        const string message = "Entity not found";
-        var sender = CreateSender<string>(null);
-        var request = new StubRequest<string?>();
-
-        var ex = Assert.ThrowsAsync<NotFoundException>(
-            () => sender.GetOr(request).ThrowNotFound(message));
-
-        Assert.That(ex!.Message, Does.Contain(message));
-    }
-
-    [Test]
-    public void ThrowNotFound_WithNullResponse_HasDefaultMessageWithTypeName()
-    {
-        var sender = CreateSender<string>(null);
-        var request = new StubRequest<string?>();
-
-        var ex = Assert.ThrowsAsync<NotFoundException>(() => sender.GetOr(request).ThrowNotFound());
-
-        Assert.That(ex!.Message, Does.Contain(nameof(String)));
-    }
-
-    #endregion
-
-    #region ThrowNotFound — empty collection
-
-    [Test]
-    public void ThrowNotFound_WithEmptyList_ThrowsNotFoundException()
-    {
-        var sender = CreateSender<List<string>>(new List<string>());
-        var request = new StubRequest<List<string>?>();
-
-        Assert.ThrowsAsync<NotFoundException>(() => sender.GetOr(request).ThrowNotFound());
-    }
-
-    [Test]
-    public void ThrowNotFound_WithEmptyArray_ThrowsNotFoundException()
-    {
-        var sender = CreateSender<int[]>(Array.Empty<int>());
-        var request = new StubRequest<int[]?>();
-
-        Assert.ThrowsAsync<NotFoundException>(() => sender.GetOr(request).ThrowNotFound());
-    }
-
-    [Test]
-    public void ThrowNotFound_WithEmptyCollection_AndCustomMessage_ContainsMessage()
-    {
-        const string message = "No items found";
-        var sender = CreateSender<List<int>>(new List<int>());
-        var request = new StubRequest<List<int>?>();
-
-        var ex = Assert.ThrowsAsync<NotFoundException>(
-            () => sender.GetOr(request).ThrowNotFound(message));
-
-        Assert.That(ex!.Message, Does.Contain(message));
-    }
-
-    #endregion
-
-    #region ThrowNotFound — non-empty collection
-
-    [Test]
-    public async Task ThrowNotFound_WithNonEmptyList_ReturnsResponse()
-    {
-        var expected = new List<string> { "a", "b" };
-        var sender = CreateSender<List<string>>(expected);
-        var request = new StubRequest<List<string>?>();
-
-        var result = await sender.GetOr(request).ThrowNotFound();
-
-        Assert.That(result, Is.EqualTo(expected));
-    }
-
-    [Test]
-    public async Task ThrowNotFound_WithNonEmptyArray_ReturnsResponse()
-    {
-        var expected = new[] { 1, 2, 3 };
-        var sender = CreateSender<int[]>(expected);
-        var request = new StubRequest<int[]?>();
-
-        var result = await sender.GetOr(request).ThrowNotFound();
-
-        Assert.That(result, Is.EqualTo(expected));
-    }
-
-    #endregion
-
-    #region ThrowInvalidOperation — null response
-
-    [Test]
-    public void ThrowInvalidOperation_WithNullResponse_ThrowsInvalidOperationException()
-    {
-        var sender = CreateSender<string>(null);
-        var request = new StubRequest<string?>();
-
-        Assert.ThrowsAsync<InvalidOperationException>(
-            () => sender.GetOr(request).ThrowInvalidOperation());
-    }
-
-    [Test]
-    public void ThrowInvalidOperation_WithNullResponse_AndCustomMessage_ContainsMessage()
-    {
-        const string message = "Something went wrong";
-        var sender = CreateSender<string>(null);
-        var request = new StubRequest<string?>();
-
-        var ex = Assert.ThrowsAsync<InvalidOperationException>(
-            () => sender.GetOr(request).ThrowInvalidOperation(message));
-
-        Assert.That(ex!.Message, Does.Contain(message));
-    }
-
-    #endregion
-
-    #region CancellationToken
-
-    [Test]
-    public void Throw_WithCancelledToken_ThrowsOperationCanceledException()
-    {
-        var sender = CreateSender<string>("value");
-        var request = new StubRequest<string?>();
-        var cts = new CancellationTokenSource();
-        cts.Cancel();
-
-        Assert.ThrowsAsync<OperationCanceledException>(
-            () => sender.GetOr(request, cts.Token).Throw(() => new InvalidOperationException()));
-    }
-
-    [Test]
-    public void ThrowNotFound_WithCancelledToken_ThrowsOperationCanceledException()
-    {
-        var sender = CreateSender<string>("value");
-        var request = new StubRequest<string?>();
-        var cts = new CancellationTokenSource();
-        cts.Cancel();
-
-        Assert.ThrowsAsync<OperationCanceledException>(
-            () => sender.GetOr(request, cts.Token).ThrowNotFound());
-    }
-
-    #endregion
-}

EnvelopeGenerator.Tests/Domain/ConstantsTests.cs

@@ -0,0 +1,17 @@
+using EnvelopeGenerator.Domain.Constants;
+using NUnit.Framework;
+
+namespace EnvelopeGenerator.Tests.Domain;
+
+public class ConstantsTests
+{
+    [TestCase(EnvelopeSigningType.ReadAndSign, EnvelopeSigningType.ReadAndSign)]
+    [TestCase(EnvelopeSigningType.WetSignature, EnvelopeSigningType.WetSignature)]
+    [TestCase((EnvelopeSigningType)5, EnvelopeSigningType.WetSignature)]
+    public void Normalize_ReturnsExpectedValue(EnvelopeSigningType input, EnvelopeSigningType expected)
+    {
+        var normalized = input.Normalize();
+
+        Assert.That(normalized, Is.EqualTo(expected));
+    }
+}

EnvelopeGenerator.Tests/EnvelopeGenerator.Tests.csproj

@@ -53,8 +53,4 @@
     </None>
   </ItemGroup>
 
-  <ItemGroup>
-    <Folder Include="Domain\" />
-  </ItemGroup>
-
 </Project>

EnvelopeGenerator.Web/Controllers/EnvelopeController.cs

@@ -91,7 +91,7 @@ public class EnvelopeController : ViewControllerBase
             if (await _historyService.IsSigned(envelopeId: er.Envelope!.Id, userReference: er.Receiver!.EmailAddress))
             {
                 await HttpContext.SignOutAsync(CookieAuthenticationDefaults.AuthenticationScheme);
-                return View("EnvelopeSigned", er);
+                return View("EnvelopeSigned");
             }
             #endregion
 

EnvelopeGenerator.Web/Controllers/Test/TestEnvelopeController.cs

@@ -1,32 +1,56 @@
-using Microsoft.AspNetCore.Mvc;
+using EnvelopeGenerator.Domain.Entities;
+using Microsoft.AspNetCore.Mvc;
+using EnvelopeGenerator.Application.Common.Dto;
 using EnvelopeGenerator.Application.Common.Extensions;
-using MediatR;
+using EnvelopeGenerator.Application.Common.Interfaces.Services;
-using EnvelopeGenerator.Application.Envelopes.Queries;
 
 namespace EnvelopeGenerator.Web.Controllers.Test;
 
 [Obsolete("Use MediatR")]
-public class TestEnvelopeController : ControllerBase
+public class TestEnvelopeController : TestControllerBase<IEnvelopeService, EnvelopeDto, Envelope, int>
 {
-    private readonly IMediator _mediator;
+    public TestEnvelopeController(ILogger<TestEnvelopeController> logger, IEnvelopeService service) : base(logger, service)
-
-    /// <summary>
-    /// 
-    /// </summary>
-    /// <param name="mediator"></param>
-    public TestEnvelopeController(IMediator mediator)
     {
-        _mediator = mediator;
     }
 
+    [NonAction]
+    public override Task<IActionResult> GetAll() => base.GetAll();
+
     [HttpGet]
-    public async Task<IActionResult> GetAll([FromQuery] ReadEnvelopeQuery query, CancellationToken cancel) => Ok(await _mediator.Send(query, cancel));
+    public async Task<IActionResult> GetAll([FromQuery] string? envelopeKey = default, [FromQuery] bool withDocuments = false, [FromQuery] bool withHistory = false, [FromQuery] bool withDocumentReceiverElement = false, [FromQuery] bool withUser = false, [FromQuery] bool withAll = true)
+    {
+        if (envelopeKey is not null)
+        {
+            (var uuid, var signature) = envelopeKey.DecodeEnvelopeReceiverId();
+            if (uuid is null)
+                return BadRequest("UUID is null");
+            var envlopeServiceResult = await _service.ReadByUuidAsync(
+                uuid: uuid,
+                withDocuments: withDocuments, withHistory: withHistory, withDocumentReceiverElement: withDocumentReceiverElement, withUser: withUser, withAll: withAll);
+
+            if (envlopeServiceResult.IsSuccess)
+            {
+                return Ok(envlopeServiceResult.Data);
+            }
+            return NotFound();
+        }
+
+        var result = await _service.ReadAllWithAsync(documents: withDocuments, history: withHistory);
+        if (result.IsSuccess)
+        {
+            return Ok(result);
+        }
+        return NotFound(result);
+    }
 
     [HttpGet("decode")]
-    public IActionResult DecodeEnvelopeReceiverId(string envelopeReceiverId, int type = 0) => type switch
+    public IActionResult DecodeEnvelopeReceiverId(string envelopeReceiverId, int type = 0)
     {
-        1 => Ok(envelopeReceiverId.GetEnvelopeUuid()),
+        return type switch
-        2 => Ok(envelopeReceiverId.GetReceiverSignature()),
+        {
-        _ => Ok(envelopeReceiverId.DecodeEnvelopeReceiverId()),
+            1 => Ok(envelopeReceiverId.GetEnvelopeUuid()),
-    };
+            2 => Ok(envelopeReceiverId.GetReceiverSignature()),
+            _ => Ok(envelopeReceiverId.DecodeEnvelopeReceiverId()),
+        };
+    }
 }

EnvelopeGenerator.Web/EnvelopeGenerator.Web.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
 	<PropertyGroup>
-		<TargetFrameworks>net8.0;net9.0</TargetFrameworks>
+		<TargetFrameworks>net7.0;net8.0;net9.0</TargetFrameworks>
 		<Nullable>enable</Nullable>
 		<ImplicitUsings>enable</ImplicitUsings>
 		<PackageId>EnvelopeGenerator.Web</PackageId>
@@ -12,9 +12,9 @@
 		<PackageTags>digital data envelope generator web</PackageTags>
 		<Description>EnvelopeGenerator.Web is an ASP.NET MVC application developed to manage signing processes. It uses Entity Framework Core (EF Core) for database operations. The user interface for signing processes is developed with Razor View Engine (.cshtml files) and JavaScript under wwwroot, integrated with PSPDFKit. This integration allows users to view and sign documents seamlessly.</Description>
 		<ApplicationIcon>Assets\icon.ico</ApplicationIcon>
-		<Version>3.12.0</Version>						<!-- NuGet package version -->
+		<Version>3.10.0</Version>						<!-- NuGet package version -->
-		<AssemblyVersion>3.12.0.0</AssemblyVersion>		<!-- Assembly version for API compatibility -->
+		<AssemblyVersion>3.10.0.0</AssemblyVersion>		<!-- Assembly version for API compatibility -->
-		<FileVersion>3.12.0.0</FileVersion>				<!-- Windows file version -->
+		<FileVersion>3.10.0.0</FileVersion>				<!-- Windows file version -->
 		<Copyright>Copyright © 2025 Digital Data GmbH. All rights reserved.</Copyright>
 	</PropertyGroup>
 
@@ -2093,14 +2093,39 @@
 		<None Include="wwwroot\lib\bootstrap-icons\icons\zoom-out.svg" />
 	</ItemGroup>
 
+	<ItemGroup Condition="'$(TargetFramework)' == 'net7.0'">
+		<PackageReference Include="BuildBundlerMinifier2022" Version="2.9.9" />
+		<PackageReference Include="DigitalData.Core.API" Version="2.2.1" />
+		<PackageReference Include="DigitalData.Core.Exceptions" Version="1.1.0" />
+		<PackageReference Include="DigitalData.EmailProfilerDispatcher" Version="3.1.1" />
+		<PackageReference Include="HtmlSanitizer" Version="9.0.892" />
+		<PackageReference Include="Microsoft.AspNetCore.OpenApi" Version="7.0.4" />
+		<PackageReference Include="Microsoft.Extensions.Caching.SqlServer" Version="7.0.20" />
+		<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
+		<PackageReference Include="NLog" Version="5.2.5" />
+		<PackageReference Include="NLog.Web.AspNetCore" Version="5.3.0" />
+		<PackageReference Include="Quartz" Version="3.8.0" />
+		<PackageReference Include="Quartz.AspNetCore" Version="3.8.0" />
+		<PackageReference Include="Quartz.Plugins" Version="3.8.0" />
+		<PackageReference Include="Quartz.Serialization.Json" Version="3.8.0" />
+		<PackageReference Include="Swashbuckle.AspNetCore" Version="6.4.0" />
+		<PackageReference Include="System.Configuration.ConfigurationManager" Version="8.0.1" />
+		<PackageReference Include="System.Diagnostics.PerformanceCounter" Version="7.0.0" />
+		<PackageReference Include="System.DirectoryServices" Version="7.0.1" />
+		<PackageReference Include="System.DirectoryServices.AccountManagement" Version="7.0.1" />
+		<PackageReference Include="System.DirectoryServices.Protocols" Version="7.0.1" />
+		<PackageReference Include="System.Drawing.Common" Version="7.0.0" />
+		<PackageReference Include="System.Security.Cryptography.Cng" Version="5.0.0" />
+	</ItemGroup>
+
 	<ItemGroup Condition="'$(TargetFramework)' == 'net8.0'">
 		<PackageReference Include="BuildBundlerMinifier2022" Version="2.9.9" />
 		<PackageReference Include="DigitalData.Core.API" Version="2.2.1" />
 		<PackageReference Include="DigitalData.Core.Exceptions" Version="1.1.0" />
 		<PackageReference Include="DigitalData.EmailProfilerDispatcher" Version="3.1.1" />
 		<PackageReference Include="HtmlSanitizer" Version="9.0.892" />
-		<PackageReference Include="Microsoft.AspNetCore.OpenApi" Version="8.0.17" />
+		<PackageReference Include="Microsoft.AspNetCore.OpenApi" Version="7.0.4" />
-		<PackageReference Include="Microsoft.Extensions.Caching.SqlServer" Version="8.0.17" />
+		<PackageReference Include="Microsoft.Extensions.Caching.SqlServer" Version="7.0.20" />
 		<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
 		<PackageReference Include="NLog" Version="5.2.5" />
 		<PackageReference Include="NLog.Web.AspNetCore" Version="5.3.0" />
@@ -2124,8 +2149,8 @@
 		<PackageReference Include="DigitalData.Core.Exceptions" Version="1.1.0" />
 		<PackageReference Include="DigitalData.EmailProfilerDispatcher" Version="3.1.1" />
 		<PackageReference Include="HtmlSanitizer" Version="9.0.892" />
-		<PackageReference Include="Microsoft.AspNetCore.OpenApi" Version="9.0.6" />
+		<PackageReference Include="Microsoft.AspNetCore.OpenApi" Version="7.0.4" />
-		<PackageReference Include="Microsoft.Extensions.Caching.SqlServer" Version="9.0.6" />
+		<PackageReference Include="Microsoft.Extensions.Caching.SqlServer" Version="7.0.20" />
 		<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
 		<PackageReference Include="NLog" Version="5.2.5" />
 		<PackageReference Include="NLog.Web.AspNetCore" Version="5.3.0" />

EnvelopeGenerator.Web/Views/Envelope/EnvelopeRejected.cshtml

@@ -9,14 +9,12 @@
 @using EnvelopeGenerator.Web.Extensions
 @using Newtonsoft.Json
 @using Newtonsoft.Json.Serialization
-@using EnvelopeGenerator.Domain.Interfaces;
 @model EnvelopeReceiverDto;
 @{
 	var envelope = Model.Envelope;
 	var document = Model.Envelope?.Documents?.FirstOrDefault();
 	var sender = Model.Envelope?.User;
 	var isExt = ViewBag.IsExt ?? false;
-	bool IsReadAndConfirm = Model!.Envelope!.IsReadAndConfirm();
 }
 <div class="page container p-5">
     <header class="text-center">
@@ -56,11 +54,7 @@
 				c-5.791,5.79-15.176,5.79-20.969,0l-30.32-30.322l-11.676,11.676l30.32,30.32c5.79,5.79,5.79,15.178,0,20.969L299.11,404.045z"/>
 			</svg>
         </div>
-		<h1>@(isExt
+		<h1>@(isExt ? _localizer.RejectionInfo1Ext() : _localizer.RejectionInfo1())</h1>
-			? _localizer.RejectionInfo1Ext()
-			: IsReadAndConfirm
-				? _localizer.RejectionInfo1ForConfirmation()
-				: _localizer.RejectionInfo1())</h1>
     </header>
     <section class="text-center">
 		<div class="card-body p-0 m-0 ms-4">

EnvelopeGenerator.Web/Views/Envelope/EnvelopeSigned.cshtml

@@ -1,11 +1,5 @@
 @{
-    @using EnvelopeGenerator.Application.Common.Dto.EnvelopeReceiver;
+    ViewData["Title"] = _localizer.DocSigned();
-    @using EnvelopeGenerator.Domain.Interfaces;
-    @model EnvelopeReceiverDto;
-    bool IsReadAndConfirm = Model!.Envelope!.IsReadAndConfirm();
-    ViewData["Title"] = IsReadAndConfirm
-        ? _localizer.DocConfirmed()
-        : _localizer.DocSigned();
 }
 <div class="page container p-5">
     <header class="text-center">
@@ -15,13 +9,9 @@
                 <path d="M15.354 3.354a.5.5 0 0 0-.708-.708L8 9.293 5.354 6.646a.5.5 0 1 0-.708.708l3 3a.5.5 0 0 0 .708 0l7-7z" />
             </svg>
         </div>
-        <h1>@(IsReadAndConfirm
+        <h1>@_localizer["DocumentSuccessfullySigned"]</h1>
-            ? _localizer["DocumentSuccessfullyConfirmed"]
-            : _localizer["DocumentSuccessfullySigned"])</h1>
     </header>
     <section class="text-center">
-        <p>@(IsReadAndConfirm
+        <p>@_localizer["DocumentSignedConfirmationMessage"]</p>
-            ? _localizer["DocumentConfirmedConfirmationMessage"]
-            : _localizer["DocumentSignedConfirmationMessage"])</p>
     </section>   
 </div>

EnvelopeGenerator.Web/Views/Envelope/ShowEnvelope.cshtml

@@ -9,7 +9,6 @@
 @using EnvelopeGenerator.Web.Extensions
 @using Newtonsoft.Json
 @using Newtonsoft.Json.Serialization
-@using EnvelopeGenerator.Domain.Interfaces
 @model EnvelopeReceiverDto;
 @{
     var userCulture = ViewData["UserCulture"] as Culture;
@@ -25,13 +24,7 @@
     if (ViewData["IsReadOnly"] is bool isReadOnly_bool)
         isReadOnly = isReadOnly_bool;
 
-    var isReadAndConfirm = envelope.IsReadAndConfirm();
+    ViewData["Title"] = isReadOnly ? _localizer.ViewDoc() : _localizer.SignDoc();
-
-    ViewData["Title"] = isReadOnly
-        ? _localizer.ViewDoc()
-        : isReadAndConfirm
-            ? _localizer.ConfirmDoc()
-            : _localizer.SignDoc();
 }
 <div class="envelope-view">
     @if (!isReadOnly)
@@ -69,9 +62,7 @@
                 <div class="progress-container">
                     <div id="signed-count-bar" class="progress"></div>
                     <span class="progress-text">
-                        <span id="signed-count">0</span>/<span id="signature-count">@signatureCount</span> @(isReadAndConfirm 
+                        <span id="signed-count">0</span>/<span id="signature-count">@signatureCount</span> @_localizer["Signatures"]
-                            ? _localizer["Confirmations"] 
-                            : _localizer["Signatures"])
                     </span>
                 </div>
                 }

EnvelopeGenerator.Web/appsettings.Mail.json

@@ -8,6 +8,7 @@
   "MailParams": {
     "Placeholders": {
       "[NAME_PORTAL]": "signFlow",
+      "[SIGNATURE_TYPE]": "signieren",
       "[REASON]": ""
     }
   }

EnvelopeGenerator.Web/wwwroot/js/annotation.js

@@ -275,7 +275,7 @@ async function createAnnotationFrameBlob(receiverName, receiverSignature, timest
 
     ctx.fillStyle = 'black'
     ctx.font = `${fontSize * scale}px sans-serif`
-    ctx.fillText((READ_AND_CONFIRM ? localized.confirmedBy : localized.signedBy) ?? 'Signed by', 15 * scale, 10 * scale)
+    ctx.fillText(localized.signedBy ?? 'Signed by', 15 * scale, 10 * scale)
     ctx.fillText(receiverName, 15 * scale, 60 * scale)
     ctx.fillText(signatureString, 15 * scale, 70 * scale)
 

EnvelopeGenerator.Web/wwwroot/js/app.js

@@ -255,7 +255,7 @@ class App {
 
         return Swal.fire({
             title: localized.confirmation,
-            html: `<div class="text-start fs-6 p-0 m-0">${READ_AND_CONFIRM ? localized.confirmAgree : localized.sigAgree}</div>`,
+            html: `<div class="text-start fs-6 p-0 m-0">${localized.sigAgree}</div>`,
             icon: "question",
             showCancelButton: true,
             confirmButtonColor: "#3085d6",

EnvelopeGenerator.Web/wwwroot/js/app.min.js

@@ -1,3 +1,3 @@
 const formatLocalized=(n,...t)=>typeof n=="string"?n.replace(/\{(\d+)\}/g,(n,i)=>t[i]??""):"";class App{constructor(n,t,i,r,u,f){this.container=f??`#${this.constructor.name.toLowerCase()}`;this.envelopeKey=n;this.pdfKit=null;this.currentDocument=t.envelope.documents[0];this.currentReceiver=t.receiver;this.signatureCount=t.envelope.documents[0].elements.length;this.envelopeReceiver=t;this.documentBytes=i;this.licenseKey=r;this.locale=u}async init(){if(this.pdfKit=await loadPSPDFKit(this.documentBytes,this.container,this.licenseKey,this.locale),addToolbarItems(this.pdfKit,this.handleClick.bind(this)),this.pdfKit.addEventListener("annotations.load",this.handleAnnotationsLoad.bind(this)),this.pdfKit.addEventListener("annotations.change",this.handleAnnotationsChange.bind(this)),this.pdfKit.addEventListener("annotations.create",this.handleAnnotationsCreate.bind(this)),this.pdfKit.addEventListener("annotations.willChange",()=>{Comp.ActPanel.Toggle()}),!READ_AND_CONFIRM)try{let n=await createAnnotations(this.currentDocument,this.envelopeReceiver.envelopeId,this.envelopeReceiver.receiverId);await this.pdfKit.create(n)}catch(n){console.error("Error loading annotations:",n)}READ_AND_CONFIRM||[...document.getElementsByClassName("btn_refresh")].forEach(n=>n.addEventListener("click",()=>this.handleClick("RESET")));[...document.getElementsByClassName("btn_complete")].forEach(n=>n.addEventListener("click",()=>this.handleClick("FINISH")));[...document.getElementsByClassName("btn_reject")].forEach(n=>n.addEventListener("click",()=>this.handleClick("REJECT")))}handleAnnotationsLoad(n){n.toJS()}handleAnnotationsChange(){}async handleAnnotationsCreate(n){const t=n.toJS()[0],i=!!t.formFieldName,r=!!t.isSignature;if(i===!1&&r===!0){const r=t.boundingBox.left-20,u=t.boundingBox.top-20,n=150,i=75,f=new Date,e=await createAnnotationFrameBlob(this.envelopeReceiver.name,this.currentReceiver.signature,f,n,i),o=await fetch(e),s=await o.blob(),h=await this.pdfKit.createAttachment(s),c=createImageAnnotation(new PSPDFKit.Geometry.Rect({left:r,top:u,width:n,height:i}),t.pageIndex,h,generateId(this.envelopeReceiver.envelopeId,this.envelopeReceiver.receiverId,this.fakeElementId--,"signed"));this.pdfKit.create(c)}}async handleClick(n){let t=!1;switch(n){case"RESET":t=await this.handleReset(null);Comp.SignatureProgress.SignedCount=0;t.isConfirmed&&Swal.fire({title:localized.success,text:localized.documentReset,icon:"info"});break;case"FINISH":t=await this.handleFinish(null);t==!0&&(window.location.href=`/Envelope/${this.envelopeKey}`);break;case"REJECT":Swal.fire({title:localized.rejection,html:`<div class="text-start fs-6 p-0 m-0">${localized.rejectionReasonQ}</div>`,icon:"question",input:"text",inputAttributes:{autocapitalize:"off"},showCancelButton:!0,confirmButtonColor:"#3085d6",cancelButtonColor:"#d33",confirmButtonText:localized.complete,cancelButtonText:localized.back,showLoaderOnConfirm:!0,preConfirm:async n=>{try{return await rejectEnvelope(n)}catch(t){Swal.showValidationMessage(`
                           Request failed: ${t}
-                        `)}},allowOutsideClick:()=>!Swal.isLoading()}).then(n=>{if(n.isConfirmed){const t=n.value;t.ok?reload():Swal.showValidationMessage(`Request failed: ${t.message}`)}});break;case"COPY_URL":const n=window.location.href.replace(/\/readonly/gi,"");navigator.clipboard.writeText(n).then(function(){bsNotify(localized.copyLinkSuccess,{alert_type:"success",delay:4,icon_name:"check_circle"})}).catch(function(){bsNotify(localized.copyLinkFailure??localized.unexpectedErrorTitle,{alert_type:"danger",delay:4,icon_name:"error"})});break;case"SHARE":Comp.ShareBackdrop.show();break;case"LOGOUT":await logout()}}async handleFinish(){let n=undefined;if(READ_AND_CONFIRM){const n=JSON.parse(sessionStorage.getItem("pspdf_all_pages_rendered")||"false")===!0;if(!n){const n=JSON.parse(sessionStorage.getItem("pspdf_unviewed_pages")||"[]"),t=n.length?formatLocalized(localized.viewRemainingPages,n.join(", ")):localized.viewAllPages;return await Swal.fire({title:localized.warning,text:t,icon:"warning"}),!1}}else{const i=await this.pdfKit.exportInstantJSON(),r=i.formFieldValues,u=r.filter(n=>isFieldRequired(n)),f=u.some(n=>n.value===undefined||n.value===null||n.value==="");if(f)return Swal.fire({title:localized.warning,text:localized.locationFieldsRequired,icon:"warning"}),!1;const e=new RegExp("^[a-zA-Z\\u0080-\\u024F]+(?:([\\ \\-\\']|(\\.\\ ))[a-zA-Z\\u0080-\\u024F]+)*$"),o=r.filter(n=>isCityField(n));for(var t of o)if(!IS_MOBILE_DEVICE&&!e.test(t.value))return Swal.fire({title:localized.warning,text:formatLocalized(localized.cityFormatInvalid,t.value),icon:"warning"}),!1;const s=await this.validateAnnotations(this.signatureCount);if(s===!1)return Swal.fire({title:localized.warning,text:localized.missingSignatures,icon:"warning"}),!1;n={instant:i,structured:mapSignature(i)}}return Swal.fire({title:localized.confirmation,html:`<div class="text-start fs-6 p-0 m-0">${READ_AND_CONFIRM?localized.confirmAgree:localized.sigAgree}</div>`,icon:"question",showCancelButton:!0,confirmButtonColor:"#3085d6",cancelButtonColor:"#d33",confirmButtonText:localized.finalize,cancelButtonText:localized.back}).then(async t=>{if(t.isConfirmed){try{await this.pdfKit.save()}catch(i){return Swal.fire({title:localized.warning,text:localized.envelopeSignError,icon:"error"}),!1}try{const t=READ_AND_CONFIRM?await signEnvelope():await signEnvelope(n);if(t.ok)return!0;if(t.status===409)return Swal.fire({title:localized.warning,text:localized.envelopeUnavailable,icon:"warning"}),!1;if(t.status===423)Swal.fire({title:localized.info??localized.warning,text:localized.envelopeRejectedRedirect,icon:"info",timer:2e3,showConfirmButton:!1}).then(()=>{location.reload()});else throw new Error;}catch(i){return Swal.fire({title:localized.warning,text:localized.envelopeSignError,icon:"error"}),!1}}else return!1})}async validateAnnotations(n){const t=await getAnnotations(this.pdfKit),i=t.map(n=>n.toJS()).filter(n=>n.isSignature);return n<=i.length}async handleReset(){const n=Swal.fire({title:localized.resetConfirmTitle,text:localized.resetConfirmText,icon:"question",showCancelButton:!0});if(n.isConfirmed){const n=await deleteAnnotations(this.pdfKit)}return n}fakeElementId=0;}
+                        `)}},allowOutsideClick:()=>!Swal.isLoading()}).then(n=>{if(n.isConfirmed){const t=n.value;t.ok?reload():Swal.showValidationMessage(`Request failed: ${t.message}`)}});break;case"COPY_URL":const n=window.location.href.replace(/\/readonly/gi,"");navigator.clipboard.writeText(n).then(function(){bsNotify(localized.copyLinkSuccess,{alert_type:"success",delay:4,icon_name:"check_circle"})}).catch(function(){bsNotify(localized.copyLinkFailure??localized.unexpectedErrorTitle,{alert_type:"danger",delay:4,icon_name:"error"})});break;case"SHARE":Comp.ShareBackdrop.show();break;case"LOGOUT":await logout()}}async handleFinish(){let n=undefined;if(READ_AND_CONFIRM){const n=JSON.parse(sessionStorage.getItem("pspdf_all_pages_rendered")||"false")===!0;if(!n){const n=JSON.parse(sessionStorage.getItem("pspdf_unviewed_pages")||"[]"),t=n.length?formatLocalized(localized.viewRemainingPages,n.join(", ")):localized.viewAllPages;return await Swal.fire({title:localized.warning,text:t,icon:"warning"}),!1}}else{const i=await this.pdfKit.exportInstantJSON(),r=i.formFieldValues,u=r.filter(n=>isFieldRequired(n)),f=u.some(n=>n.value===undefined||n.value===null||n.value==="");if(f)return Swal.fire({title:localized.warning,text:localized.locationFieldsRequired,icon:"warning"}),!1;const e=new RegExp("^[a-zA-Z\\u0080-\\u024F]+(?:([\\ \\-\\']|(\\.\\ ))[a-zA-Z\\u0080-\\u024F]+)*$"),o=r.filter(n=>isCityField(n));for(var t of o)if(!IS_MOBILE_DEVICE&&!e.test(t.value))return Swal.fire({title:localized.warning,text:formatLocalized(localized.cityFormatInvalid,t.value),icon:"warning"}),!1;const s=await this.validateAnnotations(this.signatureCount);if(s===!1)return Swal.fire({title:localized.warning,text:localized.missingSignatures,icon:"warning"}),!1;n={instant:i,structured:mapSignature(i)}}return Swal.fire({title:localized.confirmation,html:`<div class="text-start fs-6 p-0 m-0">${localized.sigAgree}</div>`,icon:"question",showCancelButton:!0,confirmButtonColor:"#3085d6",cancelButtonColor:"#d33",confirmButtonText:localized.finalize,cancelButtonText:localized.back}).then(async t=>{if(t.isConfirmed){try{await this.pdfKit.save()}catch(i){return Swal.fire({title:localized.warning,text:localized.envelopeSignError,icon:"error"}),!1}try{const t=READ_AND_CONFIRM?await signEnvelope():await signEnvelope(n);if(t.ok)return!0;if(t.status===409)return Swal.fire({title:localized.warning,text:localized.envelopeUnavailable,icon:"warning"}),!1;if(t.status===423)Swal.fire({title:localized.info??localized.warning,text:localized.envelopeRejectedRedirect,icon:"info",timer:2e3,showConfirmButton:!1}).then(()=>{location.reload()});else throw new Error;}catch(i){return Swal.fire({title:localized.warning,text:localized.envelopeSignError,icon:"error"}),!1}}else return!1})}async validateAnnotations(n){const t=await getAnnotations(this.pdfKit),i=t.map(n=>n.toJS()).filter(n=>n.isSignature);return n<=i.length}async handleReset(){const n=Swal.fire({title:localized.resetConfirmTitle,text:localized.resetConfirmText,icon:"question",showCancelButton:!0});if(n.isConfirmed){const n=await deleteAnnotations(this.pdfKit)}return n}fakeElementId=0;}

EnvelopeGenerator.WorkerService/Configuration/WorkerSettings.cs

@@ -0,0 +1,14 @@
+using EnvelopeGenerator.Jobs.FinalizeDocument;
+
+namespace EnvelopeGenerator.WorkerService.Configuration;
+
+public sealed class WorkerSettings
+{
+    public string ConnectionString { get; set; } = string.Empty;
+
+    public bool Debug { get; set; }
+
+    public int IntervalMinutes { get; set; } = 1;
+
+    public PDFBurnerParams PdfBurner { get; set; } = new();
+}