Refactor TestSanitizeController for improved clarity

- Updated namespace for consistency.
- Changed constructor and method parameters to non-nullable strings.
- Enhanced method signatures for `Sanitize` and `Encoder`.
- Improved overall class structure and formatting for better readability.

EnvelopeGenerator.Application/Contracts/Repositories/IEmailTemplateRepository.cs

@@ -7,7 +7,7 @@ namespace EnvelopeGenerator.Application.Contracts.Repositories;
 /// <summary>
 /// 
 /// </summary>
-[Obsolete("Use Read-method returning IReadQuery<TEntity> instead.")]
+[Obsolete("Use IRepository")]
 public interface IEmailTemplateRepository : ICRUDRepository<EmailTemplate, int>
 {
     /// <summary>

EnvelopeGenerator.Application/Contracts/Repositories/IEnvelopeReceiverRepository.cs

@@ -6,6 +6,7 @@ namespace EnvelopeGenerator.Application.Contracts.Repositories;
 /// <summary>
 /// 
 /// </summary>
+[Obsolete("Use IRepository")]
 public interface IEnvelopeReceiverRepository : ICRUDRepository<EnvelopeReceiver, (int Envelope, int Receiver)>
 {
     /// <summary>

EnvelopeGenerator.Application/Contracts/Repositories/IUserReceiverRepository.cs

@@ -1,12 +0,0 @@
-using DigitalData.Core.Abstraction.Application.Repository;
-using EnvelopeGenerator.Domain.Entities;
-
-namespace EnvelopeGenerator.Application.Contracts.Repositories;
-
-/// <summary>
-/// 
-/// </summary>
-[Obsolete("Use IRepository")]
-public interface IUserReceiverRepository : ICRUDRepository<UserReceiver, int>
-{
-}

EnvelopeGenerator.Application/Contracts/Services/IReceiverService.cs

@@ -1,5 +1,4 @@
-using DigitalData.Core.Abstractions;
+using DigitalData.Core.Abstraction.Application;
-using DigitalData.Core.Abstraction.Application;
 using DigitalData.Core.Abstraction.Application.DTO;
 using EnvelopeGenerator.Application.DTOs.Receiver;
 using EnvelopeGenerator.Domain.Entities;
@@ -27,12 +26,4 @@ public interface IReceiverService : ICRUDService<ReceiverCreateDto, ReceiverRead
     /// <param name="signature"></param>
     /// <returns></returns>
     Task<Result> DeleteByAsync(string? emailAddress = null, string? signature = null);
-
-    /// <summary>
-    /// 
-    /// </summary>
-    /// <typeparam name="TUpdateDto"></typeparam>
-    /// <param name="updateDto"></param>
-    /// <returns></returns>
-    Task<Result> UpdateAsync<TUpdateDto>(TUpdateDto updateDto);
 }

EnvelopeGenerator.Application/Contracts/Services/ISmsSender.cs

@@ -3,9 +3,21 @@
 namespace EnvelopeGenerator.Application.Contracts.Services;
 
 //TODO: move to DigitalData.Core
+/// <summary>
+/// 
+/// </summary>
 public interface ISmsSender
 {
+    /// <summary>
+    /// 
+    /// </summary>
     string ServiceProvider { get; }
 
+    /// <summary>
+    /// 
+    /// </summary>
+    /// <param name="recipient"></param>
+    /// <param name="message"></param>
+    /// <returns></returns>
     Task<SmsResponse> SendSmsAsync(string recipient, string message);
 }

EnvelopeGenerator.Application/Contracts/Services/IUserReceiverService.cs

@@ -1,13 +0,0 @@
-using DigitalData.Core.Abstraction.Application;
-using EnvelopeGenerator.Application.DTOs;
-using EnvelopeGenerator.Domain.Entities;
-
-namespace EnvelopeGenerator.Application.Contracts.Services;
-
-/// <summary>
-/// 
-/// </summary>
-[Obsolete("Use MediatR")]
-public interface IUserReceiverService : IBasicCRUDService<UserReceiverDto, UserReceiver, int>
-{
-}

EnvelopeGenerator.Application/DTOs/ConfigDto.cs

@@ -8,11 +8,6 @@ namespace EnvelopeGenerator.Application.DTOs;
 [ApiExplorerSettings(IgnoreApi = true)]
 public class ConfigDto
 {
-    /// <summary>
-    /// Gets or sets the path to the document.
-    /// </summary>
-    public string? DocumentPath { get; set; }
-
     /// <summary>
     /// Gets or sets the sending profile identifier.
     /// </summary>
@@ -21,7 +16,7 @@ public class ConfigDto
     /// <summary>
     /// Gets or sets the signature host URL or name.
     /// </summary>
-    public string? SignatureHost { get; set; }
+    public required string SignatureHost { get; set; }
 
     /// <summary>
     /// Gets or sets the name of the external program.

EnvelopeGenerator.Application/DTOs/MappingProfile.cs

@@ -37,7 +37,6 @@ public class MappingProfile : Profile
         CreateMap<Domain.Entities.Receiver, ReceiverReadDto>();
         CreateMap<Domain.Entities.Receiver, ReceiverCreateDto>();
         CreateMap<Domain.Entities.Receiver, ReceiverUpdateDto>();
-        CreateMap<UserReceiver, UserReceiverDto>();
         CreateMap<Domain.Entities.EnvelopeReceiverReadOnly, EnvelopeReceiverReadOnlyDto>();
 
         // DTO to Entity mappings
@@ -55,7 +54,6 @@ public class MappingProfile : Profile
         CreateMap<ReceiverReadDto, Domain.Entities.Receiver>().ForMember(rcv => rcv.EnvelopeReceivers, rcvReadDto => rcvReadDto.Ignore());
         CreateMap<ReceiverCreateDto, Domain.Entities.Receiver>();
         CreateMap<ReceiverUpdateDto, Domain.Entities.Receiver>();
-        CreateMap<UserReceiverDto, UserReceiver>();
         CreateMap<EnvelopeReceiverBase, EnvelopeReceiverBasicDto>();
         CreateMap<EnvelopeReceiverReadOnlyCreateDto, Domain.Entities.EnvelopeReceiverReadOnly>();
         CreateMap<EnvelopeReceiverReadOnlyUpdateDto, Domain.Entities.EnvelopeReceiverReadOnly>();

EnvelopeGenerator.Application/DTOs/Receiver/ReceiverCreateDto.cs

@@ -18,7 +18,7 @@ public record ReceiverCreateDto
     {
         _sha256HexOfMail = new(() =>
         {
-            var bytes_arr = Encoding.UTF8.GetBytes(EmailAddress.ToUpper());
+            var bytes_arr = Encoding.UTF8.GetBytes(EmailAddress!.ToUpper());
             var hash_arr = SHA256.HashData(bytes_arr);
             var hexa_str = BitConverter.ToString(hash_arr);
             return hexa_str.Replace("-", string.Empty);
@@ -37,7 +37,7 @@ public record ReceiverCreateDto
     public string? TotpSecretkey { get; init; }
 
     /// <summary>
-    /// var bytes_arr = Encoding.UTF8.GetBytes(EmailAddress.ToUpper());<br>
+    /// var bytes_arr = Encoding.UTF8.GetBytes(EmailAddress.ToUpper());<br/>
     /// var hash_arr = SHA256.HashData(bytes_arr);
     /// var hexa_str = BitConverter.ToString(hash_arr);
     /// return hexa_str.Replace("-", string.Empty);

EnvelopeGenerator.Application/DTOs/Receiver/ReceiverReadDto.cs

@@ -4,26 +4,57 @@ using System.Text.Json.Serialization;
 
 namespace EnvelopeGenerator.Application.DTOs.Receiver;
 
+/// <summary>
+/// 
+/// </summary>
 [ApiExplorerSettings(IgnoreApi = true)]
 public class ReceiverReadDto
 {
+    /// <summary>
+    /// 
+    /// </summary>
     public int Id { get; set; }
 
-    public string EmailAddress { get; set; }
+    /// <summary>
+    /// 
+    /// </summary>
+    public required string EmailAddress { get; set; }
 
-    public string Signature { get; set; }
+    /// <summary>
+    /// 
+    /// </summary>
+    public required string Signature { get; set; }
 
+    /// <summary>
+    /// 
+    /// </summary>
     public DateTime AddedWhen { get; set; }
 
+    /// <summary>
+    /// 
+    /// </summary>
     [JsonIgnore]
     public IEnumerable<EnvelopeReceiverBasicDto>? EnvelopeReceivers { get; set; }
 
+    /// <summary>
+    /// 
+    /// </summary>
     public string? LastUsedName => EnvelopeReceivers?.LastOrDefault()?.Name;
 
+    /// <summary>
+    /// 
+    /// </summary>
     public string? TotpSecretkey { get; set; } = null;
 
+    /// <summary>
+    /// 
+    /// </summary>
     public DateTime? TfaRegDeadline { get; set; }
 
+    /// <summary>
+    /// 
+    /// </summary>
+    /// <returns></returns>
     public override int GetHashCode()
     {
         return Id.GetHashCode();

EnvelopeGenerator.Application/DTOs/UserReceiverDto.cs

@@ -1,45 +0,0 @@
-using Microsoft.AspNetCore.Mvc;
-
-namespace EnvelopeGenerator.Application.DTOs;
-
-/// <summary>
-/// Data Transfer Object representing a user receiver with associated details.
-/// </summary>
-[ApiExplorerSettings(IgnoreApi = true)]
-public class UserReceiverDto
-{
-    /// <summary>
-    /// Gets or sets the unique identifier of the user receiver.
-    /// </summary>
-    public int Id { get; set; }
-
-    /// <summary>
-    /// Gets or sets the identifier of the user associated with the receiver.
-    /// </summary>
-    public int UserId { get; set; }
-
-    /// <summary>
-    /// Gets or sets the identifier of the receiver.
-    /// </summary>
-    public int ReceiverId { get; set; }
-
-    /// <summary>
-    /// Gets or sets the name of the receiver.
-    /// </summary>
-    public string Name { get; set; }
-
-    /// <summary>
-    /// Gets or sets the company name of the receiver.
-    /// </summary>
-    public string CompanyName { get; set; }
-
-    /// <summary>
-    /// Gets or sets the job title of the receiver.
-    /// </summary>
-    public string JobTitle { get; set; }
-
-    /// <summary>
-    /// Gets or sets the timestamp when the user receiver was added.
-    /// </summary>
-    public DateTime AddedWhen { get; set; }
-}

EnvelopeGenerator.Application/EmailTemplates/Commands/Reset/ResetEmailTemplateCommand.cs

@@ -5,20 +5,19 @@ namespace EnvelopeGenerator.Application.EmailTemplates.Commands.Reset;
 
 /// <summary>
 /// Ein Befehl zum Zurücksetzen einer E-Mail-Vorlage auf die Standardwerte.
-/// Erbt von <see cref="EmailTemplateQuery"/> und ermöglicht die Angabe einer optionalen ID und eines Typs der E-Mail-Vorlage.
+/// Erbt von <see cref="EmailTemplateQuery"/> und ermöglicht die Angabe einer optionalen ID und eines Typs der E-Mail-Vorlage.<br/><br/>
+/// Beispiele:<br/>
+/// 0 - DocumentReceived: Benachrichtigung über den Empfang eines Dokuments.<br/>
+/// 1 - DocumentSigned: Benachrichtigung über die Unterzeichnung eines Dokuments.<br/>
+/// 2 - DocumentDeleted: Benachrichtigung über das Löschen eines Dokuments.<br/>
+/// 3 - DocumentCompleted: Benachrichtigung über den Abschluss eines Dokuments.<br/>
+/// 4 - DocumentAccessCodeReceived: Benachrichtigung über den Erhalt eines Zugangscodes.<br/>
+/// 5 - DocumentShared: Benachrichtigung über das Teilen eines Dokuments.<br/>
+/// 6 - TotpSecret: Benachrichtigung über ein TOTP-Geheimnis.<br/>
+/// 7 - DocumentRejected_ADM (Für den Absender): Mail an den Absender, wenn das Dokument abgelehnt wird.<br/>
+/// 8 - DocumentRejected_REC (Für den ablehnenden Empfänger): Mail an den ablehnenden Empfänger, wenn das Dokument abgelehnt wird.<br/>
+/// 9 - DocumentRejected_REC_2 (Für sonstige Empfänger): Mail an andere Empfänger (Brief), wenn das Dokument abgelehnt wird.<br/>
 /// </summary>
-/// Beispiele:
-/// 0 - DocumentReceived: Benachrichtigung über den Empfang eines Dokuments.
-/// 1 - DocumentSigned: Benachrichtigung über die Unterzeichnung eines Dokuments.
-/// 2 - DocumentDeleted: Benachrichtigung über das Löschen eines Dokuments.
-/// 3 - DocumentCompleted: Benachrichtigung über den Abschluss eines Dokuments.
-/// 4 - DocumentAccessCodeReceived: Benachrichtigung über den Erhalt eines Zugangscodes.
-/// 5 - DocumentShared: Benachrichtigung über das Teilen eines Dokuments.
-/// 6 - TotpSecret: Benachrichtigung über ein TOTP-Geheimnis.
-/// 7 - DocumentRejected_ADM (Für den Absender): Mail an den Absender, wenn das Dokument abgelehnt wird.
-/// 8 - DocumentRejected_REC (Für den ablehnenden Empfänger): Mail an den ablehnenden Empfänger, wenn das Dokument abgelehnt wird.
-/// 9 - DocumentRejected_REC_2 (Für sonstige Empfänger): Mail an andere Empfänger (Brief), wenn das Dokument abgelehnt wird.
-/// </param>
 public record ResetEmailTemplateCommand : EmailTemplateQuery, IRequest
 {
     /// <summary>
@@ -34,7 +33,7 @@ public record ResetEmailTemplateCommand : EmailTemplateQuery, IRequest
     /// 
     /// </summary>
     /// <param name="Id">Die optionale ID der E-Mail-Vorlage, die zurückgesetzt werden soll.</param>
-    /// <param name="Type">Der Typ der E-Mail-Vorlage, z. B. <see cref="Constants.EmailTemplateType"/> (optional).
+    /// <param name="Type">Der Typ der E-Mail-Vorlage, z. B. <see cref="Constants.EmailTemplateType"/> (optional).</param>
     public ResetEmailTemplateCommand(int? Id = null, Constants.EmailTemplateType? Type = null) : base(Id, Type)
     {
     }

EnvelopeGenerator.Application/EmailTemplates/Queries/Read/ReadEmailTemplateQueryHandler.cs

@@ -12,6 +12,7 @@ public class ReadEmailTemplateQueryHandler : IRequestHandler<ReadEmailTemplateQu
 {
     private readonly IMapper _mapper;
 
+    [Obsolete("Use Read-method returning IReadQuery<TEntity> instead.")]
     private readonly IEmailTemplateRepository _repository;
 
     /// <summary>
@@ -21,6 +22,7 @@ public class ReadEmailTemplateQueryHandler : IRequestHandler<ReadEmailTemplateQu
     /// <param name="repository">
     /// Die AutoMapper-Instanz, die zum Zuordnen von Objekten verwendet wird.
     /// </param>
+    [Obsolete("Use Read-method returning IReadQuery<TEntity> instead.")]
     public ReadEmailTemplateQueryHandler(IMapper mapper, IEmailTemplateRepository repository)
     {
         _mapper = mapper;
@@ -34,6 +36,7 @@ public class ReadEmailTemplateQueryHandler : IRequestHandler<ReadEmailTemplateQu
     /// <param name="cancellationToken"></param>
     /// <returns></returns>
     /// <exception cref="InvalidOperationException"></exception>
+    [Obsolete("Use IRepository")]
     public async Task<ReadEmailTemplateResponse?> Handle(ReadEmailTemplateQuery request, CancellationToken cancellationToken)
     {
         var temp = request.Id is int id
@@ -46,4 +49,4 @@ public class ReadEmailTemplateQueryHandler : IRequestHandler<ReadEmailTemplateQu
 
         return res;
     }
-}
+}

EnvelopeGenerator.Application/EnvelopeReceivers/Commands/Create/CreateEnvelopeReceiverCommand.cs

@@ -18,4 +18,4 @@ public record CreateEnvelopeReceiverCommand(
     [Required] DocumentCreateCommand Document,
     [Required] IEnumerable<ReceiverGetOrCreateCommand> Receivers,
     bool TFAEnabled = false
-    ) : CreateEnvelopeCommand(Title, Message, TFAEnabled), IRequest<CreateEnvelopeReceiverResponse?>;
+    ) : CreateEnvelopeCommand(Title, Message, TFAEnabled), IRequest<CreateEnvelopeReceiverResponse>;

EnvelopeGenerator.Application/EnvelopeReceivers/Commands/Create/CreateEnvelopeReceiverCommandHandler.cs

@@ -64,4 +64,4 @@ public class CreateEnvelopeReceiverCommandHandler : IRequestHandler<CreateEnvelo
         res.SentReceiver = _mapper.Map<IEnumerable<ReceiverReadDto>>(sentRecipients);
         return res;
     }
-}
+}

EnvelopeGenerator.Application/Extensions/CacheExtensions.cs

@@ -1,131 +1,222 @@
 using Microsoft.Extensions.Caching.Distributed;
 
-namespace EnvelopeGenerator.Application.Extensions
+namespace EnvelopeGenerator.Application.Extensions;
+
+/// <summary>
+/// 
+/// </summary>
+public static class CacheExtensions
 {
-    public static class CacheExtensions
+    /// <summary>
+    /// 
+    /// </summary>
+    /// <param name="cache"></param>
+    /// <param name="key"></param>
+    /// <param name="value"></param>
+    /// <param name="options"></param>
+    /// <param name="cToken"></param>
+    /// <returns></returns>
+    public static Task SetLongAsync(this IDistributedCache cache, string key, long value, DistributedCacheEntryOptions? options = null, CancellationToken cToken = default)
+        => options is null
+            ? cache.SetAsync(key, BitConverter.GetBytes(value), token: cToken)
+            : cache.SetAsync(key, BitConverter.GetBytes(value), options: options, token: cToken);
+
+    /// <summary>
+    /// 
+    /// </summary>
+    /// <param name="cache"></param>
+    /// <param name="key"></param>
+    /// <param name="cToken"></param>
+    /// <returns></returns>
+    public static async Task<long?> GetLongAsync(this IDistributedCache cache, string key, CancellationToken cToken = default)
     {
-        public static Task SetLongAsync(this IDistributedCache cache, string key, long value, DistributedCacheEntryOptions? options = null, CancellationToken cToken = default)
+        var value = await cache.GetAsync(key, cToken);
-            => options is null
+        return value is null ? null : BitConverter.ToInt64(value, 0);
-                ? cache.SetAsync(key, BitConverter.GetBytes(value), token: cToken)
-                : cache.SetAsync(key, BitConverter.GetBytes(value), options: options, token: cToken);
-
-        public static async Task<long?> GetLongAsync(this IDistributedCache cache, string key, CancellationToken cToken = default)
-        {
-            var value = await cache.GetAsync(key, cToken);
-            return value is null ? null : BitConverter.ToInt64(value, 0);
-        }
-
-        public static Task SetDateTimeAsync(this IDistributedCache cache, string key, DateTime value, DistributedCacheEntryOptions? options = null, CancellationToken cToken = default)
-            => cache.SetLongAsync(key: key, value: value.Ticks, options: options, cToken: cToken);
-
-        public static async Task<DateTime?> GetDateTimeAsync(this IDistributedCache cache, string key, CancellationToken cToken = default)
-        {
-            var value = await cache.GetAsync(key, cToken);
-            return value is null ? null : new(BitConverter.ToInt64(value, 0));
-        }
-
-        public static Task SetTimeSpanAsync(this IDistributedCache cache, string key, TimeSpan value, DistributedCacheEntryOptions? options = null, CancellationToken cToken = default)
-            => cache.SetLongAsync(key: key, value: value.Ticks, options: options, cToken);
-
-        public static async Task<TimeSpan?> GetTimeSpanAsync(this IDistributedCache cache, string key, CancellationToken cToken = default)
-        {
-            var value = await cache.GetAsync(key, cToken);
-            return value is null ? null : new(BitConverter.ToInt64(value, 0));
-        }
-
-        //TODO: use code generator
-        #region GetOrSetAsync
-
-        #region string
-        public static async Task<string> GetOrSetAsync(this IDistributedCache cache, string key, Func<string> factory, DistributedCacheEntryOptions? options = null, bool cacheInBackground = false, CancellationToken cToken = default)
-        {
-            var value = await cache.GetStringAsync(key, cToken);
-            if (value is null)
-            {
-                // create new and save
-                value = factory();
-
-                Task CacheAsync() => options is null
-                        ? cache.SetStringAsync(key, value, cToken)
-                        : cache.SetStringAsync(key, value, options, cToken);
-
-                if (cacheInBackground)
-                    _ = Task.Run(async () => await CacheAsync(), cToken);
-                else
-                    await CacheAsync();
-            }
-
-            return value;
-        }
-
-        public static async Task<string> GetOrSetAsync(this IDistributedCache cache, string key, Func<Task<string>> factoryAsync, DistributedCacheEntryOptions? options = null, bool cacheInBackground = false, CancellationToken cToken = default)
-        {
-            var value = await cache.GetStringAsync(key, cToken);
-            if(value is null)
-            {
-                // create new and save
-                value = await factoryAsync();
-
-                Task CacheAsync() => options is null
-                    ? cache.SetStringAsync(key: key, value: value, token: cToken)
-                    : cache.SetStringAsync(key: key, value: value, options: options, token: cToken);
-
-                if (cacheInBackground)
-                    _ = Task.Run(async () => await CacheAsync(), cToken);
-                else
-                    await CacheAsync();
-            }
-
-            return value;
-        }
-        #endregion
-
-        #region DateTime
-        public static async Task<DateTime> GetOrSetAsync(this IDistributedCache cache, string key, Func<DateTime> factory, DistributedCacheEntryOptions? options = null, bool cacheInBackground = false, CancellationToken cToken = default)
-        {
-            if (await cache.GetDateTimeAsync(key, cToken) is DateTime dateTimeValue)
-                return dateTimeValue;
-            else
-            {
-                // create new and save
-                var newValue = factory();
-
-                Task CacheAsync() => options is null
-                        ? cache.SetDateTimeAsync(key, newValue, cToken: cToken)
-                        : cache.SetDateTimeAsync(key, newValue, options, cToken);
-
-                if (cacheInBackground)
-                    _ = Task.Run(async () => await CacheAsync(), cToken);
-                else
-                    await CacheAsync();
-
-                return newValue;
-            }
-        }
-
-        public static async Task<DateTime> GetOrSetAsync(this IDistributedCache cache, string key, Func<Task<DateTime>> factory, DistributedCacheEntryOptions? options = null, bool cacheInBackground = false, CancellationToken cToken = default)
-        {
-            if (await cache.GetDateTimeAsync(key, cToken) is DateTime dateTimeValue)
-                return dateTimeValue;
-            else
-            {
-                // create new and save
-                var newValue = await factory();
-
-                Task CacheAsync() => options is null
-                        ? cache.SetDateTimeAsync(key, newValue, cToken: cToken)
-                        : cache.SetDateTimeAsync(key, newValue, options, cToken);
-
-                if (cacheInBackground)
-                    _ = Task.Run(async () => await CacheAsync(), cToken);
-                else
-                    await CacheAsync();
-
-                return newValue;
-            }
-        }
-        #endregion
-
-        #endregion
     }
+
+    /// <summary>
+    /// 
+    /// </summary>
+    /// <param name="cache"></param>
+    /// <param name="key"></param>
+    /// <param name="value"></param>
+    /// <param name="options"></param>
+    /// <param name="cToken"></param>
+    /// <returns></returns>
+    public static Task SetDateTimeAsync(this IDistributedCache cache, string key, DateTime value, DistributedCacheEntryOptions? options = null, CancellationToken cToken = default)
+        => cache.SetLongAsync(key: key, value: value.Ticks, options: options, cToken: cToken);
+
+    /// <summary>
+    /// 
+    /// </summary>
+    /// <param name="cache"></param>
+    /// <param name="key"></param>
+    /// <param name="cToken"></param>
+    /// <returns></returns>
+    public static async Task<DateTime?> GetDateTimeAsync(this IDistributedCache cache, string key, CancellationToken cToken = default)
+    {
+        var value = await cache.GetAsync(key, cToken);
+        return value is null ? null : new(BitConverter.ToInt64(value, 0));
+    }
+
+    /// <summary>
+    /// 
+    /// </summary>
+    /// <param name="cache"></param>
+    /// <param name="key"></param>
+    /// <param name="value"></param>
+    /// <param name="options"></param>
+    /// <param name="cToken"></param>
+    /// <returns></returns>
+    public static Task SetTimeSpanAsync(this IDistributedCache cache, string key, TimeSpan value, DistributedCacheEntryOptions? options = null, CancellationToken cToken = default)
+        => cache.SetLongAsync(key: key, value: value.Ticks, options: options, cToken);
+
+    /// <summary>
+    /// 
+    /// </summary>
+    /// <param name="cache"></param>
+    /// <param name="key"></param>
+    /// <param name="cToken"></param>
+    /// <returns></returns>
+    public static async Task<TimeSpan?> GetTimeSpanAsync(this IDistributedCache cache, string key, CancellationToken cToken = default)
+    {
+        var value = await cache.GetAsync(key, cToken);
+        return value is null ? null : new(BitConverter.ToInt64(value, 0));
+    }
+
+    //TODO: use code generator
+    #region GetOrSetAsync
+
+    #region string
+
+    /// <summary>
+    /// 
+    /// </summary>
+    /// <param name="cache"></param>
+    /// <param name="key"></param>
+    /// <param name="factory"></param>
+    /// <param name="options"></param>
+    /// <param name="cacheInBackground"></param>
+    /// <param name="cToken"></param>
+    /// <returns></returns>
+    public static async Task<string> GetOrSetAsync(this IDistributedCache cache, string key, Func<string> factory, DistributedCacheEntryOptions? options = null, bool cacheInBackground = false, CancellationToken cToken = default)
+    {
+        var value = await cache.GetStringAsync(key, cToken);
+        if (value is null)
+        {
+            // create new and save
+            value = factory();
+
+            Task CacheAsync() => options is null
+                    ? cache.SetStringAsync(key, value, cToken)
+                    : cache.SetStringAsync(key, value, options, cToken);
+
+            if (cacheInBackground)
+                _ = Task.Run(async () => await CacheAsync(), cToken);
+            else
+                await CacheAsync();
+        }
+
+        return value;
+    }
+
+    /// <summary>
+    /// 
+    /// </summary>
+    /// <param name="cache"></param>
+    /// <param name="key"></param>
+    /// <param name="factoryAsync"></param>
+    /// <param name="options"></param>
+    /// <param name="cacheInBackground"></param>
+    /// <param name="cToken"></param>
+    /// <returns></returns>
+    public static async Task<string> GetOrSetAsync(this IDistributedCache cache, string key, Func<Task<string>> factoryAsync, DistributedCacheEntryOptions? options = null, bool cacheInBackground = false, CancellationToken cToken = default)
+    {
+        var value = await cache.GetStringAsync(key, cToken);
+        if(value is null)
+        {
+            // create new and save
+            value = await factoryAsync();
+
+            Task CacheAsync() => options is null
+                ? cache.SetStringAsync(key: key, value: value, token: cToken)
+                : cache.SetStringAsync(key: key, value: value, options: options, token: cToken);
+
+            if (cacheInBackground)
+                _ = Task.Run(async () => await CacheAsync(), cToken);
+            else
+                await CacheAsync();
+        }
+
+        return value;
+    }
+    #endregion
+
+    #region DateTime
+    /// <summary>
+    /// 
+    /// </summary>
+    /// <param name="cache"></param>
+    /// <param name="key"></param>
+    /// <param name="factory"></param>
+    /// <param name="options"></param>
+    /// <param name="cacheInBackground"></param>
+    /// <param name="cToken"></param>
+    /// <returns></returns>
+    public static async Task<DateTime> GetOrSetAsync(this IDistributedCache cache, string key, Func<DateTime> factory, DistributedCacheEntryOptions? options = null, bool cacheInBackground = false, CancellationToken cToken = default)
+    {
+        if (await cache.GetDateTimeAsync(key, cToken) is DateTime dateTimeValue)
+            return dateTimeValue;
+        else
+        {
+            // create new and save
+            var newValue = factory();
+
+            Task CacheAsync() => options is null
+                    ? cache.SetDateTimeAsync(key, newValue, cToken: cToken)
+                    : cache.SetDateTimeAsync(key, newValue, options, cToken);
+
+            if (cacheInBackground)
+                _ = Task.Run(async () => await CacheAsync(), cToken);
+            else
+                await CacheAsync();
+
+            return newValue;
+        }
+    }
+
+    /// <summary>
+    /// 
+    /// </summary>
+    /// <param name="cache"></param>
+    /// <param name="key"></param>
+    /// <param name="factory"></param>
+    /// <param name="options"></param>
+    /// <param name="cacheInBackground"></param>
+    /// <param name="cToken"></param>
+    /// <returns></returns>
+    public static async Task<DateTime> GetOrSetAsync(this IDistributedCache cache, string key, Func<Task<DateTime>> factory, DistributedCacheEntryOptions? options = null, bool cacheInBackground = false, CancellationToken cToken = default)
+    {
+        if (await cache.GetDateTimeAsync(key, cToken) is DateTime dateTimeValue)
+            return dateTimeValue;
+        else
+        {
+            // create new and save
+            var newValue = await factory();
+
+            Task CacheAsync() => options is null
+                    ? cache.SetDateTimeAsync(key, newValue, cToken: cToken)
+                    : cache.SetDateTimeAsync(key, newValue, options, cToken);
+
+            if (cacheInBackground)
+                _ = Task.Run(async () => await CacheAsync(), cToken);
+            else
+                await CacheAsync();
+
+            return newValue;
+        }
+    }
+    #endregion
+
+    #endregion
 }

EnvelopeGenerator.Application/Extensions/MappingExtensions.cs

@@ -1,14 +1,27 @@
 using EnvelopeGenerator.Application.DTOs.Messaging;
 
-namespace EnvelopeGenerator.Application.Extensions
+namespace EnvelopeGenerator.Application.Extensions;
-{
-    public static class MappingExtensions
-    {
-        public static bool Ok(this GtxMessagingResponse gtxMessagingResponse)
-            => gtxMessagingResponse.TryGetValue("message-status", out var status)
-            && status?.ToString()?.ToLower() == "ok";
 
-        public static string ToBase64String(this byte[] bytes)
+/// <summary>
-            => Convert.ToBase64String(bytes);
+/// Provides extension methods for common mapping and conversion operations.
-    }
+/// </summary>
+public static class MappingExtensions
+{
+    /// <summary>
+    /// Determines whether the response indicates a successful "OK" message status.
+    /// </summary>
+    /// <param name="gtxMessagingResponse">The response object to evaluate.</param>
+    /// <returns><see langword="true"/> if the response contains a "message-status" key with a value of "ok"  (case-insensitive);
+    /// otherwise, <see langword="false"/>.</returns>
+    public static bool Ok(this GtxMessagingResponse gtxMessagingResponse)
+        => gtxMessagingResponse.TryGetValue("message-status", out var status)
+        && status?.ToString()?.ToLower() == "ok";
+
+    /// <summary>
+    /// Converts the specified byte array to its equivalent string representation encoded in base-64.
+    /// </summary>
+    /// <param name="bytes">The byte array to encode.</param>
+    /// <returns>A base-64 encoded string representation of the input byte array.</returns>
+    public static string ToBase64String(this byte[] bytes)
+        => Convert.ToBase64String(bytes);
 }

EnvelopeGenerator.Application/Histories/Queries/Read/ReadHistoryQueryHandler.cs

@@ -10,6 +10,7 @@ namespace EnvelopeGenerator.Application.Histories.Queries.Read;
 /// </summary>
 public class ReadHistoryQueryHandler : IRequestHandler<ReadHistoryQuery, IEnumerable<ReadHistoryResponse>>
 {
+    [Obsolete("Use IRepository")]
     private readonly IEnvelopeHistoryRepository _repository;
 
     private readonly IMapper _mapper;
@@ -19,6 +20,7 @@ public class ReadHistoryQueryHandler : IRequestHandler<ReadHistoryQuery, IEnumer
     /// </summary>
     /// <param name="repository"></param>
     /// <param name="mapper"></param>
+    [Obsolete("Use IRepository")]
     public ReadHistoryQueryHandler(IEnvelopeHistoryRepository repository, IMapper mapper)
     {
         _repository = repository;
@@ -41,4 +43,4 @@ public class ReadHistoryQueryHandler : IRequestHandler<ReadHistoryQuery, IEnumer
                 
         return _mapper.Map<IEnumerable<ReadHistoryResponse>>(hists);
     }
-}
+}

EnvelopeGenerator.Application/Histories/Queries/Read/ReadHistoryResponse.cs

@@ -20,7 +20,7 @@ public class ReadHistoryResponse
     /// <summary>
     /// Gets or sets the reference identifier of the user who performed the action.
     /// </summary>
-    public string UserReference { get; set; }
+    public required string UserReference { get; set; }
 
     /// <summary>
     /// Gets or sets the status code of the envelope.

EnvelopeGenerator.Application/Services/UserReceiverService.cs

@@ -1,25 +0,0 @@
-using AutoMapper;
-using DigitalData.Core.Application;
-using EnvelopeGenerator.Application.Contracts.Services;
-using EnvelopeGenerator.Application.DTOs;
-using EnvelopeGenerator.Domain.Entities;
-using EnvelopeGenerator.Application.Contracts.Repositories;
-
-namespace EnvelopeGenerator.Application.Services;
-
-/// <summary>
-/// 
-/// </summary>
-[Obsolete("Use MediatR")]
-public class UserReceiverService : BasicCRUDService<IUserReceiverRepository, UserReceiverDto, UserReceiver, int>, IUserReceiverService
-{
-    /// <summary>
-    /// 
-    /// </summary>
-    /// <param name="repository"></param>
-    /// <param name="mapper"></param>
-    public UserReceiverService(IUserReceiverRepository repository, IMapper mapper)
-        : base(repository, mapper)
-    {
-    }
-}

EnvelopeGenerator.CommonServices/Jobs/FinalizeDocument/FinalizeDocumentJob.vb

@@ -143,7 +143,9 @@ Namespace Jobs
                         Logger.Debug("Documents merged!")
 
                         Dim oOutputDirectoryPath = Path.Combine(Config.ExportPath, ParentFolderUID)
+                        Logger.Debug($"oOutputDirectoryPath is {oOutputDirectoryPath}")
                         If Not Directory.Exists(oOutputDirectoryPath) Then
+                            Logger.Debug($"Directory not existing. Creating ... ")
                             Directory.CreateDirectory(oOutputDirectoryPath)
                         End If
                         Dim oOutputFilePath = Path.Combine(oOutputDirectoryPath, $"{oEnvelope.Uuid}.pdf")
@@ -172,6 +174,7 @@ Namespace Jobs
                             Throw New ApplicationException("Envelope could not be finalized")
                         End If
                     Catch ex As Exception
+                        Logger.Error(ex)
                         Logger.Warn(ex, $"Unhandled exception while working envelope [{oId}]")
                     End Try
 

EnvelopeGenerator.Domain/Entities/Config.cs

@@ -6,14 +6,12 @@ namespace EnvelopeGenerator.Domain.Entities
     [Table("TBSIG_CONFIG", Schema = "dbo")]
     public class Config
     {
-        [Column("DOCUMENT_PATH", TypeName = "nvarchar(256)")]
-        public string DocumentPath { get; set; }
-
         [Column("SENDING_PROFILE", TypeName = "int")]
         [Required]
         public int SendingProfile { get; set; }
 
         [Column("SIGNATURE_HOST", TypeName = "nvarchar(128)")]
+        [Required]
         public string SignatureHost { get; set; }
 
         [Column("EXTERNAL_PROGRAM_NAME", TypeName = "nvarchar(30)")]

EnvelopeGenerator.Domain/Entities/UserReceiver.cs

@@ -1,39 +0,0 @@
-using System.ComponentModel.DataAnnotations;
-using System.ComponentModel.DataAnnotations.Schema;
-#if NETFRAMEWORK
-using System;
-#endif
-
-namespace EnvelopeGenerator.Domain.Entities
-{
-    [Table("TBSIG_USER_RECEIVER", Schema = "dbo")]
-    public class UserReceiver
-    {
-        [Key]
-        [DatabaseGenerated(DatabaseGeneratedOption.Identity)]
-        [Column("GUID")]
-        public int Id { get; set; }
-
-        [Required]
-        [Column("USER_ID")]
-        public int UserId { get; set; }
-
-        [Required]
-        [Column("RECEIVER_ID")]
-        public int ReceiverId { get; set; }
-
-        [Required]
-        [Column("NAME", TypeName = "nvarchar(128)")]
-        public string Name { get; set; }
-
-        [Column("COMPANY_NAME", TypeName = "nvarchar(128)")]
-        public string CompanyName { get; set; }
-
-        [Column("JOB_TITLE", TypeName = "nvarchar(128)")]
-        public string JobTitle { get; set; }
-
-        [Required]
-        [Column("ADDED_WHEN", TypeName = "datetime")]
-        public DateTime AddedWhen { get; set; }
-    }
-}

EnvelopeGenerator.Form/EnvelopeGenerator.Form.vbproj

@@ -101,6 +101,9 @@
     <Reference Include="DigitalData.Modules.Messaging, Version=1.9.8.0, Culture=neutral, processorArchitecture=MSIL">
       <HintPath>..\packages\DigitalData.Modules.Messaging.1.9.8\lib\net462\DigitalData.Modules.Messaging.dll</HintPath>
     </Reference>
+    <Reference Include="DigitalData.UserManager.Domain, Version=3.2.2.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\UserManager.Domain.3.2.2\lib\net462\DigitalData.UserManager.Domain.dll</HintPath>
+    </Reference>
     <Reference Include="DocumentFormat.OpenXml, Version=3.2.0.0, Culture=neutral, PublicKeyToken=8fb06cb64d019a17, processorArchitecture=MSIL">
       <HintPath>..\packages\DocumentFormat.OpenXml.3.2.0\lib\net46\DocumentFormat.OpenXml.dll</HintPath>
     </Reference>
@@ -238,6 +241,9 @@
     <Reference Include="System.Collections.Immutable, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
       <HintPath>..\packages\System.Collections.Immutable.9.0.0\lib\net462\System.Collections.Immutable.dll</HintPath>
     </Reference>
+    <Reference Include="System.ComponentModel.Annotations, Version=4.2.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.ComponentModel.Annotations.4.7.0\lib\net461\System.ComponentModel.Annotations.dll</HintPath>
+    </Reference>
     <Reference Include="System.ComponentModel.DataAnnotations" />
     <Reference Include="System.Configuration" />
     <Reference Include="System.Core" />
@@ -245,6 +251,9 @@
     <Reference Include="System.Data.Odbc, Version=6.0.0.1, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
       <HintPath>..\packages\System.Data.Odbc.6.0.1\lib\net461\System.Data.Odbc.dll</HintPath>
     </Reference>
+    <Reference Include="System.Drawing.Common, Version=4.0.0.2, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Drawing.Common.4.7.3\lib\net461\System.Drawing.Common.dll</HintPath>
+    </Reference>
     <Reference Include="System.Formats.Asn1, Version=9.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
       <HintPath>..\packages\System.Formats.Asn1.9.0.0\lib\net462\System.Formats.Asn1.dll</HintPath>
     </Reference>

EnvelopeGenerator.Form/frmMain.vb

@@ -594,31 +594,40 @@ Public Class frmMain
     End Sub
 
     Private Sub BarButtonItem2_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles bbtnitm_ResendInvitation.ItemClick
-        Dim oView As GridView = GridEnvelopes.FocusedView
+        Dim oHandle = SplashScreenManager.ShowOverlayForm(Me)
-        Dim selReceiver As Receiver
+        Try
-        If oView.Name = ViewReceivers.Name Then
+            Dim oView As GridView = GridEnvelopes.FocusedView
-            selReceiver = oView.GetRow(oView.FocusedRowHandle)
+            Dim selReceiver As Receiver
-        Else
+            If oView.Name = ViewReceivers.Name Then
-            MsgBox(Resources.Envelope.Please_select_a_recipient_from_the_Recipients_tab, MsgBoxStyle.Information, Text)
+                selReceiver = oView.GetRow(oView.FocusedRowHandle)
-        End If
+            Else
-        If ViewEnvelopes.FocusedRowHandle < 0 Or IsNothing(selReceiver) Then
+                MsgBox(Resources.Envelope.Please_select_a_recipient_from_the_Recipients_tab, MsgBoxStyle.Information, Text)
-            Exit Sub
-        End If
-        Dim oEnvelope As Envelope = ViewEnvelopes.GetRow(ViewEnvelopes.FocusedRowHandle)
-
-        Dim oController = New EnvelopeEditorController(State, oEnvelope)
-        Dim Documents As New BindingList(Of EnvelopeDocument)
-        Dim Receivers As New BindingList(Of Receiver)
-        Receivers = New BindingList(Of Receiver)(oController.Envelope.Receivers)
-        For Each oReceiver As Receiver In Receivers
-            If oReceiver.EmailAddress = selReceiver.EmailAddress Then
-                If oController.ActionService.ResendReceiver(oEnvelope, oReceiver) = True Then
-                    Dim oMsg = Resources.Envelope.Invitation_successfully_resend.Replace("@Mail", oReceiver.EmailAddress)
-                    MsgBox(oMsg, MsgBoxStyle.Information, Text)
-
-                End If
             End If
-        Next
+            If ViewEnvelopes.FocusedRowHandle < 0 Or IsNothing(selReceiver) Then
+                Exit Sub
+            End If
+            Dim oEnvelope As Envelope = ViewEnvelopes.GetRow(ViewEnvelopes.FocusedRowHandle)
+
+            Dim oController = New EnvelopeEditorController(State, oEnvelope)
+            Dim Documents As New BindingList(Of EnvelopeDocument)
+            Dim Receivers As New BindingList(Of Receiver)
+            Receivers = New BindingList(Of Receiver)(oController.Envelope.Receivers)
+            For Each oReceiver As Receiver In Receivers
+                If oReceiver.EmailAddress = selReceiver.EmailAddress Then
+                    If oController.ActionService.ResendReceiver(oEnvelope, oReceiver) = True Then
+                        Dim oMsg = Resources.Envelope.Invitation_successfully_resend.Replace("@Mail", oReceiver.EmailAddress)
+                        MsgBox(oMsg, MsgBoxStyle.Information, Text)
+
+                    End If
+                End If
+            Next
+        Catch ex As Exception
+        Logger.Error(ex)
+        Finally
+
+
+        End Try
+        SplashScreenManager.CloseOverlayForm(oHandle)
 
 
     End Sub

EnvelopeGenerator.Form/packages.config

@@ -35,7 +35,9 @@
   <package id="System.Buffers" version="4.6.0" targetFramework="net462" />
   <package id="System.CodeDom" version="9.0.0" targetFramework="net462" />
   <package id="System.Collections.Immutable" version="9.0.0" targetFramework="net462" />
+  <package id="System.ComponentModel.Annotations" version="4.7.0" targetFramework="net462" />
   <package id="System.Data.Odbc" version="6.0.1" targetFramework="net462" />
+  <package id="System.Drawing.Common" version="4.7.3" targetFramework="net462" />
   <package id="System.Formats.Asn1" version="9.0.0" targetFramework="net462" />
   <package id="System.IO.Packaging" version="9.0.0" targetFramework="net462" />
   <package id="System.IO.Pipelines" version="9.0.0" targetFramework="net462" />
@@ -48,4 +50,5 @@
   <package id="System.Text.Json" version="9.0.0" targetFramework="net462" />
   <package id="System.Threading.Tasks.Extensions" version="4.5.4" targetFramework="net462" />
   <package id="System.ValueTuple" version="4.5.0" targetFramework="net462" />
+  <package id="UserManager.Domain" version="3.2.2" targetFramework="net462" />
 </packages>

EnvelopeGenerator.GeneratorAPI/Controllers/AuthController.cs

@@ -16,6 +16,7 @@ namespace EnvelopeGenerator.GeneratorAPI.Controllers;
 public partial class AuthController : ControllerBase
 {
     private readonly ILogger<AuthController> _logger;
+    [Obsolete("Use MediatR")]
     private readonly IUserService _userService;
     private readonly IDirectorySearchService _dirSearchService;
 
@@ -25,6 +26,7 @@ public partial class AuthController : ControllerBase
     /// <param name="logger">The logger instance.</param>
     /// <param name="userService">The user service instance.</param>
     /// <param name="dirSearchService">The directory search service instance.</param>
+    [Obsolete("Use MediatR")]
     public AuthController(ILogger<AuthController> logger, IUserService userService, IDirectorySearchService dirSearchService)
     {
         _logger = logger;

EnvelopeGenerator.GeneratorAPI/Controllers/EmailTemplateController.cs

@@ -27,6 +27,7 @@ public class EmailTemplateController : ControllerBase
 
     private readonly IMapper _mapper;
 
+    [Obsolete("Use IRepository")]
     private readonly IEmailTemplateRepository _repository;
 
     private readonly IMediator _mediator;
@@ -38,6 +39,7 @@ public class EmailTemplateController : ControllerBase
     /// <param name="repository">
     /// Die AutoMapper-Instanz, die zum Zuordnen von Objekten verwendet wird.
     /// </param>
+    [Obsolete("Use IRepository")]
     public EmailTemplateController(IMapper mapper, IEmailTemplateRepository repository, ILogger<EmailTemplateController> logger, IMediator mediator)
     {
         _mapper = mapper;
@@ -115,4 +117,4 @@ public class EmailTemplateController : ControllerBase
             return Ok();
         }
     }
-}
+}

EnvelopeGenerator.GeneratorAPI/Controllers/EnvelopeController.cs

@@ -1,4 +1,4 @@
-using DigitalData.Core.DTO;
+using DigitalData.Core.Abstraction.Application.DTO;
 using EnvelopeGenerator.Application.Contracts.Services;
 using EnvelopeGenerator.Application.Envelopes.Commands;
 using EnvelopeGenerator.Application.Envelopes.Queries.Read;
@@ -6,8 +6,6 @@ using MediatR;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
 using Newtonsoft.Json;
-using System.ComponentModel;
-using System.ComponentModel.DataAnnotations.Schema;
 
 namespace EnvelopeGenerator.GeneratorAPI.Controllers;
 
@@ -31,6 +29,7 @@ namespace EnvelopeGenerator.GeneratorAPI.Controllers;
 public class EnvelopeController : ControllerBase
 {
     private readonly ILogger<EnvelopeController> _logger;
+    [Obsolete("Use MediatR")]
     private readonly IEnvelopeService _envelopeService;
     private readonly IMediator _mediator;
 
@@ -40,6 +39,7 @@ public class EnvelopeController : ControllerBase
     /// <param name="logger">Der Logger, der für das Protokollieren von Informationen verwendet wird.</param>
     /// <param name="envelopeService">Der Dienst, der für die Verarbeitung von Umschlägen zuständig ist.</param>
     /// <param name="mediator"></param>
+    [Obsolete("Use MediatR")]
     public EnvelopeController(ILogger<EnvelopeController> logger, IEnvelopeService envelopeService, IMediator mediator)
     {
         _logger = logger;
@@ -59,6 +59,7 @@ public class EnvelopeController : ControllerBase
     /// <response code="500">Ein unerwarteter Fehler ist aufgetreten.</response>
     [Authorize]
     [HttpGet]
+    [Obsolete("Use MediatR")]
     public async Task<IActionResult> GetAsync([FromQuery] ReadEnvelopeQuery envelope)
     {
         if (User.GetId() is int intId)
@@ -98,6 +99,7 @@ public class EnvelopeController : ControllerBase
     /// <response code="404">Das Dokument wurde nicht gefunden oder ist nicht verfügbar.</response>
     /// <response code="500">Ein unerwarteter Fehler ist aufgetreten.</response>
     [HttpGet("doc-result")]
+    [Obsolete("Use MediatR")]
     public async Task<IActionResult> GetDocResultAsync([FromQuery] int id, [FromQuery] bool view = false)
     {
         if (User.GetId() is int intId)
@@ -154,4 +156,4 @@ public class EnvelopeController : ControllerBase
         else
             return Ok(res);
     }
-}
+}

EnvelopeGenerator.GeneratorAPI/Controllers/EnvelopeReceiverController.cs

@@ -1,5 +1,5 @@
 using AutoMapper;
-using DigitalData.Core.DTO;
+using DigitalData.Core.Abstraction.Application.DTO;
 using EnvelopeGenerator.Application.Contracts.Services;
 using EnvelopeGenerator.Application.Contracts.SQLExecutor;
 using EnvelopeGenerator.Application.DTOs.Receiver;
@@ -31,6 +31,7 @@ public class EnvelopeReceiverController : ControllerBase
 {
     private readonly ILogger<EnvelopeReceiverController> _logger;
 
+    [Obsolete("Use MediatR")]
     private readonly IEnvelopeReceiverService _erService;
 
     private readonly IMediator _mediator;
@@ -56,6 +57,7 @@ public class EnvelopeReceiverController : ControllerBase
     /// <param name="erExecutor"></param>
     /// <param name="documentExecutor"></param>
     /// <param name="csOpt"></param>
+    [Obsolete("Use MediatR")]
     public EnvelopeReceiverController(ILogger<EnvelopeReceiverController> logger, IEnvelopeReceiverService envelopeReceiverService, IMediator mediator, IMapper mapper, IEnvelopeExecutor envelopeExecutor, IEnvelopeReceiverExecutor erExecutor, IDocumentExecutor documentExecutor, IOptions<ConnectionString> csOpt)
     {
         _logger = logger;
@@ -82,6 +84,7 @@ public class EnvelopeReceiverController : ControllerBase
     /// <response code="500">Ein unerwarteter Fehler ist aufgetreten.</response>
     [Authorize]
     [HttpGet]
+    [Obsolete("Use MediatR")]
     public async Task<IActionResult> GetEnvelopeReceiver([FromQuery] ReadEnvelopeReceiverQuery envelopeReceiver)
     {
         var username = User.GetUsernameOrDefault();
@@ -123,6 +126,7 @@ public class EnvelopeReceiverController : ControllerBase
     /// <response code="500">Ein unerwarteter Fehler ist aufgetreten.</response>
     [Authorize]
     [HttpGet("salute")]
+    [Obsolete("Use MediatR")]
     public async Task<IActionResult> GetReceiverName([FromQuery] ReadReceiverNameQuery receiver)
     {
         return await _erService.ReadLastUsedReceiverNameByMailAsync(receiver.EmailAddress, receiver.Id, receiver.Signature).ThenAsync(

EnvelopeGenerator.GeneratorAPI/Controllers/EnvelopeTypeController.cs

@@ -1,23 +1,39 @@
-using DigitalData.Core.DTO;
+using DigitalData.Core.Abstraction.Application.DTO;
 using EnvelopeGenerator.Application.Contracts.Services;
 using Microsoft.AspNetCore.Mvc;
 
 namespace EnvelopeGenerator.GeneratorAPI.Controllers;
 
+/// <summary>
+/// 
+/// </summary>
 [ApiExplorerSettings(IgnoreApi = true)]
 [Route("api/[controller]")]
 [ApiController]
 public class EnvelopeTypeController : ControllerBase
 {
     private readonly ILogger<EnvelopeTypeController> _logger;
+
+    [Obsolete("Use MediatR")]
     private readonly IEnvelopeTypeService _service;
 
+    /// <summary>
+    /// 
+    /// </summary>
+    /// <param name="logger"></param>
+    /// <param name="service"></param>
+    [Obsolete("Use MediatR")]
     public EnvelopeTypeController(ILogger<EnvelopeTypeController> logger, IEnvelopeTypeService service)
     {
         _logger = logger;
         _service = service;
     }
 
+    /// <summary>
+    /// 
+    /// </summary>
+    /// <returns></returns>
+    [Obsolete("Use MediatR")]
     [HttpGet]
     public async Task<IActionResult> GetAllAsync()
     {

EnvelopeGenerator.GeneratorAPI/Controllers/ReceiverController.cs

@@ -1,5 +1,5 @@
-using DigitalData.Core.API;
+using DigitalData.Core.Abstraction.Application.DTO;
-using DigitalData.Core.DTO;
+using DigitalData.Core.API;
 using EnvelopeGenerator.Application.Contracts.Services;
 using EnvelopeGenerator.Application.DTOs.Receiver;
 using EnvelopeGenerator.Application.Receivers.Queries.Read;
@@ -19,6 +19,7 @@ namespace EnvelopeGenerator.GeneratorAPI.Controllers;
 [Route("api/[controller]")]
 [ApiController]
 [Authorize]
+[Obsolete("Use MediatR")]
 public class ReceiverController : CRUDControllerBaseWithErrorHandling<IReceiverService, ReceiverCreateDto, ReceiverReadDto, ReceiverUpdateDto, Receiver, int>
 {
     /// <summary>
@@ -94,4 +95,4 @@ public class ReceiverController : CRUDControllerBaseWithErrorHandling<IReceiverS
         return base.GetById(id);
     }
     #endregion
-}
+}

EnvelopeGenerator.GeneratorAPI/Program.cs

@@ -167,7 +167,9 @@ try
     });
 
     // User manager
+#pragma warning disable CS0618 // Type or member is obsolete
     builder.Services.AddUserManager<EGDbContext>();
+#pragma warning restore CS0618 // Type or member is obsolete
 
     // LDAP
     builder.ConfigureBySection<DirectorySearchOptions>();
@@ -177,9 +179,11 @@ try
     builder.Services.AddCookieBasedLocalizer();
 
     // Envelope generator serives
+#pragma warning disable CS0618 // Type or member is obsolete
     builder.Services
         .AddEnvelopeGeneratorInfrastructureServices(sqlExecutorConfigureOptions: executor => executor.ConnectionString = connStr)
         .AddEnvelopeGeneratorServices(config);
+#pragma warning restore CS0618 // Type or member is obsolete
 
     var app = builder.Build();
 

EnvelopeGenerator.Infrastructure/DependencyExtensions.cs

@@ -32,6 +32,7 @@ public static class DIExtensions
     /// This method ensures that the repositories are registered as scoped services, meaning that a new instance of each repository 
     /// 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<IServiceProvider, DbContextOptionsBuilder>? dbContextOptions = null,
         IConfiguration? sqlExecutorConfiguration = null,
@@ -157,4 +158,4 @@ public static class DIExtensions
 
         return services;
     }
-}
+}

EnvelopeGenerator.Infrastructure/Executor/EnvelopeExecutor.cs

@@ -12,13 +12,16 @@ namespace EnvelopeGenerator.Infrastructure.Executor;
 
 public class EnvelopeExecutor : SQLExecutor, IEnvelopeExecutor
 {
+    [Obsolete("Use IRepository")]
     private readonly IUserRepository _userRepository;
 
+    [Obsolete("Use IRepository")]
     public EnvelopeExecutor(IServiceProvider provider, IOptions<SQLExecutorParams> sqlExecutorParamsOptions, IUserRepository userRepository) : base(provider, sqlExecutorParamsOptions)
     {
         _userRepository = userRepository;
     }
 
+    [Obsolete("Use IRepository")]
     public async Task<Envelope> CreateEnvelopeAsync(int userId, string title = "", string message = "", bool tfaEnabled = false, CancellationToken cancellation = default)
     {
         using var connection = new SqlConnection(Params.ConnectionString);
@@ -28,7 +31,7 @@ public class EnvelopeExecutor : SQLExecutor, IEnvelopeExecutor
         var envelopes = await connection.QueryAsync<Envelope>(formattedSql);
         var envelope = envelopes.FirstOrDefault()
             ?? throw new InvalidOperationException($"Envelope creation failed. Parameters:" +
-            $"userId={userId}, title='{title}', message='{message}', tfaEnabled={tfaEnabled}."); ;
+            $"userId={userId}, title='{title}', message='{message}', tfaEnabled={tfaEnabled}.");
 
         envelope.User = await _userRepository.ReadByIdAsync(envelope.UserId);
 

EnvelopeGenerator.Infrastructure/Repositories/ConfigRepository.cs

@@ -5,6 +5,7 @@ using Microsoft.EntityFrameworkCore;
 
 namespace EnvelopeGenerator.Infrastructure.Repositories;
 
+[Obsolete("Use IRepository")]
 public class ConfigRepository : CRUDRepository<Config, int, EGDbContext>, IConfigRepository
 {
     public ConfigRepository(EGDbContext dbContext) : base(dbContext, dbContext.Configs)

EnvelopeGenerator.Infrastructure/Repositories/DocumentReceiverElementRepository.cs

@@ -4,6 +4,7 @@ using EnvelopeGenerator.Application.Contracts.Repositories;
 
 namespace EnvelopeGenerator.Infrastructure.Repositories;
 
+[Obsolete("Use IRepository")]
 public class DocumentReceiverElementRepository : CRUDRepository<DocumentReceiverElement, int, EGDbContext>, IDocumentReceiverElementRepository
 {
     public DocumentReceiverElementRepository(EGDbContext dbContext) : base(dbContext, dbContext.DocumentReceiverElements)

EnvelopeGenerator.Infrastructure/Repositories/DocumentStatusRepository.cs

@@ -1,10 +1,10 @@
 using DigitalData.Core.Infrastructure;
-using DigitalData.UserManager.Infrastructure.Repositories;
 using EnvelopeGenerator.Domain.Entities;
 using EnvelopeGenerator.Application.Contracts.Repositories;
 
 namespace EnvelopeGenerator.Infrastructure.Repositories;
 
+[Obsolete("Use IRepository")]
 public class DocumentStatusRepository : CRUDRepository<DocumentStatus, int, EGDbContext>, IDocumentStatusRepository
 {
     public DocumentStatusRepository(EGDbContext dbContext) : base(dbContext, dbContext.DocumentStatus)

EnvelopeGenerator.Infrastructure/Repositories/EnvelopeCertificateRepository.cs

@@ -4,6 +4,7 @@ using EnvelopeGenerator.Application.Contracts.Repositories;
 
 namespace EnvelopeGenerator.Infrastructure.Repositories;
 
+[Obsolete("Use IRepository")]
 public class EnvelopeCertificateRepository : CRUDRepository<EnvelopeCertificate, int, EGDbContext>, IEnvelopeCertificateRepository
 {
     public EnvelopeCertificateRepository(EGDbContext dbContext) : base(dbContext, dbContext.EnvelopeCertificates)

EnvelopeGenerator.Infrastructure/Repositories/EnvelopeDocumentRepository.cs

@@ -4,6 +4,7 @@ using EnvelopeGenerator.Application.Contracts.Repositories;
 
 namespace EnvelopeGenerator.Infrastructure.Repositories;
 
+[Obsolete("Use IRepository")]
 public class EnvelopeDocumentRepository : CRUDRepository<EnvelopeDocument, int, EGDbContext>, IEnvelopeDocumentRepository
 {
     public EnvelopeDocumentRepository(EGDbContext dbContext) : base(dbContext, dbContext.EnvelopeDocument)

EnvelopeGenerator.Infrastructure/Repositories/EnvelopeReceiverReadOnlyRepository.cs

@@ -5,6 +5,7 @@ using Microsoft.EntityFrameworkCore;
 
 namespace EnvelopeGenerator.Infrastructure.Repositories;
 
+[Obsolete("Use IRepository")]
 public class EnvelopeReceiverReadOnlyRepository : CRUDRepository<EnvelopeReceiverReadOnly, long, EGDbContext>, IEnvelopeReceiverReadOnlyRepository
 {
     private readonly IEnvelopeRepository _envRepo;

EnvelopeGenerator.Infrastructure/Repositories/EnvelopeRepository.cs

@@ -5,6 +5,7 @@ using Microsoft.EntityFrameworkCore;
 
 namespace EnvelopeGenerator.Infrastructure.Repositories;
 
+[Obsolete("Use IRepository")]
 public class EnvelopeRepository : CRUDRepository<Envelope, int, EGDbContext>, IEnvelopeRepository
 {
     public EnvelopeRepository(EGDbContext dbContext) : base(dbContext, dbContext.Envelopes)

EnvelopeGenerator.Infrastructure/Repositories/EnvelopeTypeRepository.cs

@@ -4,6 +4,7 @@ using EnvelopeGenerator.Application.Contracts.Repositories;
 
 namespace EnvelopeGenerator.Infrastructure.Repositories;
 
+[Obsolete("Use IRepository")]
 public class EnvelopeTypeRepository : CRUDRepository<EnvelopeType, int, EGDbContext>, IEnvelopeTypeRepository
 {
     public EnvelopeTypeRepository(EGDbContext dbContext) : base(dbContext, dbContext.EnvelopeTypes)

EnvelopeGenerator.Infrastructure/Repositories/ReceiverRepository.cs

@@ -5,6 +5,7 @@ using Microsoft.EntityFrameworkCore;
 
 namespace EnvelopeGenerator.Infrastructure.Repositories;
 
+[Obsolete("Use IRepository")]
 public class ReceiverRepository : CRUDRepository<Receiver, int, EGDbContext>, IReceiverRepository
 {
     public ReceiverRepository(EGDbContext dbContext) : base(dbContext, dbContext.Receivers)

EnvelopeGenerator.Infrastructure/Repositories/UserReceiverRepository.cs

@@ -1,12 +0,0 @@
-using DigitalData.Core.Infrastructure;
-using EnvelopeGenerator.Domain.Entities;
-using EnvelopeGenerator.Application.Contracts.Repositories;
-
-namespace EnvelopeGenerator.Infrastructure.Repositories;
-
-public class UserReceiverRepository : CRUDRepository<UserReceiver, int, EGDbContext>, IUserReceiverRepository
-{
-    public UserReceiverRepository(EGDbContext dbContext) : base(dbContext, dbContext.UserReceivers)
-    {
-    }
-}

EnvelopeGenerator.Service/Scheduler_FinishEnvelope.vb

@@ -67,7 +67,7 @@ Public Class Scheduler_FinishEnvelope
 
             Await Scheduler.Start()
 
-            Logger.Info("Scheduler started!")
+            Logger.Debug("Scheduler started!")
         Catch ex As Exception
             Logger.Error(ex)
         End Try

EnvelopeGenerator.Service/Service.vb

@@ -34,7 +34,7 @@ Public Class Service
             TempFiles.Create()
 
             ' === Initialize Databases ===
-            Logger.Info("Inititalize Database ...")
+            Logger.Debug("Inititalize Database ...")
 
             If Config.ConnectionString = String.Empty Then
                 Throw New ApplicationException("Connection String is empty!")

EnvelopeGenerator.Terminal/CommandManager.cs

@@ -13,9 +13,11 @@ public class CommandManager
     {
         WriteIndented = true
     };
+    [Obsolete("Use MediatR")]
     private readonly IEnvelopeReceiverService _envelopeReceiverService;
     private readonly IMediator _mediator;
 
+    [Obsolete("Use MediatR")]
     public CommandManager(IEnvelopeReceiverService envelopeReceiverService, IMediator mediator)
     {
         _envelopeReceiverService = envelopeReceiverService;
@@ -29,6 +31,7 @@ public class CommandManager
             Console.WriteLine($"v{Assembly.GetExecutingAssembly().GetName().Version}");
     }
 
+    [Obsolete("Use MediatR")]
     [Subcommand]
     public IEnvelopeReceiverService EnvelopeReceiver => _envelopeReceiverService;
 
@@ -55,4 +58,4 @@ public class CommandManager
             File.WriteAllBytes(path, document?.ByteData ?? Array.Empty<byte>());
         }
     }
-}
+}

EnvelopeGenerator.Terminal/DependencyInjection.cs

@@ -14,6 +14,7 @@ namespace EnvelopeGenerator.Terminal;
 
 public static class DependencyInjection
 {
+    [Obsolete("Use MediatR")]
     public static IServiceCollection AddCommandManagerRunner(this IServiceCollection services, IConfiguration configuration, Case @case = Case.KebabCase, string connectionStringKeyName = "Default")
     {
         var connStr = configuration.GetConnectionString(connectionStringKeyName)
@@ -52,4 +53,4 @@ public static class DependencyInjection
     }
 
     public static Task<int> RunCommandManagerRunner(this IHost host, string[] args) => host.Services.RunCommandManagerRunner(args);
-}
+}

EnvelopeGenerator.Terminal/Program.cs

@@ -15,7 +15,9 @@ public class Program
 
         var config = builder.Configuration;
 
+#pragma warning disable CS0618 // Type or member is obsolete
         builder.Services.AddCommandManagerRunner(config);
+#pragma warning restore CS0618 // Type or member is obsolete
 
         var app = builder.Build();
 

EnvelopeGenerator.Tests.Application/Mock.cs

@@ -10,6 +10,7 @@ namespace EnvelopeGenerator.Tests.Application;
 
 public class Mock
 {
+    [Obsolete("Use MediatR")]
     public static IHost CreateHost(Action<HostApplicationBuilder>? builderOptions = null, string configPath = "appsettings.json", bool useRealDb = false, params string[] args)
     {
         var builder = Host.CreateApplicationBuilder(args.Any() ? args : null);

EnvelopeGenerator.Web/Controllers/DocumentController.cs

@@ -26,6 +26,7 @@ public class DocumentController : BaseController
         _envDocService = envDocService;
     }
 
+    [Obsolete("Use MediatR")]
     [NonAction]
     public async Task<IActionResult> Get([FromRoute] string envelopeKey, [FromQuery] int index)
     {
@@ -53,6 +54,7 @@ public class DocumentController : BaseController
 
     [Authorize(Roles = ReceiverRole.FullyAuth)]
     [HttpPost("{envelopeKey}")]
+    [Obsolete("Use MediatR")]
     public async Task<IActionResult> Open(string envelopeKey)
     {
         try

EnvelopeGenerator.Web/Controllers/EnvelopeController.cs

@@ -1,153 +1,161 @@
-using DigitalData.Core.DTO;
+using EnvelopeGenerator.CommonServices;
-using EnvelopeGenerator.CommonServices;
 using EnvelopeGenerator.Web.Services;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
 using System.Text.Encodings.Web;
-using static EnvelopeGenerator.CommonServices.Constants;
 using EnvelopeGenerator.Extensions;
 using EnvelopeGenerator.Application.Contracts.Services;
+using static EnvelopeGenerator.Domain.Constants;
+using EnvelopeGenerator.Domain.Entities;
+using EnvelopeGenerator.Domain;
+using DigitalData.Core.Abstraction.Application.DTO;
 
-namespace EnvelopeGenerator.Web.Controllers
+namespace EnvelopeGenerator.Web.Controllers;
+
+[Authorize(Roles = ReceiverRole.FullyAuth)]
+[ApiController]
+[Route("api/[controller]")]
+public class EnvelopeController : BaseController
 {
-    [Authorize(Roles = ReceiverRole.FullyAuth)]
+    private readonly EnvelopeOldService envelopeService;
-    [ApiController]
+    private readonly ActionService? actionService;
-    [Route("api/[controller]")]
+    private readonly UrlEncoder _urlEncoder;
-    public class EnvelopeController : BaseController
+    [Obsolete("Use MediatR")]
+    private readonly IEnvelopeHistoryService _histService;
+    [Obsolete("Use MediatR")]
+    private readonly IReceiverService _receiverService;
+    [Obsolete("Use MediatR")]
+    private readonly IEnvelopeReceiverService _envRcvService;
+
+    [Obsolete("Use MediatR")]
+    public EnvelopeController(DatabaseService database,
+        EnvelopeOldService envelope,
+        ILogger<EnvelopeController> logger, UrlEncoder urlEncoder,
+        IEnvelopeHistoryService envelopeHistoryService,
+        IReceiverService receiverService,
+        IEnvelopeReceiverService envelopeReceiverService) : base(database, logger)
     {
-        private readonly EnvelopeOldService envelopeService;
+        envelopeService = envelope;
-        private readonly ActionService? actionService;
+        actionService = database?.Services?.actionService;
-        private readonly UrlEncoder _urlEncoder;
+        _urlEncoder = urlEncoder;
-        private readonly IEnvelopeHistoryService _histService;
+        _histService = envelopeHistoryService;
-        private readonly IReceiverService _receiverService;
+        _receiverService = receiverService;
-        private readonly IEnvelopeReceiverService _envRcvService;
+        _envRcvService = envelopeReceiverService;
+    }
 
-        public EnvelopeController(DatabaseService database,
+    [NonAction]
-            EnvelopeOldService envelope,
+    [Obsolete("Use MediatR")]
-            ILogger<EnvelopeController> logger, UrlEncoder urlEncoder,
+    public async Task<IActionResult> Get([FromRoute] string envelopeKey)
-            IEnvelopeHistoryService envelopeHistoryService,
+    {
-            IReceiverService receiverService,
+        try
-            IEnvelopeReceiverService envelopeReceiverService) : base(database, logger)
         {
-            envelopeService = envelope;
+            envelopeKey = _urlEncoder.Encode(envelopeKey);
-            actionService = database?.Services?.actionService;
+
-            _urlEncoder = urlEncoder;
+            // Validate Envelope Key and load envelope
-            _histService = envelopeHistoryService;
+            envelopeService.EnsureValidEnvelopeKey(envelopeKey);
-            _receiverService = receiverService;
+        
-            _envRcvService = envelopeReceiverService;
+            EnvelopeReceiver response = await envelopeService.LoadEnvelope(envelopeKey);
+
+            if (envelopeService.ReceiverAlreadySigned(response.Envelope, response.Receiver.Id) == true)
+            {
+                return Problem(statusCode: 403);
+            }          
+
+            _logger.LogInformation("Loaded envelope [{0}] for receiver [{1}]", response.Envelope.Id, response.Envelope.Id);
+            return Json(response);
         }
-
+        catch (Exception e)
-        [NonAction]
-        public async Task<IActionResult> Get([FromRoute] string envelopeKey)
         {
-            try
+            _logger.LogError(e, "{Message}", e.Message);
-            {
+            return StatusCode(StatusCodes.Status500InternalServerError);
-                envelopeKey = _urlEncoder.Encode(envelopeKey);
-
-                // Validate Envelope Key and load envelope
-                envelopeService.EnsureValidEnvelopeKey(envelopeKey);
-            
-                EnvelopeReceiver response = await envelopeService.LoadEnvelope(envelopeKey);
-
-                if (envelopeService.ReceiverAlreadySigned(response.Envelope, response.Receiver.Id) == true)
-                {
-                    return Problem(statusCode: 403);
-                }          
-
-                _logger.LogInformation("Loaded envelope [{0}] for receiver [{1}]", response.Envelope.Id, response.Envelope.Id);
-                return Json(response);
-            }
-            catch (Exception e)
-            {
-                _logger.LogError(e, "{Message}", e.Message);
-                return StatusCode(StatusCodes.Status500InternalServerError);
-            }
         }
+    }
 
-        [Authorize(Roles = ReceiverRole.FullyAuth)]
+    [Authorize(Roles = ReceiverRole.FullyAuth)]
-        [HttpPost("{envelopeKey}")]
+    [HttpPost("{envelopeKey}")]
-        public async Task<IActionResult> Update(string envelopeKey, int index)
+    [Obsolete("Use MediatR")]
+    public async Task<IActionResult> Update(string envelopeKey, int index)
+    {
+        try
         {
-            try
+            envelopeKey = _urlEncoder.Encode(envelopeKey);
+
+            var authSignature = this.GetAuthReceiverSignature();
+
+            if (authSignature != envelopeKey.GetReceiverSignature())
+                return Unauthorized();
+
+            // Validate Envelope Key and load envelope
+            envelopeService.EnsureValidEnvelopeKey(envelopeKey);
+            EnvelopeReceiver response = await envelopeService.LoadEnvelope(envelopeKey);
+
+            // Again check if receiver has already signed
+            if (envelopeService.ReceiverAlreadySigned(response.Envelope, response.Receiver.Id) == true)
             {
-                envelopeKey = _urlEncoder.Encode(envelopeKey);
+                return Problem(statusCode: 403);
+            }
 
-                var authSignature = this.GetAuthReceiverSignature();
+            var document = envelopeService.GetDocument(index, envelopeKey);
 
-                if (authSignature != envelopeKey.GetReceiverSignature())
+            string? annotationData = await envelopeService.EnsureValidAnnotationData(Request);
-                    return Unauthorized();
 
-                // Validate Envelope Key and load envelope
+            envelopeService.InsertDocumentStatus(new Domain.Entities.DocumentStatus()
-                envelopeService.EnsureValidEnvelopeKey(envelopeKey);
+            {
-                EnvelopeReceiver response = await envelopeService.LoadEnvelope(envelopeKey);
+                EnvelopeId = response.Envelope.Id,
+                ReceiverId = response.Receiver.Id,
+                Value = annotationData,
+                Status = Constants.DocumentStatus.Signed
+            });
 
-                // Again check if receiver has already signed
+            var signResult = actionService?.SignEnvelope(response.Envelope, response.Receiver);
-                if (envelopeService.ReceiverAlreadySigned(response.Envelope, response.Receiver.Id) == true)
+
+            return Ok(new object());
+        }
+        catch (Exception e)
+        {
+            _logger.LogError(e, "{Message}", e.Message);
+            return StatusCode(StatusCodes.Status500InternalServerError);
+        }
+    }
+
+    [Authorize(Roles = ReceiverRole.FullyAuth)]
+    [HttpPost("reject")]
+    [Obsolete("Use DigitalData.Core.Exceptions and .Middleware")]
+    public async Task<IActionResult> Reject([FromBody] string? reason = null)
+    {
+        try
+        {
+            var signature = this.GetAuthReceiverSignature();
+            var uuid = this.GetAuthEnvelopeUuid();
+            var mail = this.GetAuthReceiverMail();
+            if(uuid is null || signature is null || mail is null)
+            {
+                _logger.LogEnvelopeError(uuid: uuid, signature: signature,
+                    message: @$"Unauthorized POST request in api\envelope\reject. One of claims, Envelope, signature or mail ({mail}) is null.");
+                return Unauthorized();
+            }
+
+            var envRcvRes = await _envRcvService.ReadByUuidSignatureAsync(uuid: uuid, signature: signature);
+
+            if (envRcvRes.IsFailed)
+            {
+                _logger.LogNotice(envRcvRes.Notices);
+                return Unauthorized("you are not authirized");
+            }
+
+            return await _histService.RecordAsync(envRcvRes.Data.EnvelopeId, userReference: mail, EnvelopeStatus.DocumentRejected, comment: reason).ThenAsync(
+                Success: id => NoContent(),
+                Fail: IActionResult (mssg, ntc) =>
                 {
-                    return Problem(statusCode: 403);
+                    _logger.LogEnvelopeError(uuid: uuid, signature: signature, message: "Unexpected error happend in api/envelope/reject");
-                }
+                    _logger.LogNotice(ntc);
-
+                    return this.ViewInnerServiceError();
-                var document = envelopeService.GetDocument(index, envelopeKey);
-
-                string? annotationData = await envelopeService.EnsureValidAnnotationData(Request);
-
-                envelopeService.InsertDocumentStatus(new Common.DocumentStatus()
-                {
-                    EnvelopeId = response.Envelope.Id,
-                    ReceiverId = response.Receiver.Id,
-                    Value = annotationData,
-                    Status = Common.Constants.DocumentStatus.Signed
                 });
-
-                var signResult = actionService?.SignEnvelope(response.Envelope, response.Receiver);
-
-                return Ok(new object());
-            }
-            catch (Exception e)
-            {
-                _logger.LogError(e, "{Message}", e.Message);
-                return StatusCode(StatusCodes.Status500InternalServerError);
-            }
         }
-
+        catch (Exception e)
-        [Authorize(Roles = ReceiverRole.FullyAuth)]
-        [HttpPost("reject")]
-        public async Task<IActionResult> Reject([FromBody] string? reason = null)
         {
-            try
+            _logger.LogError(e, "{Message}", e.Message);
-            {
+            return StatusCode(StatusCodes.Status500InternalServerError);
-                var signature = this.GetAuthReceiverSignature();
-                var uuid = this.GetAuthEnvelopeUuid();
-                var mail = this.GetAuthReceiverMail();
-                if(uuid is null || signature is null || mail is null)
-                {
-                    _logger.LogEnvelopeError(uuid: uuid, signature: signature,
-                        message: @$"Unauthorized POST request in api\envelope\reject. One of claims, Envelope, signature or mail ({mail}) is null.");
-                    return Unauthorized();
-                }
-
-                var envRcvRes = await _envRcvService.ReadByUuidSignatureAsync(uuid: uuid, signature: signature);
-
-                if (envRcvRes.IsFailed)
-                {
-                    _logger.LogNotice(envRcvRes.Notices);
-                    return Unauthorized("you are not authirized");
-                }
-
-                return await _histService.RecordAsync(envRcvRes.Data.EnvelopeId, userReference: mail, EnvelopeStatus.DocumentRejected, comment: reason).ThenAsync(
-                    Success: id => NoContent(),
-                    Fail: IActionResult (mssg, ntc) =>
-                    {
-                        _logger.LogEnvelopeError(uuid: uuid, signature: signature, message: "Unexpected error happend in api/envelope/reject");
-                        _logger.LogNotice(ntc);
-                        return this.ViewInnerServiceError();
-                    });
-            }
-            catch (Exception e)
-            {
-                _logger.LogError(e, "{Message}", e.Message);
-                return StatusCode(StatusCodes.Status500InternalServerError);
-            }
         }
     }
 }

EnvelopeGenerator.Web/Controllers/HomeController.cs

@@ -1,5 +1,4 @@
-using EnvelopeGenerator.CommonServices;
+using EnvelopeGenerator.Web.Services;
-using EnvelopeGenerator.Web.Services;
 using Microsoft.AspNetCore.Authentication.Cookies;
 using Microsoft.AspNetCore.Authentication;
 using Microsoft.AspNetCore.Mvc;
@@ -8,33 +7,40 @@ using Microsoft.AspNetCore.Authorization;
 using DigitalData.Core.API;
 using EnvelopeGenerator.Extensions;
 using Microsoft.Extensions.Localization;
-using DigitalData.Core.DTO;
 using Microsoft.AspNetCore.Localization;
 using EnvelopeGenerator.Web.Models;
 using EnvelopeGenerator.Application.Resources;
 using EnvelopeGenerator.Application.DTOs.EnvelopeReceiver;
-using static EnvelopeGenerator.CommonServices.Constants;
 using Ganss.Xss;
 using Newtonsoft.Json;
 using EnvelopeGenerator.Application.DTOs;
 using DigitalData.Core.Client;
 using OtpNet;
 using EnvelopeGenerator.Application.Contracts.Services;
+using static EnvelopeGenerator.Domain.Constants;
+using DigitalData.Core.Abstraction.Application.DTO;
+using EnvelopeGenerator.Domain.Entities;
 
 namespace EnvelopeGenerator.Web.Controllers;
 
 public class HomeController : ViewControllerBase
 {
     private readonly EnvelopeOldService envelopeOldService;
+    [Obsolete("Use MediatR")]
     private readonly IEnvelopeReceiverService _envRcvService;
+    [Obsolete("Use MediatR")]
     private readonly IEnvelopeHistoryService _historyService;
     private readonly IConfiguration _configuration;
+    [Obsolete("Use MediatR")]
     private readonly IEnvelopeMailService _mailService;
+    [Obsolete("Use MediatR")]
     private readonly IEnvelopeReceiverReadOnlyService _readOnlyService;
     private readonly IAuthenticator _authenticator;
+    [Obsolete("Use MediatR")]
     private readonly IReceiverService _rcvService;
     private readonly IEnvelopeSmsHandler _envSmsHandler;
 
+    [Obsolete("Use MediatR")]
     public HomeController(EnvelopeOldService envelopeOldService, ILogger<HomeController> logger, IEnvelopeReceiverService envelopeReceiverService, IEnvelopeHistoryService historyService, IStringLocalizer<Resource> localizer, IConfiguration configuration, HtmlSanitizer sanitizer, Cultures cultures, IEnvelopeMailService envelopeMailService, IEnvelopeReceiverReadOnlyService readOnlyService, IAuthenticator authenticator, IReceiverService receiverService, IEnvelopeSmsHandler envelopeSmsService) : base(logger, sanitizer, cultures, localizer)
     {
         this.envelopeOldService = envelopeOldService;
@@ -69,6 +75,7 @@ public class HomeController : ViewControllerBase
     }
 
     [HttpGet("EnvelopeKey/{envelopeReceiverId}")]
+    [Obsolete("Use MediatR")]
     public async Task<IActionResult> MainAsync([FromRoute] string envelopeReceiverId, [FromQuery] string? culture = null)
     {
         try
@@ -131,6 +138,7 @@ public class HomeController : ViewControllerBase
     }
 
     [HttpGet("EnvelopeKey/{envelopeReceiverId}/Locked")]
+    [Obsolete("Use DigitalData.Core.Exceptions and .Middleware")]
     public async Task<IActionResult> EnvelopeLocked([FromRoute] string envelopeReceiverId)
     {
         try
@@ -163,6 +171,7 @@ public class HomeController : ViewControllerBase
         }
     }
 
+    [Obsolete("Use MediatR")]
     private async Task<IActionResult> CreateShowEnvelopeView(string envelopeReceiverId, EnvelopeReceiverDto er)
     {
         try
@@ -251,6 +260,7 @@ public class HomeController : ViewControllerBase
         }
     }
 
+    [Obsolete("Use MediatR")]
     [NonAction]
     private async Task<IActionResult?> HandleAccessCodeAsync(Auth auth, EnvelopeReceiverSecretDto er_secret, string envelopeReceiverId)
     {
@@ -323,6 +333,7 @@ public class HomeController : ViewControllerBase
     #endregion
 
     [HttpPost("EnvelopeKey/{envelopeReceiverId}/Locked")]
+    [Obsolete("Use MediatR")]
     public async Task<IActionResult> LogInEnvelope([FromRoute] string envelopeReceiverId, [FromForm] Auth auth)
     {
         try
@@ -401,6 +412,7 @@ public class HomeController : ViewControllerBase
 
     [Authorize(Roles = ReceiverRole.FullyAuth)]
     [HttpGet("EnvelopeKey/{envelopeReceiverId}/Success")]
+    [Obsolete("Use DigitalData.Core.Exceptions and .Middleware")]
     public async Task<IActionResult> EnvelopeSigned(string envelopeReceiverId)
     {
         try
@@ -412,7 +424,7 @@ public class HomeController : ViewControllerBase
                     if(!isExisting)
                         return this.ViewEnvelopeNotFound();
 
-                    Common.EnvelopeReceiver response = await envelopeOldService.LoadEnvelope(envelopeReceiverId);
+                    EnvelopeReceiver response = await envelopeOldService.LoadEnvelope(envelopeReceiverId);
                     if (!envelopeOldService.ReceiverAlreadySigned((Envelope)response.Envelope, (int)response.Receiver.Id))
                         return base.Redirect($"/EnvelopeKey/{envelopeReceiverId}/Locked");
 
@@ -436,6 +448,7 @@ public class HomeController : ViewControllerBase
 
     [Authorize(Roles = ReceiverRole.FullyAuth)]
     [HttpGet("EnvelopeKey/{envelopeReceiverId}/Rejected")]
+    [Obsolete("Use MediatR")]
     public async Task<IActionResult> EnvelopeRejected(string envelopeReceiverId)
     {
         try
@@ -467,6 +480,7 @@ public class HomeController : ViewControllerBase
     }
 
     [HttpGet("EnvelopeKey/{readOnlyKey}/ReadOnly")]
+    [Obsolete("Use MediatR")]
     public async Task<IActionResult> EnvelopeReceiverReadOnly([FromRoute] string readOnlyKey)
     {
         try

EnvelopeGenerator.Web/Controllers/ReadOnlyController.cs

@@ -1,10 +1,10 @@
-using DigitalData.Core.DTO;
+using DigitalData.Core.Abstraction.Application.DTO;
 using EnvelopeGenerator.Application.Contracts.Services;
 using EnvelopeGenerator.Application.DTOs.EnvelopeReceiverReadOnly;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
 using Newtonsoft.Json;
-using static EnvelopeGenerator.CommonServices.Constants;
+using static EnvelopeGenerator.Domain.Constants;
 
 namespace EnvelopeGenerator.Web.Controllers
 {
@@ -14,12 +14,16 @@ namespace EnvelopeGenerator.Web.Controllers
     {
         private readonly ILogger<ReadOnlyController> _logger;
 
+        [Obsolete("Use MediatR")]
         private readonly IEnvelopeReceiverReadOnlyService _erroService;
 
+        [Obsolete("Use MediatR")]
         private readonly IEnvelopeMailService _mailService;
 
+        [Obsolete("Use MediatR")]
         private readonly IEnvelopeHistoryService _histService;
 
+        [Obsolete("Use MediatR")]
         public ReadOnlyController(ILogger<ReadOnlyController> logger, IEnvelopeReceiverReadOnlyService erroService, IEnvelopeMailService mailService, IEnvelopeHistoryService histService)
         {
             _logger = logger;
@@ -30,6 +34,7 @@ namespace EnvelopeGenerator.Web.Controllers
 
         [HttpPost]
         [Authorize(Roles = ReceiverRole.FullyAuth)]
+        [Obsolete("Use MediatR")]
         public async Task<IActionResult> CreateAsync([FromBody] EnvelopeReceiverReadOnlyCreateDto createDto)
         {
             try
@@ -62,7 +67,7 @@ namespace EnvelopeGenerator.Web.Controllers
                 }
 
                 //read new entity
-                var read_res = await _erroService.ReadByIdAsync(creation_res.Data);
+                var read_res = await _erroService.ReadByIdAsync(creation_res.Data.Id);
                 if (read_res.IsFailed)
                 {
                     _logger.LogNotice(creation_res);
@@ -76,7 +81,7 @@ namespace EnvelopeGenerator.Web.Controllers
                 {
                     //TODO: implement multi-threading to history process (Task)
                     //TODO: remove casting after change the id type
-                    var hist_res = await _histService.RecordAsync((int)createDto.EnvelopeId, createDto.AddedWho, Common.Constants.EnvelopeStatus.EnvelopeShared);
+                    var hist_res = await _histService.RecordAsync((int)createDto.EnvelopeId, createDto.AddedWho, EnvelopeStatus.EnvelopeShared);
                     if (hist_res.IsFailed)
                     {
                         _logger.LogError("Although the envelope was sent as read-only, the EnvelopeShared hisotry could not be saved. Create DTO:\n{createDto}", JsonConvert.SerializeObject(createDto));

EnvelopeGenerator.Web/Controllers/TFARegController.cs

@@ -4,25 +4,28 @@ using Microsoft.AspNetCore.Mvc;
 using EnvelopeGenerator.Extensions;
 using Microsoft.Extensions.Localization;
 using EnvelopeGenerator.Application.Resources;
-using DigitalData.Core.DTO;
 using EnvelopeGenerator.Application.Extensions;
 using Microsoft.Extensions.Options;
 using Microsoft.AspNetCore.Authorization;
-using static EnvelopeGenerator.CommonServices.Constants;
 using Microsoft.AspNetCore.Authentication.Cookies;
 using Microsoft.AspNetCore.Authentication;
 using EnvelopeGenerator.Application.Contracts.Services;
+using DigitalData.Core.Abstraction.Application.DTO;
+using static EnvelopeGenerator.Domain.Constants;
 
 namespace EnvelopeGenerator.Web.Controllers;
 
 //TODO: Add authorization as well as limiting the link duration (intermediate token with different role) or sign it
 public class TFARegController : ViewControllerBase
 {
+    [Obsolete("Use MediatR")]
     private readonly IEnvelopeReceiverService _envRcvService;
     private readonly IAuthenticator _authenticator;
+    [Obsolete("Use MediatR")]
     private readonly IReceiverService _rcvService;
     private readonly TFARegParams _params;
 
+    [Obsolete("Use MediatR")]
     public TFARegController(ILogger<TFARegController> logger, HtmlSanitizer sanitizer, Cultures cultures, IStringLocalizer<Resource> localizer, IEnvelopeReceiverService erService, IAuthenticator authenticator, IReceiverService receiverService, IOptions<TFARegParams> tfaRegParamsOptions) : base(logger, sanitizer, cultures, localizer)
     {
         _envRcvService = erService;
@@ -34,6 +37,7 @@ public class TFARegController : ViewControllerBase
     //TODO: move under auth route
     [Authorize]
     [HttpGet("tfa/{envelopeReceiverId}")]
+    [Obsolete("Use MediatR")]
     public async Task<IActionResult> Reg(string envelopeReceiverId)
     {
         try

EnvelopeGenerator.Web/Controllers/Test/TestConfigController.cs

@@ -3,13 +3,13 @@ using EnvelopeGenerator.Domain.Entities;
 using DigitalData.Core.API;
 using EnvelopeGenerator.Application.Contracts.Services;
 
-namespace EnvelopeGenerator.Web.Controllers.Test
+namespace EnvelopeGenerator.Web.Controllers.Test;
-{
+
-    public class TestConfigController : ReadControllerBase<IConfigService, ConfigDto, Config, int>
+[Obsolete("Use MediatR")]
-    {
+public class TestConfigController : ReadControllerBase<IConfigService, ConfigDto, Config, int>
-        public TestConfigController(ILogger<TestConfigController> logger, IConfigService service) : base(logger, service)
+{
-        {
+    public TestConfigController(ILogger<TestConfigController> logger, IConfigService service) : base(logger, service)
+    {
 
-        }
     }
 }

EnvelopeGenerator.Web/Controllers/Test/TestControllerBase.cs

@@ -1,18 +1,18 @@
 using DigitalData.Core.API;
 using DigitalData.Core.Abstraction.Application;
 using Microsoft.AspNetCore.Mvc;
-using DigitalData.Core.Abstractions;
 
-namespace EnvelopeGenerator.Web.Controllers.Test
+namespace EnvelopeGenerator.Web.Controllers.Test;
+
+[ApiController]
+[Route("api/test/[controller]")]
+[Obsolete("Use MediatR")]
+public class TestControllerBase<TCRUDService, TDto, TEntity, TId> : BasicCRUDControllerBase<TCRUDService, TDto, TEntity, TId> 
+    where TCRUDService : ICRUDService<TDto, TDto, TEntity, TId>
+    where TDto : class
+    where TEntity : class
 {
-    [ApiController]
+    public TestControllerBase(ILogger logger, TCRUDService service) : base(logger, service)
-    [Route("api/test/[controller]")]
-    public class TestControllerBase<TCRUDService, TDto, TEntity, TId> : BasicCRUDControllerBase<TCRUDService, TDto, TEntity, TId> 
-        where TCRUDService : ICRUDService<TDto, TDto, TEntity, TId>
-        where TDto : class, IUnique<TId> where TEntity : class, IUnique<TId>
     {
-        public TestControllerBase(ILogger logger, TCRUDService service) : base(logger, service)
-        {
-        }
     }
 }

EnvelopeGenerator.Web/Controllers/Test/TestDocumentReceiverElementController.cs

@@ -4,6 +4,7 @@ using EnvelopeGenerator.Domain.Entities;
 
 namespace EnvelopeGenerator.Web.Controllers.Test;
 
+[Obsolete("Use MediatR")]
 public class TestDocumentReceiverElementController : TestControllerBase<IDocumentReceiverElementService, DocumentReceiverElementDto, DocumentReceiverElement, int>
 {
     public TestDocumentReceiverElementController(ILogger<TestDocumentReceiverElementController> logger, IDocumentReceiverElementService service) : base(logger, service)

EnvelopeGenerator.Web/Controllers/Test/TestDocumentStatusController.cs

@@ -2,13 +2,12 @@
 using EnvelopeGenerator.Application.DTOs;
 using EnvelopeGenerator.Domain.Entities;
 
-namespace EnvelopeGenerator.Web.Controllers.Test
+namespace EnvelopeGenerator.Web.Controllers.Test;
-{
-    public class TestDocumentStatusController : TestControllerBase<IDocumentStatusService, DocumentStatusDto, DocumentStatus, int>
-    {
-        public TestDocumentStatusController(ILogger<TestDocumentStatusController> logger, IDocumentStatusService service) : base(logger, service)
-        {
 
-        }
+[Obsolete("Use MediatR")]
+public class TestDocumentStatusController : TestControllerBase<IDocumentStatusService, DocumentStatusDto, DocumentStatus, int>
+{
+    public TestDocumentStatusController(ILogger<TestDocumentStatusController> logger, IDocumentStatusService service) : base(logger, service)
+    {
     }
 }

EnvelopeGenerator.Web/Controllers/Test/TestEmailTemplateController.cs

@@ -1,33 +1,34 @@
-using DigitalData.Core.DTO;
+using DigitalData.Core.Abstraction.Application.DTO;
 using EnvelopeGenerator.Application.Contracts.Services;
 using EnvelopeGenerator.Application.DTOs;
 using EnvelopeGenerator.Domain.Entities;
 using Microsoft.AspNetCore.Mvc;
-using static EnvelopeGenerator.CommonServices.Constants;
+using static EnvelopeGenerator.Domain.Constants;
 
-namespace EnvelopeGenerator.Web.Controllers.Test
+namespace EnvelopeGenerator.Web.Controllers.Test;
+
+[Obsolete("Use MediatR")]
+public class TestEmailTemplateController : TestControllerBase<IEmailTemplateService, EmailTemplateDto, EmailTemplate, int>
 {
-    public class TestEmailTemplateController : TestControllerBase<IEmailTemplateService, EmailTemplateDto, EmailTemplate, int>
+    public TestEmailTemplateController(ILogger<TestEmailTemplateController> logger, IEmailTemplateService service) : base(logger, service)
     {
-        public TestEmailTemplateController(ILogger<TestEmailTemplateController> logger, IEmailTemplateService service) : base(logger, service)
-        {
-        }
-
-        [HttpGet]
-        public virtual async Task<IActionResult> GetAll([FromQuery] string? tempType = null)
-        {
-            return tempType is null
-                ? await base.GetAll()
-                : await _service.ReadByNameAsync((EmailTemplateType)Enum.Parse(typeof(EmailTemplateType), tempType)).ThenAsync(
-                    Success: Ok,
-                    Fail: IActionResult (messages, notices) =>
-                    {
-                        _logger.LogNotice(notices);
-                        return NotFound(messages);
-                    });
-        }
-
-        [NonAction]
-        public override Task<IActionResult> GetAll() => base.GetAll();
     }
+
+    [HttpGet]
+    [Obsolete("Use MediatR")]
+    public virtual async Task<IActionResult> GetAll([FromQuery] string? tempType = null)
+    {
+        return tempType is null
+            ? await base.GetAll()
+            : await _service.ReadByNameAsync((EmailTemplateType)Enum.Parse(typeof(EmailTemplateType), tempType)).ThenAsync(
+                Success: Ok,
+                Fail: IActionResult (messages, notices) =>
+                {
+                    _logger.LogNotice(notices);
+                    return NotFound(messages);
+                });
+    }
+
+    [NonAction]
+    public override Task<IActionResult> GetAll() => base.GetAll();
 }

EnvelopeGenerator.Web/Controllers/Test/TestEnvelopeCertificateController.cs

@@ -2,13 +2,13 @@
 using EnvelopeGenerator.Application.DTOs;
 using EnvelopeGenerator.Domain.Entities;
 
-namespace EnvelopeGenerator.Web.Controllers.Test
+namespace EnvelopeGenerator.Web.Controllers.Test;
-{
+
-    public class TestEnvelopeCertificateController : TestControllerBase<IEnvelopeCertificateService, EnvelopeCertificateDto, EnvelopeCertificate, int>
+[Obsolete("Use MediatR")]
-    {
+public class TestEnvelopeCertificateController : TestControllerBase<IEnvelopeCertificateService, EnvelopeCertificateDto, EnvelopeCertificate, int>
-        public TestEnvelopeCertificateController(ILogger<TestEnvelopeCertificateController> logger, IEnvelopeCertificateService service) : base(logger, service)
+{
-        {
+    public TestEnvelopeCertificateController(ILogger<TestEnvelopeCertificateController> logger, IEnvelopeCertificateService service) : base(logger, service)
+    {
 
-        }
     }
 }

EnvelopeGenerator.Web/Controllers/Test/TestEnvelopeController.cs

@@ -4,53 +4,53 @@ using Microsoft.AspNetCore.Mvc;
 using EnvelopeGenerator.Extensions;
 using EnvelopeGenerator.Application.Contracts.Services;
 
-namespace EnvelopeGenerator.Web.Controllers.Test
+namespace EnvelopeGenerator.Web.Controllers.Test;
+
+[Obsolete("Use MediatR")]
+public class TestEnvelopeController : TestControllerBase<IEnvelopeService, EnvelopeDto, Envelope, int>
 {
-    public class TestEnvelopeController : TestControllerBase<IEnvelopeService, EnvelopeDto, Envelope, int>
+    public TestEnvelopeController(ILogger<TestEnvelopeController> logger, IEnvelopeService service) : base(logger, service)
     {
-        public TestEnvelopeController(ILogger<TestEnvelopeController> logger, IEnvelopeService service) : base(logger, service)
+    }
+
+    [NonAction]
+    public override Task<IActionResult> GetAll() => base.GetAll();
+
+    [HttpGet]
+    public async Task<IActionResult> GetAll([FromQuery] string? envelopeKey = default, [FromQuery] bool withDocuments = false, [FromQuery] bool withHistory = false, [FromQuery] bool withDocumentReceiverElement = false, [FromQuery] bool withUser = false, [FromQuery] bool withAll = true)
+    {
+        if (envelopeKey is not null)
         {
+            (var uuid, var signature) = envelopeKey.DecodeEnvelopeReceiverId();
+            if (uuid is null)
+                return BadRequest("UUID is null");
+            var envlopeServiceResult = await _service.ReadByUuidAsync(
+                uuid: uuid,
+                withDocuments: withDocuments, withHistory: withHistory, withDocumentReceiverElement: withDocumentReceiverElement, withUser: withUser, withAll: withAll);
+
+            if (envlopeServiceResult.IsSuccess)
+            {
+                return Ok(envlopeServiceResult.Data);
+            }
+            return NotFound();
         }
 
-        [NonAction]
+        var result = await _service.ReadAllWithAsync(documents: withDocuments, history: withHistory);
-        public override Task<IActionResult> GetAll() => base.GetAll();
+        if (result.IsSuccess)
-
-        [HttpGet]
-        public async Task<IActionResult> GetAll([FromQuery] string? envelopeKey = default, [FromQuery] bool withDocuments = false, [FromQuery] bool withHistory = false, [FromQuery] bool withDocumentReceiverElement = false, [FromQuery] bool withUser = false, [FromQuery] bool withAll = true)
         {
-            if(envelopeKey is not null)
+            return Ok(result);
-            {
-                (var uuid, var signature) = envelopeKey.DecodeEnvelopeReceiverId();
-                if (uuid is null)
-                    return BadRequest("UUID is null");
-                var envlopeServiceResult = await _service.ReadByUuidAsync(
-                    uuid: uuid,
-                    withDocuments: withDocuments, withHistory: withHistory, withDocumentReceiverElement:withDocumentReceiverElement, withUser:withUser, withAll:withAll);
-
-                if (envlopeServiceResult.IsSuccess)
-                {
-                    return Ok(envlopeServiceResult.Data);
-                }
-                return NotFound();
-            }
-
-            var result = await _service.ReadAllWithAsync(documents: withDocuments, history: withHistory);
-            if (result.IsSuccess)
-            {
-                return Ok(result);
-            }
-            return NotFound(result);
         }
+        return NotFound(result);
+    }
 
-        [HttpGet("decode")]
+    [HttpGet("decode")]
-        public IActionResult DecodeEnvelopeReceiverId(string envelopeReceiverId, int type = 0)
+    public IActionResult DecodeEnvelopeReceiverId(string envelopeReceiverId, int type = 0)
+    {
+        return type switch
         {
-			return type switch
+            1 => Ok(envelopeReceiverId.GetEnvelopeUuid()),
-			{
+            2 => Ok(envelopeReceiverId.GetReceiverSignature()),
-				1 => Ok(envelopeReceiverId.GetEnvelopeUuid()),
+            _ => Ok(envelopeReceiverId.DecodeEnvelopeReceiverId()),
-				2 => Ok(envelopeReceiverId.GetReceiverSignature()),
+        };
-				_ => Ok(envelopeReceiverId.DecodeEnvelopeReceiverId()),
+    }
-			};
-		}
-	}
 }

EnvelopeGenerator.Web/Controllers/Test/TestEnvelopeDocumentController.cs

@@ -4,6 +4,7 @@ using EnvelopeGenerator.Domain.Entities;
 
 namespace EnvelopeGenerator.Web.Controllers.Test;
 
+[Obsolete("Use MediatR")]
 public class TestEnvelopeDocumentController : TestControllerBase<IEnvelopeDocumentService, EnvelopeDocumentDto, EnvelopeDocument, int>
 {
     public TestEnvelopeDocumentController(ILogger<TestEnvelopeDocumentController> logger, IEnvelopeDocumentService service) : base(logger, service)

EnvelopeGenerator.Web/Controllers/Test/TestEnvelopeHistoryController.cs

@@ -3,9 +3,11 @@ using EnvelopeGenerator.Application.Contracts.Services;
 using EnvelopeGenerator.Application.DTOs.EnvelopeHistory;
 using EnvelopeGenerator.Domain.Entities;
 using Microsoft.AspNetCore.Mvc;
+using static EnvelopeGenerator.Domain.Constants;
 
 namespace EnvelopeGenerator.Web.Controllers.Test;
 
+[Obsolete("Use MediatR")]
 public class TestEnvelopeHistoryController : CRUDControllerBase<IEnvelopeHistoryService, EnvelopeHistoryCreateDto, EnvelopeHistoryDto, EnvelopeHistoryDto, EnvelopeHistory, long>
 {
     public TestEnvelopeHistoryController(ILogger<TestEnvelopeHistoryController> logger, IEnvelopeHistoryService service) : base(logger, service)
@@ -13,7 +15,7 @@ public class TestEnvelopeHistoryController : CRUDControllerBase<IEnvelopeHistory
     }
 
     [HttpGet("Count")]
-    public async Task<IActionResult> Count(int? envelopeId = null, string? userReference = null, int? status = null)
+    public async Task<IActionResult> Count(int? envelopeId = null, string? userReference = null, EnvelopeStatus? status = null)
     {
         return Ok(await _service.CountAsync(envelopeId, userReference, status));
     }
@@ -25,7 +27,7 @@ public class TestEnvelopeHistoryController : CRUDControllerBase<IEnvelopeHistory
     }
 
     [HttpGet]
-    public async Task<IActionResult> GetAsyncWith(int? envelopeId = null, string? userReference = null, int? status = null)
+    public async Task<IActionResult> GetAsyncWith(int? envelopeId = null, string? userReference = null, EnvelopeStatus? status = null)
     {
         return Ok(await _service.ReadAsync(envelopeId: envelopeId, userReference: userReference, status: status));
     }

EnvelopeGenerator.Web/Controllers/Test/TestEnvelopeMailController.cs

@@ -1,48 +1,50 @@
-using DigitalData.Core.DTO;
+using DigitalData.Core.Abstraction.Application.DTO;
 using EnvelopeGenerator.Application.Contracts.Services;
 using EnvelopeGenerator.Application.DTOs.EnvelopeReceiver;
 using Microsoft.AspNetCore.Mvc;
-using System.Net;
 
-namespace EnvelopeGenerator.Web.Controllers.Test
+namespace EnvelopeGenerator.Web.Controllers.Test;
+
+[ApiController]
+[Route("api/test/[controller]")]
+public class TestEnvelopeMailController : ControllerBase
 {
-    [ApiController]
+	private readonly ILogger<TestEnvelopeMailController> _logger;
-	[Route("api/test/[controller]")]
+    [Obsolete("Use MediatR")]
-	public class TestEnvelopeMailController : ControllerBase
+    private readonly IEnvelopeMailService _mailService;
+    [Obsolete("Use MediatR")]
+    private readonly IEnvelopeReceiverService _envRcvService;
+
+    [Obsolete("Use MediatR")]
+    public TestEnvelopeMailController(ILogger<TestEnvelopeMailController> logger, IEnvelopeMailService envelopeMailService, IEnvelopeReceiverService envelopeReceiverService)
 	{
-		private readonly ILogger<TestEnvelopeMailController> _logger;
+		_logger = logger;
-		private readonly IEnvelopeMailService _mailService;
+		_mailService = envelopeMailService;
-		private readonly IEnvelopeReceiverService _envRcvService;
+		_envRcvService = envelopeReceiverService;
+	}
 
-		public TestEnvelopeMailController(ILogger<TestEnvelopeMailController> logger, IEnvelopeMailService envelopeMailService, IEnvelopeReceiverService envelopeReceiverService)
+	[HttpGet]
-		{
+    [Obsolete("Use MediatR")]
-			_logger = logger;
+    public async Task<IActionResult> SendAccessCode([FromQuery] string envelopeReceiverId = "ZDlmYjZmYjctNTBhNS00NTcyLWI5NTQtYzJjYmY4N2UwZmZhOjowRDI3MkEwNTdGMjRBMkY3MEZDMzM3QkRBQzA1MjYxRjU3NTI2QzgxQ0IyMUE5NzE1RjA1NTJFQzdFNjIwNjY1")
-			_mailService = envelopeMailService;
+	{
-			_envRcvService = envelopeReceiverService;
+		return await _envRcvService.ReadByEnvelopeReceiverIdAsync(envelopeReceiverId: envelopeReceiverId).ThenAsync<EnvelopeReceiverDto, IActionResult>(
-		}
+			SuccessAsync: async er =>
+			{
 
-		[HttpGet]
+
-		public async Task<IActionResult> SendAccessCode([FromQuery] string envelopeReceiverId = "ZDlmYjZmYjctNTBhNS00NTcyLWI5NTQtYzJjYmY4N2UwZmZhOjowRDI3MkEwNTdGMjRBMkY3MEZDMzM3QkRBQzA1MjYxRjU3NTI2QzgxQ0IyMUE5NzE1RjA1NTJFQzdFNjIwNjY1")
+				var mailRes = await _mailService.SendAccessCodeAsync(envelopeReceiverDto: er);
-		{
+				if (mailRes.IsFailed)
-			return await _envRcvService.ReadByEnvelopeReceiverIdAsync(envelopeReceiverId: envelopeReceiverId).ThenAsync<EnvelopeReceiverDto, IActionResult>(
-				SuccessAsync: async er =>
 				{
+					_logger.LogNotice(mailRes);
+					return StatusCode(500, mailRes.Notices);
+				}
 
-
+				return Ok();
-					var mailRes = await _mailService.SendAccessCodeAsync(envelopeReceiverDto: er);
+			},
-					if (mailRes.IsFailed)
+			Fail: (messages, notices) =>
-					{
+			{
-						_logger.LogNotice(mailRes);
+				_logger.LogNotice(notices);
-						return StatusCode(500, mailRes.Notices);
+				return StatusCode(500, notices);
-					}
+			});
-
-					return Ok();
-				},
-				Fail: (messages, notices) =>
-				{
-					_logger.LogNotice(notices);
-					return StatusCode(500, notices);
-				});
-		}
 	}
 }

EnvelopeGenerator.Web/Controllers/Test/TestEnvelopeReceiverController.cs

@@ -1,66 +1,66 @@
 using DigitalData.Core.API;
-using DigitalData.Core.DTO;
 using EnvelopeGenerator.Extensions;
 using EnvelopeGenerator.Domain.Entities;
 using Microsoft.AspNetCore.Mvc;
 using EnvelopeGenerator.Application.DTOs.EnvelopeReceiver;
 using EnvelopeGenerator.Application.Contracts.Services;
+using DigitalData.Core.Abstraction.Application.DTO;
 
-namespace EnvelopeGenerator.Web.Controllers.Test
+namespace EnvelopeGenerator.Web.Controllers.Test;
+
+[Obsolete("Use MediatR")]
+public class TestEnvelopeReceiverController : ReadControllerBase<IEnvelopeReceiverService, EnvelopeReceiverDto, EnvelopeReceiver, (int Envelope, int Receiver)>
 {
-    public class TestEnvelopeReceiverController : ReadControllerBase<IEnvelopeReceiverService, EnvelopeReceiverDto, EnvelopeReceiver, (int Envelope, int Receiver)>
+    public TestEnvelopeReceiverController(ILogger<TestEnvelopeReceiverController> logger, IEnvelopeReceiverService service) : base(logger, service)
     {
-        public TestEnvelopeReceiverController(ILogger<TestEnvelopeReceiverController> logger, IEnvelopeReceiverService service) : base(logger, service)
+    }
+
+    [HttpGet("verify-access-code/{envelope_receiver_id}")]
+    public async Task<IActionResult> VerifyAccessCode([FromRoute] string envelope_receiver_id, [FromQuery] string access_code)
+    {
+        var verification = await _service.VerifyAccessCodeAsync(envelopeReceiverId:envelope_receiver_id, accessCode: access_code);
+
+        if (verification.IsSuccess)
+            return Ok(verification);
+        else if (verification.HasFlag(Flag.SecurityBreach))
+            return Forbid();
+        else if (verification.HasFlag(Flag.SecurityBreachOrDataIntegrity))
+            return Conflict();
+        else
+            return this.InnerServiceError(verification);
+    }
+
+    [HttpGet("e-r-id/{envelope_receiver_id}")]
+    public async Task<IActionResult> GetByEnvelopeReceiverId([FromRoute] string envelope_receiver_id)
+    {
+        var er_result = await _service.ReadByEnvelopeReceiverIdAsync(envelopeReceiverId: envelope_receiver_id);
+        if (er_result.IsSuccess)
+            return Ok(er_result);
+        else
+            return this.InnerServiceError(er_result);
+    }
+
+    [HttpGet("decode")]
+    public IActionResult DecodeEnvelopeReceiverId(string envelopeReceiverId, bool isReadOnly = false)
+    {
+        if (isReadOnly)
         {
+            var readOnlyId = envelopeReceiverId.DecodeEnvelopeReceiverReadOnlyId();
+            return Ok(new { readOnlyId });
         }
-
+        else
-        [HttpGet("verify-access-code/{envelope_receiver_id}")]
-        public async Task<IActionResult> VerifyAccessCode([FromRoute] string envelope_receiver_id, [FromQuery] string access_code)
         {
-            var verification = await _service.VerifyAccessCodeAsync(envelopeReceiverId:envelope_receiver_id, accessCode: access_code);
+            var (EnvelopeUuid, ReceiverSignature) = envelopeReceiverId.DecodeEnvelopeReceiverId();
-
+            return Ok(new { uuid = EnvelopeUuid, signature = ReceiverSignature });
-            if (verification.IsSuccess)
-                return Ok(verification);
-            else if (verification.HasFlag(Flag.SecurityBreach))
-                return Forbid();
-            else if (verification.HasFlag(Flag.SecurityBreachOrDataIntegrity))
-                return Conflict();
-            else
-                return this.InnerServiceError(verification);
-        }
-
-        [HttpGet("e-r-id/{envelope_receiver_id}")]
-        public async Task<IActionResult> GetByEnvelopeReceiverId([FromRoute] string envelope_receiver_id)
-        {
-            var er_result = await _service.ReadByEnvelopeReceiverIdAsync(envelopeReceiverId: envelope_receiver_id);
-            if (er_result.IsSuccess)
-                return Ok(er_result);
-            else
-                return this.InnerServiceError(er_result);
-        }
-
-        [HttpGet("decode")]
-        public IActionResult DecodeEnvelopeReceiverId(string envelopeReceiverId, bool isReadOnly = false)
-        {
-            if (isReadOnly)
-            {
-                var readOnlyId = envelopeReceiverId.DecodeEnvelopeReceiverReadOnlyId();
-                return Ok(new { readOnlyId });
-            }
-            else
-            {
-                var (EnvelopeUuid, ReceiverSignature) = envelopeReceiverId.DecodeEnvelopeReceiverId();
-                return Ok(new { uuid = EnvelopeUuid, signature = ReceiverSignature });
-            }
-        }
-
-        [HttpGet("encode")]
-        public IActionResult EncodeEnvelopeReceiverId(string? uuid = null, string? signature = null, long? readOnlyId = null)
-        {
-            if(readOnlyId is long readOnlyId_long)
-                return Ok(readOnlyId_long.EncodeEnvelopeReceiverId());
-            else
-                return Ok((uuid ?? string.Empty, signature ?? string.Empty).EncodeEnvelopeReceiverId());
         }
     }
+
+    [HttpGet("encode")]
+    public IActionResult EncodeEnvelopeReceiverId(string? uuid = null, string? signature = null, long? readOnlyId = null)
+    {
+        if(readOnlyId is long readOnlyId_long)
+            return Ok(readOnlyId_long.EncodeEnvelopeReceiverId());
+        else
+            return Ok((uuid ?? string.Empty, signature ?? string.Empty).EncodeEnvelopeReceiverId());
+    }
 }

EnvelopeGenerator.Web/Controllers/Test/TestEnvelopeTypeController.cs

@@ -4,6 +4,7 @@ using EnvelopeGenerator.Domain.Entities;
 
 namespace EnvelopeGenerator.Web.Controllers.Test;
 
+[Obsolete("Use MediatR")]
 public class TestEnvelopeTypeController : TestControllerBase<IEnvelopeTypeService, EnvelopeTypeDto, EnvelopeType, int>
 {
     public TestEnvelopeTypeController(ILogger<TestEnvelopeTypeController> logger, IEnvelopeTypeService service) : base(logger, service)

EnvelopeGenerator.Web/Controllers/Test/TestReceiverController.cs

@@ -3,13 +3,13 @@ using EnvelopeGenerator.Application.Contracts.Services;
 using EnvelopeGenerator.Application.DTOs.Receiver;
 using EnvelopeGenerator.Domain.Entities;
 
-namespace EnvelopeGenerator.Web.Controllers.Test
+namespace EnvelopeGenerator.Web.Controllers.Test;
-{
+
-    public class TestReceiverController : CRUDControllerBase<IReceiverService, ReceiverCreateDto, ReceiverReadDto, ReceiverUpdateDto, Receiver, int>
+[Obsolete("Use MediatR")]
-    {
+public class TestReceiverController : CRUDControllerBase<IReceiverService, ReceiverCreateDto, ReceiverReadDto, ReceiverUpdateDto, Receiver, int>
-        public TestReceiverController(ILogger<TestReceiverController> logger, IReceiverService service) : base(logger, service)
+{
-        {
+    public TestReceiverController(ILogger<TestReceiverController> logger, IReceiverService service) : base(logger, service)
+    {
 
-        }
     }
 }

EnvelopeGenerator.Web/Controllers/Test/TestSanitizeController.cs

@@ -2,36 +2,34 @@
 using Microsoft.AspNetCore.Mvc;
 using System.Text.Encodings.Web;
 
-namespace EnvelopeGenerator.Web.Controllers.Test
+namespace EnvelopeGenerator.Web.Controllers.Test;
+
+[ApiController]
+[Route("api/test/[controller]")]
+public class TestSanitizeController : ControllerBase
 {
-    [ApiController]
+    private readonly HtmlEncoder _htmlEncoder;
-    [Route("api/test/[controller]")]
+    private readonly HtmlSanitizer _sanitizer;
-    public class TestSanitizeController : ControllerBase
+
+    public TestSanitizeController(HtmlEncoder htmlEncoder, HtmlSanitizer sanitizer)
     {
-        private readonly HtmlEncoder _htmlEncoder;
+        _htmlEncoder = htmlEncoder;
-        private readonly HtmlSanitizer _sanitizer;
+        _sanitizer = sanitizer;
-
-        public TestSanitizeController(HtmlEncoder htmlEncoder, HtmlSanitizer sanitizer)
-        {
-            _htmlEncoder = htmlEncoder;
-            _sanitizer = sanitizer;
-        }
-
-        [HttpGet("sanitize")]
-        public IActionResult Sanitize([FromQuery] string? input = null) => Ok(new
-        {
-            input,
-            Sanitized = _sanitizer.Sanitize(input),
-            SanitizedDocument = _sanitizer.SanitizeDocument(input),
-            SanitizedDom = _sanitizer.SanitizeDom(input)
-        });
-
-
-        [HttpGet("encode")]
-        public IActionResult Encoder([FromQuery] string? input = null) => Ok(new
-        {
-            input,
-            Encoded = _htmlEncoder.Encode(input)
-        });
     }
-}
+
+    [HttpGet("sanitize")]
+    public IActionResult Sanitize([FromQuery] string input) => Ok(new
+    {
+        input,
+        Sanitized = _sanitizer.Sanitize(input),
+        SanitizedDocument = _sanitizer.SanitizeDocument(input),
+        SanitizedDom = _sanitizer.SanitizeDom(input)
+    });
+
+    [HttpGet("encode")]
+    public IActionResult Encoder([FromQuery] string input) => Ok(new
+    {
+        input,
+        Encoded = _htmlEncoder.Encode(input)
+    });
+}

EnvelopeGenerator.Web/Controllers/Test/TestUserReceiverController.cs

@@ -1,14 +0,0 @@
-using EnvelopeGenerator.Application.Contracts.Services;
-using EnvelopeGenerator.Application.DTOs;
-using EnvelopeGenerator.Domain.Entities;
-
-namespace EnvelopeGenerator.Web.Controllers.Test
-{
-    public class TestUserReceiverController : TestControllerBase< IUserReceiverService, UserReceiverDto, UserReceiver, int>
-    {
-        public TestUserReceiverController(ILogger<TestUserReceiverController> logger, IUserReceiverService service) : base(logger, service)
-        {
-
-        }
-    }
-}

EnvelopeGenerator.Web/Controllers/Test/TestViewController.cs

@@ -1,56 +1,55 @@
-using EnvelopeGenerator.CommonServices;
+using EnvelopeGenerator.Domain.Entities;
 using EnvelopeGenerator.Web.Services;
 using Microsoft.AspNetCore.Mvc;
 
-namespace EnvelopeGenerator.Web.Controllers.Test
+namespace EnvelopeGenerator.Web.Controllers.Test;
+
+[Route("api/test/[controller]")]
+public class TestViewController : BaseController
 {
-    [Route("api/test/[controller]")]
+    private readonly EnvelopeOldService envelopeOldService;
-    public class TestViewController : BaseController
+    private readonly IConfiguration _config;
+
+    public TestViewController(DatabaseService databaseService, EnvelopeOldService envelopeOldService, ILogger<TestViewController> logger, IConfiguration configuration) : base(databaseService, logger)
     {
-        private readonly EnvelopeOldService envelopeOldService;
+        this.envelopeOldService = envelopeOldService;
-        private readonly IConfiguration _config;
+        _config = configuration;
+    }
 
-        public TestViewController(DatabaseService databaseService, EnvelopeOldService envelopeOldService, ILogger<TestViewController> logger, IConfiguration configuration) : base(databaseService, logger)
+    [HttpGet]
-        {
+    public IActionResult Index()
-            this.envelopeOldService = envelopeOldService;
+    {
-            _config = configuration;
+        return View("AnnotationIndex");
-        }
+    }
 
-        [HttpGet]
+    [HttpPost]
-        public IActionResult Index()
+    public IActionResult DebugEnvelopes([FromForm] string? password)
+    {
+        try
         {
-            return View("AnnotationIndex");
+            var passwordFromConfig = _config["AdminPassword"];
-        }
 
-        [HttpPost]
+            if (passwordFromConfig == null)
-        public IActionResult DebugEnvelopes([FromForm] string? password)
-        {
-            try
             {
-                var passwordFromConfig = _config["AdminPassword"];
+                ViewData["error"] = "No admin password configured!";
-
-                if (passwordFromConfig == null)
-                {
-                    ViewData["error"] = "No admin password configured!";
-                    return View("AnnotationIndex");
-                }
-
-                if (password != passwordFromConfig)
-                {
-                    ViewData["error"] = "Wrong Password!";
-                    return View("AnnotationIndex");
-                }
-
-                List<Envelope> envelopes = envelopeOldService.LoadEnvelopes();
-
-                return View("DebugEnvelopes", envelopes);
-            } 
-            catch(Exception ex)
-            {
-                _logger.LogError(ex, "Unexpected error");
-                ViewData["error"] = "Unknown error!";
                 return View("AnnotationIndex");
-            }         
+            }
-        }
+
+            if (password != passwordFromConfig)
+            {
+                ViewData["error"] = "Wrong Password!";
+                return View("AnnotationIndex");
+            }
+
+            List<Envelope> envelopes = envelopeOldService.LoadEnvelopes();
+
+            return View("DebugEnvelopes", envelopes);
+        } 
+        catch(Exception ex)
+        {
+            _logger.LogError(ex, "Unexpected error");
+            ViewData["error"] = "Unknown error!";
+            return View("AnnotationIndex");
+        }         
     }
 }

EnvelopeGenerator.Web/Program.cs

@@ -98,6 +98,7 @@ try
     });
 
     // Add envelope generator services
+#pragma warning disable CS0618 // Type or member is obsolete
     builder.Services.AddEnvelopeGeneratorInfrastructureServices((provider, options) =>
     {
         var logger = provider.GetRequiredService<ILogger<EGDbContext>>();
@@ -106,8 +107,11 @@ try
                .EnableSensitiveDataLogging()
                .EnableDetailedErrors();
     });
+#pragma warning restore CS0618 // Type or member is obsolete
 
+#pragma warning disable CS0618 // Type or member is obsolete
     builder.Services.AddEnvelopeGeneratorServices(config);
+#pragma warning restore CS0618 // Type or member is obsolete
 
     builder.Services.Configure<CookiePolicyOptions>(options =>
     {
@@ -174,7 +178,10 @@ try
     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();
@@ -183,7 +190,9 @@ try
 
     builder.ConfigureBySection<AnnotationParams>();
 
+#pragma warning disable CS0618 // Type or member is obsolete
     builder.Services.AddUserManager<EGDbContext>();
+#pragma warning restore CS0618 // Type or member is obsolete
 
     var app = builder.Build();
 

EnvelopeGenerator.Web/Services/EnvelopeOldService.cs

@@ -1,186 +1,190 @@
 using EnvelopeGenerator.Application.Contracts.Services;
 using EnvelopeGenerator.CommonServices;
+using EnvelopeGenerator.Domain.Entities;
 using System.Text;
 
-namespace EnvelopeGenerator.Web.Services
+namespace EnvelopeGenerator.Web.Services;
+
+public class EnvelopeOldService
 {
-    public class EnvelopeOldService
+    private readonly ReceiverModel receiverModel;
+    private readonly EnvelopeModel envelopeModel;
+    private readonly HistoryModel historyModel;
+    
+    private readonly DocumentStatusModel documentStatusModel;
+
+    [Obsolete("Use MediatR")]
+    private readonly IConfigService _configService;
+    private readonly ILogger<EnvelopeOldService> _logger;
+
+    [Obsolete("Use MediatR")]
+    public EnvelopeOldService(DatabaseService database, IConfigService configService, ILogger<EnvelopeOldService> logger)
     {
-        private readonly ReceiverModel receiverModel;
+        _logger = logger;
-        private readonly EnvelopeModel envelopeModel;
-        private readonly HistoryModel historyModel;
-        
-        private readonly DocumentStatusModel documentStatusModel;
 
-        private readonly IConfigService _configService;
+        if (database.Models is null)
-        private readonly ILogger<EnvelopeOldService> _logger;
+            throw new ArgumentNullException("Models not loaded.");
 
-        public EnvelopeOldService(DatabaseService database, IConfigService configService, ILogger<EnvelopeOldService> logger)
+        receiverModel = database.Models.receiverModel;
+        envelopeModel = database.Models.envelopeModel;
+        historyModel = database.Models.historyModel;
+        documentStatusModel = database.Models.documentStatusModel;
+
+        _configService = configService;
+    }
+
+    public void EnsureValidEnvelopeKey(string envelopeKey)
+    {
+        _logger.LogInformation("Parsing EnvelopeKey..");
+
+        if (string.IsNullOrEmpty(envelopeKey))
+            throw new ArgumentNullException("EnvelopeKey");
+
+        Tuple<string, string> result = Helpers.DecodeEnvelopeReceiverId(envelopeKey);
+        _logger.LogInformation("EnvelopeUUID: [{0}]", result.Item1);
+        _logger.LogInformation("ReceiverSignature: [{0}]", result.Item2);
+
+        if (string.IsNullOrEmpty(result.Item1))
+            throw new ArgumentNullException("EnvelopeUUID");
+
+        if (string.IsNullOrEmpty(result.Item2))
+            throw new ArgumentNullException("ReceiverSignature");
+    }
+
+    [Obsolete("Use MediatR")]
+    public async Task<EnvelopeReceiver> LoadEnvelope(string pEnvelopeKey)
+    {
+        _logger.LogInformation("Loading Envelope by Key [{0}]", pEnvelopeKey);
+
+        Tuple<string, string> result = Helpers.DecodeEnvelopeReceiverId(pEnvelopeKey);
+        var envelopeUuid = result.Item1;
+        var receiverSignature = result.Item2;
+        var receiverId = receiverModel.GetReceiverIdBySignature(receiverSignature);
+
+        _logger.LogInformation("Resolved receiver signature to receiverId [{0}]", receiverId);
+
+        _logger.LogInformation("Loading envelope..");
+        Envelope? envelope = envelopeModel.GetByUuid(envelopeUuid);
+
+        if (envelope == null)
         {
-            _logger = logger;
+            _logger.LogWarning("Envelope not found");
-
+            throw new NullReferenceException("Envelope not found");
-            if (database.Models is null)
-                throw new ArgumentNullException("Models not loaded.");
-
-            receiverModel = database.Models.receiverModel;
-            envelopeModel = database.Models.envelopeModel;
-            historyModel = database.Models.historyModel;
-            documentStatusModel = database.Models.documentStatusModel;
-
-            _configService = configService;
         }
 
-        public void EnsureValidEnvelopeKey(string envelopeKey)
+        _logger.LogInformation("Envelope loaded");
+
+        if (envelope.Receivers == null)
         {
-            _logger.LogInformation("Parsing EnvelopeKey..");
+            _logger.LogWarning("Receivers for envelope not loaded");
-
+            throw new NullReferenceException("Receivers for envelope not loaded");
-            if (string.IsNullOrEmpty(envelopeKey))
-                throw new ArgumentNullException("EnvelopeKey");
-
-            Tuple<string, string> result = Helpers.DecodeEnvelopeReceiverId(envelopeKey);
-            _logger.LogInformation("EnvelopeUUID: [{0}]", result.Item1);
-            _logger.LogInformation("ReceiverSignature: [{0}]", result.Item2);
-
-            if (string.IsNullOrEmpty(result.Item1))
-                throw new ArgumentNullException("EnvelopeUUID");
-
-            if (string.IsNullOrEmpty(result.Item2))
-                throw new ArgumentNullException("ReceiverSignature");
         }
 
-        public async Task<EnvelopeReceiver> LoadEnvelope(string pEnvelopeKey)
+        _logger.LogInformation("Envelope receivers found: [{0}]", envelope.Receivers.Count);
+
+        Receiver? receiver = envelope.Receivers.Where(r => r.Id == receiverId).SingleOrDefault();
+
+        if (receiver == null)
         {
-            _logger.LogInformation("Loading Envelope by Key [{0}]", pEnvelopeKey);
+            _logger.LogWarning("Receiver [{0}] not found", receiverId);
-
+            throw new NullReferenceException("Receiver not found");
-            Tuple<string, string> result = Helpers.DecodeEnvelopeReceiverId(pEnvelopeKey);
-            var envelopeUuid = result.Item1;
-            var receiverSignature = result.Item2;
-            var receiverId = receiverModel.GetReceiverIdBySignature(receiverSignature);
-
-            _logger.LogInformation("Resolved receiver signature to receiverId [{0}]", receiverId);
-
-            _logger.LogInformation("Loading envelope..");
-            Envelope? envelope = envelopeModel.GetByUuid(envelopeUuid);
-
-            if (envelope == null)
-            {
-                _logger.LogWarning("Envelope not found");
-                throw new NullReferenceException("Envelope not found");
-            }
-
-            _logger.LogInformation("Envelope loaded");
-
-            if (envelope.Receivers == null)
-            {
-                _logger.LogWarning("Receivers for envelope not loaded");
-                throw new NullReferenceException("Receivers for envelope not loaded");
-            }
-
-            _logger.LogInformation("Envelope receivers found: [{0}]", envelope.Receivers.Count);
-
-            Receiver? receiver = envelope.Receivers.Where(r => r.Id == receiverId).SingleOrDefault();
-
-            if (receiver == null)
-            {
-                _logger.LogWarning("Receiver [{0}] not found", receiverId);
-                throw new NullReferenceException("Receiver not found");
-            }
-
-            _logger.LogInformation("Loading documents for receiver [{0}]", receiver.EmailAddress);
-
-            // filter elements by receiver
-            envelope.Documents = envelope.Documents.Select((document) =>
-            {
-                document.Elements = document.Elements.Where((e) => e.ReceiverId == receiverId).ToList();
-                return document;
-            }).ToList();
-
-            //if documenet_path_dmz is existing in config, replace the path with it
-            var config = await _configService.ReadDefaultAsync();
-
-            return new()
-            {
-                Receiver = receiver,
-                Envelope = envelope
-            };
         }
 
-        public List<Envelope> LoadEnvelopes()
+        _logger.LogInformation("Loading documents for receiver [{0}]", receiver.EmailAddress);
+
+        // filter elements by receiver
+        envelope.Documents = envelope.Documents.Select((document) =>
         {
-            var receivers = receiverModel.ListReceivers();
+            document.Elements = document.Elements.Where((e) => e.ReceiverId == receiverId).ToList();
-            List<Envelope> envelopes = new();
-
-            foreach (var receiver in receivers)
-            {
-                var envs = (List<Envelope>)envelopeModel.List(receiver.Id);
-                envelopes.AddRange(envs);
-            }
-
-            return envelopes;
-        }
-
-        public List<Envelope> LoadEnvelopes(int pReceiverId)
-        {
-            return (List<Envelope>)envelopeModel.List(pReceiverId);
-        }
-
-        public bool ReceiverAlreadySigned(Envelope envelope, int receiverId)
-        {
-            return historyModel.HasReceiverSigned(envelope.Id, receiverId);     
-        }
-
-        public async Task<string?> EnsureValidAnnotationData(HttpRequest request)
-        {
-            try
-            {
-                _logger.LogInformation("Parsing annotation data from request..");
-
-                using MemoryStream ms = new();
-                await request.BodyReader.CopyToAsync(ms);
-                var bytes = ms.ToArray();
-
-                _logger.LogInformation("Annotation data parsed, size: [{0}]", bytes.Length);
-
-                return Encoding.UTF8.GetString(bytes);
-            }
-            catch (Exception e)
-            {
-                _logger.LogError(e, "Inner Service Error");
-                throw new ArgumentNullException("AnnotationData");
-            }
-        }
-
-        public async Task<EnvelopeDocument> GetDocument(int documentId, string envelopeKey)
-        {
-            EnvelopeReceiver response = await LoadEnvelope(envelopeKey);
-
-            _logger.LogInformation("Loading document for Id [{0}]", documentId);
-            
-            var document = response.Envelope.Documents.
-                Where(d => d.Id == documentId).
-                FirstOrDefault();
-
-            if (document == null)
-                throw new ArgumentException("DocumentId");
-
-            _logger.LogInformation("Document [{0}] loaded!", documentId);
-
             return document;
+        }).ToList();
+
+        //if documenet_path_dmz is existing in config, replace the path with it
+        var config = await _configService.ReadDefaultAsync();
+
+        return new()
+        {
+            Receiver = receiver,
+            Envelope = envelope
+        };
+    }
+
+    public List<Envelope> LoadEnvelopes()
+    {
+        var receivers = receiverModel.ListReceivers();
+        List<Envelope> envelopes = new();
+
+        foreach (var receiver in receivers)
+        {
+            var envs = (List<Envelope>)envelopeModel.List(receiver.Id);
+            envelopes.AddRange(envs);
         }
 
-        public bool InsertDocumentStatus(Common.DocumentStatus documentStatus)
+        return envelopes;
+    }
+
+    public List<Envelope> LoadEnvelopes(int pReceiverId)
+    {
+        return (List<Envelope>)envelopeModel.List(pReceiverId);
+    }
+
+    public bool ReceiverAlreadySigned(Envelope envelope, int receiverId)
+    {
+        return historyModel.HasReceiverSigned(envelope.Id, receiverId);     
+    }
+
+    public async Task<string?> EnsureValidAnnotationData(HttpRequest request)
+    {
+        try
         {
-            _logger.LogInformation("Saving annotation data..");
+            _logger.LogInformation("Parsing annotation data from request..");
-            return documentStatusModel.InsertOrUpdate(documentStatus);
+
+            using MemoryStream ms = new();
+            await request.BodyReader.CopyToAsync(ms);
+            var bytes = ms.ToArray();
+
+            _logger.LogInformation("Annotation data parsed, size: [{0}]", bytes.Length);
+
+            return Encoding.UTF8.GetString(bytes);
         }
-
+        catch (Exception e)
-        public async Task<byte[]> GetDocumentContents(EnvelopeDocument document)
         {
-            _logger.LogInformation("Loading file [{0}]", document.Filepath);
+            _logger.LogError(e, "Inner Service Error");
-            var bytes = await File.ReadAllBytesAsync(document.Filepath);
+            throw new ArgumentNullException("AnnotationData");
-            _logger.LogInformation("File loaded, size: [{0}]", bytes.Length);
-
-            return bytes;
         }
     }
+
+    [Obsolete("Use MediatR")]
+    public async Task<EnvelopeDocument> GetDocument(int documentId, string envelopeKey)
+    {
+        EnvelopeReceiver response = await LoadEnvelope(envelopeKey);
+
+        _logger.LogInformation("Loading document for Id [{0}]", documentId);
+        
+        var document = response.Envelope.Documents.
+            Where(d => d.Id == documentId).
+            FirstOrDefault();
+
+        if (document == null)
+            throw new ArgumentException("DocumentId");
+
+        _logger.LogInformation("Document [{0}] loaded!", documentId);
+
+        return document;
+    }
+
+    public bool InsertDocumentStatus(DocumentStatus documentStatus)
+    {
+        _logger.LogInformation("Saving annotation data..");
+        return documentStatusModel.InsertOrUpdate(documentStatus);
+    }
+
+    public async Task<byte[]> GetDocumentContents(EnvelopeDocument document)
+    {
+        _logger.LogInformation("Loading file [{0}]", document.Filepath);
+        var bytes = await File.ReadAllBytesAsync(document.Filepath);
+        _logger.LogInformation("File loaded, size: [{0}]", bytes.Length);
+
+        return bytes;
+    }
 }

EnvelopeGenerator.Web/Views/Home/EnvelopeRejected.cshtml

@@ -4,7 +4,7 @@
 @{
 	var nonce = _accessor.HttpContext?.Items["csp-nonce"] as string;
 }
-@using DigitalData.Core.DTO;
+@using DigitalData.Core.Abstraction.Application.DTO;
 @using EnvelopeGenerator.Application.DTOs.EnvelopeReceiver
 @using Newtonsoft.Json
 @using Newtonsoft.Json.Serialization

EnvelopeGenerator.Web/Views/Home/ShowEnvelope.cshtml

@@ -2,7 +2,7 @@
     var nonce = _accessor.HttpContext?.Items["csp-nonce"] as string;
     var cImg = _cImgOpt.Value;
 }
-@using DigitalData.Core.DTO;
+@using DigitalData.Core.Abstraction.Application;
 @using EnvelopeGenerator.Application.DTOs;
 @using EnvelopeGenerator.Application.DTOs.EnvelopeReceiver
 @using EnvelopeGenerator.Application.DTOs.EnvelopeReceiverReadOnly

EnvelopeGenerator.Web/Views/TestView/DebugEnvelopes.cshtml

@@ -1,5 +1,6 @@
 @using EnvelopeGenerator.CommonServices;
-@using static EnvelopeGenerator.CommonServices.Constants;
+@using EnvelopeGenerator.Domain.Entities;
+@using static EnvelopeGenerator.Domain.Constants;
 @{
     ViewData["Title"] = "Debug";
 }
@@ -11,9 +12,9 @@
         return Helpers.EncodeEnvelopeReceiverId(envelope.Uuid, receiver.Signature);
     }
 
-    IEnumerable<IGrouping<EnvelopeStatus, Envelope>> groupEnvelopes(List<Envelope> envelopes) 
+    IEnumerable<IGrouping<EnvelopeStatus, Envelope>> groupEnvelopes(List<Envelope> envelopes)
     {
-        return envelopes.GroupBy(item => item.Status).OrderBy(item => (int)item.Key);
+        return envelopes.GroupBy(item => (EnvelopeStatus) item.Status).OrderBy(item => item.Key);
     }
 }
 

EnvelopeGenerator.sln

@@ -53,8 +53,8 @@ Global
 		{6D56C01F-D6CB-4D8A-BD3D-4FD34326998C}.Release|Any CPU.Build.0 = Debug|Any CPU
 		{6EA0C51F-C2B1-4462-8198-3DE0B32B74F8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{6EA0C51F-C2B1-4462-8198-3DE0B32B74F8}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{6EA0C51F-C2B1-4462-8198-3DE0B32B74F8}.Release|Any CPU.ActiveCfg = Debug|Any CPU
+		{6EA0C51F-C2B1-4462-8198-3DE0B32B74F8}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{6EA0C51F-C2B1-4462-8198-3DE0B32B74F8}.Release|Any CPU.Build.0 = Debug|Any CPU
+		{6EA0C51F-C2B1-4462-8198-3DE0B32B74F8}.Release|Any CPU.Build.0 = Release|Any CPU
 		{5E0E17C0-FF5A-4246-BF87-1ADD85376A27}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{5E0E17C0-FF5A-4246-BF87-1ADD85376A27}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{5E0E17C0-FF5A-4246-BF87-1ADD85376A27}.Release|Any CPU.ActiveCfg = Debug|Any CPU