refactor(ModifyDocStatusCommandBase): add EnvelopeId and ReceiverId properties

EnvelopeGenerator.Application/Common/Configurations/AuthenticatorParams.cs

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

EnvelopeGenerator.Application/Common/Configurations/DbTriggerParams.cs

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

EnvelopeGenerator.Application/Common/Configurations/DispatcherParams.cs

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

EnvelopeGenerator.Application/Common/Configurations/GtxMessagingParams.cs

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

EnvelopeGenerator.Application/Common/Configurations/MailParams.cs

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

EnvelopeGenerator.Application/Common/Configurations/TotpSmsParams.cs

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

EnvelopeGenerator.Application/Common/Dto/ConfigDto.cs

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

EnvelopeGenerator.Application/Common/Dto/DocumentDto.cs

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

EnvelopeGenerator.Application/Common/Dto/DocumentStatusDto.cs

@@ -1,7 +1,7 @@
 using EnvelopeGenerator.Domain.Constants;
 using Microsoft.AspNetCore.Mvc;
 
-namespace EnvelopeGenerator.Application.Dto;
+namespace EnvelopeGenerator.Application.Common.Dto;
 
 /// <summary>
 /// Data Transfer Object representing the status of a document for a specific receiver.

EnvelopeGenerator.Application/Common/Dto/EmailTemplateDto.cs

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

EnvelopeGenerator.Application/Common/Dto/EnvelopeDto.cs

@@ -4,7 +4,7 @@ using EnvelopeGenerator.Domain.Constants;
 using EnvelopeGenerator.Domain.Entities;
 using Microsoft.AspNetCore.Mvc;
 
-namespace EnvelopeGenerator.Application.Dto;
+namespace EnvelopeGenerator.Application.Common.Dto;
 
 /// <summary>
 /// 
@@ -117,5 +117,5 @@ public record EnvelopeDto
     /// <summary>
     /// 
     /// </summary>
-    public IEnumerable<EnvelopeDocumentDto>? Documents { get; set; }
+    public IEnumerable<DocumentDto>? Documents { get; set; }
 }

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

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

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

@@ -1,13 +1,12 @@
-using EnvelopeGenerator.Application.Dto.Receiver;
-using Microsoft.AspNetCore.Mvc;
+using Microsoft.AspNetCore.Mvc;
 
-namespace EnvelopeGenerator.Application.Dto.EnvelopeReceiver;
+namespace EnvelopeGenerator.Application.Common.Dto.EnvelopeReceiver;
 
 /// <summary>
 /// 
 /// </summary>
 [ApiExplorerSettings(IgnoreApi = true)]
-public record EnvelopeReceiverSecretDto : EnvelopeReceiverDto<ReceiverSecretDto>
+public record EnvelopeReceiverSecretDto : EnvelopeReceiverDto
 {
     /// <summary>
     /// 

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

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

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

@@ -1,7 +1,8 @@
-using EnvelopeGenerator.Application.Dto.Receiver;
+using EnvelopeGenerator.Application.Common.Dto;
+using EnvelopeGenerator.Application.Common.Dto.Receiver;
 using Microsoft.AspNetCore.Mvc;
 
-namespace EnvelopeGenerator.Application.Dto.EnvelopeReceiverReadOnly;
+namespace EnvelopeGenerator.Application.Common.Dto.EnvelopeReceiverReadOnly;
 
 /// <summary>
 /// Represents a read-only Data Transfer Object (DTO) for an envelope receiver.

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

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

EnvelopeGenerator.Application/Common/Dto/EnvelopeTypeDto.cs

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

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

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

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

@@ -1,13 +1,13 @@
 using DigitalData.UserManager.Application.DTOs.User;
-using EnvelopeGenerator.Application.Dto.Receiver;
+using EnvelopeGenerator.Application.Common.Dto.Receiver;
 using EnvelopeGenerator.Domain.Constants;
 
-namespace EnvelopeGenerator.Application.Dto.EnvelopeHistory;
+namespace EnvelopeGenerator.Application.Common.Dto.History;
 
 /// <summary>
 /// Data Transfer Object representing the history of an envelope, including status, sender, receiver, and related metadata.
 /// </summary>
-public record EnvelopeHistoryDto
+public record HistoryDto
 {
     /// <summary>
     /// Unique identifier for the envelope history entry.

EnvelopeGenerator.Application/Common/Dto/MappingProfile.cs

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

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

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

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

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

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

@@ -1,8 +1,8 @@
-using EnvelopeGenerator.Application.Dto.EnvelopeReceiver;
+using EnvelopeGenerator.Application.Common.Dto.EnvelopeReceiver;
 using Microsoft.AspNetCore.Mvc;
 using System.Text.Json.Serialization;
 
-namespace EnvelopeGenerator.Application.Dto.Receiver;
+namespace EnvelopeGenerator.Application.Common.Dto.Receiver;
 
 /// <summary>
 /// 
@@ -25,6 +25,12 @@ public class ReceiverDto
     /// </summary>
     public required string Signature { get; set; }
 
+    /// <summary>
+    /// 
+    /// </summary>
+    [JsonIgnore]
+    public string? TotpSecretkey { get; set; }
+
     /// <summary>
     /// 
     /// </summary>
@@ -34,7 +40,7 @@ public class ReceiverDto
     /// 
     /// </summary>
     [JsonIgnore]
-    public IEnumerable<EnvelopeReceiverBasicDto>? EnvelopeReceivers { get; set; }
+    public IEnumerable<EnvelopeReceiverDto>? EnvelopeReceivers { get; set; }
 
     /// <summary>
     /// 

EnvelopeGenerator.Application/Common/Dto/SignatureDto.cs

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

EnvelopeGenerator.Application/Common/EnvelopeFlag.cs

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

EnvelopeGenerator.Application/Common/Extensions/CacheExtensions.cs

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

EnvelopeGenerator.Application/Common/Extensions/DecodingExtensions.cs

@@ -1,7 +1,7 @@
 using EnvelopeGenerator.Domain.Constants;
 using System.Text;
 
-namespace EnvelopeGenerator.Application.Extensions;
+namespace EnvelopeGenerator.Application.Common.Extensions;
 
 /// <summary>
 /// 
@@ -58,8 +58,8 @@ public static class DecodingExtensions
         }
 
         // Ensure no invalid padding scenarios exist
-        if (input.EndsWith("==") && (input.Length % 4 == 0) ||
-            input.EndsWith("=") && (input.Length % 4 == 3))
+        if (input.EndsWith("==") && input.Length % 4 == 0 ||
+            input.EndsWith("=") && input.Length % 4 == 3)
         {
             return true;
         }
@@ -157,7 +157,7 @@ public static class DecodingExtensions
             return null;
         }
         byte[] bytes = Convert.FromBase64String(envelopeReceiverReadOnlyId);
-        string decodedString = System.Text.Encoding.UTF8.GetString(bytes);
+        string decodedString = Encoding.UTF8.GetString(bytes);
         string[] parts = decodedString.Split(new string[] { "::" }, StringSplitOptions.None);
 
         if (parts.Length > 2)

EnvelopeGenerator.Application/Common/Extensions/EncodingExtensions.cs

@@ -1,6 +1,6 @@
 using System.Text;
 
-namespace EnvelopeGenerator.Application.Extensions;
+namespace EnvelopeGenerator.Application.Common.Extensions;
 
 /// <summary>
 /// Provides extension methods for decoding and extracting information from an envelope receiver ID.

EnvelopeGenerator.Application/Common/Extensions/LoggerExtensions.cs

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

EnvelopeGenerator.Application/Common/Extensions/MappingExtensions.cs

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

EnvelopeGenerator.Application/Common/Extensions/MemoryCacheExtensions.cs

@@ -1,11 +1,24 @@
-using Microsoft.Extensions.Caching.Memory;
+using EnvelopeGenerator.Application.Common.Extensions;
+using Microsoft.Extensions.Caching.Memory;
 
-namespace EnvelopeGenerator.Application.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

@@ -1,8 +1,10 @@
 using DigitalData.Core.Exceptions;
-using EnvelopeGenerator.Application.Model;
+using EnvelopeGenerator.Application.Common.Extensions;
+using EnvelopeGenerator.Application.Common.Query;
+using EnvelopeGenerator.Domain.Entities;
 using EnvelopeGenerator.Domain.Interfaces;
 
-namespace EnvelopeGenerator.Application.Extensions;
+namespace EnvelopeGenerator.Application.Common.Extensions;
 
 /// <summary>
 /// 
@@ -33,6 +35,28 @@ public static class QueryExtensions
         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>
@@ -59,6 +83,30 @@ public static class QueryExtensions
         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>

EnvelopeGenerator.Application/Common/Extensions/StringExtension.cs

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

EnvelopeGenerator.Application/Common/Extensions/TaskExtensions.cs

@@ -1,6 +1,6 @@
 using DigitalData.Core.Exceptions;
 
-namespace EnvelopeGenerator.Application.Extensions;
+namespace EnvelopeGenerator.Application.Common.Extensions;
 
 /// <summary>
 /// Extension methods for tasks

EnvelopeGenerator.Application/Common/Extensions/XSSExtensions.cs

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

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

@@ -1,10 +1,10 @@
-using EnvelopeGenerator.Application.Dto.EnvelopeReceiver;
+using EnvelopeGenerator.Application.Common.Dto.EnvelopeReceiver;
 using EnvelopeGenerator.Domain.Constants;
 using MediatR;
 using Newtonsoft.Json;
 using System.Dynamic;
 
-namespace EnvelopeGenerator.Application.Notifications.DocSigned;
+namespace EnvelopeGenerator.Application.Common.Notifications.DocSigned;
 
 /// <summary>
 /// 

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

@@ -1,9 +1,10 @@
-using EnvelopeGenerator.Application.DocStatus.Commands;
+using EnvelopeGenerator.Application.Common.Notifications.DocSigned;
+using EnvelopeGenerator.Application.DocStatus.Commands;
 using EnvelopeGenerator.Domain.Constants;
 using MediatR;
 using Newtonsoft.Json;
 
-namespace EnvelopeGenerator.Application.Notifications.DocSigned.Handlers;
+namespace EnvelopeGenerator.Application.Common.Notifications.DocSigned.Handlers;
 
 /// <summary>
 /// 

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

@@ -1,9 +1,10 @@
-using EnvelopeGenerator.Application.Histories.Commands;
+using EnvelopeGenerator.Application.Common.Notifications.DocSigned;
+using EnvelopeGenerator.Application.Histories.Commands;
 using EnvelopeGenerator.Domain.Constants;
 using MediatR;
 using Newtonsoft.Json;
 
-namespace EnvelopeGenerator.Application.Notifications.DocSigned.Handlers;
+namespace EnvelopeGenerator.Application.Common.Notifications.DocSigned.Handlers;
 
 /// <summary>
 /// 

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

@@ -1,10 +1,10 @@
 using DigitalData.Core.Abstraction.Application.Repository;
 using DigitalData.EmailProfilerDispatcher.Abstraction.Entities;
-using EnvelopeGenerator.Application.Configurations;
+using EnvelopeGenerator.Application.Common.Configurations;
 using EnvelopeGenerator.Domain.Entities;
 using Microsoft.Extensions.Options;
 
-namespace EnvelopeGenerator.Application.Notifications.DocSigned.Handlers;
+namespace EnvelopeGenerator.Application.Common.Notifications.DocSigned.Handlers;
 
 /// <summary>
 /// 

EnvelopeGenerator.Application/Common/Notifications/SendMailHandler.cs

@@ -1,6 +1,6 @@
 using DigitalData.Core.Abstraction.Application.Repository;
 using DigitalData.EmailProfilerDispatcher.Abstraction.Entities;
-using EnvelopeGenerator.Application.Configurations;
+using EnvelopeGenerator.Application.Common.Configurations;
 using EnvelopeGenerator.Domain.Constants;
 using EnvelopeGenerator.Domain.Entities;
 using MediatR;
@@ -8,7 +8,7 @@ using Microsoft.EntityFrameworkCore;
 using Microsoft.Extensions.Options;
 using Newtonsoft.Json;
 
-namespace EnvelopeGenerator.Application.Notifications;
+namespace EnvelopeGenerator.Application.Common.Notifications;
 
 /// <summary>
 /// 

EnvelopeGenerator.Application/Common/Query/EnvelopeQueryBase.cs

@@ -1,4 +1,4 @@
-namespace EnvelopeGenerator.Application.Model;
+namespace EnvelopeGenerator.Application.Common.Query;
 
 /// <summary>
 /// Repräsentiert eine Abfrage für Umschläge.

EnvelopeGenerator.Application/Common/Query/EnvelopeReceiverQueryBase.cs

@@ -1,7 +1,7 @@
 using DigitalData.Core.Exceptions;
-using EnvelopeGenerator.Application.Extensions;
+using EnvelopeGenerator.Application.Common.Extensions;
 
-namespace EnvelopeGenerator.Application.Model;
+namespace EnvelopeGenerator.Application.Common.Query;
 
 /// <summary>
 /// 

EnvelopeGenerator.Application/Common/Query/MappingProfile.cs

@@ -1,7 +1,7 @@
 using AutoMapper;
 using EnvelopeGenerator.Domain.Entities;
 
-namespace EnvelopeGenerator.Application.Model;
+namespace EnvelopeGenerator.Application.Common.Query;
 
 /// <summary>
 /// 

EnvelopeGenerator.Application/Common/Query/ReceiverQueryBase.cs

@@ -1,4 +1,4 @@
-namespace EnvelopeGenerator.Application.Model;
+namespace EnvelopeGenerator.Application.Common.Query;
 
 /// <summary>
 /// Stellt eine Abfrage dar, um die Details eines Empfängers zu lesen.
@@ -9,12 +9,12 @@ public record ReceiverQueryBase
     /// <summary>
     /// ID des Empfängers
     /// </summary>
-    public virtual int? Id { get; init; }
+    public virtual int? Id { get; set; }
 
     /// <summary>
     /// E-Mail Adresse des Empfängers
     /// </summary>
-    public virtual string? EmailAddress { get; init; }
+    public virtual string? EmailAddress { get; set; }
 
     /// <summary>
     /// Eindeutige Signatur des Empfängers

EnvelopeGenerator.Application/Common/SQL/DocumentCreateReadSQL.cs

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

EnvelopeGenerator.Application/Common/SQL/EnvelopeCreateReadSQL.cs

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

EnvelopeGenerator.Application/Common/SQL/EnvelopeReceiverAddReadSQL.cs

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

EnvelopeGenerator.Application/Common/SQL/ParamsExtensions.cs

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

EnvelopeGenerator.Application/DependencyInjection.cs

@@ -1,5 +1,5 @@
 using DigitalData.Core.Client;
-using EnvelopeGenerator.Application.Configurations;
+using EnvelopeGenerator.Application.Common.Configurations;
 using EnvelopeGenerator.Application.Interfaces.Services;
 using EnvelopeGenerator.Application.Services;
 using Microsoft.Extensions.Configuration;

EnvelopeGenerator.Application/DocStatus/Commands/ModifyDocStatusCommandBase.cs

@@ -1,4 +1,4 @@
-using EnvelopeGenerator.Application.Model;
+using EnvelopeGenerator.Application.Common.Query;
 using EnvelopeGenerator.Domain.Constants;
 
 namespace EnvelopeGenerator.Application.DocStatus.Commands;
@@ -8,6 +8,21 @@ namespace EnvelopeGenerator.Application.DocStatus.Commands;
 /// </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>

EnvelopeGenerator.Application/DocStatus/Commands/SaveDocStatusCommand.cs

@@ -2,9 +2,9 @@
 using EnvelopeGenerator.Domain.Entities;
 using MediatR;
 using Microsoft.EntityFrameworkCore;
-using EnvelopeGenerator.Application.Extensions;
-using EnvelopeGenerator.Application.Dto;
 using AutoMapper;
+using EnvelopeGenerator.Application.Common.Dto;
+using EnvelopeGenerator.Application.Common.Extensions;
 
 namespace EnvelopeGenerator.Application.DocStatus.Commands;
 
@@ -23,15 +23,23 @@ public class SaveDocStatusCommandHandler : IRequestHandler<SaveDocStatusCommand,
 
     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>
-    public SaveDocStatusCommandHandler(IMapper mapper, IRepository<DocumentStatus> repo)
+    /// <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>
@@ -45,6 +53,12 @@ public class SaveDocStatusCommandHandler : IRequestHandler<SaveDocStatusCommand,
         // 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>();

EnvelopeGenerator.Application/DocStatus/MappingProfile.cs

@@ -14,7 +14,12 @@ public class MappingProfile : Profile
     /// </summary>
     public MappingProfile()
     {
-        CreateMap<CreateDocStatusCommand, DocumentStatus>();
-        CreateMap<UpdateDocStatusCommand, DocumentStatus>();
+        CreateMap<CreateDocStatusCommand, DocumentStatus>()
+        .ForMember(dest => dest.Envelope, opt => opt.Ignore())
+        .ForMember(dest => dest.Receiver, opt => opt.Ignore());
+
+        CreateMap<UpdateDocStatusCommand, DocumentStatus>()
+        .ForMember(dest => dest.Envelope, opt => opt.Ignore())
+        .ForMember(dest => dest.Receiver, opt => opt.Ignore());
     }
-}
+}

EnvelopeGenerator.Application/Documents/Queries/ReadDocumentQuery.cs

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

EnvelopeGenerator.Application/Dto/EnvelopeReceiver/EnvelopeReceiverDto.cs

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

EnvelopeGenerator.Application/Dto/Receiver/ReceiverSecretDto.cs

@@ -1,15 +0,0 @@
-using Microsoft.AspNetCore.Mvc;
-
-namespace EnvelopeGenerator.Application.Dto.Receiver;
-
-/// <summary>
-/// 
-/// </summary>
-[ApiExplorerSettings(IgnoreApi = true)]
-public class ReceiverSecretDto : ReceiverDto
-{
-    /// <summary>
-    /// 
-    /// </summary>
-    public string? TotpSecretkey { get; set; }
-}

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

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

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

@@ -1,11 +1,11 @@
 using AutoMapper;
 using DigitalData.Core.Abstraction.Application.Repository;
-using EnvelopeGenerator.Application.Dto;
 using DigitalData.Core.Exceptions;
 using EnvelopeGenerator.Domain.Entities;
 using MediatR;
 using Microsoft.EntityFrameworkCore;
 using EnvelopeGenerator.Domain.Constants;
+using EnvelopeGenerator.Application.Common.Dto;
 
 namespace EnvelopeGenerator.Application.EmailTemplates.Commands.Update;
 

EnvelopeGenerator.Application/EnvelopeFlag.cs

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

EnvelopeGenerator.Application/EnvelopeReceivers/Commands/CreateEnvelopeReceiverCommandHandler.cs

@@ -1,8 +1,8 @@
 using AutoMapper;
 using EnvelopeGenerator.Application.Interfaces.SQLExecutor;
-using EnvelopeGenerator.Application.Dto.Receiver;
 using EnvelopeGenerator.Domain.Entities;
 using MediatR;
+using EnvelopeGenerator.Application.Common.Dto.Receiver;
 
 namespace EnvelopeGenerator.Application.EnvelopeReceivers.Commands;
 

EnvelopeGenerator.Application/EnvelopeReceivers/Commands/CreateEnvelopeReceiverResponse.cs

@@ -1,5 +1,5 @@
-using EnvelopeGenerator.Application.Dto;
-using EnvelopeGenerator.Application.Dto.Receiver;
+using EnvelopeGenerator.Application.Common.Dto;
+using EnvelopeGenerator.Application.Common.Dto.Receiver;
 
 namespace EnvelopeGenerator.Application.EnvelopeReceivers.Commands;
 

EnvelopeGenerator.Application/EnvelopeReceivers/MappingProfile.cs

@@ -1,5 +1,5 @@
 using AutoMapper;
-using EnvelopeGenerator.Application.Dto.Receiver;
+using EnvelopeGenerator.Application.Common.Dto.Receiver;
 using EnvelopeGenerator.Application.Envelopes.Commands;
 using EnvelopeGenerator.Domain.Entities;
 

EnvelopeGenerator.Application/EnvelopeReceivers/Queries/ReadEnvelopeReceiverQuery.cs

@@ -1,15 +1,14 @@
 using AutoMapper;
 using DigitalData.Core.Abstraction.Application.Repository;
 using DigitalData.Core.Exceptions;
-using EnvelopeGenerator.Application.Dto.EnvelopeReceiver;
 using EnvelopeGenerator.Application.Envelopes.Queries;
-using EnvelopeGenerator.Application.Extensions;
-using EnvelopeGenerator.Application.Model;
 using EnvelopeGenerator.Application.Receivers.Queries;
 using MediatR;
 using EnvelopeGenerator.Domain.Entities;
 using Microsoft.EntityFrameworkCore;
-using EnvelopeGenerator.Application.SQL;
+using EnvelopeGenerator.Application.Common.Dto.EnvelopeReceiver;
+using EnvelopeGenerator.Application.Common.Query;
+using EnvelopeGenerator.Application.Common.Extensions;
 
 namespace EnvelopeGenerator.Application.EnvelopeReceivers.Queries;
 
@@ -114,7 +113,7 @@ public class ReadEnvelopeReceiverQueryHandler : IRequestHandler<ReadEnvelopeRece
     /// <exception cref="BadRequestException"></exception>
     public async Task<IEnumerable<EnvelopeReceiverDto>> Handle(ReadEnvelopeReceiverQuery request, CancellationToken cancel)
     {
-        var q = _repo.Read().Where(request, notnull: false);
+        var q = _repo.ReadOnly().Where(request, notnull: false);
 
         if (request.Envelope.Status is not null)
         {

EnvelopeGenerator.Application/EnvelopeReceivers/Queries/ReceiverAlreadySignedQuery.cs

@@ -1,10 +1,10 @@
 using DigitalData.Core.Abstraction.Application.Repository;
-using EnvelopeGenerator.Application.Model;
 using EnvelopeGenerator.Domain.Entities;
-using EnvelopeGenerator.Application.Extensions;
+using EnvelopeGenerator.Application.Common.Extensions;
 using MediatR;
 using Microsoft.EntityFrameworkCore;
 using EnvelopeGenerator.Domain.Constants;
+using EnvelopeGenerator.Application.Common.Query;
 
 namespace EnvelopeGenerator.Application.EnvelopeReceivers.Queries;
 
@@ -49,13 +49,13 @@ public static class ReceiverAlreadySignedQueryExtensions
 /// </summary>
 public class ReceiverAlreadySignedQueryHandler : IRequestHandler<ReceiverAlreadySignedQuery, bool>
 {
-    private readonly IRepository<EnvelopeReceiver> _repo;
+    private readonly IRepository<History> _repo;
 
     /// <summary>
     /// 
     /// </summary>
     /// <param name="repo"></param>
-    public ReceiverAlreadySignedQueryHandler(IRepository<EnvelopeReceiver> repo)
+    public ReceiverAlreadySignedQueryHandler(IRepository<History> repo)
     {
         _repo = repo;
     }
@@ -68,10 +68,6 @@ public class ReceiverAlreadySignedQueryHandler : IRequestHandler<ReceiverAlready
     /// <returns></returns>
     public async Task<bool> Handle(ReceiverAlreadySignedQuery request, CancellationToken cancel = default)
     {
-        return await _repo.Read()
-            .Where(er => er.Envelope!.Uuid == request.Envelope.Uuid)
-            .Where(er => er.Receiver!.Signature == request.Receiver.Signature)
-            .Where(er => er.Envelope!.Histories.Any(hist => hist.Status == EnvelopeStatus.DocumentSigned))
-            .AnyAsync(cancel);
+        return await _repo.ReadOnly().Where(request).Where(h => h.Status == EnvelopeStatus.DocumentSigned).AnyAsync(cancel);
     }
 }

EnvelopeGenerator.Application/Envelopes/Commands/CreateEnvelopeCommand.cs

@@ -1,5 +1,5 @@
 using DigitalData.Core.Abstraction.Application.Repository;
-using EnvelopeGenerator.Application.Dto;
+using EnvelopeGenerator.Application.Common.Dto;
 using EnvelopeGenerator.Application.Interfaces.SQLExecutor;
 using MediatR;
 using System.ComponentModel.DataAnnotations;

EnvelopeGenerator.Application/Envelopes/Commands/CreateEnvelopeCommandHandler.cs

@@ -1,10 +1,10 @@
 using AutoMapper;
 using EnvelopeGenerator.Application.Interfaces.SQLExecutor;
-using EnvelopeGenerator.Application.Dto;
 using MediatR;
 using Microsoft.Extensions.DependencyInjection;
 using DigitalData.Core.Abstraction.Application.Repository;
 using EnvelopeGenerator.Domain.Entities;
+using EnvelopeGenerator.Application.Common.Dto;
 
 namespace EnvelopeGenerator.Application.Envelopes.Commands;
 

EnvelopeGenerator.Application/Envelopes/Queries/ReadEnvelopeQuery.cs

@@ -1,6 +1,6 @@
 using MediatR;
-using EnvelopeGenerator.Application.Model;
 using EnvelopeGenerator.Domain.Constants;
+using EnvelopeGenerator.Application.Common.Query;
 
 namespace EnvelopeGenerator.Application.Envelopes.Queries;
 

EnvelopeGenerator.Application/Histories/Commands/CreateHistoryCommand.cs

@@ -1,9 +1,9 @@
 using AutoMapper;
 using DigitalData.Core.Abstraction.Application.Repository;
 using DigitalData.Core.Exceptions;
-using EnvelopeGenerator.Application.Dto.EnvelopeHistory;
-using EnvelopeGenerator.Application.Extensions;
-using EnvelopeGenerator.Application.Model;
+using EnvelopeGenerator.Application.Common.Dto.History;
+using EnvelopeGenerator.Application.Common.Extensions;
+using EnvelopeGenerator.Application.Common.Query;
 using EnvelopeGenerator.Domain.Constants;
 using EnvelopeGenerator.Domain.Entities;
 using MediatR;
@@ -14,7 +14,7 @@ namespace EnvelopeGenerator.Application.Histories.Commands;
 /// <summary>
 /// 
 /// </summary>
-public record CreateHistoryCommand : EnvelopeReceiverQueryBase, IRequest<EnvelopeHistoryDto?>
+public record CreateHistoryCommand : EnvelopeReceiverQueryBase, IRequest<HistoryDto?>
 {
     /// <summary>
     /// 
@@ -50,9 +50,9 @@ public record CreateHistoryCommand : EnvelopeReceiverQueryBase, IRequest<Envelop
 /// <summary>
 /// 
 /// </summary>
-public class CreateHistoryCommandHandler : IRequestHandler<CreateHistoryCommand, EnvelopeHistoryDto?>
+public class CreateHistoryCommandHandler : IRequestHandler<CreateHistoryCommand, HistoryDto?>
 {
-    private readonly IRepository<EnvelopeHistory> _repo;
+    private readonly IRepository<History> _repo;
 
     private readonly IRepository<EnvelopeReceiver> _erRepo;
 
@@ -64,7 +64,7 @@ public class CreateHistoryCommandHandler : IRequestHandler<CreateHistoryCommand,
     /// <param name="repo"></param>
     /// <param name="erRepo"></param>
     /// <param name="mapper"></param>
-    public CreateHistoryCommandHandler(IRepository<EnvelopeHistory> repo, IRepository<EnvelopeReceiver> erRepo, IMapper mapper)
+    public CreateHistoryCommandHandler(IRepository<History> repo, IRepository<EnvelopeReceiver> erRepo, IMapper mapper)
     {
         _repo = repo;
         _erRepo = erRepo;
@@ -77,7 +77,7 @@ public class CreateHistoryCommandHandler : IRequestHandler<CreateHistoryCommand,
     /// <param name="request"></param>
     /// <param name="cancel"></param>
     /// <returns></returns>
-    public async Task<EnvelopeHistoryDto?> Handle(CreateHistoryCommand request, CancellationToken cancel)
+    public async Task<HistoryDto?> Handle(CreateHistoryCommand request, CancellationToken cancel)
     {
         if(request.UserReference is null)
         {
@@ -103,6 +103,6 @@ public class CreateHistoryCommandHandler : IRequestHandler<CreateHistoryCommand,
         // create entitiy
         var hist = await _repo.CreateAsync(request, cancel);
         
-        return _mapper.Map<EnvelopeHistoryDto>(hist);
+        return _mapper.Map<HistoryDto>(hist);
     }
 }

EnvelopeGenerator.Application/Histories/MappingProfile.cs

@@ -14,7 +14,7 @@ public class MappingProfile: Profile
     /// </summary>
     public MappingProfile()
     {
-        CreateMap<CreateHistoryCommand, EnvelopeHistory>()
+        CreateMap<CreateHistoryCommand, History>()
             .ForMember(dest => dest.Envelope, opt => opt.Ignore())
             .ForMember(dest => dest.Sender, opt => opt.Ignore())
             .ForMember(dest => dest.Receiver, opt => opt.Ignore());

EnvelopeGenerator.Application/Histories/Queries/ReadHistoryQuery.cs

@@ -1,4 +1,4 @@
-using EnvelopeGenerator.Application.Dto.EnvelopeHistory;
+using EnvelopeGenerator.Application.Common.Dto.History;
 using EnvelopeGenerator.Domain.Constants;
 using MediatR;
 using System.ComponentModel.DataAnnotations;
@@ -9,7 +9,7 @@ namespace EnvelopeGenerator.Application.Histories.Queries;
 /// <summary>
 /// Repräsentiert eine Abfrage für die Verlaufshistorie eines Umschlags.
 /// </summary>
-public record ReadHistoryQuery : IRequest<IEnumerable<EnvelopeHistoryDto>>
+public record ReadHistoryQuery : IRequest<IEnumerable<HistoryDto>>
 {
     /// <summary>
     /// Die eindeutige Kennung des Umschlags.

EnvelopeGenerator.Application/Histories/Queries/ReadHistoryQueryHandler.cs

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

EnvelopeGenerator.Application/Interfaces/Repositories/IDocumentReceiverElementRepository.cs

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

EnvelopeGenerator.Application/Interfaces/Repositories/IEnvelopeDocumentRepository.cs

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

EnvelopeGenerator.Application/Interfaces/Repositories/IEnvelopeHistoryRepository.cs

@@ -8,7 +8,7 @@ namespace EnvelopeGenerator.Application.Interfaces.Repositories;
 /// 
 /// </summary>
 [Obsolete("Use IRepository")]
-public interface IEnvelopeHistoryRepository : ICRUDRepository<EnvelopeHistory, long>
+public interface IEnvelopeHistoryRepository : ICRUDRepository<History, long>
 {
     /// <summary>
     /// 
@@ -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, EnvelopeStatus? status = null, bool withSender = false, bool withReceiver = false);
+    Task<IEnumerable<History>> ReadAsync(int? envelopeId = null, string? userReference = null, EnvelopeStatus? status = null, bool withSender = false, bool withReceiver = false);
 }

EnvelopeGenerator.Application/Interfaces/SQLExecutor/IDocumentExecutor.cs

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

EnvelopeGenerator.Application/Interfaces/Services/IConfigService.cs

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

EnvelopeGenerator.Application/Interfaces/Services/IDocumentReceiverElementService.cs

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

EnvelopeGenerator.Application/Interfaces/Services/IDocumentStatusService.cs

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

EnvelopeGenerator.Application/Interfaces/Services/IEmailTemplateService.cs

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

EnvelopeGenerator.Application/Interfaces/Services/IEnvelopeDocumentService.cs

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

EnvelopeGenerator.Application/Interfaces/Services/IEnvelopeHistoryService.cs

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

EnvelopeGenerator.Application/Interfaces/Services/IEnvelopeMailService.cs

@@ -1,7 +1,7 @@
 using DigitalData.Core.Abstraction.Application.DTO;
 using DigitalData.EmailProfilerDispatcher.Abstraction.Contracts;
-using EnvelopeGenerator.Application.Dto.EnvelopeReceiver;
-using EnvelopeGenerator.Application.Dto.EnvelopeReceiverReadOnly;
+using EnvelopeGenerator.Application.Common.Dto.EnvelopeReceiver;
+using EnvelopeGenerator.Application.Common.Dto.EnvelopeReceiverReadOnly;
 using EnvelopeGenerator.Domain.Constants;
 
 namespace EnvelopeGenerator.Application.Interfaces.Services;

EnvelopeGenerator.Application/Interfaces/Services/IEnvelopeReceiverReadOnlyService.cs

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

EnvelopeGenerator.Application/Interfaces/Services/IEnvelopeReceiverService.cs

@@ -1,8 +1,8 @@
 using CommandDotNet;
 using DigitalData.Core.Abstraction.Application;
 using DigitalData.Core.Abstraction.Application.DTO;
-using EnvelopeGenerator.Application.Dto.EnvelopeReceiver;
-using EnvelopeGenerator.Application.Dto.Messaging;
+using EnvelopeGenerator.Application.Common.Dto.EnvelopeReceiver;
+using EnvelopeGenerator.Application.Common.Dto.Messaging;
 using EnvelopeGenerator.Application.Envelopes;
 using EnvelopeGenerator.Application.Envelopes.Queries;
 using EnvelopeGenerator.Application.Receivers.Queries;

EnvelopeGenerator.Application/Interfaces/Services/IEnvelopeService.cs

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

EnvelopeGenerator.Application/Interfaces/Services/IEnvelopeSmsHandler.cs

@@ -1,5 +1,5 @@
-using EnvelopeGenerator.Application.Dto.EnvelopeReceiver;
-using EnvelopeGenerator.Application.Dto.Messaging;
+using EnvelopeGenerator.Application.Common.Dto.EnvelopeReceiver;
+using EnvelopeGenerator.Application.Common.Dto.Messaging;
 
 namespace EnvelopeGenerator.Application.Interfaces.Services;
 

EnvelopeGenerator.Application/Interfaces/Services/IEnvelopeTypeService.cs

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

EnvelopeGenerator.Application/Interfaces/Services/IReceiverService.cs

@@ -1,6 +1,6 @@
 using DigitalData.Core.Abstraction.Application;
 using DigitalData.Core.Abstraction.Application.DTO;
-using EnvelopeGenerator.Application.Dto.Receiver;
+using EnvelopeGenerator.Application.Common.Dto.Receiver;
 using EnvelopeGenerator.Application.Receivers.Commands;
 using EnvelopeGenerator.Domain.Entities;
 

EnvelopeGenerator.Application/Interfaces/Services/ISmsSender.cs

@@ -1,4 +1,4 @@
-using EnvelopeGenerator.Application.Dto.Messaging;
+using EnvelopeGenerator.Application.Common.Dto.Messaging;
 
 namespace EnvelopeGenerator.Application.Interfaces.Services;
 

EnvelopeGenerator.Application/Receivers/Commands/CreateReceiverCommand.cs

@@ -1,6 +1,6 @@
 using AutoMapper;
 using DigitalData.Core.Abstraction.Application.Repository;
-using EnvelopeGenerator.Application.Dto.Receiver;
+using EnvelopeGenerator.Application.Common.Dto.Receiver;
 using EnvelopeGenerator.Domain.Entities;
 using MediatR;
 using Microsoft.AspNetCore.Mvc;

EnvelopeGenerator.Application/Receivers/Queries/ReadReceiverQuery.cs

@@ -1,4 +1,4 @@
-using EnvelopeGenerator.Application.Model;
+using EnvelopeGenerator.Application.Common.Query;
 
 namespace EnvelopeGenerator.Application.Receivers.Queries;
 

EnvelopeGenerator.Application/Services/Authenticator.cs

@@ -1,4 +1,4 @@
-using EnvelopeGenerator.Application.Configurations;
+using EnvelopeGenerator.Application.Common.Configurations;
 using EnvelopeGenerator.Application.Interfaces.Services;
 using Microsoft.Extensions.Options;
 using OtpNet;

EnvelopeGenerator.Application/Services/ConfigService.cs

@@ -2,11 +2,11 @@
 using DigitalData.Core.Application;
 using DigitalData.Core.Abstraction.Application.DTO;
 using EnvelopeGenerator.Application.Interfaces.Services;
-using EnvelopeGenerator.Application.Dto;
 using EnvelopeGenerator.Domain.Entities;
 using EnvelopeGenerator.Application.Interfaces.Repositories;
 using Microsoft.Extensions.Caching.Memory;
 using Microsoft.Extensions.Logging;
+using EnvelopeGenerator.Application.Common.Dto;
 
 namespace EnvelopeGenerator.Application.Services;
 

EnvelopeGenerator.Application/Services/DocumentReceiverElementService.cs

@@ -1,9 +1,9 @@
 using AutoMapper;
 using DigitalData.Core.Application;
 using EnvelopeGenerator.Application.Interfaces.Services;
-using EnvelopeGenerator.Application.Dto;
 using EnvelopeGenerator.Domain.Entities;
 using EnvelopeGenerator.Application.Interfaces.Repositories;
+using EnvelopeGenerator.Application.Common.Dto;
 
 namespace EnvelopeGenerator.Application.Services;
 
@@ -11,7 +11,7 @@ namespace EnvelopeGenerator.Application.Services;
 /// 
 /// </summary>
 [Obsolete("Use MediatR")]
-public class DocumentReceiverElementService : BasicCRUDService<IDocumentReceiverElementRepository, DocumentReceiverElementDto, DocumentReceiverElement, int>, IDocumentReceiverElementService
+public class DocumentReceiverElementService : BasicCRUDService<IDocumentReceiverElementRepository, SignatureDto, Signature, int>, IDocumentReceiverElementService
 {
     /// <summary>
     /// 

EnvelopeGenerator.Application/Services/DocumentStatusService.cs

@@ -1,9 +1,9 @@
 using AutoMapper;
 using DigitalData.Core.Application;
 using EnvelopeGenerator.Application.Interfaces.Services;
-using EnvelopeGenerator.Application.Dto;
 using EnvelopeGenerator.Domain.Entities;
 using EnvelopeGenerator.Application.Interfaces.Repositories;
+using EnvelopeGenerator.Application.Common.Dto;
 
 namespace EnvelopeGenerator.Application.Services;
 

EnvelopeGenerator.Application/Services/EmailTemplateService.cs

@@ -1,12 +1,12 @@
 using AutoMapper;
 using DigitalData.Core.Application;
-using EnvelopeGenerator.Application.Dto;
 using EnvelopeGenerator.Domain.Entities;
 using EnvelopeGenerator.Application.Interfaces.Repositories;
 using DigitalData.Core.Abstraction.Application.DTO;
 using Microsoft.Extensions.Logging;
 using EnvelopeGenerator.Application.Interfaces.Services;
 using EnvelopeGenerator.Domain.Constants;
+using EnvelopeGenerator.Application.Common.Dto;
 
 namespace EnvelopeGenerator.Application.Services;
 

EnvelopeGenerator.Application/Services/EnvelopeDocumentService.cs

@@ -1,9 +1,9 @@
 using AutoMapper;
 using DigitalData.Core.Application;
 using EnvelopeGenerator.Application.Interfaces.Services;
-using EnvelopeGenerator.Application.Dto;
 using EnvelopeGenerator.Domain.Entities;
 using EnvelopeGenerator.Application.Interfaces.Repositories;
+using EnvelopeGenerator.Application.Common.Dto;
 
 namespace EnvelopeGenerator.Application.Services;
 
@@ -11,7 +11,7 @@ namespace EnvelopeGenerator.Application.Services;
 /// 
 /// </summary>
 [Obsolete("Use MediatR")]
-public class EnvelopeDocumentService : BasicCRUDService<IEnvelopeDocumentRepository, EnvelopeDocumentDto, EnvelopeDocument, int>, IEnvelopeDocumentService
+public class EnvelopeDocumentService : BasicCRUDService<IEnvelopeDocumentRepository, DocumentDto, Document, int>, IEnvelopeDocumentService
 {
     /// <summary>
     /// 

EnvelopeGenerator.Application/Services/EnvelopeHistoryService.cs

@@ -2,11 +2,11 @@
 using DigitalData.Core.Application;
 using EnvelopeGenerator.Domain.Entities;
 using EnvelopeGenerator.Application.Interfaces.Repositories;
-using EnvelopeGenerator.Application.Dto.EnvelopeHistory;
-using EnvelopeGenerator.Application.Dto.Receiver;
 using EnvelopeGenerator.Application.Interfaces.Services;
 using DigitalData.Core.Abstraction.Application.DTO;
 using EnvelopeGenerator.Domain.Constants;
+using EnvelopeGenerator.Application.Common.Dto.History;
+using EnvelopeGenerator.Application.Common.Dto.Receiver;
 
 namespace EnvelopeGenerator.Application.Services;
 
@@ -14,7 +14,7 @@ namespace EnvelopeGenerator.Application.Services;
 /// 
 /// </summary>
 [Obsolete("Use MediatR")]
-public class EnvelopeHistoryService : CRUDService<IEnvelopeHistoryRepository, EnvelopeHistoryCreateDto, EnvelopeHistoryDto, EnvelopeHistory, long>, IEnvelopeHistoryService
+public class EnvelopeHistoryService : CRUDService<IEnvelopeHistoryRepository, HistoryCreateDto, HistoryDto, History, long>, IEnvelopeHistoryService
 {
     /// <summary>
     /// 
@@ -94,9 +94,9 @@ public class EnvelopeHistoryService : CRUDService<IEnvelopeHistoryRepository, En
     /// <param name="withSender"></param>
     /// <param name="withReceiver"></param>
     /// <returns></returns>
-    public async Task<IEnumerable<EnvelopeHistoryDto>> ReadAsync(int? envelopeId = null, string? userReference = null, ReferenceType? referenceType = null, EnvelopeStatus? status = null, bool withSender = false, bool withReceiver = false)
+    public async Task<IEnumerable<HistoryDto>> ReadAsync(int? envelopeId = null, string? userReference = null, ReferenceType? referenceType = null, EnvelopeStatus? status = null, bool withSender = false, bool withReceiver = false)
     {
-        var histDTOs = _mapper.Map<IEnumerable<EnvelopeHistoryDto>>(
+        var histDTOs = _mapper.Map<IEnumerable<HistoryDto>>(
                     await _repository.ReadAsync(
                                 envelopeId: envelopeId,
                                 userReference: userReference,
@@ -112,7 +112,7 @@ public class EnvelopeHistoryService : CRUDService<IEnvelopeHistoryRepository, En
     /// <param name="envelopeId"></param>
     /// <param name="userReference"></param>
     /// <returns></returns>
-    public async Task<IEnumerable<EnvelopeHistoryDto>> ReadRejectedAsync(int envelopeId, string? userReference = null) =>
+    public async Task<IEnumerable<HistoryDto>> ReadRejectedAsync(int envelopeId, string? userReference = null) =>
         await ReadAsync(envelopeId: envelopeId, userReference: userReference, status: EnvelopeStatus.DocumentRejected, withReceiver:true);
 
 	//TODO: use IQueryable in repository to incerease the performance

EnvelopeGenerator.Application/Services/EnvelopeMailService.cs

@@ -2,16 +2,16 @@
 using DigitalData.EmailProfilerDispatcher.Abstraction.Contracts;
 using DigitalData.EmailProfilerDispatcher.Abstraction.DTOs.EmailOut;
 using DigitalData.EmailProfilerDispatcher.Abstraction.Services;
-using EnvelopeGenerator.Application.Dto.EnvelopeReceiver;
 using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Options;
-using EnvelopeGenerator.Application.Extensions;
-using EnvelopeGenerator.Application.Dto.EnvelopeReceiverReadOnly;
-using EnvelopeGenerator.Application.Configurations;
 using Newtonsoft.Json;
 using EnvelopeGenerator.Application.Interfaces.Services;
 using DigitalData.Core.Abstraction.Application.DTO;
 using EnvelopeGenerator.Domain.Constants;
+using EnvelopeGenerator.Application.Common.Configurations;
+using EnvelopeGenerator.Application.Common.Dto.EnvelopeReceiver;
+using EnvelopeGenerator.Application.Common.Dto.EnvelopeReceiverReadOnly;
+using EnvelopeGenerator.Application.Common.Extensions;
 
 namespace EnvelopeGenerator.Application.Services;
 

EnvelopeGenerator.Application/Services/EnvelopeReceiverReadOnlyService.cs

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

EnvelopeGenerator.Application/Services/EnvelopeReceiverService.cs

@@ -1,18 +1,19 @@
 using AutoMapper;
 using DigitalData.Core.Application;
 using DigitalData.Core.Abstraction.Application.DTO;
-using EnvelopeGenerator.Application.Dto.EnvelopeReceiver;
 using EnvelopeGenerator.Application.Resources;
 using EnvelopeGenerator.Domain.Entities;
 using EnvelopeGenerator.Application.Interfaces.Repositories;
 using Microsoft.Extensions.Localization;
 using Microsoft.Extensions.Logging;
-using EnvelopeGenerator.Application.Extensions;
-using EnvelopeGenerator.Application.Dto.Messaging;
+using EnvelopeGenerator.Application.Common.Extensions;
 using EnvelopeGenerator.Application.Interfaces.Services;
 using EnvelopeGenerator.Application.Envelopes.Queries;
 using EnvelopeGenerator.Application.Receivers.Queries;
 using EnvelopeGenerator.Domain.Constants;
+using EnvelopeGenerator.Application.Common.Dto.EnvelopeReceiver;
+using EnvelopeGenerator.Application.Common.Dto.Messaging;
+using EnvelopeGenerator.Application.Common;
 
 namespace EnvelopeGenerator.Application.Services;