refactor(Envelope): remove unnecessary [NotMapped] attribute from DocResult property

- Replaced multiple sequential 'Where' calls with a single LINQ query expression
- Preserved all status filters (Include, Ignore, Min, Max)
- Preserved DocResult filtering logic
- Improves readability while keeping behavior identical

EnvelopeGenerator.Application/Common/Dto/MappingProfile.cs

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

EnvelopeGenerator.Application/Common/Dto/ThirdPartyModuleDto.cs

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

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

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

EnvelopeGenerator.Application/DependencyInjection.cs

@@ -58,6 +58,12 @@ public static class DependencyInjection
             cfg.RegisterServicesFromAssembly(Assembly.GetExecutingAssembly());
         });
 
+        // Add memory cache
+        services.AddMemoryCache();
+
+        // Register mail services
+        services.AddScoped<IEnvelopeMailService, EnvelopeMailService>();
+
         return services;
     }
 }

EnvelopeGenerator.Application/EnvelopeGenerator.Application.csproj

@@ -14,7 +14,7 @@
 
 	<ItemGroup>
 		<PackageReference Include="Dapper" Version="2.1.66" />
-		<PackageReference Include="DigitalData.Core.Abstraction.Application" Version="1.4.0" />
+		<PackageReference Include="DigitalData.Core.Abstraction.Application" Version="1.5.0" />
 		<PackageReference Include="DigitalData.Core.Application" Version="3.4.0" />
 		<PackageReference Include="DigitalData.Core.Client" Version="2.1.0" />
 		<PackageReference Include="DigitalData.Core.Exceptions" Version="1.1.0" />
@@ -25,19 +25,23 @@
 		<PackageReference Include="Otp.NET" Version="1.4.0" />
 		<PackageReference Include="QRCoder" Version="1.6.0" />
 		<PackageReference Include="QRCoder-ImageSharp" Version="0.10.0" />
+		<PackageReference Include="SixLabors.ImageSharp" Version="3.1.12" />
 		<PackageReference Include="UserManager" Version="1.1.3" />
 	</ItemGroup>
 
 	<ItemGroup Condition="'$(TargetFramework)' == 'net7.0'">
 		<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="8.0.0" />
+		<PackageReference Include="System.Formats.Asn1" Version="8.0.2" />
 	</ItemGroup>
 
 	<ItemGroup Condition="'$(TargetFramework)' == 'net8.0'">
 		<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="9.0.5" />
+		<PackageReference Include="System.Formats.Asn1" Version="9.0.10" />
 	</ItemGroup>
 
 	<ItemGroup Condition="'$(TargetFramework)' == 'net9.0'">
 		<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="9.0.5" />
+		<PackageReference Include="System.Formats.Asn1" Version="9.0.10" />
 	</ItemGroup>
 
 	<ItemGroup>

EnvelopeGenerator.Application/Envelopes/Queries/ReadEnvelopeQuery.cs

@@ -1,18 +1,29 @@
 using MediatR;
 using EnvelopeGenerator.Domain.Constants;
 using EnvelopeGenerator.Application.Common.Query;
+using EnvelopeGenerator.Application.Common.Dto;
+using AutoMapper;
+using DigitalData.Core.Abstraction.Application.Repository;
+using EnvelopeGenerator.Application.Common.Extensions;
+using EnvelopeGenerator.Domain.Entities;
+using Microsoft.EntityFrameworkCore;
 
 namespace EnvelopeGenerator.Application.Envelopes.Queries;
 
 /// <summary>
 /// Repräsentiert eine Abfrage für Umschläge.
 /// </summary>
-public record ReadEnvelopeQuery : EnvelopeQueryBase, IRequest
+public record ReadEnvelopeQuery : EnvelopeQueryBase, IRequest<IEnumerable<EnvelopeDto>>
 {
     /// <summary>
     /// Abfrage des Include des Umschlags
     /// </summary>
     public EnvelopeStatusQuery? Status { get; init; }
+
+    /// <summary>
+    /// 
+    /// </summary>
+    public bool? HasDocResult { get; init; }
 }
 
 /// <summary>
@@ -65,4 +76,53 @@ public record EnvelopeStatusQuery
     /// Eine Liste von Statuswerten, die ignoriert werden werden.
     /// </summary>
     public EnvelopeStatus[]? Ignore { get; init; }
+}
+
+/// <summary>
+/// 
+/// </summary>
+public class ReadEnvelopeQueryHandler : IRequestHandler<ReadEnvelopeQuery, IEnumerable<EnvelopeDto>>
+{
+    private readonly IMapper _mapper;
+
+    private readonly IRepository<Envelope> _repo;
+
+    /// <summary>
+    /// 
+    /// </summary>
+    /// <param name="mapper"></param>
+    /// <param name="repo"></param>
+    public ReadEnvelopeQueryHandler(IMapper mapper, IRepository<Envelope> repo)
+    {
+        _mapper = mapper;
+        _repo = repo;
+    }
+
+    /// <summary>
+    /// 
+    /// </summary>
+    /// <param name="request"></param>
+    /// <param name="cancel"></param>
+    /// <returns></returns>
+    /// <exception cref="NotImplementedException"></exception>
+    public async Task<IEnumerable<EnvelopeDto>> Handle(ReadEnvelopeQuery request, CancellationToken cancel)
+    {
+        var envelopesQ = _repo.Query.Where(request, notnull: false);
+
+        EnvelopeStatusQuery? statusQ = request.Status;
+        bool? hasDocResult = request.HasDocResult;
+
+        var filtered =
+            from envelope in envelopesQ
+            where (statusQ == null || statusQ.Include == null || statusQ.Include.Contains(envelope.Status))
+               && (statusQ == null || statusQ.Ignore == null || !statusQ.Ignore.Contains(envelope.Status))
+               && (statusQ == null || statusQ.Min == null || envelope.Status > statusQ.Min)
+               && (statusQ == null || statusQ.Max == null || envelope.Status < statusQ.Max)
+               && (!hasDocResult.HasValue || (hasDocResult.Value ? envelope.DocResult != null : envelope.DocResult == null))
+            select envelope;
+
+        var envelopes = await filtered.ToListAsync(cancel);
+
+        return _mapper.Map<IEnumerable<EnvelopeDto>>(envelopes);
+    }
 }

EnvelopeGenerator.Application/ThirdPartyModules/Queries/ReadThirdPartyModuleQuery.cs

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

EnvelopeGenerator.BBTests/EnvelopeGenerator.BBTests.vbproj

@@ -70,8 +70,8 @@
     <Reference Include="DigitalData.Controls.DocumentViewer, Version=1.9.8.0, Culture=neutral, processorArchitecture=MSIL">
       <HintPath>..\packages\DigitalData.Controls.DocumentViewer.1.9.8\lib\net462\DigitalData.Controls.DocumentViewer.dll</HintPath>
     </Reference>
-    <Reference Include="DigitalData.Core.Abstraction.Application, Version=1.4.0.0, Culture=neutral, processorArchitecture=MSIL">
+    <Reference Include="DigitalData.Core.Abstraction.Application, Version=1.5.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\DigitalData.Core.Abstraction.Application.1.4.0\lib\net462\DigitalData.Core.Abstraction.Application.dll</HintPath>
+      <HintPath>..\packages\DigitalData.Core.Abstraction.Application.1.5.0\lib\net462\DigitalData.Core.Abstraction.Application.dll</HintPath>
     </Reference>
     <Reference Include="DigitalData.Core.Abstractions, Version=4.3.0.0, Culture=neutral, processorArchitecture=MSIL">
       <HintPath>..\packages\DigitalData.Core.Abstractions.4.3.0\lib\net462\DigitalData.Core.Abstractions.dll</HintPath>

EnvelopeGenerator.BBTests/frmFinalizePDF.vb

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

EnvelopeGenerator.BBTests/packages.config

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

EnvelopeGenerator.CommonServices/EnvelopeGenerator.CommonServices.vbproj

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

EnvelopeGenerator.CommonServices/Jobs/FinalizeDocument/FinalizeDocumentJob.vb

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

EnvelopeGenerator.CommonServices/packages.config

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

EnvelopeGenerator.DependencyInjection/DependencyInjection.cs

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

EnvelopeGenerator.DependencyInjection/EnvelopeGenerator.DependencyInjection.csproj

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

EnvelopeGenerator.Domain/Entities/Envelope.cs

@@ -2,7 +2,6 @@
 using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
 using EnvelopeGenerator.Domain.Constants;
-
 #if NETFRAMEWORK
 using System;
 using System.Collections.Generic;
@@ -134,14 +133,12 @@ public class Envelope
         = false;
 #endif
 
-    [NotMapped]
     [Column("DOC_RESULT")]
     public byte[]
 #if NET
         ?
 #endif
-        DocResult
+        DocResult { get; set; }
-    { get; set; }
 
     [ForeignKey("EnvelopeTypeId")]
     public virtual EnvelopeType

EnvelopeGenerator.Domain/Entities/ThirdPartyModule.cs

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

EnvelopeGenerator.Finalizer/EnvelopeGenerator.Finalizer.csproj

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

EnvelopeGenerator.Finalizer/Extensions.cs

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

EnvelopeGenerator.Finalizer/Job/EnvelopeTaskApiJob.cs

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

EnvelopeGenerator.Finalizer/Job/FinishEnvelopeJob.cs

@@ -0,0 +1,45 @@
+using EnvelopeGenerator.Application.Envelopes.Queries;
+using EnvelopeGenerator.Domain.Constants;
+using EnvelopeGenerator.Finalizer.Models;
+using MediatR;
+using Microsoft.Extensions.Options;
+using Quartz;
+
+namespace EnvelopeGenerator.Finalizer.Job
+{
+    public class FinishEnvelopeJob : IJob
+    {
+        private readonly ILogger<FinishEnvelopeJob> _logger;
+
+        private readonly GdPictureOptions _gdPictureOptions;
+
+        private readonly IMediator _mediator;
+
+        public FinishEnvelopeJob(ILogger<FinishEnvelopeJob> logger, IOptions<GdPictureOptions> gdPictureOptions, IMediator mediator)
+        {
+            _logger = logger;
+            _gdPictureOptions = gdPictureOptions.Value;
+            _mediator = mediator;
+        }
+
+        public async Task Execute(IJobExecutionContext context)
+        {
+            var cancel = context.CancellationToken;
+            if (_logger.IsEnabled(LogLevel.Information))
+            {
+                _logger.LogInformation("{jobName} running at: {time}", context.JobDetail.Key, DateTimeOffset.Now);
+            }
+
+            var envelopes = await _mediator.Send(new ReadEnvelopeQuery()
+            {
+                Status = new() { Include = [EnvelopeStatus.EnvelopeCompletelySigned] },
+                HasDocResult = false
+            }, cancel);
+
+            foreach (var envelope in envelopes) 
+            {
+                // add sub-steps
+            }
+        }
+    }
+}

EnvelopeGenerator.Finalizer/Models/GdPictureOptions.cs

@@ -0,0 +1,9 @@
+namespace EnvelopeGenerator.Finalizer.Models;
+
+public class GdPictureOptions
+{
+    /// <summary>
+    /// 
+    /// </summary>
+    public string License { get; set; } = null!;
+}

EnvelopeGenerator.Finalizer/Program.cs

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

EnvelopeGenerator.Finalizer/Properties/launchSettings.json

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

EnvelopeGenerator.Finalizer/appsettings.Database.json

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

EnvelopeGenerator.Finalizer/appsettings.Development.json

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

EnvelopeGenerator.Finalizer/appsettings.Job.json

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

EnvelopeGenerator.Finalizer/appsettings.Logging.json

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

EnvelopeGenerator.Finalizer/appsettings.PdfBurner.json

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

EnvelopeGenerator.Finalizer/appsettings.json

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

EnvelopeGenerator.GeneratorAPI/Program.cs

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

EnvelopeGenerator.Infrastructure/DependencyInjection.cs

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

EnvelopeGenerator.Infrastructure/EGDbContext.cs

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

EnvelopeGenerator.Infrastructure/EnvelopeGenerator.Infrastructure.csproj

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

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

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

EnvelopeGenerator.Infrastructure/Migrations/EGDbContextModelSnapshot.cs

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

EnvelopeGenerator.Tests.Application/EnvelopeGenerator.Tests.Application.csproj

@@ -20,7 +20,7 @@
   <ItemGroup>
     <PackageReference Include="Bogus" Version="35.6.3" />
     <PackageReference Include="coverlet.collector" Version="6.0.0" />
-    <PackageReference Include="DigitalData.Core.Abstraction.Application" Version="1.4.0" />
+    <PackageReference Include="DigitalData.Core.Abstraction.Application" Version="1.5.0" />
     <PackageReference Include="DigitalData.Core.Abstractions" Version="4.3.0" />
     <PackageReference Include="DigitalData.Core.API" Version="2.2.1" />
     <PackageReference Include="DigitalData.Core.Application" Version="3.4.0" />

EnvelopeGenerator.Web/Program.cs

@@ -1,4 +1,3 @@
-using EnvelopeGenerator.Application.Services;
 using Microsoft.EntityFrameworkCore;
 using NLog;
 using Quartz;
@@ -16,7 +15,6 @@ using EnvelopeGenerator.Web.Sanitizers;
 using EnvelopeGenerator.Web.Models.Annotation;
 using DigitalData.UserManager.DependencyInjection;
 using EnvelopeGenerator.Web.Middleware;
-using EnvelopeGenerator.Application.Common.Interfaces.Services;
 
 var logger = LogManager.Setup().LoadConfigurationFromAppSettings().GetCurrentClassLogger();
 logger.Info("Logging initialized!");
@@ -88,6 +86,7 @@ try
         builder.Services.AddSwaggerGen();
     }
 
+    // TODO: Update to configure with EnvelopeGenerator.DependencyInjection
     //AddEF Core dbcontext
     var useDbMigration = Environment.GetEnvironmentVariable("MIGRATION_TEST_MODE") == true.ToString() || config.GetValue<bool>("UseDbMigration");
     var cnnStrName = useDbMigration ? "DbMigrationTest" : "Default";
@@ -103,7 +102,7 @@ try
 
     // Add envelope generator services
 #pragma warning disable CS0618 // Type or member is obsolete
-    builder.Services.AddEnvelopeGeneratorInfrastructureServices(
+    builder.Services.AddEGInfrastructureServices(
         opt =>
         {
             opt.AddDbTriggerParams(config);
@@ -186,15 +185,8 @@ try
     builder.Services.Configure<Cultures>(config.GetSection("Cultures"));
     builder.Services.AddSingleton(sp => sp.GetRequiredService<IOptions<Cultures>>().Value);
 
-    // Register mail services
-#pragma warning disable CS0618 // Type or member is obsolete
-    builder.Services.AddScoped<IEnvelopeMailService, EnvelopeMailService>();
-#pragma warning restore CS0618 // Type or member is obsolete
-
     builder.Services.AddDispatcher<EGDbContext>();
 
-    builder.Services.AddMemoryCache();
-
     builder.ConfigureBySection<CustomImages>();
 
     builder.ConfigureBySection<AnnotationParams>();

EnvelopeGenerator.sln

@@ -37,6 +37,10 @@ Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "EnvelopeGenerator.Form", "E
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "EnvelopeGenerator.PdfEditor", "EnvelopeGenerator.PdfEditor\EnvelopeGenerator.PdfEditor.csproj", "{211619F5-AE25-4BA5-A552-BACAFE0632D3}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "EnvelopeGenerator.DependencyInjection", "EnvelopeGenerator.DependencyInjection\EnvelopeGenerator.DependencyInjection.csproj", "{B97DE7DD-3190-4A84-85E9-E57AD735BE61}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "EnvelopeGenerator.Finalizer", "EnvelopeGenerator.Finalizer\EnvelopeGenerator.Finalizer.csproj", "{C4970E6C-DB2E-48C5-B3C5-2AF589405ED9}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -91,6 +95,14 @@ Global
 		{211619F5-AE25-4BA5-A552-BACAFE0632D3}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{211619F5-AE25-4BA5-A552-BACAFE0632D3}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{211619F5-AE25-4BA5-A552-BACAFE0632D3}.Release|Any CPU.Build.0 = Release|Any CPU
+		{B97DE7DD-3190-4A84-85E9-E57AD735BE61}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{B97DE7DD-3190-4A84-85E9-E57AD735BE61}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{B97DE7DD-3190-4A84-85E9-E57AD735BE61}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{B97DE7DD-3190-4A84-85E9-E57AD735BE61}.Release|Any CPU.Build.0 = Release|Any CPU
+		{C4970E6C-DB2E-48C5-B3C5-2AF589405ED9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{C4970E6C-DB2E-48C5-B3C5-2AF589405ED9}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{C4970E6C-DB2E-48C5-B3C5-2AF589405ED9}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{C4970E6C-DB2E-48C5-B3C5-2AF589405ED9}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -111,6 +123,8 @@ Global
 		{A9F9B431-BB9B-49B8-9E2C-0703634A653A} = {E3C758DC-914D-4B7E-8457-0813F1FDB0CB}
 		{6D56C01F-D6CB-4D8A-BD3D-4FD34326998C} = {E3C758DC-914D-4B7E-8457-0813F1FDB0CB}
 		{211619F5-AE25-4BA5-A552-BACAFE0632D3} = {9943209E-1744-4944-B1BA-4F87FC1A0EEB}
+		{B97DE7DD-3190-4A84-85E9-E57AD735BE61} = {E3C758DC-914D-4B7E-8457-0813F1FDB0CB}
+		{C4970E6C-DB2E-48C5-B3C5-2AF589405ED9} = {E3C758DC-914D-4B7E-8457-0813F1FDB0CB}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {73E60370-756D-45AD-A19A-C40A02DACCC7}