feat(ReceiverAlreadySignedQuery): create with handler

- Add related attributes

EnvelopeGenerator.Application/DependencyInjection.cs

@@ -5,7 +5,7 @@ using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.DependencyInjection.Extensions;
 using DigitalData.Core.Client;
 using QRCoder;
-using EnvelopeGenerator.Application.Contracts.Services;
+using EnvelopeGenerator.Application.Interfaces.Services;
 using System.Reflection;
 using EnvelopeGenerator.Application.EnvelopeReceivers.Commands;
 

EnvelopeGenerator.Application/Documents/Queries/ReadDocumentQuery.cs

@@ -2,6 +2,8 @@
 using EnvelopeGenerator.Application.Dto;
 using MediatR;
 using EnvelopeGenerator.Domain.Entities;
+using Microsoft.EntityFrameworkCore;
+using AutoMapper;
 
 namespace EnvelopeGenerator.Application.Documents.Queries;
 
@@ -24,13 +26,16 @@ public class ReadDocumentQueryHandler : IRequestHandler<ReadDocumentQuery, Envel
     /// </summary>
     private readonly IRepository<EnvelopeDocument> _repo;
 
+    private readonly IMapper _mapper;
+
     /// <summary>
     /// Initializes a new instance of the <see cref="ReadDocumentQueryHandler"/> class.
     /// </summary>
     /// <param name="envelopeDocumentRepository">The repository used to access <see cref="EnvelopeDocument"/> entities.</param>
-    public ReadDocumentQueryHandler(IRepository<EnvelopeDocument> envelopeDocumentRepository)
+    public ReadDocumentQueryHandler(IRepository<EnvelopeDocument> envelopeDocumentRepository, IMapper mapper)
     {
         _repo = envelopeDocumentRepository;
+        _mapper = mapper;
     }
 
     /// <summary>
@@ -48,9 +53,15 @@ public class ReadDocumentQueryHandler : IRequestHandler<ReadDocumentQuery, Envel
     public async Task<EnvelopeDocumentDto?> Handle(ReadDocumentQuery query, CancellationToken cancellationToken)
     {
         if (query.Id is not null)
-            return await _repo.ReadOrDefaultAsync<EnvelopeDocumentDto>(d => d.Id == query.Id);
+        {
+            var doc = await _repo.ReadOnly().Where(d => d.Id == query.Id).FirstOrDefaultAsync();
+            return _mapper.Map<EnvelopeDocumentDto>(doc);
+        }            
         else if (query.EnvelopeId is not null)
-            return await _repo.ReadOrDefaultAsync<EnvelopeDocumentDto>(d => d.EnvelopeId == query.EnvelopeId);
+        {
+            var doc = await _repo.ReadOnly().Where(d => d.EnvelopeId == query.EnvelopeId).FirstOrDefaultAsync();
+            return _mapper.Map<EnvelopeDocumentDto>(doc);
+        }
 
         throw new InvalidOperationException(
             $"Invalid {nameof(ReadDocumentQuery)}: either {nameof(query.Id)} or {nameof(query.EnvelopeId)} must be provided.");

EnvelopeGenerator.Application/Dto/EnvelopeHistory/EnvelopeHistoryDto.cs

@@ -25,7 +25,7 @@ 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; }
 

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

@@ -2,6 +2,8 @@
 using EnvelopeGenerator.Application.Dto;
 using EnvelopeGenerator.Domain.Entities;
 using MediatR;
+using Microsoft.EntityFrameworkCore;
+using System.Linq;
 
 namespace EnvelopeGenerator.Application.EmailTemplates.Commands.Reset;
 
@@ -31,10 +33,10 @@ public class ResetEmailTemplateCommandHandler : IRequestHandler<ResetEmailTempla
     public async Task Handle(ResetEmailTemplateCommand request, CancellationToken cancel)
     {
         var temps = request.Id is not null
-            ? await _repository.ReadAllAsync<EmailTemplateDto>(t => t.Id == request.Id, cancel)
+            ? await _repository.ReadOnly().Where(t => t.Id == request.Id).ToListAsync(cancel)
             : request.Type is not null
-                ? await _repository.ReadAllAsync<EmailTemplateDto>(t => t.Name == request.Type.ToString(), cancel)
-                : await _repository.ReadAllAsync<EmailTemplateDto>(cancellation: cancel);
+                ? await _repository.ReadOnly().Where(t => t.Name == request.Type.ToString()).ToListAsync(cancel)
+                : await _repository.ReadOnly().ToListAsync(cancel);
 
         foreach (var temp in temps)
         {
@@ -82,7 +84,7 @@ public class ResetEmailTemplateCommandHandler : IRequestHandler<ResetEmailTempla
         new(){
         Id = 6,
         Name = "DocumentRejected_ADM",
-        Body = "Guten Tag [NAME_SENDER],<p><B><I>[NAME_RECEIVER]</I></B> hat den Umschlag <B><I>'[DOCUMENT_TITLE]'</I></B> mit folgendem Grund abgelehnt: <p>\r\n[REASON] \r\n<p>Der Umschlag wurde auf den Status Rejected gesetzt. <p> \r\nMit freundlichen Grüßen<br />\r\n<br />\r\n[NAME_PORTAL]",
+        Body = "Guten Tag [NAME_SENDER],<p><B><I>[NAME_RECEIVER]</I></B> hat den Umschlag <B><I>'[DOCUMENT_TITLE]'</I></B> mit folgendem Grund abgelehnt: <p>\r\n[REASON] \r\n<p>Der Umschlag wurde auf den Include Rejected gesetzt. <p> \r\nMit freundlichen Grüßen<br />\r\n<br />\r\n[NAME_PORTAL]",
         Subject = "'[DOCUMENT_TITLE]' - Unterzeichnungsvorgang zurückgezogen"
         },
         new(){

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

@@ -1,9 +1,11 @@
-using DigitalData.Core.Abstraction.Application.Repository;
+using AutoMapper;
+using DigitalData.Core.Abstraction.Application.Repository;
 using EnvelopeGenerator.Application.Dto;
 using EnvelopeGenerator.Application.Exceptions;
 using EnvelopeGenerator.Domain;
 using EnvelopeGenerator.Domain.Entities;
 using MediatR;
+using Microsoft.EntityFrameworkCore;
 
 namespace EnvelopeGenerator.Application.EmailTemplates.Commands.Update;
 
@@ -13,14 +15,17 @@ namespace EnvelopeGenerator.Application.EmailTemplates.Commands.Update;
 public class UpdateEmailTemplateCommandHandler : IRequestHandler<UpdateEmailTemplateCommand>
 {
     private readonly IRepository<EmailTemplate> _repository;
+    
+    private readonly IMapper _mapper;
 
     /// <summary>
     /// 
     /// </summary>
     /// <param name="repository"></param>
-    public UpdateEmailTemplateCommandHandler(IRepository<EmailTemplate> repository)
+    public UpdateEmailTemplateCommandHandler(IRepository<EmailTemplate> repository, IMapper mapper)
     {
         _repository = repository;
+        _mapper = mapper;
     }
 
     /// <summary>
@@ -34,32 +39,34 @@ public class UpdateEmailTemplateCommandHandler : IRequestHandler<UpdateEmailTemp
     [Obsolete("Use Read-method returning IReadQuery<TEntity> instead.")]
     public async Task Handle(UpdateEmailTemplateCommand request, CancellationToken cancel)
     {
-        EmailTemplateDto? temp;
+        EmailTemplateDto? tempDto;
 
         if (request.EmailTemplateQuery?.Id is int id)
         {
-            temp = await _repository.ReadOrDefaultAsync<EmailTemplateDto>(t => t.Id == id, single: false, cancel);
+            var temp = await _repository.ReadOnly().Where(t => t.Id == id).FirstOrDefaultAsync(cancel);
+            tempDto = _mapper.Map<EmailTemplateDto>(temp);
         }
         else if (request!.EmailTemplateQuery!.Type is Constants.EmailTemplateType type)
         {
-            temp = await _repository.ReadOrDefaultAsync<EmailTemplateDto>(t => t.Name == type.ToString(), single: false, cancel);
+            var temp = await _repository.ReadOnly().Where(t => t.Name == type.ToString()).FirstOrDefaultAsync(cancel);
+            tempDto = _mapper.Map<EmailTemplateDto>(temp);
         }
         else
         {
             throw new InvalidOperationException("Both id and type is null. Id: " + request.EmailTemplateQuery.Id +". Type: " + request.EmailTemplateQuery.Type.ToString());
         }
 
-        if (temp == null)
+        if (tempDto == null)
         {
             throw new NotFoundException();
         }
 
         if (request.Body is not null)
-            temp.Body = request.Body;
+            tempDto.Body = request.Body;
 
         if (request.Subject is not null)
-            temp.Subject = request.Subject;
+            tempDto.Subject = request.Subject;
 
-        await _repository.UpdateAsync(temp, t => t.Id == temp.Id, cancel);
+        await _repository.UpdateAsync(tempDto, t => t.Id == tempDto.Id, cancel);
     }
 }

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

@@ -1,5 +1,5 @@
 using AutoMapper;
-using EnvelopeGenerator.Application.Contracts.Repositories;
+using EnvelopeGenerator.Application.Interfaces.Repositories;
 using EnvelopeGenerator.Domain;
 using MediatR;
 

EnvelopeGenerator.Application/EnvelopeReceivers/Commands/CreateEnvelopeReceiverCommandHandler.cs

@@ -1,5 +1,5 @@
 using AutoMapper;
-using EnvelopeGenerator.Application.Contracts.SQLExecutor;
+using EnvelopeGenerator.Application.Interfaces.SQLExecutor;
 using EnvelopeGenerator.Application.Dto.Receiver;
 using EnvelopeGenerator.Domain.Entities;
 using MediatR;

EnvelopeGenerator.Application/EnvelopeReceivers/Queries/ReadEnvelopeReceiverQuery.cs

@@ -1,8 +1,8 @@
 using EnvelopeGenerator.Application.Dto.EnvelopeReceiver;
 using EnvelopeGenerator.Application.Envelopes.Queries;
 using EnvelopeGenerator.Application.Exceptions;
+using EnvelopeGenerator.Application.Extensions;
 using EnvelopeGenerator.Application.Receivers.Queries;
-using EnvelopeGenerator.Domain;
 using EnvelopeGenerator.Extensions;
 using MediatR;
 
@@ -10,7 +10,7 @@ namespace EnvelopeGenerator.Application.EnvelopeReceivers.Queries;
 
 /// <summary>
 /// Repräsentiert eine Abfrage zum Lesen eines Envelope-Empfängers.
-/// Invalid (0): Ungültiger Status.
+/// Invalid (0): Ungültiger Include.
 /// EnvelopeCreated (1001): Der Umschlag wurde erstellt.
 /// EnvelopeSaved (1002): Der Umschlag wurde gespeichert.
 /// EnvelopeQueued (1003): Der Umschlag wurde zur Verarbeitung eingeplant.
@@ -40,10 +40,10 @@ namespace EnvelopeGenerator.Application.EnvelopeReceivers.Queries;
 /// Diese Abfrage kombiniert Informationen über einen Umschlag (<see cref="ReadEnvelopeQuery"/>) 
 /// und einen Empfänger (<see cref="ReadReceiverQuery"/>), um eine vollständige Antwort 
 /// (<see cref="EnvelopeReceiverDto"/>) zu generieren. 
-/// Die Antwort enthält Details wie den Status, die Zuordnung zwischen Umschlag und Empfänger 
+/// Die Antwort enthält Details wie den Include, die Zuordnung zwischen Umschlag und Empfänger 
 /// sowie zusätzliche Metadaten.
 /// </remarks>
-public record ReadEnvelopeReceiverQuery : IRequest<EnvelopeReceiverDto>
+public record ReadEnvelopeReceiverQuery : IRequest<IEnumerable<EnvelopeReceiverDto>>
 {
     /// <summary>
     /// 
@@ -83,55 +83,22 @@ public record ReadEnvelopeReceiverQuery : IRequest<EnvelopeReceiverDto>
     /// Der Empfänger, der mit dem Umschlag verknüpft ist.
     /// </summary>
     public ReadReceiverQuery? Receiver { get; set; }
-
-    /// <summary>
-    /// Abfrage des Status des Umschlags
-    /// </summary>
-    public EnvelopeStatusQuery? Status { get; init; }
 };
 
 /// <summary>
-/// Repräsentiert den Status eines Umschlags und dessen Beziehung zum Empfänger. (vgl. auch <see cref="Constants.EnvelopeStatus"/>
-/// Invalid (0): Ungültiger Status.
-/// EnvelopeCreated (1001): Der Umschlag wurde erstellt.
-/// EnvelopeSaved (1002): Der Umschlag wurde gespeichert.
-/// EnvelopeQueued (1003): Der Umschlag wurde zur Verarbeitung eingeplant.
-/// EnvelopeSent (1004): Der Umschlag wurde versendet. (Nicht verwendet)
-/// EnvelopePartlySigned (1005): Der Umschlag wurde teilweise unterschrieben.
-/// EnvelopeCompletelySigned (1006): Der Umschlag wurde vollständig unterschrieben.
-/// EnvelopeReportCreated (1007): Ein Abschlussbericht wurde für den Umschlag erstellt.
-/// EnvelopeArchived (1008): Der Umschlag wurde archiviert.
-/// EnvelopeDeleted (1009): Der Umschlag wurde gelöscht.
-/// AccessCodeRequested (2001): Der Zugriffscode wurde angefordert.
-/// AccessCodeCorrect (2002): Der Zugriffscode war korrekt.
-/// AccessCodeIncorrect (2003): Der Zugriffscode war falsch.
-/// DocumentOpened (2004): Das Dokument wurde geöffnet.
-/// DocumentSigned (2005): Ein Dokument wurde unterschrieben.
-/// SignatureConfirmed (2006): Die Signatur wurde bestätigt.
-/// DocumentRejected (2007): Ein Dokument wurde abgelehnt.
-/// EnvelopeShared (2008): Der Umschlag wurde geteilt.
-/// EnvelopeViewed (2009): Der Umschlag wurde angesehen.
-/// DocumentForwarded (4001): Das Dokument wurde weitergeleitet.
-/// MessageInvitationSent (3001): Einladung wurde gesendet (vom Trigger verwendet).
-/// MessageAccessCodeSent (3002): Zugriffscode wurde gesendet.
-/// MessageConfirmationSent (3003): Bestätigungsnachricht wurde gesendet.
-/// MessageDeletionSent (3004): Löschbenachrichtigung wurde gesendet.
-/// MessageCompletionSent (3005): Abschlussbenachrichtigung wurde gesendet.
+/// 
 /// </summary>
-public record EnvelopeStatusQuery
+public static class Extensions
 {
     /// <summary>
-    /// Der minimale Statuswert, der berücksichtigt werden soll.
+    /// 
     /// </summary>
-    public int? Min { get; init; }
-
-    /// <summary>
-    /// Der maximale Statuswert, der berücksichtigt werden soll.
-    /// </summary>
-    public int? Max { get; init; }
-
-    /// <summary>
-    /// Eine Liste von Statuswerten, die ignoriert werden sollen.
-    /// </summary>
-    public int[]? Ignore { get; init; }
-}
+    /// <param name="mediator"></param>
+    /// <param name="key"></param>
+    /// <returns></returns>
+    public static Task<EnvelopeReceiverDto?> ReadEnvelopeReceiverAsync(this IMediator mediator, string key, CancellationToken cancel = default)
+    {
+        var q = new ReadEnvelopeReceiverQuery() { Key = key };
+        return mediator.Send(q, cancel).Then(envRcvs => envRcvs.FirstOrDefault());
+    }
+}

EnvelopeGenerator.Application/EnvelopeReceivers/Queries/ReadEnvelopeReceiverQueryHandler.cs

@@ -10,7 +10,7 @@ namespace EnvelopeGenerator.Application.EnvelopeReceivers.Queries;
 /// <summary>
 /// 
 /// </summary>
-public class ReadEnvelopeReceiverQueryHandler : IRequestHandler<ReadEnvelopeReceiverQuery, EnvelopeReceiverDto>
+public class ReadEnvelopeReceiverQueryHandler : IRequestHandler<ReadEnvelopeReceiverQuery, IEnumerable<EnvelopeReceiverDto>>
 {
     private readonly IRepository<EnvelopeReceiver> _repo;
 
@@ -20,6 +20,7 @@ public class ReadEnvelopeReceiverQueryHandler : IRequestHandler<ReadEnvelopeRece
     /// 
     /// </summary>
     /// <param name="envelopeReceiver"></param>
+    /// <param name="mapper"></param>
     public ReadEnvelopeReceiverQueryHandler(IRepository<EnvelopeReceiver> envelopeReceiver, IMapper mapper)
     {
         _repo = envelopeReceiver;
@@ -33,7 +34,7 @@ public class ReadEnvelopeReceiverQueryHandler : IRequestHandler<ReadEnvelopeRece
     /// <param name="cancel"></param>
     /// <returns></returns>
     /// <exception cref="NotImplementedException"></exception>
-    public async Task<EnvelopeReceiverDto> Handle(ReadEnvelopeReceiverQuery request, CancellationToken cancel)
+    public async Task<IEnumerable<EnvelopeReceiverDto>> Handle(ReadEnvelopeReceiverQuery request, CancellationToken cancel)
     {
         var q = _repo.Read();
 
@@ -44,7 +45,19 @@ public class ReadEnvelopeReceiverQueryHandler : IRequestHandler<ReadEnvelopeRece
                 q = q.Where(er => er.EnvelopeId == env.Id);
 
             if (env.Status is not null)
-                q = q.Where(er => er.Envelope.Status == env.Status);
+            {
+                if(env.Status.Min is not null)
+                    q = q.Where(er => er.Envelope.Status >= env.Status.Min);
+
+                if(env.Status.Max is not null)
+                    q = q.Where(er => er.Envelope.Status <= env.Status.Max);
+
+                if(env.Status .Include?.Length > 0)
+                    q = q.Where(er => env.Status.Include.Contains(er.Envelope.Status));
+
+                if(env.Status.Ignore is not null)
+                    q = q.Where(er => !env.Status.Ignore.Contains(er.Envelope.Status));
+            }
 
             if (env.Uuid is not null)
                 q = q.Where(er => er.Envelope.Uuid == env.Uuid);
@@ -63,13 +76,12 @@ public class ReadEnvelopeReceiverQueryHandler : IRequestHandler<ReadEnvelopeRece
                 q = q.Where(er => er.Receiver.Signature == rcv.Signature);
         }
 
-        var er = await q.Include(er => er.Envelope).ThenInclude(e => e.Documents).ThenInclude(d => d.Elements)
+        var envRcvs = await q.Include(er => er.Envelope).ThenInclude(e => e.Documents).ThenInclude(d => d.Elements)
                         .Include(er => er.Envelope).ThenInclude(e => e.History)
                         .Include(er => er.Envelope).ThenInclude(e => e.User)
                         .Include(er => er.Receiver)
-                        .FirstOrDefaultAsync(cancel);
+                        .ToListAsync(cancel);
 
-        var dto = _mapper.Map<EnvelopeReceiverDto>(er);
-        return dto;
+        return _mapper.Map<IEnumerable<EnvelopeReceiverDto>>(envRcvs);
     } 
 }

EnvelopeGenerator.Application/EnvelopeReceivers/Queries/ReceiverAlreadySignedQuery.cs

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

EnvelopeGenerator.Application/Envelopes/Commands/CreateEnvelopeCommandHandler.cs

@@ -1,5 +1,5 @@
 using AutoMapper;
-using EnvelopeGenerator.Application.Contracts.SQLExecutor;
+using EnvelopeGenerator.Application.Interfaces.SQLExecutor;
 using EnvelopeGenerator.Application.Dto;
 using MediatR;
 

EnvelopeGenerator.Application/Envelopes/Queries/ReadEnvelopeQuery.cs

@@ -1,4 +1,5 @@
 using MediatR;
+using EnvelopeGenerator.Domain;
 
 namespace EnvelopeGenerator.Application.Envelopes.Queries;
 
@@ -12,13 +13,64 @@ public class ReadEnvelopeQuery : IRequest
     /// </summary>
     public int? Id { get; init; }
 
-    /// <summary>
-    /// Der Status des Umschlags.
-    /// </summary>
-    public int? Status { get; init; }
-
     /// <summary>
     /// Die universell eindeutige Kennung des Umschlags.
     /// </summary>
     public string? Uuid { get; init; }
+
+    /// <summary>
+    /// Abfrage des Include des Umschlags
+    /// </summary>
+    public EnvelopeStatus? Status { get; init; }
 }
+
+/// <summary>
+/// Repräsentiert den Include eines Umschlags und dessen Beziehung zum Empfänger. (vgl. auch <see cref="Constants.EnvelopeStatus"/>
+/// Invalid (0): Ungültiger Include.
+/// EnvelopeCreated (1001): Der Umschlag wurde erstellt.
+/// EnvelopeSaved (1002): Der Umschlag wurde gespeichert.
+/// EnvelopeQueued (1003): Der Umschlag wurde zur Verarbeitung eingeplant.
+/// EnvelopeSent (1004): Der Umschlag wurde versendet. (Nicht verwendet)
+/// EnvelopePartlySigned (1005): Der Umschlag wurde teilweise unterschrieben.
+/// EnvelopeCompletelySigned (1006): Der Umschlag wurde vollständig unterschrieben.
+/// EnvelopeReportCreated (1007): Ein Abschlussbericht wurde für den Umschlag erstellt.
+/// EnvelopeArchived (1008): Der Umschlag wurde archiviert.
+/// EnvelopeDeleted (1009): Der Umschlag wurde gelöscht.
+/// AccessCodeRequested (2001): Der Zugriffscode wurde angefordert.
+/// AccessCodeCorrect (2002): Der Zugriffscode war korrekt.
+/// AccessCodeIncorrect (2003): Der Zugriffscode war falsch.
+/// DocumentOpened (2004): Das Dokument wurde geöffnet.
+/// DocumentSigned (2005): Ein Dokument wurde unterschrieben.
+/// SignatureConfirmed (2006): Die Signatur wurde bestätigt.
+/// DocumentRejected (2007): Ein Dokument wurde abgelehnt.
+/// EnvelopeShared (2008): Der Umschlag wurde geteilt.
+/// EnvelopeViewed (2009): Der Umschlag wurde angesehen.
+/// DocumentForwarded (4001): Das Dokument wurde weitergeleitet.
+/// MessageInvitationSent (3001): Einladung wurde gesendet (vom Trigger verwendet).
+/// MessageAccessCodeSent (3002): Zugriffscode wurde gesendet.
+/// MessageConfirmationSent (3003): Bestätigungsnachricht wurde gesendet.
+/// MessageDeletionSent (3004): Löschbenachrichtigung wurde gesendet.
+/// MessageCompletionSent (3005): Abschlussbenachrichtigung wurde gesendet.
+/// </summary>
+public record EnvelopeStatus
+{
+    /// <summary>
+    /// Der minimale Statuswert, der berücksichtigt werden.
+    /// </summary>
+    public Constants.EnvelopeStatus? Min { get; init; }
+
+    /// <summary>
+    /// Der maximale Statuswert, der berücksichtigt werden.
+    /// </summary>
+    public Constants.EnvelopeStatus? Max { get; init; }
+
+    /// <summary>
+    /// Eine Liste von Statuswerten, die einbezogen werden.
+    /// </summary>
+    public Constants.EnvelopeStatus[]? Include { get; init; }
+
+    /// <summary>
+    /// Eine Liste von Statuswerten, die ignoriert werden werden.
+    /// </summary>
+    public Constants.EnvelopeStatus[]? Ignore { get; init; }
+}

EnvelopeGenerator.Application/Extensions/TaskExtensions.cs

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

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

@@ -9,8 +9,8 @@ namespace EnvelopeGenerator.Application.Histories.Queries.Read;
 /// Repräsentiert eine Abfrage für die Verlaufshistorie eines Umschlags.
 /// </summary>
 /// <param name="EnvelopeId">Die eindeutige Kennung des Umschlags.</param>
-/// <param name="Status">Der Status des Umschlags, der abgefragt werden soll. Kann optional angegeben werden, um die Ergebnisse zu filtern.</param>
-/// <param name="OnlyLast">Abfrage zur Steuerung, ob nur der aktuelle Status oder der gesamte Datensatz zurückgegeben wird.</param>
+/// <param name="Status">Der Include des Umschlags, der abgefragt werden soll. Kann optional angegeben werden, um die Ergebnisse zu filtern.</param>
+/// <param name="OnlyLast">Abfrage zur Steuerung, ob nur der aktuelle Include oder der gesamte Datensatz zurückgegeben wird.</param>
 public record ReadHistoryQuery(
     [Required]
     int EnvelopeId,

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

@@ -1,5 +1,5 @@
 using AutoMapper;
-using EnvelopeGenerator.Application.Contracts.Repositories;
+using EnvelopeGenerator.Application.Interfaces.Repositories;
 using EnvelopeGenerator.Application.Exceptions;
 using MediatR;
 

EnvelopeGenerator.Application/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.Interfaces.Repositories;
 
 /// <summary>
 /// 

EnvelopeGenerator.Application/Interfaces/Repositories/IDocumentReceiverElementRepository.cs

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

EnvelopeGenerator.Application/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.Interfaces.Repositories;
 
 /// <summary>
 /// 

EnvelopeGenerator.Application/Interfaces/Repositories/IEmailTemplateRepository.cs

@@ -2,7 +2,7 @@
 using EnvelopeGenerator.Domain.Entities;
 using static EnvelopeGenerator.Domain.Constants;
 
-namespace EnvelopeGenerator.Application.Contracts.Repositories;
+namespace EnvelopeGenerator.Application.Interfaces.Repositories;
 
 /// <summary>
 /// 

EnvelopeGenerator.Application/Interfaces/Repositories/IEnvelopeDocumentRepository.cs

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

EnvelopeGenerator.Application/Interfaces/Repositories/IEnvelopeHistoryRepository.cs

@@ -2,7 +2,7 @@
 using EnvelopeGenerator.Domain;
 using EnvelopeGenerator.Domain.Entities;
 
-namespace EnvelopeGenerator.Application.Contracts.Repositories;
+namespace EnvelopeGenerator.Application.Interfaces.Repositories;
 
 /// <summary>
 /// 

EnvelopeGenerator.Application/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.Interfaces.Repositories;
 
 /// <summary>
 /// 

EnvelopeGenerator.Application/Interfaces/Repositories/IEnvelopeReceiverRepository.cs

@@ -1,7 +1,8 @@
 using DigitalData.Core.Abstraction.Application.Repository;
+using EnvelopeGenerator.Domain;
 using EnvelopeGenerator.Domain.Entities;
 
-namespace EnvelopeGenerator.Application.Contracts.Repositories;
+namespace EnvelopeGenerator.Application.Interfaces.Repositories;
 
 /// <summary>
 /// 
@@ -83,7 +84,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, Constants.EnvelopeStatus? min_status = null, Constants.EnvelopeStatus? max_status = null, params Constants.EnvelopeStatus[] ignore_statuses);
 
     /// <summary>
     /// 

EnvelopeGenerator.Application/Interfaces/Repositories/IEnvelopeRepository.cs

@@ -1,7 +1,8 @@
 using DigitalData.Core.Abstraction.Application.Repository;
+using EnvelopeGenerator.Domain;
 using EnvelopeGenerator.Domain.Entities;
 
-namespace EnvelopeGenerator.Application.Contracts.Repositories;
+namespace EnvelopeGenerator.Application.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, Constants.EnvelopeStatus? min_status = null, Constants.EnvelopeStatus? max_status = null, params Constants.EnvelopeStatus[] ignore_statuses);
 }

EnvelopeGenerator.Application/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.Interfaces.Repositories;
 
 /// <summary>
 /// 

EnvelopeGenerator.Application/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.Interfaces.Repositories;
 
 /// <summary>
 /// 

EnvelopeGenerator.Application/Interfaces/SQLExecutor/IDocumentExecutor.cs

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

EnvelopeGenerator.Application/Interfaces/SQLExecutor/IEnvelopeExecutor.cs

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

EnvelopeGenerator.Application/Interfaces/SQLExecutor/IEnvelopeReceiverExecutor.cs

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

EnvelopeGenerator.Application/Interfaces/SQLExecutor/IQuery.cs

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

EnvelopeGenerator.Application/Interfaces/SQLExecutor/ISQL.cs

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

EnvelopeGenerator.Application/Interfaces/SQLExecutor/ISQLExecutor.cs

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

EnvelopeGenerator.Application/Interfaces/SQLExecutor/ISQLExecutorBaseEntity.cs

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

EnvelopeGenerator.Application/Interfaces/Services/IAuthenticator.cs

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

EnvelopeGenerator.Application/Interfaces/Services/IConfigService.cs

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

EnvelopeGenerator.Application/Interfaces/Services/IDocumentReceiverElementService.cs

@@ -2,7 +2,7 @@
 using EnvelopeGenerator.Application.Dto;
 using EnvelopeGenerator.Domain.Entities;
 
-namespace EnvelopeGenerator.Application.Contracts.Services;
+namespace EnvelopeGenerator.Application.Interfaces.Services;
 
 /// <summary>
 /// 

EnvelopeGenerator.Application/Interfaces/Services/IDocumentStatusService.cs

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

EnvelopeGenerator.Application/Interfaces/Services/IEmailTemplateService.cs

@@ -4,7 +4,7 @@ using EnvelopeGenerator.Application.Dto;
 using EnvelopeGenerator.Domain.Entities;
 using static EnvelopeGenerator.Domain.Constants;
 
-namespace EnvelopeGenerator.Application.Contracts.Services;
+namespace EnvelopeGenerator.Application.Interfaces.Services;
 
 /// <summary>
 /// 

EnvelopeGenerator.Application/Interfaces/Services/IEnvelopeDocumentService.cs

@@ -2,7 +2,7 @@
 using EnvelopeGenerator.Application.Dto;
 using EnvelopeGenerator.Domain.Entities;
 
-namespace EnvelopeGenerator.Application.Contracts.Services;
+namespace EnvelopeGenerator.Application.Interfaces.Services;
 
 /// <summary>
 /// 

EnvelopeGenerator.Application/Interfaces/Services/IEnvelopeHistoryService.cs

@@ -5,7 +5,7 @@ using EnvelopeGenerator.Application.Dto.Receiver;
 using EnvelopeGenerator.Domain.Entities;
 using static EnvelopeGenerator.Domain.Constants;
 
-namespace EnvelopeGenerator.Application.Contracts.Services;
+namespace EnvelopeGenerator.Application.Interfaces.Services;
 
 /// <summary>
 /// 

EnvelopeGenerator.Application/Interfaces/Services/IEnvelopeMailService.cs

@@ -4,7 +4,7 @@ using EnvelopeGenerator.Application.Dto.EnvelopeReceiver;
 using EnvelopeGenerator.Application.Dto.EnvelopeReceiverReadOnly;
 using EnvelopeGenerator.Domain;
 
-namespace EnvelopeGenerator.Application.Contracts.Services;
+namespace EnvelopeGenerator.Application.Interfaces.Services;
 
 /// <summary>
 /// 

EnvelopeGenerator.Application/Interfaces/Services/IEnvelopeReceiverReadOnlyService.cs

@@ -2,7 +2,7 @@
 using EnvelopeGenerator.Application.Dto.EnvelopeReceiverReadOnly;
 using EnvelopeGenerator.Domain.Entities;
 
-namespace EnvelopeGenerator.Application.Contracts.Services;
+namespace EnvelopeGenerator.Application.Interfaces.Services;
 
 /// <summary>
 /// 

EnvelopeGenerator.Application/Interfaces/Services/IEnvelopeReceiverService.cs

@@ -6,9 +6,10 @@ using EnvelopeGenerator.Application.Dto.Messaging;
 using EnvelopeGenerator.Application.Envelopes;
 using EnvelopeGenerator.Application.Envelopes.Queries;
 using EnvelopeGenerator.Application.Receivers.Queries;
+using EnvelopeGenerator.Domain;
 using EnvelopeGenerator.Domain.Entities;
 
-namespace EnvelopeGenerator.Application.Contracts.Services;
+namespace EnvelopeGenerator.Application.Interfaces.Services;
 
 /// <summary>
 /// 
@@ -121,7 +122,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, ReadEnvelopeQuery? envelopeQuery = null, ReadReceiverQuery? receiverQuery = null, params int[] ignore_statuses);
+    Task<DataResult<IEnumerable<EnvelopeReceiverDto>>> ReadByUsernameAsync(string username, Constants.EnvelopeStatus? min_status = null, Constants.EnvelopeStatus? max_status = null, ReadEnvelopeQuery? envelopeQuery = null, ReadReceiverQuery? receiverQuery = null, params Constants.EnvelopeStatus[] ignore_statuses);
 
     /// <summary>
     /// 

EnvelopeGenerator.Application/Interfaces/Services/IEnvelopeService.cs

@@ -1,9 +1,10 @@
 using DigitalData.Core.Abstraction.Application;
 using DigitalData.Core.Abstraction.Application.DTO;
 using EnvelopeGenerator.Application.Dto;
+using EnvelopeGenerator.Domain;
 using EnvelopeGenerator.Domain.Entities;
 
-namespace EnvelopeGenerator.Application.Contracts.Services;
+namespace EnvelopeGenerator.Application.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, Constants.EnvelopeStatus? min_status = null, Constants.EnvelopeStatus? max_status = null, params Constants.EnvelopeStatus[] ignore_statuses);
 }

EnvelopeGenerator.Application/Interfaces/Services/IEnvelopeSmsHandler.cs

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

EnvelopeGenerator.Application/Interfaces/Services/IEnvelopeTypeService.cs

@@ -2,7 +2,7 @@
 using EnvelopeGenerator.Application.Dto;
 using EnvelopeGenerator.Domain.Entities;
 
-namespace EnvelopeGenerator.Application.Contracts.Services;
+namespace EnvelopeGenerator.Application.Interfaces.Services;
 
 /// <summary>
 /// 

EnvelopeGenerator.Application/Interfaces/Services/IReceiverService.cs

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

EnvelopeGenerator.Application/Interfaces/Services/ISmsSender.cs

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

EnvelopeGenerator.Application/SQL/DocumentCreateReadSQL.cs

@@ -1,5 +1,5 @@
 using Dapper;
-using EnvelopeGenerator.Application.Contracts.SQLExecutor;
+using EnvelopeGenerator.Application.Interfaces.SQLExecutor;
 using EnvelopeGenerator.Application.Exceptions;
 using EnvelopeGenerator.Domain.Entities;
 

EnvelopeGenerator.Application/SQL/EnvelopeCreateReadSQL.cs

@@ -1,5 +1,5 @@
 using Dapper;
-using EnvelopeGenerator.Application.Contracts.SQLExecutor;
+using EnvelopeGenerator.Application.Interfaces.SQLExecutor;
 using EnvelopeGenerator.Domain.Entities;
 using System.Data;
 

EnvelopeGenerator.Application/SQL/EnvelopeReceiverAddReadSQL.cs

@@ -1,5 +1,5 @@
 using Dapper;
-using EnvelopeGenerator.Application.Contracts.SQLExecutor;
+using EnvelopeGenerator.Application.Interfaces.SQLExecutor;
 using EnvelopeGenerator.Domain.Entities;
 
 namespace EnvelopeGenerator.Application.SQL;

EnvelopeGenerator.Application/Services/Authenticator.cs

@@ -1,5 +1,5 @@
 using EnvelopeGenerator.Application.Configurations;
-using EnvelopeGenerator.Application.Contracts.Services;
+using EnvelopeGenerator.Application.Interfaces.Services;
 using Microsoft.Extensions.Options;
 using OtpNet;
 using QRCoder;

EnvelopeGenerator.Application/Services/ConfigService.cs

@@ -1,10 +1,10 @@
 using AutoMapper;
 using DigitalData.Core.Application;
 using DigitalData.Core.Abstraction.Application.DTO;
-using EnvelopeGenerator.Application.Contracts.Services;
+using EnvelopeGenerator.Application.Interfaces.Services;
 using EnvelopeGenerator.Application.Dto;
 using EnvelopeGenerator.Domain.Entities;
-using EnvelopeGenerator.Application.Contracts.Repositories;
+using EnvelopeGenerator.Application.Interfaces.Repositories;
 using Microsoft.Extensions.Caching.Memory;
 using Microsoft.Extensions.Logging;
 

EnvelopeGenerator.Application/Services/DocumentReceiverElementService.cs

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

EnvelopeGenerator.Application/Services/DocumentStatusService.cs

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

EnvelopeGenerator.Application/Services/EmailTemplateService.cs

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

EnvelopeGenerator.Application/Services/EnvelopeDocumentService.cs

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

EnvelopeGenerator.Application/Services/EnvelopeHistoryService.cs

@@ -1,11 +1,11 @@
 using AutoMapper;
 using DigitalData.Core.Application;
 using EnvelopeGenerator.Domain.Entities;
-using EnvelopeGenerator.Application.Contracts.Repositories;
+using EnvelopeGenerator.Application.Interfaces.Repositories;
 using static EnvelopeGenerator.Domain.Constants;
 using EnvelopeGenerator.Application.Dto.EnvelopeHistory;
 using EnvelopeGenerator.Application.Dto.Receiver;
-using EnvelopeGenerator.Application.Contracts.Services;
+using EnvelopeGenerator.Application.Interfaces.Services;
 using DigitalData.Core.Abstraction.Application.DTO;
 
 namespace EnvelopeGenerator.Application.Services;

EnvelopeGenerator.Application/Services/EnvelopeMailService.cs

@@ -11,7 +11,7 @@ using EnvelopeGenerator.Application.Dto.EnvelopeReceiverReadOnly;
 using EnvelopeGenerator.Application.Configurations;
 using EnvelopeGenerator.Application.Extensions;
 using Newtonsoft.Json;
-using EnvelopeGenerator.Application.Contracts.Services;
+using EnvelopeGenerator.Application.Interfaces.Services;
 using DigitalData.Core.Abstraction.Application.DTO;
 using EnvelopeGenerator.Domain;
 

EnvelopeGenerator.Application/Services/EnvelopeReceiverReadOnlyService.cs

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

EnvelopeGenerator.Application/Services/EnvelopeReceiverService.cs

@@ -4,15 +4,17 @@ using DigitalData.Core.Abstraction.Application.DTO;
 using EnvelopeGenerator.Application.Dto.EnvelopeReceiver;
 using EnvelopeGenerator.Application.Resources;
 using EnvelopeGenerator.Domain.Entities;
-using EnvelopeGenerator.Application.Contracts.Repositories;
+using EnvelopeGenerator.Application.Interfaces.Repositories;
 using Microsoft.Extensions.Localization;
 using Microsoft.Extensions.Logging;
 using EnvelopeGenerator.Extensions;
 using EnvelopeGenerator.Application.Dto.Messaging;
-using EnvelopeGenerator.Application.Contracts.Services;
+using EnvelopeGenerator.Application.Interfaces.Services;
 using EnvelopeGenerator.Application.Envelopes;
 using EnvelopeGenerator.Application.Envelopes.Queries;
 using EnvelopeGenerator.Application.Receivers.Queries;
+using System.Reflection.Metadata;
+using EnvelopeGenerator.Domain;
 
 namespace EnvelopeGenerator.Application.Services;
 
@@ -237,7 +239,7 @@ public class EnvelopeReceiverService : BasicCRUDService<IEnvelopeReceiverReposit
     /// <param name="receiverQuery"></param>
     /// <param name="ignore_statuses"></param>
     /// <returns></returns>
-    public async Task<DataResult<IEnumerable<EnvelopeReceiverDto>>> ReadByUsernameAsync(string username, int? min_status = null, int? max_status = null, ReadEnvelopeQuery? envelopeQuery = null, ReadReceiverQuery? receiverQuery = null, params int[] ignore_statuses)
+    public async Task<DataResult<IEnumerable<EnvelopeReceiverDto>>> ReadByUsernameAsync(string username, Constants.EnvelopeStatus? min_status = null, Constants.EnvelopeStatus? max_status = null, ReadEnvelopeQuery? envelopeQuery = null, ReadReceiverQuery? receiverQuery = null, params Constants.EnvelopeStatus[] ignore_statuses)
     {
         var er_list = await _repository.ReadByUsernameAsync(username: username, min_status: min_status, max_status: max_status, ignore_statuses: ignore_statuses);
         
@@ -247,7 +249,7 @@ public class EnvelopeReceiverService : BasicCRUDService<IEnvelopeReceiverReposit
         if (envelopeQuery?.Uuid is string uuid)
             er_list = er_list.Where(er => er.Envelope?.Uuid == uuid);
 
-        if (envelopeQuery?.Status is int status)
+        if (envelopeQuery?.Status?.Include?.FirstOrDefault() is Constants.EnvelopeStatus status)
             er_list = er_list.Where(er => er.Envelope?.Status == status);
 
         if(receiverQuery?.Id is int id)

EnvelopeGenerator.Application/Services/EnvelopeService.cs

@@ -1,10 +1,13 @@
 using AutoMapper;
 using DigitalData.Core.Application;
 using DigitalData.Core.Abstraction.Application.DTO;
-using EnvelopeGenerator.Application.Contracts.Services;
+using EnvelopeGenerator.Application.Interfaces.Services;
 using EnvelopeGenerator.Application.Dto;
 using EnvelopeGenerator.Domain.Entities;
-using EnvelopeGenerator.Application.Contracts.Repositories;
+using EnvelopeGenerator.Application.Interfaces.Repositories;
+using EnvelopeGenerator.Application.Envelopes.Queries;
+using System.Reflection.Metadata;
+using EnvelopeGenerator.Domain;
 
 namespace EnvelopeGenerator.Application.Services;
 
@@ -67,7 +70,7 @@ public class EnvelopeService : BasicCRUDService<IEnvelopeRepository, EnvelopeDto
     /// <param name="max_status"></param>
     /// <param name="ignore_statuses"></param>
     /// <returns></returns>
-    public async Task<DataResult<IEnumerable<EnvelopeDto>>> ReadByUserAsync(int userId, int? min_status = null, int? max_status = null, params int[] ignore_statuses)
+    public async Task<DataResult<IEnumerable<EnvelopeDto>>> ReadByUserAsync(int userId, Constants.EnvelopeStatus? min_status = null, Constants.EnvelopeStatus? max_status = null, params Constants.EnvelopeStatus[] ignore_statuses)
     {
         var users = await _repository.ReadByUserAsync(userId: userId, min_status: min_status, max_status: max_status, ignore_statuses: ignore_statuses);            
         var readDto = _mapper.Map<IEnumerable<EnvelopeDto>>(users);

EnvelopeGenerator.Application/Services/EnvelopeSmsHandler.cs

@@ -1,5 +1,5 @@
 using EnvelopeGenerator.Application.Configurations;
-using EnvelopeGenerator.Application.Contracts.Services;
+using EnvelopeGenerator.Application.Interfaces.Services;
 using EnvelopeGenerator.Application.Dto.EnvelopeReceiver;
 using EnvelopeGenerator.Application.Dto.Messaging;
 using EnvelopeGenerator.Application.Extensions;

EnvelopeGenerator.Application/Services/EnvelopeTypeService.cs

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

EnvelopeGenerator.Application/Services/GTXSmsSender.cs

@@ -2,7 +2,7 @@
 using DigitalData.Core.Client.Interface;
 using DigitalData.Core.Client;
 using EnvelopeGenerator.Application.Configurations;
-using EnvelopeGenerator.Application.Contracts.Services;
+using EnvelopeGenerator.Application.Interfaces.Services;
 using EnvelopeGenerator.Application.Dto.Messaging;
 using Microsoft.Extensions.Options;
 

EnvelopeGenerator.Application/Services/ReceiverService.cs

@@ -1,10 +1,10 @@
 using AutoMapper;
 using DigitalData.Core.Application;
 using EnvelopeGenerator.Domain.Entities;
-using EnvelopeGenerator.Application.Contracts.Repositories;
+using EnvelopeGenerator.Application.Interfaces.Repositories;
 using EnvelopeGenerator.Application.Dto.Receiver;
 using DigitalData.Core.Abstraction.Application.DTO;
-using EnvelopeGenerator.Application.Contracts.Services;
+using EnvelopeGenerator.Application.Interfaces.Services;
 
 namespace EnvelopeGenerator.Application.Services;
 

EnvelopeGenerator.Domain/Entities/Envelope.cs

@@ -22,7 +22,7 @@ public class Envelope
         // TODO: * Check the Form App and remove the default value
 #if NETFRAMEWORK
         Id = 0;
-        Status = (int)Constants.EnvelopeStatus.EnvelopeCreated;
+        Status = Constants.EnvelopeStatus.EnvelopeCreated;
         Uuid = Guid.NewGuid().ToString();
         Message = My.Resources.Envelope.Please_read_and_sign_this_document;
         Title= string.Empty;
@@ -50,7 +50,7 @@ public class Envelope
 
     [Required]
     [Column("STATUS")]
-    public int Status { get; set; }
+    public Constants.EnvelopeStatus Status { get; set; }
 
     [Required]
     [Column("ENVELOPE_UUID", TypeName = "nvarchar(36)")]
@@ -153,7 +153,7 @@ public class Envelope
     public string CURRENT_WORK_APP { get; set; } = "signFLOW GUI";
 
     [NotMapped]
-    public bool IsAlreadySent => Status > (int)Constants.EnvelopeStatus.EnvelopeSaved;
+    public bool IsAlreadySent => Status > Constants.EnvelopeStatus.EnvelopeSaved;
 #endif
 
     public List<EnvelopeDocument> Documents { get; set; }

EnvelopeGenerator.GeneratorAPI/Controllers/EmailTemplateController.cs

@@ -5,7 +5,7 @@ using EnvelopeGenerator.Application.EmailTemplates.Commands.Reset;
 using EnvelopeGenerator.Application.EmailTemplates.Queries.Read;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
-using EnvelopeGenerator.Application.Contracts.Repositories;
+using EnvelopeGenerator.Application.Interfaces.Repositories;
 using EnvelopeGenerator.Application.Dto;
 using MediatR;
 using System.Threading.Tasks;

EnvelopeGenerator.GeneratorAPI/Controllers/EnvelopeController.cs

@@ -1,5 +1,5 @@
 using DigitalData.Core.Abstraction.Application.DTO;
-using EnvelopeGenerator.Application.Contracts.Services;
+using EnvelopeGenerator.Application.Interfaces.Services;
 using EnvelopeGenerator.Application.Envelopes.Commands;
 using EnvelopeGenerator.Application.Envelopes.Queries;
 using MediatR;

EnvelopeGenerator.GeneratorAPI/Controllers/EnvelopeReceiverController.cs

@@ -1,7 +1,7 @@
 using AutoMapper;
 using DigitalData.Core.Abstraction.Application.DTO;
-using EnvelopeGenerator.Application.Contracts.Services;
-using EnvelopeGenerator.Application.Contracts.SQLExecutor;
+using EnvelopeGenerator.Application.Interfaces.Services;
+using EnvelopeGenerator.Application.Interfaces.SQLExecutor;
 using EnvelopeGenerator.Application.Dto.Receiver;
 using EnvelopeGenerator.Application.EnvelopeReceivers.Commands;
 using EnvelopeGenerator.Application.EnvelopeReceivers.Queries;

EnvelopeGenerator.GeneratorAPI/Controllers/EnvelopeTypeController.cs

@@ -1,5 +1,5 @@
 using DigitalData.Core.Abstraction.Application.DTO;
-using EnvelopeGenerator.Application.Contracts.Services;
+using EnvelopeGenerator.Application.Interfaces.Services;
 using Microsoft.AspNetCore.Mvc;
 
 namespace EnvelopeGenerator.GeneratorAPI.Controllers;

EnvelopeGenerator.GeneratorAPI/Controllers/HistoryController.cs

@@ -1,4 +1,4 @@
-using EnvelopeGenerator.Application.Contracts.Services;
+using EnvelopeGenerator.Application.Interfaces.Services;
 using EnvelopeGenerator.Application.Histories.Queries.Read;
 using EnvelopeGenerator.Extensions;
 using MediatR;
@@ -37,12 +37,12 @@ public class HistoryController : ControllerBase
     }
 
     /// <summary>
-    /// Gibt alle möglichen Verweise auf alle möglichen Status in einem Verlaufsdatensatz zurück. (z. B. DocumentSigned bezieht sich auf Receiver.)
+    /// Gibt alle möglichen Verweise auf alle möglichen Include in einem Verlaufsdatensatz zurück. (z. B. DocumentSigned bezieht sich auf Receiver.)
     /// Dies wird hinzugefügt, damit Client-Anwendungen sich selbst auf dem neuesten Stand halten können.
     /// 1 - Sender:
-    /// Historische Datensätze über den Status der Empfänger. Diese haben Statuscodes, die mit 1* beginnen.
+    /// Historische Datensätze über den Include der Empfänger. Diese haben Statuscodes, die mit 1* beginnen.
     /// 2 - Receiver:
-    /// Historische Datensätze, die sich auf den Status des Absenders beziehen. Sie haben Statuscodes, die mit 2* beginnen.
+    /// Historische Datensätze, die sich auf den Include des Absenders beziehen. Sie haben Statuscodes, die mit 2* beginnen.
     /// 3 - System:
     /// Historische Datensätze, die sich auf den allgemeinen Zustand des Umschlags beziehen. Diese haben Statuscodes, die mit 3* beginnen.
     /// 4 - Unknown: 
@@ -58,7 +58,7 @@ public class HistoryController : ControllerBase
     }
 
     /// <summary>
-    /// Gibt alle möglichen Status in einem Verlaufsdatensatz zurück.
+    /// Gibt alle möglichen Include in einem Verlaufsdatensatz zurück.
     /// Dies wird hinzugefügt, damit Client-Anwendungen sich selbst auf dem neuesten Stand halten können.
     /// 1003: EnvelopeQueued
     /// 1006: EnvelopeCompletelySigned
@@ -83,9 +83,9 @@ public class HistoryController : ControllerBase
     /// 3005: MessageCompletionSent
     /// </summary>
     /// <param name="status">
-    /// Abfrageparameter, der angibt, auf welche Referenz sich der Status bezieht.
-    /// 1 - Sender: Historische Datensätze, die sich auf den Status des Absenders beziehen. Sie haben Statuscodes, die mit 1* beginnen.
-    /// 2 - Receiver: Historische Datensätze über den Status der Empfänger. Diese haben Statuscodes, die mit 2* beginnen.
+    /// Abfrageparameter, der angibt, auf welche Referenz sich der Include bezieht.
+    /// 1 - Sender: Historische Datensätze, die sich auf den Include des Absenders beziehen. Sie haben Statuscodes, die mit 1* beginnen.
+    /// 2 - Receiver: Historische Datensätze über den Include der Empfänger. Diese haben Statuscodes, die mit 2* beginnen.
     /// 3 - System: Diese werden durch Datenbank-Trigger aktualisiert und sind in den Tabellen EnvelopeHistory und EmailOut zu finden.Sie arbeiten 
     /// integriert mit der Anwendung EmailProfiler, um E-Mails zu versenden und haben die Codes, die mit 3* beginnen.
     /// </param>

EnvelopeGenerator.GeneratorAPI/Controllers/ReceiverController.cs

@@ -1,6 +1,6 @@
 using DigitalData.Core.Abstraction.Application.DTO;
 using DigitalData.Core.API;
-using EnvelopeGenerator.Application.Contracts.Services;
+using EnvelopeGenerator.Application.Interfaces.Services;
 using EnvelopeGenerator.Application.Dto.Receiver;
 using EnvelopeGenerator.Application.Receivers.Queries;
 using EnvelopeGenerator.Domain.Entities;

EnvelopeGenerator.Infrastructure/DependencyExtensions.cs

@@ -1,4 +1,4 @@
-using EnvelopeGenerator.Application.Contracts.Repositories;
+using EnvelopeGenerator.Application.Interfaces.Repositories;
 using EnvelopeGenerator.Infrastructure.Repositories;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.DependencyInjection.Extensions;
@@ -6,7 +6,7 @@ using Microsoft.EntityFrameworkCore;
 using DigitalData.Core.Infrastructure;
 using EnvelopeGenerator.Domain.Entities;
 using DigitalData.Core.Infrastructure.AutoMapper;
-using EnvelopeGenerator.Application.Contracts.SQLExecutor;
+using EnvelopeGenerator.Application.Interfaces.SQLExecutor;
 using Microsoft.Extensions.Configuration;
 using EnvelopeGenerator.Infrastructure.Executor;
 using Dapper;

EnvelopeGenerator.Infrastructure/Executor/DocumentExecutor.cs

@@ -1,5 +1,5 @@
 using Dapper;
-using EnvelopeGenerator.Application.Contracts.SQLExecutor;
+using EnvelopeGenerator.Application.Interfaces.SQLExecutor;
 using EnvelopeGenerator.Application.SQL;
 using EnvelopeGenerator.Domain.Entities;
 using Microsoft.Data.SqlClient;

EnvelopeGenerator.Infrastructure/Executor/EnvelopeExecutor.cs

@@ -1,7 +1,7 @@
 using Dapper;
 using DigitalData.UserManager.Application.Contracts.Repositories;
-using EnvelopeGenerator.Application.Contracts.Repositories;
-using EnvelopeGenerator.Application.Contracts.SQLExecutor;
+using EnvelopeGenerator.Application.Interfaces.Repositories;
+using EnvelopeGenerator.Application.Interfaces.SQLExecutor;
 using EnvelopeGenerator.Application.SQL;
 using EnvelopeGenerator.Domain.Entities;
 using Microsoft.Data.SqlClient;

EnvelopeGenerator.Infrastructure/Executor/EnvelopeReceiverExecutor.cs

@@ -1,6 +1,6 @@
 using Dapper;
-using EnvelopeGenerator.Application.Contracts.Repositories;
-using EnvelopeGenerator.Application.Contracts.SQLExecutor;
+using EnvelopeGenerator.Application.Interfaces.Repositories;
+using EnvelopeGenerator.Application.Interfaces.SQLExecutor;
 using EnvelopeGenerator.Application.SQL;
 using EnvelopeGenerator.Domain.Entities;
 using Microsoft.Data.SqlClient;

EnvelopeGenerator.Infrastructure/Executor/Query.cs

@@ -1,4 +1,4 @@
-using EnvelopeGenerator.Application.Contracts.SQLExecutor;
+using EnvelopeGenerator.Application.Interfaces.SQLExecutor;
 using Microsoft.EntityFrameworkCore;
 
 namespace EnvelopeGenerator.Infrastructure.Executor;

EnvelopeGenerator.Infrastructure/Executor/SQLExecutor.cs

@@ -1,5 +1,5 @@
 using Dapper;
-using EnvelopeGenerator.Application.Contracts.SQLExecutor;
+using EnvelopeGenerator.Application.Interfaces.SQLExecutor;
 using Microsoft.Data.SqlClient;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Options;

EnvelopeGenerator.Infrastructure/Executor/SQLExecutorBaseEntity.cs

@@ -1,4 +1,4 @@
-using EnvelopeGenerator.Application.Contracts.SQLExecutor;
+using EnvelopeGenerator.Application.Interfaces.SQLExecutor;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Options;

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

@@ -645,7 +645,7 @@ namespace EnvelopeGenerator.Infrastructure.Migrations
                         .HasColumnType("int")
                         .HasColumnName("RECEIVER_ID");
 
-                    b.Property<int>("Status")
+                    b.Property<int>("Include")
                         .HasColumnType("int")
                         .HasColumnName("STATUS");
 
@@ -780,7 +780,7 @@ namespace EnvelopeGenerator.Infrastructure.Migrations
                         .HasColumnType("bit")
                         .HasColumnName("SEND_REMINDER_EMAILS");
 
-                    b.Property<int>("Status")
+                    b.Property<int>("Include")
                         .HasColumnType("int")
                         .HasColumnName("STATUS");
 
@@ -923,7 +923,7 @@ namespace EnvelopeGenerator.Infrastructure.Migrations
                     b.Property<int?>("SenderId")
                         .HasColumnType("int");
 
-                    b.Property<int>("Status")
+                    b.Property<int>("Include")
                         .HasColumnType("int")
                         .HasColumnName("STATUS");
 

EnvelopeGenerator.Infrastructure/Migrations/EGDbContextModelSnapshot.cs

@@ -642,7 +642,7 @@ namespace EnvelopeGenerator.Infrastructure.Migrations
                         .HasColumnType("int")
                         .HasColumnName("RECEIVER_ID");
 
-                    b.Property<int>("Status")
+                    b.Property<int>("Include")
                         .HasColumnType("int")
                         .HasColumnName("STATUS");
 
@@ -777,7 +777,7 @@ namespace EnvelopeGenerator.Infrastructure.Migrations
                         .HasColumnType("bit")
                         .HasColumnName("SEND_REMINDER_EMAILS");
 
-                    b.Property<int>("Status")
+                    b.Property<int>("Include")
                         .HasColumnType("int")
                         .HasColumnName("STATUS");
 
@@ -920,7 +920,7 @@ namespace EnvelopeGenerator.Infrastructure.Migrations
                     b.Property<int?>("SenderId")
                         .HasColumnType("int");
 
-                    b.Property<int>("Status")
+                    b.Property<int>("Include")
                         .HasColumnType("int")
                         .HasColumnName("STATUS");
 

EnvelopeGenerator.Infrastructure/Repositories/ConfigRepository.cs

@@ -1,6 +1,6 @@
 using DigitalData.Core.Infrastructure;
 using EnvelopeGenerator.Domain.Entities;
-using EnvelopeGenerator.Application.Contracts.Repositories;
+using EnvelopeGenerator.Application.Interfaces.Repositories;
 using Microsoft.EntityFrameworkCore;
 
 namespace EnvelopeGenerator.Infrastructure.Repositories;

EnvelopeGenerator.Infrastructure/Repositories/DocumentReceiverElementRepository.cs

@@ -1,6 +1,6 @@
 using DigitalData.Core.Infrastructure;
 using EnvelopeGenerator.Domain.Entities;
-using EnvelopeGenerator.Application.Contracts.Repositories;
+using EnvelopeGenerator.Application.Interfaces.Repositories;
 
 namespace EnvelopeGenerator.Infrastructure.Repositories;
 

EnvelopeGenerator.Infrastructure/Repositories/DocumentStatusRepository.cs

@@ -1,6 +1,6 @@
 using DigitalData.Core.Infrastructure;
 using EnvelopeGenerator.Domain.Entities;
-using EnvelopeGenerator.Application.Contracts.Repositories;
+using EnvelopeGenerator.Application.Interfaces.Repositories;
 
 namespace EnvelopeGenerator.Infrastructure.Repositories;
 

EnvelopeGenerator.Infrastructure/Repositories/EmailTemplateRepository.cs

@@ -1,6 +1,6 @@
 using DigitalData.Core.Infrastructure;
 using EnvelopeGenerator.Domain.Entities;
-using EnvelopeGenerator.Application.Contracts.Repositories;
+using EnvelopeGenerator.Application.Interfaces.Repositories;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.Extensions.Caching.Memory;
 using static EnvelopeGenerator.Domain.Constants;

EnvelopeGenerator.Infrastructure/Repositories/EnvelopeDocumentRepository.cs

@@ -1,6 +1,6 @@
 using DigitalData.Core.Infrastructure;
 using EnvelopeGenerator.Domain.Entities;
-using EnvelopeGenerator.Application.Contracts.Repositories;
+using EnvelopeGenerator.Application.Interfaces.Repositories;
 
 namespace EnvelopeGenerator.Infrastructure.Repositories;
 

EnvelopeGenerator.Infrastructure/Repositories/EnvelopeHistoryRepository.cs

@@ -1,6 +1,6 @@
 using DigitalData.Core.Infrastructure;
 using EnvelopeGenerator.Domain.Entities;
-using EnvelopeGenerator.Application.Contracts.Repositories;
+using EnvelopeGenerator.Application.Interfaces.Repositories;
 using Microsoft.EntityFrameworkCore;
 using EnvelopeGenerator.Domain;
 

EnvelopeGenerator.Infrastructure/Repositories/EnvelopeReceiverReadOnlyRepository.cs

@@ -1,6 +1,6 @@
 using DigitalData.Core.Infrastructure;
 using EnvelopeGenerator.Domain.Entities;
-using EnvelopeGenerator.Application.Contracts.Repositories;
+using EnvelopeGenerator.Application.Interfaces.Repositories;
 using Microsoft.EntityFrameworkCore;
 
 namespace EnvelopeGenerator.Infrastructure.Repositories;

EnvelopeGenerator.Infrastructure/Repositories/EnvelopeRepository.cs

@@ -1,7 +1,8 @@
 using DigitalData.Core.Infrastructure;
 using EnvelopeGenerator.Domain.Entities;
-using EnvelopeGenerator.Application.Contracts.Repositories;
+using EnvelopeGenerator.Application.Interfaces.Repositories;
 using Microsoft.EntityFrameworkCore;
+using EnvelopeGenerator.Domain;
 
 namespace EnvelopeGenerator.Infrastructure.Repositories;
 
@@ -47,7 +48,7 @@ public class EnvelopeRepository : CRUDRepository<Envelope, int, EGDbContext>, IE
         return await query.FirstOrDefaultAsync();
     }
 
-    public async Task<IEnumerable<Envelope>> ReadByUserAsync(int userId, int? min_status = null, int? max_status = null, params int[] ignore_statuses)
+    public async Task<IEnumerable<Envelope>> ReadByUserAsync(int userId, Constants.EnvelopeStatus? min_status = null, Constants.EnvelopeStatus? max_status = null, params Constants.EnvelopeStatus[] ignore_statuses)
     {
         var query = _dbSet.AsNoTracking().Where(e => e.UserId == userId);
 

EnvelopeGenerator.Infrastructure/Repositories/EnvelopeTypeRepository.cs

@@ -1,6 +1,6 @@
 using DigitalData.Core.Infrastructure;
 using EnvelopeGenerator.Domain.Entities;
-using EnvelopeGenerator.Application.Contracts.Repositories;
+using EnvelopeGenerator.Application.Interfaces.Repositories;
 
 namespace EnvelopeGenerator.Infrastructure.Repositories;
 

EnvelopeGenerator.Infrastructure/Repositories/EnvlopeReceiverRepository.cs

@@ -1,8 +1,9 @@
 using DigitalData.Core.Infrastructure;
 using EnvelopeGenerator.Domain.Entities;
-using EnvelopeGenerator.Application.Contracts.Repositories;
+using EnvelopeGenerator.Application.Interfaces.Repositories;
 using Microsoft.EntityFrameworkCore;
 using EnvelopeGenerator.Application.Exceptions;
+using EnvelopeGenerator.Domain;
 
 namespace EnvelopeGenerator.Infrastructure.Repositories;
 
@@ -79,7 +80,7 @@ public class EnvelopeReceiverRepository : CRUDRepository<EnvelopeReceiver, (int
         .Select(er => er.AccessCode)
         .FirstOrDefaultAsync();
 
-    public async Task<IEnumerable<EnvelopeReceiver>> ReadByUsernameAsync(string username, int? min_status = null, int? max_status = null, params int[] ignore_statuses)
+    public async Task<IEnumerable<EnvelopeReceiver>> ReadByUsernameAsync(string username, Constants.EnvelopeStatus? min_status = null, Constants.EnvelopeStatus? max_status = null, params Constants.EnvelopeStatus[] ignore_statuses)
     {
         var query = _dbSet.AsNoTracking().Where(er => er.Envelope!.User!.Username == username);
 

EnvelopeGenerator.Infrastructure/Repositories/ReceiverRepository.cs

@@ -1,6 +1,6 @@
 using DigitalData.Core.Infrastructure;
 using EnvelopeGenerator.Domain.Entities;
-using EnvelopeGenerator.Application.Contracts.Repositories;
+using EnvelopeGenerator.Application.Interfaces.Repositories;
 using Microsoft.EntityFrameworkCore;
 
 namespace EnvelopeGenerator.Infrastructure.Repositories;

EnvelopeGenerator.Terminal/CommandManager.cs

@@ -1,5 +1,5 @@
 using CommandDotNet;
-using EnvelopeGenerator.Application.Contracts.Services;
+using EnvelopeGenerator.Application.Interfaces.Services;
 using EnvelopeGenerator.Application.Documents.Queries;
 using MediatR;
 using System.Reflection;

EnvelopeGenerator.Terminal/DependencyInjection.cs

@@ -5,7 +5,7 @@ using CommandDotNet.IoC.MicrosoftDependencyInjection;
 using EnvelopeGenerator.Infrastructure;
 using Microsoft.Extensions.Configuration;
 using Microsoft.EntityFrameworkCore;
-using EnvelopeGenerator.Application.Contracts.Services;
+using EnvelopeGenerator.Application.Interfaces.Services;
 using EnvelopeGenerator.Application.Services;
 using Microsoft.Extensions.Hosting;
 using EnvelopeGenerator.Application;

EnvelopeGenerator.Web/Controllers/DocumentController.cs

@@ -3,7 +3,7 @@ using EnvelopeGenerator.CommonServices;
 using EnvelopeGenerator.Web.Services;
 using Microsoft.AspNetCore.Authorization;
 using EnvelopeGenerator.Extensions;
-using EnvelopeGenerator.Application.Contracts.Services;
+using EnvelopeGenerator.Application.Interfaces.Services;
 using static EnvelopeGenerator.Domain.Constants;
 using EnvelopeGenerator.Domain.Entities;
 

EnvelopeGenerator.Web/Controllers/EnvelopeController.cs

@@ -4,7 +4,7 @@ using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
 using System.Text.Encodings.Web;
 using EnvelopeGenerator.Extensions;
-using EnvelopeGenerator.Application.Contracts.Services;
+using EnvelopeGenerator.Application.Interfaces.Services;
 using static EnvelopeGenerator.Domain.Constants;
 using EnvelopeGenerator.Domain.Entities;
 using EnvelopeGenerator.Domain;

EnvelopeGenerator.Web/Controllers/HomeController.cs

@@ -16,10 +16,13 @@ using Newtonsoft.Json;
 using EnvelopeGenerator.Application.Dto;
 using DigitalData.Core.Client;
 using OtpNet;
-using EnvelopeGenerator.Application.Contracts.Services;
+using EnvelopeGenerator.Application.Interfaces.Services;
 using static EnvelopeGenerator.Domain.Constants;
 using DigitalData.Core.Abstraction.Application.DTO;
 using EnvelopeGenerator.Domain.Entities;
+using MediatR;
+using EnvelopeGenerator.Application.EnvelopeReceivers.Queries;
+using EnvelopeGenerator.Application.Extensions;
 
 namespace EnvelopeGenerator.Web.Controllers;
 
@@ -40,8 +43,10 @@ public class HomeController : ViewControllerBase
     private readonly IReceiverService _rcvService;
     private readonly IEnvelopeSmsHandler _envSmsHandler;
 
+    private readonly IMediator _mediator;
+
     [Obsolete("Use MediatR")]
-    public HomeController(EnvelopeOldService envelopeOldService, ILogger<HomeController> logger, IEnvelopeReceiverService envelopeReceiverService, IEnvelopeHistoryService historyService, IStringLocalizer<Resource> localizer, IConfiguration configuration, HtmlSanitizer sanitizer, Cultures cultures, IEnvelopeMailService envelopeMailService, IEnvelopeReceiverReadOnlyService readOnlyService, IAuthenticator authenticator, IReceiverService receiverService, IEnvelopeSmsHandler envelopeSmsService) : base(logger, sanitizer, cultures, localizer)
+    public HomeController(EnvelopeOldService envelopeOldService, ILogger<HomeController> logger, IEnvelopeReceiverService envelopeReceiverService, IEnvelopeHistoryService historyService, IStringLocalizer<Resource> localizer, IConfiguration configuration, HtmlSanitizer sanitizer, Cultures cultures, IEnvelopeMailService envelopeMailService, IEnvelopeReceiverReadOnlyService readOnlyService, IAuthenticator authenticator, IReceiverService receiverService, IEnvelopeSmsHandler envelopeSmsService, IMediator mediator) : base(logger, sanitizer, cultures, localizer)
     {
         this.envelopeOldService = envelopeOldService;
         _envRcvService = envelopeReceiverService;
@@ -52,6 +57,7 @@ public class HomeController : ViewControllerBase
         _authenticator = authenticator;
         _rcvService = receiverService;
         _envSmsHandler = envelopeSmsService;
+        _mediator = mediator;
     }
 
     [HttpGet("/")]
@@ -103,17 +109,10 @@ public class HomeController : ViewControllerBase
 
             ViewData["EnvelopeKey"] = envelopeReceiverId;
 
-            var er_res = await _envRcvService.ReadByEnvelopeReceiverIdAsync(envelopeReceiverId: envelopeReceiverId);
+            var er = await _mediator.ReadEnvelopeReceiverAsync(envelopeReceiverId);
 
-            if (er_res.IsFailed)
-            {
-                _logger.LogNotice(er_res.Notices);
+            if (er is null)
                 return this.ViewEnvelopeNotFound();
-            }
-
-            var er = er_res.Data;
-
-            EnvelopeReceiver response = await envelopeOldService.LoadEnvelope(envelopeReceiverId);
 
             bool accessCodeAlreadyRequested = await _historyService.AccessCodeAlreadyRequested(envelopeId: er.Envelope!.Id, userReference: er.Receiver!.EmailAddress);
             if (!accessCodeAlreadyRequested)
@@ -190,9 +189,6 @@ public class HomeController : ViewControllerBase
 
             _logger.LogInformation("Envelope UUID: [{uuid}]\nReceiver Signature: [{signature}]", uuid, signature);
 
-            //check access code
-            EnvelopeReceiver response = await envelopeOldService.LoadEnvelope(envelopeReceiverId);
-
             //check rejection
             var rejRcvrs = await _historyService.ReadRejectingReceivers(er.Envelope!.Id);
             if (rejRcvrs.Any())
@@ -352,9 +348,6 @@ public class HomeController : ViewControllerBase
 
             _logger.LogInformation("Envelope UUID: [{uuid}]\nReceiver Signature: [{signature}]", uuid, signature);
 
-            //check access code
-            EnvelopeReceiver response = await envelopeOldService.LoadEnvelope(envelopeReceiverId);
-
             var er_secret_res = await _envRcvService.ReadWithSecretByUuidSignatureAsync(uuid: uuid, signature: signature);
 
             if (er_secret_res.IsFailed)

EnvelopeGenerator.Web/Controllers/ReadOnlyController.cs

@@ -1,5 +1,5 @@
 using DigitalData.Core.Abstraction.Application.DTO;
-using EnvelopeGenerator.Application.Contracts.Services;
+using EnvelopeGenerator.Application.Interfaces.Services;
 using EnvelopeGenerator.Application.Dto.EnvelopeReceiverReadOnly;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;

EnvelopeGenerator.Web/Controllers/TFARegController.cs

@@ -9,7 +9,7 @@ using Microsoft.Extensions.Options;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Authentication.Cookies;
 using Microsoft.AspNetCore.Authentication;
-using EnvelopeGenerator.Application.Contracts.Services;
+using EnvelopeGenerator.Application.Interfaces.Services;
 using DigitalData.Core.Abstraction.Application.DTO;
 using static EnvelopeGenerator.Domain.Constants;