chore(Web): bump to 3.3.0

- Aktualisieren Sie „MainAsync”, um mit einer geparsten schreibgeschützten ID anstelle eines String-Schlüssels zu „EnvelopeReceiverReadOnly” umzuleiten
- Ändern Sie die Aktionssignatur „EnvelopeReceiverReadOnly”, um „long readOnlyId” anstelle von „[FromRoute] string readOnlyKey” zu akzeptieren
- Inline-Schlüssel-Decodierungs-/Validierungslogik entfernt und Decodierung an `MainAsync` delegiert
- Protokollmeldungen angepasst, um `ReadOnly-Id` anstelle von `ReadOnly-key` widerzuspiegeln

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

@@ -0,0 +1,8 @@
+namespace EnvelopeGenerator.Application.Common.Configurations;
+
+/// <summary>
+/// 
+/// </summary>
+public class DbTriggerParams : Dictionary<string, ICollection<string>>
+{
+}

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.DTOs;
+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.DTOs;
+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.DTOs;
+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.DTOs
+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.DTOs;
+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.DTOs.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.DTOs.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.DTOs.EnvelopeReceiverReadOnly;
+namespace EnvelopeGenerator.Application.Common.Dto.EnvelopeReceiverReadOnly;
 
 /// <summary>
 /// 

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

@@ -1,7 +1,8 @@
-using EnvelopeGenerator.Application.DTOs.Receiver;
+using EnvelopeGenerator.Application.Common.Dto;
+using EnvelopeGenerator.Application.Common.Dto.Receiver;
 using Microsoft.AspNetCore.Mvc;
 
-namespace EnvelopeGenerator.Application.DTOs.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.DTOs.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.DTOs;
+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.DTOs.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.DTOs.Receiver;
-using static EnvelopeGenerator.Domain.Constants;
+using EnvelopeGenerator.Application.Common.Dto.Receiver;
+using EnvelopeGenerator.Domain.Constants;
 
-namespace EnvelopeGenerator.Application.DTOs.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.
@@ -25,9 +25,19 @@ public record EnvelopeHistoryDto
     public required string UserReference { get; set; }
 
     /// <summary>
-    /// Status code of the envelope at this history point.
+    /// 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.DTOs.EnvelopeHistory;
-using EnvelopeGenerator.Application.DTOs.EnvelopeReceiver;
-using EnvelopeGenerator.Application.DTOs.EnvelopeReceiverReadOnly;
-using EnvelopeGenerator.Application.DTOs.Messaging;
-using EnvelopeGenerator.Application.DTOs.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.DTOs;
+namespace EnvelopeGenerator.Application.Common.Dto;
 
 /// <summary>
 /// Represents the AutoMapper profile configuration for mapping between
@@ -23,38 +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<EnvelopeCertificate, EnvelopeCertificateDto>();
-        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<EnvelopeCertificateDto, EnvelopeCertificate>();
-        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<EnvelopeReceiverBase, 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.DTOs.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.DTOs.Messaging;
+namespace EnvelopeGenerator.Application.Common.Dto.Messaging;
 
 /// <summary>
 /// 

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

@@ -1,14 +1,14 @@
-using EnvelopeGenerator.Application.DTOs.EnvelopeReceiver;
+using EnvelopeGenerator.Application.Common.Dto.EnvelopeReceiver;
 using Microsoft.AspNetCore.Mvc;
 using System.Text.Json.Serialization;
 
-namespace EnvelopeGenerator.Application.DTOs.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.DTOs;
+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/JsonExtensions.cs

@@ -0,0 +1,18 @@
+using System.Text.Json;
+
+namespace EnvelopeGenerator.Application.Common.Extensions;
+
+/// <summary>
+/// 
+/// </summary>
+public static class JsonExtensions
+{
+    /// <summary>
+    /// 
+    /// </summary>
+    /// <param name="obj"></param>
+    /// <param name="options"></param>
+    /// <returns></returns>
+    public static string ToJson(this object obj, JsonSerializerOptions? options = null)
+        => JsonSerializer.Serialize(obj, options);
+}

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.DTOs.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

@@ -0,0 +1,30 @@
+using OtpNet;
+
+namespace EnvelopeGenerator.Application.Common.Extensions;
+
+/// <summary>
+/// 
+/// </summary>
+public static class StringExtension
+{
+    /// <summary>
+    /// 
+    /// </summary>
+    /// <param name="totp"></param>
+    /// <param name="secret"></param>
+    /// <returns></returns>
+    public static bool IsValidTotp(this string totp, string secret)
+    {
+        var secret_bytes = Base32Encoding.ToBytes(secret);
+        var secret_totp = new Totp(secret_bytes);
+        return secret_totp.VerifyTotp(totp, out _, VerificationWindow.RfcSpecifiedNetworkDelay);
+    }
+
+    /// <summary>
+    /// 
+    /// </summary>
+    /// <param name="seperator"></param>
+    /// <param name="values"></param>
+    /// <returns></returns>
+    public static string Join(this IEnumerable<string> values, string seperator) => string.Join(seperator, values);
+}

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/Interfaces/Repositories/IConfigRepository.cs

@@ -1,7 +1,7 @@
 using DigitalData.Core.Abstraction.Application.Repository;
 using EnvelopeGenerator.Domain.Entities;
 
-namespace EnvelopeGenerator.Application.Contracts.Repositories;
+namespace EnvelopeGenerator.Application.Common.Interfaces.Repositories;
 
 /// <summary>
 /// 

EnvelopeGenerator.Application/Common/Interfaces/Repositories/IDocumentReceiverElementRepository.cs

@@ -1,11 +1,11 @@
 using DigitalData.Core.Abstraction.Application.Repository;
 using EnvelopeGenerator.Domain.Entities;
 
-namespace EnvelopeGenerator.Application.Contracts.Repositories;
+namespace EnvelopeGenerator.Application.Common.Interfaces.Repositories;
 /// <summary>
 /// 
 /// </summary>
 [Obsolete("Use IRepository")]
-public interface IDocumentReceiverElementRepository : ICRUDRepository<DocumentReceiverElement, int>
+public interface IDocumentReceiverElementRepository : ICRUDRepository<Signature, int>
 {
 }

EnvelopeGenerator.Application/Common/Interfaces/Repositories/IDocumentStatusRepository.cs

@@ -1,7 +1,7 @@
 using DigitalData.Core.Abstraction.Application.Repository;
 using EnvelopeGenerator.Domain.Entities;
 
-namespace EnvelopeGenerator.Application.Contracts.Repositories;
+namespace EnvelopeGenerator.Application.Common.Interfaces.Repositories;
 
 /// <summary>
 /// 

EnvelopeGenerator.Application/Common/Interfaces/Repositories/IEmailTemplateRepository.cs

@@ -1,8 +1,8 @@
 using DigitalData.Core.Abstraction.Application.Repository;
+using EnvelopeGenerator.Domain.Constants;
 using EnvelopeGenerator.Domain.Entities;
-using static EnvelopeGenerator.Domain.Constants;
 
-namespace EnvelopeGenerator.Application.Contracts.Repositories;
+namespace EnvelopeGenerator.Application.Common.Interfaces.Repositories;
 
 /// <summary>
 /// 

EnvelopeGenerator.Application/Common/Interfaces/Repositories/IEnvelopeDocumentRepository.cs

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

EnvelopeGenerator.Application/Common/Interfaces/Repositories/IEnvelopeHistoryRepository.cs

@@ -1,14 +1,14 @@
 using DigitalData.Core.Abstraction.Application.Repository;
-using EnvelopeGenerator.Domain;
+using EnvelopeGenerator.Domain.Constants;
 using EnvelopeGenerator.Domain.Entities;
 
-namespace EnvelopeGenerator.Application.Contracts.Repositories;
+namespace EnvelopeGenerator.Application.Common.Interfaces.Repositories;
 
 /// <summary>
 /// 
 /// </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/Common/Interfaces/Repositories/IEnvelopeReceiverReadOnlyRepository.cs

@@ -1,7 +1,7 @@
 using DigitalData.Core.Abstraction.Application.Repository;
 using EnvelopeGenerator.Domain.Entities;
 
-namespace EnvelopeGenerator.Application.Contracts.Repositories;
+namespace EnvelopeGenerator.Application.Common.Interfaces.Repositories;
 
 /// <summary>
 /// 

EnvelopeGenerator.Application/Common/Interfaces/Repositories/IEnvelopeReceiverRepository.cs

@@ -1,7 +1,9 @@
 using DigitalData.Core.Abstraction.Application.Repository;
+using EnvelopeGenerator.Application.Envelopes.Queries;
+using EnvelopeGenerator.Domain.Constants;
 using EnvelopeGenerator.Domain.Entities;
 
-namespace EnvelopeGenerator.Application.Contracts.Repositories;
+namespace EnvelopeGenerator.Application.Common.Interfaces.Repositories;
 
 /// <summary>
 /// 
@@ -83,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, int? min_status = null, int? max_status = null, params int[] ignore_statuses);
+    Task<IEnumerable<EnvelopeReceiver>> ReadByUsernameAsync(string username, EnvelopeStatus? min_status = null, EnvelopeStatus? max_status = null, params EnvelopeStatus[] ignore_statuses);
 
     /// <summary>
     /// 

EnvelopeGenerator.Application/Common/Interfaces/Repositories/IEnvelopeRepository.cs

@@ -1,7 +1,8 @@
 using DigitalData.Core.Abstraction.Application.Repository;
+using EnvelopeGenerator.Domain.Constants;
 using EnvelopeGenerator.Domain.Entities;
 
-namespace EnvelopeGenerator.Application.Contracts.Repositories;
+namespace EnvelopeGenerator.Application.Common.Interfaces.Repositories;
 
 /// <summary>
 /// 
@@ -38,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, int? min_status = null, int? max_status = null, params int[] ignore_statuses);
+    Task<IEnumerable<Envelope>> ReadByUserAsync(int userId, EnvelopeStatus? min_status = null, EnvelopeStatus? max_status = null, params EnvelopeStatus[] ignore_statuses);
 }

EnvelopeGenerator.Application/Common/Interfaces/Repositories/IEnvelopeTypeRepository.cs

@@ -1,7 +1,7 @@
 using DigitalData.Core.Abstraction.Application.Repository;
 using EnvelopeGenerator.Domain.Entities;
 
-namespace EnvelopeGenerator.Application.Contracts.Repositories;
+namespace EnvelopeGenerator.Application.Common.Interfaces.Repositories;
 
 /// <summary>
 /// 

EnvelopeGenerator.Application/Common/Interfaces/Repositories/IReceiverRepository.cs

@@ -1,7 +1,7 @@
 using DigitalData.Core.Abstraction.Application.Repository;
 using EnvelopeGenerator.Domain.Entities;
 
-namespace EnvelopeGenerator.Application.Contracts.Repositories;
+namespace EnvelopeGenerator.Application.Common.Interfaces.Repositories;
 
 /// <summary>
 /// 

EnvelopeGenerator.Application/Common/Interfaces/SQLExecutor/IDocumentExecutor.cs

@@ -1,6 +1,6 @@
 using EnvelopeGenerator.Domain.Entities;
 
-namespace EnvelopeGenerator.Application.Contracts.SQLExecutor;
+namespace EnvelopeGenerator.Application.Common.Interfaces.SQLExecutor;
 
 /// <summary>
 /// 
@@ -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/Common/Interfaces/SQLExecutor/IEnvelopeExecutor.cs

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

EnvelopeGenerator.Application/Common/Interfaces/SQLExecutor/IEnvelopeReceiverExecutor.cs

@@ -1,6 +1,6 @@
 using EnvelopeGenerator.Domain.Entities;
 
-namespace EnvelopeGenerator.Application.Contracts.SQLExecutor;
+namespace EnvelopeGenerator.Application.Common.Interfaces.SQLExecutor;
 
 /// <summary>
 /// 

EnvelopeGenerator.Application/Common/Interfaces/SQLExecutor/IQuery.cs

@@ -1,4 +1,4 @@
-namespace EnvelopeGenerator.Application.Contracts.SQLExecutor;
+namespace EnvelopeGenerator.Application.Common.Interfaces.SQLExecutor;
 
 /// <summary>
 /// Provides methods for executing common queries on a given entity type.

EnvelopeGenerator.Application/Common/Interfaces/SQLExecutor/ISQL.cs

@@ -1,4 +1,4 @@
-namespace EnvelopeGenerator.Application.Contracts.SQLExecutor;
+namespace EnvelopeGenerator.Application.Common.Interfaces.SQLExecutor;
 
 /// <summary>
 /// Represents a raw SQL query contract.

EnvelopeGenerator.Application/Common/Interfaces/SQLExecutor/ISQLExecutor.cs

@@ -1,4 +1,4 @@
-namespace EnvelopeGenerator.Application.Contracts.SQLExecutor;
+namespace EnvelopeGenerator.Application.Common.Interfaces.SQLExecutor;
 
 /// <summary>
 /// Defines methods for executing raw SQL queries or custom SQL query classes and returning query executors for further operations.

EnvelopeGenerator.Application/Common/Interfaces/SQLExecutor/ISQLExecutorBaseEntity.cs

@@ -1,6 +1,6 @@
 using Dapper;
 
-namespace EnvelopeGenerator.Application.Contracts.SQLExecutor;
+namespace EnvelopeGenerator.Application.Common.Interfaces.SQLExecutor;
 
 /// <summary>
 /// 

EnvelopeGenerator.Application/Common/Interfaces/Services/IAuthenticator.cs

@@ -1,6 +1,6 @@
 using OtpNet;
 
-namespace EnvelopeGenerator.Application.Contracts.Services;
+namespace EnvelopeGenerator.Application.Common.Interfaces.Services;
 
 /// <summary>
 /// 

EnvelopeGenerator.Application/Common/Interfaces/Services/IConfigService.cs

@@ -1,9 +1,9 @@
 using DigitalData.Core.Abstraction.Application;
 using DigitalData.Core.Abstraction.Application.DTO;
-using EnvelopeGenerator.Application.DTOs;
+using EnvelopeGenerator.Application.Common.Dto;
 using EnvelopeGenerator.Domain.Entities;
 
-namespace EnvelopeGenerator.Application.Contracts.Services;
+namespace EnvelopeGenerator.Application.Common.Interfaces.Services;
 
 /// <summary>
 /// 

EnvelopeGenerator.Application/Common/Interfaces/Services/IDocumentReceiverElementService.cs

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

EnvelopeGenerator.Application/Common/Interfaces/Services/IDocumentStatusService.cs

@@ -1,7 +1,7 @@
 using DigitalData.Core.Abstraction.Application;
-using EnvelopeGenerator.Application.DTOs;
+using EnvelopeGenerator.Application.Common.Dto;
 using EnvelopeGenerator.Domain.Entities;
-namespace EnvelopeGenerator.Application.Contracts.Services;
+namespace EnvelopeGenerator.Application.Common.Interfaces.Services;
 
 /// <summary>
 /// 

EnvelopeGenerator.Application/Common/Interfaces/Services/IEmailTemplateService.cs

@@ -1,10 +1,10 @@
 using DigitalData.Core.Abstraction.Application;
 using DigitalData.Core.Abstraction.Application.DTO;
-using EnvelopeGenerator.Application.DTOs;
+using EnvelopeGenerator.Application.Common.Dto;
+using EnvelopeGenerator.Domain.Constants;
 using EnvelopeGenerator.Domain.Entities;
-using static EnvelopeGenerator.Domain.Constants;
 
-namespace EnvelopeGenerator.Application.Contracts.Services;
+namespace EnvelopeGenerator.Application.Common.Interfaces.Services;
 
 /// <summary>
 /// 

EnvelopeGenerator.Application/Common/Interfaces/Services/IEnvelopeDocumentService.cs

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

EnvelopeGenerator.Application/Common/Interfaces/Services/IEnvelopeHistoryService.cs

@@ -1,17 +1,17 @@
 using DigitalData.Core.Abstraction.Application;
 using DigitalData.Core.Abstraction.Application.DTO;
-using EnvelopeGenerator.Application.DTOs.EnvelopeHistory;
-using EnvelopeGenerator.Application.DTOs.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.Contracts.Services;
+namespace EnvelopeGenerator.Application.Common.Interfaces.Services;
 
 /// <summary>
 /// 
 /// </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/Common/Interfaces/Services/IEnvelopeMailService.cs

@@ -1,10 +1,10 @@
 using DigitalData.Core.Abstraction.Application.DTO;
 using DigitalData.EmailProfilerDispatcher.Abstraction.Contracts;
-using EnvelopeGenerator.Application.DTOs.EnvelopeReceiver;
-using EnvelopeGenerator.Application.DTOs.EnvelopeReceiverReadOnly;
-using EnvelopeGenerator.Domain;
+using EnvelopeGenerator.Application.Common.Dto.EnvelopeReceiver;
+using EnvelopeGenerator.Application.Common.Dto.EnvelopeReceiverReadOnly;
+using EnvelopeGenerator.Domain.Constants;
 
-namespace EnvelopeGenerator.Application.Contracts.Services;
+namespace EnvelopeGenerator.Application.Common.Interfaces.Services;
 
 /// <summary>
 /// 
@@ -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/Common/Interfaces/Services/IEnvelopeReceiverReadOnlyService.cs

@@ -1,8 +1,8 @@
 using DigitalData.Core.Abstraction.Application;
-using EnvelopeGenerator.Application.DTOs.EnvelopeReceiverReadOnly;
+using EnvelopeGenerator.Application.Common.Dto.EnvelopeReceiverReadOnly;
 using EnvelopeGenerator.Domain.Entities;
 
-namespace EnvelopeGenerator.Application.Contracts.Services;
+namespace EnvelopeGenerator.Application.Common.Interfaces.Services;
 
 /// <summary>
 /// 

EnvelopeGenerator.Application/Common/Interfaces/Services/IEnvelopeReceiverService.cs

@@ -1,13 +1,16 @@
 using CommandDotNet;
 using DigitalData.Core.Abstraction.Application;
 using DigitalData.Core.Abstraction.Application.DTO;
-using EnvelopeGenerator.Application.DTOs.EnvelopeReceiver;
-using EnvelopeGenerator.Application.DTOs.Messaging;
+using EnvelopeGenerator.Application.Common.Dto.EnvelopeReceiver;
+using EnvelopeGenerator.Application.Common.Dto.Messaging;
 using EnvelopeGenerator.Application.Envelopes;
-using EnvelopeGenerator.Application.Receivers.Queries.Read;
+using EnvelopeGenerator.Application.Envelopes.Queries;
+using EnvelopeGenerator.Application.Receivers.Queries;
+using EnvelopeGenerator.Domain;
+using EnvelopeGenerator.Domain.Constants;
 using EnvelopeGenerator.Domain.Entities;
 
-namespace EnvelopeGenerator.Application.Contracts.Services;
+namespace EnvelopeGenerator.Application.Common.Interfaces.Services;
 
 /// <summary>
 /// 
@@ -120,7 +123,7 @@ public interface IEnvelopeReceiverService : IBasicCRUDService<EnvelopeReceiverDt
     /// <param name="receiverQuery"></param>
     /// <param name="ignore_statuses"></param>
     /// <returns></returns>
-    Task<DataResult<IEnumerable<EnvelopeReceiverDto>>> ReadByUsernameAsync(string username, int? min_status = null, int? max_status = null, EnvelopeQuery? envelopeQuery = null, ReadReceiverQuery? receiverQuery = null, params int[] ignore_statuses);
+    Task<DataResult<IEnumerable<EnvelopeReceiverDto>>> ReadByUsernameAsync(string username, EnvelopeStatus? min_status = null, EnvelopeStatus? max_status = null, ReadEnvelopeQuery? envelopeQuery = null, ReadReceiverQuery? receiverQuery = null, params EnvelopeStatus[] ignore_statuses);
 
     /// <summary>
     /// 

EnvelopeGenerator.Application/Common/Interfaces/Services/IEnvelopeService.cs

@@ -1,9 +1,10 @@
 using DigitalData.Core.Abstraction.Application;
 using DigitalData.Core.Abstraction.Application.DTO;
-using EnvelopeGenerator.Application.DTOs;
+using EnvelopeGenerator.Application.Common.Dto;
+using EnvelopeGenerator.Domain.Constants;
 using EnvelopeGenerator.Domain.Entities;
 
-namespace EnvelopeGenerator.Application.Contracts.Services;
+namespace EnvelopeGenerator.Application.Common.Interfaces.Services;
 
 /// <summary>
 /// 
@@ -40,5 +41,5 @@ public interface IEnvelopeService : IBasicCRUDService<EnvelopeDto, Envelope, int
     /// <param name="max_status"></param>
     /// <param name="ignore_statuses"></param>
     /// <returns></returns>
-    Task<DataResult<IEnumerable<EnvelopeDto>>> ReadByUserAsync(int userId, int? min_status = null, int? max_status = null, params int[] ignore_statuses);
+    Task<DataResult<IEnumerable<EnvelopeDto>>> ReadByUserAsync(int userId, EnvelopeStatus? min_status = null, EnvelopeStatus? max_status = null, params EnvelopeStatus[] ignore_statuses);
 }

EnvelopeGenerator.Application/Common/Interfaces/Services/IEnvelopeSmsHandler.cs

@@ -1,7 +1,7 @@
-using EnvelopeGenerator.Application.DTOs.EnvelopeReceiver;
-using EnvelopeGenerator.Application.DTOs.Messaging;
+using EnvelopeGenerator.Application.Common.Dto.EnvelopeReceiver;
+using EnvelopeGenerator.Application.Common.Dto.Messaging;
 
-namespace EnvelopeGenerator.Application.Contracts.Services;
+namespace EnvelopeGenerator.Application.Common.Interfaces.Services;
 
 /// <summary>
 /// 

EnvelopeGenerator.Application/Common/Interfaces/Services/IEnvelopeTypeService.cs

@@ -1,8 +1,8 @@
 using DigitalData.Core.Abstraction.Application;
-using EnvelopeGenerator.Application.DTOs;
+using EnvelopeGenerator.Application.Common.Dto;
 using EnvelopeGenerator.Domain.Entities;
 
-namespace EnvelopeGenerator.Application.Contracts.Services;
+namespace EnvelopeGenerator.Application.Common.Interfaces.Services;
 
 /// <summary>
 /// 

EnvelopeGenerator.Application/Common/Interfaces/Services/IReceiverService.cs

@@ -1,15 +1,16 @@
 using DigitalData.Core.Abstraction.Application;
 using DigitalData.Core.Abstraction.Application.DTO;
-using EnvelopeGenerator.Application.DTOs.Receiver;
+using EnvelopeGenerator.Application.Common.Dto.Receiver;
+using EnvelopeGenerator.Application.Receivers.Commands;
 using EnvelopeGenerator.Domain.Entities;
 
-namespace EnvelopeGenerator.Application.Contracts.Services;
+namespace EnvelopeGenerator.Application.Common.Interfaces.Services;
 
 /// <summary>
 /// 
 /// </summary>
 [Obsolete("Use MediatR")]
-public interface IReceiverService : ICRUDService<ReceiverCreateDto, ReceiverReadDto, Receiver, int>
+public interface IReceiverService : ICRUDService<CreateReceiverCommand, ReceiverDto, Receiver, int>
 {
     /// <summary>
     /// 
@@ -17,7 +18,7 @@ public interface IReceiverService : ICRUDService<ReceiverCreateDto, ReceiverRead
     /// <param name="emailAddress"></param>
     /// <param name="signature"></param>
     /// <returns></returns>
-    Task<DataResult<ReceiverReadDto>> ReadByAsync(string? emailAddress = null, string? signature = null);
+    Task<DataResult<ReceiverDto>> ReadByAsync(string? emailAddress = null, string? signature = null);
 
     /// <summary>
     /// 

EnvelopeGenerator.Application/Common/Interfaces/Services/ISmsSender.cs

@@ -1,6 +1,6 @@
-using EnvelopeGenerator.Application.DTOs.Messaging;
+using EnvelopeGenerator.Application.Common.Dto.Messaging;
 
-namespace EnvelopeGenerator.Application.Contracts.Services;
+namespace EnvelopeGenerator.Application.Common.Interfaces.Services;
 
 //TODO: move to DigitalData.Core
 /// <summary>

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

@@ -0,0 +1,56 @@
+using EnvelopeGenerator.Application.Common.Dto.EnvelopeReceiver;
+using EnvelopeGenerator.Application.Common.Extensions;
+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{this.ToJson(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,39 @@
+using EnvelopeGenerator.Application.DocStatus.Commands;
+using EnvelopeGenerator.Domain.Constants;
+using MediatR;
+using System.Text.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 = JsonSerializer.Serialize(notification.Annotations, Format.Json.ForAnnotations)
+        }, cancel);
+    }
+}

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

@@ -0,0 +1,43 @@
+using EnvelopeGenerator.Application.Common.Extensions;
+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)
+            throw new InvalidOperationException($"Receiver information is missing in the notification. DocSignedNotification:\n {notification.ToJson(Format.Json.ForDiagnostics)}");
+
+        await _sender.Send(new CreateHistoryCommand()
+        {
+            EnvelopeId = notification.EnvelopeId,
+            UserReference = notification.Receiver.EmailAddress,
+            Status = EnvelopeStatus.DocumentSigned,
+        }, 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,135 @@
+using DigitalData.Core.Abstraction.Application.Repository;
+using DigitalData.EmailProfilerDispatcher.Abstraction.Entities;
+using EnvelopeGenerator.Application.Common.Configurations;
+using EnvelopeGenerator.Application.Common.Extensions;
+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
+            .Where(x => x.Name == notification.TemplateType.ToString())
+            .SingleOrDefaultAsync(cancel)
+                ?? throw new InvalidOperationException($"Receiver information is missing in the notification." +
+                $"{typeof(TNotification)}:\n {notification.ToJson(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 = 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;
+    }
+}

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,33 @@
+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; }
+
+    /// <summary>
+    /// Checks whether any of the specified query criteria have a value.
+    /// </summary>
+    /// <remarks>
+    /// This property returns <c>true</c> if at least one of the fields 
+    /// <see cref="Id"/>, <see cref="EmailAddress"/>, or <see cref="Signature"/> is not null.
+    /// <para>Usage example: The query can be executed only if at least one criterion is specified.</para>
+    /// </remarks>
+    public bool HasAnyCriteria => Id is not null || EmailAddress is not null || Signature is not null;
+}

EnvelopeGenerator.Application/Common/SQL/DocumentCreateReadSQL.cs

@@ -1,14 +1,14 @@
 using Dapper;
-using EnvelopeGenerator.Application.Contracts.SQLExecutor;
-using EnvelopeGenerator.Application.Exceptions;
+using DigitalData.Core.Exceptions;
 using EnvelopeGenerator.Domain.Entities;
+using EnvelopeGenerator.Application.Common.Interfaces.SQLExecutor;
 
-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

@@ -1,9 +1,9 @@
 using Dapper;
-using EnvelopeGenerator.Application.Contracts.SQLExecutor;
+using EnvelopeGenerator.Application.Common.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

@@ -1,8 +1,8 @@
 using Dapper;
-using EnvelopeGenerator.Application.Contracts.SQLExecutor;
+using EnvelopeGenerator.Application.Common.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/Configurations/DbTriggerParams.cs

@@ -1,8 +0,0 @@
-namespace EnvelopeGenerator.Application.Configurations;
-
-/// <summary>
-/// 
-/// </summary>
-public class DbTriggerParams : Dictionary<string, IEnumerable<string>>
-{
-}

EnvelopeGenerator.Application/Contracts/Repositories/IEnvelopeCertificateRepository.cs

@@ -1,12 +0,0 @@
-using DigitalData.Core.Abstraction.Application.Repository;
-using EnvelopeGenerator.Domain.Entities;
-
-namespace EnvelopeGenerator.Application.Contracts.Repositories;
-
-/// <summary>
-/// 
-/// </summary>
-[Obsolete("Use Read-method returning IReadQuery<TEntity> instead.")]
-public interface IEnvelopeCertificateRepository : ICRUDRepository<EnvelopeCertificate, int>
-{
-}

EnvelopeGenerator.Application/Contracts/Services/IEnvelopeCertificateService.cs

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

EnvelopeGenerator.Application/Contracts/Services/IEnvelopeDocumentService.cs

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

EnvelopeGenerator.Application/DTOs/EnvelopeCertificateDto.cs

@@ -1,50 +0,0 @@
-using Microsoft.AspNetCore.Mvc;
-
-namespace EnvelopeGenerator.Application.DTOs;
-
-/// <summary>
-/// Data Transfer Object representing certificate information for an envelope.
-/// </summary>
-[ApiExplorerSettings(IgnoreApi = true)]
-public class EnvelopeCertificateDto
-{
-    /// <summary>
-    /// Gets the unique identifier of the certificate.
-    /// </summary>
-    public int Id { get; init; }
-
-    /// <summary>
-    /// Gets the envelope ID associated with the certificate.
-    /// </summary>
-    public int EnvelopeId { get; init; }
-
-    /// <summary>
-    /// Gets the UUID of the envelope.
-    /// </summary>
-    public string EnvelopeUuid { get; init; } = string.Empty;
-
-    /// <summary>
-    /// Gets the subject of the envelope.
-    /// </summary>
-    public string EnvelopeSubject { get; init; } = string.Empty;
-
-    /// <summary>
-    /// Gets the ID of the creator of the envelope.
-    /// </summary>
-    public int CreatorId { get; init; }
-
-    /// <summary>
-    /// Gets the name of the creator.
-    /// </summary>
-    public string CreatorName { get; init; } = string.Empty;
-
-    /// <summary>
-    /// Gets the email address of the creator.
-    /// </summary>
-    public string CreatorEmail { get; init; } = string.Empty;
-
-    /// <summary>
-    /// Gets the current status of the envelope.
-    /// </summary>
-    public int EnvelopeStatus { get; init; }
-}

EnvelopeGenerator.Application/DTOs/EnvelopeReceiver/EnvelopeReceiverDto.cs

@@ -1,22 +0,0 @@
-using EnvelopeGenerator.Application.DTOs.Receiver;
-using Microsoft.AspNetCore.Mvc;
-
-namespace EnvelopeGenerator.Application.DTOs.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/DTOs/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.DTOs.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/DependencyInjection.cs

@@ -1,13 +1,12 @@
-using EnvelopeGenerator.Application.Configurations;
+using DigitalData.Core.Client;
+using EnvelopeGenerator.Application.Common.Configurations;
+using EnvelopeGenerator.Application.Common.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.Contracts.Services;
 using System.Reflection;
-using EnvelopeGenerator.Application.EnvelopeReceivers.Commands.Create;
 
 namespace EnvelopeGenerator.Application;
 
@@ -33,12 +32,10 @@ public static class DependencyInjection
         services.TryAddScoped<IDocumentStatusService, DocumentStatusService>();
         services.TryAddScoped<IEmailTemplateService, EmailTemplateService>();
         services.TryAddScoped<IEnvelopeService, EnvelopeService>();
-        services.TryAddScoped<IEnvelopeCertificateService, EnvelopeCertificateService>();
         services.TryAddScoped<IEnvelopeDocumentService, EnvelopeDocumentService>();
         services.TryAddScoped<IEnvelopeReceiverService, EnvelopeReceiverService>();
         services.TryAddScoped<IEnvelopeTypeService, EnvelopeTypeService>();
         services.TryAddScoped<IReceiverService, ReceiverService>();
-        services.TryAddScoped<IUserReceiverService, UserReceiverService>();
         services.TryAddScoped<IEnvelopeReceiverReadOnlyService, EnvelopeReceiverReadOnlyService>();
 
         //Auto mapping profiles
@@ -60,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/Read/ReadDocumentMappingProfile.cs

@@ -1,18 +0,0 @@
-using AutoMapper;
-using EnvelopeGenerator.Domain.Entities;
-
-namespace EnvelopeGenerator.Application.Documents.Queries.Read;
-
-/// <summary>
-/// 
-/// </summary>
-public class ReadDocumentMappingProfile : Profile
-{
-    /// <summary>
-    /// 
-    /// </summary>
-    public ReadDocumentMappingProfile()
-    {
-        CreateMap<EnvelopeDocument, ReadDocumentResponse>();
-    }
-}

EnvelopeGenerator.Application/Documents/Queries/Read/ReadDocumentQuery.cs

@@ -1,12 +0,0 @@
-using MediatR;
-
-namespace EnvelopeGenerator.Application.Documents.Queries.Read;
-
-/// <summary>
-/// Represents a query to read a document based on its unique identifier or associated envelope identifier.
-/// </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<ReadDocumentResponse?>
-{
-}

EnvelopeGenerator.Application/Documents/Queries/Read/ReadDocumentQueryHandler.cs

@@ -1,48 +0,0 @@
-using DigitalData.Core.Abstraction.Application.Repository;
-using EnvelopeGenerator.Domain.Entities;
-using MediatR;
-
-namespace EnvelopeGenerator.Application.Documents.Queries.Read;
-
-/// <summary>
-/// Handles queries for reading <see cref="EnvelopeDocument"/> data based on either the document ID or the envelope ID.
-/// </summary>
-public class ReadDocumentQueryHandler : IRequestHandler<ReadDocumentQuery, ReadDocumentResponse?>
-{
-    /// <summary>
-    /// Repository for accessing <see cref="EnvelopeDocument"/> entities.
-    /// </summary>
-    private readonly IRepository<EnvelopeDocument> _repo;
-
-    /// <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)
-    {
-        _repo = envelopeDocumentRepository;
-    }
-
-    /// <summary>
-    /// Handles the <see cref="ReadDocumentQuery"/> and returns a <see cref="ReadDocumentResponse"/> 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>
-    /// <returns>
-    /// A <see cref="ReadDocumentResponse"/> 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<ReadDocumentResponse?> Handle(ReadDocumentQuery query, CancellationToken cancellationToken)
-    {
-        if (query.Id is not null)
-            return await _repo.ReadOrDefaultAsync<ReadDocumentResponse>(d => d.Id == query.Id);
-        else if (query.EnvelopeId is not null)
-            return await _repo.ReadOrDefaultAsync<ReadDocumentResponse>(d => d.EnvelopeId == query.EnvelopeId);
-
-        throw new InvalidOperationException(
-            $"Invalid {nameof(ReadDocumentQuery)}: either {nameof(query.Id)} or {nameof(query.EnvelopeId)} must be provided.");
-    }
-}

EnvelopeGenerator.Application/Documents/Queries/Read/ReadDocumentResponse.cs

@@ -1,12 +0,0 @@
-namespace EnvelopeGenerator.Application.Documents.Queries.Read;
-
-/// <summary>
-/// Represents the response for reading a document.
-/// </summary>
-public class ReadDocumentResponse : ReadDocumentResponseBase
-{
-    /// <summary>
-    /// The binary data of the document, if available.
-    /// </summary>
-    public byte[]? ByteData { get; init; }
-}

EnvelopeGenerator.Application/Documents/Queries/Read/ReadDocumentResponseBase.cs

@@ -1,22 +0,0 @@
-namespace EnvelopeGenerator.Application.Documents.Queries.Read;
-
-/// <summary>
-/// Represents the response for reading a document.
-/// </summary>
-public class ReadDocumentResponseBase
-{
-    /// <summary>
-    /// The unique identifier of the document.
-    /// </summary>
-    public int Guid { get; init; }
-
-    /// <summary>
-    /// The identifier of the associated envelope.
-    /// </summary>
-    public int EnvelopeId { get; init; }
-
-    /// <summary>
-    /// The date and time when the document was added.
-    /// </summary>
-    public DateTime AddedWhen { get; init; }
-}