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.
Update final status to 'Lesebestätigung' for read confirm
2026-03-04 16:49:07 +01:00 · 2026-03-04 16:19:45 +01:00 · 2026-03-04 16:19:33 +01:00 · 2026-03-04 16:09:50 +01:00 · 2026-03-04 16:09:40 +01:00 · 2026-03-04 15:17:47 +01:00
44 changed files with 97 additions and 1660 deletions
--- a/EnvelopeGenerator.Application/Common/Dto/EnvelopeDto.cs
+++ b/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>
 	/// 
--- a/EnvelopeGenerator.Application/Common/Notifications/DocSigned/Handlers/SendSignedMailHandler.cs
+++ b/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;
    }
 }
--- a/EnvelopeGenerator.Application/EnvelopeGenerator.Application.csproj
+++ b/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>
--- a/EnvelopeGenerator.Application/Services/EnvelopeMailService.cs
+++ b/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,7 +86,8 @@ public class EnvelopeMailService : EmailOutService, IEnvelopeMailService
 		return _placeholders;
 	}

-	private async Task<Dictionary<string, string>> CreatePlaceholders(EnvelopeReceiverReadOnlyDto? readOnlyDto = null)
+    // 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)
--- a/EnvelopeGenerator.Domain/Entities/Envelope.cs
+++ b/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; }
--- a/EnvelopeGenerator.Domain/Entities/History.cs
+++ b/EnvelopeGenerator.Domain/Entities/History.cs
@@ -37,6 +37,7 @@ namespace EnvelopeGenerator.Domain.Entities
        [Column("ACTION_DATE", TypeName = "datetime")]
        public DateTime? ActionDate { get; set; }

+        [NotMapped]
        public DateTime? ChangedWhen { get => ActionDate; set => ActionDate = value; }

        [Column("COMMENT", TypeName = "nvarchar(max)")]
--- a/EnvelopeGenerator.Domain/Entities/Signature.cs
+++ b/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
-        [JsonIgnore]
-#endif
+#if NETFRAMEWORK
        [NotMapped]
        public double Top => Math.Round(Y, 5);

-
-#if NET
-        [JsonIgnore]
-#endif
        [NotMapped]
        public double Left => Math.Round(X, 5);
+#endif
    }
 }
--- a/EnvelopeGenerator.Domain/Interfaces/IEnvelope.cs
+++ b/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;
+        }
+    }
+}
--- a/EnvelopeGenerator.Infrastructure/EnvelopeGenerator.Infrastructure.csproj
+++ b/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" />
--- a/EnvelopeGenerator.Service/App.config
+++ b/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" />
--- a/EnvelopeGenerator.Service/EnvelopeGenerator.Service.vbproj
+++ b/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">
-      <HintPath>..\packages\Microsoft.Extensions.DependencyInjection.Abstractions.7.0.0\lib\net462\Microsoft.Extensions.DependencyInjection.Abstractions.dll</HintPath>
+    <Reference Include="Microsoft.Extensions.DependencyInjection.Abstractions, Version=8.0.0.2, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
+      <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">
-      <HintPath>..\packages\Microsoft.Extensions.Logging.Abstractions.7.0.0\lib\net462\Microsoft.Extensions.Logging.Abstractions.dll</HintPath>
+    <Reference Include="Microsoft.Extensions.Logging.Abstractions, Version=8.0.0.3, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
+      <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>
--- a/EnvelopeGenerator.Service/packages.config
+++ b/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.Logging.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="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" />
--- a/EnvelopeGenerator.ServiceHost/EnvelopeGenerator.ServiceHost.csproj
+++ b/EnvelopeGenerator.ServiceHost/EnvelopeGenerator.ServiceHost.csproj
@@ -1,32 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk.Web">
-
-  <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
-    <Nullable>enable</Nullable>
-    <ImplicitUsings>enable</ImplicitUsings>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <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" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <ProjectReference Include="..\EnvelopeGenerator.Domain\EnvelopeGenerator.Domain.csproj" />
-    <ProjectReference Include="..\EnvelopeGenerator.Infrastructure\EnvelopeGenerator.Infrastructure.csproj" />
-    <ProjectReference Include="..\EnvelopeGenerator.PdfEditor\EnvelopeGenerator.PdfEditor.csproj" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <Folder Include="Controllers\" />
-  </ItemGroup>
-
-</Project>
--- a/EnvelopeGenerator.ServiceHost/Exceptions/BurnAnnotationException.cs
+++ b/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)
-    {
-    }
-}
--- a/EnvelopeGenerator.ServiceHost/Exceptions/CreateReportException.cs
+++ b/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)
-    {
-    }
-}
--- a/EnvelopeGenerator.ServiceHost/Exceptions/ExportDocumentException.cs
+++ b/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)
-    {
-    }
-}
--- a/EnvelopeGenerator.ServiceHost/Exceptions/MergeDocumentException.cs
+++ b/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)
-    {
-    }
-}
--- a/EnvelopeGenerator.ServiceHost/Extensions/DataRowExtensions.cs
+++ b/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);
-    }
-}
--- a/EnvelopeGenerator.ServiceHost/Extensions/DependencyInjection.cs
+++ b/EnvelopeGenerator.ServiceHost/Extensions/DependencyInjection.cs
@@ -1,38 +0,0 @@
-using DigitalData.Modules.Database;
-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(nameof(WorkerOptions)));
-        services.AddSingleton<FinalizeDocumentJob>();
-        services.AddScoped<ActionService>();
-        services.AddSingleton<TempFiles>();
-        services.AddScoped<PDFBurner>();
-        services.AddScoped<PDFMerger>();
-        services.AddScoped<ReportModel>();
-        services.AddSingleton<State>();
-        services.AddScoped<MSSQLServer>();
-
-        //TODO: Check lifetime of services. They might be singleton or scoped.
-        services.AddTransient<GdViewer>();
-        // Add LicenseManager
-        services.AddTransient(provider =>
-        {
-            var options = provider.GetRequiredService<IOptions<WorkerOptions>>().Value;
-            var licenseManager = new LicenseManager();
-            licenseManager.RegisterKEY(options.GdPictureLicenseKey);
-            return licenseManager;
-        });
-        services.AddTransient<AnnotationManager>();
-
-        return services;
-    }
-}
--- a/EnvelopeGenerator.ServiceHost/Extensions/LoggerExtensions.cs
+++ b/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);
-    }
-}
--- a/EnvelopeGenerator.ServiceHost/Jobs/ActionService.cs
+++ b/EnvelopeGenerator.ServiceHost/Jobs/ActionService.cs
@@ -1,31 +0,0 @@
-using EnvelopeGenerator.Domain.Entities;
-
-namespace EnvelopeGenerator.ServiceHost.Jobs;
-
-[Obsolete("This is a placeholder service added by copilot. Migrate the actual logic from CommonServices.Jobs")]
-public class ActionService
-{
-    [Obsolete("This is a placeholder service added by copilot. Migrate the actual logic from CommonServices.Jobs")]
-    public bool CreateReport(Envelope envelope)
-    {
-        throw new NotImplementedException();
-    }
-
-    [Obsolete("This is a placeholder service added by copilot. Migrate the actual logic from CommonServices.Jobs")]
-    public bool FinalizeEnvelope(Envelope envelope)
-    {
-        throw new NotImplementedException();
-    }
-
-    [Obsolete("This is a placeholder service added by copilot. Migrate the actual logic from CommonServices.Jobs")]
-    public bool CompleteEnvelope(Envelope envelope)
-    {
-        throw new NotImplementedException();
-    }
-
-    [Obsolete("This is a placeholder service added by copilot. Migrate the actual logic from CommonServices.Jobs")]
-    public bool CompleteEnvelope(Envelope envelope, Receiver receiver)
-    {
-        throw new NotImplementedException();
-    }
-}
--- a/EnvelopeGenerator.ServiceHost/Jobs/ConfigModel.cs
+++ b/EnvelopeGenerator.ServiceHost/Jobs/ConfigModel.cs
@@ -1,34 +0,0 @@
-using DigitalData.Modules.Database;
-using EnvelopeGenerator.ServiceHost.Extensions;
-
-namespace EnvelopeGenerator.ServiceHost.Jobs;
-
-public class ConfigModel(MSSQLServer Database, ILogger Logger)
-{
-    public DbConfig LoadConfiguration()
-    {
-        try
-        {
-            const string sql = "SELECT TOP 1 * FROM TBSIG_CONFIG";
-            var table = Database.GetDatatable(sql);
-            var row = table.Rows[0];
-
-            return new DbConfig
-            {
-                DocumentPath = row.ItemEx("DOCUMENT_PATH", string.Empty),
-                DocumentPathOrigin = row.ItemEx("DOCUMENT_PATH", string.Empty),
-                ExportPath = row.ItemEx("EXPORT_PATH", string.Empty),
-                SendingProfile = row.ItemEx("SENDING_PROFILE", 0),
-                SignatureHost = row.ItemEx("SIGNATURE_HOST", string.Empty),
-                ExternalProgramName = row.ItemEx("EXTERNAL_PROGRAM_NAME", string.Empty),
-                Default_Tfa_Enabled = row.ItemEx("DEF_TFA_ENABLED", false),
-                Default_Tfa_WithPhone = row.ItemEx("DEF_TFA_WITH_PHONE", false)
-            };
-        }
-        catch (Exception ex)
-        {
-            Logger.LogError(ex);
-            return new DbConfig();
-        }
-    }
-}
--- a/EnvelopeGenerator.ServiceHost/Jobs/DbConfig.cs
+++ b/EnvelopeGenerator.ServiceHost/Jobs/DbConfig.cs
@@ -1,13 +0,0 @@
-namespace EnvelopeGenerator.ServiceHost.Jobs;
-
-public class DbConfig
-{
-    public string ExternalProgramName { get; set; } = "signFLOW";
-    public string DocumentPathOrigin { get; set; } = string.Empty;
-    public string DocumentPath { get; set; } = string.Empty;
-    public string ExportPath { get; set; } = string.Empty;
-    public int SendingProfile { get; set; }
-    public string SignatureHost { get; set; } = string.Empty;
-    public bool Default_Tfa_Enabled { get; set; }
-    public bool Default_Tfa_WithPhone { get; set; }
-}
--- a/EnvelopeGenerator.ServiceHost/Jobs/EnvelopeModel.cs
+++ b/EnvelopeGenerator.ServiceHost/Jobs/EnvelopeModel.cs
@@ -1,38 +0,0 @@
-using DigitalData.Modules.Database;
-using EnvelopeGenerator.Domain.Entities;
-using EnvelopeGenerator.ServiceHost.Extensions;
-
-namespace EnvelopeGenerator.ServiceHost.Jobs;
-
-public class EnvelopeModel(MSSQLServer Database, ILogger Logger)
-{
-    public Envelope? GetById(int envelopeId)
-    {
-        try
-        {
-            var sql = $"SELECT * FROM [dbo].[TBSIG_ENVELOPE] WHERE GUID = {envelopeId}";
-            var table = Database.GetDatatable(sql);
-            var row = table.Rows.Cast<System.Data.DataRow>().SingleOrDefault();
-            if (row is null)
-            {
-                return null;
-            }
-
-            return new Envelope
-            {
-                Id = row.ItemEx("GUID", 0),
-                Uuid = row.ItemEx("ENVELOPE_UUID", string.Empty),
-                FinalEmailToCreator = row.ItemEx("FINAL_EMAIL_TO_CREATOR", 0),
-                FinalEmailToReceivers = row.ItemEx("FINAL_EMAIL_TO_RECEIVERS", 0),
-                UserId = row.ItemEx("USER_ID", 0),
-                User = null!,
-                EnvelopeReceivers = new List<EnvelopeReceiver>()
-            };
-        }
-        catch (Exception ex)
-        {
-            Logger.LogError(ex);
-            return null;
-        }
-    }
-}
--- a/EnvelopeGenerator.ServiceHost/Jobs/FinalizeDocument/PDFBurner.cs
+++ b/EnvelopeGenerator.ServiceHost/Jobs/FinalizeDocument/PDFBurner.cs
@@ -1,430 +0,0 @@
-using System.Collections.Immutable;
-using System.Drawing;
-using EnvelopeGenerator.Domain.Entities;
-using EnvelopeGenerator.Infrastructure;
-using EnvelopeGenerator.PdfEditor;
-using EnvelopeGenerator.ServiceHost.Exceptions;
-using GdPicture14;
-using Microsoft.EntityFrameworkCore;
-using Microsoft.Extensions.Options;
-using Newtonsoft.Json;
-
-namespace EnvelopeGenerator.ServiceHost.Jobs.FinalizeDocument;
-
-//TODO: check if licence manager is needed as a dependency to 
-/// <summary>
-/// 
-/// </summary>
-/// <param name="workerOptions"></param>
-/// <param name="context2"></param>
-/// <param name="logger2"></param>
-/// <param name="licenseManager"></param>
-/// <param name="annotationManager2"></param>
-public class PDFBurner(IOptions<WorkerOptions> workerOptions, EGDbContext context, ILogger<PDFBurner> logger, LicenseManager licenseManager, 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;
-    }
-}
--- a/EnvelopeGenerator.ServiceHost/Jobs/FinalizeDocument/PDFMerger.cs
+++ b/EnvelopeGenerator.ServiceHost/Jobs/FinalizeDocument/PDFMerger.cs
@@ -1,61 +0,0 @@
-using EnvelopeGenerator.ServiceHost.Exceptions;
-using GdPicture14;
-using Microsoft.Extensions.Options;
-
-namespace EnvelopeGenerator.ServiceHost.Jobs.FinalizeDocument;
-
-public class PDFMerger
-{
-    private readonly AnnotationManager _manager;
-    private readonly LicenseManager _licenseManager;
-
-    private const bool AllowRasterization = true;
-    private const bool AllowVectorization = true;
-
-    private readonly PdfConversionConformance _pdfaConformanceLevel = PdfConversionConformance.PDF_A_1b;
-
-    public PDFMerger(LicenseManager licenseManager, AnnotationManager annotationManager)
-    {
-        _licenseManager = licenseManager;
-        _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();
-    }
-}
--- a/EnvelopeGenerator.ServiceHost/Jobs/FinalizeDocument/ReportCreator.cs
+++ b/EnvelopeGenerator.ServiceHost/Jobs/FinalizeDocument/ReportCreator.cs
@@ -1,102 +0,0 @@
-using System.Data;
-using EnvelopeGenerator.Domain.Constants;
-using EnvelopeGenerator.Domain.Entities;
-using EnvelopeGenerator.ServiceHost.Exceptions;
-using EnvelopeGenerator.ServiceHost.Extensions;
-
-namespace EnvelopeGenerator.ServiceHost.Jobs.FinalizeDocument;
-
-[Obsolete("Instead of ReportModel create and use EnvelopeReport mediator queries")]
-public class ReportCreator(ReportModel ReportModel, ILogger<ReportCreator> Logger)
-{
-    [Obsolete("Solve the spaghetti...")]
-    private Envelope? _envelope;
-
-    [Obsolete("Instead of ReportModel create and use EnvelopeReport mediator queries and solve this spaghetti...")]
-    public byte[] CreateReport(Envelope envelope)
-    {
-        try
-        {
-            Logger.LogDebug("Loading report data..");
-            var table = ReportModel.List(envelope.Id);
-            var items = GetReportSource(table);
-
-            _envelope = envelope;
-
-            if (items.Count == 0)
-            {
-                throw new CreateReportException("No report data found!");
-            }
-
-            Logger.LogDebug("Creating report with [{count}] items..", items.Count);
-            var buffer = DoCreateReport(items);
-            Logger.LogDebug("Report created!");
-
-            return buffer;
-        }
-        catch (Exception ex)
-        {
-            Logger.LogError(ex);
-            throw new CreateReportException("Could not prepare report data!", ex);
-        }
-    }
-
-    private List<ReportItem> GetReportSource(DataTable dataTable)
-    {
-        Logger.LogDebug("Preparing report data");
-        return dataTable.Rows
-            .Cast<DataRow>()
-            .Select(ToReportItem)
-            .OrderByDescending(r => r.ItemDate)
-            .ToList();
-    }
-
-    private byte[] DoCreateReport(List<ReportItem> reportItems)
-    {
-        var items = reportItems.Select(MergeEnvelope).ToList();
-        var source = new ReportSource { Items = items };
-        var report = new rptEnvelopeHistory { DataSource = source, DataMember = "Items" };
-
-        Logger.LogDebug("Creating report in memory..");
-        report.CreateDocument();
-
-        Logger.LogDebug("Exporting report to stream..");
-        using var stream = new MemoryStream();
-        report.ExportToPdf(stream);
-
-        Logger.LogDebug("Writing report to buffer..");
-        return stream.ToArray();
-    }
-
-    [Obsolete("Solve this spaghetti...")]
-    private ReportItem MergeEnvelope(ReportItem item)
-    {
-        if (item.Envelope is null)
-        {
-            item.Envelope = _envelope;
-        }
-
-        return item;
-    }
-
-    private ReportItem ToReportItem(DataRow row)
-    {
-        try
-        {
-            return new ReportItem
-            {
-                EnvelopeId = row.ItemEx("ENVELOPE_ID", 0),
-                EnvelopeTitle = row.ItemEx("HEAD_TITLE", string.Empty),
-                EnvelopeSubject = row.ItemEx("HEAD_SUBJECT", string.Empty),
-                ItemDate = row.ItemEx("POS_WHEN", DateTime.MinValue),
-                ItemStatus = (EnvelopeStatus)row.ItemEx("POS_STATUS", 0),
-                ItemUserReference = row.ItemEx("POS_WHO", string.Empty)
-            };
-        }
-        catch (Exception ex)
-        {
-            Logger.LogError(ex);
-            throw new CreateReportException("Could not read data from database!", ex);
-        }
-    }
-}
--- a/EnvelopeGenerator.ServiceHost/Jobs/FinalizeDocument/ReportItem.cs
+++ b/EnvelopeGenerator.ServiceHost/Jobs/FinalizeDocument/ReportItem.cs
@@ -1,19 +0,0 @@
-using EnvelopeGenerator.Domain.Constants;
-using EnvelopeGenerator.Domain.Entities;
-
-namespace EnvelopeGenerator.ServiceHost.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; }
-}
--- a/EnvelopeGenerator.ServiceHost/Jobs/FinalizeDocument/ReportSource.cs
+++ b/EnvelopeGenerator.ServiceHost/Jobs/FinalizeDocument/ReportSource.cs
@@ -1,6 +0,0 @@
-namespace EnvelopeGenerator.ServiceHost.Jobs.FinalizeDocument;
-
-public class ReportSource
-{
-    public List<ReportItem> Items { get; set; } = new();
-}
--- a/EnvelopeGenerator.ServiceHost/Jobs/FinalizeDocument/rptEnvelopeHistory.cs
+++ b/EnvelopeGenerator.ServiceHost/Jobs/FinalizeDocument/rptEnvelopeHistory.cs
@@ -1,18 +0,0 @@
-using System.IO;
-
-namespace EnvelopeGenerator.ServiceHost.Jobs.FinalizeDocument;
-
-public class rptEnvelopeHistory
-{
-    public object? DataSource { get; set; }
-    public string? DataMember { get; set; }
-
-    public void CreateDocument()
-    {
-    }
-
-    public void ExportToPdf(Stream stream)
-    {
-        stream.Write(Array.Empty<byte>(), 0, 0);
-    }
-}
--- a/EnvelopeGenerator.ServiceHost/Jobs/FinalizeDocumentJob.cs
+++ b/EnvelopeGenerator.ServiceHost/Jobs/FinalizeDocumentJob.cs
@@ -1,360 +0,0 @@
-using System.Data;
-using DigitalData.Modules.Database;
-using EnvelopeGenerator.Domain.Constants;
-using EnvelopeGenerator.Domain.Entities;
-using EnvelopeGenerator.ServiceHost.Exceptions;
-using EnvelopeGenerator.ServiceHost.Jobs.FinalizeDocument;
-using GdPicture14;
-using Microsoft.Data.SqlClient;
-using Microsoft.Extensions.Options;
-using EnvelopeGenerator.ServiceHost.Extensions;
-
-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, IConfiguration config, ILogger<FinalizeDocumentJob> logger, TempFiles tempFiles, ActionService actionService, PDFBurner pdfBurner, PDFMerger pdfMerger, ReportCreator reportCreator, ConfigModel _configModel, EnvelopeModel _envelopeModel, ReportModel _reportModel, MSSQLServer _database, GdViewer? _gdViewer, LicenseManager licenseManager)
-{
-    private readonly WorkerOptions _options = options.Value;
-
-    private DbConfig? _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 Task ExecuteAsync(CancellationToken cancellationToken = default)
-    {
-        var gdPictureKey = _options.GdPictureLicenseKey;
-        tempFiles.Create();
-        var jobId = typeof(FinalizeDocumentJob).FullName;
-        logger.LogDebug("Starting job {jobId}", jobId);
-
-        try
-        {
-            logger.LogDebug("Loading Configuration..");
-            _config = _configModel?.LoadConfiguration() ?? throw new InvalidOperationException("Configuration could not be loaded because there is no record");
-
-            logger.LogDebug("DocumentPath: [{documentPath}]", _config.DocumentPath);
-            logger.LogDebug("ExportPath: [{exportPath}]", _config.ExportPath);
-
-            var completeStatus = EnvelopeStatus.EnvelopeCompletelySigned;
-            var sql = $"SELECT * FROM TBSIG_ENVELOPE WHERE STATUS = {completeStatus} AND DATEDIFF(minute, CHANGED_WHEN, GETDATE()) >= {CompleteWaitTime} ORDER BY GUID";
-            var table = _database.GetDatatable(sql);
-
-            var envelopeIds = table.Rows.Cast<DataRow>()
-                .Select(r => r.Field<int>("GUID"))
-                .ToList();
-
-            if (envelopeIds.Count > 0)
-            {
-                logger.LogInformation("Found [{count}] completed envelopes.", envelopeIds.Count);
-            }
-
-            var total = envelopeIds.Count;
-            var current = 1;
-
-            foreach (var id in envelopeIds)
-            {
-                logger.LogInformation("Finalizing Envelope [{id}] ({current}/{total})", id, current, total);
-                try
-                {
-                    var envelope = _envelopeModel?.GetById(id);
-                    if (envelope is null)
-                    {
-                        logger.LogWarning("Envelope could not be loaded for Id [{id}]!", id);
-                        throw new ArgumentNullException(nameof(EnvelopeData));
-                    }
-
-                    logger.LogDebug("Loading Envelope Data..");
-                    var envelopeData = GetEnvelopeData(id);
-
-                    if (envelopeData is null)
-                    {
-                        logger.LogWarning("EnvelopeData could not be loaded for Id [{id}]!", id);
-                        throw new ArgumentNullException(nameof(EnvelopeData));
-                    }
-
-                    logger.LogDebug("Burning Annotations to pdf ...");
-                    var burnedDocument = BurnAnnotationsToPdf(envelopeData);
-                    if (burnedDocument is null)
-                    {
-                        logger.LogWarning("Document could not be finalized!");
-                        throw new ApplicationException("Document could not be finalized");
-                    }
-
-                    if (actionService?.CreateReport(envelope) == false)
-                    {
-                        logger.LogWarning("Document Report could not be created!");
-                        throw new ApplicationException("Document Report could not be created");
-                    }
-
-                    logger.LogDebug("Creating report..");
-                    var report = reportCreator!.CreateReport(envelope);
-                    logger.LogDebug("Report created!");
-
-                    logger.LogDebug("Merging documents ...");
-                    var mergedDocument = pdfMerger!.MergeDocuments(burnedDocument, report);
-                    logger.LogDebug("Documents merged!");
-
-                    var outputDirectoryPath = Path.Combine(_config.ExportPath, _parentFolderUid);
-                    logger.LogDebug("oOutputDirectoryPath is {outputDirectoryPath}", outputDirectoryPath);
-                    if (!Directory.Exists(outputDirectoryPath))
-                    {
-                        logger.LogDebug("Directory not existing. Creating ... ");
-                        Directory.CreateDirectory(outputDirectoryPath);
-                    }
-
-                    var outputFilePath = Path.Combine(outputDirectoryPath, $"{envelope.Uuid}.pdf");
-                    logger.LogDebug("Writing finalized Pdf to disk..");
-                    logger.LogInformation("Output path is [{outputFilePath}]", outputFilePath);
-
-                    try
-                    {
-                        File.WriteAllBytes(outputFilePath, mergedDocument);
-                    }
-                    catch (Exception ex)
-                    {
-                        logger.LogWarning("Could not export final document to disk!");
-                        throw new ExportDocumentException("Could not export final document to disk!", ex);
-                    }
-
-                    logger.LogDebug("Writing EB-bytes to database...");
-                    UpdateFileDb(outputFilePath, envelope.Id);
-
-                    if (!SendFinalEmails(envelope))
-                    {
-                        throw new ApplicationException("Final emails could not be sent!");
-                    }
-
-                    logger.LogInformation("Report-mails successfully sent!");
-
-                    logger.LogDebug("Setting envelope status..");
-                    if (actionService?.FinalizeEnvelope(envelope) == false)
-                    {
-                        logger.LogWarning("Envelope could not be finalized!");
-                        throw new ApplicationException("Envelope could not be finalized");
-                    }
-                }
-                catch (Exception ex)
-                {
-                    logger.LogError(ex);
-                    logger.LogWarning(ex, "Unhandled exception while working envelope [{id}]", id);
-                }
-
-                current += 1;
-                logger.LogInformation("Envelope [{id}] finalized!", id);
-            }
-
-            logger.LogDebug("Completed job {jobId} successfully!", jobId);
-        }
-        catch (MergeDocumentException ex)
-        {
-            logger.LogWarning("Certificate Document job failed at step: Merging documents!");
-            logger.LogError(ex);
-        }
-        catch (ExportDocumentException ex)
-        {
-            logger.LogWarning("Certificate Document job failed at step: Exporting document!");
-            logger.LogError(ex);
-        }
-        catch (Exception ex)
-        {
-            logger.LogWarning("Certificate Document job failed!");
-            logger.LogError(ex);
-        }
-        finally
-        {
-            logger.LogDebug("Job execution for [{jobId}] ended", jobId);
-        }
-
-        return Task.FromResult(true);
-    }
-
-    private void UpdateFileDb(string filePath, long envelopeId)
-    {
-        try
-        {
-            var imageData = ReadFile(filePath);
-            if (imageData is null)
-            {
-                return;
-            }
-
-            var query = $"UPDATE TBSIG_ENVELOPE SET DOC_RESULT = @ImageData WHERE GUID = {envelopeId}";
-            using var command = new SqlCommand(query, _database!.GetConnection);
-            command.Parameters.Add(new SqlParameter("@ImageData", imageData));
-            command.ExecuteNonQuery();
-        }
-        catch (Exception ex)
-        {
-            logger?.LogError(ex);
-        }
-    }
-
-    private static byte[]? ReadFile(string path)
-    {
-        var fileInfo = new FileInfo(path);
-        var numBytes = fileInfo.Length;
-        using var stream = new FileStream(path, FileMode.Open, FileAccess.Read);
-        using var reader = new BinaryReader(stream);
-        return reader.ReadBytes((int)numBytes);
-    }
-
-    private bool SendFinalEmails(Envelope envelope)
-    {
-        var mailToCreator = (FinalEmailType)(envelope.FinalEmailToCreator ?? 0);
-        var mailToReceivers = (FinalEmailType)(envelope.FinalEmailToReceivers ?? 0);
-
-        if (mailToCreator != FinalEmailType.No)
-        {
-            logger?.LogDebug("Sending email to creator ...");
-            SendFinalEmailToCreator(envelope, mailToCreator);
-        }
-        else
-        {
-            logger?.LogWarning("No SendFinalEmailToCreator - oMailToCreator [{0}] <> [{1}] ", mailToCreator, FinalEmailType.No);
-        }
-
-        if (mailToReceivers != FinalEmailType.No)
-        {
-            logger?.LogDebug("Sending emails to receivers..");
-            SendFinalEmailToReceivers(envelope, mailToReceivers);
-        }
-        else
-        {
-            logger?.LogWarning("No SendFinalEmailToReceivers - oMailToCreator [{0}] <> [{1}] ", mailToReceivers, FinalEmailType.No);
-        }
-
-        return true;
-    }
-
-    private bool SendFinalEmailToCreator(Envelope envelope, FinalEmailType mailToCreator)
-    {
-        var includeAttachment = SendFinalEmailWithAttachment(mailToCreator);
-        logger?.LogDebug("Attachment included: [{0}]", includeAttachment);
-
-        if (actionService?.CompleteEnvelope(envelope) == false)
-        {
-            logger?.LogError(new Exception("CompleteEnvelope failed"), "Envelope could not be completed for receiver [{0}]", envelope.User?.Email);
-            return false;
-        }
-
-        return true;
-    }
-
-    private bool SendFinalEmailToReceivers(Envelope envelope, FinalEmailType mailToReceivers)
-    {
-        var includeAttachment = SendFinalEmailWithAttachment(mailToReceivers);
-        logger?.LogDebug("Attachment included: [{0}]", includeAttachment);
-
-        foreach (var receiver in envelope.EnvelopeReceivers ?? Enumerable.Empty<EnvelopeReceiver>())
-        {
-            if (actionService?.CompleteEnvelope(envelope, receiver.Receiver) == false)
-            {
-                logger?.LogError(new Exception("CompleteEnvelope failed"), "Envelope could not be completed for receiver [{0}]", receiver.Receiver?.EmailAddress);
-                return false;
-            }
-        }
-
-        return true;
-    }
-
-    private static bool SendFinalEmailWithAttachment(FinalEmailType type)
-    {
-        return type == FinalEmailType.YesWithAttachment;
-    }
-
-    private byte[] BurnAnnotationsToPdf(EnvelopeData envelopeData)
-    {
-        var envelopeId = envelopeData.EnvelopeId;
-
-        logger?.LogInformation("Burning [{0}] signatures", envelopeData.AnnotationData.Count);
-        var annotations = envelopeData.AnnotationData;
-        var inputPath = string.Empty;
-        if (envelopeData.DocAsByte is null)
-        {
-            inputPath = envelopeData.DocumentPath;
-            logger?.LogInformation("Input path: [{0}]", inputPath);
-        }
-        else
-        {
-            logger?.LogDebug("we got bytes..");
-            inputPath = _config!.DocumentPathOrigin;
-            logger?.LogDebug("oInputPath: {0}", _config.DocumentPathOrigin);
-        }
-
-        if (envelopeData.DocAsByte is null)
-        {
-            var directorySource = Path.GetDirectoryName(inputPath) ?? string.Empty;
-            var split = directorySource.Split('\\');
-            _parentFolderUid = split[^1];
-        }
-        else
-        {
-            _parentFolderUid = envelopeData.EnvelopeUuid;
-        }
-
-        logger?.LogInformation("ParentFolderUID: [{0}]", _parentFolderUid);
-        byte[] inputDocumentBuffer;
-        if (envelopeData.DocAsByte is not null)
-        {
-            inputDocumentBuffer = envelopeData.DocAsByte;
-        }
-        else
-        {
-            try
-            {
-                inputDocumentBuffer = File.ReadAllBytes(inputPath);
-            }
-            catch (Exception ex)
-            {
-                throw new BurnAnnotationException("Source document could not be read from disk!", ex);
-            }
-        }
-
-        return pdfBurner!.BurnAnnotsToPDF(inputDocumentBuffer, annotations, envelopeId);
-    }
-
-    private EnvelopeData? GetEnvelopeData(int envelopeId)
-    {
-        var sql = $"SELECT T.GUID, T.ENVELOPE_UUID, T.ENVELOPE_TYPE, T2.FILEPATH, T2.BYTE_DATA FROM [dbo].[TBSIG_ENVELOPE] T\n                JOIN TBSIG_ENVELOPE_DOCUMENT T2 ON T.GUID = T2.ENVELOPE_ID\n                WHERE T.GUID = {envelopeId}";
-        var table = _database!.GetDatatable(sql);
-        var row = table.Rows.Cast<DataRow>().SingleOrDefault();
-        if (row is null)
-        {
-            return null;
-        }
-
-        var annotationData = GetAnnotationData(envelopeId);
-        var data = new EnvelopeData
-        {
-            EnvelopeId = envelopeId,
-            DocumentPath = row.ItemEx("FILEPATH", string.Empty),
-            AnnotationData = annotationData,
-            DocAsByte = row.Field<byte[]?>("BYTE_DATA"),
-            EnvelopeUuid = row.ItemEx("ENVELOPE_UUID", string.Empty)
-        };
-
-        logger?.LogDebug("Document path: [{0}]", data.DocumentPath);
-
-        return data;
-    }
-
-    private List<string> GetAnnotationData(int envelopeId)
-    {
-        var sql = $"SELECT VALUE FROM TBSIG_DOCUMENT_STATUS WHERE ENVELOPE_ID = {envelopeId}";
-        var table = _database!.GetDatatable(sql);
-
-        return table.Rows.Cast<DataRow>()
-            .Select(r => r.ItemEx("VALUE", string.Empty))
-            .ToList();
-    }
-}
--- a/EnvelopeGenerator.ServiceHost/Jobs/Infrastructure/Database.cs
+++ b/EnvelopeGenerator.ServiceHost/Jobs/Infrastructure/Database.cs
@@ -1,60 +0,0 @@
-using System.Data;
-using Microsoft.Data.SqlClient;
-
-namespace DigitalData.Modules.Database;
-
-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;
-    }
-}
--- a/EnvelopeGenerator.ServiceHost/Jobs/ReportModel.cs
+++ b/EnvelopeGenerator.ServiceHost/Jobs/ReportModel.cs
@@ -1,15 +0,0 @@
-using DigitalData.Modules.Database;
-using System.Data;
-
-namespace EnvelopeGenerator.ServiceHost.Jobs;
-
-[Obsolete("Create and use EnvelopeReport mediator queries")]
-public class ReportModel(MSSQLServer Database)
-{
-    [Obsolete("Create and use EnvelopeReport mediator queries")]
-    public DataTable List(int envelopeId)
-    {
-        var sql = $"SELECT * FROM VWSIG_ENVELOPE_REPORT WHERE ENVELOPE_ID = {envelopeId}";
-        return Database.GetDatatable(sql);
-    }
-}
--- a/EnvelopeGenerator.ServiceHost/Jobs/State.cs
+++ b/EnvelopeGenerator.ServiceHost/Jobs/State.cs
@@ -1,14 +0,0 @@
-using DigitalData.Modules.Database;
-using EnvelopeGenerator.Domain.Entities;
-
-namespace EnvelopeGenerator.ServiceHost.Jobs;
-
-[Obsolete("Use DbContext")]
-public class State
-{
-    public int UserId { get; set; }
-    public FormUser? User { get; set; }
-    public Config? Config { get; set; }
-    public DbConfig? DbConfig { get; set; }
-    public MSSQLServer? Database { get; set; }
-}
--- a/EnvelopeGenerator.ServiceHost/Jobs/TempFiles.cs
+++ b/EnvelopeGenerator.ServiceHost/Jobs/TempFiles.cs
@@ -1,73 +0,0 @@
-using EnvelopeGenerator.ServiceHost.Extensions;
-
-namespace EnvelopeGenerator.ServiceHost.Jobs;
-
-public class TempFiles
-{
-    public string TempPath { get; }
-
-    private readonly ILogger<TempFiles> _logger;
-
-    public TempFiles(ILogger<TempFiles> logger)
-    {
-        _logger = logger;
-        var tempDirectoryPath = Path.GetTempPath();
-        TempPath = Path.Combine(tempDirectoryPath, "EnvelopeGenerator");
-    }
-
-    public bool Create()
-    {
-        try
-        {
-            if (!Directory.Exists(TempPath))
-            {
-                Directory.CreateDirectory(TempPath);
-            }
-            else
-            {
-                CleanUpFiles();
-            }
-
-            return true;
-        }
-        catch (Exception ex)
-        {
-            _logger.LogError(ex);
-            return false;
-        }
-    }
-
-    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;
-        }
-    }
-
-    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;
-        }
-    }
-}
--- a/EnvelopeGenerator.ServiceHost/Jobs/WorkerOptions.cs
+++ b/EnvelopeGenerator.ServiceHost/Jobs/WorkerOptions.cs
@@ -1,29 +0,0 @@
-using EnvelopeGenerator.ServiceHost.Jobs.FinalizeDocument;
-using System.Drawing;
-
-namespace EnvelopeGenerator.ServiceHost.Jobs;
-
-public class WorkerOptions
-{
-    public string GdPictureLicenseKey { get; set; } = null!;
-
-    [Obsolete("Use ILogger.")]
-    public bool Debug { 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;
-    }
-}
--- a/EnvelopeGenerator.ServiceHost/Program.cs
+++ b/EnvelopeGenerator.ServiceHost/Program.cs
@@ -1,31 +0,0 @@
-using EnvelopeGenerator.ServiceHost;
-using EnvelopeGenerator.ServiceHost.Extensions;
-
-var builder = WebApplication.CreateBuilder(args);
-
-// Add services to the container.
-
-builder.Services.AddControllers();
-builder.Services.AddFinalizeDocumentJob(builder.Configuration);
-builder.Services.AddHostedService<Worker>();
-
-// Learn more about configuring Swagger/OpenAPI at https://aka.ms/aspnetcore/swashbuckle
-builder.Services.AddEndpointsApiExplorer();
-builder.Services.AddSwaggerGen();
-
-var app = builder.Build();
-
-// Configure the HTTP request pipeline.
-if (app.Environment.IsDevelopment())
-{
-    app.UseSwagger();
-    app.UseSwaggerUI();
-}
-
-app.UseHttpsRedirection();
-
-app.UseAuthorization();
-
-app.MapControllers();
-
-app.Run();
--- a/EnvelopeGenerator.ServiceHost/Properties/launchSettings.json
+++ b/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"
-      }
-    }
-  }
-}
--- a/EnvelopeGenerator.ServiceHost/Worker.cs
+++ b/EnvelopeGenerator.ServiceHost/Worker.cs
@@ -1,31 +0,0 @@
-using EnvelopeGenerator.ServiceHost.Jobs;
-
-namespace EnvelopeGenerator.ServiceHost;
-
-public class Worker : BackgroundService
-{
-    private readonly ILogger<Worker> _logger;
-    private readonly int _delayMilliseconds;
-    private readonly FinalizeDocumentJob _finalizeDocumentJob;
-
-    public Worker(ILogger<Worker> logger, IConfiguration configuration, FinalizeDocumentJob finalizeDocumentJob)
-    {
-        _logger = logger;
-        _delayMilliseconds = Math.Max(1, configuration.GetValue("Worker:DelayMilliseconds", 1000));
-        _finalizeDocumentJob = finalizeDocumentJob;
-    }
-
-    protected override async Task ExecuteAsync(CancellationToken stoppingToken)
-    {
-        while (!stoppingToken.IsCancellationRequested)
-        {
-            if (_logger.IsEnabled(LogLevel.Information))
-            {
-                _logger.LogInformation("Worker running at: {time}", DateTimeOffset.Now);
-            }
-
-            await _finalizeDocumentJob.ExecuteAsync(stoppingToken);
-            await Task.Delay(_delayMilliseconds, stoppingToken);
-        }
-    }
-}
--- a/EnvelopeGenerator.ServiceHost/appsettings.Development.json
+++ b/EnvelopeGenerator.ServiceHost/appsettings.Development.json
@@ -1,8 +0,0 @@
-{
-  "Logging": {
-    "LogLevel": {
-      "Default": "Information",
-      "Microsoft.AspNetCore": "Warning"
-    }
-  }
-}
--- a/EnvelopeGenerator.ServiceHost/appsettings.json
+++ b/EnvelopeGenerator.ServiceHost/appsettings.json
@@ -1,12 +0,0 @@
-{
-  "Logging": {
-    "LogLevel": {
-      "Default": "Information",
-      "Microsoft.AspNetCore": "Warning"
-    }
-  },
-  "Worker": {
-    "DelayMilliseconds": 1000
-  },
-  "AllowedHosts": "*"
-}
--- a/EnvelopeGenerator.Web/EnvelopeGenerator.Web.csproj
+++ b/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 -->
-		<AssemblyVersion>3.10.0.0</AssemblyVersion>		<!-- Assembly version for API compatibility -->
-		<FileVersion>3.10.0.0</FileVersion>				<!-- Windows file version -->
+		<Version>3.11.0</Version>						<!-- NuGet package version -->
+		<AssemblyVersion>3.11.0.0</AssemblyVersion>		<!-- Assembly version for API compatibility -->
+		<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.Extensions.Caching.SqlServer" Version="7.0.20" />
+		<PackageReference Include="Microsoft.AspNetCore.OpenApi" Version="8.0.17" />
+		<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.Extensions.Caching.SqlServer" Version="7.0.20" />
+		<PackageReference Include="Microsoft.AspNetCore.OpenApi" Version="9.0.6" />
+		<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" />
--- a/EnvelopeGenerator.Web/appsettings.Mail.json
+++ b/EnvelopeGenerator.Web/appsettings.Mail.json
@@ -8,7 +8,6 @@
  "MailParams": {
    "Placeholders": {
      "[NAME_PORTAL]": "signFlow",
-      "[SIGNATURE_TYPE]": "signieren",
      "[REASON]": ""
    }
  }
--- a/EnvelopeGenerator.sln
+++ b/EnvelopeGenerator.sln
@@ -35,8 +35,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "EnvelopeGenerator.Tests", "
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "EnvelopeGenerator.API", "EnvelopeGenerator.API\EnvelopeGenerator.API.csproj", "{EC768913-6270-14F4-1DD3-69C87A659462}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "EnvelopeGenerator.ServiceHost", "EnvelopeGenerator.ServiceHost\EnvelopeGenerator.ServiceHost.csproj", "{5DD82482-E560-405F-BF55-04D647B05BEF}"
-EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -55,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.Build.0 = 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 = 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
@@ -87,10 +85,6 @@ Global
 		{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
 		{EC768913-6270-14F4-1DD3-69C87A659462}.Release|Any CPU.Build.0 = Release|Any CPU
-		{5DD82482-E560-405F-BF55-04D647B05BEF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{5DD82482-E560-405F-BF55-04D647B05BEF}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{5DD82482-E560-405F-BF55-04D647B05BEF}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{5DD82482-E560-405F-BF55-04D647B05BEF}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -110,7 +104,6 @@ Global
 		{211619F5-AE25-4BA5-A552-BACAFE0632D3} = {9943209E-1744-4944-B1BA-4F87FC1A0EEB}
 		{224C4845-1CDE-22B7-F3A9-1FF9297F70E8} = {0CBC2432-A561-4440-89BC-671B66A24146}
 		{EC768913-6270-14F4-1DD3-69C87A659462} = {E3C758DC-914D-4B7E-8457-0813F1FDB0CB}
-		{5DD82482-E560-405F-BF55-04D647B05BEF} = {E3C758DC-914D-4B7E-8457-0813F1FDB0CB}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {73E60370-756D-45AD-A19A-C40A02DACCC7}
Author	SHA1	Message	Date
TekH	bcc17f6def	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.	2026-03-04 16:49:07 +01:00
TekH	8e3c334fa3	Update final status to 'Lesebestätigung' for read confirm Changed the [FINAL_STATUS] placeholder value from "Bestätigung" to the more specific "Lesebestätigung" when an envelope is read and confirmed, improving clarity in status messaging.	2026-03-04 16:19:45 +01:00
TekH	08299451bb	Customize email placeholders by envelope action type Added logic to set email template placeholders based on whether the envelope requires "Read and Confirm" or "Sign" actions. Placeholders such as [SIGNATURE_TYPE], [DOCUMENT_PROCESS], [FINAL_STATUS], [FINAL_ACTION], [REJECTED_BY_OTHERS], and [RECEIVER_ACTION] are now dynamically set to reflect the correct process and status, improving the accuracy and clarity of notification emails.	2026-03-04 16:19:33 +01:00
TekH	59d6d25bdd	Add ChangedWhen property to History entity Added a [NotMapped] ChangedWhen property to the History entity as a wrapper for ActionDate, providing alternative get/set access without affecting the database schema.	2026-03-04 16:09:50 +01:00
TekH	9a516ab3c9	Update and align NuGet dependencies; drop net7.0 from Web - Downgrade Microsoft.Data.SqlClient to 5.2.2 in Application and Infrastructure projects - Downgrade Microsoft.Extensions.DependencyInjection to 8.0.1 for net8.0 in Application - Remove net7.0 target and related packages from Web project - Upgrade OpenApi and Caching.SqlServer to 8.0.17 (net8.0) and 9.0.6 (net9.0) in Web - Ensures consistent, compatible package versions across solution	2026-03-04 16:09:40 +01:00
TekH	8fed342dc5	Remove [SIGNATURE_TYPE] placeholder from MailParams The [SIGNATURE_TYPE] placeholder and its value ("signieren") were removed from the MailParams section in appsettings.Mail.json. This cleans up unused or unnecessary configuration.	2026-03-04 15:17:47 +01:00
TekH	f44643aa3e	Add dynamic email placeholders for confirm/sign workflows Refactored CreatePlaceholders to set email template values based on whether the envelope requires "read and confirm" or signature. Renamed method parameter for clarity and updated usages. Added a TODO for future method unification. Improves email content accuracy for different envelope actions.	2026-03-04 15:02:04 +01:00
TekH	86c99596c4	Implement IEnvelope interface in EnvelopeDto EnvelopeDto now implements the IEnvelope interface, enabling it to be used wherever IEnvelope is required. No other modifications were made to the class.	2026-03-04 14:19:11 +01:00
TekH	2d0c08b2ce	Implement IEnvelope and update Envelope.ReadOnly property Envelope now implements the IEnvelope interface. The ReadOnly property is marked as [Obsolete] and delegates to the IsReadAndConfirm extension method instead of directly checking EnvelopeTypeId. Added a using directive for EnvelopeGenerator.Domain.Interfaces.	2026-03-04 14:19:02 +01:00
TekH	e0aa963184	Add IEnvelope interface and IsReadAndConfirm extension Introduced the IEnvelope interface with an EnvelopeTypeId property in the new EnvelopeGenerator.Domain.Interfaces namespace. Added the EnvelopeExtensions static class with an IsReadAndConfirm extension method to check if EnvelopeTypeId equals 2.	2026-03-04 14:18:28 +01:00
TekH	6d2ec4cc0b	Update DI and Logging packages to v8, adjust binding redirects Upgraded Microsoft.Extensions.DependencyInjection.Abstractions to 8.0.2 and Microsoft.Extensions.Logging.Abstractions to 8.0.3 in project references and packages.config. Updated related binding redirects in App.config. Also modified the solution file to change the build configuration for project {83ED2617-B398-4859-8F59-B38F8807E83E} so Debug\|Any CPU now maps to Release\|Any CPU. Adjusted System.Memory and System.Buffers binding redirect ranges.	2026-02-23 15:54:52 +01:00