Add MapAddedWhen to History mapping in MappingProfile

Imported necessary namespaces and updated the CreateHistoryCommand-to-History mapping to include the MapAddedWhen extension method, likely to handle automatic setting of creation timestamps or similar metadata.

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

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

EnvelopeGenerator.Application/DocStatus/Commands/CreateDocStatusCommand.cs

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

EnvelopeGenerator.Application/DocStatus/Commands/ModifyDocStatusCommandBase.cs

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

EnvelopeGenerator.Application/DocStatus/Commands/SaveDocStatusCommand.cs

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

EnvelopeGenerator.Application/DocStatus/Commands/UpdateDocStatusCommand.cs

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

EnvelopeGenerator.Application/DocStatus/MappingProfile.cs

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

EnvelopeGenerator.Application/Histories/Commands/CreateHistoryCommand.cs

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

EnvelopeGenerator.Application/Histories/MappingProfile.cs

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

EnvelopeGenerator.Domain/Entities/DocumentStatus.cs

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

EnvelopeGenerator.Domain/Entities/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
     }
 }

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>

EnvelopeGenerator.ServiceHost/Exceptions/BurnAnnotationException.cs

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

EnvelopeGenerator.ServiceHost/Exceptions/CreateReportException.cs

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

EnvelopeGenerator.ServiceHost/Exceptions/ExportDocumentException.cs

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

EnvelopeGenerator.ServiceHost/Exceptions/MergeDocumentException.cs

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

EnvelopeGenerator.ServiceHost/Extensions/DataRowExtensions.cs

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

EnvelopeGenerator.ServiceHost/Extensions/DependencyInjection.cs

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

EnvelopeGenerator.ServiceHost/Extensions/LoggerExtensions.cs

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

EnvelopeGenerator.ServiceHost/Jobs/ActionService.cs

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

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();
-        }
-    }
-}

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; }
-}

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;
-        }
-    }
-}

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;
-    }
-}

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();
-    }
-}

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);
-        }
-    }
-}

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; }
-}

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();
-}

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);
-    }
-}

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();
-    }
-}

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;
-    }
-}

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);
-    }
-}

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; }
-}

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;
-        }
-    }
-}

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;
-    }
-}

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();

EnvelopeGenerator.ServiceHost/Properties/launchSettings.json

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

EnvelopeGenerator.ServiceHost/Worker.cs

@@ -1,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);
-        }
-    }
-}

EnvelopeGenerator.ServiceHost/appsettings.Development.json

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

EnvelopeGenerator.ServiceHost/appsettings.json

@@ -1,12 +0,0 @@
-{
-  "Logging": {
-    "LogLevel": {
-      "Default": "Information",
-      "Microsoft.AspNetCore": "Warning"
-    }
-  },
-  "Worker": {
-    "DelayMilliseconds": 1000
-  },
-  "AllowedHosts": "*"
-}

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
@@ -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}