Merge branch 'master' of http://git.dd:3000/AppStd/EnvelopeGenerator

- Logo aktualisiert.
 - CSS für Logo hinzugefügt

EnvelopeGenerator.Application/Configurations/DbTriggerParams.cs

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

EnvelopeGenerator.Application/Contracts/IAuthenticator.cs

@@ -1,19 +0,0 @@
-using OtpNet;
-
-namespace EnvelopeGenerator.Application.Contracts
-{
-    public interface IAuthenticator
-    {
-        string GenerateCode(int length);
-
-        string GenerateTotpSecretKey(int? length = null);
-
-        byte[] GenerateTotpQrCode(string userEmail, string secretKey, string? issuer = null, string? totpUrlFormat = null, int? pixelsPerModule = null);
-
-        byte[] GenerateTotpQrCode(string userEmail, int? length = null, string? issuer = null, string? totpUrlFormat = null, int? pixelsPerModule = null);
-
-        string GenerateTotp(string secretKey, int step = 30);
-
-        bool VerifyTotp(string totpCode, string secretKey, int step = 30, VerificationWindow? window = null);
-    }
-}

EnvelopeGenerator.Application/Contracts/IConfigService.cs

@@ -1,17 +0,0 @@
-using DigitalData.Core.Abstractions.Application;
-using DigitalData.Core.DTO;
-using EnvelopeGenerator.Application.DTOs;
-using EnvelopeGenerator.Domain.Entities;
-
-namespace EnvelopeGenerator.Application.Contracts
-{
-    public interface IConfigService : IReadService<ConfigDto, Config, int>
-    {
-        Task<DataResult<ConfigDto>> ReadFirstAsync();
-
-        Task<ConfigDto> ReadDefaultAsync();
-
-        Task<string> ReadDefaultSignatureHost();
-
-	}
-}

EnvelopeGenerator.Application/Contracts/IDocumentReceiverElementService.cs

@@ -1,10 +0,0 @@
-using DigitalData.Core.Abstractions.Application;
-using EnvelopeGenerator.Application.DTOs;
-using EnvelopeGenerator.Domain.Entities;
-
-namespace EnvelopeGenerator.Application.Contracts
-{
-    public interface IDocumentReceiverElementService : IBasicCRUDService<DocumentReceiverElementDto, DocumentReceiverElement, int>
-    {
-    }
-}

EnvelopeGenerator.Application/Contracts/IDocumentStatusService.cs

@@ -1,9 +0,0 @@
-using DigitalData.Core.Abstractions.Application;
-using EnvelopeGenerator.Application.DTOs;
-using EnvelopeGenerator.Domain.Entities;
-namespace EnvelopeGenerator.Application.Contracts
-{
-    public interface IDocumentStatusService : IBasicCRUDService<DocumentStatusDto, DocumentStatus, int>
-    {
-    }
-}

EnvelopeGenerator.Application/Contracts/IEmailTemplateService.cs

@@ -1,13 +0,0 @@
-using DigitalData.Core.Abstractions.Application;
-using DigitalData.Core.DTO;
-using EnvelopeGenerator.Application.DTOs;
-using EnvelopeGenerator.Domain.Entities;
-using static EnvelopeGenerator.Common.Constants;
-
-namespace EnvelopeGenerator.Application.Contracts
-{
-    public interface IEmailTemplateService : IBasicCRUDService<EmailTemplateDto, EmailTemplate, int>
-    {
-        Task<DataResult<EmailTemplateDto>> ReadByNameAsync(EmailTemplateType type);
-    }
-}

EnvelopeGenerator.Application/Contracts/IEnvelopeCertificateService.cs

@@ -1,10 +0,0 @@
-using DigitalData.Core.Abstractions.Application;
-using EnvelopeGenerator.Application.DTOs;
-using EnvelopeGenerator.Domain.Entities;
-
-namespace EnvelopeGenerator.Application.Contracts
-{
-    public interface IEnvelopeCertificateService : IBasicCRUDService<EnvelopeCertificateDto, EnvelopeCertificate, int>
-    {
-    }
-}

EnvelopeGenerator.Application/Contracts/IEnvelopeDocumentService.cs

@@ -1,10 +0,0 @@
-using DigitalData.Core.Abstractions.Application;
-using EnvelopeGenerator.Application.DTOs;
-using EnvelopeGenerator.Domain.Entities;
-
-namespace EnvelopeGenerator.Application.Contracts
-{
-    public interface IEnvelopeDocumentService : IBasicCRUDService<EnvelopeDocumentDto, EnvelopeDocument, int>
-    {
-    }
-}

EnvelopeGenerator.Application/Contracts/IEnvelopeHistoryService.cs

@@ -1,28 +0,0 @@
-using DigitalData.Core.Abstractions.Application;
-using DigitalData.Core.DTO;
-using EnvelopeGenerator.Application.DTOs.EnvelopeHistory;
-using EnvelopeGenerator.Application.DTOs.Receiver;
-using EnvelopeGenerator.Domain.Entities;
-using static EnvelopeGenerator.Common.Constants;
-
-namespace EnvelopeGenerator.Application.Contracts
-{
-    public interface IEnvelopeHistoryService : ICRUDService<EnvelopeHistoryCreateDto, EnvelopeHistoryDto, EnvelopeHistoryDto, EnvelopeHistory, long>
-    {
-        Task<int> CountAsync(int? envelopeId = null, string? userReference = null, int? status = null);
-
-        Task<bool> AccessCodeAlreadyRequested(int envelopeId, string userReference);
-
-        Task<bool> IsSigned(int envelopeId, string userReference);
-
-        Task<bool> IsRejected(int envelopeId, string? userReference = null);
-
-        Task<IEnumerable<EnvelopeHistoryDto>> ReadAsync(int? envelopeId = null, string? userReference = null, ReferenceType? referenceType = null, int? status = null, bool withSender = false, bool withReceiver = false);
-
-        Task<IEnumerable<EnvelopeHistoryDto>> ReadRejectedAsync(int envelopeId, string? userReference = null);
-
-        Task<IEnumerable<ReceiverReadDto>> ReadRejectingReceivers(int envelopeId);
-
-		Task<DataResult<long>> RecordAsync(int envelopeId, string userReference, EnvelopeStatus status, string? comment = null);
-    }
-}

EnvelopeGenerator.Application/Contracts/IEnvelopeMailService.cs

@@ -1,19 +0,0 @@
-using DigitalData.Core.DTO;
-using DigitalData.EmailProfilerDispatcher.Abstraction.Contracts;
-using EnvelopeGenerator.Application.DTOs.EnvelopeReceiver;
-using EnvelopeGenerator.Application.DTOs.EnvelopeReceiverReadOnly;
-using EnvelopeGenerator.Common;
-
-namespace EnvelopeGenerator.Application.Contracts
-{
-    public interface IEnvelopeMailService : IEmailOutService
-    {
-        Task<DataResult<int>> SendAsync(EnvelopeReceiverDto envelopeReceiverDto, Constants.EmailTemplateType tempType, Dictionary<string, object>? optionalPlaceholders = null);
-
-        Task<DataResult<int>> SendAsync(EnvelopeReceiverReadOnlyDto dto, Dictionary<string, object>? optionalPlaceholders = null);
-
-        Task<DataResult<int>> SendAccessCodeAsync(EnvelopeReceiverDto envelopeReceiverDto);
-
-        Task<DataResult<int>> SendTFAQrCodeAsync(EnvelopeReceiverDto envelopeReceiverDto);
-    }
-}

EnvelopeGenerator.Application/Contracts/IEnvelopeReceiverReadOnlyService.cs

@@ -1,10 +0,0 @@
-using DigitalData.Core.Abstractions.Application;
-using EnvelopeGenerator.Application.DTOs.EnvelopeReceiverReadOnly;
-using EnvelopeGenerator.Domain.Entities;
-
-namespace EnvelopeGenerator.Application.Contracts
-{
-    public interface IEnvelopeReceiverReadOnlyService : ICRUDService<EnvelopeReceiverReadOnlyCreateDto, EnvelopeReceiverReadOnlyDto, EnvelopeReceiverReadOnlyUpdateDto, EnvelopeReceiverReadOnly, long>
-    {
-    }
-}

EnvelopeGenerator.Application/Contracts/IEnvelopeReceiverService.cs

@@ -1,38 +0,0 @@
-using DigitalData.Core.Abstractions.Application;
-using DigitalData.Core.DTO;
-using EnvelopeGenerator.Application.DTOs.EnvelopeReceiver;
-using EnvelopeGenerator.Application.DTOs.Messaging;
-using EnvelopeGenerator.Domain.Entities;
-
-namespace EnvelopeGenerator.Application.Contracts
-{
-    public interface IEnvelopeReceiverService : IBasicCRUDService<EnvelopeReceiverDto, EnvelopeReceiver, (int Envelope, int Receiver)>
-    {
-
-        Task<DataResult<IEnumerable<EnvelopeReceiverDto>>> ReadByUuidAsync(string uuid, bool withEnvelope = true, bool withReceiver = false, bool readOnly = true);
-
-        Task<DataResult<IEnumerable<string?>>> ReadAccessCodeByUuidAsync(string uuid, bool withEnvelope = false, bool withReceiver = true);
-
-        Task<DataResult<IEnumerable<EnvelopeReceiverDto>>> ReadBySignatureAsync(string signature, bool withEnvelope = false, bool withReceiver = true, bool readOnly = true);
-
-        Task<DataResult<EnvelopeReceiverDto>> ReadByUuidSignatureAsync(string uuid, string signature, bool withEnvelope = true, bool withReceiver = true, bool readOnly = true);
-
-        Task<DataResult<EnvelopeReceiverSecretDto>> ReadWithSecretByUuidSignatureAsync(string uuid, string signature, bool withEnvelope = true, bool withReceiver = true, bool readOnly = true);
-
-        Task<DataResult<EnvelopeReceiverDto>> ReadByEnvelopeReceiverIdAsync(string envelopeReceiverId, bool withEnvelope = true, bool withReceiver = true, bool readOnly = true);
-
-        Task<DataResult<string>> ReadAccessCodeByIdAsync(int envelopeId, int receiverId);
-        
-		Task<DataResult<bool>> VerifyAccessCodeAsync(string uuid, string signature, string accessCode);
-
-        Task<DataResult<bool>> VerifyAccessCodeAsync(string envelopeReceiverId, string accessCode);
-
-        Task<DataResult<bool>> IsExisting(string envelopeReceiverId);
-
-        Task<DataResult<IEnumerable<EnvelopeReceiverDto>>> ReadByUsernameAsync(string username, int? min_status = null, int? max_status = null, params int[] ignore_statuses);
-
-        Task<DataResult<string?>> ReadLastUsedReceiverNameByMail(string mail);
-
-        Task<DataResult<SmsResponse>> SendSmsAsync(string envelopeReceiverId, string message);
-    }
-}

EnvelopeGenerator.Application/Contracts/IEnvelopeService.cs

@@ -1,16 +0,0 @@
-using DigitalData.Core.Abstractions.Application;
-using DigitalData.Core.DTO;
-using EnvelopeGenerator.Application.DTOs;
-using EnvelopeGenerator.Domain.Entities;
-
-namespace EnvelopeGenerator.Application.Contracts
-{
-    public interface IEnvelopeService : IBasicCRUDService<EnvelopeDto, Envelope, int>
-    {
-        Task<DataResult<IEnumerable<EnvelopeDto>>> ReadAllWithAsync(bool documents = false, bool history = false, bool documentReceiverElement = false);
-
-        Task<DataResult<EnvelopeDto>> ReadByUuidAsync(string uuid, bool withDocuments = false, bool withHistory = false, bool withDocumentReceiverElement = false, bool withUser = false, bool withAll = false);
-
-        Task<DataResult<IEnumerable<EnvelopeDto>>> ReadByUserAsync(int userId, int? min_status = null, int? max_status = null, params int[]ignore_statuses);
-    }
-}

EnvelopeGenerator.Application/Contracts/IEnvelopeTypeService.cs

@@ -1,10 +0,0 @@
-using DigitalData.Core.Abstractions.Application;
-using EnvelopeGenerator.Application.DTOs;
-using EnvelopeGenerator.Domain.Entities;
-
-namespace EnvelopeGenerator.Application.Contracts
-{
-    public interface IEnvelopeTypeService : IBasicCRUDService<EnvelopeTypeDto, EnvelopeType, int>
-    {
-    }
-}

EnvelopeGenerator.Application/Contracts/IReceiverService.cs

@@ -1,17 +0,0 @@
-using DigitalData.Core.Abstractions;
-using DigitalData.Core.Abstractions.Application;
-using DigitalData.Core.DTO;
-using EnvelopeGenerator.Application.DTOs.Receiver;
-using EnvelopeGenerator.Domain.Entities;
-
-namespace EnvelopeGenerator.Application.Contracts
-{
-    public interface IReceiverService : ICRUDService<ReceiverCreateDto, ReceiverReadDto, ReceiverUpdateDto, Receiver, int>
-    {
-        Task<DataResult<ReceiverReadDto>> ReadByAsync(string? emailAddress = null, string? signature = null);
-
-        Task<Result> DeleteByAsync(string? emailAddress = null, string? signature = null);
-
-        Task<Result> UpdateAsync<TUpdateDto>(TUpdateDto updateDto) where TUpdateDto : IUnique<int>;
-    }
-}

EnvelopeGenerator.Application/Contracts/IUserReceiverService.cs

@@ -1,10 +0,0 @@
-using DigitalData.Core.Abstractions.Application;
-using EnvelopeGenerator.Application.DTOs;
-using EnvelopeGenerator.Domain.Entities;
-
-namespace EnvelopeGenerator.Application.Contracts
-{
-    public interface IUserReceiverService : IBasicCRUDService<UserReceiverDto, UserReceiver, int>
-    {
-    }
-}

EnvelopeGenerator.Application/Contracts/Repositories/IConfigRepository.cs

@@ -0,0 +1,9 @@
+using DigitalData.Core.Abstractions.Infrastructure;
+using EnvelopeGenerator.Domain.Entities;
+
+namespace EnvelopeGenerator.Application.Contracts.Repositories;
+
+public interface IConfigRepository : ICRUDRepository<Config, int>
+{
+    Task<Config?> ReadFirstAsync();
+}

EnvelopeGenerator.Application/Contracts/Repositories/IDocumentReceiverElementRepository.cs

@@ -0,0 +1,8 @@
+using DigitalData.Core.Abstractions.Infrastructure;
+using EnvelopeGenerator.Domain.Entities;
+
+namespace EnvelopeGenerator.Application.Contracts.Repositories;
+
+public interface IDocumentReceiverElementRepository : ICRUDRepository<DocumentReceiverElement, int>
+{
+}

EnvelopeGenerator.Application/Contracts/Repositories/IDocumentStatusRepository.cs

@@ -0,0 +1,8 @@
+using DigitalData.Core.Abstractions.Infrastructure;
+using EnvelopeGenerator.Domain.Entities;
+
+namespace EnvelopeGenerator.Application.Contracts.Repositories;
+
+public interface IDocumentStatusRepository : ICRUDRepository<DocumentStatus, int>
+{
+}

EnvelopeGenerator.Application/Contracts/Repositories/IEmailTemplateRepository.cs

@@ -0,0 +1,10 @@
+using DigitalData.Core.Abstractions.Infrastructure;
+using EnvelopeGenerator.Domain.Entities;
+using static EnvelopeGenerator.Common.Constants;
+
+namespace EnvelopeGenerator.Application.Contracts.Repositories;
+
+public interface IEmailTemplateRepository : ICRUDRepository<EmailTemplate, int>
+{
+    Task<EmailTemplate?> ReadByNameAsync(EmailTemplateType type);
+}

EnvelopeGenerator.Application/Contracts/Repositories/IEnvelopeCertificateRepository.cs

@@ -0,0 +1,8 @@
+using DigitalData.Core.Abstractions.Infrastructure;
+using EnvelopeGenerator.Domain.Entities;
+
+namespace EnvelopeGenerator.Application.Contracts.Repositories;
+
+public interface IEnvelopeCertificateRepository : ICRUDRepository<EnvelopeCertificate, int>
+{
+}

EnvelopeGenerator.Application/Contracts/Repositories/IEnvelopeDocumentRepository.cs

@@ -0,0 +1,8 @@
+using DigitalData.Core.Abstractions.Infrastructure;
+using EnvelopeGenerator.Domain.Entities;
+
+namespace EnvelopeGenerator.Application.Contracts.Repositories;
+
+public interface IEnvelopeDocumentRepository : ICRUDRepository<EnvelopeDocument, int>
+{
+}

EnvelopeGenerator.Application/Contracts/Repositories/IEnvelopeHistoryRepository.cs

@@ -0,0 +1,11 @@
+using DigitalData.Core.Abstractions.Infrastructure;
+using EnvelopeGenerator.Domain.Entities;
+
+namespace EnvelopeGenerator.Application.Contracts.Repositories;
+
+public interface IEnvelopeHistoryRepository : ICRUDRepository<EnvelopeHistory, long>
+{
+    Task<int> CountAsync(int? envelopeId = null, string? userReference = null, int? status = null);
+
+    Task<IEnumerable<EnvelopeHistory>> ReadAsync(int? envelopeId = null, string? userReference = null, int? status = null, bool withSender = false, bool withReceiver = false);
+}

EnvelopeGenerator.Application/Contracts/Repositories/IEnvelopeReceiverReadOnlyRepository.cs

@@ -0,0 +1,8 @@
+using DigitalData.Core.Abstractions.Infrastructure;
+using EnvelopeGenerator.Domain.Entities;
+
+namespace EnvelopeGenerator.Application.Contracts.Repositories;
+
+public interface IEnvelopeReceiverReadOnlyRepository : ICRUDRepository<EnvelopeReceiverReadOnly, long>
+{
+}

EnvelopeGenerator.Application/Contracts/Repositories/IEnvelopeReceiverRepository.cs

@@ -0,0 +1,25 @@
+using DigitalData.Core.Abstractions.Infrastructure;
+using EnvelopeGenerator.Domain.Entities;
+
+namespace EnvelopeGenerator.Application.Contracts.Repositories;
+
+public interface IEnvelopeReceiverRepository : ICRUDRepository<EnvelopeReceiver, (int Envelope, int Receiver)>
+{
+    Task<IEnumerable<EnvelopeReceiver>> ReadByUuidAsync(string uuid, bool withEnvelope = true, bool withReceiver = false, bool readOnly = true);
+
+    Task<IEnumerable<EnvelopeReceiver>> ReadBySignatureAsync(string signature, bool withEnvelope = false, bool withReceiver = true, bool readOnly = true);
+
+    Task<EnvelopeReceiver?> ReadByUuidSignatureAsync(string uuid, string signature, bool withEnvelope = true, bool withReceiver = true, bool readOnly = true);
+
+    Task<string?> ReadAccessCodeAsync(string uuid, string signature, bool readOnly = true);
+
+    Task<int> CountAsync(string uuid, string signature);
+
+    Task<EnvelopeReceiver?> ReadByIdAsync(int envelopeId, int receiverId, bool readOnly = true);
+
+    Task<string?> ReadAccessCodeByIdAsync(int envelopeId, int receiverId, bool readOnly = true);
+
+    Task<IEnumerable<EnvelopeReceiver>> ReadByUsernameAsync(string username, int? min_status = null, int? max_status = null, params int[] ignore_statuses);
+
+    Task<EnvelopeReceiver?> ReadLastByReceiver(string email);
+}

EnvelopeGenerator.Application/Contracts/Repositories/IEnvelopeRepository.cs

@@ -0,0 +1,13 @@
+using DigitalData.Core.Abstractions.Infrastructure;
+using EnvelopeGenerator.Domain.Entities;
+
+namespace EnvelopeGenerator.Application.Contracts.Repositories;
+
+public interface IEnvelopeRepository : ICRUDRepository<Envelope, int>
+{
+    Task<IEnumerable<Envelope>> ReadAllWithAsync(bool documents = false, bool history = false, bool documentReceiverElement = false);
+
+    Task<Envelope?> ReadByUuidAsync(string uuid, bool withDocuments = false, bool withHistory = false, bool withDocumentReceiverElement = false, bool withUser = false, bool withAll = false);
+
+    Task<IEnumerable<Envelope>> ReadByUserAsync(int userId, int? min_status = null, int? max_status = null, params int[] ignore_statuses);
+}

EnvelopeGenerator.Application/Contracts/Repositories/IEnvelopeTypeRepository.cs

@@ -0,0 +1,8 @@
+using DigitalData.Core.Abstractions.Infrastructure;
+using EnvelopeGenerator.Domain.Entities;
+
+namespace EnvelopeGenerator.Application.Contracts.Repositories;
+
+public interface IEnvelopeTypeRepository : ICRUDRepository<EnvelopeType, int>
+{
+}

EnvelopeGenerator.Application/Contracts/Repositories/IReceiverRepository.cs

@@ -0,0 +1,9 @@
+using DigitalData.Core.Abstractions.Infrastructure;
+using EnvelopeGenerator.Domain.Entities;
+
+namespace EnvelopeGenerator.Application.Contracts.Repositories;
+
+public interface IReceiverRepository : ICRUDRepository<Receiver, int>
+{
+    Task<Receiver?> ReadByAsync(string? emailAddress = null, string? signature = null);
+}

EnvelopeGenerator.Application/Contracts/Repositories/IUserReceiverRepository.cs

@@ -0,0 +1,8 @@
+using DigitalData.Core.Abstractions.Infrastructure;
+using EnvelopeGenerator.Domain.Entities;
+
+namespace EnvelopeGenerator.Application.Contracts.Repositories;
+
+public interface IUserReceiverRepository : ICRUDRepository<UserReceiver, int>
+{
+}

EnvelopeGenerator.Application/Contracts/Services/IAuthenticator.cs

@@ -0,0 +1,18 @@
+using OtpNet;
+
+namespace EnvelopeGenerator.Application.Contracts.Services;
+
+public interface IAuthenticator
+{
+    string GenerateCode(int length);
+
+    string GenerateTotpSecretKey(int? length = null);
+
+    byte[] GenerateTotpQrCode(string userEmail, string secretKey, string? issuer = null, string? totpUrlFormat = null, int? pixelsPerModule = null);
+
+    byte[] GenerateTotpQrCode(string userEmail, int? length = null, string? issuer = null, string? totpUrlFormat = null, int? pixelsPerModule = null);
+
+    string GenerateTotp(string secretKey, int step = 30);
+
+    bool VerifyTotp(string totpCode, string secretKey, int step = 30, VerificationWindow? window = null);
+}

EnvelopeGenerator.Application/Contracts/Services/IConfigService.cs

@@ -0,0 +1,16 @@
+using DigitalData.Core.Abstractions.Application;
+using DigitalData.Core.DTO;
+using EnvelopeGenerator.Application.DTOs;
+using EnvelopeGenerator.Domain.Entities;
+
+namespace EnvelopeGenerator.Application.Contracts.Services;
+
+public interface IConfigService : IReadService<ConfigDto, Config, int>
+{
+    Task<DataResult<ConfigDto>> ReadFirstAsync();
+
+    Task<ConfigDto> ReadDefaultAsync();
+
+    Task<string> ReadDefaultSignatureHost();
+
+}

EnvelopeGenerator.Application/Contracts/Services/IDocumentReceiverElementService.cs

@@ -0,0 +1,9 @@
+using DigitalData.Core.Abstractions.Application;
+using EnvelopeGenerator.Application.DTOs;
+using EnvelopeGenerator.Domain.Entities;
+
+namespace EnvelopeGenerator.Application.Contracts.Services;
+
+public interface IDocumentReceiverElementService : IBasicCRUDService<DocumentReceiverElementDto, DocumentReceiverElement, int>
+{
+}

EnvelopeGenerator.Application/Contracts/Services/IDocumentStatusService.cs

@@ -0,0 +1,8 @@
+using DigitalData.Core.Abstractions.Application;
+using EnvelopeGenerator.Application.DTOs;
+using EnvelopeGenerator.Domain.Entities;
+namespace EnvelopeGenerator.Application.Contracts.Services;
+
+public interface IDocumentStatusService : IBasicCRUDService<DocumentStatusDto, DocumentStatus, int>
+{
+}

EnvelopeGenerator.Application/Contracts/Services/IEmailTemplateService.cs

@@ -0,0 +1,12 @@
+using DigitalData.Core.Abstractions.Application;
+using DigitalData.Core.DTO;
+using EnvelopeGenerator.Application.DTOs;
+using EnvelopeGenerator.Domain.Entities;
+using static EnvelopeGenerator.Common.Constants;
+
+namespace EnvelopeGenerator.Application.Contracts.Services;
+
+public interface IEmailTemplateService : IBasicCRUDService<EmailTemplateDto, EmailTemplate, int>
+{
+    Task<DataResult<EmailTemplateDto>> ReadByNameAsync(EmailTemplateType type);
+}

EnvelopeGenerator.Application/Contracts/Services/IEnvelopeCertificateService.cs

@@ -0,0 +1,9 @@
+using DigitalData.Core.Abstractions.Application;
+using EnvelopeGenerator.Application.DTOs;
+using EnvelopeGenerator.Domain.Entities;
+
+namespace EnvelopeGenerator.Application.Contracts.Services;
+
+public interface IEnvelopeCertificateService : IBasicCRUDService<EnvelopeCertificateDto, EnvelopeCertificate, int>
+{
+}

EnvelopeGenerator.Application/Contracts/Services/IEnvelopeDocumentService.cs

@@ -0,0 +1,9 @@
+using DigitalData.Core.Abstractions.Application;
+using EnvelopeGenerator.Application.DTOs;
+using EnvelopeGenerator.Domain.Entities;
+
+namespace EnvelopeGenerator.Application.Contracts.Services;
+
+public interface IEnvelopeDocumentService : IBasicCRUDService<EnvelopeDocumentDto, EnvelopeDocument, int>
+{
+}

EnvelopeGenerator.Application/Contracts/Services/IEnvelopeHistoryService.cs

@@ -0,0 +1,27 @@
+using DigitalData.Core.Abstractions.Application;
+using DigitalData.Core.DTO;
+using EnvelopeGenerator.Application.DTOs.EnvelopeHistory;
+using EnvelopeGenerator.Application.DTOs.Receiver;
+using EnvelopeGenerator.Domain.Entities;
+using static EnvelopeGenerator.Common.Constants;
+
+namespace EnvelopeGenerator.Application.Contracts.Services;
+
+public interface IEnvelopeHistoryService : ICRUDService<EnvelopeHistoryCreateDto, EnvelopeHistoryDto, EnvelopeHistoryDto, EnvelopeHistory, long>
+{
+    Task<int> CountAsync(int? envelopeId = null, string? userReference = null, int? status = null);
+
+    Task<bool> AccessCodeAlreadyRequested(int envelopeId, string userReference);
+
+    Task<bool> IsSigned(int envelopeId, string userReference);
+
+    Task<bool> IsRejected(int envelopeId, string? userReference = null);
+
+    Task<IEnumerable<EnvelopeHistoryDto>> ReadAsync(int? envelopeId = null, string? userReference = null, ReferenceType? referenceType = null, int? status = null, bool withSender = false, bool withReceiver = false);
+
+    Task<IEnumerable<EnvelopeHistoryDto>> ReadRejectedAsync(int envelopeId, string? userReference = null);
+
+    Task<IEnumerable<ReceiverReadDto>> ReadRejectingReceivers(int envelopeId);
+
+    Task<DataResult<long>> RecordAsync(int envelopeId, string userReference, EnvelopeStatus status, string? comment = null);
+}

EnvelopeGenerator.Application/Contracts/Services/IEnvelopeMailService.cs

@@ -0,0 +1,18 @@
+using DigitalData.Core.DTO;
+using DigitalData.EmailProfilerDispatcher.Abstraction.Contracts;
+using EnvelopeGenerator.Application.DTOs.EnvelopeReceiver;
+using EnvelopeGenerator.Application.DTOs.EnvelopeReceiverReadOnly;
+using EnvelopeGenerator.Common;
+
+namespace EnvelopeGenerator.Application.Contracts.Services;
+
+public interface IEnvelopeMailService : IEmailOutService
+{
+    Task<DataResult<int>> SendAsync(EnvelopeReceiverDto envelopeReceiverDto, Constants.EmailTemplateType tempType, Dictionary<string, object>? optionalPlaceholders = null);
+
+    Task<DataResult<int>> SendAsync(EnvelopeReceiverReadOnlyDto dto, Dictionary<string, object>? optionalPlaceholders = null);
+
+    Task<DataResult<int>> SendAccessCodeAsync(EnvelopeReceiverDto envelopeReceiverDto);
+
+    Task<DataResult<int>> SendTFAQrCodeAsync(EnvelopeReceiverDto envelopeReceiverDto);
+}

EnvelopeGenerator.Application/Contracts/Services/IEnvelopeReceiverReadOnlyService.cs

@@ -0,0 +1,9 @@
+using DigitalData.Core.Abstractions.Application;
+using EnvelopeGenerator.Application.DTOs.EnvelopeReceiverReadOnly;
+using EnvelopeGenerator.Domain.Entities;
+
+namespace EnvelopeGenerator.Application.Contracts.Services;
+
+public interface IEnvelopeReceiverReadOnlyService : ICRUDService<EnvelopeReceiverReadOnlyCreateDto, EnvelopeReceiverReadOnlyDto, EnvelopeReceiverReadOnlyUpdateDto, EnvelopeReceiverReadOnly, long>
+{
+}

EnvelopeGenerator.Application/Contracts/Services/IEnvelopeReceiverService.cs

@@ -0,0 +1,37 @@
+using DigitalData.Core.Abstractions.Application;
+using DigitalData.Core.DTO;
+using EnvelopeGenerator.Application.DTOs.EnvelopeReceiver;
+using EnvelopeGenerator.Application.DTOs.Messaging;
+using EnvelopeGenerator.Domain.Entities;
+
+namespace EnvelopeGenerator.Application.Contracts.Services;
+
+public interface IEnvelopeReceiverService : IBasicCRUDService<EnvelopeReceiverDto, EnvelopeReceiver, (int Envelope, int Receiver)>
+{
+
+    Task<DataResult<IEnumerable<EnvelopeReceiverDto>>> ReadByUuidAsync(string uuid, bool withEnvelope = true, bool withReceiver = false, bool readOnly = true);
+
+    Task<DataResult<IEnumerable<string?>>> ReadAccessCodeByUuidAsync(string uuid, bool withEnvelope = false, bool withReceiver = true);
+
+    Task<DataResult<IEnumerable<EnvelopeReceiverDto>>> ReadBySignatureAsync(string signature, bool withEnvelope = false, bool withReceiver = true, bool readOnly = true);
+
+    Task<DataResult<EnvelopeReceiverDto>> ReadByUuidSignatureAsync(string uuid, string signature, bool withEnvelope = true, bool withReceiver = true, bool readOnly = true);
+
+    Task<DataResult<EnvelopeReceiverSecretDto>> ReadWithSecretByUuidSignatureAsync(string uuid, string signature, bool withEnvelope = true, bool withReceiver = true, bool readOnly = true);
+
+    Task<DataResult<EnvelopeReceiverDto>> ReadByEnvelopeReceiverIdAsync(string envelopeReceiverId, bool withEnvelope = true, bool withReceiver = true, bool readOnly = true);
+
+    Task<DataResult<string>> ReadAccessCodeByIdAsync(int envelopeId, int receiverId);
+
+    Task<DataResult<bool>> VerifyAccessCodeAsync(string uuid, string signature, string accessCode);
+
+    Task<DataResult<bool>> VerifyAccessCodeAsync(string envelopeReceiverId, string accessCode);
+
+    Task<DataResult<bool>> IsExisting(string envelopeReceiverId);
+
+    Task<DataResult<IEnumerable<EnvelopeReceiverDto>>> ReadByUsernameAsync(string username, int? min_status = null, int? max_status = null, params int[] ignore_statuses);
+
+    Task<DataResult<string?>> ReadLastUsedReceiverNameByMail(string mail);
+
+    Task<DataResult<SmsResponse>> SendSmsAsync(string envelopeReceiverId, string message);
+}

EnvelopeGenerator.Application/Contracts/Services/IEnvelopeService.cs

@@ -0,0 +1,15 @@
+using DigitalData.Core.Abstractions.Application;
+using DigitalData.Core.DTO;
+using EnvelopeGenerator.Application.DTOs;
+using EnvelopeGenerator.Domain.Entities;
+
+namespace EnvelopeGenerator.Application.Contracts.Services;
+
+public interface IEnvelopeService : IBasicCRUDService<EnvelopeDto, Envelope, int>
+{
+    Task<DataResult<IEnumerable<EnvelopeDto>>> ReadAllWithAsync(bool documents = false, bool history = false, bool documentReceiverElement = false);
+
+    Task<DataResult<EnvelopeDto>> ReadByUuidAsync(string uuid, bool withDocuments = false, bool withHistory = false, bool withDocumentReceiverElement = false, bool withUser = false, bool withAll = false);
+
+    Task<DataResult<IEnumerable<EnvelopeDto>>> ReadByUserAsync(int userId, int? min_status = null, int? max_status = null, params int[] ignore_statuses);
+}

EnvelopeGenerator.Application/Contracts/Services/IEnvelopeSmsHandler.cs

@@ -1,7 +1,7 @@
 using EnvelopeGenerator.Application.DTOs.EnvelopeReceiver;
 using EnvelopeGenerator.Application.DTOs.Messaging;
 
-namespace EnvelopeGenerator.Application.Contracts;
+namespace EnvelopeGenerator.Application.Contracts.Services;
 
 public interface IEnvelopeSmsHandler
 {

EnvelopeGenerator.Application/Contracts/Services/IEnvelopeTypeService.cs

@@ -0,0 +1,9 @@
+using DigitalData.Core.Abstractions.Application;
+using EnvelopeGenerator.Application.DTOs;
+using EnvelopeGenerator.Domain.Entities;
+
+namespace EnvelopeGenerator.Application.Contracts.Services;
+
+public interface IEnvelopeTypeService : IBasicCRUDService<EnvelopeTypeDto, EnvelopeType, int>
+{
+}

EnvelopeGenerator.Application/Contracts/Services/IReceiverService.cs

@@ -0,0 +1,16 @@
+using DigitalData.Core.Abstractions;
+using DigitalData.Core.Abstractions.Application;
+using DigitalData.Core.DTO;
+using EnvelopeGenerator.Application.DTOs.Receiver;
+using EnvelopeGenerator.Domain.Entities;
+
+namespace EnvelopeGenerator.Application.Contracts.Services;
+
+public interface IReceiverService : ICRUDService<ReceiverCreateDto, ReceiverReadDto, ReceiverUpdateDto, Receiver, int>
+{
+    Task<DataResult<ReceiverReadDto>> ReadByAsync(string? emailAddress = null, string? signature = null);
+
+    Task<Result> DeleteByAsync(string? emailAddress = null, string? signature = null);
+
+    Task<Result> UpdateAsync<TUpdateDto>(TUpdateDto updateDto) where TUpdateDto : IUnique<int>;
+}

EnvelopeGenerator.Application/Contracts/Services/ISmsSender.cs

@@ -1,6 +1,6 @@
 using EnvelopeGenerator.Application.DTOs.Messaging;
 
-namespace EnvelopeGenerator.Application.Contracts;
+namespace EnvelopeGenerator.Application.Contracts.Services;
 
 //TODO: move to DigitalData.Core
 public interface ISmsSender

EnvelopeGenerator.Application/Contracts/Services/IUserReceiverService.cs

@@ -0,0 +1,9 @@
+using DigitalData.Core.Abstractions.Application;
+using EnvelopeGenerator.Application.DTOs;
+using EnvelopeGenerator.Domain.Entities;
+
+namespace EnvelopeGenerator.Application.Contracts.Services;
+
+public interface IUserReceiverService : IBasicCRUDService<UserReceiverDto, UserReceiver, int>
+{
+}

EnvelopeGenerator.Application/EnvelopeGenerator.Application.csproj

@@ -26,8 +26,8 @@
 	</ItemGroup>
 
 	<ItemGroup>
+		<ProjectReference Include="..\EnvelopeGenerator.Domain\EnvelopeGenerator.Domain.csproj" />
 		<ProjectReference Include="..\EnvelopeGenerator.Extensions\EnvelopeGenerator.Extensions.csproj" />
-		<ProjectReference Include="..\EnvelopeGenerator.Infrastructure\EnvelopeGenerator.Infrastructure.csproj" />
 	</ItemGroup>
 
 	<ItemGroup>

EnvelopeGenerator.Application/Extensions/DIExtensions.cs

@@ -1,39 +1,21 @@
 using DigitalData.UserManager.Application.MappingProfiles;
-using EnvelopeGenerator.Application.Contracts;
 using EnvelopeGenerator.Application.MappingProfiles;
 using EnvelopeGenerator.Application.Configurations;
 using EnvelopeGenerator.Application.Services;
-using EnvelopeGenerator.Infrastructure.Contracts;
-using EnvelopeGenerator.Infrastructure.Repositories;
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.DependencyInjection.Extensions;
 using DigitalData.Core.Client;
 using QRCoder;
+using EnvelopeGenerator.Application.Contracts.Services;
 
 namespace EnvelopeGenerator.Application.Extensions;
 
 public static class DIExtensions
 {
-    public static IServiceCollection AddEnvelopeGenerator(this IServiceCollection services, IConfiguration config)
+    public static IServiceCollection AddEnvelopeGeneratorServices(this IServiceCollection services, IConfiguration config)
     {
         //Inject CRUD Service and repositoriesad
-        services.TryAddScoped<IConfigRepository, ConfigRepository>();
-        services.TryAddScoped<IDocumentReceiverElementRepository, DocumentReceiverElementRepository>();
-        services.TryAddScoped<IEnvelopeDocumentRepository, EnvelopeDocumentRepository>();
-        services.TryAddScoped<IConfigRepository, ConfigRepository>();
-        services.TryAddScoped<IDocumentReceiverElementRepository, DocumentReceiverElementRepository>();
-        services.TryAddScoped<IDocumentStatusRepository, DocumentStatusRepository>();
-        services.TryAddScoped<IEmailTemplateRepository, EmailTemplateRepository>();
-        services.TryAddScoped<IEnvelopeRepository, EnvelopeRepository>();
-        services.TryAddScoped<IEnvelopeCertificateRepository, EnvelopeCertificateRepository>();
-        services.TryAddScoped<IEnvelopeDocumentRepository, EnvelopeDocumentRepository>();
-        services.TryAddScoped<IEnvelopeHistoryRepository, EnvelopeHistoryRepository>();
-        services.TryAddScoped<IEnvelopeReceiverRepository, EnvelopeReceiverRepository>();
-        services.TryAddScoped<IEnvelopeTypeRepository, EnvelopeTypeRepository>();
-        services.TryAddScoped<IReceiverRepository, ReceiverRepository>();
-        services.TryAddScoped<IUserReceiverRepository, UserReceiverRepository>();
-        services.TryAddScoped<IEnvelopeReceiverReadOnlyRepository, EnvelopeReceiverReadOnlyRepository>();
         services.TryAddScoped<IConfigService, ConfigService>();
         services.TryAddScoped<IDocumentReceiverElementService, DocumentReceiverElementService>();
         services.TryAddScoped<IEnvelopeDocumentService, EnvelopeDocumentService>();
@@ -57,6 +39,7 @@ public static class DIExtensions
         services.Configure<MailParams>(config.GetSection(nameof(MailParams)));
         services.Configure<AuthenticatorParams>(config.GetSection(nameof(AuthenticatorParams)));
         services.Configure<TotpSmsParams>(config.GetSection(nameof(TotpSmsParams)));
+        services.Configure<DbTriggerParams>(config.GetSection(nameof(DbTriggerParams)));
 
         services.AddHttpClientService<GtxMessagingParams>(config.GetSection(nameof(GtxMessagingParams)));
         services.TryAddSingleton<ISmsSender, GTXSmsSender>();

EnvelopeGenerator.Application/Services/Authenticator.cs

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

EnvelopeGenerator.Application/Services/ConfigService.cs

@@ -1,16 +1,16 @@
 using AutoMapper;
 using DigitalData.Core.Application;
 using DigitalData.Core.DTO;
-using EnvelopeGenerator.Application.Contracts;
+using EnvelopeGenerator.Application.Contracts.Services;
 using EnvelopeGenerator.Application.DTOs;
 using EnvelopeGenerator.Domain.Entities;
-using EnvelopeGenerator.Infrastructure.Contracts;
+using EnvelopeGenerator.Application.Contracts.Repositories;
 using Microsoft.Extensions.Caching.Memory;
 using Microsoft.Extensions.Logging;
-namespace EnvelopeGenerator.Application.Services
+namespace EnvelopeGenerator.Application.Services;
+
+public class ConfigService : ReadService<IConfigRepository, ConfigDto, Config, int>, IConfigService
 {
-    public class ConfigService : ReadService<IConfigRepository, ConfigDto, Config, int>, IConfigService
-    {
 		private static readonly Guid DefaultConfigCacheId = Guid.NewGuid();
 
 		private readonly IMemoryCache _cache;
@@ -56,5 +56,4 @@ namespace EnvelopeGenerator.Application.Services
     }
 
     public async Task<string> ReadDefaultSignatureHost() => (await ReadDefaultAsync()).SignatureHost;
-    }
 }

EnvelopeGenerator.Application/Services/DocumentReceiverElementService.cs

@@ -1,17 +1,16 @@
 using AutoMapper;
 using DigitalData.Core.Application;
-using EnvelopeGenerator.Application.Contracts;
+using EnvelopeGenerator.Application.Contracts.Services;
 using EnvelopeGenerator.Application.DTOs;
 using EnvelopeGenerator.Domain.Entities;
-using EnvelopeGenerator.Infrastructure.Contracts;
+using EnvelopeGenerator.Application.Contracts.Repositories;
 
-namespace EnvelopeGenerator.Application.Services
+namespace EnvelopeGenerator.Application.Services;
+
+public class DocumentReceiverElementService : BasicCRUDService<IDocumentReceiverElementRepository, DocumentReceiverElementDto, DocumentReceiverElement, int>, IDocumentReceiverElementService
 {
-    public class DocumentReceiverElementService : BasicCRUDService<IDocumentReceiverElementRepository, DocumentReceiverElementDto, DocumentReceiverElement, int>, IDocumentReceiverElementService
-    {
     public DocumentReceiverElementService(IDocumentReceiverElementRepository repository, IMapper mapper)
         : base(repository, mapper)
     {
     }
-    }
 }

EnvelopeGenerator.Application/Services/DocumentStatusService.cs

@@ -1,17 +1,16 @@
 using AutoMapper;
 using DigitalData.Core.Application;
-using EnvelopeGenerator.Application.Contracts;
+using EnvelopeGenerator.Application.Contracts.Services;
 using EnvelopeGenerator.Application.DTOs;
 using EnvelopeGenerator.Domain.Entities;
-using EnvelopeGenerator.Infrastructure.Contracts;
+using EnvelopeGenerator.Application.Contracts.Repositories;
 
-namespace EnvelopeGenerator.Application.Services
+namespace EnvelopeGenerator.Application.Services;
+
+public class DocumentStatusService : BasicCRUDService<IDocumentStatusRepository, DocumentStatusDto, DocumentStatus, int>, IDocumentStatusService
 {
-    public class DocumentStatusService : BasicCRUDService<IDocumentStatusRepository, DocumentStatusDto, DocumentStatus, int>, IDocumentStatusService
-    {
     public DocumentStatusService(IDocumentStatusRepository repository, IMapper mapper)
         : base(repository, mapper)
     {
     }
-    }
 }

EnvelopeGenerator.Application/Services/EmailTemplateService.cs

@@ -1,17 +1,17 @@
 using AutoMapper;
 using DigitalData.Core.Application;
-using EnvelopeGenerator.Application.Contracts;
 using EnvelopeGenerator.Application.DTOs;
 using EnvelopeGenerator.Domain.Entities;
-using EnvelopeGenerator.Infrastructure.Contracts;
+using EnvelopeGenerator.Application.Contracts.Repositories;
 using static EnvelopeGenerator.Common.Constants;
 using DigitalData.Core.DTO;
 using Microsoft.Extensions.Logging;
+using EnvelopeGenerator.Application.Contracts.Services;
 
-namespace EnvelopeGenerator.Application.Services
+namespace EnvelopeGenerator.Application.Services;
+
+public class EmailTemplateService : BasicCRUDService<IEmailTemplateRepository, EmailTemplateDto, EmailTemplate, int>, IEmailTemplateService
 {
-    public class EmailTemplateService : BasicCRUDService<IEmailTemplateRepository, EmailTemplateDto, EmailTemplate, int>, IEmailTemplateService
-    {
     public EmailTemplateService(IEmailTemplateRepository repository, IMapper mapper)
         : base(repository, mapper)
     {
@@ -26,5 +26,4 @@ namespace EnvelopeGenerator.Application.Services
                 .Notice(LogLevel.Error, Flag.DataIntegrityIssue, $"EmailTemplateType '{type}' is not found in DB. Please, define required e-mail template.")
             : Result.Success(_mapper.Map<EmailTemplateDto>(temp));
     }
-    }
 }

EnvelopeGenerator.Application/Services/EnvelopeCertificateService.cs

@@ -1,19 +1,17 @@
 using AutoMapper;
 using DigitalData.Core.Application;
 using Microsoft.Extensions.Localization;
-using EnvelopeGenerator.Application.Contracts;
 using EnvelopeGenerator.Application.DTOs;
 using EnvelopeGenerator.Domain.Entities;
-using EnvelopeGenerator.Infrastructure.Contracts;
+using EnvelopeGenerator.Application.Contracts.Repositories;
-using EnvelopeGenerator.Application.Resources;
+using EnvelopeGenerator.Application.Contracts.Services;
 
-namespace EnvelopeGenerator.Application.Services
+namespace EnvelopeGenerator.Application.Services;
+
+public class EnvelopeCertificateService : BasicCRUDService<IEnvelopeCertificateRepository, EnvelopeCertificateDto, EnvelopeCertificate, int>, IEnvelopeCertificateService
 {
-    public class EnvelopeCertificateService : BasicCRUDService<IEnvelopeCertificateRepository, EnvelopeCertificateDto, EnvelopeCertificate, int>, IEnvelopeCertificateService
-    {
     public EnvelopeCertificateService(IEnvelopeCertificateRepository repository, IMapper mapper)
         : base(repository, mapper)
     {
     }
-    }
 }

EnvelopeGenerator.Application/Services/EnvelopeDocumentService.cs

@@ -1,16 +1,15 @@
 using AutoMapper;
 using DigitalData.Core.Application;
-using EnvelopeGenerator.Application.Contracts;
+using EnvelopeGenerator.Application.Contracts.Services;
 using EnvelopeGenerator.Application.DTOs;
 using EnvelopeGenerator.Domain.Entities;
-using EnvelopeGenerator.Infrastructure.Contracts;
+using EnvelopeGenerator.Application.Contracts.Repositories;
 
-namespace EnvelopeGenerator.Application.Services
+namespace EnvelopeGenerator.Application.Services;
+
+public class EnvelopeDocumentService : BasicCRUDService<IEnvelopeDocumentRepository, EnvelopeDocumentDto, EnvelopeDocument, int>, IEnvelopeDocumentService
 {
-    public class EnvelopeDocumentService : BasicCRUDService<IEnvelopeDocumentRepository, EnvelopeDocumentDto, EnvelopeDocument, int>, IEnvelopeDocumentService
-    {
     public EnvelopeDocumentService(IEnvelopeDocumentRepository repository, IMapper mapper) : base(repository, mapper)
     {
     }
-    }
 }

EnvelopeGenerator.Application/Services/EnvelopeHistoryService.cs

@@ -1,17 +1,17 @@
 using AutoMapper;
 using DigitalData.Core.Application;
-using EnvelopeGenerator.Application.Contracts;
 using EnvelopeGenerator.Domain.Entities;
-using EnvelopeGenerator.Infrastructure.Contracts;
+using EnvelopeGenerator.Application.Contracts.Repositories;
 using static EnvelopeGenerator.Common.Constants;
 using DigitalData.Core.DTO;
 using EnvelopeGenerator.Application.DTOs.EnvelopeHistory;
 using EnvelopeGenerator.Application.DTOs.Receiver;
+using EnvelopeGenerator.Application.Contracts.Services;
 
-namespace EnvelopeGenerator.Application.Services
+namespace EnvelopeGenerator.Application.Services;
+
+public class EnvelopeHistoryService : CRUDService<IEnvelopeHistoryRepository, EnvelopeHistoryCreateDto, EnvelopeHistoryDto, EnvelopeHistoryDto, EnvelopeHistory, long>, IEnvelopeHistoryService
 {
-    public class EnvelopeHistoryService : CRUDService<IEnvelopeHistoryRepository, EnvelopeHistoryCreateDto, EnvelopeHistoryDto, EnvelopeHistoryDto, EnvelopeHistory, long>, IEnvelopeHistoryService
-    {
     public EnvelopeHistoryService(IEnvelopeHistoryRepository repository, IMapper mapper)
         : base(repository, mapper)
     {
@@ -81,5 +81,4 @@ namespace EnvelopeGenerator.Application.Services
                 Success: id => Result.Success(id),
                 Fail: (mssg, ntc) => Result.Fail<long>().Message(mssg).Notice(ntc)
             );
-    }
 }

EnvelopeGenerator.Application/Services/EnvelopeMailService.cs

@@ -3,7 +3,6 @@ using DigitalData.Core.DTO;
 using DigitalData.EmailProfilerDispatcher.Abstraction.Contracts;
 using DigitalData.EmailProfilerDispatcher.Abstraction.DTOs.EmailOut;
 using DigitalData.EmailProfilerDispatcher.Abstraction.Services;
-using EnvelopeGenerator.Application.Contracts;
 using EnvelopeGenerator.Application.DTOs.EnvelopeReceiver;
 using EnvelopeGenerator.Common;
 using Microsoft.Extensions.Logging;
@@ -14,6 +13,7 @@ using EnvelopeGenerator.Application.DTOs.EnvelopeReceiverReadOnly;
 using EnvelopeGenerator.Application.Configurations;
 using EnvelopeGenerator.Application.Extensions;
 using Newtonsoft.Json;
+using EnvelopeGenerator.Application.Contracts.Services;
 
 namespace EnvelopeGenerator.Application.Services
 {

EnvelopeGenerator.Application/Services/EnvelopeReceiverReadOnlyService.cs

@@ -1,16 +1,15 @@
 using AutoMapper;
 using DigitalData.Core.Application;
-using EnvelopeGenerator.Application.Contracts;
+using EnvelopeGenerator.Application.Contracts.Services;
 using EnvelopeGenerator.Application.DTOs.EnvelopeReceiverReadOnly;
 using EnvelopeGenerator.Domain.Entities;
-using EnvelopeGenerator.Infrastructure.Contracts;
+using EnvelopeGenerator.Application.Contracts.Repositories;
 
-namespace EnvelopeGenerator.Application.Services
+namespace EnvelopeGenerator.Application.Services;
+
+public class EnvelopeReceiverReadOnlyService : CRUDService<IEnvelopeReceiverReadOnlyRepository, EnvelopeReceiverReadOnlyCreateDto, EnvelopeReceiverReadOnlyDto, EnvelopeReceiverReadOnlyUpdateDto, EnvelopeReceiverReadOnly, long>, IEnvelopeReceiverReadOnlyService
 {
-    public class EnvelopeReceiverReadOnlyService : CRUDService<IEnvelopeReceiverReadOnlyRepository, EnvelopeReceiverReadOnlyCreateDto, EnvelopeReceiverReadOnlyDto, EnvelopeReceiverReadOnlyUpdateDto, EnvelopeReceiverReadOnly, long>, IEnvelopeReceiverReadOnlyService
-    {
     public EnvelopeReceiverReadOnlyService(IEnvelopeReceiverReadOnlyRepository repository, IMapper mapper) : base(repository, mapper)
     {
     }
-    }
 }

EnvelopeGenerator.Application/Services/EnvelopeReceiverService.cs

@@ -1,20 +1,20 @@
 using AutoMapper;
 using DigitalData.Core.Application;
 using DigitalData.Core.DTO;
-using EnvelopeGenerator.Application.Contracts;
 using EnvelopeGenerator.Application.DTOs.EnvelopeReceiver;
 using EnvelopeGenerator.Application.Resources;
 using EnvelopeGenerator.Domain.Entities;
-using EnvelopeGenerator.Infrastructure.Contracts;
+using EnvelopeGenerator.Application.Contracts.Repositories;
 using Microsoft.Extensions.Localization;
 using Microsoft.Extensions.Logging;
 using EnvelopeGenerator.Extensions;
 using EnvelopeGenerator.Application.DTOs.Messaging;
+using EnvelopeGenerator.Application.Contracts.Services;
 
-namespace EnvelopeGenerator.Application.Services
+namespace EnvelopeGenerator.Application.Services;
+
+public class EnvelopeReceiverService : BasicCRUDService<IEnvelopeReceiverRepository, EnvelopeReceiverDto, EnvelopeReceiver, (int Envelope, int Receiver)>, IEnvelopeReceiverService
 {
-    public class EnvelopeReceiverService : BasicCRUDService<IEnvelopeReceiverRepository, EnvelopeReceiverDto, EnvelopeReceiver, (int Envelope, int Receiver)>, IEnvelopeReceiverService
-    {
     private readonly IStringLocalizer<Resource> _localizer;
 
     private readonly ISmsSender _smsSender;
@@ -175,5 +175,4 @@ namespace EnvelopeGenerator.Application.Services
 
         return Result.Success(res);
     }
-    }
 }

EnvelopeGenerator.Application/Services/EnvelopeService.cs

@@ -1,15 +1,15 @@
 using AutoMapper;
 using DigitalData.Core.Application;
 using DigitalData.Core.DTO;
-using EnvelopeGenerator.Application.Contracts;
+using EnvelopeGenerator.Application.Contracts.Services;
 using EnvelopeGenerator.Application.DTOs;
 using EnvelopeGenerator.Domain.Entities;
-using EnvelopeGenerator.Infrastructure.Contracts;
+using EnvelopeGenerator.Application.Contracts.Repositories;
 
-namespace EnvelopeGenerator.Application.Services
+namespace EnvelopeGenerator.Application.Services;
+
+public class EnvelopeService : BasicCRUDService<IEnvelopeRepository, EnvelopeDto, Envelope, int>, IEnvelopeService
 {
-    public class EnvelopeService : BasicCRUDService<IEnvelopeRepository, EnvelopeDto, Envelope, int>, IEnvelopeService
-    {
     public EnvelopeService(IEnvelopeRepository repository, IMapper mapper)
         : base(repository, mapper)
     {
@@ -39,5 +39,4 @@ namespace EnvelopeGenerator.Application.Services
         var readDto = _mapper.Map<IEnumerable<EnvelopeDto>>(users);
         return Result.Success(readDto);
     }
-    }
 }

EnvelopeGenerator.Application/Services/EnvelopeSmsHandler.cs

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

EnvelopeGenerator.Application/Services/EnvelopeTypeService.cs

@@ -1,17 +1,17 @@
 using AutoMapper;
 using DigitalData.Core.Application;
-using EnvelopeGenerator.Application.Contracts;
 using EnvelopeGenerator.Application.DTOs;
 using EnvelopeGenerator.Domain.Entities;
-using EnvelopeGenerator.Infrastructure.Contracts;
+using EnvelopeGenerator.Application.Contracts.Repositories;
 using Microsoft.Extensions.Caching.Memory;
 using DigitalData.Core.DTO;
 using Microsoft.Extensions.Logging;
+using EnvelopeGenerator.Application.Contracts.Services;
 
-namespace EnvelopeGenerator.Application.Services
+namespace EnvelopeGenerator.Application.Services;
+
+public class EnvelopeTypeService : BasicCRUDService<IEnvelopeTypeRepository, EnvelopeTypeDto, EnvelopeType, int>, IEnvelopeTypeService
 {
-    public class EnvelopeTypeService : BasicCRUDService<IEnvelopeTypeRepository, EnvelopeTypeDto, EnvelopeType, int>, IEnvelopeTypeService
-    {
     private static readonly Guid CacheKey = Guid.NewGuid();
 
     private readonly IMemoryCache _cache;
@@ -26,5 +26,4 @@ namespace EnvelopeGenerator.Application.Services
         => await _cache.GetOrCreateAsync(CacheKey, async entry => await base.ReadAllAsync())
         ?? Result.Fail<IEnumerable<EnvelopeTypeDto>>().Notice(LogLevel.Error, Flag.NotFound, "No cached envelope types are available in the database. If you have added any envelope types after the server started, please restart the server.");
     
-    }
 }

EnvelopeGenerator.Application/Services/GTXSmsSender.cs

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

EnvelopeGenerator.Application/Services/ReceiverService.cs

@@ -1,17 +1,17 @@
 using AutoMapper;
 using DigitalData.Core.Application;
-using EnvelopeGenerator.Application.Contracts;
 using EnvelopeGenerator.Domain.Entities;
-using EnvelopeGenerator.Infrastructure.Contracts;
+using EnvelopeGenerator.Application.Contracts.Repositories;
 using EnvelopeGenerator.Application.DTOs.Receiver;
 using DigitalData.Core.DTO;
 using DigitalData.Core.Abstractions;
 using Microsoft.Extensions.Logging;
+using EnvelopeGenerator.Application.Contracts.Services;
 
-namespace EnvelopeGenerator.Application.Services
+namespace EnvelopeGenerator.Application.Services;
+
+public class ReceiverService : CRUDService<IReceiverRepository, ReceiverCreateDto, ReceiverReadDto, ReceiverUpdateDto, Receiver, int>, IReceiverService
 {
-    public class ReceiverService : CRUDService<IReceiverRepository, ReceiverCreateDto, ReceiverReadDto, ReceiverUpdateDto, Receiver, int>, IReceiverService
-    {
     public ReceiverService(IReceiverRepository repository, IMapper mapper)
         : base(repository, mapper)
     {
@@ -48,5 +48,4 @@ namespace EnvelopeGenerator.Application.Services
         var entity = _mapper.Map(updateDto, val);
         return (await _repository.UpdateAsync(entity)) ? Result.Success() : Result.Fail();
     }
-    }
 }

EnvelopeGenerator.Application/Services/UserReceiverService.cs

@@ -1,17 +1,16 @@
 using AutoMapper;
 using DigitalData.Core.Application;
-using EnvelopeGenerator.Application.Contracts;
+using EnvelopeGenerator.Application.Contracts.Services;
 using EnvelopeGenerator.Application.DTOs;
 using EnvelopeGenerator.Domain.Entities;
-using EnvelopeGenerator.Infrastructure.Contracts;
+using EnvelopeGenerator.Application.Contracts.Repositories;
 
-namespace EnvelopeGenerator.Application.Services
+namespace EnvelopeGenerator.Application.Services;
+
+public class UserReceiverService : BasicCRUDService<IUserReceiverRepository, UserReceiverDto, UserReceiver, int>, IUserReceiverService
 {
-    public class UserReceiverService : BasicCRUDService<IUserReceiverRepository, UserReceiverDto, UserReceiver, int>, IUserReceiverService
-    {
     public UserReceiverService(IUserReceiverRepository repository, IMapper mapper)
         : base(repository, mapper)
     {
     }
-    }
 }

EnvelopeGenerator.Form/frmMain.Designer.vb

@@ -63,6 +63,7 @@ Partial Class frmMain
         Me.bbtnitmInfoMail = New DevExpress.XtraBars.BarButtonItem()
         Me.BarButtonItem2 = New DevExpress.XtraBars.BarButtonItem()
         Me.BarButtonItem3 = New DevExpress.XtraBars.BarButtonItem()
+        Me.BarButtonItem4 = New DevExpress.XtraBars.BarButtonItem()
         Me.RibbonPage1 = New DevExpress.XtraBars.Ribbon.RibbonPage()
         Me.RibbonPageEnvelopeActions = New DevExpress.XtraBars.Ribbon.RibbonPageGroup()
         Me.RibbonPageGroup1 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup()
@@ -141,16 +142,16 @@ Partial Class frmMain
         '
         'SplitContainerControl1
         '
-        resources.ApplyResources(Me.SplitContainerControl1, "SplitContainerControl1")
         Me.SplitContainerControl1.Collapsed = True
         Me.SplitContainerControl1.CollapsePanel = DevExpress.XtraEditors.SplitCollapsePanel.Panel2
+        resources.ApplyResources(Me.SplitContainerControl1, "SplitContainerControl1")
         Me.SplitContainerControl1.Horizontal = False
         Me.SplitContainerControl1.Name = "SplitContainerControl1"
         '
         'SplitContainerControl1.Panel1
         '
-        resources.ApplyResources(Me.SplitContainerControl1.Panel1, "SplitContainerControl1.Panel1")
         Me.SplitContainerControl1.Panel1.Controls.Add(Me.XtraTabControlMain)
+        resources.ApplyResources(Me.SplitContainerControl1.Panel1, "SplitContainerControl1.Panel1")
         '
         'SplitContainerControl1.Panel2
         '
@@ -166,25 +167,19 @@ Partial Class frmMain
         '
         'XtraTabPage1
         '
-        resources.ApplyResources(Me.XtraTabPage1, "XtraTabPage1")
         Me.XtraTabPage1.Controls.Add(Me.GridEnvelopes)
         Me.XtraTabPage1.Name = "XtraTabPage1"
+        resources.ApplyResources(Me.XtraTabPage1, "XtraTabPage1")
         '
         'GridEnvelopes
         '
         resources.ApplyResources(Me.GridEnvelopes, "GridEnvelopes")
-        Me.GridEnvelopes.EmbeddedNavigator.AccessibleDescription = resources.GetString("GridEnvelopes.EmbeddedNavigator.AccessibleDescription")
-        Me.GridEnvelopes.EmbeddedNavigator.AccessibleName = resources.GetString("GridEnvelopes.EmbeddedNavigator.AccessibleName")
         Me.GridEnvelopes.EmbeddedNavigator.AllowHtmlTextInToolTip = CType(resources.GetObject("GridEnvelopes.EmbeddedNavigator.AllowHtmlTextInToolTip"), DevExpress.Utils.DefaultBoolean)
         Me.GridEnvelopes.EmbeddedNavigator.Anchor = CType(resources.GetObject("GridEnvelopes.EmbeddedNavigator.Anchor"), System.Windows.Forms.AnchorStyles)
-        Me.GridEnvelopes.EmbeddedNavigator.BackgroundImage = CType(resources.GetObject("GridEnvelopes.EmbeddedNavigator.BackgroundImage"), System.Drawing.Image)
         Me.GridEnvelopes.EmbeddedNavigator.BackgroundImageLayout = CType(resources.GetObject("GridEnvelopes.EmbeddedNavigator.BackgroundImageLayout"), System.Windows.Forms.ImageLayout)
         Me.GridEnvelopes.EmbeddedNavigator.ImeMode = CType(resources.GetObject("GridEnvelopes.EmbeddedNavigator.ImeMode"), System.Windows.Forms.ImeMode)
-        Me.GridEnvelopes.EmbeddedNavigator.MaximumSize = CType(resources.GetObject("GridEnvelopes.EmbeddedNavigator.MaximumSize"), System.Drawing.Size)
         Me.GridEnvelopes.EmbeddedNavigator.TextLocation = CType(resources.GetObject("GridEnvelopes.EmbeddedNavigator.TextLocation"), DevExpress.XtraEditors.NavigatorButtonsTextLocation)
-        Me.GridEnvelopes.EmbeddedNavigator.ToolTip = resources.GetString("GridEnvelopes.EmbeddedNavigator.ToolTip")
         Me.GridEnvelopes.EmbeddedNavigator.ToolTipIconType = CType(resources.GetObject("GridEnvelopes.EmbeddedNavigator.ToolTipIconType"), DevExpress.Utils.ToolTipIconType)
-        Me.GridEnvelopes.EmbeddedNavigator.ToolTipTitle = resources.GetString("GridEnvelopes.EmbeddedNavigator.ToolTipTitle")
         GridLevelNode1.LevelTemplate = Me.ViewReceivers
         GridLevelNode1.RelationName = "Receivers"
         GridLevelNode2.LevelTemplate = Me.ViewHistory
@@ -198,7 +193,6 @@ Partial Class frmMain
         '
         'ViewReceivers
         '
-        resources.ApplyResources(Me.ViewReceivers, "ViewReceivers")
         Me.ViewReceivers.Columns.AddRange(New DevExpress.XtraGrid.Columns.GridColumn() {Me.ColReceiverStatus, Me.ColName, Me.ColEmail, Me.ColSignedDate, Me.colAccessCode, Me.ColStatusReceiver})
         Me.ViewReceivers.GridControl = Me.GridEnvelopes
         Me.ViewReceivers.Name = "ViewReceivers"
@@ -208,6 +202,7 @@ Partial Class frmMain
         Me.ViewReceivers.OptionsView.ShowDetailButtons = False
         Me.ViewReceivers.OptionsView.ShowGroupPanel = False
         Me.ViewReceivers.OptionsView.ShowIndicator = False
+        resources.ApplyResources(Me.ViewReceivers, "ViewReceivers")
         '
         'ColReceiverStatus
         '
@@ -251,7 +246,6 @@ Partial Class frmMain
         '
         'ViewHistory
         '
-        resources.ApplyResources(Me.ViewHistory, "ViewHistory")
         Me.ViewHistory.Columns.AddRange(New DevExpress.XtraGrid.Columns.GridColumn() {Me.ColHistoryStatus, Me.ColHistoryUserReference, Me.ColHistoryDate})
         Me.ViewHistory.GridControl = Me.GridEnvelopes
         Me.ViewHistory.Name = "ViewHistory"
@@ -283,7 +277,6 @@ Partial Class frmMain
         '
         'ViewEnvelopes
         '
-        resources.ApplyResources(Me.ViewEnvelopes, "ViewEnvelopes")
         Me.ViewEnvelopes.Columns.AddRange(New DevExpress.XtraGrid.Columns.GridColumn() {Me.colEnvelopeId, Me.colContractType, Me.colStatus, Me.colTitle, Me.colAddedWhen})
         Me.ViewEnvelopes.GridControl = Me.GridEnvelopes
         Me.ViewEnvelopes.Name = "ViewEnvelopes"
@@ -325,14 +318,12 @@ Partial Class frmMain
         '
         'RibbonControl
         '
-        resources.ApplyResources(Me.RibbonControl, "RibbonControl")
         Me.RibbonControl.ExpandCollapseItem.Id = 0
         Me.RibbonControl.ExpandCollapseItem.ImageOptions.ImageIndex = CType(resources.GetObject("RibbonControl.ExpandCollapseItem.ImageOptions.ImageIndex"), Integer)
         Me.RibbonControl.ExpandCollapseItem.ImageOptions.LargeImageIndex = CType(resources.GetObject("RibbonControl.ExpandCollapseItem.ImageOptions.LargeImageIndex"), Integer)
-        Me.RibbonControl.ExpandCollapseItem.ImageOptions.SvgImage = CType(resources.GetObject("RibbonControl.ExpandCollapseItem.ImageOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage)
+        Me.RibbonControl.Items.AddRange(New DevExpress.XtraBars.BarItem() {Me.RibbonControl.ExpandCollapseItem, Me.RibbonControl.SearchEditItem, Me.btnCreateEnvelope, Me.btnEditEnvelope, Me.btnDeleteEnvelope, Me.BarButtonItem1, Me.txtRefreshLabel, Me.btnShowDocument, Me.btnContactReceiver, Me.txtEnvelopeIdLabel, Me.btnOpenLogDirectory, Me.BarCheckItem1, Me.bsitmInfo, Me.bbtnitmEB, Me.bbtnitmInfoMail, Me.BarButtonItem2, Me.BarButtonItem3, Me.BarButtonItem4})
-        Me.RibbonControl.ExpandCollapseItem.SearchTags = resources.GetString("RibbonControl.ExpandCollapseItem.SearchTags")
+        resources.ApplyResources(Me.RibbonControl, "RibbonControl")
-        Me.RibbonControl.Items.AddRange(New DevExpress.XtraBars.BarItem() {Me.RibbonControl.ExpandCollapseItem, Me.RibbonControl.SearchEditItem, Me.btnCreateEnvelope, Me.btnEditEnvelope, Me.btnDeleteEnvelope, Me.BarButtonItem1, Me.txtRefreshLabel, Me.btnShowDocument, Me.btnContactReceiver, Me.txtEnvelopeIdLabel, Me.btnOpenLogDirectory, Me.BarCheckItem1, Me.bsitmInfo, Me.bbtnitmEB, Me.bbtnitmInfoMail, Me.BarButtonItem2, Me.BarButtonItem3})
+        Me.RibbonControl.MaxItemId = 19
-        Me.RibbonControl.MaxItemId = 18
         Me.RibbonControl.Name = "RibbonControl"
         Me.RibbonControl.Pages.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPage() {Me.RibbonPage1, Me.RibbonPage2})
         Me.RibbonControl.ShowApplicationButton = DevExpress.Utils.DefaultBoolean.[False]
@@ -421,8 +412,6 @@ Partial Class frmMain
         '
         resources.ApplyResources(Me.btnOpenLogDirectory, "btnOpenLogDirectory")
         Me.btnOpenLogDirectory.Id = 10
-        Me.btnOpenLogDirectory.ImageOptions.ImageIndex = CType(resources.GetObject("btnOpenLogDirectory.ImageOptions.ImageIndex"), Integer)
-        Me.btnOpenLogDirectory.ImageOptions.LargeImageIndex = CType(resources.GetObject("btnOpenLogDirectory.ImageOptions.LargeImageIndex"), Integer)
         Me.btnOpenLogDirectory.ImageOptions.SvgImage = CType(resources.GetObject("btnOpenLogDirectory.ImageOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage)
         Me.btnOpenLogDirectory.Name = "btnOpenLogDirectory"
         '
@@ -431,20 +420,13 @@ Partial Class frmMain
         resources.ApplyResources(Me.BarCheckItem1, "BarCheckItem1")
         Me.BarCheckItem1.Id = 12
         Me.BarCheckItem1.ImageOptions.Image = CType(resources.GetObject("BarCheckItem1.ImageOptions.Image"), System.Drawing.Image)
-        Me.BarCheckItem1.ImageOptions.ImageIndex = CType(resources.GetObject("BarCheckItem1.ImageOptions.ImageIndex"), Integer)
         Me.BarCheckItem1.ImageOptions.LargeImage = CType(resources.GetObject("BarCheckItem1.ImageOptions.LargeImage"), System.Drawing.Image)
-        Me.BarCheckItem1.ImageOptions.LargeImageIndex = CType(resources.GetObject("BarCheckItem1.ImageOptions.LargeImageIndex"), Integer)
-        Me.BarCheckItem1.ImageOptions.SvgImage = CType(resources.GetObject("BarCheckItem1.ImageOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage)
         Me.BarCheckItem1.Name = "BarCheckItem1"
         '
         'bsitmInfo
         '
-        resources.ApplyResources(Me.bsitmInfo, "bsitmInfo")
         Me.bsitmInfo.Id = 13
         Me.bsitmInfo.ImageOptions.Image = CType(resources.GetObject("bsitmInfo.ImageOptions.Image"), System.Drawing.Image)
-        Me.bsitmInfo.ImageOptions.ImageIndex = CType(resources.GetObject("bsitmInfo.ImageOptions.ImageIndex"), Integer)
-        Me.bsitmInfo.ImageOptions.LargeImageIndex = CType(resources.GetObject("bsitmInfo.ImageOptions.LargeImageIndex"), Integer)
-        Me.bsitmInfo.ImageOptions.SvgImage = CType(resources.GetObject("bsitmInfo.ImageOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage)
         Me.bsitmInfo.Name = "bsitmInfo"
         Me.bsitmInfo.PaintStyle = DevExpress.XtraBars.BarItemPaintStyle.CaptionGlyph
         Me.bsitmInfo.Visibility = DevExpress.XtraBars.BarItemVisibility.Never
@@ -454,8 +436,6 @@ Partial Class frmMain
         resources.ApplyResources(Me.bbtnitmEB, "bbtnitmEB")
         Me.bbtnitmEB.Enabled = False
         Me.bbtnitmEB.Id = 14
-        Me.bbtnitmEB.ImageOptions.ImageIndex = CType(resources.GetObject("bbtnitmEB.ImageOptions.ImageIndex"), Integer)
-        Me.bbtnitmEB.ImageOptions.LargeImageIndex = CType(resources.GetObject("bbtnitmEB.ImageOptions.LargeImageIndex"), Integer)
         Me.bbtnitmEB.ImageOptions.SvgImage = CType(resources.GetObject("bbtnitmEB.ImageOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage)
         Me.bbtnitmEB.Name = "bbtnitmEB"
         '
@@ -463,8 +443,6 @@ Partial Class frmMain
         '
         resources.ApplyResources(Me.bbtnitmInfoMail, "bbtnitmInfoMail")
         Me.bbtnitmInfoMail.Id = 15
-        Me.bbtnitmInfoMail.ImageOptions.ImageIndex = CType(resources.GetObject("bbtnitmInfoMail.ImageOptions.ImageIndex"), Integer)
-        Me.bbtnitmInfoMail.ImageOptions.LargeImageIndex = CType(resources.GetObject("bbtnitmInfoMail.ImageOptions.LargeImageIndex"), Integer)
         Me.bbtnitmInfoMail.ImageOptions.SvgImage = CType(resources.GetObject("bbtnitmInfoMail.ImageOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage)
         Me.bbtnitmInfoMail.Name = "bbtnitmInfoMail"
         '
@@ -472,8 +450,6 @@ Partial Class frmMain
         '
         resources.ApplyResources(Me.BarButtonItem2, "BarButtonItem2")
         Me.BarButtonItem2.Id = 16
-        Me.BarButtonItem2.ImageOptions.ImageIndex = CType(resources.GetObject("BarButtonItem2.ImageOptions.ImageIndex"), Integer)
-        Me.BarButtonItem2.ImageOptions.LargeImageIndex = CType(resources.GetObject("BarButtonItem2.ImageOptions.LargeImageIndex"), Integer)
         Me.BarButtonItem2.ImageOptions.SvgImage = CType(resources.GetObject("BarButtonItem2.ImageOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage)
         Me.BarButtonItem2.Name = "BarButtonItem2"
         '
@@ -481,11 +457,16 @@ Partial Class frmMain
         '
         resources.ApplyResources(Me.BarButtonItem3, "BarButtonItem3")
         Me.BarButtonItem3.Id = 17
-        Me.BarButtonItem3.ImageOptions.ImageIndex = CType(resources.GetObject("BarButtonItem3.ImageOptions.ImageIndex"), Integer)
-        Me.BarButtonItem3.ImageOptions.LargeImageIndex = CType(resources.GetObject("BarButtonItem3.ImageOptions.LargeImageIndex"), Integer)
         Me.BarButtonItem3.ImageOptions.SvgImage = CType(resources.GetObject("BarButtonItem3.ImageOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage)
         Me.BarButtonItem3.Name = "BarButtonItem3"
         '
+        'BarButtonItem4
+        '
+        resources.ApplyResources(Me.BarButtonItem4, "BarButtonItem4")
+        Me.BarButtonItem4.Id = 18
+        Me.BarButtonItem4.ImageOptions.SvgImage = CType(resources.GetObject("BarButtonItem4.ImageOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage)
+        Me.BarButtonItem4.Name = "BarButtonItem4"
+        '
         'RibbonPage1
         '
         Me.RibbonPage1.Groups.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPageGroup() {Me.RibbonPageEnvelopeActions, Me.RibbonPageGroup1, Me.RibbonPageGroupFunctions})
@@ -528,39 +509,34 @@ Partial Class frmMain
         '
         Me.RibbonPageGroup3.ItemLinks.Add(Me.btnOpenLogDirectory)
         Me.RibbonPageGroup3.ItemLinks.Add(Me.BarCheckItem1)
+        Me.RibbonPageGroup3.ItemLinks.Add(Me.BarButtonItem4)
         Me.RibbonPageGroup3.Name = "RibbonPageGroup3"
         resources.ApplyResources(Me.RibbonPageGroup3, "RibbonPageGroup3")
         '
         'RibbonStatusBar
         '
-        resources.ApplyResources(Me.RibbonStatusBar, "RibbonStatusBar")
         Me.RibbonStatusBar.ItemLinks.Add(Me.txtRefreshLabel)
         Me.RibbonStatusBar.ItemLinks.Add(Me.txtEnvelopeIdLabel)
         Me.RibbonStatusBar.ItemLinks.Add(Me.bsitmInfo)
+        resources.ApplyResources(Me.RibbonStatusBar, "RibbonStatusBar")
         Me.RibbonStatusBar.Name = "RibbonStatusBar"
         Me.RibbonStatusBar.Ribbon = Me.RibbonControl
         '
         'XtraTabPage2
         '
-        resources.ApplyResources(Me.XtraTabPage2, "XtraTabPage2")
         Me.XtraTabPage2.Controls.Add(Me.GridCompleted)
         Me.XtraTabPage2.Name = "XtraTabPage2"
+        resources.ApplyResources(Me.XtraTabPage2, "XtraTabPage2")
         '
         'GridCompleted
         '
         resources.ApplyResources(Me.GridCompleted, "GridCompleted")
-        Me.GridCompleted.EmbeddedNavigator.AccessibleDescription = resources.GetString("GridCompleted.EmbeddedNavigator.AccessibleDescription")
-        Me.GridCompleted.EmbeddedNavigator.AccessibleName = resources.GetString("GridCompleted.EmbeddedNavigator.AccessibleName")
         Me.GridCompleted.EmbeddedNavigator.AllowHtmlTextInToolTip = CType(resources.GetObject("GridCompleted.EmbeddedNavigator.AllowHtmlTextInToolTip"), DevExpress.Utils.DefaultBoolean)
         Me.GridCompleted.EmbeddedNavigator.Anchor = CType(resources.GetObject("GridCompleted.EmbeddedNavigator.Anchor"), System.Windows.Forms.AnchorStyles)
-        Me.GridCompleted.EmbeddedNavigator.BackgroundImage = CType(resources.GetObject("GridCompleted.EmbeddedNavigator.BackgroundImage"), System.Drawing.Image)
         Me.GridCompleted.EmbeddedNavigator.BackgroundImageLayout = CType(resources.GetObject("GridCompleted.EmbeddedNavigator.BackgroundImageLayout"), System.Windows.Forms.ImageLayout)
         Me.GridCompleted.EmbeddedNavigator.ImeMode = CType(resources.GetObject("GridCompleted.EmbeddedNavigator.ImeMode"), System.Windows.Forms.ImeMode)
-        Me.GridCompleted.EmbeddedNavigator.MaximumSize = CType(resources.GetObject("GridCompleted.EmbeddedNavigator.MaximumSize"), System.Drawing.Size)
         Me.GridCompleted.EmbeddedNavigator.TextLocation = CType(resources.GetObject("GridCompleted.EmbeddedNavigator.TextLocation"), DevExpress.XtraEditors.NavigatorButtonsTextLocation)
-        Me.GridCompleted.EmbeddedNavigator.ToolTip = resources.GetString("GridCompleted.EmbeddedNavigator.ToolTip")
         Me.GridCompleted.EmbeddedNavigator.ToolTipIconType = CType(resources.GetObject("GridCompleted.EmbeddedNavigator.ToolTipIconType"), DevExpress.Utils.ToolTipIconType)
-        Me.GridCompleted.EmbeddedNavigator.ToolTipTitle = resources.GetString("GridCompleted.EmbeddedNavigator.ToolTipTitle")
         GridLevelNode3.LevelTemplate = Me.ViewReceiversCompleted
         GridLevelNode3.RelationName = "Receivers"
         GridLevelNode4.LevelTemplate = Me.ViewHistoryCompleted
@@ -574,7 +550,6 @@ Partial Class frmMain
         '
         'ViewReceiversCompleted
         '
-        resources.ApplyResources(Me.ViewReceiversCompleted, "ViewReceiversCompleted")
         Me.ViewReceiversCompleted.Columns.AddRange(New DevExpress.XtraGrid.Columns.GridColumn() {Me.ColStatusCompleted, Me.ColNameCompleted, Me.ColEmailCompleted, Me.ColSignedDateCompleted})
         Me.ViewReceiversCompleted.GridControl = Me.GridCompleted
         Me.ViewReceiversCompleted.Name = "ViewReceiversCompleted"
@@ -584,6 +559,7 @@ Partial Class frmMain
         Me.ViewReceiversCompleted.OptionsView.ShowDetailButtons = False
         Me.ViewReceiversCompleted.OptionsView.ShowGroupPanel = False
         Me.ViewReceiversCompleted.OptionsView.ShowIndicator = False
+        resources.ApplyResources(Me.ViewReceiversCompleted, "ViewReceiversCompleted")
         '
         'ColStatusCompleted
         '
@@ -611,7 +587,6 @@ Partial Class frmMain
         '
         'ViewHistoryCompleted
         '
-        resources.ApplyResources(Me.ViewHistoryCompleted, "ViewHistoryCompleted")
         Me.ViewHistoryCompleted.Columns.AddRange(New DevExpress.XtraGrid.Columns.GridColumn() {Me.ColHistoryStatusCompleted, Me.ColHistoryUserReferenceCompleted, Me.ColHistoryDateCompleted})
         Me.ViewHistoryCompleted.GridControl = Me.GridCompleted
         Me.ViewHistoryCompleted.Name = "ViewHistoryCompleted"
@@ -645,7 +620,6 @@ Partial Class frmMain
         '
         'ViewCompleted
         '
-        resources.ApplyResources(Me.ViewCompleted, "ViewCompleted")
         Me.ViewCompleted.Columns.AddRange(New DevExpress.XtraGrid.Columns.GridColumn() {Me.GridColumn3, Me.GridColumn4, Me.GridColumn5, Me.GridColumn7})
         Me.ViewCompleted.GridControl = Me.GridCompleted
         Me.ViewCompleted.Name = "ViewCompleted"
@@ -679,10 +653,10 @@ Partial Class frmMain
         '
         'XtraTabPageAdmin
         '
-        resources.ApplyResources(Me.XtraTabPageAdmin, "XtraTabPageAdmin")
         Me.XtraTabPageAdmin.Controls.Add(Me.SplitContainerControl2)
         Me.XtraTabPageAdmin.Controls.Add(Me.PanelControl1)
         Me.XtraTabPageAdmin.Name = "XtraTabPageAdmin"
+        resources.ApplyResources(Me.XtraTabPageAdmin, "XtraTabPageAdmin")
         '
         'SplitContainerControl2
         '
@@ -691,8 +665,8 @@ Partial Class frmMain
         '
         'SplitContainerControl2.Panel1
         '
-        resources.ApplyResources(Me.SplitContainerControl2.Panel1, "SplitContainerControl2.Panel1")
         Me.SplitContainerControl2.Panel1.Controls.Add(Me.GridControlData)
+        resources.ApplyResources(Me.SplitContainerControl2.Panel1, "SplitContainerControl2.Panel1")
         '
         'SplitContainerControl2.Panel2
         '
@@ -702,18 +676,6 @@ Partial Class frmMain
         'GridControlData
         '
         resources.ApplyResources(Me.GridControlData, "GridControlData")
-        Me.GridControlData.EmbeddedNavigator.AccessibleDescription = resources.GetString("GridControlData.EmbeddedNavigator.AccessibleDescription")
-        Me.GridControlData.EmbeddedNavigator.AccessibleName = resources.GetString("GridControlData.EmbeddedNavigator.AccessibleName")
-        Me.GridControlData.EmbeddedNavigator.AllowHtmlTextInToolTip = CType(resources.GetObject("GridControlData.EmbeddedNavigator.AllowHtmlTextInToolTip"), DevExpress.Utils.DefaultBoolean)
-        Me.GridControlData.EmbeddedNavigator.Anchor = CType(resources.GetObject("GridControlData.EmbeddedNavigator.Anchor"), System.Windows.Forms.AnchorStyles)
-        Me.GridControlData.EmbeddedNavigator.BackgroundImage = CType(resources.GetObject("GridControlData.EmbeddedNavigator.BackgroundImage"), System.Drawing.Image)
-        Me.GridControlData.EmbeddedNavigator.BackgroundImageLayout = CType(resources.GetObject("GridControlData.EmbeddedNavigator.BackgroundImageLayout"), System.Windows.Forms.ImageLayout)
-        Me.GridControlData.EmbeddedNavigator.ImeMode = CType(resources.GetObject("GridControlData.EmbeddedNavigator.ImeMode"), System.Windows.Forms.ImeMode)
-        Me.GridControlData.EmbeddedNavigator.MaximumSize = CType(resources.GetObject("GridControlData.EmbeddedNavigator.MaximumSize"), System.Drawing.Size)
-        Me.GridControlData.EmbeddedNavigator.TextLocation = CType(resources.GetObject("GridControlData.EmbeddedNavigator.TextLocation"), DevExpress.XtraEditors.NavigatorButtonsTextLocation)
-        Me.GridControlData.EmbeddedNavigator.ToolTip = resources.GetString("GridControlData.EmbeddedNavigator.ToolTip")
-        Me.GridControlData.EmbeddedNavigator.ToolTipIconType = CType(resources.GetObject("GridControlData.EmbeddedNavigator.ToolTipIconType"), DevExpress.Utils.ToolTipIconType)
-        Me.GridControlData.EmbeddedNavigator.ToolTipTitle = resources.GetString("GridControlData.EmbeddedNavigator.ToolTipTitle")
         Me.GridControlData.MainView = Me.GridViewData
         Me.GridControlData.MenuManager = Me.RibbonControl
         Me.GridControlData.Name = "GridControlData"
@@ -721,21 +683,20 @@ Partial Class frmMain
         '
         'GridViewData
         '
-        resources.ApplyResources(Me.GridViewData, "GridViewData")
         Me.GridViewData.GridControl = Me.GridControlData
         Me.GridViewData.Name = "GridViewData"
         '
         'PanelControl1
         '
-        resources.ApplyResources(Me.PanelControl1, "PanelControl1")
         Me.PanelControl1.Controls.Add(Me.GroupControl2)
         Me.PanelControl1.Controls.Add(Me.GroupControl1)
+        resources.ApplyResources(Me.PanelControl1, "PanelControl1")
         Me.PanelControl1.Name = "PanelControl1"
         '
         'GroupControl2
         '
-        resources.ApplyResources(Me.GroupControl2, "GroupControl2")
         Me.GroupControl2.Controls.Add(Me.LabelControl1)
+        resources.ApplyResources(Me.GroupControl2, "GroupControl2")
         Me.GroupControl2.Name = "GroupControl2"
         '
         'LabelControl1
@@ -745,39 +706,39 @@ Partial Class frmMain
         '
         'GroupControl1
         '
-        resources.ApplyResources(Me.GroupControl1, "GroupControl1")
         Me.GroupControl1.Controls.Add(Me.btnEnvelopes_All)
         Me.GroupControl1.Controls.Add(Me.btnEnvelopes_thisYear)
         Me.GroupControl1.Controls.Add(Me.btnEnvelopes_lastmonth)
         Me.GroupControl1.Controls.Add(Me.btnEnvelopes_thismonth)
+        resources.ApplyResources(Me.GroupControl1, "GroupControl1")
         Me.GroupControl1.Name = "GroupControl1"
         '
         'btnEnvelopes_All
         '
-        resources.ApplyResources(Me.btnEnvelopes_All, "btnEnvelopes_All")
         Me.btnEnvelopes_All.Appearance.BackColor = System.Drawing.Color.MediumTurquoise
         Me.btnEnvelopes_All.Appearance.Options.UseBackColor = True
+        resources.ApplyResources(Me.btnEnvelopes_All, "btnEnvelopes_All")
         Me.btnEnvelopes_All.Name = "btnEnvelopes_All"
         '
         'btnEnvelopes_thisYear
         '
-        resources.ApplyResources(Me.btnEnvelopes_thisYear, "btnEnvelopes_thisYear")
         Me.btnEnvelopes_thisYear.Appearance.BackColor = System.Drawing.Color.LightSeaGreen
         Me.btnEnvelopes_thisYear.Appearance.Options.UseBackColor = True
+        resources.ApplyResources(Me.btnEnvelopes_thisYear, "btnEnvelopes_thisYear")
         Me.btnEnvelopes_thisYear.Name = "btnEnvelopes_thisYear"
         '
         'btnEnvelopes_lastmonth
         '
-        resources.ApplyResources(Me.btnEnvelopes_lastmonth, "btnEnvelopes_lastmonth")
         Me.btnEnvelopes_lastmonth.Appearance.BackColor = System.Drawing.Color.Turquoise
         Me.btnEnvelopes_lastmonth.Appearance.Options.UseBackColor = True
+        resources.ApplyResources(Me.btnEnvelopes_lastmonth, "btnEnvelopes_lastmonth")
         Me.btnEnvelopes_lastmonth.Name = "btnEnvelopes_lastmonth"
         '
         'btnEnvelopes_thismonth
         '
-        resources.ApplyResources(Me.btnEnvelopes_thismonth, "btnEnvelopes_thismonth")
         Me.btnEnvelopes_thismonth.Appearance.BackColor = System.Drawing.Color.Aquamarine
         Me.btnEnvelopes_thismonth.Appearance.Options.UseBackColor = True
+        resources.ApplyResources(Me.btnEnvelopes_thismonth, "btnEnvelopes_thismonth")
         Me.btnEnvelopes_thismonth.Name = "btnEnvelopes_thismonth"
         '
         'RefreshTimer
@@ -790,7 +751,6 @@ Partial Class frmMain
         '
         'XtraSaveFileDialog1
         '
-        resources.ApplyResources(Me.XtraSaveFileDialog1, "XtraSaveFileDialog1")
         Me.XtraSaveFileDialog1.FileName = "XtraSaveFileDialog1"
         '
         'frmMain
@@ -917,4 +877,5 @@ Partial Class frmMain
     Friend WithEvents BarButtonItem3 As DevExpress.XtraBars.BarButtonItem
     Friend WithEvents XtraSaveFileDialog1 As DevExpress.XtraEditors.XtraSaveFileDialog
     Friend WithEvents RibbonPageGroupFunctions As DevExpress.XtraBars.Ribbon.RibbonPageGroup
+    Friend WithEvents BarButtonItem4 As DevExpress.XtraBars.BarButtonItem
 End Class

EnvelopeGenerator.Form/frmMain.vb

@@ -664,4 +664,54 @@ Public Class frmMain
 
         End If
     End Sub
+
+    Private Sub BarButtonItem4_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles BarButtonItem4.ItemClick
+        Try
+            Dim saveFileDialog1 As New SaveFileDialog()
+            If File.Exists(LogConfig.LogFile) Then
+                saveFileDialog1.Filter = "log file|*.log"
+                saveFileDialog1.FileName = Path.GetFileName(LogConfig.LogFile)
+                If saveFileDialog1.ShowDialog() = DialogResult.OK Then
+                    If File.Exists(saveFileDialog1.FileName) Then
+                        File.Delete(saveFileDialog1.FileName)
+                    End If
+                    File.Copy(LogConfig.LogFile, saveFileDialog1.FileName)
+                End If
+            End If
+
+            If LogConfig.Debug = True Then
+                Dim oDebuglogFilename_only = Path.GetFileNameWithoutExtension(LogConfig.LogFile) + "-Debug.log"
+                Dim oDebuglogFilename = LogConfig.LogDirectory + "\" + oDebuglogFilename_only
+                If File.Exists(oDebuglogFilename) Then
+                    saveFileDialog1.Filter = "log file|*.log"
+                    saveFileDialog1.FileName = oDebuglogFilename_only
+                    If saveFileDialog1.ShowDialog() = DialogResult.OK Then
+                        If File.Exists(saveFileDialog1.FileName) Then
+                            File.Delete(saveFileDialog1.FileName)
+                        End If
+                        File.Copy(oDebuglogFilename, saveFileDialog1.FileName)
+                    End If
+                End If
+            End If
+            Dim oErrorlogFilename_only = Path.GetFileNameWithoutExtension(LogConfig.LogFile) + "-Error.log"
+            Dim oErrorlogFilename = LogConfig.LogDirectory + "\" + oErrorlogFilename_only
+            If File.Exists(oErrorlogFilename) Then
+                saveFileDialog1.Filter = "log file|*.log"
+                saveFileDialog1.FileName = oErrorlogFilename_only
+                If saveFileDialog1.ShowDialog() = DialogResult.OK Then
+                    If File.Exists(saveFileDialog1.FileName) Then
+                        File.Delete(saveFileDialog1.FileName)
+                    End If
+                    File.Copy(oErrorlogFilename, saveFileDialog1.FileName)
+                End If
+            End If
+            Dim oMSG = "The export of the log files was successful. Please make the log files available in a ticket or send them to Your admin-team"
+            MsgBox(oMSG, MsgBoxStyle.Information, Me.Text)
+        Catch ex As Exception
+            MsgBox(ex.Message, MsgBoxStyle.Critical, "Error saving log file")
+        End Try
+    End Sub
+    Public Shared Sub Save_Logfiles()
+
+    End Sub
 End Class

EnvelopeGenerator.GeneratorAPI/Controllers/EnvelopeController.cs

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

EnvelopeGenerator.GeneratorAPI/Controllers/EnvelopeReceiverController.cs

@@ -1,5 +1,5 @@
 using DigitalData.Core.DTO;
-using EnvelopeGenerator.Application.Contracts;
+using EnvelopeGenerator.Application.Contracts.Services;
 using EnvelopeGenerator.Common.My.Resources;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;

EnvelopeGenerator.GeneratorAPI/Controllers/EnvelopeTypeController.cs

@@ -1,5 +1,5 @@
 using DigitalData.Core.DTO;
-using EnvelopeGenerator.Application.Contracts;
+using EnvelopeGenerator.Application.Contracts.Services;
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Mvc;
 using System.Net.Mail;

EnvelopeGenerator.GeneratorAPI/Controllers/HistoryController.cs

@@ -1,4 +1,4 @@
-using EnvelopeGenerator.Application.Contracts;
+using EnvelopeGenerator.Application.Contracts.Services;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
 using System;

EnvelopeGenerator.GeneratorAPI/Controllers/ReceiverController.cs

@@ -1,6 +1,6 @@
 using DigitalData.Core.API;
 using DigitalData.Core.DTO;
-using EnvelopeGenerator.Application.Contracts;
+using EnvelopeGenerator.Application.Contracts.Services;
 using EnvelopeGenerator.Application.DTOs.Receiver;
 using EnvelopeGenerator.Domain.Entities;
 using Microsoft.AspNetCore.Authorization;

EnvelopeGenerator.Infrastructure/Contracts/IConfigRepository.cs

@@ -1,10 +0,0 @@
-using DigitalData.Core.Abstractions.Infrastructure;
-using EnvelopeGenerator.Domain.Entities;
-
-namespace EnvelopeGenerator.Infrastructure.Contracts
-{
-    public interface IConfigRepository : ICRUDRepository<Config, int>
-    {
-        Task<Config?> ReadFirstAsync();
-    }
-}

EnvelopeGenerator.Infrastructure/Contracts/IDocumentReceiverElementRepository.cs

@@ -1,9 +0,0 @@
-using DigitalData.Core.Abstractions.Infrastructure;
-using EnvelopeGenerator.Domain.Entities;
-
-namespace EnvelopeGenerator.Infrastructure.Contracts
-{
-    public interface IDocumentReceiverElementRepository : ICRUDRepository<DocumentReceiverElement, int>
-    {
-    }
-}

EnvelopeGenerator.Infrastructure/Contracts/IDocumentStatusRepository.cs

@@ -1,9 +0,0 @@
-using DigitalData.Core.Abstractions.Infrastructure;
-using EnvelopeGenerator.Domain.Entities;
-
-namespace EnvelopeGenerator.Infrastructure.Contracts
-{
-    public interface IDocumentStatusRepository : ICRUDRepository<DocumentStatus, int>
-    {
-    }
-}

EnvelopeGenerator.Infrastructure/Contracts/IEmailTemplateRepository.cs

@@ -1,11 +0,0 @@
-using DigitalData.Core.Abstractions.Infrastructure;
-using EnvelopeGenerator.Domain.Entities;
-using static EnvelopeGenerator.Common.Constants;
-
-namespace EnvelopeGenerator.Infrastructure.Contracts
-{
-    public interface IEmailTemplateRepository : ICRUDRepository<EmailTemplate, int>
-    {
-        Task<EmailTemplate?> ReadByNameAsync(EmailTemplateType type);
-    }
-}

EnvelopeGenerator.Infrastructure/Contracts/IEnvelopeCertificateRepository.cs

@@ -1,9 +0,0 @@
-using DigitalData.Core.Abstractions.Infrastructure;
-using EnvelopeGenerator.Domain.Entities;
-
-namespace EnvelopeGenerator.Infrastructure.Contracts
-{
-    public interface IEnvelopeCertificateRepository : ICRUDRepository<EnvelopeCertificate, int>
-    {
-    }
-}

EnvelopeGenerator.Infrastructure/Contracts/IEnvelopeDocumentRepository.cs

@@ -1,9 +0,0 @@
-using DigitalData.Core.Abstractions.Infrastructure;
-using EnvelopeGenerator.Domain.Entities;
-
-namespace EnvelopeGenerator.Infrastructure.Contracts
-{
-    public interface IEnvelopeDocumentRepository : ICRUDRepository<EnvelopeDocument, int>
-    {
-    }
-}

EnvelopeGenerator.Infrastructure/Contracts/IEnvelopeHistoryRepository.cs

@@ -1,12 +0,0 @@
-using DigitalData.Core.Abstractions.Infrastructure;
-using EnvelopeGenerator.Domain.Entities;
-
-namespace EnvelopeGenerator.Infrastructure.Contracts
-{
-    public interface IEnvelopeHistoryRepository : ICRUDRepository<EnvelopeHistory, long>
-    {
-        Task<int> CountAsync(int? envelopeId = null, string? userReference = null, int? status = null);
-
-        Task<IEnumerable<EnvelopeHistory>> ReadAsync(int? envelopeId = null, string? userReference = null, int? status = null, bool withSender = false, bool withReceiver = false);
-    }
-}

EnvelopeGenerator.Infrastructure/Contracts/IEnvelopeReceiverReadOnlyRepository.cs

@@ -1,9 +0,0 @@
-using DigitalData.Core.Abstractions.Infrastructure;
-using EnvelopeGenerator.Domain.Entities;
-
-namespace EnvelopeGenerator.Infrastructure.Contracts
-{
-    public interface IEnvelopeReceiverReadOnlyRepository : ICRUDRepository<EnvelopeReceiverReadOnly, long>
-    {
-    }
-}

EnvelopeGenerator.Infrastructure/Contracts/IEnvelopeReceiverRepository.cs

@@ -1,26 +0,0 @@
-using DigitalData.Core.Abstractions.Infrastructure;
-using EnvelopeGenerator.Domain.Entities;
-
-namespace EnvelopeGenerator.Infrastructure.Contracts
-{
-    public interface IEnvelopeReceiverRepository : ICRUDRepository<EnvelopeReceiver, (int Envelope, int Receiver)>
-    {
-        Task<IEnumerable<EnvelopeReceiver>> ReadByUuidAsync(string uuid, bool withEnvelope = true, bool withReceiver = false, bool readOnly = true);
-
-        Task<IEnumerable<EnvelopeReceiver>> ReadBySignatureAsync(string signature, bool withEnvelope = false, bool withReceiver = true, bool readOnly = true);
-
-        Task<EnvelopeReceiver?> ReadByUuidSignatureAsync(string uuid, string signature, bool withEnvelope = true, bool withReceiver = true, bool readOnly = true);
-
-        Task<string?> ReadAccessCodeAsync(string uuid, string signature, bool readOnly = true);
-
-        Task<int> CountAsync(string uuid, string signature);
-
-		Task<EnvelopeReceiver?> ReadByIdAsync(int envelopeId, int receiverId, bool readOnly = true);
-
-		Task<string?> ReadAccessCodeByIdAsync(int envelopeId, int receiverId, bool readOnly = true);
-
-        Task<IEnumerable<EnvelopeReceiver>> ReadByUsernameAsync(string username, int? min_status = null, int? max_status = null, params int[] ignore_statuses);
-
-        Task<EnvelopeReceiver?> ReadLastByReceiver(string email);
-    }
-}

EnvelopeGenerator.Infrastructure/Contracts/IEnvelopeRepository.cs

@@ -1,14 +0,0 @@
-using DigitalData.Core.Abstractions.Infrastructure;
-using EnvelopeGenerator.Domain.Entities;
-
-namespace EnvelopeGenerator.Infrastructure.Contracts
-{
-    public interface IEnvelopeRepository : ICRUDRepository<Envelope, int>
-    {
-        Task<IEnumerable<Envelope>> ReadAllWithAsync(bool documents = false, bool history = false, bool documentReceiverElement = false);
-
-        Task<Envelope?> ReadByUuidAsync(string uuid, bool withDocuments = false, bool withHistory = false, bool withDocumentReceiverElement = false, bool withUser = false, bool withAll = false);
-
-        Task<IEnumerable<Envelope>> ReadByUserAsync(int userId, int? min_status = null, int? max_status = null, params int[] ignore_statuses);
-    }
-}

EnvelopeGenerator.Infrastructure/Contracts/IEnvelopeTypeRepository.cs

@@ -1,9 +0,0 @@
-using DigitalData.Core.Abstractions.Infrastructure;
-using EnvelopeGenerator.Domain.Entities;
-
-namespace EnvelopeGenerator.Infrastructure.Contracts
-{
-    public interface IEnvelopeTypeRepository : ICRUDRepository<EnvelopeType, int>
-    {
-    }
-}

EnvelopeGenerator.Infrastructure/Contracts/IReceiverRepository.cs

@@ -1,10 +0,0 @@
-using DigitalData.Core.Abstractions.Infrastructure;
-using EnvelopeGenerator.Domain.Entities;
-
-namespace EnvelopeGenerator.Infrastructure.Contracts
-{
-    public interface IReceiverRepository : ICRUDRepository<Receiver, int>
-    {
-        Task<Receiver?> ReadByAsync(string? emailAddress = null, string? signature = null);
-    }
-}

EnvelopeGenerator.Infrastructure/Contracts/IUserReceiverRepository.cs

@@ -1,9 +0,0 @@
-using DigitalData.Core.Abstractions.Infrastructure;
-using EnvelopeGenerator.Domain.Entities;
-
-namespace EnvelopeGenerator.Infrastructure.Contracts
-{
-    public interface IUserReceiverRepository : ICRUDRepository<UserReceiver, int>
-    {
-    }
-}

EnvelopeGenerator.Infrastructure/DIExtensions.cs

@@ -0,0 +1,37 @@
+using EnvelopeGenerator.Application.Contracts.Repositories;
+using EnvelopeGenerator.Application.Extensions;
+using EnvelopeGenerator.Infrastructure.Repositories;
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.DependencyInjection.Extensions;
+using Microsoft.Extensions.Configuration;
+
+namespace EnvelopeGenerator.Infrastructure;
+
+public static class DIExtensions
+{
+    public static IServiceCollection AddEnvelopeGeneratorRepositories(this IServiceCollection services)
+    {
+        services.TryAddScoped<IConfigRepository, ConfigRepository>();
+        services.TryAddScoped<IDocumentReceiverElementRepository, DocumentReceiverElementRepository>();
+        services.TryAddScoped<IEnvelopeDocumentRepository, EnvelopeDocumentRepository>();
+        services.TryAddScoped<IConfigRepository, ConfigRepository>();
+        services.TryAddScoped<IDocumentReceiverElementRepository, DocumentReceiverElementRepository>();
+        services.TryAddScoped<IDocumentStatusRepository, DocumentStatusRepository>();
+        services.TryAddScoped<IEmailTemplateRepository, EmailTemplateRepository>();
+        services.TryAddScoped<IEnvelopeRepository, EnvelopeRepository>();
+        services.TryAddScoped<IEnvelopeCertificateRepository, EnvelopeCertificateRepository>();
+        services.TryAddScoped<IEnvelopeDocumentRepository, EnvelopeDocumentRepository>();
+        services.TryAddScoped<IEnvelopeHistoryRepository, EnvelopeHistoryRepository>();
+        services.TryAddScoped<IEnvelopeReceiverRepository, EnvelopeReceiverRepository>();
+        services.TryAddScoped<IEnvelopeTypeRepository, EnvelopeTypeRepository>();
+        services.TryAddScoped<IReceiverRepository, ReceiverRepository>();
+        services.TryAddScoped<IUserReceiverRepository, UserReceiverRepository>();
+        services.TryAddScoped<IEnvelopeReceiverReadOnlyRepository, EnvelopeReceiverReadOnlyRepository>();
+
+        return services;
+    }
+
+    public static IServiceCollection AddEnvelopeGenerator(this IServiceCollection services, IConfiguration configuration) => services
+        .AddEnvelopeGeneratorRepositories()
+        .AddEnvelopeGeneratorServices(configuration);
+}

EnvelopeGenerator.Infrastructure/EGDbContext.cs

@@ -7,12 +7,16 @@ using Microsoft.EntityFrameworkCore;
 using Group = DigitalData.UserManager.Domain.Entities.Group;
 using Module = DigitalData.UserManager.Domain.Entities.Module;
 using DigitalData.EmailProfilerDispatcher;
+using Microsoft.Extensions.Options;
+using EnvelopeGenerator.Application.Configurations;
+using DigitalData.Core.Client;
+using Microsoft.Extensions.Logging;
 
-namespace EnvelopeGenerator.Infrastructure
+namespace EnvelopeGenerator.Infrastructure;
+
+//TODO: Adding EmailOut instead of EmailOut.Abst is not correct for the arch. Re-design EmailPut consedering this. IMailDbContext shoud move to Abstraction layer (hint: in this case using DBSet in abst. will be problem because entity framework will have to be added.
+public class EGDbContext : DbContext, IUserManagerDbContext, IMailDbContext
 {
-    //TODO: Adding EmailOut instead of EmailOut.Abst is not correct for the arch. Re-design EmailPut consedering this. IMailDbContext shoud move to Abstraction layer (hint: in this case using DBSet in abst. will be problem because entity framework will have to be added.
-    public class EGDbContext : DbContext, IUserManagerDbContext, IMailDbContext
-    {
     public DbSet<UserReceiver> UserReceivers { get; set; }
 
     public DbSet<Config> Configs { get; set; }
@@ -53,8 +57,15 @@ namespace EnvelopeGenerator.Infrastructure
 
     public DbSet<EnvelopeReceiverReadOnly> EnvelopeReceiverReadOnlys { get; set; }
 
-        public EGDbContext(DbContextOptions<EGDbContext> options) : base(options)
+    private readonly DbTriggerParams _triggers;
+
+    private readonly ILogger<EGDbContext> _logger;
+
+    public EGDbContext(DbContextOptions<EGDbContext> options, IOptions<DbTriggerParams> triggerParamOptions, ILogger<EGDbContext> logger) : base(options)
     {
+        _triggers = triggerParamOptions.Value;
+        _logger = logger;
+
         UserReceivers = Set<UserReceiver>();
         Configs = Set<Config>();
         EnvelopeReceivers = Set<EnvelopeReceiver>();
@@ -136,16 +147,34 @@ namespace EnvelopeGenerator.Infrastructure
             .HasPrincipalKey(r => r.EmailAddress);
 
         // Configure entities to handle database triggers
-            modelBuilder.Entity<Envelope>().ToTable(tb => tb.HasTrigger("TBSIG_ENVELOPE_HISTORY_AFT_INS"));
+        void AddTrigger<T>() where T : class => _triggers
-            modelBuilder.Entity<EnvelopeHistory>().ToTable(tb => tb.HasTrigger("TBSIG_ENVELOPE_HISTORY_AFT_INS"));
+            .Where(t => t.Key == typeof(T).Name)
-            modelBuilder.Entity<EmailOut>().ToTable(tb => tb.HasTrigger("TBEMLP_EMAIL_OUT_AFT_INS"));
+            .SelectMany(t => t.Value)
-            modelBuilder.Entity<EmailOut>().ToTable(tb => tb.HasTrigger("TBEMLP_EMAIL_OUT_AFT_UPD"));
+            .ForEach(tName =>
-            modelBuilder.Entity<EnvelopeReceiverReadOnly>().ToTable(tb => tb.HasTrigger("TBSIG_ENVELOPE_RECEIVER_READ_ONLY_UPD"));
+            {
+                modelBuilder.Entity<T>().ToTable(tb => tb.HasTrigger(tName));
+                _logger.LogInformation("Trigger '{triggerName}' has been added to the '{entityName}' entity.", tName, typeof(T).Name);
+            });
+        
+        // TODO: call add trigger methods with attributes and reflection
+        AddTrigger<Config>();
+        AddTrigger<DocumentReceiverElement>();
+        AddTrigger<DocumentStatus>();
+        AddTrigger<EmailTemplate>();
+        AddTrigger<Envelope>();
+        AddTrigger<EnvelopeCertificate>();
+        AddTrigger<EnvelopeDocument>();
+        AddTrigger<EnvelopeHistory>();
+        AddTrigger<EnvelopeReceiver>();
+        AddTrigger<EnvelopeReceiverReadOnly>();
+        AddTrigger<EnvelopeType>();
+        AddTrigger<Receiver>();
+        AddTrigger<UserReceiver>();
+        AddTrigger<EmailOut>();
 
         //configure model builder for user manager tables
         modelBuilder.ConfigureUserManager();
 
         base.OnModelCreating(modelBuilder);
     }
-    }
 }

EnvelopeGenerator.Infrastructure/EnvelopeGenerator.Infrastructure.csproj

@@ -20,6 +20,7 @@
   </ItemGroup>
 
   <ItemGroup>
+    <ProjectReference Include="..\EnvelopeGenerator.Application\EnvelopeGenerator.Application.csproj" />
     <ProjectReference Include="..\EnvelopeGenerator.Domain\EnvelopeGenerator.Domain.csproj" />
   </ItemGroup>
 

EnvelopeGenerator.Infrastructure/Repositories/ConfigRepository.cs

@@ -1,12 +1,12 @@
 using DigitalData.Core.Infrastructure;
 using EnvelopeGenerator.Domain.Entities;
-using EnvelopeGenerator.Infrastructure.Contracts;
+using EnvelopeGenerator.Application.Contracts.Repositories;
 using Microsoft.EntityFrameworkCore;
 
-namespace EnvelopeGenerator.Infrastructure.Repositories
+namespace EnvelopeGenerator.Infrastructure.Repositories;
+
+public class ConfigRepository : CRUDRepository<Config, int, EGDbContext>, IConfigRepository
 {
-    public class ConfigRepository : CRUDRepository<Config, int, EGDbContext>, IConfigRepository
-    {
     public ConfigRepository(EGDbContext dbContext) : base(dbContext, dbContext.Configs)
     {
     }
@@ -16,5 +16,4 @@ namespace EnvelopeGenerator.Infrastructure.Repositories
         var configs = await _dbSet.ToListAsync();
         return configs.Count > 0 ? configs[0] : default;
     }
-    }
 }

EnvelopeGenerator.Infrastructure/Repositories/DocumentReceiverElementRepository.cs

@@ -1,13 +1,12 @@
 using DigitalData.Core.Infrastructure;
 using EnvelopeGenerator.Domain.Entities;
-using EnvelopeGenerator.Infrastructure.Contracts;
+using EnvelopeGenerator.Application.Contracts.Repositories;
 
-namespace EnvelopeGenerator.Infrastructure.Repositories
+namespace EnvelopeGenerator.Infrastructure.Repositories;
+
+public class DocumentReceiverElementRepository : CRUDRepository<DocumentReceiverElement, int, EGDbContext>, IDocumentReceiverElementRepository
 {
-    public class DocumentReceiverElementRepository : CRUDRepository<DocumentReceiverElement, int, EGDbContext>, IDocumentReceiverElementRepository
-    {
     public DocumentReceiverElementRepository(EGDbContext dbContext) : base(dbContext, dbContext.DocumentReceiverElements)
     {
     }
-    }
 }

EnvelopeGenerator.Infrastructure/Repositories/DocumentStatusRepository.cs

@@ -1,14 +1,13 @@
 using DigitalData.Core.Infrastructure;
 using DigitalData.UserManager.Infrastructure.Repositories;
 using EnvelopeGenerator.Domain.Entities;
-using EnvelopeGenerator.Infrastructure.Contracts;
+using EnvelopeGenerator.Application.Contracts.Repositories;
 
-namespace EnvelopeGenerator.Infrastructure.Repositories
+namespace EnvelopeGenerator.Infrastructure.Repositories;
+
+public class DocumentStatusRepository : CRUDRepository<DocumentStatus, int, EGDbContext>, IDocumentStatusRepository
 {
-    public class DocumentStatusRepository : CRUDRepository<DocumentStatus, int, EGDbContext>, IDocumentStatusRepository
-    {
     public DocumentStatusRepository(EGDbContext dbContext) : base(dbContext, dbContext.DocumentStatus)
     {
     }
-    }
 }

EnvelopeGenerator.Infrastructure/Repositories/EmailTemplateRepository.cs

@@ -1,12 +1,12 @@
 using DigitalData.Core.Infrastructure;
 using EnvelopeGenerator.Domain.Entities;
-using EnvelopeGenerator.Infrastructure.Contracts;
+using EnvelopeGenerator.Application.Contracts.Repositories;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.Extensions.Caching.Memory;
 using static EnvelopeGenerator.Common.Constants;
 
-namespace EnvelopeGenerator.Infrastructure.Repositories
+namespace EnvelopeGenerator.Infrastructure.Repositories;
-{
+
     public class EmailTemplateRepository : CRUDRepository<EmailTemplate, int, EGDbContext>, IEmailTemplateRepository
     {
         private readonly IMemoryCache _cache;
@@ -31,4 +31,3 @@ namespace EnvelopeGenerator.Infrastructure.Repositories
 	public async Task<EmailTemplate?> ReadByNameAsync(EmailTemplateType type) => await _cache.GetOrCreateAsync($"{type}{key_guid}", async _
             => await _dbSet.Where(t => t.Name == type.ToString()).FirstOrDefaultAsync());
     }
-}

EnvelopeGenerator.Infrastructure/Repositories/EnvelopeCertificateRepository.cs

@@ -1,13 +1,12 @@
 using DigitalData.Core.Infrastructure;
 using EnvelopeGenerator.Domain.Entities;
-using EnvelopeGenerator.Infrastructure.Contracts;
+using EnvelopeGenerator.Application.Contracts.Repositories;
 
-namespace EnvelopeGenerator.Infrastructure.Repositories
+namespace EnvelopeGenerator.Infrastructure.Repositories;
+
+public class EnvelopeCertificateRepository : CRUDRepository<EnvelopeCertificate, int, EGDbContext>, IEnvelopeCertificateRepository
 {
-    public class EnvelopeCertificateRepository : CRUDRepository<EnvelopeCertificate, int, EGDbContext>, IEnvelopeCertificateRepository
-    {
     public EnvelopeCertificateRepository(EGDbContext dbContext) : base(dbContext, dbContext.EnvelopeCertificates)
     {
     }
-    }
 }

EnvelopeGenerator.Infrastructure/Repositories/EnvelopeDocumentRepository.cs

@@ -1,14 +1,13 @@
 using DigitalData.Core.Infrastructure;
 using DigitalData.UserManager.Infrastructure.Repositories;
 using EnvelopeGenerator.Domain.Entities;
-using EnvelopeGenerator.Infrastructure.Contracts;
+using EnvelopeGenerator.Application.Contracts.Repositories;
 
-namespace EnvelopeGenerator.Infrastructure.Repositories
+namespace EnvelopeGenerator.Infrastructure.Repositories;
+
+public class EnvelopeDocumentRepository : CRUDRepository<EnvelopeDocument, int, EGDbContext>, IEnvelopeDocumentRepository
 {
-    public class EnvelopeDocumentRepository : CRUDRepository<EnvelopeDocument, int, EGDbContext>, IEnvelopeDocumentRepository
-    {
     public EnvelopeDocumentRepository(EGDbContext dbContext) : base(dbContext, dbContext.EnvelopeDocument)
     {
     }
-    }
 }

EnvelopeGenerator.Infrastructure/Repositories/EnvelopeHistoryRepository.cs

@@ -1,12 +1,12 @@
 using DigitalData.Core.Infrastructure;
 using EnvelopeGenerator.Domain.Entities;
-using EnvelopeGenerator.Infrastructure.Contracts;
+using EnvelopeGenerator.Application.Contracts.Repositories;
 using Microsoft.EntityFrameworkCore;
 
-namespace EnvelopeGenerator.Infrastructure.Repositories
+namespace EnvelopeGenerator.Infrastructure.Repositories;
+
+public class EnvelopeHistoryRepository : CRUDRepository<EnvelopeHistory, long, EGDbContext>, IEnvelopeHistoryRepository
 {
-    public class EnvelopeHistoryRepository : CRUDRepository<EnvelopeHistory, long, EGDbContext>, IEnvelopeHistoryRepository
-    {
     public EnvelopeHistoryRepository(EGDbContext dbContext) : base(dbContext, dbContext.EnvelopeHistories)
     {
     }
@@ -45,5 +45,4 @@ namespace EnvelopeGenerator.Infrastructure.Repositories
         status: status,
         withSender: withSender,
         withReceiver: withReceiver).ToListAsync();
-    }
 }

EnvelopeGenerator.Infrastructure/Repositories/EnvelopeReceiverReadOnlyRepository.cs

@@ -1,12 +1,12 @@
 using DigitalData.Core.Infrastructure;
 using EnvelopeGenerator.Domain.Entities;
-using EnvelopeGenerator.Infrastructure.Contracts;
+using EnvelopeGenerator.Application.Contracts.Repositories;
 using Microsoft.EntityFrameworkCore;
 
-namespace EnvelopeGenerator.Infrastructure.Repositories
+namespace EnvelopeGenerator.Infrastructure.Repositories;
+
+public class EnvelopeReceiverReadOnlyRepository : CRUDRepository<EnvelopeReceiverReadOnly, long, EGDbContext>, IEnvelopeReceiverReadOnlyRepository
 {
-    public class EnvelopeReceiverReadOnlyRepository : CRUDRepository<EnvelopeReceiverReadOnly, long, EGDbContext>, IEnvelopeReceiverReadOnlyRepository
-    {
     private readonly IEnvelopeRepository _envRepo;
 
     public EnvelopeReceiverReadOnlyRepository(EGDbContext dbContext, IEnvelopeRepository envelopeRepository) : base(dbContext, dbContext.EnvelopeReceiverReadOnlys)
@@ -66,5 +66,4 @@ namespace EnvelopeGenerator.Infrastructure.Repositories
 
         return erros;
     }
-    }
 }

EnvelopeGenerator.Infrastructure/Repositories/EnvelopeRepository.cs

@@ -1,12 +1,12 @@
 using DigitalData.Core.Infrastructure;
 using EnvelopeGenerator.Domain.Entities;
-using EnvelopeGenerator.Infrastructure.Contracts;
+using EnvelopeGenerator.Application.Contracts.Repositories;
 using Microsoft.EntityFrameworkCore;
 
-namespace EnvelopeGenerator.Infrastructure.Repositories
+namespace EnvelopeGenerator.Infrastructure.Repositories;
+
+public class EnvelopeRepository : CRUDRepository<Envelope, int, EGDbContext>, IEnvelopeRepository
 {
-    public class EnvelopeRepository : CRUDRepository<Envelope, int, EGDbContext>, IEnvelopeRepository
-    {
     public EnvelopeRepository(EGDbContext dbContext) : base(dbContext, dbContext.Envelopes)
     {
     }
@@ -61,5 +61,4 @@ namespace EnvelopeGenerator.Infrastructure.Repositories
 
         return await query.ToListAsync();
     }
-    }
 }

EnvelopeGenerator.Infrastructure/Repositories/EnvelopeTypeRepository.cs

@@ -1,13 +1,12 @@
 using DigitalData.Core.Infrastructure;
 using EnvelopeGenerator.Domain.Entities;
-using EnvelopeGenerator.Infrastructure.Contracts;
+using EnvelopeGenerator.Application.Contracts.Repositories;
 
-namespace EnvelopeGenerator.Infrastructure.Repositories
+namespace EnvelopeGenerator.Infrastructure.Repositories;
+
+public class EnvelopeTypeRepository : CRUDRepository<EnvelopeType, int, EGDbContext>, IEnvelopeTypeRepository
 {
-    public class EnvelopeTypeRepository : CRUDRepository<EnvelopeType, int, EGDbContext>, IEnvelopeTypeRepository
-    {
     public EnvelopeTypeRepository(EGDbContext dbContext) : base(dbContext, dbContext.EnvelopeTypes)
     {
     }
-    }
 }

EnvelopeGenerator.Infrastructure/Repositories/EnvlopeReceiverRepository.cs

@@ -1,12 +1,12 @@
 using DigitalData.Core.Infrastructure;
 using EnvelopeGenerator.Domain.Entities;
-using EnvelopeGenerator.Infrastructure.Contracts;
+using EnvelopeGenerator.Application.Contracts.Repositories;
 using Microsoft.EntityFrameworkCore;
 
-namespace EnvelopeGenerator.Infrastructure.Repositories
+namespace EnvelopeGenerator.Infrastructure.Repositories;
+
+public class EnvelopeReceiverRepository : CRUDRepository<EnvelopeReceiver, (int Envelope, int Receiver), EGDbContext>, IEnvelopeReceiverRepository
 {
-    public class EnvelopeReceiverRepository : CRUDRepository<EnvelopeReceiver, (int Envelope, int Receiver), EGDbContext>, IEnvelopeReceiverRepository
-    {
     public EnvelopeReceiverRepository(EGDbContext dbContext) : base(dbContext, dbContext.EnvelopeReceivers)
     {
     }
@@ -83,5 +83,4 @@ namespace EnvelopeGenerator.Infrastructure.Repositories
     {
         return await _dbSet.Where(er => er.Receiver!.EmailAddress == email).OrderBy(er => er.EnvelopeId).LastOrDefaultAsync();
     }      
-    }
 }