Bump version to 3.11.0 in EnvelopeGenerator.Web.csproj

Updated <Version>, <AssemblyVersion>, and <FileVersion> properties from 3.10.0 to 3.11.0 to reflect the new release. No other changes were made.

EnvelopeGenerator.Application/Common/Dto/EnvelopeDto.cs

@@ -2,6 +2,7 @@
 using DigitalData.UserManager.Application.DTOs.User;
 using EnvelopeGenerator.Domain.Constants;
 using EnvelopeGenerator.Domain.Entities;
+using EnvelopeGenerator.Domain.Interfaces;
 using Microsoft.AspNetCore.Mvc;
 
 namespace EnvelopeGenerator.Application.Common.Dto;
@@ -10,7 +11,7 @@ namespace EnvelopeGenerator.Application.Common.Dto;
 /// 
 /// </summary>
 [ApiExplorerSettings(IgnoreApi = true)]
-public record EnvelopeDto
+public record EnvelopeDto : IEnvelope
 {
 	/// <summary>
 	/// 

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

@@ -3,6 +3,7 @@ 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;
 
@@ -45,6 +46,25 @@ 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/EnvelopeGenerator.Application.csproj

@@ -37,7 +37,7 @@
 	</ItemGroup>
 
 	<ItemGroup Condition="'$(TargetFramework)' == 'net8.0'">
-		<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="9.0.5" />
+		<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="8.0.1" />
 	</ItemGroup>
 
 	<ItemGroup Condition="'$(TargetFramework)' == 'net9.0'">
@@ -80,7 +80,7 @@
 
 	<ItemGroup Condition="'$(TargetFramework)' == 'net7.0'">
 	  <PackageReference Include="AutoMapper" Version="13.0.1" />
-	  <PackageReference Include="Microsoft.Data.SqlClient" Version="6.1.4" />
+	  <PackageReference Include="Microsoft.Data.SqlClient" Version="5.2.2" />
 	  <PackageReference Include="CommandDotNet">
 		<Version>7.0.5</Version>
 	  </PackageReference>
@@ -88,7 +88,6 @@
 
 	<ItemGroup Condition="'$(TargetFramework)' == 'net8.0'">
 	  <PackageReference Include="AutoMapper" Version="14.0.0" />
-	  <PackageReference Include="Microsoft.Data.SqlClient" Version="6.0.2" />
 	  <PackageReference Include="CommandDotNet">
 	    <Version>8.1.1</Version>
 	  </PackageReference>
@@ -96,7 +95,6 @@
 
 	<ItemGroup Condition="'$(TargetFramework)' == 'net9.0'">
 	  <PackageReference Include="AutoMapper" Version="14.0.0" />
-	  <PackageReference Include="Microsoft.Data.SqlClient" Version="6.0.2" />
 	  <PackageReference Include="CommandDotNet">
 	    <Version>8.1.1</Version>
 	  </PackageReference>

EnvelopeGenerator.Application/Services/EnvelopeMailService.cs

@@ -12,6 +12,7 @@ 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;
 
@@ -49,14 +50,33 @@ public class EnvelopeMailService : EmailOutService, IEnvelopeMailService
 		_sender = sender;
     }
 
-	private async Task<Dictionary<string, string>> CreatePlaceholders(string? accessCode = null, EnvelopeReceiverDto? envelopeReceiverDto = null)
+	private async Task<Dictionary<string, string>> CreatePlaceholders(string? accessCode = null, EnvelopeReceiverDto? er = 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 (envelopeReceiverDto?.Envelope is not null && envelopeReceiverDto.Receiver is not null)
+		if (er?.Envelope is not null && er.Receiver is not null)
 		{
-			var erId = (envelopeReceiverDto.Envelope.Uuid, envelopeReceiverDto.Receiver.Signature).ToEnvelopeKey();
+			var erId = (er.Envelope.Uuid, er.Receiver.Signature).ToEnvelopeKey();
 			var sigHost = await _configService.ReadDefaultSignatureHost();
 			var linkToDoc = $"{sigHost}/EnvelopeKey/{erId}";
 			_placeholders["[LINK_TO_DOCUMENT]"] = linkToDoc;
@@ -66,6 +86,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)
 	{
 		if (readOnlyDto?.Envelope is not null && readOnlyDto.Receiver is not null)
@@ -124,7 +145,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, envelopeReceiverDto: dto);
+		var placeholders = await CreatePlaceholders(accessCode: accessCode, er: dto);
 
 		// Add optional place holders.
 		if (optionalPlaceholders is not null)

EnvelopeGenerator.BBTests/frmFinalizePDF.vb

@@ -7,11 +7,10 @@ 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=;"
+    Private Const CONNECTIONSTRING = "Server=sDD-VMP04-SQL17\DD_DEVELOP01;Database=DD_ECM;User Id=sa;Password=+bk8oAbbQP1AzoHtvZUbd+Mbok2f8Fl4miEx1qssJ5yEaEWoQJ9prg4L14fURpPnqi1WMNs9fE4=;" + "Encrypt=True;TrustServerCertificate=True;"
 
     Private Database As MSSQLServer
     Private LogConfig As LogConfig
@@ -93,8 +92,6 @@ Public Class frmFinalizePDF
     End Function
 
     Private Sub Button1_Click(sender As Object, e As EventArgs) Handles Button1.Click
-        Try
-
         Dim oTable = LoadAnnotationDataForEnvelope()
         Dim oJsonList = oTable.Rows.
             Cast(Of DataRow).
@@ -110,22 +107,9 @@ Public Class frmFinalizePDF
         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
-
     End Sub
 
     Private Sub Button2_Click(sender As Object, e As EventArgs) Handles Button2.Click
-        Try
         Dim oTable = LoadAnnotationDataForEnvelope()
         Dim oJsonList = oTable.Rows.
             Cast(Of DataRow).
@@ -139,10 +123,5 @@ Public Class frmFinalizePDF
         oJObject1.Merge(oJObject2)
 
         txtResult.Text = oJObject1.ToString()
-
-
-        Catch ex As Exception
-            MsgBox(ex.Message, MsgBoxStyle.Critical)
-        End Try
     End Sub
 End Class

EnvelopeGenerator.Domain/Entities/Envelope.cs

@@ -5,6 +5,7 @@ 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;
@@ -13,7 +14,7 @@ using System.Linq;
 namespace EnvelopeGenerator.Domain.Entities
 {
     [Table("TBSIG_ENVELOPE", Schema = "dbo")]
-    public class Envelope : IHasAddedWhen, IHasChangedWhen
+    public class Envelope : IHasAddedWhen, IHasChangedWhen, IEnvelope
     {
         public Envelope()
         {
@@ -106,7 +107,8 @@ namespace EnvelopeGenerator.Domain.Entities
 
         [JsonIgnore]
         [NotMapped]
-        public bool ReadOnly => EnvelopeTypeId == 2;
+        [Obsolete("Use EnvelopeGenerator.Domain.Interfaces.EnvelopeExtensions.IsReadAndConfirm extension method instead.")]
+        public bool ReadOnly => this.IsReadAndConfirm();
 
         [Column("CERTIFICATION_TYPE")]
         public int? CertificationType { get; set; }

EnvelopeGenerator.Domain/Entities/History.cs

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

EnvelopeGenerator.Domain/Interfaces/IEnvelope.cs

@@ -0,0 +1,15 @@
+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/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="6.1.4" />
+    <PackageReference Include="Microsoft.Data.SqlClient" Version="5.2.2" />
     <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

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

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

EnvelopeGenerator.Jobs/Jobs/DataRowExtensions.cs

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

EnvelopeGenerator.Jobs/Jobs/FinalizeDocument/FinalizeDocumentExceptions.cs

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

EnvelopeGenerator.Jobs/Jobs/FinalizeDocument/FinalizeDocumentJob.cs

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

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

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

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

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

@@ -1,19 +0,0 @@
-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,8 +0,0 @@
-using System.Collections.Generic;
-
-namespace EnvelopeGenerator.Jobs.FinalizeDocument;
-
-public class ReportSource
-{
-    public List<ReportItem> Items { get; set; } = new();
-}

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.2.0" newVersion="4.0.2.0" />
+        <bindingRedirect oldVersion="0.0.0.0-4.0.5.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.4.0" newVersion="4.0.4.0" />
+        <bindingRedirect oldVersion="0.0.0.0-4.0.5.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-7.0.0.0" newVersion="7.0.0.0" />
+        <bindingRedirect oldVersion="0.0.0.0-8.0.0.3" newVersion="8.0.0.3" />
       </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-7.0.0.0" newVersion="7.0.0.0" />
+        <bindingRedirect oldVersion="0.0.0.0-8.0.0.2" newVersion="8.0.0.2" />
       </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=7.0.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
+    <Reference Include="Microsoft.Extensions.DependencyInjection.Abstractions, Version=8.0.0.2, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
-      <HintPath>..\packages\Microsoft.Extensions.DependencyInjection.Abstractions.7.0.0\lib\net462\Microsoft.Extensions.DependencyInjection.Abstractions.dll</HintPath>
+      <HintPath>..\packages\Microsoft.Extensions.DependencyInjection.Abstractions.8.0.2\lib\net462\Microsoft.Extensions.DependencyInjection.Abstractions.dll</HintPath>
     </Reference>
-    <Reference Include="Microsoft.Extensions.Logging.Abstractions, Version=7.0.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
+    <Reference Include="Microsoft.Extensions.Logging.Abstractions, Version=8.0.0.3, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
-      <HintPath>..\packages\Microsoft.Extensions.Logging.Abstractions.7.0.0\lib\net462\Microsoft.Extensions.Logging.Abstractions.dll</HintPath>
+      <HintPath>..\packages\Microsoft.Extensions.Logging.Abstractions.8.0.3\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="7.0.0" targetFramework="net462" />
+  <package id="Microsoft.Extensions.DependencyInjection.Abstractions" version="8.0.2" targetFramework="net462" />
-  <package id="Microsoft.Extensions.Logging.Abstractions" version="7.0.0" targetFramework="net462" />
+  <package id="Microsoft.Extensions.Logging.Abstractions" version="8.0.3" 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.Web/Controllers/Test/TestEnvelopeController.cs

@@ -1,56 +1,32 @@
-using EnvelopeGenerator.Domain.Entities;
+using Microsoft.AspNetCore.Mvc;
-using Microsoft.AspNetCore.Mvc;
-using EnvelopeGenerator.Application.Common.Dto;
 using EnvelopeGenerator.Application.Common.Extensions;
-using EnvelopeGenerator.Application.Common.Interfaces.Services;
+using MediatR;
+using EnvelopeGenerator.Application.Envelopes.Queries;
 
 namespace EnvelopeGenerator.Web.Controllers.Test;
 
 [Obsolete("Use MediatR")]
-public class TestEnvelopeController : TestControllerBase<IEnvelopeService, EnvelopeDto, Envelope, int>
+public class TestEnvelopeController : ControllerBase
 {
-    public TestEnvelopeController(ILogger<TestEnvelopeController> logger, IEnvelopeService service) : base(logger, service)
+    private readonly IMediator _mediator;
-    {
-    }
 
-    [NonAction]
+    /// <summary>
-    public override Task<IActionResult> GetAll() => base.GetAll();
+    /// 
+    /// </summary>
+    /// <param name="mediator"></param>
+    public TestEnvelopeController(IMediator mediator)
+    {
+        _mediator = mediator;
+    }
 
     [HttpGet]
-    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)
+    public async Task<IActionResult> GetAll([FromQuery] ReadEnvelopeQuery query, CancellationToken cancel) => Ok(await _mediator.Send(query, cancel));
-    {
-        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)
+    public IActionResult DecodeEnvelopeReceiverId(string envelopeReceiverId, int type = 0) => type switch
-    {
-        return type switch
     {
         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>net7.0;net8.0;net9.0</TargetFrameworks>
+		<TargetFrameworks>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.10.0</Version>						<!-- NuGet package version -->
+		<Version>3.11.0</Version>						<!-- NuGet package version -->
-		<AssemblyVersion>3.10.0.0</AssemblyVersion>		<!-- Assembly version for API compatibility -->
+		<AssemblyVersion>3.11.0.0</AssemblyVersion>		<!-- Assembly version for API compatibility -->
-		<FileVersion>3.10.0.0</FileVersion>				<!-- Windows file version -->
+		<FileVersion>3.11.0.0</FileVersion>				<!-- Windows file version -->
 		<Copyright>Copyright © 2025 Digital Data GmbH. All rights reserved.</Copyright>
 	</PropertyGroup>
 
@@ -2093,39 +2093,14 @@
 		<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="7.0.4" />
+		<PackageReference Include="Microsoft.AspNetCore.OpenApi" Version="8.0.17" />
-		<PackageReference Include="Microsoft.Extensions.Caching.SqlServer" Version="7.0.20" />
+		<PackageReference Include="Microsoft.Extensions.Caching.SqlServer" Version="8.0.17" />
 		<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
 		<PackageReference Include="NLog" Version="5.2.5" />
 		<PackageReference Include="NLog.Web.AspNetCore" Version="5.3.0" />
@@ -2149,8 +2124,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="7.0.4" />
+		<PackageReference Include="Microsoft.AspNetCore.OpenApi" Version="9.0.6" />
-		<PackageReference Include="Microsoft.Extensions.Caching.SqlServer" Version="7.0.20" />
+		<PackageReference Include="Microsoft.Extensions.Caching.SqlServer" Version="9.0.6" />
 		<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/appsettings.Mail.json

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

EnvelopeGenerator.WorkerService/Configuration/WorkerSettings.cs

@@ -1,14 +0,0 @@
-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();
-}

EnvelopeGenerator.WorkerService/EnvelopeGenerator.WorkerService.csproj

@@ -1,22 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk.Worker">
-
-  <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
-    <Nullable>enable</Nullable>
-    <ImplicitUsings>enable</ImplicitUsings>
-    <UserSecretsId>dotnet-EnvelopeGenerator.WorkerService-0636abb8-6085-477d-9f56-1a9787e84dde</UserSecretsId>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <PackageReference Include="BouncyCastle.Cryptography" Version="2.6.2" />
-    <PackageReference Include="HtmlSanitizer" Version="9.0.892" />
-    <PackageReference Include="Microsoft.Extensions.Hosting" Version="8.0.1" />
-    <PackageReference Include="Microsoft.Identity.Client" Version="4.82.1" />
-    <PackageReference Include="Quartz.Extensions.Hosting" Version="3.9.0" />
-    <PackageReference Include="SixLabors.ImageSharp" Version="3.1.12" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <ProjectReference Include="..\EnvelopeGenerator.Jobs\EnvelopeGenerator.Jobs.csproj" />
-  </ItemGroup>
-</Project>

EnvelopeGenerator.WorkerService/Program.cs

@@ -1,67 +0,0 @@
-using EnvelopeGenerator.Domain.Constants;
-using EnvelopeGenerator.Jobs.APIBackendJobs;
-using EnvelopeGenerator.Jobs.FinalizeDocument;
-using EnvelopeGenerator.WorkerService;
-using EnvelopeGenerator.WorkerService.Configuration;
-using EnvelopeGenerator.WorkerService.Services;
-using Quartz;
-
-var builder = Host.CreateApplicationBuilder(args);
-
-builder.Services.Configure<WorkerSettings>(builder.Configuration.GetSection("WorkerSettings"));
-
-builder.Services.AddSingleton<TempFileManager>();
-builder.Services.AddSingleton(provider =>
-{
-    var settings = provider.GetRequiredService<Microsoft.Extensions.Options.IOptions<WorkerSettings>>().Value;
-    var logger = provider.GetRequiredService<ILogger<PDFBurner>>();
-    return new PDFBurner(logger, settings.PdfBurner);
-});
-builder.Services.AddSingleton<PDFMerger>();
-builder.Services.AddSingleton<ReportCreator>();
-
-builder.Services.AddQuartz(q =>
-{
-    q.UseMicrosoftDependencyInjectionJobFactory();
-    q.UseDefaultThreadPool(tp => tp.MaxConcurrency = 5);
-
-    var settings = new WorkerSettings();
-    builder.Configuration.GetSection("WorkerSettings").Bind(settings);
-    var intervalMinutes = Math.Max(1, settings.IntervalMinutes);
-
-    var finalizeJobKey = new JobKey("FinalizeDocumentJob");
-    q.AddJob<FinalizeDocumentJob>(opts => opts
-        .WithIdentity(finalizeJobKey)
-        .UsingJobData(Value.DATABASE, settings.ConnectionString));
-
-    q.AddTrigger(opts => opts
-        .ForJob(finalizeJobKey)
-        .WithIdentity("FinalizeDocumentJob-trigger")
-        .StartNow()
-        .WithSimpleSchedule(x => x
-            .WithIntervalInMinutes(intervalMinutes)
-            .RepeatForever()));
-
-    var apiJobKey = new JobKey("APIEnvelopeJob");
-    q.AddJob<APIEnvelopeJob>(opts => opts
-        .WithIdentity(apiJobKey)
-        .UsingJobData(Value.DATABASE, settings.ConnectionString));
-
-    q.AddTrigger(opts => opts
-        .ForJob(apiJobKey)
-        .WithIdentity("APIEnvelopeJob-trigger")
-        .StartNow()
-        .WithSimpleSchedule(x => x
-            .WithIntervalInMinutes(intervalMinutes)
-            .RepeatForever()));
-});
-
-builder.Services.AddQuartzHostedService(options =>
-{
-    options.WaitForJobsToComplete = true;
-});
-
-builder.Services.AddHostedService<Worker>();
-
-var host = builder.Build();
-host.Run();

EnvelopeGenerator.WorkerService/Properties/launchSettings.json

@@ -1,12 +0,0 @@
-{
-  "$schema": "http://json.schemastore.org/launchsettings.json",
-  "profiles": {
-    "EnvelopeGenerator.WorkerService": {
-      "commandName": "Project",
-      "dotnetRunMessages": true,
-      "environmentVariables": {
-        "DOTNET_ENVIRONMENT": "Development"
-      }
-    }
-  }
-}

EnvelopeGenerator.WorkerService/Services/TempFileManager.cs

@@ -1,74 +0,0 @@
-using System.IO;
-using Microsoft.Extensions.Logging;
-
-namespace EnvelopeGenerator.WorkerService.Services;
-
-public sealed class TempFileManager
-{
-    private readonly ILogger<TempFileManager> _logger;
-
-    public TempFileManager(ILogger<TempFileManager> logger)
-    {
-        _logger = logger;
-        TempPath = Path.Combine(Path.GetTempPath(), "EnvelopeGenerator");
-    }
-
-    public string TempPath { get; }
-
-    public Task CreateAsync(CancellationToken cancellationToken = default)
-    {
-        try
-        {
-            if (!Directory.Exists(TempPath))
-            {
-                Directory.CreateDirectory(TempPath);
-                _logger.LogDebug("Created temp folder {TempPath}", TempPath);
-            }
-            else
-            {
-                CleanUpFiles();
-            }
-        }
-        catch (Exception ex)
-        {
-            _logger.LogError(ex, "Failed to create temp folder {TempPath}", TempPath);
-            throw;
-        }
-
-        return Task.CompletedTask;
-    }
-
-    public Task CleanupAsync(CancellationToken cancellationToken = default)
-    {
-        try
-        {
-            if (Directory.Exists(TempPath))
-            {
-                _logger.LogDebug("Deleting temp folder {TempPath}", TempPath);
-                Directory.Delete(TempPath, recursive: true);
-            }
-        }
-        catch (Exception ex)
-        {
-            _logger.LogError(ex, "Failed to clean up temp folder {TempPath}", TempPath);
-        }
-
-        return Task.CompletedTask;
-    }
-
-    private void CleanUpFiles()
-    {
-        foreach (var file in Directory.GetFiles(TempPath))
-        {
-            try
-            {
-                _logger.LogDebug("Deleting temp file {File}", file);
-                File.Delete(file);
-            }
-            catch (Exception ex)
-            {
-                _logger.LogWarning(ex, "Failed to delete temp file {File}", file);
-            }
-        }
-    }
-}

EnvelopeGenerator.WorkerService/Worker.cs

@@ -1,71 +0,0 @@
-using EnvelopeGenerator.WorkerService.Configuration;
-using EnvelopeGenerator.WorkerService.Services;
-using Microsoft.Data.SqlClient;
-using Microsoft.Extensions.Options;
-
-namespace EnvelopeGenerator.WorkerService;
-
-public class Worker : BackgroundService
-{
-    private readonly ILogger<Worker> _logger;
-    private readonly WorkerSettings _settings;
-    private readonly TempFileManager _tempFiles;
-
-    public Worker(
-        ILogger<Worker> logger,
-        IOptions<WorkerSettings> settings,
-        TempFileManager tempFiles)
-    {
-        _logger = logger;
-        _settings = settings.Value;
-        _tempFiles = tempFiles;
-    }
-
-    public override async Task StartAsync(CancellationToken cancellationToken)
-    {
-        _logger.LogInformation("Starting EnvelopeGenerator worker...");
-        _logger.LogInformation("Debug mode: {Debug}", _settings.Debug);
-
-        ValidateConfiguration();
-        await EnsureDatabaseConnectionAsync(cancellationToken);
-        await _tempFiles.CreateAsync(cancellationToken);
-
-        await base.StartAsync(cancellationToken);
-    }
-
-    protected override async Task ExecuteAsync(CancellationToken stoppingToken)
-    {
-        _logger.LogInformation("EnvelopeGenerator worker is running. Jobs are scheduled every {Interval} minute(s).", Math.Max(1, _settings.IntervalMinutes));
-        await Task.Delay(Timeout.Infinite, stoppingToken);
-    }
-
-    public override async Task StopAsync(CancellationToken cancellationToken)
-    {
-        _logger.LogInformation("Stopping EnvelopeGenerator worker...");
-        await _tempFiles.CleanupAsync(cancellationToken);
-        await base.StopAsync(cancellationToken);
-    }
-
-    private void ValidateConfiguration()
-    {
-        if (string.IsNullOrWhiteSpace(_settings.ConnectionString))
-        {
-            throw new InvalidOperationException("Connection string cannot be empty. Configure 'WorkerSettings:ConnectionString'.");
-        }
-    }
-
-    private async Task EnsureDatabaseConnectionAsync(CancellationToken cancellationToken)
-    {
-        try
-        {
-            await using var connection = new SqlConnection(_settings.ConnectionString);
-            await connection.OpenAsync(cancellationToken);
-            _logger.LogInformation("Database connection established successfully.");
-        }
-        catch (Exception ex)
-        {
-            _logger.LogError(ex, "Database connection could not be established.");
-            throw;
-        }
-    }
-}

EnvelopeGenerator.WorkerService/appsettings.Development.json

@@ -1,30 +0,0 @@
-{
-  "Logging": {
-    "LogLevel": {
-      "Default": "Debug",
-      "Microsoft.Hosting.Lifetime": "Information"
-    }
-  },
-  "WorkerSettings": {
-    "ConnectionString": "Server=SDD-VMP04-SQL17\\DD_DEVELOP01;Database=DD_ECM;User Id=sa;Password=dd;Encrypt=false;TrustServerCertificate=True;",
-    "Debug": true,
-    "IntervalMinutes": 1,
-    "PdfBurner": {
-      "IgnoredLabels": [
-        "Date",
-        "Datum",
-        "ZIP",
-        "PLZ",
-        "Place",
-        "Ort",
-        "Position",
-        "Stellung"
-      ],
-      "TopMargin": 0.1,
-      "YOffset": -0.3,
-      "FontName": "Arial",
-      "FontSize": 8,
-      "FontStyle": "Italic"
-    }
-  }
-}

EnvelopeGenerator.WorkerService/appsettings.json

@@ -1,21 +0,0 @@
-{
-  "Logging": {
-    "LogLevel": {
-      "Default": "Information",
-      "Microsoft.Hosting.Lifetime": "Information"
-    }
-  },
-  "WorkerSettings": {
-    "ConnectionString": "Server=SDD-VMP04-SQL17\\DD_DEVELOP01;Database=DD_ECM;User Id=sa;Password=dd;Encrypt=false;TrustServerCertificate=True;",
-    "Debug": false,
-    "IntervalMinutes": 1,
-    "PdfBurner": {
-      "IgnoredLabels": ["Date", "Datum", "ZIP", "PLZ", "Place", "Ort", "Position", "Stellung"],
-      "TopMargin": 0.1,
-      "YOffset": -0.3,
-      "FontName": "Arial",
-      "FontSize": 8,
-      "FontStyle": "Italic"
-    }
-  }
-}

EnvelopeGenerator.sln

@@ -33,10 +33,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "EnvelopeGenerator.PdfEditor
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "EnvelopeGenerator.Tests", "EnvelopeGenerator.Tests\EnvelopeGenerator.Tests.csproj", "{224C4845-1CDE-22B7-F3A9-1FF9297F70E8}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "EnvelopeGenerator.Jobs", "EnvelopeGenerator.Jobs\EnvelopeGenerator.Jobs.csproj", "{3D0514EA-2681-4B13-AD71-35CC6363DBD7}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "EnvelopeGenerator.WorkerService", "EnvelopeGenerator.WorkerService\EnvelopeGenerator.WorkerService.csproj", "{E3676510-7030-4E85-86E1-51E483E2A3B6}"
-EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "EnvelopeGenerator.API", "EnvelopeGenerator.API\EnvelopeGenerator.API.csproj", "{EC768913-6270-14F4-1DD3-69C87A659462}"
 EndProject
 Global
@@ -57,8 +53,8 @@ Global
 		{5E0E17C0-FF5A-4246-BF87-1ADD85376A27}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{5E0E17C0-FF5A-4246-BF87-1ADD85376A27}.Release|Any CPU.ActiveCfg = Debug|Any CPU
 		{5E0E17C0-FF5A-4246-BF87-1ADD85376A27}.Release|Any CPU.Build.0 = Debug|Any CPU
-		{83ED2617-B398-4859-8F59-B38F8807E83E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{83ED2617-B398-4859-8F59-B38F8807E83E}.Debug|Any CPU.ActiveCfg = Release|Any CPU
-		{83ED2617-B398-4859-8F59-B38F8807E83E}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{83ED2617-B398-4859-8F59-B38F8807E83E}.Debug|Any CPU.Build.0 = Release|Any CPU
 		{83ED2617-B398-4859-8F59-B38F8807E83E}.Release|Any CPU.ActiveCfg = Debug|Any CPU
 		{83ED2617-B398-4859-8F59-B38F8807E83E}.Release|Any CPU.Build.0 = Debug|Any CPU
 		{4F32A98D-E6F0-4A09-BD97-1CF26107E837}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
@@ -85,14 +81,6 @@ Global
 		{224C4845-1CDE-22B7-F3A9-1FF9297F70E8}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{224C4845-1CDE-22B7-F3A9-1FF9297F70E8}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{224C4845-1CDE-22B7-F3A9-1FF9297F70E8}.Release|Any CPU.Build.0 = Release|Any CPU
-		{3D0514EA-2681-4B13-AD71-35CC6363DBD7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{3D0514EA-2681-4B13-AD71-35CC6363DBD7}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{3D0514EA-2681-4B13-AD71-35CC6363DBD7}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{3D0514EA-2681-4B13-AD71-35CC6363DBD7}.Release|Any CPU.Build.0 = Release|Any CPU
-		{E3676510-7030-4E85-86E1-51E483E2A3B6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{E3676510-7030-4E85-86E1-51E483E2A3B6}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{E3676510-7030-4E85-86E1-51E483E2A3B6}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{E3676510-7030-4E85-86E1-51E483E2A3B6}.Release|Any CPU.Build.0 = Release|Any CPU
 		{EC768913-6270-14F4-1DD3-69C87A659462}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{EC768913-6270-14F4-1DD3-69C87A659462}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{EC768913-6270-14F4-1DD3-69C87A659462}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -115,8 +103,6 @@ Global
 		{6D56C01F-D6CB-4D8A-BD3D-4FD34326998C} = {E3C758DC-914D-4B7E-8457-0813F1FDB0CB}
 		{211619F5-AE25-4BA5-A552-BACAFE0632D3} = {9943209E-1744-4944-B1BA-4F87FC1A0EEB}
 		{224C4845-1CDE-22B7-F3A9-1FF9297F70E8} = {0CBC2432-A561-4440-89BC-671B66A24146}
-		{3D0514EA-2681-4B13-AD71-35CC6363DBD7} = {9943209E-1744-4944-B1BA-4F87FC1A0EEB}
-		{E3676510-7030-4E85-86E1-51E483E2A3B6} = {9943209E-1744-4944-B1BA-4F87FC1A0EEB}
 		{EC768913-6270-14F4-1DD3-69C87A659462} = {E3C758DC-914D-4B7E-8457-0813F1FDB0CB}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution