refactor(form): vbproj aktualisieren, um mit .net 8 zu konfigurieren.

- Verwandte Referenzen für net 9 hinzufügen.
 - Backup-XML-Datei für altes vbproj erstellen.

EnvelopeGenerator.Application/Common/Configurations/AuthenticatorParams.cs

@@ -1,4 +1,4 @@
-namespace EnvelopeGenerator.Application.Configurations;
+namespace EnvelopeGenerator.Application.Common.Configurations;
 
 /// <summary>
 /// 

EnvelopeGenerator.Application/Common/Configurations/DbTriggerParams.cs

@@ -1,4 +1,4 @@
-namespace EnvelopeGenerator.Application.Configurations;
+namespace EnvelopeGenerator.Application.Common.Configurations;
 
 /// <summary>
 /// 

EnvelopeGenerator.Application/Common/Configurations/DispatcherParams.cs

@@ -1,4 +1,4 @@
-namespace EnvelopeGenerator.Application.Configurations;
+namespace EnvelopeGenerator.Application.Common.Configurations;
 
 /// <summary>
 /// 
@@ -23,5 +23,5 @@ public class DispatcherParams
     /// <summary>
     /// Default value is string.Empty
     /// </summary>
-    public string EmailAttmt1 { get; init; } = string.Empty;
+    public string? EmailAttmt1 { get; init; } = null;
 }

EnvelopeGenerator.Application/Common/Configurations/GtxMessagingParams.cs

@@ -1,5 +1,5 @@
 using DigitalData.Core.Client.Interface;
-namespace EnvelopeGenerator.Application.Configurations;
+namespace EnvelopeGenerator.Application.Common.Configurations;
 
 /// <summary>
 /// https://www.gtx-messaging.com/en/api-docs/sms-rest-api/

EnvelopeGenerator.Application/Common/Configurations/MailParams.cs

@@ -1,4 +1,4 @@
-namespace EnvelopeGenerator.Application.Configurations;
+namespace EnvelopeGenerator.Application.Common.Configurations;
 
 /// <summary>
 /// 

EnvelopeGenerator.Application/Common/Configurations/TotpSmsParams.cs

@@ -1,7 +1,7 @@
 using OtpNet;
 using System.Globalization;
 
-namespace EnvelopeGenerator.Application.Configurations;
+namespace EnvelopeGenerator.Application.Common.Configurations;
 
 /// <summary>
 /// 

EnvelopeGenerator.Application/Common/Dto/ConfigDto.cs

@@ -1,6 +1,6 @@
 using Microsoft.AspNetCore.Mvc;
 
-namespace EnvelopeGenerator.Application.Dto;
+namespace EnvelopeGenerator.Application.Common.Dto;
 
 /// <summary>
 /// Data Transfer Object representing configuration settings.

EnvelopeGenerator.Application/Common/Dto/DocumentDto.cs

@@ -1,12 +1,12 @@
 using Microsoft.AspNetCore.Mvc;
 
-namespace EnvelopeGenerator.Application.Dto;
+namespace EnvelopeGenerator.Application.Common.Dto;
 
 /// <summary>
 /// Data Transfer Object representing a document within an envelope, including optional binary data and form elements.
 /// </summary>
 [ApiExplorerSettings(IgnoreApi = true)]
-public class EnvelopeDocumentDto
+public class DocumentDto
 {
     /// <summary>
     /// Gets or sets the unique identifier of the document.
@@ -31,5 +31,5 @@ public class EnvelopeDocumentDto
     /// <summary>
     /// Gets or sets the collection of elements associated with the document for receiver interactions, if any.
     /// </summary>
-    public IEnumerable<DocumentReceiverElementDto>? Elements { get; set; }
+    public IEnumerable<SignatureDto>? Elements { get; set; }
 }

EnvelopeGenerator.Application/Common/Dto/DocumentStatusDto.cs

@@ -1,6 +1,7 @@
-using Microsoft.AspNetCore.Mvc;
+using EnvelopeGenerator.Domain.Constants;
+using Microsoft.AspNetCore.Mvc;
 
-namespace EnvelopeGenerator.Application.Dto;
+namespace EnvelopeGenerator.Application.Common.Dto;
 
 /// <summary>
 /// Data Transfer Object representing the status of a document for a specific receiver.
@@ -26,7 +27,7 @@ public class DocumentStatusDto
     /// <summary>
     /// Gets or sets the current status code.
     /// </summary>
-    public int Status { get; set; }
+    public EnvelopeStatus Status { get; set; }
 
     /// <summary>
     /// Gets or sets the timestamp when the status was changed.

EnvelopeGenerator.Application/Common/Dto/EmailTemplateDto.cs

@@ -1,6 +1,6 @@
 using Microsoft.AspNetCore.Mvc;
 
-namespace EnvelopeGenerator.Application.Dto
+namespace EnvelopeGenerator.Application.Common.Dto
 {
     /// <summary>
     /// 

EnvelopeGenerator.Application/Common/Dto/EnvelopeDto.cs

@@ -1,9 +1,10 @@
 using DigitalData.EmailProfilerDispatcher.Abstraction.Attributes;
 using DigitalData.UserManager.Application.DTOs.User;
+using EnvelopeGenerator.Domain.Constants;
 using EnvelopeGenerator.Domain.Entities;
 using Microsoft.AspNetCore.Mvc;
 
-namespace EnvelopeGenerator.Application.Dto;
+namespace EnvelopeGenerator.Application.Common.Dto;
 
 /// <summary>
 /// 
@@ -24,7 +25,7 @@ public record EnvelopeDto
     /// <summary>
     /// 
     /// </summary>
-    public int Status { get; set; }
+    public required EnvelopeStatus Status { get; set; }
 
     /// <summary>
     /// Default value is string.Empty
@@ -116,5 +117,5 @@ public record EnvelopeDto
     /// <summary>
     /// 
     /// </summary>
-    public IEnumerable<EnvelopeDocumentDto>? Documents { get; set; }
+    public IEnumerable<DocumentDto>? Documents { get; set; }
 }

EnvelopeGenerator.Application/Common/Dto/EnvelopeReceiver/EnvelopeReceiverDto.cs

@@ -1,14 +1,25 @@
 using DigitalData.EmailProfilerDispatcher.Abstraction.Attributes;
+using EnvelopeGenerator.Application.Common.Dto.Receiver;
 using Microsoft.AspNetCore.Mvc;
 
-namespace EnvelopeGenerator.Application.Dto.EnvelopeReceiver;
+namespace EnvelopeGenerator.Application.Common.Dto.EnvelopeReceiver;
 
 /// <summary>
 /// 
 /// </summary>
 [ApiExplorerSettings(IgnoreApi = true)]
-public record EnvelopeReceiverBasicDto
+public record EnvelopeReceiverDto
 {
+    /// <summary>
+    /// 
+    /// </summary>
+    public EnvelopeDto? Envelope { get; set; }
+
+    /// <summary>
+    /// 
+    /// </summary>
+    public ReceiverDto? Receiver { get; set; }
+
     /// <summary>
     /// 
     /// </summary>

EnvelopeGenerator.Application/Common/Dto/EnvelopeReceiver/EnvelopeReceiverSecretDto.cs

@@ -1,6 +1,6 @@
 using Microsoft.AspNetCore.Mvc;
 
-namespace EnvelopeGenerator.Application.Dto.EnvelopeReceiver;
+namespace EnvelopeGenerator.Application.Common.Dto.EnvelopeReceiver;
 
 /// <summary>
 /// 

EnvelopeGenerator.Application/Common/Dto/EnvelopeReceiverReadOnly/EnvelopeReceiverReadOnlyCreateDto.cs

@@ -2,7 +2,7 @@
 using System.ComponentModel.DataAnnotations;
 using System.Text.Json.Serialization;
 
-namespace EnvelopeGenerator.Application.Dto.EnvelopeReceiverReadOnly;
+namespace EnvelopeGenerator.Application.Common.Dto.EnvelopeReceiverReadOnly;
 
 /// <summary>
 /// 

EnvelopeGenerator.Application/Common/Dto/EnvelopeReceiverReadOnly/EnvelopeReceiverReadOnlyDto.cs

@@ -1,7 +1,8 @@
-using EnvelopeGenerator.Application.Dto.Receiver;
+using EnvelopeGenerator.Application.Common.Dto;
+using EnvelopeGenerator.Application.Common.Dto.Receiver;
 using Microsoft.AspNetCore.Mvc;
 
-namespace EnvelopeGenerator.Application.Dto.EnvelopeReceiverReadOnly;
+namespace EnvelopeGenerator.Application.Common.Dto.EnvelopeReceiverReadOnly;
 
 /// <summary>
 /// Represents a read-only Data Transfer Object (DTO) for an envelope receiver.
@@ -59,5 +60,5 @@ public class EnvelopeReceiverReadOnlyDto
     /// <summary>
     /// Gets or inits the associated receiver details.
     /// </summary>
-    public ReceiverReadDto? Receiver { get; set; }
+    public ReceiverDto? Receiver { get; set; }
 }

EnvelopeGenerator.Application/Common/Dto/EnvelopeReceiverReadOnly/EnvelopeReceiverReadOnlyUpdateDto.cs

@@ -1,6 +1,6 @@
 using Microsoft.AspNetCore.Mvc;
 
-namespace EnvelopeGenerator.Application.Dto.EnvelopeReceiverReadOnly;
+namespace EnvelopeGenerator.Application.Common.Dto.EnvelopeReceiverReadOnly;
 
 /// <summary>
 /// Data Transfer Object for updating a read-only envelope receiver.

EnvelopeGenerator.Application/Common/Dto/EnvelopeTypeDto.cs

@@ -1,6 +1,6 @@
 using Microsoft.AspNetCore.Mvc;
 
-namespace EnvelopeGenerator.Application.Dto;
+namespace EnvelopeGenerator.Application.Common.Dto;
 
 /// <summary>
 /// Data Transfer Object representing a type of envelope with its configuration settings.

EnvelopeGenerator.Application/Common/Dto/History/HistoryCreateDto.cs

@@ -1,11 +1,9 @@
-using Microsoft.AspNetCore.Mvc;
-
-namespace EnvelopeGenerator.Application.Dto.EnvelopeHistory;
+namespace EnvelopeGenerator.Application.Common.Dto.History;
 
 /// <summary>
 /// Data Transfer Object for creating a new envelope history record.
 /// </summary>
-public class EnvelopeHistoryCreateDto
+public class HistoryCreateDto
 {
     /// <summary>
     /// Gets or sets the identifier of the envelope.

EnvelopeGenerator.Application/Common/Dto/History/HistoryDto.cs

@@ -1,13 +1,13 @@
 using DigitalData.UserManager.Application.DTOs.User;
-using EnvelopeGenerator.Application.Dto.Receiver;
-using static EnvelopeGenerator.Domain.Constants;
+using EnvelopeGenerator.Application.Common.Dto.Receiver;
+using EnvelopeGenerator.Domain.Constants;
 
-namespace EnvelopeGenerator.Application.Dto.EnvelopeHistory;
+namespace EnvelopeGenerator.Application.Common.Dto.History;
 
 /// <summary>
 /// Data Transfer Object representing the history of an envelope, including status, sender, receiver, and related metadata.
 /// </summary>
-public record EnvelopeHistoryDto
+public record HistoryDto
 {
     /// <summary>
     /// Unique identifier for the envelope history entry.
@@ -27,7 +27,17 @@ public record EnvelopeHistoryDto
     /// <summary>
     /// Include code of the envelope at this history point.
     /// </summary>
-    public int Status { get; set; }
+    public EnvelopeStatus Status { get; set; }
+
+    /// <summary>
+    /// Type of reference for this history entry.
+    /// </summary>
+    public ReferenceType ReferenceType => ((int)Status).ToString().FirstOrDefault() switch
+    {
+        '1' => ReferenceType.Sender,
+        '2' => ReferenceType.Receiver,
+        _ => ReferenceType.System,
+    };
 
     /// <summary>
     /// Human-readable name of the status.
@@ -52,12 +62,7 @@ public record EnvelopeHistoryDto
     /// <summary>
     /// Information about the receiver associated with this history entry.
     /// </summary>
-    public ReceiverReadDto? Receiver { get; set; }
-
-    /// <summary>
-    /// Type of reference for this history entry.
-    /// </summary>
-    public ReferenceType ReferenceType { get; set; }
+    public ReceiverDto? Receiver { get; set; }
 
     /// <summary>
     /// Optional comment related to this history entry.

EnvelopeGenerator.Application/Common/Dto/MappingProfile.cs

@@ -1,13 +1,13 @@
 using AutoMapper;
-using EnvelopeGenerator.Application.Dto.EnvelopeHistory;
-using EnvelopeGenerator.Application.Dto.EnvelopeReceiver;
-using EnvelopeGenerator.Application.Dto.EnvelopeReceiverReadOnly;
-using EnvelopeGenerator.Application.Dto.Messaging;
-using EnvelopeGenerator.Application.Dto.Receiver;
-using EnvelopeGenerator.Application.Extensions;
+using EnvelopeGenerator.Application.Common.Dto.History;
+using EnvelopeGenerator.Application.Common.Dto.EnvelopeReceiver;
+using EnvelopeGenerator.Application.Common.Dto.EnvelopeReceiverReadOnly;
+using EnvelopeGenerator.Application.Common.Dto.Messaging;
+using EnvelopeGenerator.Application.Common.Dto.Receiver;
+using EnvelopeGenerator.Application.Common.Extensions;
 using EnvelopeGenerator.Domain.Entities;
 
-namespace EnvelopeGenerator.Application.Dto;
+namespace EnvelopeGenerator.Application.Common.Dto;
 
 /// <summary>
 /// Represents the AutoMapper profile configuration for mapping between
@@ -23,36 +23,31 @@ public class MappingProfile : Profile
     {
         // Entity to DTO mappings
         CreateMap<Config, ConfigDto>();
-        CreateMap<DocumentReceiverElement, DocumentReceiverElementDto>();
+        CreateMap<Signature, SignatureDto>();
         CreateMap<DocumentStatus, DocumentStatusDto>();
         CreateMap<EmailTemplate, EmailTemplateDto>();
         CreateMap<Envelope, EnvelopeDto>();
-        CreateMap<EnvelopeDocument, EnvelopeDocumentDto>();
-        CreateMap<Domain.Entities.EnvelopeHistory, EnvelopeHistoryDto>();
-        CreateMap<Domain.Entities.EnvelopeHistory, EnvelopeHistoryCreateDto>();
+        CreateMap<Document, DocumentDto>();
+        CreateMap<Domain.Entities.History, HistoryDto>();
+        CreateMap<Domain.Entities.History, HistoryCreateDto>();
         CreateMap<Domain.Entities.EnvelopeReceiver, EnvelopeReceiverDto>();
         CreateMap<Domain.Entities.EnvelopeReceiver, EnvelopeReceiverSecretDto>();
         CreateMap<EnvelopeType, EnvelopeTypeDto>();
-        CreateMap<Domain.Entities.Receiver, ReceiverReadDto>();
-        CreateMap<Domain.Entities.Receiver, ReceiverCreateDto>();
-        CreateMap<Domain.Entities.Receiver, ReceiverUpdateDto>();
+        CreateMap<Domain.Entities.Receiver, ReceiverDto>();
         CreateMap<Domain.Entities.EnvelopeReceiverReadOnly, EnvelopeReceiverReadOnlyDto>();
 
         // DTO to Entity mappings
         CreateMap<ConfigDto, Config>();
-        CreateMap<DocumentReceiverElementDto, DocumentReceiverElement>();
+        CreateMap<SignatureDto, Signature>();
         CreateMap<DocumentStatusDto, DocumentStatus>();
         CreateMap<EmailTemplateDto, EmailTemplate>();
         CreateMap<EnvelopeDto, Envelope>();
-        CreateMap<EnvelopeDocumentDto, EnvelopeDocument>();
-        CreateMap<EnvelopeHistoryDto, Domain.Entities.EnvelopeHistory>();
-        CreateMap<EnvelopeHistoryCreateDto, Domain.Entities.EnvelopeHistory>();
+        CreateMap<DocumentDto, Document>();
+        CreateMap<HistoryDto, Domain.Entities.History>();
+        CreateMap<HistoryCreateDto, Domain.Entities.History>();
         CreateMap<EnvelopeReceiverDto, Domain.Entities.EnvelopeReceiver>();
         CreateMap<EnvelopeTypeDto, EnvelopeType>();
-        CreateMap<ReceiverReadDto, Domain.Entities.Receiver>().ForMember(rcv => rcv.EnvelopeReceivers, rcvReadDto => rcvReadDto.Ignore());
-        CreateMap<ReceiverCreateDto, Domain.Entities.Receiver>();
-        CreateMap<ReceiverUpdateDto, Domain.Entities.Receiver>();
-        CreateMap<Domain.Entities.EnvelopeReceiver, EnvelopeReceiverBasicDto>();
+        CreateMap<ReceiverDto, Domain.Entities.Receiver>().ForMember(rcv => rcv.EnvelopeReceivers, rcvReadDto => rcvReadDto.Ignore());
         CreateMap<EnvelopeReceiverReadOnlyCreateDto, Domain.Entities.EnvelopeReceiverReadOnly>();
         CreateMap<EnvelopeReceiverReadOnlyUpdateDto, Domain.Entities.EnvelopeReceiverReadOnly>();
 

EnvelopeGenerator.Application/Common/Dto/Messaging/GtxMessagingResponse.cs

@@ -1,6 +1,6 @@
 using Microsoft.AspNetCore.Mvc;
 
-namespace EnvelopeGenerator.Application.Dto.Messaging;
+namespace EnvelopeGenerator.Application.Common.Dto.Messaging;
 
 /// <summary>
 /// 

EnvelopeGenerator.Application/Common/Dto/Messaging/SmsResponse.cs

@@ -1,6 +1,6 @@
 using Microsoft.AspNetCore.Mvc;
 
-namespace EnvelopeGenerator.Application.Dto.Messaging;
+namespace EnvelopeGenerator.Application.Common.Dto.Messaging;
 
 /// <summary>
 /// 

EnvelopeGenerator.Application/Common/Dto/Receiver/ReceiverDto.cs

@@ -1,14 +1,14 @@
-using EnvelopeGenerator.Application.Dto.EnvelopeReceiver;
+using EnvelopeGenerator.Application.Common.Dto.EnvelopeReceiver;
 using Microsoft.AspNetCore.Mvc;
 using System.Text.Json.Serialization;
 
-namespace EnvelopeGenerator.Application.Dto.Receiver;
+namespace EnvelopeGenerator.Application.Common.Dto.Receiver;
 
 /// <summary>
 /// 
 /// </summary>
 [ApiExplorerSettings(IgnoreApi = true)]
-public class ReceiverReadDto
+public class ReceiverDto
 {
     /// <summary>
     /// 
@@ -25,6 +25,12 @@ public class ReceiverReadDto
     /// </summary>
     public required string Signature { get; set; }
 
+    /// <summary>
+    /// 
+    /// </summary>
+    [JsonIgnore]
+    public string? TotpSecretkey { get; set; }
+
     /// <summary>
     /// 
     /// </summary>
@@ -34,18 +40,13 @@ public class ReceiverReadDto
     /// 
     /// </summary>
     [JsonIgnore]
-    public IEnumerable<EnvelopeReceiverBasicDto>? EnvelopeReceivers { get; set; }
+    public IEnumerable<EnvelopeReceiverDto>? EnvelopeReceivers { get; set; }
 
     /// <summary>
     /// 
     /// </summary>
     public string? LastUsedName => EnvelopeReceivers?.LastOrDefault()?.Name;
 
-    /// <summary>
-    /// 
-    /// </summary>
-    public string? TotpSecretkey { get; set; } = null;
-
     /// <summary>
     /// 
     /// </summary>

EnvelopeGenerator.Application/Common/Dto/SignatureDto.cs

@@ -1,12 +1,12 @@
 using Microsoft.AspNetCore.Mvc;
 
-namespace EnvelopeGenerator.Application.Dto;
+namespace EnvelopeGenerator.Application.Common.Dto;
 
 /// <summary>
 /// Data Transfer Object representing a positioned element assigned to a document receiver.
 /// </summary>
 [ApiExplorerSettings(IgnoreApi = true)]
-public class DocumentReceiverElementDto
+public class SignatureDto
 {
     /// <summary>
     /// Gets or sets the unique identifier of the element.
@@ -86,10 +86,10 @@ public class DocumentReceiverElementDto
     /// <summary>
     /// Gets or sets the top position of the element (in layout terms).
     /// </summary>
-    public double Top { get; set; }
+    public double Top => Y;
 
     /// <summary>
     /// Gets or sets the left position of the element (in layout terms).
     /// </summary>
-    public double Left { get; set; }
+    public double Left => X;
 }

EnvelopeGenerator.Application/Common/EnvelopeFlag.cs

@@ -0,0 +1,27 @@
+namespace EnvelopeGenerator.Application.Common;
+
+/// <summary>
+/// 
+/// </summary>
+public enum EnvelopeFlag
+{
+    /// <summary>
+    /// 
+    /// </summary>
+    EnvelopeOrReceiverNonexists,
+
+    /// <summary>
+    /// 
+    /// </summary>
+    NonDecodableEnvelopeReceiverId,
+
+    /// <summary>
+    /// 
+    /// </summary>
+    WrongEnvelopeReceiverId,
+
+    /// <summary>
+    /// 
+    /// </summary>
+    AccessCodeNull
+}

EnvelopeGenerator.Application/Common/Extensions/CacheExtensions.cs

@@ -1,6 +1,6 @@
 using Microsoft.Extensions.Caching.Distributed;
 
-namespace EnvelopeGenerator.Application.Extensions;
+namespace EnvelopeGenerator.Application.Common.Extensions;
 
 /// <summary>
 /// 

EnvelopeGenerator.Application/Common/Extensions/DecodingExtensions.cs

@@ -0,0 +1,182 @@
+using EnvelopeGenerator.Domain.Constants;
+using System.Text;
+
+namespace EnvelopeGenerator.Application.Common.Extensions;
+
+/// <summary>
+/// 
+/// </summary>
+public static class DecodingExtensions
+{
+    /// <summary>
+    /// Validates whether a given string is a correctly formatted Base-64 encoded string.
+    /// </summary>
+    /// <remarks>
+    /// This method checks the string for proper Base-64 formatting, which includes validating
+    /// the length of the string (must be divisible by 4). It also checks each character to ensure
+    /// it belongs to the Base-64 character set (A-Z, a-z, 0-9, '+', '/', and '=' for padding).
+    /// The method ensures that padding characters ('=') only appear at the end of the string and
+    /// are in a valid configuration (either one '=' at the end if the string's length % 4 is 3,
+    /// or two '==' if the length % 4 is 2).
+    /// </remarks>
+    /// <param name="input">The Base-64 encoded string to validate.</param>
+    /// <returns>
+    /// <c>true</c> if the string is a valid Base-64 encoded string; otherwise, <c>false</c>.
+    /// </returns>
+    /// <example>
+    /// <code>
+    /// string testString = "TWFuIGlzIGRpc3Rpbmd1aXNoZWQsIG5vdCBvbmx5IGJ5IGhpcyByZWFzb24sIGJ1dCBieSB0aGlzIHNpbmd1bGFyIHBhc3Npb24gZnJvbSBvdGhlciBhbmltYWxzLCB3aGljaCBpcyBhIGx1c3Qgb2YgdGhlIG1pbmQsIHRoYXQgYnk=";
+    /// bool isValid = IsValidBase64String(testString);
+    /// Console.WriteLine(isValid); // Output: true
+    /// </code>
+    /// </example>
+    public static bool IsBase64String(this string input)
+    {
+        // Check if the string is null or empty
+        if (string.IsNullOrEmpty(input))
+        {
+            return false;
+        }
+
+        // Replace valid base-64 padding
+        input = input.Trim();
+        int mod4 = input.Length % 4;
+        if (mod4 > 0)
+        {
+            // Base-64 string lengths should be divisible by 4
+            return false;
+        }
+
+        // Check each character to ensure it is valid base-64
+        foreach (char c in input)
+        {
+            if (!char.IsLetterOrDigit(c) && c != '+' && c != '/' && c != '=')
+            {
+                // Invalid character detected
+                return false;
+            }
+        }
+
+        // Ensure no invalid padding scenarios exist
+        if (input.EndsWith("==") && input.Length % 4 == 0 ||
+            input.EndsWith("=") && input.Length % 4 == 3)
+        {
+            return true;
+        }
+
+        return input.IndexOf('=') == -1; // No padding allowed except at the end
+    }
+
+    /// <summary>
+    /// 
+    /// </summary>
+    /// <param name="encodedKey"></param>
+    /// <param name="decodedKeys"></param>
+    /// <returns></returns>
+    public static bool TryDecode(this string encodedKey, out string[] decodedKeys)
+    {
+        try
+        {
+            byte[] bytes = Convert.FromBase64String(encodedKey);
+            string decodedString = Encoding.UTF8.GetString(bytes);
+            decodedKeys = decodedString.Split(new string[] { "::" }, StringSplitOptions.None);
+            return true;
+        }
+        catch(ArgumentNullException) { }
+        catch (FormatException) { }
+        catch(ArgumentException) { }
+
+        decodedKeys = Array.Empty<string>();
+        return false;
+    }
+
+    /// <summary>
+    /// 
+    /// </summary>
+    /// <param name="decodedKeys"></param>
+    /// <returns></returns>
+    public static EncodeType GetEncodeType(this string[] decodedKeys) => decodedKeys.Length switch
+    {
+        2 => EncodeType.EnvelopeReceiver,
+        3 => long.TryParse(decodedKeys[1], out var _) ? EncodeType.EnvelopeReceiverReadOnly : EncodeType.Undefined,
+        _ => EncodeType.Undefined,
+    };
+
+    /// <summary>
+    /// 
+    /// </summary>
+    /// <param name="decodedKeys"></param>
+    /// <returns></returns>
+    /// <exception cref="InvalidOperationException"></exception>
+    public static (string? EnvelopeUuid, string? ReceiverSignature) ParseEnvelopeReceiverId(this string[] decodedKeys)
+        => decodedKeys.GetEncodeType() == EncodeType.EnvelopeReceiver
+        ? (EnvelopeUuid: decodedKeys[0], ReceiverSignature: decodedKeys[1])
+        : throw new InvalidOperationException("Attempted to convert a decoded other than type EnvelopeReceiver to EnvelopeReceiver.");
+
+    /// <summary>
+    /// 
+    /// </summary>
+    /// <param name="decodedKeys"></param>
+    /// <returns></returns>
+    /// <exception cref="InvalidOperationException"></exception>
+    public static long ParseReadOnlyId(this string[] decodedKeys)
+        => decodedKeys.GetEncodeType() == EncodeType.EnvelopeReceiverReadOnly
+        ? long.Parse(decodedKeys[1])
+        : throw new InvalidOperationException("Attempted to convert a decoded other than type EnvelopeReceiver to EnvelopeReceiver. ");
+
+    /// <summary>
+    /// Decodes the envelope receiver ID and extracts the envelope UUID and receiver signature.
+    /// </summary>
+    /// <param name="envelopeReceiverId">The base64 encoded string containing the envelope UUID and receiver signature.</param>
+    /// <returns>A tuple containing the envelope UUID and receiver signature.</returns>
+    public static (string? EnvelopeUuid, string? ReceiverSignature) DecodeEnvelopeReceiverId(this string envelopeReceiverId)
+    {
+        if (!envelopeReceiverId.IsBase64String())
+        {
+            return (null, null);
+        }
+        byte[] bytes = Convert.FromBase64String(envelopeReceiverId);
+        string decodedString = Encoding.UTF8.GetString(bytes);
+        string[] parts = decodedString.Split(new string[] { "::" }, StringSplitOptions.None);
+
+        if (parts.Length > 1)
+            return (EnvelopeUuid: parts[0], ReceiverSignature: parts[1]);
+        else
+            return (string.Empty, string.Empty);
+    }
+
+    /// <summary>
+    /// 
+    /// </summary>
+    /// <param name="envelopeReceiverReadOnlyId"></param>
+    /// <returns></returns>
+    public static long? DecodeEnvelopeReceiverReadOnlyId(this string envelopeReceiverReadOnlyId)
+    {
+        if (!envelopeReceiverReadOnlyId.IsBase64String())
+        {
+            return null;
+        }
+        byte[] bytes = Convert.FromBase64String(envelopeReceiverReadOnlyId);
+        string decodedString = Encoding.UTF8.GetString(bytes);
+        string[] parts = decodedString.Split(new string[] { "::" }, StringSplitOptions.None);
+
+        if (parts.Length > 2)
+            return long.TryParse(parts[1], out long readOnlyId) ? readOnlyId : null;
+        else
+            return null;
+    }
+
+    /// <summary>
+    /// Gets the envelope UUID from the decoded envelope receiver ID.
+    /// </summary>
+    /// <param name="envelopeReceiverId">The base64 encoded string to decode.</param>
+    /// <returns>The envelope UUID.</returns>
+    public static string? GetEnvelopeUuid(this string envelopeReceiverId) => envelopeReceiverId.DecodeEnvelopeReceiverId().EnvelopeUuid;
+
+    /// <summary>
+    /// Gets the receiver signature from the decoded envelope receiver ID.
+    /// </summary>
+    /// <param name="envelopeReceiverId">The base64 encoded string to decode.</param>
+    /// <returns>The receiver signature.</returns>
+    public static string? GetReceiverSignature(this string envelopeReceiverId) => envelopeReceiverId.DecodeEnvelopeReceiverId().ReceiverSignature;
+}

EnvelopeGenerator.Application/Common/Extensions/EncodingExtensions.cs

@@ -0,0 +1,38 @@
+using System.Text;
+
+namespace EnvelopeGenerator.Application.Common.Extensions;
+
+/// <summary>
+/// Provides extension methods for decoding and extracting information from an envelope receiver ID.
+/// </summary>
+public static class EncodingExtensions
+{
+    /// <summary>
+    /// 
+    /// </summary>
+    /// <param name="readOnlyId"></param>
+    /// <returns></returns>
+    public static string ToEnvelopeKey(this long readOnlyId)
+    {
+        //The random number is used as a salt to increase security but it is not saved in the database.
+        string combinedString = $"{Random.Shared.Next()}::{readOnlyId}::{Random.Shared.Next()}";
+        byte[] bytes = Encoding.UTF8.GetBytes(combinedString);
+        string base64String = Convert.ToBase64String(bytes);
+
+        return base64String;
+    }
+
+    /// <summary>
+    /// 
+    /// </summary>
+    /// <param name="input"></param>
+    /// <returns></returns>
+    public static string ToEnvelopeKey(this (string envelopeUuid, string receiverSignature) input)
+    {
+        string combinedString = $"{input.envelopeUuid}::{input.receiverSignature}";
+        byte[] bytes = Encoding.UTF8.GetBytes(combinedString);
+        string base64String = Convert.ToBase64String(bytes);
+
+        return base64String;
+    }
+}

EnvelopeGenerator.Application/Common/Extensions/LoggerExtensions.cs

@@ -1,7 +1,7 @@
 using Microsoft.Extensions.Logging;
 using System.Text;
 
-namespace EnvelopeGenerator.Extensions
+namespace EnvelopeGenerator.Application.Common.Extensions
 {
     public static class LoggerExtensions
     {

EnvelopeGenerator.Application/Common/Extensions/MappingExtensions.cs

@@ -1,6 +1,6 @@
-using EnvelopeGenerator.Application.Dto.Messaging;
+using EnvelopeGenerator.Application.Common.Dto.Messaging;
 
-namespace EnvelopeGenerator.Application.Extensions;
+namespace EnvelopeGenerator.Application.Common.Extensions;
 
 /// <summary>
 /// Provides extension methods for common mapping and conversion operations.

EnvelopeGenerator.Application/Common/Extensions/MemoryCacheExtensions.cs

@@ -1,11 +1,24 @@
-using Microsoft.Extensions.Caching.Memory;
+using EnvelopeGenerator.Application.Common.Extensions;
+using Microsoft.Extensions.Caching.Memory;
 
-namespace EnvelopeGenerator.Extensions;
+namespace EnvelopeGenerator.Application.Common.Extensions;
 
+/// <summary>
+/// 
+/// </summary>
 public static class MemoryCacheExtensions
 {
     private static readonly Guid BaseId = Guid.NewGuid();
 
+    /// <summary>
+    /// 
+    /// </summary>
+    /// <typeparam name="TEnum"></typeparam>
+    /// <param name="memoryCache"></param>
+    /// <param name="key"></param>
+    /// <param name="ignores"></param>
+    /// <returns></returns>
+    /// <exception cref="InvalidOperationException"></exception>
     public static IDictionary<string, int> GetEnumAsDictionary<TEnum>(this IMemoryCache memoryCache, string key = "", params object[] ignores)
         where TEnum : Enum
         => memoryCache.GetOrCreate(BaseId + typeof(TEnum).FullName + key, _ =>

EnvelopeGenerator.Application/Common/Extensions/QueryExtensions.cs

@@ -0,0 +1,125 @@
+using DigitalData.Core.Exceptions;
+using EnvelopeGenerator.Application.Common.Extensions;
+using EnvelopeGenerator.Application.Common.Query;
+using EnvelopeGenerator.Domain.Entities;
+using EnvelopeGenerator.Domain.Interfaces;
+
+namespace EnvelopeGenerator.Application.Common.Extensions;
+
+/// <summary>
+/// 
+/// </summary>
+public static class QueryExtensions
+{
+    /// <summary>
+    /// 
+    /// </summary>
+    /// <typeparam name="TEntity"></typeparam>
+    /// <param name="root"></param>
+    /// <param name="query"></param>
+    /// <param name="notnull"></param>
+    /// <returns></returns>
+    /// <exception cref="BadRequestException"></exception>
+    public static IQueryable<TEntity> Where<TEntity>(this IQueryable<TEntity> root, EnvelopeQueryBase query, bool notnull = true)
+        where TEntity : IHasEnvelope
+    {
+        if (query.Id is not null)
+            root = root.Where(e => e.Envelope!.Id == query.Id);
+        else if (query.Uuid is not null)
+            root = root.Where(e => e.Envelope!.Uuid == query.Uuid);
+        else if (notnull)
+            throw new BadRequestException(
+                "Either Envelope Id or Envelope Uuid must be provided in the query."
+            );
+
+        return root;
+    }
+
+    /// <summary>
+    /// 
+    /// </summary>
+    /// <param name="root"></param>
+    /// <param name="query"></param>
+    /// <param name="notnull"></param>
+    /// <returns></returns>
+    /// <exception cref="BadRequestException"></exception>
+    public static IQueryable<Envelope> Where(this IQueryable<Envelope> root, EnvelopeQueryBase query, bool notnull = true)
+    {
+        if (query.Id is not null)
+            root = root.Where(e => e.Id == query.Id);
+        else if (query.Uuid is not null)
+            root = root.Where(e => e.Uuid == query.Uuid);
+        else if (notnull)
+            throw new BadRequestException(
+                "Either Envelope Id or Envelope Uuid must be provided in the query."
+            );
+
+        return root;
+    }
+
+    /// <summary>
+    /// 
+    /// </summary>
+    /// <typeparam name="TEntity"></typeparam>
+    /// <param name="root"></param>
+    /// <param name="query"></param>
+    /// <param name="notnull"></param>
+    /// <returns></returns>
+    /// <exception cref="BadRequestException"></exception>
+    public static IQueryable<TEntity> Where<TEntity>(this IQueryable<TEntity> root, ReceiverQueryBase query, bool notnull = true)
+        where TEntity : IHasReceiver
+    {
+        if (query.Id is not null)
+            root = root.Where(e => e.Receiver!.Id == query.Id);
+        else if (query.EmailAddress is not null)
+            root = root.Where(e => e.Receiver!.EmailAddress == query.EmailAddress);
+        else if (query.Signature is not null)
+            root = root.Where(e => e.Receiver!.Signature == query.Signature);
+        else if (notnull)
+            throw new BadRequestException(
+                "Receiver must have at least one identifier (Id, EmailAddress, or Signature)."
+            );
+
+        return root;
+    }
+
+    /// <summary>
+    /// 
+    /// </summary>
+    /// <param name="root"></param>
+    /// <param name="query"></param>
+    /// <param name="notnull"></param>
+    /// <returns></returns>
+    /// <exception cref="BadRequestException"></exception>
+    public static IQueryable<Receiver> Where(this IQueryable<Receiver> root, ReceiverQueryBase query, bool notnull = true)
+    {
+        if (query.Id is not null)
+            root = root.Where(e => e.Id == query.Id);
+        else if (query.EmailAddress is not null)
+            root = root.Where(e => e.EmailAddress == query.EmailAddress);
+        else if (query.Signature is not null)
+            root = root.Where(e => e.Signature == query.Signature);
+        else if (notnull)
+            throw new BadRequestException(
+                "Receiver must have at least one identifier (Id, EmailAddress, or Signature)."
+            );
+
+        return root;
+    }
+
+    /// <summary>
+    /// 
+    /// </summary>
+    /// <typeparam name="TEntity"></typeparam>
+    /// <typeparam name="TEnvelopeQuery"></typeparam>
+    /// <typeparam name="TReceiverQuery"></typeparam>
+    /// <param name="root"></param>
+    /// <param name="query"></param>
+    /// <param name="notnull"></param>
+    /// <returns></returns>
+    public static IQueryable<TEntity> Where<TEntity, TEnvelopeQuery, TReceiverQuery>(this IQueryable<TEntity> root, EnvelopeReceiverQueryBase<TEnvelopeQuery, TReceiverQuery> query, bool notnull = true)
+        where TEntity : IHasEnvelope, IHasReceiver
+        where TEnvelopeQuery : EnvelopeQueryBase, new()
+        where TReceiverQuery : ReceiverQueryBase, new() 
+        => root.Where(query.Envelope, notnull).Where(query.Receiver, notnull);
+}

EnvelopeGenerator.Application/Common/Extensions/StringExtension.cs

@@ -1,6 +1,6 @@
 using OtpNet;
 
-namespace EnvelopeGenerator.Extensions
+namespace EnvelopeGenerator.Application.Common.Extensions
 {
     public static class StringExtension
     {

EnvelopeGenerator.Application/Common/Extensions/TaskExtensions.cs

@@ -0,0 +1,78 @@
+using DigitalData.Core.Exceptions;
+
+namespace EnvelopeGenerator.Application.Common.Extensions;
+
+/// <summary>
+/// Extension methods for tasks
+/// </summary>
+public static class TaskExtensions
+{
+    /// <summary>
+    /// Awaits the specified task and ensures that the result is not <c>null</c>.
+    /// If the result is <c>null</c>, the exception created by factory-method is thrown.
+    /// </summary>
+    /// <typeparam name="T">The type of the result.</typeparam>
+    /// <typeparam name="TException">The type of the exception.</typeparam>
+    /// <param name="task">The task to await.</param>
+    /// <param name="factory">Exception provider</param>
+    /// <returns>The awaited result if not <c>null</c>.</returns>
+    /// <exception>Thrown if the result is <c>null</c>.</exception>
+    public static async Task<T> ThrowIfNull<T, TException>(this Task<T?> task, Func<TException> factory) where TException : Exception
+    {
+        var result = await task;
+        return result ?? throw factory();
+    }
+
+    /// <summary>
+    /// Awaits the specified task and ensures that the result is not <c>empty</c>.
+    /// If the result contains no elements, the exception created by factory-method is thrown.
+    /// </summary>
+    /// <typeparam name="T">The element type of the collection.</typeparam>
+    /// <typeparam name="TException">The type of the exception.</typeparam>
+    /// <param name="task">The task to await.</param>
+    /// <param name="factory">Exception provider</param>
+    /// <returns>The awaited collection if it is not <c>null</c> or empty.</returns>
+    /// <exception cref="NotFoundException">Thrown if the result is <c>null</c> or empty.</exception>
+    public static async Task<IEnumerable<T>> ThrowIfEmpty<T, TException>(this Task<IEnumerable<T>> task, Func<TException> factory) where TException : Exception
+    {
+        var result = await task;
+        return result?.Any() ?? false ? result : throw factory();
+    }
+
+    /// <summary>
+    /// 
+    /// </summary>
+    /// <typeparam name="T"></typeparam>
+    /// <typeparam name="I"></typeparam>
+    /// <param name="task"></param>
+    /// <param name="act"></param>
+    /// <returns></returns>
+    public static async Task<I> Then<T, I>(this Task<T> task, Func<T, I> act)
+    {
+        var res = await task;
+        return act(res);
+    }
+}
+
+/// <summary>
+/// 
+/// </summary>
+public static class Exceptions
+{
+    /// <summary>
+    /// 
+    /// </summary>
+    public static NotFoundException NotFound() => new();
+
+    /// <summary>
+    /// 
+    /// </summary>
+    /// <returns></returns>
+    public static BadRequestException BadRequest() => new();
+
+    /// <summary>
+    /// 
+    /// </summary>
+    /// <returns></returns>
+    public static ForbiddenException Forbidden() => new();
+}

EnvelopeGenerator.Application/Common/Extensions/XSSExtensions.cs

@@ -2,7 +2,7 @@
 using Microsoft.Extensions.Localization;
 using System.Text.Encodings.Web;
 
-namespace EnvelopeGenerator.Extensions
+namespace EnvelopeGenerator.Application.Common.Extensions
 {
     public static class XSSExtensions
     {

EnvelopeGenerator.Application/Common/Notifications/DocSigned/DocSignedNotification.cs

@@ -0,0 +1,55 @@
+using EnvelopeGenerator.Application.Common.Dto.EnvelopeReceiver;
+using EnvelopeGenerator.Domain.Constants;
+using MediatR;
+using Newtonsoft.Json;
+using System.Dynamic;
+
+namespace EnvelopeGenerator.Application.Common.Notifications.DocSigned;
+
+/// <summary>
+/// 
+/// </summary>
+/// <param name="Original"></param>
+public record DocSignedNotification(EnvelopeReceiverDto Original) : EnvelopeReceiverDto(Original), INotification, ISendMailNotification
+{
+    /// <summary>
+    /// 
+    /// </summary>
+    public required ExpandoObject Annotations { get; init; }
+
+    /// <summary>
+    /// 
+    /// </summary>
+    public EmailTemplateType TemplateType => EmailTemplateType.DocumentSigned;
+
+    /// <summary>
+    /// 
+    /// </summary>
+    public string EmailAddress => Receiver?.EmailAddress
+        ?? throw new InvalidOperationException($"Receiver is null." +
+            $"DocSignedNotification:\n{JsonConvert.SerializeObject(this, Format.Json.ForDiagnostics)}");
+}
+
+/// <summary>
+/// 
+/// </summary>
+public static class DocSignedNotificationExtensions
+{
+    /// <summary>
+    /// Converts an <see cref="EnvelopeReceiverDto"/> to a <see cref="DocSignedNotification"/>.
+    /// </summary>
+    /// <param name="dto">The DTO to convert.</param>
+    /// <param name="annotations"></param>
+    /// <returns>A new <see cref="DocSignedNotification"/> instance.</returns>
+    public static DocSignedNotification ToDocSignedNotification(this EnvelopeReceiverDto dto, ExpandoObject annotations)
+        => new(dto) { Annotations = annotations };
+
+    /// <summary>
+    /// Asynchronously converts a <see cref="Task{EnvelopeReceiverDto}"/> to a <see cref="DocSignedNotification"/>.
+    /// </summary>
+    /// <param name="dtoTask">The task that returns the DTO to convert.</param>
+    /// <param name="annotations"></param>
+    /// <returns>A task that represents the asynchronous conversion operation.</returns>
+    public static async Task<DocSignedNotification?> ToDocSignedNotification(this Task<EnvelopeReceiverDto?> dtoTask, ExpandoObject annotations)
+        => await dtoTask is EnvelopeReceiverDto dto ? new(dto) { Annotations = annotations } : null;
+}

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

@@ -0,0 +1,40 @@
+using EnvelopeGenerator.Application.Common.Notifications.DocSigned;
+using EnvelopeGenerator.Application.DocStatus.Commands;
+using EnvelopeGenerator.Domain.Constants;
+using MediatR;
+using Newtonsoft.Json;
+
+namespace EnvelopeGenerator.Application.Common.Notifications.DocSigned.Handlers;
+
+/// <summary>
+/// 
+/// </summary>
+public class AnnotationHandler : INotificationHandler<DocSignedNotification>
+{
+    private readonly ISender _sender;
+
+    /// <summary>
+    /// 
+    /// </summary>
+    /// <param name="sender"></param>
+    public AnnotationHandler(ISender sender)
+    {
+        _sender = sender;
+    }
+
+    /// <summary>
+    /// 
+    /// </summary>
+    /// <param name="notification"></param>
+    /// <param name="cancel"></param>
+    /// <returns></returns>
+    public async Task Handle(DocSignedNotification notification, CancellationToken cancel)
+    {
+        await _sender.Send(new SaveDocStatusCommand()
+        {
+            Envelope = new() { Id = notification.EnvelopeId },
+            Receiver = new() { Id = notification.ReceiverId},
+            Value = JsonConvert.SerializeObject(notification.Annotations, Format.Json.ForAnnotations)
+        }, cancel);
+    }
+}

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

@@ -0,0 +1,45 @@
+using EnvelopeGenerator.Application.Common.Notifications.DocSigned;
+using EnvelopeGenerator.Application.Histories.Commands;
+using EnvelopeGenerator.Domain.Constants;
+using MediatR;
+using Newtonsoft.Json;
+
+namespace EnvelopeGenerator.Application.Common.Notifications.DocSigned.Handlers;
+
+/// <summary>
+/// 
+/// </summary>
+public class HistoryHandler : INotificationHandler<DocSignedNotification>
+{
+    private readonly ISender _sender;
+
+    /// <summary>
+    /// 
+    /// </summary>
+    /// <param name="sender"></param>
+    public HistoryHandler(ISender sender)
+    {
+        _sender = sender;
+    }
+
+    /// <summary>
+    /// 
+    /// </summary>
+    /// <param name="notification"></param>
+    /// <param name="cancel"></param>
+    /// <returns></returns>
+    public async Task Handle(DocSignedNotification notification, CancellationToken cancel)
+    {
+        if(notification.Receiver is null)
+            if (notification.Receiver is null)
+                throw new InvalidOperationException($"Receiver information is missing in the notification. DocSignedNotification:\n {JsonConvert.SerializeObject(notification, Format.Json.ForDiagnostics)}");
+
+        await _sender.Send(new CreateHistoryCommand()
+        {
+            EnvelopeId = notification.EnvelopeId,
+            UserReference = notification.Receiver.EmailAddress,
+            Status = EnvelopeStatus.DocumentSigned,
+            Comment = JsonConvert.SerializeObject(notification.Annotations, Format.Json.ForAnnotations)
+        }, cancel);
+    }
+}

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

@@ -0,0 +1,50 @@
+using DigitalData.Core.Abstraction.Application.Repository;
+using DigitalData.EmailProfilerDispatcher.Abstraction.Entities;
+using EnvelopeGenerator.Application.Common.Configurations;
+using EnvelopeGenerator.Domain.Entities;
+using Microsoft.Extensions.Options;
+
+namespace EnvelopeGenerator.Application.Common.Notifications.DocSigned.Handlers;
+
+/// <summary>
+/// 
+/// </summary>
+public class SendSignedMailHandler : SendMailHandler<DocSignedNotification>
+{
+    /// <summary>
+    /// 
+    /// </summary>
+    /// <param name="tempRepo"></param>
+    /// <param name="emailOutRepo"></param>
+    /// <param name="mailParamsOptions"></param>
+    /// <param name="dispatcherParamsOptions"></param>
+    public SendSignedMailHandler(IRepository<EmailTemplate> tempRepo, IRepository<EmailOut> emailOutRepo, IOptions<MailParams> mailParamsOptions, IOptions<DispatcherParams> dispatcherParamsOptions) : base(tempRepo, emailOutRepo, mailParamsOptions, dispatcherParamsOptions)
+    {
+    }
+
+    /// <summary>
+    /// 
+    /// </summary>
+    /// <param name="notification"></param>
+    /// <param name="emailOut"></param>
+    protected override void ConfigureEmailOut(DocSignedNotification notification, EmailOut emailOut)
+    {
+        emailOut.ReferenceString = notification.EmailAddress;
+        emailOut.ReferenceId = notification.ReceiverId;
+    }
+
+    /// <summary>
+    /// </summary>
+    /// <param name="notification"></param>
+    /// <returns></returns>
+    protected override Dictionary<string, string> CreatePlaceHolders(DocSignedNotification notification)
+    {
+        var placeHolders = new Dictionary<string, string>()
+        {
+            { "[NAME_RECEIVER]", notification.Name ?? string.Empty },
+            { "[DOCUMENT_TITLE]", notification.Envelope?.Title ?? string.Empty },
+        };
+
+        return placeHolders;
+    }
+}

EnvelopeGenerator.Application/Common/Notifications/SendMailHandler.cs

@@ -0,0 +1,152 @@
+using DigitalData.Core.Abstraction.Application.Repository;
+using DigitalData.EmailProfilerDispatcher.Abstraction.Entities;
+using EnvelopeGenerator.Application.Common.Configurations;
+using EnvelopeGenerator.Domain.Constants;
+using EnvelopeGenerator.Domain.Entities;
+using MediatR;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.Extensions.Options;
+using Newtonsoft.Json;
+
+namespace EnvelopeGenerator.Application.Common.Notifications;
+
+/// <summary>
+/// 
+/// </summary>
+public interface ISendMailNotification : INotification
+{
+    /// <summary>
+    /// 
+    /// </summary>
+    public EmailTemplateType TemplateType { get; }
+
+    /// <summary>
+    /// 
+    /// </summary>
+    public string EmailAddress { get; }
+}
+
+/// <summary>
+/// 
+/// </summary>
+public abstract class SendMailHandler<TNotification> : INotificationHandler<TNotification>
+    where TNotification : ISendMailNotification
+{
+    /// <summary>
+    /// 
+    /// </summary>
+    protected readonly IRepository<EmailTemplate> TempRepo;
+
+    /// <summary>
+    /// 
+    /// </summary>
+    protected readonly IRepository<EmailOut> EmailOutRepo;
+
+    /// <summary>
+    /// 
+    /// </summary>
+    protected abstract Dictionary<string, string> CreatePlaceHolders(TNotification notification);
+
+    /// <summary>
+    ///{ "[MESSAGE]", notification.Message },<br/>
+    ///{ "[DOCUMENT_ACCESS_CODE]", notification.ReceiverAccessCode },<br/>
+    ///{ "[REASON]", pReason }<br/>
+    ///{ "[NAME_SENDER]", notification.Envelope.User?.FullName},<br/>
+    ///{ "[NAME_PORTAL]", DispatcherParams. },<br/>
+    ///{ "[SIGNATURE_TYPE]", "signieren" },<br/>
+    ///{ "[LINK_TO_DOCUMENT]", notification.SignatureLink },<br/>
+    ///{ "[LINK_TO_DOCUMENT_TEXT]", $"{notification.SignatureLink.Truncate(40)}.." },
+    /// </summary>
+    protected readonly MailParams MailParams;
+
+    /// <summary>
+    /// 
+    /// </summary>
+    protected readonly DispatcherParams DispatcherParams;
+
+    /// <summary>
+    /// 
+    /// </summary>
+    /// <param name="notification"></param>
+    /// <param name="emailOut"></param>
+    protected abstract void ConfigureEmailOut(TNotification notification, EmailOut emailOut);
+
+    /// <summary>
+    /// 
+    /// </summary>
+    /// <param name="tempRepo"></param>
+    /// <param name="emailOutRepo"></param>
+    /// <param name="mailParamsOptions"></param>
+    /// <param name="dispatcherParamsOptions"></param>
+    protected SendMailHandler(IRepository<EmailTemplate> tempRepo, IRepository<EmailOut> emailOutRepo, IOptions<MailParams> mailParamsOptions, IOptions<DispatcherParams> dispatcherParamsOptions)
+    {
+        TempRepo = tempRepo;
+        EmailOutRepo = emailOutRepo;
+        MailParams = mailParamsOptions.Value;
+        DispatcherParams = dispatcherParamsOptions.Value;
+    }
+
+    /// <summary>
+    /// 
+    /// </summary>
+    /// <param name="notification"></param>
+    /// <param name="cancel"></param>
+    /// <returns></returns>
+    /// <exception cref="NotImplementedException"></exception>
+    public virtual async Task Handle(TNotification notification, CancellationToken cancel)
+    {
+        var placeHolders = CreatePlaceHolders(notification);
+
+        var temp = await TempRepo
+            .ReadOnly()
+            .SingleOrDefaultAsync(x => x.Name == notification.TemplateType.ToString(), cancel)
+                ?? throw new InvalidOperationException($"Receiver information is missing in the notification." +
+                $"{typeof(TNotification)}:\n {JsonConvert.SerializeObject(notification, Format.Json.ForDiagnostics)}");
+
+        temp.Subject = ReplacePlaceHolders(temp.Subject, placeHolders, MailParams.Placeholders);
+
+        temp.Body = ReplacePlaceHolders(temp.Body, placeHolders, MailParams.Placeholders);
+
+        var emailOut = new EmailOut
+        {
+            EmailAddress = notification.EmailAddress,
+            EmailBody = TextToHtml(temp.Body),
+            EmailSubj = temp.Subject,
+            AddedWhen = DateTime.UtcNow,
+            AddedWho = DispatcherParams.AddedWho,
+            SendingProfile = DispatcherParams.SendingProfile,
+            ReminderTypeId = DispatcherParams.ReminderTypeId,
+            EmailAttmt1 = DispatcherParams.EmailAttmt1,
+            WfId = (int)EnvelopeStatus.MessageConfirmationSent,
+            
+        };
+        ConfigureEmailOut(notification, emailOut);
+        await EmailOutRepo.CreateAsync(emailOut, cancel);
+    }
+
+    private static string ReplacePlaceHolders(string text, params Dictionary<string, string>[] placeHoldersList)
+    {
+        foreach (var placeHolders in placeHoldersList)
+            foreach (var ph in placeHolders)
+                text = text.Replace(ph.Key, ph.Value);
+        return text;
+    }
+
+    private static string TextToHtml(string input)
+    {
+        if (string.IsNullOrEmpty(input)) return "";
+
+        // HTML encoding special characters
+        string encoded = System.Net.WebUtility.HtmlEncode(input);
+
+        // Convert tabs to &nbsp; (4 non-breaking spaces)
+        encoded = encoded.Replace("\t", "&nbsp;&nbsp;&nbsp;&nbsp;");
+
+        // Convert line breaks to <br />
+        encoded = encoded.Replace("\r\n", "<br />"); // Windows
+        encoded = encoded.Replace("\r", "<br />");   // Mac old
+        encoded = encoded.Replace("\n", "<br />");   // Unix/Linux
+
+        return encoded;
+    }
+}

EnvelopeGenerator.Application/Common/Query/EnvelopeQueryBase.cs

@@ -0,0 +1,17 @@
+namespace EnvelopeGenerator.Application.Common.Query;
+
+/// <summary>
+/// Repräsentiert eine Abfrage für Umschläge.
+/// </summary>
+public record EnvelopeQueryBase
+{
+    /// <summary>
+    /// Die eindeutige Kennung des Umschlags.
+    /// </summary>
+    public virtual int? Id { get; set; }
+
+    /// <summary>
+    /// Die universell eindeutige Kennung des Umschlags.
+    /// </summary>
+    public virtual string? Uuid { get; set; }
+}

EnvelopeGenerator.Application/Common/Query/EnvelopeReceiverQueryBase.cs

@@ -0,0 +1,62 @@
+using DigitalData.Core.Exceptions;
+using EnvelopeGenerator.Application.Common.Extensions;
+
+namespace EnvelopeGenerator.Application.Common.Query;
+
+/// <summary>
+/// 
+/// </summary>
+public record EnvelopeReceiverQueryBase : EnvelopeReceiverQueryBase<EnvelopeQueryBase, ReceiverQueryBase>;
+
+/// <summary>
+/// 
+/// </summary>
+/// <typeparam name="TEnvelopeQuery"></typeparam>
+/// <typeparam name="TReceiverQuery"></typeparam>
+public record EnvelopeReceiverQueryBase<TEnvelopeQuery, TReceiverQuery>
+    where TEnvelopeQuery : EnvelopeQueryBase, new()
+    where TReceiverQuery : ReceiverQueryBase, new()
+{
+    private string? _key;
+
+    /// <summary>
+    /// 
+    /// </summary>
+    public virtual string? Key
+    {
+        get => _key;
+        set
+        {
+            if (value is null)
+            {
+                _key = null;
+                return;
+            }
+
+            (string? EnvelopeUuid, string? ReceiverSignature) = value.DecodeEnvelopeReceiverId();
+            if (string.IsNullOrEmpty(EnvelopeUuid) || string.IsNullOrEmpty(ReceiverSignature))
+                throw new BadRequestException("Der EnvelopeReceiverKey muss ein gültiger Base64-kodierter String sein, der die EnvelopeUuid und die ReceiverSignature enthält.");
+
+            Envelope = new TEnvelopeQuery()
+            {
+                Uuid = EnvelopeUuid
+            };
+            Receiver = new TReceiverQuery()
+            {
+                Signature = ReceiverSignature
+            };
+            _key = value;
+        }
+    }
+
+    /// <summary>
+    /// Repräsentiert eine Abfrage für Umschläge.
+    /// </summary>
+    public virtual TEnvelopeQuery Envelope { get; set; } = new();
+
+    /// <summary>
+    /// Stellt eine Abfrage dar, um die Details eines Empfängers zu lesen.
+    /// um spezifische Informationen über einen Empfänger abzurufen.
+    /// </summary>
+    public virtual TReceiverQuery Receiver { get; set; } = new();
+}

EnvelopeGenerator.Application/Common/Query/MappingProfile.cs

@@ -0,0 +1,20 @@
+using AutoMapper;
+using EnvelopeGenerator.Domain.Entities;
+
+namespace EnvelopeGenerator.Application.Common.Query;
+
+/// <summary>
+/// 
+/// </summary>
+public class MappingProfile : Profile
+{
+    /// <summary>
+    /// 
+    /// </summary>
+    public MappingProfile()
+    {
+        CreateMap<EnvelopeQueryBase, Envelope>();
+        CreateMap<ReceiverQueryBase, Receiver>();
+        CreateMap<EnvelopeReceiverQueryBase, EnvelopeReceiver>();
+    }
+}

EnvelopeGenerator.Application/Common/Query/ReceiverQueryBase.cs

@@ -0,0 +1,23 @@
+namespace EnvelopeGenerator.Application.Common.Query;
+
+/// <summary>
+/// Stellt eine Abfrage dar, um die Details eines Empfängers zu lesen.
+/// um spezifische Informationen über einen Empfänger abzurufen.
+/// </summary>
+public record ReceiverQueryBase
+{
+    /// <summary>
+    /// ID des Empfängers
+    /// </summary>
+    public virtual int? Id { get; set; }
+
+    /// <summary>
+    /// E-Mail Adresse des Empfängers
+    /// </summary>
+    public virtual string? EmailAddress { get; set; }
+
+    /// <summary>
+    /// Eindeutige Signatur des Empfängers
+    /// </summary>
+    public virtual string? Signature { get; set; }
+}

EnvelopeGenerator.Application/Common/SQL/DocumentCreateReadSQL.cs

@@ -1,14 +1,14 @@
 using Dapper;
 using EnvelopeGenerator.Application.Interfaces.SQLExecutor;
-using EnvelopeGenerator.Application.Exceptions;
+using DigitalData.Core.Exceptions;
 using EnvelopeGenerator.Domain.Entities;
 
-namespace EnvelopeGenerator.Application.SQL;
+namespace EnvelopeGenerator.Application.Common.SQL;
 
 /// <summary>
 /// 
 /// </summary>
-public class DocumentCreateReadSQL : ISQL<EnvelopeDocument>
+public class DocumentCreateReadSQL : ISQL<Document>
 {
     /// <summary>
     /// Base64, OUT_UID

EnvelopeGenerator.Application/Common/SQL/EnvelopeCreateReadSQL.cs

@@ -3,7 +3,7 @@ using EnvelopeGenerator.Application.Interfaces.SQLExecutor;
 using EnvelopeGenerator.Domain.Entities;
 using System.Data;
 
-namespace EnvelopeGenerator.Application.SQL;
+namespace EnvelopeGenerator.Application.Common.SQL;
 
 /// <summary>
 /// 

EnvelopeGenerator.Application/Common/SQL/EnvelopeReceiverAddReadSQL.cs

@@ -2,7 +2,7 @@
 using EnvelopeGenerator.Application.Interfaces.SQLExecutor;
 using EnvelopeGenerator.Domain.Entities;
 
-namespace EnvelopeGenerator.Application.SQL;
+namespace EnvelopeGenerator.Application.Common.SQL;
 
 /// <summary>
 /// 

EnvelopeGenerator.Application/Common/SQL/ParamsExtensions.cs

@@ -1,6 +1,6 @@
 using System.Globalization;
 
-namespace EnvelopeGenerator.Application.SQL;
+namespace EnvelopeGenerator.Application.Common.SQL;
 
 /// <summary>
 /// Extension method for converting objects to SQL parameter strings.

EnvelopeGenerator.Application/DependencyInjection.cs

@@ -1,13 +1,12 @@
-using EnvelopeGenerator.Application.Configurations;
+using DigitalData.Core.Client;
+using EnvelopeGenerator.Application.Common.Configurations;
+using EnvelopeGenerator.Application.Interfaces.Services;
 using EnvelopeGenerator.Application.Services;
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.DependencyInjection.Extensions;
-using DigitalData.Core.Client;
 using QRCoder;
-using EnvelopeGenerator.Application.Interfaces.Services;
 using System.Reflection;
-using EnvelopeGenerator.Application.EnvelopeReceivers.Commands;
 
 namespace EnvelopeGenerator.Application;
 
@@ -58,7 +57,6 @@ public static class DependencyInjection
         services.AddMediatR(cfg =>
         {
             cfg.RegisterServicesFromAssembly(Assembly.GetExecutingAssembly());
-            cfg.RegisterServicesFromAssembly(typeof(CreateEnvelopeReceiverCommandHandler).Assembly);
         });
 
         return services;

EnvelopeGenerator.Application/DocStatus/Commands/CreateDocStatusCommand.cs

@@ -0,0 +1,12 @@
+namespace EnvelopeGenerator.Application.DocStatus.Commands;
+
+/// <summary>
+/// 
+/// </summary>
+public record CreateDocStatusCommand : ModifyDocStatusCommandBase
+{
+    /// <summary>
+    /// Gets timestamp when this record was added. Returns the StatusChangedWhen value.
+    /// </summary>
+    public DateTime AddedWhen => StatusChangedWhen;
+}

EnvelopeGenerator.Application/DocStatus/Commands/ModifyDocStatusCommandBase.cs

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

EnvelopeGenerator.Application/DocStatus/Commands/SaveDocStatusCommand.cs

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

EnvelopeGenerator.Application/DocStatus/Commands/UpdateDocStatusCommand.cs

@@ -0,0 +1,14 @@
+using EnvelopeGenerator.Domain;
+
+namespace EnvelopeGenerator.Application.DocStatus.Commands;
+
+/// <summary>
+/// 
+/// </summary>
+public record UpdateDocStatusCommand : ModifyDocStatusCommandBase
+{
+    /// <summary>
+    /// Gets timestamp when this record was added. Returns the StatusChangedWhen value.
+    /// </summary>
+    public DateTime? ChangedWhen => StatusChangedWhen;
+}

EnvelopeGenerator.Application/DocStatus/MappingProfile.cs

@@ -0,0 +1,25 @@
+using AutoMapper;
+using EnvelopeGenerator.Application.DocStatus.Commands;
+using EnvelopeGenerator.Domain.Entities;
+
+namespace EnvelopeGenerator.Application.DocStatus;
+
+/// <summary>
+/// 
+/// </summary>
+public class MappingProfile : Profile
+{
+    /// <summary>
+    /// 
+    /// </summary>
+    public MappingProfile()
+    {
+        CreateMap<CreateDocStatusCommand, DocumentStatus>()
+        .ForMember(dest => dest.Envelope, opt => opt.Ignore())
+        .ForMember(dest => dest.Receiver, opt => opt.Ignore());
+
+        CreateMap<UpdateDocStatusCommand, DocumentStatus>()
+        .ForMember(dest => dest.Envelope, opt => opt.Ignore())
+        .ForMember(dest => dest.Receiver, opt => opt.Ignore());
+    }
+}

EnvelopeGenerator.Application/Documents/Queries/ReadDocumentQuery.cs

@@ -1,9 +1,9 @@
 using DigitalData.Core.Abstraction.Application.Repository;
-using EnvelopeGenerator.Application.Dto;
 using MediatR;
 using EnvelopeGenerator.Domain.Entities;
 using Microsoft.EntityFrameworkCore;
 using AutoMapper;
+using EnvelopeGenerator.Application.Common.Dto;
 
 namespace EnvelopeGenerator.Application.Documents.Queries;
 
@@ -12,55 +12,55 @@ namespace EnvelopeGenerator.Application.Documents.Queries;
 /// </summary>
 /// <param name="Id">The unique identifier of the document. Optional.</param>
 /// <param name="EnvelopeId">The identifier of the envelope associated with the document. Optional.</param>
-public record ReadDocumentQuery(int? Id = null, int? EnvelopeId = null) : IRequest<EnvelopeDocumentDto?>
+public record ReadDocumentQuery(int? Id = null, int? EnvelopeId = null) : IRequest<DocumentDto?>
 {
 }
 
 /// <summary>
-/// Handles queries for reading <see cref="EnvelopeDocument"/> data based on either the document ID or the envelope ID.
+/// Handles queries for reading <see cref="Document"/> data based on either the document ID or the envelope ID.
 /// </summary>
-public class ReadDocumentQueryHandler : IRequestHandler<ReadDocumentQuery, EnvelopeDocumentDto?>
+public class ReadDocumentQueryHandler : IRequestHandler<ReadDocumentQuery, DocumentDto?>
 {
     /// <summary>
-    /// Repository for accessing <see cref="EnvelopeDocument"/> entities.
+    /// TempRepo for accessing <see cref="Document"/> entities.
     /// </summary>
-    private readonly IRepository<EnvelopeDocument> _repo;
+    private readonly IRepository<Document> _repo;
 
     private readonly IMapper _mapper;
 
     /// <summary>
     /// Initializes a new instance of the <see cref="ReadDocumentQueryHandler"/> class.
     /// </summary>
-    /// <param name="envelopeDocumentRepository">The repository used to access <see cref="EnvelopeDocument"/> entities.</param>
-    public ReadDocumentQueryHandler(IRepository<EnvelopeDocument> envelopeDocumentRepository, IMapper mapper)
+    /// <param name="envelopeDocumentRepository">The repository used to access <see cref="Document"/> entities.</param>
+    /// <param name="mapper"></param>
+    public ReadDocumentQueryHandler(IRepository<Document> envelopeDocumentRepository, IMapper mapper)
     {
         _repo = envelopeDocumentRepository;
         _mapper = mapper;
     }
 
     /// <summary>
-    /// Handles the <see cref="ReadDocumentQuery"/> and returns a <see cref="EnvelopeDocumentDto"/> based on the provided identifiers.
+    /// Handles the <see cref="ReadDocumentQuery"/> and returns a <see cref="DocumentDto"/> based on the provided identifiers.
     /// </summary>
     /// <param name="query">The query containing the document ID or envelope ID to search for.</param>
-    /// <param name="cancellationToken">A token to monitor for cancellation requests.</param>
+    /// <param name="cancel">A token to monitor for cancellation requests.</param>
     /// <returns>
-    /// A <see cref="EnvelopeDocumentDto"/> if a matching document is found; otherwise, <c>null</c>.
+    /// A <see cref="DocumentDto"/> if a matching document is found; otherwise, <c>null</c>.
     /// </returns>
     /// <exception cref="InvalidOperationException">
     /// Thrown when neither <see cref="ReadDocumentQuery.Id"/> nor <see cref="ReadDocumentQuery.EnvelopeId"/> is provided.
     /// </exception>
-    [Obsolete("Use MediatR")]
-    public async Task<EnvelopeDocumentDto?> Handle(ReadDocumentQuery query, CancellationToken cancellationToken)
+    public async Task<DocumentDto?> Handle(ReadDocumentQuery query, CancellationToken cancel)
     {
         if (query.Id is not null)
         {
-            var doc = await _repo.ReadOnly().Where(d => d.Id == query.Id).FirstOrDefaultAsync();
-            return _mapper.Map<EnvelopeDocumentDto>(doc);
+            var doc = await _repo.ReadOnly().Where(d => d.Id == query.Id).FirstOrDefaultAsync(cancel);
+            return _mapper.Map<DocumentDto>(doc);
         }            
         else if (query.EnvelopeId is not null)
         {
-            var doc = await _repo.ReadOnly().Where(d => d.EnvelopeId == query.EnvelopeId).FirstOrDefaultAsync();
-            return _mapper.Map<EnvelopeDocumentDto>(doc);
+            var doc = await _repo.ReadOnly().Where(d => d.EnvelopeId == query.EnvelopeId).FirstOrDefaultAsync(cancel);
+            return _mapper.Map<DocumentDto>(doc);
         }
 
         throw new InvalidOperationException(

EnvelopeGenerator.Application/Dto/EnvelopeReceiver/EnvelopeReceiverDto.cs

@@ -1,22 +0,0 @@
-using EnvelopeGenerator.Application.Dto.Receiver;
-using Microsoft.AspNetCore.Mvc;
-
-namespace EnvelopeGenerator.Application.Dto.EnvelopeReceiver;
-
-/// <summary>
-/// 
-/// </summary>
-
-[ApiExplorerSettings(IgnoreApi = true)]
-public record EnvelopeReceiverDto() : EnvelopeReceiverBasicDto()
-{
-    /// <summary>
-    /// 
-    /// </summary>
-    public EnvelopeDto? Envelope { get; set; }
-
-    /// <summary>
-    /// 
-    /// </summary>
-    public ReceiverReadDto? Receiver { get; set; }
-}

EnvelopeGenerator.Application/Dto/Receiver/ReceiverCreateDto.cs

@@ -1,53 +0,0 @@
-using Microsoft.AspNetCore.Mvc;
-using System.ComponentModel.DataAnnotations;
-using System.Security.Cryptography;
-using System.Text;
-
-namespace EnvelopeGenerator.Application.Dto.Receiver;
-
-/// <summary>
-/// 
-/// </summary>
-[ApiExplorerSettings(IgnoreApi = true)]
-public record ReceiverCreateDto
-{
-    /// <summary>
-    /// 
-    /// </summary>
-    public ReceiverCreateDto()
-    {
-        _sha256HexOfMail = new(() =>
-        {
-            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);
-        });
-    }
-
-    /// <summary>
-    /// 
-    /// </summary>
-    [EmailAddress]
-    public required string EmailAddress { get; init; }
-
-    /// <summary>
-    /// 
-    /// </summary>
-    public string? TotpSecretkey { get; init; }
-
-    /// <summary>
-    /// 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);
-    /// </summary>
-    public string Signature => _sha256HexOfMail.Value;
-
-    private readonly Lazy<string> _sha256HexOfMail;
-
-    /// <summary>
-    /// Default value is DateTime.Now
-    /// </summary>
-    public DateTime AddedWhen { get; } = DateTime.Now;
-};

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

@@ -1,4 +1,5 @@
 using EnvelopeGenerator.Domain;
+using EnvelopeGenerator.Domain.Constants;
 using MediatR;
 
 namespace EnvelopeGenerator.Application.EmailTemplates.Commands.Reset;
@@ -33,8 +34,8 @@ 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>
-    public ResetEmailTemplateCommand(int? Id = null, Constants.EmailTemplateType? Type = null) : base(Id, Type)
+    /// <param name="Type">Der Typ der E-Mail-Vorlage, z. B. <see cref="EmailTemplateType"/> (optional).</param>
+    public ResetEmailTemplateCommand(int? Id = null, EmailTemplateType? Type = null) : base(Id, Type)
     {
     }
 };

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

@@ -1,5 +1,5 @@
 using DigitalData.Core.Abstraction.Application.Repository;
-using EnvelopeGenerator.Application.Dto;
+using EnvelopeGenerator.Application.Common.Dto;
 using EnvelopeGenerator.Domain.Entities;
 using MediatR;
 using Microsoft.EntityFrameworkCore;

EnvelopeGenerator.Application/EmailTemplates/Commands/Update/UpdateEmailTemplateCommandHandler.cs

@@ -1,11 +1,11 @@
 using AutoMapper;
 using DigitalData.Core.Abstraction.Application.Repository;
-using EnvelopeGenerator.Application.Dto;
-using EnvelopeGenerator.Application.Exceptions;
-using EnvelopeGenerator.Domain;
+using DigitalData.Core.Exceptions;
 using EnvelopeGenerator.Domain.Entities;
 using MediatR;
 using Microsoft.EntityFrameworkCore;
+using EnvelopeGenerator.Domain.Constants;
+using EnvelopeGenerator.Application.Common.Dto;
 
 namespace EnvelopeGenerator.Application.EmailTemplates.Commands.Update;
 
@@ -46,7 +46,7 @@ public class UpdateEmailTemplateCommandHandler : IRequestHandler<UpdateEmailTemp
             var temp = await _repository.ReadOnly().Where(t => t.Id == id).FirstOrDefaultAsync(cancel);
             tempDto = _mapper.Map<EmailTemplateDto>(temp);
         }
-        else if (request!.EmailTemplateQuery!.Type is Constants.EmailTemplateType type)
+        else if (request!.EmailTemplateQuery!.Type is EmailTemplateType type)
         {
             var temp = await _repository.ReadOnly().Where(t => t.Name == type.ToString()).FirstOrDefaultAsync(cancel);
             tempDto = _mapper.Map<EmailTemplateDto>(temp);

EnvelopeGenerator.Application/EmailTemplates/EmailTemplateQuery.cs

@@ -1,4 +1,4 @@
-using EnvelopeGenerator.Domain;
+using EnvelopeGenerator.Domain.Constants;
 
 namespace EnvelopeGenerator.Application.EmailTemplates;
 
@@ -7,7 +7,7 @@ namespace EnvelopeGenerator.Application.EmailTemplates;
 /// Die Standardkultur ist "de-DE".
 /// </summary>
 /// <param name="Id">Die eindeutige Kennung der E-Mail-Vorlage (optional).</param>
-/// <param name="Type">Der Typ der E-Mail-Vorlage, z. B. <see cref="Constants.EmailTemplateType"/> (optional). Beispiele:
+/// <param name="Type">Der Typ der E-Mail-Vorlage, z. B. <see cref="EmailTemplateType"/> (optional). 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.
@@ -19,6 +19,6 @@ namespace EnvelopeGenerator.Application.EmailTemplates;
 /// 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 EmailTemplateQuery(int? Id = null, Constants.EmailTemplateType? Type = null)
+public record EmailTemplateQuery(int? Id = null, EmailTemplateType? Type = null)
 {
 }

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

@@ -1,6 +1,6 @@
 using AutoMapper;
 using EnvelopeGenerator.Application.Interfaces.Repositories;
-using EnvelopeGenerator.Domain;
+using EnvelopeGenerator.Domain.Constants;
 using MediatR;
 
 namespace EnvelopeGenerator.Application.EmailTemplates.Queries.Read;
@@ -41,7 +41,7 @@ public class ReadEmailTemplateQueryHandler : IRequestHandler<ReadEmailTemplateQu
     {
         var temp = request.Id is int id
             ? await _repository.ReadByIdAsync(id)
-            : request.Type is Constants.EmailTemplateType type
+            : request.Type is EmailTemplateType type
                 ? await _repository.ReadByNameAsync(type)
                 : throw new InvalidOperationException("Either a valid integer ID or a valid EmailTemplateType must be provided in the request.");
 

EnvelopeGenerator.Application/EnvelopeFlag.cs

@@ -1,10 +0,0 @@
-namespace EnvelopeGenerator.Application
-{
-    public enum EnvelopeFlag
-    {
-        EnvelopeOrReceiverNonexists,
-        NonDecodableEnvelopeReceiverId,
-        WrongEnvelopeReceiverId,
-        AccessCodeNull
-    }
-}

EnvelopeGenerator.Application/EnvelopeGenerator.Application.csproj

@@ -14,10 +14,12 @@
 
 	<ItemGroup>
 		<PackageReference Include="Dapper" Version="2.1.66" />
-		<PackageReference Include="DigitalData.Core.Abstraction.Application" Version="1.1.0" />
+		<PackageReference Include="DigitalData.Core.Abstraction.Application" Version="1.2.1" />
 		<PackageReference Include="DigitalData.Core.Application" Version="3.4.0" />
 		<PackageReference Include="DigitalData.Core.Client" Version="2.1.0" />
+		<PackageReference Include="DigitalData.Core.Exceptions" Version="1.1.0" />
 		<PackageReference Include="DigitalData.EmailProfilerDispatcher" Version="3.1.1" />
+		<PackageReference Include="HtmlSanitizer" Version="8.0.865" />
 		<PackageReference Include="MediatR" Version="12.5.0" />
 		<PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="7.0.18" />
 		<PackageReference Include="Otp.NET" Version="1.4.0" />
@@ -40,7 +42,6 @@
 
 	<ItemGroup>
 		<ProjectReference Include="..\EnvelopeGenerator.Domain\EnvelopeGenerator.Domain.csproj" />
-		<ProjectReference Include="..\EnvelopeGenerator.Extensions\EnvelopeGenerator.Extensions.csproj" />
 	</ItemGroup>
 
 	<ItemGroup>

EnvelopeGenerator.Application/EnvelopeReceivers/Commands/CreateEnvelopeReceiverCommand.cs

@@ -7,18 +7,20 @@ namespace EnvelopeGenerator.Application.EnvelopeReceivers.Commands;
 /// <summary>
 /// Befehl zur Erstellung eines Umschlags.
 /// </summary>
-/// <param name="Title">Der Titel des Umschlags. Dies ist ein Pflichtfeld.</param>
-/// <param name="Message">Die Nachricht, die im Umschlag enthalten sein soll. Dies ist ein Pflichtfeld.</param>
-/// <param name="Document">Das mit dem Umschlag verknüpfte Dokument. Dies ist ein Pflichtfeld.</param>
-/// <param name="Receivers">Eine Sammlung von Empfängern, die den Umschlag erhalten. Dies ist ein Pflichtfeld.</param>
-/// <param name="TFAEnabled">Gibt an, ob die Zwei-Faktor-Authentifizierung für den Umschlag aktiviert ist. Standardmäßig false.</param>
-public record CreateEnvelopeReceiverCommand(
-    [Required] string Title,
-    [Required] string Message,
-    [Required] DocumentCreateCommand Document,
-    [Required] IEnumerable<ReceiverGetOrCreateCommand> Receivers,
-    bool TFAEnabled = false
-    ) : CreateEnvelopeCommand(Title, Message, TFAEnabled), IRequest<CreateEnvelopeReceiverResponse>;
+public record CreateEnvelopeReceiverCommand : CreateEnvelopeCommand, IRequest<CreateEnvelopeReceiverResponse>
+{
+    /// <summary>
+    /// Das mit dem Umschlag verknüpfte Dokument. Dies ist ein Pflichtfeld.
+    /// </summary>
+    [Required]
+    public required DocumentCreateCommand Document { get; set; }
+
+    /// <summary>
+    /// Eine Sammlung von Empfängern, die den Umschlag erhalten. Dies ist ein Pflichtfeld.
+    /// </summary>
+    [Required]
+    public List<ReceiverGetOrCreateCommand> Receivers { get; set; } = new();
+}
 
 #region Subcommands
 /// <summary>
@@ -33,19 +35,37 @@ public record Signature([Required] double X, [Required] double Y, [Required] int
 /// DTO für Empfänger, die erstellt oder abgerufen werden sollen.
 /// Wenn nicht, wird sie erstellt und mit einer Signatur versehen.
 /// </summary>
-/// <param name="Signatures">Unterschriften auf Dokumenten.</param>
-/// <param name="Salution">Der Name, mit dem der Empfänger angesprochen werden soll. Bei Null oder keinem Wert wird der zuletzt verwendete Name verwendet.</param>
-/// <param name="PhoneNumber">Sollte mit Vorwahl geschrieben werden</param>
-public record ReceiverGetOrCreateCommand([Required] IEnumerable<Signature> Signatures, string? Salution = null, string? PhoneNumber = null)
+public class ReceiverGetOrCreateCommand
 {
+    /// <summary>
+    /// Unterschriften auf Dokumenten.
+    /// </summary>
+    [Required]
+    public List<Signature> Signatures { get; init; } = new();
+
+    /// <summary>
+    /// Der Name, mit dem der Empfänger angesprochen werden soll.
+    /// Bei Null oder keinem Wert wird der zuletzt verwendete Name verwendet.
+    /// </summary>
+    public string? Salution { get; init; }
+
+    /// <summary>
+    /// Sollte mit Vorwahl geschrieben werden
+    /// </summary>
+    public string? PhoneNumber { get; init; }
+
     private string _emailAddress = string.Empty;
 
     /// <summary>
     /// E-Mail-Adresse des Empfängers.
     /// </summary>
     [Required]
-    public string EmailAddress { get => _emailAddress.ToLower(); init => _emailAddress = value.ToLower(); }
-};
+    public string EmailAddress
+    {
+        get => _emailAddress.ToLower();
+        init => _emailAddress = value.ToLower();
+    }
+}
 
 /// <summary>
 /// DTO zum Erstellen eines Dokuments.

EnvelopeGenerator.Application/EnvelopeReceivers/Commands/CreateEnvelopeReceiverCommandHandler.cs

@@ -1,8 +1,8 @@
 using AutoMapper;
 using EnvelopeGenerator.Application.Interfaces.SQLExecutor;
-using EnvelopeGenerator.Application.Dto.Receiver;
 using EnvelopeGenerator.Domain.Entities;
 using MediatR;
+using EnvelopeGenerator.Application.Common.Dto.Receiver;
 
 namespace EnvelopeGenerator.Application.EnvelopeReceivers.Commands;
 
@@ -42,9 +42,7 @@ public class CreateEnvelopeReceiverCommandHandler : IRequestHandler<CreateEnvelo
     /// <returns>A task representing the asynchronous operation.</returns>
     public async Task<CreateEnvelopeReceiverResponse> Handle(CreateEnvelopeReceiverCommand request, CancellationToken cancel)
     {
-        int userId = request.UserId ?? throw new InvalidOperationException("UserId cannot be null when creating an envelope.");
-
-        var envelope = await _envelopeExecutor.CreateEnvelopeAsync(userId, request.Title, request.Message, request.TFAEnabled, cancel);
+        var envelope = await _envelopeExecutor.CreateEnvelopeAsync(request.UserId, request.Title, request.Message, request.TFAEnabled, cancel);
 
         List<EnvelopeReceiver> sentRecipients = new();
         List<ReceiverGetOrCreateCommand> unsentRecipients = new();
@@ -61,7 +59,7 @@ public class CreateEnvelopeReceiverCommandHandler : IRequestHandler<CreateEnvelo
 
         var res = _mapper.Map<CreateEnvelopeReceiverResponse>(envelope);
         res.UnsentReceivers = unsentRecipients;
-        res.SentReceiver = _mapper.Map<IEnumerable<ReceiverReadDto>>(sentRecipients);
+        res.SentReceiver = _mapper.Map<IEnumerable<ReceiverDto>>(sentRecipients);
         return res;
     }
 }

EnvelopeGenerator.Application/EnvelopeReceivers/Commands/CreateEnvelopeReceiverResponse.cs

@@ -1,5 +1,5 @@
-using EnvelopeGenerator.Application.Dto;
-using EnvelopeGenerator.Application.Dto.Receiver;
+using EnvelopeGenerator.Application.Common.Dto;
+using EnvelopeGenerator.Application.Common.Dto.Receiver;
 
 namespace EnvelopeGenerator.Application.EnvelopeReceivers.Commands;
 
@@ -11,7 +11,7 @@ public record CreateEnvelopeReceiverResponse : EnvelopeDto
     /// <summary>
     /// 
     /// </summary>
-    public IEnumerable<ReceiverReadDto> SentReceiver { get; set; } = new List<ReceiverReadDto>();
+    public IEnumerable<ReceiverDto> SentReceiver { get; set; } = new List<ReceiverDto>();
 
     /// <summary>
     /// 

EnvelopeGenerator.Application/EnvelopeReceivers/MappingProfile.cs

@@ -1,5 +1,5 @@
 using AutoMapper;
-using EnvelopeGenerator.Application.Dto.Receiver;
+using EnvelopeGenerator.Application.Common.Dto.Receiver;
 using EnvelopeGenerator.Application.Envelopes.Commands;
 using EnvelopeGenerator.Domain.Entities;
 
@@ -15,6 +15,6 @@ public class MappingProfile : Profile
     /// </summary>
     public MappingProfile()
     {
-        CreateMap<Receiver, ReceiverReadDto>();
+        CreateMap<Receiver, ReceiverDto>();
     }
 }

EnvelopeGenerator.Application/EnvelopeReceivers/Queries/ReadEnvelopeReceiverQuery.cs

@@ -1,10 +1,14 @@
-using EnvelopeGenerator.Application.Dto.EnvelopeReceiver;
+using AutoMapper;
+using DigitalData.Core.Abstraction.Application.Repository;
+using DigitalData.Core.Exceptions;
 using EnvelopeGenerator.Application.Envelopes.Queries;
-using EnvelopeGenerator.Application.Exceptions;
-using EnvelopeGenerator.Application.Extensions;
 using EnvelopeGenerator.Application.Receivers.Queries;
-using EnvelopeGenerator.Extensions;
 using MediatR;
+using EnvelopeGenerator.Domain.Entities;
+using Microsoft.EntityFrameworkCore;
+using EnvelopeGenerator.Application.Common.Dto.EnvelopeReceiver;
+using EnvelopeGenerator.Application.Common.Query;
+using EnvelopeGenerator.Application.Common.Extensions;
 
 namespace EnvelopeGenerator.Application.EnvelopeReceivers.Queries;
 
@@ -43,47 +47,7 @@ namespace EnvelopeGenerator.Application.EnvelopeReceivers.Queries;
 /// Die Antwort enthält Details wie den Include, die Zuordnung zwischen Umschlag und Empfänger 
 /// sowie zusätzliche Metadaten.
 /// </remarks>
-public record ReadEnvelopeReceiverQuery : IRequest<IEnumerable<EnvelopeReceiverDto>>
-{
-    /// <summary>
-    /// 
-    /// </summary>
-    public string? Key
-    { 
-        get => Envelope?.Uuid is string uuid && Receiver?.Signature is string signature
-                ? (uuid, signature).EncodeEnvelopeReceiverId()
-                : null;
-        init
-        {
-            if (value is null)
-                return;
-
-            (string? EnvelopeUuid, string? ReceiverSignature)  = value.DecodeEnvelopeReceiverId();
-            if(string.IsNullOrEmpty(EnvelopeUuid) || string.IsNullOrEmpty(ReceiverSignature))
-            {
-                throw new BadRequestException("Der EnvelopeReceiverKey muss ein gültiger Base64-kodierter String sein, der die EnvelopeUuid und die ReceiverSignature enthält.");
-            }
-            Envelope = new ReadEnvelopeQuery()
-            {
-                Uuid = EnvelopeUuid
-            };
-            Receiver = new ReadReceiverQuery()
-            {
-                Signature = ReceiverSignature
-            };
-        }
-    }
-
-    /// <summary>
-    /// Der Umschlag, der mit dem Empfänger verknüpft ist.
-    /// </summary>
-    public ReadEnvelopeQuery? Envelope { get; set; }
-
-    /// <summary>
-    /// Der Empfänger, der mit dem Umschlag verknüpft ist.
-    /// </summary>
-    public ReadReceiverQuery? Receiver { get; set; }
-};
+public record ReadEnvelopeReceiverQuery : EnvelopeReceiverQueryBase<ReadEnvelopeQuery, ReadReceiverQuery>, IRequest<IEnumerable<EnvelopeReceiverDto>>;
 
 /// <summary>
 /// 
@@ -95,10 +59,85 @@ public static class Extensions
     /// </summary>
     /// <param name="mediator"></param>
     /// <param name="key"></param>
+    /// <param name="cancel"></param>
     /// <returns></returns>
     public static Task<EnvelopeReceiverDto?> ReadEnvelopeReceiverAsync(this IMediator mediator, string key, CancellationToken cancel = default)
     {
         var q = new ReadEnvelopeReceiverQuery() { Key = key };
         return mediator.Send(q, cancel).Then(envRcvs => envRcvs.FirstOrDefault());
     }
-}
+
+    /// <summary>
+    /// 
+    /// </summary>
+    /// <param name="mediator"></param>
+    /// <param name="uuid"></param>
+    /// <param name="signature"></param>
+    /// <param name="cancel"></param>
+    /// <returns></returns>
+    public static Task<EnvelopeReceiverDto?> ReadEnvelopeReceiverAsync(this IMediator mediator, string uuid, string signature, CancellationToken cancel = default)
+    {
+        var q = new ReadEnvelopeReceiverQuery();
+        q.Envelope.Uuid = uuid;
+        q.Receiver.Signature = signature;
+        return mediator.Send(q, cancel).Then(envRcvs => envRcvs.FirstOrDefault());
+    }
+}
+
+/// <summary>
+/// 
+/// </summary>
+public class ReadEnvelopeReceiverQueryHandler : IRequestHandler<ReadEnvelopeReceiverQuery, IEnumerable<EnvelopeReceiverDto>>
+{
+    private readonly IRepository<EnvelopeReceiver> _repo;
+
+    private readonly IMapper _mapper;
+
+    /// <summary>
+    /// 
+    /// </summary>
+    /// <param name="envelopeReceiver"></param>
+    /// <param name="mapper"></param>
+    public ReadEnvelopeReceiverQueryHandler(IRepository<EnvelopeReceiver> envelopeReceiver, IMapper mapper)
+    {
+        _repo = envelopeReceiver;
+        _mapper = mapper;
+    }
+
+    /// <summary>
+    /// 
+    /// </summary>
+    /// <param name="request"></param>
+    /// <param name="cancel"></param>
+    /// <returns></returns>
+    /// <exception cref="BadRequestException"></exception>
+    public async Task<IEnumerable<EnvelopeReceiverDto>> Handle(ReadEnvelopeReceiverQuery request, CancellationToken cancel)
+    {
+        var q = _repo.ReadOnly().Where(request, notnull: false);
+
+        if (request.Envelope.Status is not null)
+        {
+            var status = request.Envelope.Status;
+            if (status.Min is not null)
+                q = q.Where(er => er.Envelope!.Status >= status.Min);
+
+            if (status.Max is not null)
+                q = q.Where(er => er.Envelope!.Status <= status.Max);
+
+            if (status.Include?.Length > 0)
+                q = q.Where(er => status.Include.Contains(er.Envelope!.Status));
+
+            if (status.Ignore is not null)
+                q = q.Where(er => !status.Ignore.Contains(er.Envelope!.Status));
+        }
+
+        var envRcvs = await q
+                        .Include(er => er.Envelope).ThenInclude(e => e!.Documents!).ThenInclude(d => d.Elements)
+                        .Include(er => er.Envelope).ThenInclude(e => e!.Histories)
+                        .Include(er => er.Envelope).ThenInclude(e => e!.User)
+                        .Include(er => er.Receiver)
+                        .ToListAsync(cancel);
+
+        return _mapper.Map<List<EnvelopeReceiverDto>>(envRcvs);
+    }
+} 

EnvelopeGenerator.Application/EnvelopeReceivers/Queries/ReadEnvelopeReceiverQueryHandler.cs

@@ -1,87 +0,0 @@
-using AutoMapper;
-using DigitalData.Core.Abstraction.Application.Repository;
-using EnvelopeGenerator.Application.Dto.EnvelopeReceiver;
-using EnvelopeGenerator.Domain.Entities;
-using MediatR;
-using Microsoft.EntityFrameworkCore;
-
-namespace EnvelopeGenerator.Application.EnvelopeReceivers.Queries;
-
-/// <summary>
-/// 
-/// </summary>
-public class ReadEnvelopeReceiverQueryHandler : IRequestHandler<ReadEnvelopeReceiverQuery, IEnumerable<EnvelopeReceiverDto>>
-{
-    private readonly IRepository<EnvelopeReceiver> _repo;
-
-    private readonly IMapper _mapper;
-
-    /// <summary>
-    /// 
-    /// </summary>
-    /// <param name="envelopeReceiver"></param>
-    /// <param name="mapper"></param>
-    public ReadEnvelopeReceiverQueryHandler(IRepository<EnvelopeReceiver> envelopeReceiver, IMapper mapper)
-    {
-        _repo = envelopeReceiver;
-        _mapper = mapper;
-    }
-
-    /// <summary>
-    /// 
-    /// </summary>
-    /// <param name="request"></param>
-    /// <param name="cancel"></param>
-    /// <returns></returns>
-    /// <exception cref="NotImplementedException"></exception>
-    public async Task<IEnumerable<EnvelopeReceiverDto>> Handle(ReadEnvelopeReceiverQuery request, CancellationToken cancel)
-    {
-        var q = _repo.Read();
-
-        if(request.Envelope is not null)
-        {
-            var env = request.Envelope;
-            if (env.Id is not null)
-                q = q.Where(er => er.EnvelopeId == env.Id);
-
-            if (env.Status is not null)
-            {
-                if(env.Status.Min is not null)
-                    q = q.Where(er => er.Envelope.Status >= env.Status.Min);
-
-                if(env.Status.Max is not null)
-                    q = q.Where(er => er.Envelope.Status <= env.Status.Max);
-
-                if(env.Status .Include?.Length > 0)
-                    q = q.Where(er => env.Status.Include.Contains(er.Envelope.Status));
-
-                if(env.Status.Ignore is not null)
-                    q = q.Where(er => !env.Status.Ignore.Contains(er.Envelope.Status));
-            }
-
-            if (env.Uuid is not null)
-                q = q.Where(er => er.Envelope.Uuid == env.Uuid);
-        }
-
-        if (request.Receiver is not null)
-        {
-            var rcv = request.Receiver;
-            if (rcv.Id is not null)
-                q = q.Where(r => r.ReceiverId == rcv.Id);
-
-            if (rcv.EmailAddress is not null)
-                q = q.Where(r => r.Receiver.EmailAddress == rcv.EmailAddress);
-
-            if (rcv.Signature is not null)
-                q = q.Where(er => er.Receiver.Signature == rcv.Signature);
-        }
-
-        var envRcvs = await q.Include(er => er.Envelope).ThenInclude(e => e.Documents).ThenInclude(d => d.Elements)
-                        .Include(er => er.Envelope).ThenInclude(e => e.History)
-                        .Include(er => er.Envelope).ThenInclude(e => e.User)
-                        .Include(er => er.Receiver)
-                        .ToListAsync(cancel);
-
-        return _mapper.Map<IEnumerable<EnvelopeReceiverDto>>(envRcvs);
-    } 
-}

EnvelopeGenerator.Application/EnvelopeReceivers/Queries/ReceiverAlreadySignedQuery.cs

@@ -1,38 +1,17 @@
 using DigitalData.Core.Abstraction.Application.Repository;
-using EnvelopeGenerator.Application.Exceptions;
-using EnvelopeGenerator.Domain;
 using EnvelopeGenerator.Domain.Entities;
-using EnvelopeGenerator.Extensions;
+using EnvelopeGenerator.Application.Common.Extensions;
 using MediatR;
 using Microsoft.EntityFrameworkCore;
+using EnvelopeGenerator.Domain.Constants;
+using EnvelopeGenerator.Application.Common.Query;
 
 namespace EnvelopeGenerator.Application.EnvelopeReceivers.Queries;
 
 /// <summary>
 /// 
 /// </summary>
-public record ReceiverAlreadySignedQuery : IRequest<bool>
-{
-    /// <summary>
-    /// 
-    /// </summary>
-    public required string Key
-    {
-        get => (EnvelopeUuid, ReceiverSignature).EncodeEnvelopeReceiverId();
-        init
-        {
-            (string? EnvelopeUuid, string? ReceiverSignature) = value.DecodeEnvelopeReceiverId();
-            if (string.IsNullOrEmpty(EnvelopeUuid) || string.IsNullOrEmpty(ReceiverSignature))
-            {
-                throw new BadRequestException("Der EnvelopeReceiverKey muss ein gültiger Base64-kodierter String sein, der die EnvelopeUuid und die ReceiverSignature enthält.");
-            }
-        }
-    }
-
-    internal string EnvelopeUuid { get; set; } = null!;
-
-    internal string ReceiverSignature { get; set; } = null!;
-}
+public record ReceiverAlreadySignedQuery : EnvelopeReceiverQueryBase, IRequest<bool>;
 
 /// <summary>
 /// 
@@ -44,9 +23,25 @@ public static class ReceiverAlreadySignedQueryExtensions
     /// </summary>
     /// <param name="mediator"></param>
     /// <param name="key"></param>
+    /// <param name="cancel"></param>
     /// <returns></returns>
-    public static Task<bool> ReceiverAlreadySigned(IMediator mediator, string key)
-        => mediator.Send(new ReceiverAlreadySignedQuery { Key = key });
+    public static Task<bool> IsSignedAsync(this IMediator mediator, string key, CancellationToken cancel = default)
+        => mediator.Send(new ReceiverAlreadySignedQuery { Key = key }, cancel);
+
+    /// <summary>
+    /// 
+    /// </summary>
+    /// <param name="mediator"></param>
+    /// <param name="uuid"></param>
+    /// <param name="signature"></param>
+    /// <param name="cancel"></param>
+    /// <returns></returns>
+    public static Task<bool> IsSignedAsync(this IMediator mediator, string uuid, string signature, CancellationToken cancel = default)
+        => mediator.Send(new ReceiverAlreadySignedQuery
+        { 
+            Envelope = new() { Uuid = uuid },
+            Receiver = new() { Signature = signature } 
+        }, cancel);
 }
 
 /// <summary>
@@ -54,13 +49,13 @@ public static class ReceiverAlreadySignedQueryExtensions
 /// </summary>
 public class ReceiverAlreadySignedQueryHandler : IRequestHandler<ReceiverAlreadySignedQuery, bool>
 {
-    private readonly IRepository<EnvelopeReceiver> _repo;
+    private readonly IRepository<History> _repo;
 
     /// <summary>
     /// 
     /// </summary>
     /// <param name="repo"></param>
-    public ReceiverAlreadySignedQueryHandler(IRepository<EnvelopeReceiver> repo)
+    public ReceiverAlreadySignedQueryHandler(IRepository<History> repo)
     {
         _repo = repo;
     }
@@ -73,10 +68,6 @@ public class ReceiverAlreadySignedQueryHandler : IRequestHandler<ReceiverAlready
     /// <returns></returns>
     public async Task<bool> Handle(ReceiverAlreadySignedQuery request, CancellationToken cancel = default)
     {
-        return await _repo.Read()
-            .Where(er => er.Envelope.Uuid == request.EnvelopeUuid)
-            .Where(er => er.Receiver.Signature == request.ReceiverSignature)
-            .Where(er => er.Envelope.History.Any(hist => hist.Status == Constants.EnvelopeStatus.DocumentSigned))
-            .AnyAsync(cancel);
+        return await _repo.ReadOnly().Where(request).Where(h => h.Status == EnvelopeStatus.DocumentSigned).AnyAsync(cancel);
     }
 }

EnvelopeGenerator.Application/Envelopes/Commands/CreateEnvelopeCommand.cs

@@ -1,8 +1,9 @@
-using EnvelopeGenerator.Application.Dto;
-using EnvelopeGenerator.Application.Envelopes.Queries;
+using DigitalData.Core.Abstraction.Application.Repository;
+using EnvelopeGenerator.Application.Common.Dto;
+using EnvelopeGenerator.Application.Interfaces.SQLExecutor;
 using MediatR;
-using Microsoft.AspNetCore.Mvc.ModelBinding;
 using System.ComponentModel.DataAnnotations;
+using System.ComponentModel.DataAnnotations.Schema;
 using System.Text.Json.Serialization;
 
 namespace EnvelopeGenerator.Application.Envelopes.Commands;
@@ -10,19 +11,37 @@ namespace EnvelopeGenerator.Application.Envelopes.Commands;
 /// <summary>
 /// Befehl zur Erstellung eines Umschlags.
 /// </summary>
-/// <param name="Title">Der Titel des Umschlags. Dies ist ein Pflichtfeld.</param>
-/// <param name="Message">Die Nachricht, die im Umschlag enthalten sein soll. Dies ist ein Pflichtfeld.</param>
-/// <param name="TFAEnabled">Gibt an, ob die Zwei-Faktor-Authentifizierung für den Umschlag aktiviert ist. Standardmäßig false.</param>
-public record CreateEnvelopeCommand(
-    [Required] string Title,
-    [Required] string Message,
-    bool TFAEnabled = false
-    ) : IRequest<EnvelopeDto?>
+public record CreateEnvelopeCommand : IRequest<EnvelopeDto?>
 {
     /// <summary>
-    /// Id of receiver
+    /// Der Titel des Umschlags. Dies ist ein Pflichtfeld.
+    /// </summary>
+    [Required]
+    public required string Title { get; set; }
+
+    /// <summary>
+    /// Die Nachricht, die im Umschlag enthalten sein soll. Dies ist ein Pflichtfeld.
+    /// </summary>
+    [Required]
+    public required string Message { get; set; }
+
+    /// <summary>
+    /// Gibt an, ob die Zwei-Faktor-Authentifizierung für den Umschlag aktiviert ist. Standardmäßig false.
+    /// </summary>
+    public bool TFAEnabled { get; set; } = false;
+
+    /// <summary>
+    /// ID des Absenders
+    /// </summary>
+    public int UserId { get; set; }
+
+    /// <summary>
+    /// Determines which component is used for envelope processing.
+    /// When <c>true</c>, processing is delegated to <see cref="IEnvelopeExecutor"/>; 
+    /// when <c>false</c>, <see cref="IRepository{Envelope}"/> is used instead. 
+    /// Note: <see cref="IRepository{Envelope}"/> should only be used in testing scenarios.
     /// </summary>
     [JsonIgnore]
-    [BindNever]
-    public int? UserId { get; set; }
-};
+    [NotMapped]
+    public bool UseSQLExecutor { get; set; } = true;
+}

EnvelopeGenerator.Application/Envelopes/Commands/CreateEnvelopeCommandHandler.cs

@@ -1,7 +1,10 @@
 using AutoMapper;
 using EnvelopeGenerator.Application.Interfaces.SQLExecutor;
-using EnvelopeGenerator.Application.Dto;
 using MediatR;
+using Microsoft.Extensions.DependencyInjection;
+using DigitalData.Core.Abstraction.Application.Repository;
+using EnvelopeGenerator.Domain.Entities;
+using EnvelopeGenerator.Application.Common.Dto;
 
 namespace EnvelopeGenerator.Application.Envelopes.Commands;
 
@@ -10,18 +13,22 @@ namespace EnvelopeGenerator.Application.Envelopes.Commands;
 /// </summary>
 public class CreateEnvelopeCommandHandler : IRequestHandler<CreateEnvelopeCommand, EnvelopeDto?>
 {
-    private readonly IEnvelopeExecutor _envelopeExecutor;
+    private readonly IServiceProvider _provider;
+
+    private IEnvelopeExecutor Executor => _provider.GetRequiredService<IEnvelopeExecutor>();
+
+    private IRepository<Envelope> Repository => _provider.GetRequiredService<IRepository<Envelope>>();
 
     private readonly IMapper _mapper;
 
     /// <summary>
     /// 
     /// </summary>
-    /// <param name="envelopeExecutor"></param>
+    /// <param name="provider"></param>
     /// <param name="mapper"></param>
-    public CreateEnvelopeCommandHandler(IEnvelopeExecutor envelopeExecutor, IMapper mapper)
+    public CreateEnvelopeCommandHandler(IServiceProvider provider, IMapper mapper)
     {
-        _envelopeExecutor = envelopeExecutor;
+        _provider = provider;
         _mapper = mapper;
     }
 
@@ -29,14 +36,14 @@ public class CreateEnvelopeCommandHandler : IRequestHandler<CreateEnvelopeComman
     /// 
     /// </summary>
     /// <param name="request"></param>
-    /// <param name="cancellationToken"></param>
+    /// <param name="cancel"></param>
     /// <returns></returns>
-    public async Task<EnvelopeDto?> Handle(CreateEnvelopeCommand request, CancellationToken cancellationToken)
+    public async Task<EnvelopeDto?> Handle(CreateEnvelopeCommand request, CancellationToken cancel)
     {
-        int userId = request.UserId ?? throw new InvalidOperationException("UserId cannot be null when creating an envelope.");
-
-        var envelope = await _envelopeExecutor.CreateEnvelopeAsync(userId, request.Title, request.Message, request.TFAEnabled, cancellationToken);
+        var envelope = request.UseSQLExecutor
+            ? await Executor.CreateEnvelopeAsync(request.UserId, request.Title, request.Message, request.TFAEnabled, cancel)
+            : await Repository.CreateAsync(request, cancel);
 
         return _mapper.Map<EnvelopeDto>(envelope);
     }
-}
+}

EnvelopeGenerator.Application/Envelopes/MappingProfile.cs

@@ -1,5 +1,6 @@
 using AutoMapper;
 using EnvelopeGenerator.Application.EnvelopeReceivers.Commands;
+using EnvelopeGenerator.Application.Envelopes.Commands;
 using EnvelopeGenerator.Domain.Entities;
 
 namespace EnvelopeGenerator.Application.Envelopes;
@@ -15,5 +16,7 @@ public class MappingProfile : Profile
     public MappingProfile()
     {
         CreateMap<Envelope, CreateEnvelopeReceiverResponse>();
+        CreateMap<CreateEnvelopeCommand, Envelope>()
+            .ForMember(dest => dest.Uuid, opt => opt.MapFrom(_ => Guid.NewGuid().ToString()));
     }
 }

EnvelopeGenerator.Application/Envelopes/Queries/ReadEnvelopeQuery.cs

@@ -1,31 +1,22 @@
 using MediatR;
-using EnvelopeGenerator.Domain;
+using EnvelopeGenerator.Domain.Constants;
+using EnvelopeGenerator.Application.Common.Query;
 
 namespace EnvelopeGenerator.Application.Envelopes.Queries;
 
 /// <summary>
 /// Repräsentiert eine Abfrage für Umschläge.
 /// </summary>
-public class ReadEnvelopeQuery : IRequest
+public record ReadEnvelopeQuery : EnvelopeQueryBase, IRequest
 {
-    /// <summary>
-    /// Die eindeutige Kennung des Umschlags.
-    /// </summary>
-    public int? Id { get; init; }
-
-    /// <summary>
-    /// Die universell eindeutige Kennung des Umschlags.
-    /// </summary>
-    public string? Uuid { get; init; }
-
     /// <summary>
     /// Abfrage des Include des Umschlags
     /// </summary>
-    public EnvelopeStatus? Status { get; init; }
+    public EnvelopeStatusQuery? Status { get; init; }
 }
 
 /// <summary>
-/// Repräsentiert den Include eines Umschlags und dessen Beziehung zum Empfänger. (vgl. auch <see cref="Constants.EnvelopeStatus"/>
+/// Repräsentiert den Include eines Umschlags und dessen Beziehung zum Empfänger. (vgl. auch <see cref="EnvelopeStatusQuery"/>
 /// Invalid (0): Ungültiger Include.
 /// EnvelopeCreated (1001): Der Umschlag wurde erstellt.
 /// EnvelopeSaved (1002): Der Umschlag wurde gespeichert.
@@ -52,25 +43,26 @@ public class ReadEnvelopeQuery : IRequest
 /// MessageDeletionSent (3004): Löschbenachrichtigung wurde gesendet.
 /// MessageCompletionSent (3005): Abschlussbenachrichtigung wurde gesendet.
 /// </summary>
-public record EnvelopeStatus
+
+public record EnvelopeStatusQuery
 {
     /// <summary>
     /// Der minimale Statuswert, der berücksichtigt werden.
     /// </summary>
-    public Constants.EnvelopeStatus? Min { get; init; }
+    public EnvelopeStatus? Min { get; init; }
 
     /// <summary>
     /// Der maximale Statuswert, der berücksichtigt werden.
     /// </summary>
-    public Constants.EnvelopeStatus? Max { get; init; }
+    public EnvelopeStatus? Max { get; init; }
 
     /// <summary>
     /// Eine Liste von Statuswerten, die einbezogen werden.
     /// </summary>
-    public Constants.EnvelopeStatus[]? Include { get; init; }
+    public EnvelopeStatus[]? Include { get; init; }
 
     /// <summary>
     /// Eine Liste von Statuswerten, die ignoriert werden werden.
     /// </summary>
-    public Constants.EnvelopeStatus[]? Ignore { get; init; }
+    public EnvelopeStatus[]? Ignore { get; init; }
 }

EnvelopeGenerator.Application/Exceptions/BadRequestException.cs

@@ -1,22 +0,0 @@
-namespace EnvelopeGenerator.Application.Exceptions;
-
-/// <summary>
-/// Represents an exception that is thrown when a bad request is encountered.
-/// </summary>
-public class BadRequestException : Exception
-{
-    /// <summary>
-    /// Initializes a new instance of the <see cref="BadRequestException"/> class.
-    /// </summary>
-    public BadRequestException()
-    {
-    }
-
-    /// <summary>
-    /// Initializes a new instance of the <see cref="BadRequestException"/> class with a specified error message.
-    /// </summary>
-    /// <param name="message">The message that describes the error.</param>
-    public BadRequestException(string? message) : base(message)
-    {
-    }
-}

EnvelopeGenerator.Application/Exceptions/NotFoundException.cs

@@ -1,22 +0,0 @@
-namespace EnvelopeGenerator.Application.Exceptions;
-
-/// <summary>
-/// Represents an exception that is thrown when a requested resource is not found.
-/// </summary>
-public class NotFoundException : Exception
-{
-    /// <summary>
-    /// Initializes a new instance of the <see cref="NotFoundException"/> class.
-    /// </summary>
-    public NotFoundException()
-    {
-    }
-
-    /// <summary>
-    /// Initializes a new instance of the <see cref="NotFoundException"/> class with a specified error message.
-    /// </summary>
-    /// <param name="message">The message that describes the error.</param>
-    public NotFoundException(string? message) : base(message)
-    {
-    }
-}

EnvelopeGenerator.Application/Extensions/TaskExtensions.cs

@@ -1,53 +0,0 @@
-using EnvelopeGenerator.Application.Exceptions;
-
-namespace EnvelopeGenerator.Application.Extensions;
-
-/// <summary>
-/// Extension methods for tasks
-/// </summary>
-public static class TaskExtensions
-{
-    /// <summary>
-    /// Awaits the specified task and ensures that the result is not <c>null</c>.
-    /// If the result is <c>null</c>, a <see cref="NotFoundException"/> is thrown.
-    /// </summary>
-    /// <typeparam name="T">The type of the result.</typeparam>
-    /// <param name="task">The task to await.</param>
-    /// <param name="exceptionMessage">Optional custom exception message.</param>
-    /// <returns>The awaited result if not <c>null</c>.</returns>
-    /// <exception cref="NotFoundException">Thrown if the result is <c>null</c>.</exception>
-    public static async Task<T> ThrowIfNull<T>(this Task<T?> task, string? exceptionMessage = null)
-    {
-        var result = await task;
-        return result ?? throw new NotFoundException(exceptionMessage);
-    }
-
-    /// <summary>
-    /// Awaits the specified task and ensures that the result is not <c>empty</c>.
-    /// If the result contains no elements, a <see cref="NotFoundException"/> is thrown.
-    /// </summary>
-    /// <typeparam name="T">The element type of the collection.</typeparam>
-    /// <param name="task">The task to await.</param>
-    /// <param name="exceptionMessage">Optional custom exception message.</param>
-    /// <returns>The awaited collection if it is not <c>null</c> or empty.</returns>
-    /// <exception cref="NotFoundException">Thrown if the result is <c>null</c> or empty.</exception>
-    public static async Task<IEnumerable<T>> ThrowIfNull<T>(this Task<IEnumerable<T>> task, string? exceptionMessage = null)
-    {
-        var result = await task;
-        return result?.Any() ?? false ? result : throw new NotFoundException(exceptionMessage);
-    }
-
-    /// <summary>
-    /// 
-    /// </summary>
-    /// <typeparam name="T"></typeparam>
-    /// <typeparam name="I"></typeparam>
-    /// <param name="task"></param>
-    /// <param name="act"></param>
-    /// <returns></returns>
-    public static async Task<I> Then<T, I>(this Task<T> task, Func<T, I> act)
-    {
-        var res = await task;
-        return act(res);
-    }
-}

EnvelopeGenerator.Application/Histories/Commands/CreateHistoryCommand.cs

@@ -0,0 +1,108 @@
+using AutoMapper;
+using DigitalData.Core.Abstraction.Application.Repository;
+using DigitalData.Core.Exceptions;
+using EnvelopeGenerator.Application.Common.Dto.History;
+using EnvelopeGenerator.Application.Common.Extensions;
+using EnvelopeGenerator.Application.Common.Query;
+using EnvelopeGenerator.Domain.Constants;
+using EnvelopeGenerator.Domain.Entities;
+using MediatR;
+using Microsoft.EntityFrameworkCore;
+
+namespace EnvelopeGenerator.Application.Histories.Commands;
+
+/// <summary>
+/// 
+/// </summary>
+public record CreateHistoryCommand : EnvelopeReceiverQueryBase, IRequest<HistoryDto?>
+{
+    /// <summary>
+    /// 
+    /// </summary>
+    public int? EnvelopeId { get; set; }
+
+    /// <summary>
+    /// 
+    /// </summary>
+    public string? UserReference { get; set; }
+
+    /// <summary>
+    /// 
+    /// </summary>
+    public EnvelopeStatus Status { get; set; }
+
+    /// <summary>
+    /// 
+    /// </summary>
+    public DateTime AddedWhen { get; } = DateTime.Now;
+
+    /// <summary>
+    /// 
+    /// </summary>
+    public DateTime ActionDate => AddedWhen;
+
+    /// <summary>
+    /// 
+    /// </summary>
+    public string? Comment { get; set; }
+}
+
+/// <summary>
+/// 
+/// </summary>
+public class CreateHistoryCommandHandler : IRequestHandler<CreateHistoryCommand, HistoryDto?>
+{
+    private readonly IRepository<History> _repo;
+
+    private readonly IRepository<EnvelopeReceiver> _erRepo;
+
+    private readonly IMapper _mapper;
+
+    /// <summary>
+    /// 
+    /// </summary>
+    /// <param name="repo"></param>
+    /// <param name="erRepo"></param>
+    /// <param name="mapper"></param>
+    public CreateHistoryCommandHandler(IRepository<History> repo, IRepository<EnvelopeReceiver> erRepo, IMapper mapper)
+    {
+        _repo = repo;
+        _erRepo = erRepo;
+        _mapper = mapper;
+    }
+
+    /// <summary>
+    /// 
+    /// </summary>
+    /// <param name="request"></param>
+    /// <param name="cancel"></param>
+    /// <returns></returns>
+    public async Task<HistoryDto?> Handle(CreateHistoryCommand request, CancellationToken cancel)
+    {
+        if(request.UserReference is null)
+        {
+            var receivers = await _erRepo
+                .ReadOnly()
+                .Where(request)
+                .Include(er => er.Receiver)
+                .ToListAsync(cancel);
+
+            if (receivers.Count != 1)
+                throw new BadRequestException(
+                    receivers.Count > 1
+                        ? "Multiple receivers found for the given envelope and receiver criteria."
+                        : "No receiver found for the given envelope and receiver criteria."
+                );
+
+            var receiver = receivers.Single().Receiver
+                           ?? throw new BadRequestException("No receiver found for the given envelope and receiver criteria.");
+
+            request.UserReference = receiver.EmailAddress;
+        }
+
+        // create entitiy
+        var hist = await _repo.CreateAsync(request, cancel);
+        
+        return _mapper.Map<HistoryDto>(hist);
+    }
+}

EnvelopeGenerator.Application/Histories/MappingProfile.cs

@@ -1,5 +1,5 @@
 using AutoMapper;
-using EnvelopeGenerator.Application.Histories.Queries.Read;
+using EnvelopeGenerator.Application.Histories.Commands;
 using EnvelopeGenerator.Domain.Entities;
 
 namespace EnvelopeGenerator.Application.Histories;
@@ -14,6 +14,9 @@ public class MappingProfile: Profile
     /// </summary>
     public MappingProfile()
     {
-        CreateMap<EnvelopeHistory, ReadHistoryResponse>();
+        CreateMap<CreateHistoryCommand, History>()
+            .ForMember(dest => dest.Envelope, opt => opt.Ignore())
+            .ForMember(dest => dest.Sender, opt => opt.Ignore())
+            .ForMember(dest => dest.Receiver, opt => opt.Ignore());
     }
-}
+}

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

@@ -1,20 +0,0 @@
-using EnvelopeGenerator.Domain;
-using MediatR;
-using System.ComponentModel.DataAnnotations;
-
-namespace EnvelopeGenerator.Application.Histories.Queries.Read;
-
-//TODO: Add sender query
-/// <summary>
-/// Repräsentiert eine Abfrage für die Verlaufshistorie eines Umschlags.
-/// </summary>
-/// <param name="EnvelopeId">Die eindeutige Kennung des Umschlags.</param>
-/// <param name="Status">Der Include des Umschlags, der abgefragt werden soll. Kann optional angegeben werden, um die Ergebnisse zu filtern.</param>
-/// <param name="OnlyLast">Abfrage zur Steuerung, ob nur der aktuelle Include oder der gesamte Datensatz zurückgegeben wird.</param>
-public record ReadHistoryQuery(
-    [Required]
-    int EnvelopeId,
-    Constants.EnvelopeStatus? Status = null,
-    bool? OnlyLast = true) : IRequest<IEnumerable<ReadHistoryResponse>>
-{
-};

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

@@ -1,46 +0,0 @@
-using AutoMapper;
-using EnvelopeGenerator.Application.Interfaces.Repositories;
-using EnvelopeGenerator.Application.Exceptions;
-using MediatR;
-
-namespace EnvelopeGenerator.Application.Histories.Queries.Read;
-
-/// <summary>
-/// 
-/// </summary>
-public class ReadHistoryQueryHandler : IRequestHandler<ReadHistoryQuery, IEnumerable<ReadHistoryResponse>>
-{
-    [Obsolete("Use IRepository")]
-    private readonly IEnvelopeHistoryRepository _repository;
-
-    private readonly IMapper _mapper;
-
-    /// <summary>
-    /// 
-    /// </summary>
-    /// <param name="repository"></param>
-    /// <param name="mapper"></param>
-    [Obsolete("Use IRepository")]
-    public ReadHistoryQueryHandler(IEnvelopeHistoryRepository repository, IMapper mapper)
-    {
-        _repository = repository;
-        _mapper = mapper;
-    }
-
-    /// <summary>
-    /// 
-    /// </summary>
-    /// <param name="request"></param>
-    /// <param name="cancellationToken"></param>
-    /// <returns></returns>
-    /// <exception cref="NotFoundException"></exception>
-    public async Task<IEnumerable<ReadHistoryResponse>> Handle(ReadHistoryQuery request, CancellationToken cancellationToken)
-    {
-        var hists = await _repository.ReadAsync(request.EnvelopeId, status: request.Status is null ? null : request.Status);
-
-        if (!hists.Any())
-            throw new NotFoundException();
-                
-        return _mapper.Map<IEnumerable<ReadHistoryResponse>>(hists);
-    }
-}

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

@@ -1,60 +0,0 @@
-using EnvelopeGenerator.Domain;
-
-namespace EnvelopeGenerator.Application.Histories.Queries.Read;
-
-/// <summary>
-/// Represents the history of an envelope, including its status, user actions, and references.
-/// </summary>
-public class ReadHistoryResponse
-{
-    /// <summary>
-    /// Gets or sets the unique identifier of the envelope history record.
-    /// </summary>
-    public long Id { get; set; }
-
-    /// <summary>
-    /// Gets or sets the identifier of the associated envelope.
-    /// </summary>
-    public int EnvelopeId { get; set; }
-
-    /// <summary>
-    /// Gets or sets the reference identifier of the user who performed the action.
-    /// </summary>
-    public required string UserReference { get; set; }
-
-    /// <summary>
-    /// Gets or sets the status code of the envelope.
-    /// </summary>
-    public int Status { get; set; }
-
-    /// <summary>
-    /// 
-    /// </summary>
-    public Constants.ReferenceType ReferenceType => Status.ToString().FirstOrDefault() switch
-    {
-        '1' => Constants.ReferenceType.Sender,
-        '2' => Constants.ReferenceType.Receiver,
-        _ => Constants.ReferenceType.System,
-    };
-
-    /// <summary>
-    /// Gets or sets the date and time when the record was added.
-    /// </summary>
-    public DateTime AddedWhen { get; set; }
-
-    /// <summary>
-    /// Gets or sets the date and time when the action occurred.
-    /// </summary>
-    public DateTime? ActionDate { get; set; }
-
-    /// <summary>
-    /// Gets or sets the optional comment about the envelope history record.
-    /// </summary>
-    public string? Comment { get; set; }
-
-    /// <inheritdoc/>
-    public override int GetHashCode()
-    {
-        return Id.GetHashCode();
-    }
-}

EnvelopeGenerator.Application/Histories/Queries/ReadHistoryQuery.cs

@@ -0,0 +1,29 @@
+using EnvelopeGenerator.Application.Common.Dto.History;
+using EnvelopeGenerator.Domain.Constants;
+using MediatR;
+using System.ComponentModel.DataAnnotations;
+
+namespace EnvelopeGenerator.Application.Histories.Queries;
+
+//TODO: Add sender query
+/// <summary>
+/// Repräsentiert eine Abfrage für die Verlaufshistorie eines Umschlags.
+/// </summary>
+public record ReadHistoryQuery : IRequest<IEnumerable<HistoryDto>>
+{
+    /// <summary>
+    /// Die eindeutige Kennung des Umschlags.
+    /// </summary>
+    [Required]
+    public int EnvelopeId { get; init; }
+
+    /// <summary>
+    /// Der Include des Umschlags, der abgefragt werden soll. Kann optional angegeben werden, um die Ergebnisse zu filtern.
+    /// </summary>
+    public EnvelopeStatus? Status { get; init; }
+
+    /// <summary>
+    /// Abfrage zur Steuerung, ob nur der aktuelle Include oder der gesamte Datensatz zurückgegeben wird.
+    /// </summary>
+    public bool? OnlyLast { get; init; } = true;
+}

EnvelopeGenerator.Application/Histories/Queries/ReadHistoryQueryHandler.cs

@@ -0,0 +1,47 @@
+using AutoMapper;
+using DigitalData.Core.Abstraction.Application.Repository;
+using DigitalData.Core.Exceptions;
+using EnvelopeGenerator.Application.Common.Dto.History;
+using EnvelopeGenerator.Domain.Entities;
+using MediatR;
+using Microsoft.EntityFrameworkCore;
+
+namespace EnvelopeGenerator.Application.Histories.Queries;
+
+/// <summary>
+/// 
+/// </summary>
+public class ReadHistoryQueryHandler : IRequestHandler<ReadHistoryQuery, IEnumerable<HistoryDto>>
+{
+    private readonly IRepository<History> _repo;
+
+    private readonly IMapper _mapper;
+
+    /// <summary>
+    /// 
+    /// </summary>
+    /// <param name="repo"></param>
+    /// <param name="mapper"></param>
+    public ReadHistoryQueryHandler(IRepository<History> repo, IMapper mapper)
+    {
+        _repo = repo;
+        _mapper = mapper;
+    }
+
+    /// <summary>
+    /// 
+    /// </summary>
+    /// <param name="request"></param>
+    /// <param name="cancel"></param>
+    /// <returns></returns>
+    /// <exception cref="NotFoundException"></exception>
+    public async Task<IEnumerable<HistoryDto>> Handle(ReadHistoryQuery request, CancellationToken cancel = default)
+    {
+        var query = _repo.ReadOnly().Where(h => h.EnvelopeId == request.EnvelopeId);
+        if (request.Status is not null)
+            query = query.Where(h => h.Status == request.Status);
+
+        var hists = await query.ToListAsync(cancel);
+        return _mapper.Map<List<HistoryDto>>(hists);
+    }
+}

EnvelopeGenerator.Application/Interfaces/Repositories/IDocumentReceiverElementRepository.cs

@@ -6,6 +6,6 @@ namespace EnvelopeGenerator.Application.Interfaces.Repositories;
 /// 
 /// </summary>
 [Obsolete("Use IRepository")]
-public interface IDocumentReceiverElementRepository : ICRUDRepository<DocumentReceiverElement, int>
+public interface IDocumentReceiverElementRepository : ICRUDRepository<Signature, int>
 {
 }

EnvelopeGenerator.Application/Interfaces/Repositories/IEmailTemplateRepository.cs

@@ -1,6 +1,6 @@
 using DigitalData.Core.Abstraction.Application.Repository;
+using EnvelopeGenerator.Domain.Constants;
 using EnvelopeGenerator.Domain.Entities;
-using static EnvelopeGenerator.Domain.Constants;
 
 namespace EnvelopeGenerator.Application.Interfaces.Repositories;
 

EnvelopeGenerator.Application/Interfaces/Repositories/IEnvelopeDocumentRepository.cs

@@ -7,6 +7,6 @@ namespace EnvelopeGenerator.Application.Interfaces.Repositories;
 /// 
 /// </summary>
 [Obsolete("Use IRepository")]
-public interface IEnvelopeDocumentRepository : ICRUDRepository<EnvelopeDocument, int>
+public interface IEnvelopeDocumentRepository : ICRUDRepository<Document, int>
 {
 }

EnvelopeGenerator.Application/Interfaces/Repositories/IEnvelopeHistoryRepository.cs

@@ -1,5 +1,5 @@
 using DigitalData.Core.Abstraction.Application.Repository;
-using EnvelopeGenerator.Domain;
+using EnvelopeGenerator.Domain.Constants;
 using EnvelopeGenerator.Domain.Entities;
 
 namespace EnvelopeGenerator.Application.Interfaces.Repositories;
@@ -8,7 +8,7 @@ namespace EnvelopeGenerator.Application.Interfaces.Repositories;
 /// 
 /// </summary>
 [Obsolete("Use IRepository")]
-public interface IEnvelopeHistoryRepository : ICRUDRepository<EnvelopeHistory, long>
+public interface IEnvelopeHistoryRepository : ICRUDRepository<History, long>
 {
     /// <summary>
     /// 
@@ -17,7 +17,7 @@ public interface IEnvelopeHistoryRepository : ICRUDRepository<EnvelopeHistory, l
     /// <param name="userReference"></param>
     /// <param name="status"></param>
     /// <returns></returns>
-    Task<int> CountAsync(int? envelopeId = null, string? userReference = null, Constants.EnvelopeStatus? status = null);
+    Task<int> CountAsync(int? envelopeId = null, string? userReference = null, EnvelopeStatus? status = null);
 
     /// <summary>
     /// 
@@ -28,5 +28,5 @@ public interface IEnvelopeHistoryRepository : ICRUDRepository<EnvelopeHistory, l
     /// <param name="withSender"></param>
     /// <param name="withReceiver"></param>
     /// <returns></returns>
-    Task<IEnumerable<EnvelopeHistory>> ReadAsync(int? envelopeId = null, string? userReference = null, Constants.EnvelopeStatus? status = null, bool withSender = false, bool withReceiver = false);
+    Task<IEnumerable<History>> ReadAsync(int? envelopeId = null, string? userReference = null, EnvelopeStatus? status = null, bool withSender = false, bool withReceiver = false);
 }

EnvelopeGenerator.Application/Interfaces/Repositories/IEnvelopeReceiverRepository.cs

@@ -1,5 +1,6 @@
 using DigitalData.Core.Abstraction.Application.Repository;
-using EnvelopeGenerator.Domain;
+using EnvelopeGenerator.Application.Envelopes.Queries;
+using EnvelopeGenerator.Domain.Constants;
 using EnvelopeGenerator.Domain.Entities;
 
 namespace EnvelopeGenerator.Application.Interfaces.Repositories;
@@ -84,7 +85,7 @@ public interface IEnvelopeReceiverRepository : ICRUDRepository<EnvelopeReceiver,
     /// <param name="max_status"></param>
     /// <param name="ignore_statuses"></param>
     /// <returns></returns>
-    Task<IEnumerable<EnvelopeReceiver>> ReadByUsernameAsync(string username, Constants.EnvelopeStatus? min_status = null, Constants.EnvelopeStatus? max_status = null, params Constants.EnvelopeStatus[] ignore_statuses);
+    Task<IEnumerable<EnvelopeReceiver>> ReadByUsernameAsync(string username, EnvelopeStatus? min_status = null, EnvelopeStatus? max_status = null, params EnvelopeStatus[] ignore_statuses);
 
     /// <summary>
     /// 

EnvelopeGenerator.Application/Interfaces/Repositories/IEnvelopeRepository.cs

@@ -1,5 +1,5 @@
 using DigitalData.Core.Abstraction.Application.Repository;
-using EnvelopeGenerator.Domain;
+using EnvelopeGenerator.Domain.Constants;
 using EnvelopeGenerator.Domain.Entities;
 
 namespace EnvelopeGenerator.Application.Interfaces.Repositories;
@@ -39,5 +39,5 @@ public interface IEnvelopeRepository : ICRUDRepository<Envelope, int>
     /// <param name="max_status"></param>
     /// <param name="ignore_statuses"></param>
     /// <returns></returns>
-    Task<IEnumerable<Envelope>> ReadByUserAsync(int userId, Constants.EnvelopeStatus? min_status = null, Constants.EnvelopeStatus? max_status = null, params Constants.EnvelopeStatus[] ignore_statuses);
+    Task<IEnumerable<Envelope>> ReadByUserAsync(int userId, EnvelopeStatus? min_status = null, EnvelopeStatus? max_status = null, params EnvelopeStatus[] ignore_statuses);
 }

EnvelopeGenerator.Application/Interfaces/SQLExecutor/IDocumentExecutor.cs

@@ -14,5 +14,5 @@ public interface IDocumentExecutor
     /// <param name="envelope_uuid"></param>
     /// <param name="cancellation"></param>
     /// <returns></returns>
-    Task<EnvelopeDocument> CreateDocumentAsync(string base64, string envelope_uuid, CancellationToken cancellation = default);
+    Task<Document> CreateDocumentAsync(string base64, string envelope_uuid, CancellationToken cancellation = default);
 }

EnvelopeGenerator.Application/Interfaces/Services/IConfigService.cs

@@ -1,6 +1,6 @@
 using DigitalData.Core.Abstraction.Application;
 using DigitalData.Core.Abstraction.Application.DTO;
-using EnvelopeGenerator.Application.Dto;
+using EnvelopeGenerator.Application.Common.Dto;
 using EnvelopeGenerator.Domain.Entities;
 
 namespace EnvelopeGenerator.Application.Interfaces.Services;

EnvelopeGenerator.Application/Interfaces/Services/IDocumentReceiverElementService.cs

@@ -1,5 +1,5 @@
 using DigitalData.Core.Abstraction.Application;
-using EnvelopeGenerator.Application.Dto;
+using EnvelopeGenerator.Application.Common.Dto;
 using EnvelopeGenerator.Domain.Entities;
 
 namespace EnvelopeGenerator.Application.Interfaces.Services;
@@ -8,6 +8,6 @@ namespace EnvelopeGenerator.Application.Interfaces.Services;
 /// 
 /// </summary>
 [Obsolete("Use MediatR")]
-public interface IDocumentReceiverElementService : IBasicCRUDService<DocumentReceiverElementDto, DocumentReceiverElement, int>
+public interface IDocumentReceiverElementService : IBasicCRUDService<SignatureDto, Signature, int>
 {
 }

EnvelopeGenerator.Application/Interfaces/Services/IDocumentStatusService.cs

@@ -1,5 +1,5 @@
 using DigitalData.Core.Abstraction.Application;
-using EnvelopeGenerator.Application.Dto;
+using EnvelopeGenerator.Application.Common.Dto;
 using EnvelopeGenerator.Domain.Entities;
 namespace EnvelopeGenerator.Application.Interfaces.Services;
 

EnvelopeGenerator.Application/Interfaces/Services/IEmailTemplateService.cs

@@ -1,8 +1,8 @@
 using DigitalData.Core.Abstraction.Application;
 using DigitalData.Core.Abstraction.Application.DTO;
-using EnvelopeGenerator.Application.Dto;
+using EnvelopeGenerator.Application.Common.Dto;
+using EnvelopeGenerator.Domain.Constants;
 using EnvelopeGenerator.Domain.Entities;
-using static EnvelopeGenerator.Domain.Constants;
 
 namespace EnvelopeGenerator.Application.Interfaces.Services;
 

EnvelopeGenerator.Application/Interfaces/Services/IEnvelopeDocumentService.cs

@@ -1,5 +1,5 @@
 using DigitalData.Core.Abstraction.Application;
-using EnvelopeGenerator.Application.Dto;
+using EnvelopeGenerator.Application.Common.Dto;
 using EnvelopeGenerator.Domain.Entities;
 
 namespace EnvelopeGenerator.Application.Interfaces.Services;
@@ -8,6 +8,6 @@ namespace EnvelopeGenerator.Application.Interfaces.Services;
 /// 
 /// </summary>
 [Obsolete("Use MediatR")]
-public interface IEnvelopeDocumentService : IBasicCRUDService<EnvelopeDocumentDto, EnvelopeDocument, int>
+public interface IEnvelopeDocumentService : IBasicCRUDService<DocumentDto, Document, int>
 {
 }

EnvelopeGenerator.Application/Interfaces/Services/IEnvelopeHistoryService.cs

@@ -1,9 +1,9 @@
 using DigitalData.Core.Abstraction.Application;
 using DigitalData.Core.Abstraction.Application.DTO;
-using EnvelopeGenerator.Application.Dto.EnvelopeHistory;
-using EnvelopeGenerator.Application.Dto.Receiver;
+using EnvelopeGenerator.Application.Common.Dto.History;
+using EnvelopeGenerator.Application.Common.Dto.Receiver;
+using EnvelopeGenerator.Domain.Constants;
 using EnvelopeGenerator.Domain.Entities;
-using static EnvelopeGenerator.Domain.Constants;
 
 namespace EnvelopeGenerator.Application.Interfaces.Services;
 
@@ -11,7 +11,7 @@ namespace EnvelopeGenerator.Application.Interfaces.Services;
 /// 
 /// </summary>
 [Obsolete("Use MediatR")]
-public interface IEnvelopeHistoryService : ICRUDService<EnvelopeHistoryCreateDto, EnvelopeHistoryDto, EnvelopeHistory, long>
+public interface IEnvelopeHistoryService : ICRUDService<HistoryCreateDto, HistoryDto, History, long>
 {
     /// <summary>
     /// 
@@ -56,7 +56,7 @@ public interface IEnvelopeHistoryService : ICRUDService<EnvelopeHistoryCreateDto
     /// <param name="withSender"></param>
     /// <param name="withReceiver"></param>
     /// <returns></returns>
-    Task<IEnumerable<EnvelopeHistoryDto>> ReadAsync(int? envelopeId = null, string? userReference = null, ReferenceType? referenceType = null, EnvelopeStatus? status = null, bool withSender = false, bool withReceiver = false);
+    Task<IEnumerable<HistoryDto>> ReadAsync(int? envelopeId = null, string? userReference = null, ReferenceType? referenceType = null, EnvelopeStatus? status = null, bool withSender = false, bool withReceiver = false);
 
     /// <summary>
     /// 
@@ -64,14 +64,14 @@ public interface IEnvelopeHistoryService : ICRUDService<EnvelopeHistoryCreateDto
     /// <param name="envelopeId"></param>
     /// <param name="userReference"></param>
     /// <returns></returns>
-    Task<IEnumerable<EnvelopeHistoryDto>> ReadRejectedAsync(int envelopeId, string? userReference = null);
+    Task<IEnumerable<HistoryDto>> ReadRejectedAsync(int envelopeId, string? userReference = null);
 
     /// <summary>
     /// 
     /// </summary>
     /// <param name="envelopeId"></param>
     /// <returns></returns>
-    Task<IEnumerable<ReceiverReadDto>> ReadRejectingReceivers(int envelopeId);
+    Task<IEnumerable<ReceiverDto>> ReadRejectingReceivers(int envelopeId);
 
     /// <summary>
     /// 

EnvelopeGenerator.Application/Interfaces/Services/IEnvelopeMailService.cs

@@ -1,8 +1,8 @@
 using DigitalData.Core.Abstraction.Application.DTO;
 using DigitalData.EmailProfilerDispatcher.Abstraction.Contracts;
-using EnvelopeGenerator.Application.Dto.EnvelopeReceiver;
-using EnvelopeGenerator.Application.Dto.EnvelopeReceiverReadOnly;
-using EnvelopeGenerator.Domain;
+using EnvelopeGenerator.Application.Common.Dto.EnvelopeReceiver;
+using EnvelopeGenerator.Application.Common.Dto.EnvelopeReceiverReadOnly;
+using EnvelopeGenerator.Domain.Constants;
 
 namespace EnvelopeGenerator.Application.Interfaces.Services;
 
@@ -19,7 +19,7 @@ public interface IEnvelopeMailService : IEmailOutService
     /// <param name="tempType"></param>
     /// <param name="optionalPlaceholders"></param>
     /// <returns></returns>
-    Task<DataResult<int>> SendAsync(EnvelopeReceiverDto envelopeReceiverDto, Constants.EmailTemplateType tempType, Dictionary<string, object>? optionalPlaceholders = null);
+    Task<DataResult<int>> SendAsync(EnvelopeReceiverDto envelopeReceiverDto, EmailTemplateType tempType, Dictionary<string, object>? optionalPlaceholders = null);
 
     /// <summary>
     /// 
@@ -35,11 +35,4 @@ public interface IEnvelopeMailService : IEmailOutService
     /// <param name="envelopeReceiverDto"></param>
     /// <returns></returns>
     Task<DataResult<int>> SendAccessCodeAsync(EnvelopeReceiverDto envelopeReceiverDto);
-
-    /// <summary>
-    /// 
-    /// </summary>
-    /// <param name="envelopeReceiverDto"></param>
-    /// <returns></returns>
-    Task<DataResult<int>> SendTFAQrCodeAsync(EnvelopeReceiverDto envelopeReceiverDto);
 }

EnvelopeGenerator.Application/Interfaces/Services/IEnvelopeReceiverReadOnlyService.cs

@@ -1,5 +1,5 @@
 using DigitalData.Core.Abstraction.Application;
-using EnvelopeGenerator.Application.Dto.EnvelopeReceiverReadOnly;
+using EnvelopeGenerator.Application.Common.Dto.EnvelopeReceiverReadOnly;
 using EnvelopeGenerator.Domain.Entities;
 
 namespace EnvelopeGenerator.Application.Interfaces.Services;