chore(api): Core-Bibliotheken und UserManager.Infrastructure auf 2.0.0.0 aktualisiert

- Core-Bibliotheken und UserManager.Infrastructure in den API-Schichten auf Version 2.0.0.0 erhöht.
refactor(dbcontext): DbContext aktualisiert, um IUserManagerDbContext zu implementieren und neue DbSets hinzuzufügen
2024-09-20 11:05:00 +02:00 · 2024-09-20 09:46:21 +02:00 · 2024-09-20 09:39:14 +02:00 · 2024-09-20 01:16:47 +02:00 · 2024-09-19 15:06:33 +02:00 · 2024-09-19 14:48:34 +02:00
62 changed files with 296 additions and 214 deletions
--- a/EnvelopeGenerator.Application/Contracts/IConfigService.cs
+++ b/EnvelopeGenerator.Application/Contracts/IConfigService.cs
@@ -5,7 +5,7 @@ using EnvelopeGenerator.Domain.Entities;

 namespace EnvelopeGenerator.Application.Contracts
 {
-    public interface IConfigService : IBasicCRUDService<ConfigDto, Config, int>
+    public interface IConfigService : IReadService<ConfigDto, Config, int>
    {
        Task<DataResult<ConfigDto>> ReadFirstAsync();

--- a/EnvelopeGenerator.Application/Contracts/IEnvelopeHistoryService.cs
+++ b/EnvelopeGenerator.Application/Contracts/IEnvelopeHistoryService.cs
@@ -3,7 +3,6 @@ using DigitalData.Core.DTO;
 using EnvelopeGenerator.Application.DTOs.EnvelopeHistory;
 using EnvelopeGenerator.Application.DTOs.Receiver;
 using EnvelopeGenerator.Domain.Entities;
-using EnvelopeGenerator.Infrastructure.Contracts;
 using static EnvelopeGenerator.Common.Constants;

 namespace EnvelopeGenerator.Application.Contracts
--- a/EnvelopeGenerator.Application/Contracts/IEnvelopeReceiverService.cs
+++ b/EnvelopeGenerator.Application/Contracts/IEnvelopeReceiverService.cs
@@ -6,7 +6,7 @@ using EnvelopeGenerator.Domain.Entities;

 namespace EnvelopeGenerator.Application.Contracts
 {
-    public interface IEnvelopeReceiverService : IBasicCRUDService<EnvelopeReceiverDto, EnvelopeReceiver, object>
+    public interface IEnvelopeReceiverService : IBasicCRUDService<EnvelopeReceiverDto, EnvelopeReceiver, (int Envelope, int Receiver)>
    {

        Task<DataResult<IEnumerable<EnvelopeReceiverDto>>> ReadByUuidAsync(string uuid, bool withEnvelope = true, bool withReceiver = false);
--- a/EnvelopeGenerator.Application/Contracts/IUserReceiverService.cs
+++ b/EnvelopeGenerator.Application/Contracts/IUserReceiverService.cs
@@ -1,7 +1,6 @@
 using DigitalData.Core.Abstractions.Application;
 using EnvelopeGenerator.Application.DTOs;
 using EnvelopeGenerator.Domain.Entities;
-using EnvelopeGenerator.Infrastructure.Contracts;

 namespace EnvelopeGenerator.Application.Contracts
 {
--- a/EnvelopeGenerator.Application/DTOs/ConfigDto.cs
+++ b/EnvelopeGenerator.Application/DTOs/ConfigDto.cs
@@ -1,4 +1,7 @@
-namespace EnvelopeGenerator.Application.DTOs
+using DigitalData.Core.Abstractions;
+using System.Text.Json.Serialization;
+
+namespace EnvelopeGenerator.Application.DTOs
 {
    public record ConfigDto(
        string DocumentPath,
@@ -8,5 +11,10 @@
        string ExportPath,
        string DocumentPathDmz,
        string ExportPathDmz,
-        string DocumentPathMoveAftsend);
+        string DocumentPathMoveAftsend) : IUnique<int>
+    {
+        [JsonIgnore]
+        [Obsolete("Configuration does not have an ID; it represents a single table in the database.")]
+        public int Id => throw new InvalidOperationException("This configuration does not support an ID as it represents a single row in the database.");
+    };
 }
--- a/EnvelopeGenerator.Application/DTOs/DocumentReceiverElementDto.cs
+++ b/EnvelopeGenerator.Application/DTOs/DocumentReceiverElementDto.cs
@@ -1,4 +1,6 @@
-namespace EnvelopeGenerator.Application.DTOs
+using DigitalData.Core.Abstractions;
+
+namespace EnvelopeGenerator.Application.DTOs
 {
    public record DocumentReceiverElementDto(
        int Id,
@@ -18,5 +20,5 @@
        DateTime? ChangedWhen,
        double Top,
        double Left
-        );
+        ): IUnique<int>;
 }
--- a/EnvelopeGenerator.Application/DTOs/DocumentStatusDto.cs
+++ b/EnvelopeGenerator.Application/DTOs/DocumentStatusDto.cs
@@ -1,4 +1,6 @@
-namespace EnvelopeGenerator.Application.DTOs
+using DigitalData.Core.Abstractions;
+
+namespace EnvelopeGenerator.Application.DTOs
 {
    public record DocumentStatusDto(
        int Id,
@@ -8,5 +10,5 @@
        DateTime? StatusChangedWhen,
        string Value,
        DateTime AddedWhen,
-        DateTime? ChangedWhen);
+        DateTime? ChangedWhen) : IUnique<int>;
 }
--- a/EnvelopeGenerator.Application/DTOs/EmailTemplateDto.cs
+++ b/EnvelopeGenerator.Application/DTOs/EmailTemplateDto.cs
@@ -1,8 +1,10 @@
-namespace EnvelopeGenerator.Application.DTOs
+using DigitalData.Core.Abstractions;
+
+namespace EnvelopeGenerator.Application.DTOs
 {
    public record EmailTemplateDto(
        int Id,
        string Name,
        string Body,
-        string Subject);
+        string Subject) : IUnique<int>;
 }
--- a/EnvelopeGenerator.Application/DTOs/EnvelopeCertificateDto.cs
+++ b/EnvelopeGenerator.Application/DTOs/EnvelopeCertificateDto.cs
@@ -1,4 +1,6 @@
-namespace EnvelopeGenerator.Application.DTOs
+using DigitalData.Core.Abstractions;
+
+namespace EnvelopeGenerator.Application.DTOs
 {
    public record EnvelopeCertificateDto(
        int Id,
@@ -8,5 +10,5 @@
        int CreatorId,
        string CreatorName,
        string CreatorEmail,
-        int EnvelopeStatus);
+        int EnvelopeStatus) : IUnique<int>;
 }
--- a/EnvelopeGenerator.Application/DTOs/EnvelopeDocumentDto.cs
+++ b/EnvelopeGenerator.Application/DTOs/EnvelopeDocumentDto.cs
@@ -1,4 +1,6 @@
-namespace EnvelopeGenerator.Application.DTOs
+using DigitalData.Core.Abstractions;
+
+namespace EnvelopeGenerator.Application.DTOs
 {
    public record EnvelopeDocumentDto
    (
@@ -6,5 +8,5 @@
        int EnvelopeId,
        DateTime AddedWhen,
        IEnumerable<DocumentReceiverElementDto>? Elements
-    );
+    ) : IUnique<int>;
 }
--- a/EnvelopeGenerator.Application/DTOs/EnvelopeDto.cs
+++ b/EnvelopeGenerator.Application/DTOs/EnvelopeDto.cs
@@ -1,10 +1,11 @@
-using DigitalData.EmailProfilerDispatcher.Abstraction.Attributes;
+using DigitalData.Core.Abstractions;
+using DigitalData.EmailProfilerDispatcher.Abstraction.Attributes;
 using DigitalData.UserManager.Application.DTOs.User;
 using EnvelopeGenerator.Domain.Entities;

 namespace EnvelopeGenerator.Application.DTOs
 {
-    public record EnvelopeDto()
+    public record EnvelopeDto() : IUnique<int>
    {
 		public int Id { get; set; }

--- a/EnvelopeGenerator.Application/DTOs/EnvelopeHistory/EnvelopeHistoryDto.cs
+++ b/EnvelopeGenerator.Application/DTOs/EnvelopeHistory/EnvelopeHistoryDto.cs
@@ -1,4 +1,5 @@
-using DigitalData.Core.DTO;
+using DigitalData.Core.Abstractions;
+using DigitalData.Core.DTO;
 using DigitalData.UserManager.Application.DTOs.User;
 using EnvelopeGenerator.Application.DTOs.Receiver;
 using static EnvelopeGenerator.Common.Constants;
@@ -16,5 +17,5 @@ namespace EnvelopeGenerator.Application.DTOs.EnvelopeHistory
        UserCreateDto? Sender,
        ReceiverReadDto? Receiver,
        ReferenceType ReferenceType,
-        string? Comment = null) : BaseDTO<long>(Id);
+        string? Comment = null) : BaseDTO<long>(Id), IUnique<long>;
 }
--- a/EnvelopeGenerator.Application/DTOs/EnvelopeReceiver/EnvelopeReceiverBasicDto.cs
+++ b/EnvelopeGenerator.Application/DTOs/EnvelopeReceiver/EnvelopeReceiverBasicDto.cs
@@ -1,9 +1,12 @@
-using DigitalData.EmailProfilerDispatcher.Abstraction.Attributes;
+using DigitalData.Core.Abstractions;
+using DigitalData.EmailProfilerDispatcher.Abstraction.Attributes;

 namespace EnvelopeGenerator.Application.DTOs.EnvelopeReceiver
 {
-    public record EnvelopeReceiverBasicDto()
+    public record EnvelopeReceiverBasicDto() : IUnique<(int Envelope, int Receiver)>
    {
+        public (int Envelope, int Receiver) Id => (Envelope: EnvelopeId, Receiver: ReceiverId);
+
        public int EnvelopeId { get; init; }

        public int ReceiverId { get; init; }
--- a/EnvelopeGenerator.Application/DTOs/EnvelopeTypeDto.cs
+++ b/EnvelopeGenerator.Application/DTOs/EnvelopeTypeDto.cs
@@ -1,4 +1,6 @@
-namespace EnvelopeGenerator.Application.DTOs
+using DigitalData.Core.Abstractions;
+
+namespace EnvelopeGenerator.Application.DTOs
 {
    public record EnvelopeTypeDto(
        int Id,
@@ -15,5 +17,5 @@
        bool? SendReminderEmails,
        int? FirstReminderDays,
        int? ReminderIntervalDays,
-        int? ContractType);
+        int? ContractType) : IUnique<int>;
 }
--- a/EnvelopeGenerator.Application/DTOs/Receiver/ReceiverUpdateDto.cs
+++ b/EnvelopeGenerator.Application/DTOs/Receiver/ReceiverUpdateDto.cs
@@ -1,4 +1,6 @@
-namespace EnvelopeGenerator.Application.DTOs.Receiver
+using DigitalData.Core.Abstractions;
+
+namespace EnvelopeGenerator.Application.DTOs.Receiver
 {
-    public record ReceiverUpdateDto();
+    public record ReceiverUpdateDto(int Id) : IUnique<int>;
 }
--- a/EnvelopeGenerator.Application/DTOs/UserReceiverDto.cs
+++ b/EnvelopeGenerator.Application/DTOs/UserReceiverDto.cs
@@ -1,4 +1,6 @@
-namespace EnvelopeGenerator.Application.DTOs
+using DigitalData.Core.Abstractions;
+
+namespace EnvelopeGenerator.Application.DTOs
 {
    public record UserReceiverDto(
        int Id,
@@ -7,5 +9,5 @@
        string Name,
        string CompanyName,
        string JobTitle,
-        DateTime AddedWhen);
+        DateTime AddedWhen) : IUnique<int>;
 }
--- a/EnvelopeGenerator.Application/EnvelopeGenerator.Application.csproj
+++ b/EnvelopeGenerator.Application/EnvelopeGenerator.Application.csproj
@@ -12,13 +12,13 @@

  <ItemGroup>
    <PackageReference Include="AutoMapper" Version="13.0.1" />
-    <PackageReference Include="DigitalData.Core.Abstractions" Version="1.0.1.1" />
-    <PackageReference Include="DigitalData.Core.Application" Version="1.0.0" />
-    <PackageReference Include="DigitalData.Core.DTO" Version="1.0.0.1" />
-    <PackageReference Include="DigitalData.EmailProfilerDispatcher" Version="1.0.0" />
+    <PackageReference Include="DigitalData.Core.Abstractions" Version="2.0.0" />
+    <PackageReference Include="DigitalData.Core.Application" Version="2.0.0" />
+    <PackageReference Include="DigitalData.Core.DTO" Version="2.0.0" />
+    <PackageReference Include="DigitalData.EmailProfilerDispatcher" Version="2.0.0" />
    <PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="7.0.18" />
-    <PackageReference Include="UserManager.Application" Version="1.0.0" />
-    <PackageReference Include="UserManager.Infrastructure" Version="1.0.0" />
+    <PackageReference Include="UserManager.Application" Version="2.0.0" />
+    <PackageReference Include="UserManager.Infrastructure" Version="2.0.0" />
  </ItemGroup>

  <ItemGroup>
--- a/EnvelopeGenerator.Application/Services/ConfigService.cs
+++ b/EnvelopeGenerator.Application/Services/ConfigService.cs
@@ -3,15 +3,13 @@ using DigitalData.Core.Application;
 using DigitalData.Core.DTO;
 using EnvelopeGenerator.Application.Contracts;
 using EnvelopeGenerator.Application.DTOs;
-using EnvelopeGenerator.Application.Resources;
 using EnvelopeGenerator.Domain.Entities;
 using EnvelopeGenerator.Infrastructure.Contracts;
 using Microsoft.Extensions.Caching.Memory;
-using Microsoft.Extensions.Localization;
 using Microsoft.Extensions.Logging;
 namespace EnvelopeGenerator.Application.Services
 {
-    public class ConfigService : BasicCRUDService<IConfigRepository, ConfigDto, Config, int>, IConfigService
+    public class ConfigService : ReadService<IConfigRepository, ConfigDto, Config, int>, IConfigService
    {
 		private static readonly Guid DefaultConfigCacheId = Guid.NewGuid();

@@ -28,7 +26,7 @@ namespace EnvelopeGenerator.Application.Services
            var config = await _repository.ReadFirstAsync();
            return config is null 
                ? Result.Fail<ConfigDto>().Notice(LogLevel.Error, Flag.DataIntegrityIssue, "There is no configuration in DB.")
-                : Result.Success(_mapper.MapOrThrow<ConfigDto>(config));
+                : Result.Success(_mapper.Map<ConfigDto>(config));
        }

 		/// <summary>
--- a/EnvelopeGenerator.Application/Services/DocumentReceiverElementService.cs
+++ b/EnvelopeGenerator.Application/Services/DocumentReceiverElementService.cs
@@ -2,10 +2,8 @@
 using DigitalData.Core.Application;
 using EnvelopeGenerator.Application.Contracts;
 using EnvelopeGenerator.Application.DTOs;
-using EnvelopeGenerator.Application.Resources;
 using EnvelopeGenerator.Domain.Entities;
 using EnvelopeGenerator.Infrastructure.Contracts;
-using Microsoft.Extensions.Localization;

 namespace EnvelopeGenerator.Application.Services
 {
--- a/EnvelopeGenerator.Application/Services/DocumentStatusService.cs
+++ b/EnvelopeGenerator.Application/Services/DocumentStatusService.cs
@@ -2,10 +2,8 @@
 using DigitalData.Core.Application;
 using EnvelopeGenerator.Application.Contracts;
 using EnvelopeGenerator.Application.DTOs;
-using EnvelopeGenerator.Application.Resources;
 using EnvelopeGenerator.Domain.Entities;
 using EnvelopeGenerator.Infrastructure.Contracts;
-using Microsoft.Extensions.Localization;

 namespace EnvelopeGenerator.Application.Services
 {
--- a/EnvelopeGenerator.Application/Services/EmailTemplateService.cs
+++ b/EnvelopeGenerator.Application/Services/EmailTemplateService.cs
@@ -1,11 +1,9 @@
 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.Resources;
 using static EnvelopeGenerator.Common.Constants;
 using DigitalData.Core.DTO;
 using Microsoft.Extensions.Logging;
@@ -26,7 +24,7 @@ namespace EnvelopeGenerator.Application.Services
                ? Result.Fail<EmailTemplateDto>()
                    .Message(Key.InnerServiceError)
                    .Notice(LogLevel.Error, Flag.DataIntegrityIssue, $"EmailTemplateType '{type}' is not found in DB. Please, define required e-mail template.")
-                : Result.Success(_mapper.MapOrThrow<EmailTemplateDto>(temp));
+                : Result.Success(_mapper.Map<EmailTemplateDto>(temp));
        }
    }
 }
--- a/EnvelopeGenerator.Application/Services/EnvelopeHistoryService.cs
+++ b/EnvelopeGenerator.Application/Services/EnvelopeHistoryService.cs
@@ -1,11 +1,9 @@
 using AutoMapper;
 using DigitalData.Core.Application;
-using Microsoft.Extensions.Localization;
 using EnvelopeGenerator.Application.Contracts;
 using EnvelopeGenerator.Domain.Entities;
 using EnvelopeGenerator.Infrastructure.Contracts;
 using static EnvelopeGenerator.Common.Constants;
-using EnvelopeGenerator.Application.Resources;
 using DigitalData.Core.DTO;
 using EnvelopeGenerator.Application.DTOs.EnvelopeHistory;
 using EnvelopeGenerator.Application.DTOs.Receiver;
@@ -14,7 +12,7 @@ namespace EnvelopeGenerator.Application.Services
 {
    public class EnvelopeHistoryService : CRUDService<IEnvelopeHistoryRepository, EnvelopeHistoryCreateDto, EnvelopeHistoryDto, EnvelopeHistoryDto, EnvelopeHistory, long>, IEnvelopeHistoryService
    {
-        public EnvelopeHistoryService(IEnvelopeHistoryRepository repository, IStringLocalizer<Resource> localizer, IMapper mapper)
+        public EnvelopeHistoryService(IEnvelopeHistoryRepository repository, IMapper mapper)
            : base(repository, mapper)
        {
        }
@@ -53,7 +51,7 @@ namespace EnvelopeGenerator.Application.Services

        public async Task<IEnumerable<EnvelopeHistoryDto>> ReadAsync(int? envelopeId = null, string? userReference = null, ReferenceType? referenceType = null, int? status = null, bool withSender = false, bool withReceiver = false)
        {
-            var histDTOs = _mapper.MapOrThrow<IEnumerable<EnvelopeHistoryDto>>(
+            var histDTOs = _mapper.Map<IEnumerable<EnvelopeHistoryDto>>(
                        await _repository.ReadAsync(
                                    envelopeId: envelopeId,
                                    userReference: userReference,
--- a/EnvelopeGenerator.Application/Services/EnvelopeReceiverService.cs
+++ b/EnvelopeGenerator.Application/Services/EnvelopeReceiverService.cs
@@ -11,7 +11,7 @@ using Microsoft.Extensions.Logging;

 namespace EnvelopeGenerator.Application.Services
 {
-    public class EnvelopeReceiverService : BasicCRUDService<IEnvelopeReceiverRepository, EnvelopeReceiverDto, EnvelopeReceiver, object>, IEnvelopeReceiverService
+    public class EnvelopeReceiverService : BasicCRUDService<IEnvelopeReceiverRepository, EnvelopeReceiverDto, EnvelopeReceiver, (int Envelope, int Receiver)>, IEnvelopeReceiverService
    {
        private readonly IStringLocalizer<Resource> _localizer;

@@ -24,19 +24,19 @@ namespace EnvelopeGenerator.Application.Services
        public async Task<DataResult<IEnumerable<EnvelopeReceiverDto>>> ReadBySignatureAsync(string signature, bool withEnvelope = false, bool withReceiver = true)
        {
            var env_rcvs = await _repository.ReadBySignatureAsync(signature: signature, withEnvelope: withEnvelope, withReceiver: withReceiver);
-            return Result.Success(_mapper.MapOrThrow<IEnumerable<EnvelopeReceiverDto>>(env_rcvs));
+            return Result.Success(_mapper.Map<IEnumerable<EnvelopeReceiverDto>>(env_rcvs));
        }

        public async Task<DataResult<IEnumerable<EnvelopeReceiverDto>>> ReadByUuidAsync(string uuid, bool withEnvelope = true, bool withReceiver = false)
        {
            var env_rcvs = await _repository.ReadByUuidAsync(uuid: uuid, withEnvelope: withEnvelope, withReceiver: withReceiver);
-            return Result.Success(_mapper.MapOrThrow<IEnumerable<EnvelopeReceiverDto>>(env_rcvs));
+            return Result.Success(_mapper.Map<IEnumerable<EnvelopeReceiverDto>>(env_rcvs));
        }

        public async Task<DataResult<IEnumerable<EnvelopeReceiverSecretDto>>> ReadSecretByUuidAsync(string uuid, bool withEnvelope = false, bool withReceiver = true)
        {
            var env_rcvs = await _repository.ReadByUuidAsync(uuid: uuid, withEnvelope: withEnvelope, withReceiver: withReceiver);
-            return Result.Success(_mapper.MapOrThrow<IEnumerable<EnvelopeReceiverSecretDto>>(env_rcvs));
+            return Result.Success(_mapper.Map<IEnumerable<EnvelopeReceiverSecretDto>>(env_rcvs));
        }

        public async Task<DataResult<EnvelopeReceiverDto>> ReadByUuidSignatureAsync(string uuid, string signature, bool withEnvelope = true, bool withReceiver = true)
@@ -46,7 +46,7 @@ namespace EnvelopeGenerator.Application.Services
                return Result.Fail<EnvelopeReceiverDto>()
                    .Message(Key.EnvelopeReceiverNotFound);

-            return Result.Success(_mapper.MapOrThrow<EnvelopeReceiverDto>(env_rcv));
+            return Result.Success(_mapper.Map<EnvelopeReceiverDto>(env_rcv));
        }

        public async Task<DataResult<EnvelopeReceiverDto>> ReadByEnvelopeReceiverIdAsync(string envelopeReceiverId, bool withEnvelope = true, bool withReceiver = true)
@@ -125,7 +125,7 @@ namespace EnvelopeGenerator.Application.Services
        public async Task<DataResult<IEnumerable<EnvelopeReceiverDto>>> ReadByUsernameAsync(string username, int? min_status = null, int? max_status = null, params int[] ignore_statuses)
        {
            var er_list = await _repository.ReadByUsernameAsync(username: username, min_status: min_status, max_status: max_status, ignore_statuses: ignore_statuses);
-            var dto_list = _mapper.MapOrThrow<IEnumerable<EnvelopeReceiverDto>>(er_list);
+            var dto_list = _mapper.Map<IEnumerable<EnvelopeReceiverDto>>(er_list);
            return Result.Success(dto_list);
        }

--- a/EnvelopeGenerator.Application/Services/EnvelopeService.cs
+++ b/EnvelopeGenerator.Application/Services/EnvelopeService.cs
@@ -18,7 +18,7 @@ namespace EnvelopeGenerator.Application.Services
        public async Task<DataResult<IEnumerable<EnvelopeDto>>> ReadAllWithAsync(bool documents = false, bool history = false, bool documentReceiverElement = false)
        {
            var envelopes = await _repository.ReadAllWithAsync(documents: documents, history: history, documentReceiverElement: documentReceiverElement);
-            var readDto = _mapper.MapOrThrow<IEnumerable<EnvelopeDto>>(envelopes);
+            var readDto = _mapper.Map<IEnumerable<EnvelopeDto>>(envelopes);
            return Result.Success(readDto);
        }

@@ -29,14 +29,14 @@ namespace EnvelopeGenerator.Application.Services
            if (envelope is null)
                return Result.Fail<EnvelopeDto>();

-            var readDto = _mapper.MapOrThrow<EnvelopeDto>(envelope);
+            var readDto = _mapper.Map<EnvelopeDto>(envelope);
            return Result.Success(readDto);
        }

        public async Task<DataResult<IEnumerable<EnvelopeDto>>> ReadByUserAsync(int userId, int? min_status = null, int? max_status = null, params int[] ignore_statuses)
        {
            var users = await _repository.ReadByUserAsync(userId: userId, min_status: min_status, max_status: max_status, ignore_statuses: ignore_statuses);            
-            var readDto = _mapper.MapOrThrow<IEnumerable<EnvelopeDto>>(users);
+            var readDto = _mapper.Map<IEnumerable<EnvelopeDto>>(users);
            return Result.Success(readDto);
        }
    }
--- a/EnvelopeGenerator.Application/Services/EnvelopeTypeService.cs
+++ b/EnvelopeGenerator.Application/Services/EnvelopeTypeService.cs
@@ -6,7 +6,6 @@ using EnvelopeGenerator.Domain.Entities;
 using EnvelopeGenerator.Infrastructure.Contracts;
 using Microsoft.Extensions.Caching.Memory;
 using DigitalData.Core.DTO;
-using System.Collections.Generic;
 using Microsoft.Extensions.Logging;

 namespace EnvelopeGenerator.Application.Services
--- a/EnvelopeGenerator.Application/Services/ReceiverService.cs
+++ b/EnvelopeGenerator.Application/Services/ReceiverService.cs
@@ -1,10 +1,8 @@
 using AutoMapper;
 using DigitalData.Core.Application;
-using Microsoft.Extensions.Localization;
 using EnvelopeGenerator.Application.Contracts;
 using EnvelopeGenerator.Domain.Entities;
 using EnvelopeGenerator.Infrastructure.Contracts;
-using EnvelopeGenerator.Application.Resources;
 using EnvelopeGenerator.Application.DTOs.Receiver;
 using DigitalData.Core.DTO;

@@ -12,7 +10,7 @@ namespace EnvelopeGenerator.Application.Services
 {
    public class ReceiverService : CRUDService<IReceiverRepository, ReceiverCreateDto, ReceiverReadDto, ReceiverUpdateDto, Receiver, int>, IReceiverService
    {
-        public ReceiverService(IReceiverRepository repository, IStringLocalizer<Resource> localizer, IMapper mapper)
+        public ReceiverService(IReceiverRepository repository, IMapper mapper)
            : base(repository, mapper)
        {
        }
@@ -24,7 +22,7 @@ namespace EnvelopeGenerator.Application.Services
            if (rcv is null)
                return Result.Fail<ReceiverReadDto>();

-            return Result.Success(_mapper.MapOrThrow<ReceiverReadDto>(rcv));
+            return Result.Success(_mapper.Map<ReceiverReadDto>(rcv));
        }

        public async Task<Result> DeleteByAsync(string? emailAddress = null, string? signature = null)
--- a/EnvelopeGenerator.Application/Services/UserReceiverService.cs
+++ b/EnvelopeGenerator.Application/Services/UserReceiverService.cs
@@ -1,17 +1,15 @@
 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.Resources;

 namespace EnvelopeGenerator.Application.Services
 {
    public class UserReceiverService : BasicCRUDService<IUserReceiverRepository, UserReceiverDto, UserReceiver, int>, IUserReceiverService
    {
-        public UserReceiverService(IUserReceiverRepository repository, IStringLocalizer<Resource> localizer, IMapper mapper)
+        public UserReceiverService(IUserReceiverRepository repository, IMapper mapper)
            : base(repository, mapper)
        {
        }
--- a/EnvelopeGenerator.Domain/Entities/Config.cs
+++ b/EnvelopeGenerator.Domain/Entities/Config.cs
@@ -1,43 +1,41 @@
-using System.ComponentModel;
+using DigitalData.Core.Abstractions;
 using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;

 namespace EnvelopeGenerator.Domain.Entities
 {
    [Table("TBSIG_CONFIG", Schema = "dbo")]
-    public class Config
+    public class Config : IUnique<int>
    {
        [Column("DOCUMENT_PATH", TypeName = "nvarchar(256)")]
-        public string DocumentPath { get; set; }
+        public string? DocumentPath { get; init; }

        [Column("SENDING_PROFILE", TypeName = "int")]
        [Required]
-        [DatabaseGenerated(DatabaseGeneratedOption.None)] // Assuming SENDING_PROFILE is manually entered or controlled by the application logic
-        [DefaultValue(0)] // This sets the default value for SENDING_PROFILE
-        public int SendingProfile { get; set; }
+        public required int SendingProfile { get; init; }

        [Column("SIGNATURE_HOST", TypeName = "nvarchar(128)")]
-        public string SignatureHost { get; set; }
+        public string? SignatureHost { get; init; }

        [Column("EXTERNAL_PROGRAM_NAME", TypeName = "nvarchar(30)")]
-        public string ExternalProgramName { get; set; }
+        public string? ExternalProgramName { get; init; }

        [Column("EXPORT_PATH", TypeName = "nvarchar(256)")]
-        public string ExportPath { get; set; }
+        public string? ExportPath { get; init; }

        [Column("DOCUMENT_PATH_DMZ", TypeName = "nvarchar(512)")]
        [Required]
-        [DefaultValue("")] // This sets the default value for DOCUMENT_PATH_DMZ
-        public string DocumentPathDmz { get; set; }
+        public string? DocumentPathDmz { get; init; }

        [Column("EXPORT_PATH_DMZ", TypeName = "nvarchar(512)")]
        [Required]
-        [DefaultValue("")] // This sets the default value for EXPORT_PATH_DMZ
-        public string ExportPathDmz { get; set; }
+        public required string ExportPathDmz { get; init; }

        [Column("DOCUMENT_PATH_MOVE_AFTSEND", TypeName = "nvarchar(512)")]
        [Required]
-        [DefaultValue("")] // This sets the default value for DOCUMENT_PATH_MOVE_AFTSEND
-        public string DocumentPathMoveAftsend { get; set; }
+        public required string DocumentPathMoveAftsend { get; init; }
+
+        [Obsolete("Configuration does not have an ID; it represents a single table in the database.")]
+        public int Id => throw new InvalidOperationException("This configuration does not support an ID as it represents a single table in the database.");
    }
 }
--- a/EnvelopeGenerator.Domain/Entities/DocumentReceiverElement.cs
+++ b/EnvelopeGenerator.Domain/Entities/DocumentReceiverElement.cs
@@ -1,11 +1,12 @@
-using System.ComponentModel;
+using DigitalData.Core.Abstractions;
+using System.ComponentModel;
 using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;

 namespace EnvelopeGenerator.Domain.Entities
 {
    [Table("TBSIG_DOCUMENT_RECEIVER_ELEMENT", Schema = "dbo")]
-    public class DocumentReceiverElement
+    public class DocumentReceiverElement : IUnique<int>
    {
        [Key]
        [DatabaseGenerated(DatabaseGeneratedOption.Identity)]
--- a/EnvelopeGenerator.Domain/Entities/DocumentStatus.cs
+++ b/EnvelopeGenerator.Domain/Entities/DocumentStatus.cs
@@ -1,10 +1,11 @@
-using System.ComponentModel.DataAnnotations;
+using DigitalData.Core.Abstractions;
+using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;

 namespace EnvelopeGenerator.Domain.Entities
 {
    [Table("TBSIG_DOCUMENT_STATUS", Schema = "dbo")]
-    public class DocumentStatus
+    public class DocumentStatus : IUnique<int>
    {
        [Key]
        [DatabaseGenerated(DatabaseGeneratedOption.Identity)]
@@ -27,7 +28,7 @@ namespace EnvelopeGenerator.Domain.Entities
        public DateTime? StatusChangedWhen { get; set; }

        [Column("VALUE", TypeName = "nvarchar(max)")]
-        public string Value { get; set; }
+        public string? Value { get; set; }

        [Required]
        [Column("ADDED_WHEN", TypeName = "datetime")]
@@ -42,4 +43,4 @@ namespace EnvelopeGenerator.Domain.Entities
        [ForeignKey("ReceiverId")]
        public virtual Receiver? Receiver { get; set; }
    }
-}
+}
--- a/EnvelopeGenerator.Domain/Entities/EmailTemplate.cs
+++ b/EnvelopeGenerator.Domain/Entities/EmailTemplate.cs
@@ -1,10 +1,11 @@
-using System.ComponentModel.DataAnnotations;
+using DigitalData.Core.Abstractions;
+using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;

 namespace EnvelopeGenerator.Domain.Entities
 {
    [Table("TBSIG_EMAIL_TEMPLATE", Schema = "dbo")]
-    public class EmailTemplate
+    public class EmailTemplate : IUnique<int>
    {
        [Key]
        [DatabaseGenerated(DatabaseGeneratedOption.Identity)]
@@ -12,12 +13,12 @@ namespace EnvelopeGenerator.Domain.Entities
        public int Id { get; set; }

        [Column("NAME", TypeName = "nvarchar(64)")]
-        public string Name { get; set; }
+        public string? Name { get; set; }

        [Column("BODY", TypeName = "nvarchar(max)")]
-        public string Body { get; set; }
+        public string? Body { get; set; }

        [Column("SUBJECT", TypeName = "nvarchar(512)")]
-        public string Subject { get; set; }
+        public string? Subject { get; set; }
    }
 }
--- a/EnvelopeGenerator.Domain/Entities/Envelope.cs
+++ b/EnvelopeGenerator.Domain/Entities/Envelope.cs
@@ -1,12 +1,12 @@
-using EnvelopeGenerator.Common;
-using EnvelopeGenerator.Common.My.Resources;
+using DigitalData.Core.Abstractions;
+using EnvelopeGenerator.Common;
 using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;

 namespace EnvelopeGenerator.Domain.Entities
 {
    [Table("TBSIG_ENVELOPE", Schema = "dbo")]
-    public class Envelope
+    public class Envelope : IUnique<int>
    {
        [Key]
        [DatabaseGenerated(DatabaseGeneratedOption.Identity)]
@@ -26,11 +26,11 @@ namespace EnvelopeGenerator.Domain.Entities

        [Required]
        [Column("ENVELOPE_UUID", TypeName = "nvarchar(36)")]
-        public string Uuid { get; set; }
+        public required string Uuid { get; init; }

        [Required]
        [Column("MESSAGE", TypeName = "nvarchar(max)")]
-        public string Message { get; set; }
+        public string? Message { get; set; }

        [Column("EXPIRES_WHEN", TypeName = "datetime")]
        public DateTime? ExpiresWhen { get; set; }
@@ -46,13 +46,13 @@ namespace EnvelopeGenerator.Domain.Entities
        public DateTime? ChangedWhen { get; set; }

        [Column("TITLE", TypeName = "nvarchar(128)")]
-        public string Title { get; set; }
+        public string? Title { get; set; }

        [Column("CONTRACT_TYPE")]
        public int? ContractType { get; set; }

        [Column("LANGUAGE", TypeName = "nvarchar(5)")]
-        public string Language { get; set; }
+        public required string Language { get; set; }

        [Column("SEND_REMINDER_EMAILS")]
        public bool? SendReminderEmails { get; set; }
--- a/EnvelopeGenerator.Domain/Entities/EnvelopeCertificate.cs
+++ b/EnvelopeGenerator.Domain/Entities/EnvelopeCertificate.cs
@@ -1,10 +1,11 @@
-using System.ComponentModel.DataAnnotations;
+using DigitalData.Core.Abstractions;
+using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;

 namespace EnvelopeGenerator.Domain.Entities
 {
    [Table("TBSIG_ENVELOPE_CERTIFICATE", Schema = "dbo")]
-    public class EnvelopeCertificate
+    public class EnvelopeCertificate : IUnique<int>
    {
        [Key]
        [DatabaseGenerated(DatabaseGeneratedOption.Identity)]
@@ -17,11 +18,11 @@ namespace EnvelopeGenerator.Domain.Entities

        [Required]
        [Column("ENVELOPE_UUID", TypeName = "nvarchar(36)")]
-        public string EnvelopeUuid { get; set; }
+        public required string EnvelopeUuid { get; set; }

        [Required]
        [Column("ENVELOPE_SUBJECT", TypeName = "nvarchar(512)")]
-        public string EnvelopeSubject { get; set; }
+        public required string EnvelopeSubject { get; set; }

        [Required]
        [Column("CREATOR_ID")]
@@ -29,11 +30,11 @@ namespace EnvelopeGenerator.Domain.Entities

        [Required]
        [Column("CREATOR_NAME", TypeName = "nvarchar(128)")]
-        public string CreatorName { get; set; }
+        public required string CreatorName { get; set; }

        [Required]
        [Column("CREATOR_EMAIL", TypeName = "nvarchar(128)")]
-        public string CreatorEmail { get; set; }
+        public required string CreatorEmail { get; set; }

        [Required]
        [Column("ENVELOPE_STATUS")]
--- a/EnvelopeGenerator.Domain/Entities/EnvelopeDocument.cs
+++ b/EnvelopeGenerator.Domain/Entities/EnvelopeDocument.cs
@@ -1,10 +1,11 @@
-using System.ComponentModel.DataAnnotations;
+using DigitalData.Core.Abstractions;
+using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;

 namespace EnvelopeGenerator.Domain.Entities
 {
    [Table("TBSIG_ENVELOPE_DOCUMENT", Schema = "dbo")]
-    public class EnvelopeDocument
+    public class EnvelopeDocument : IUnique<int>
    {
        [Key]
        [DatabaseGenerated(DatabaseGeneratedOption.Identity)]
@@ -17,18 +18,18 @@ namespace EnvelopeGenerator.Domain.Entities

        [Required]
        [Column("FILENAME", TypeName = "nvarchar(256)")]
-        public string Filename { get; set; }
+        public required string Filename { get; set; }

        [Required]
        [Column("FILEPATH", TypeName = "nvarchar(256)")]
-        public string Filepath { get; set; }
+        public required string Filepath { get; set; }

        [Required]
        [Column("ADDED_WHEN", TypeName = "datetime")]
-        public DateTime AddedWhen { get; set; }
+        public required DateTime AddedWhen { get; set; }

        [Column("FILENAME_ORIGINAL", TypeName = "nvarchar(256)")]
-        public string FilenameOriginal { get; set; }
+        public required string FilenameOriginal { get; set; }

        public IEnumerable<DocumentReceiverElement>? Elements { get; set; }
    }
--- a/EnvelopeGenerator.Domain/Entities/EnvelopeHistory.cs
+++ b/EnvelopeGenerator.Domain/Entities/EnvelopeHistory.cs
@@ -1,4 +1,5 @@
-using DigitalData.UserManager.Domain.Entities;
+using DigitalData.Core.Abstractions;
+using DigitalData.UserManager.Domain.Entities;
 using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
 using static EnvelopeGenerator.Common.Constants;
@@ -6,7 +7,7 @@ using static EnvelopeGenerator.Common.Constants;
 namespace EnvelopeGenerator.Domain.Entities
 {
    [Table("TBSIG_ENVELOPE_HISTORY", Schema = "dbo")]
-    public class EnvelopeHistory
+    public class EnvelopeHistory : IUnique<long>
    {
        [Key]
        [DatabaseGenerated(DatabaseGeneratedOption.Identity)]
--- a/EnvelopeGenerator.Domain/Entities/EnvelopeReceiverBase.cs
+++ b/EnvelopeGenerator.Domain/Entities/EnvelopeReceiverBase.cs
@@ -1,10 +1,11 @@
-using System.ComponentModel.DataAnnotations;
+using DigitalData.Core.Abstractions;
+using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;

 namespace EnvelopeGenerator.Domain.Entities
 {
    [Table("TBSIG_ENVELOPE_RECEIVER", Schema = "dbo")]
-    public class EnvelopeReceiverBase
+    public class EnvelopeReceiverBase : IUnique<(int Envelope, int Receiver)>
    {
        [Key]
        [Column("ENVELOPE_ID")]
@@ -39,5 +40,7 @@ namespace EnvelopeGenerator.Domain.Entities

        [Column("CHANGED_WHEN", TypeName = "datetime")]
        public DateTime? ChangedWhen { get; set; }
+
+        public (int Envelope, int Receiver) Id => (Envelope: EnvelopeId, Receiver: ReceiverId);
    }
 }
--- a/EnvelopeGenerator.Domain/Entities/EnvelopeType.cs
+++ b/EnvelopeGenerator.Domain/Entities/EnvelopeType.cs
@@ -1,12 +1,11 @@
-using System;
+using DigitalData.Core.Abstractions;
 using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
-using EnvelopeGenerator.Domain.Entities;

 namespace EnvelopeGenerator.Domain.Entities
 {
    [Table("TBSIG_ENVELOPE_TYPE", Schema = "dbo")]
-    public class EnvelopeType
+    public class EnvelopeType : IUnique<int>
    {
        [Key]
        [DatabaseGenerated(DatabaseGeneratedOption.Identity)]
@@ -15,10 +14,10 @@ namespace EnvelopeGenerator.Domain.Entities

        [Required]
        [Column("TITLE", TypeName = "nvarchar(128)")]
-        public string Title { get; set; }
+        public required string Title { get; set; }

        [Column("LANGUAGE", TypeName = "nvarchar(5)")]
-        public string Language { get; set; }
+        public string? Language { get; set; }

        [Column("EXPIRES_DAYS")]
        public int? ExpiresDays { get; set; }
--- a/EnvelopeGenerator.Domain/Entities/Receiver.cs
+++ b/EnvelopeGenerator.Domain/Entities/Receiver.cs
@@ -1,10 +1,11 @@
-using System.ComponentModel.DataAnnotations;
+using DigitalData.Core.Abstractions;
+using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;

 namespace EnvelopeGenerator.Domain.Entities
 {
    [Table("TBSIG_RECEIVER", Schema = "dbo")]
-    public class Receiver
+    public class Receiver : IUnique<int>
    {
        [Key]
        [DatabaseGenerated(DatabaseGeneratedOption.Identity)]
--- a/EnvelopeGenerator.Domain/Entities/UserReceiver.cs
+++ b/EnvelopeGenerator.Domain/Entities/UserReceiver.cs
@@ -1,10 +1,11 @@
-using System.ComponentModel.DataAnnotations;
+using DigitalData.Core.Abstractions;
+using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;

 namespace EnvelopeGenerator.Domain.Entities
 {
    [Table("TBSIG_USER_RECEIVER", Schema = "dbo")]
-    public class UserReceiver
+    public class UserReceiver : IUnique<int>
    {
        [Key]
        [DatabaseGenerated(DatabaseGeneratedOption.Identity)]
@@ -21,16 +22,16 @@ namespace EnvelopeGenerator.Domain.Entities

        [Required]
        [Column("NAME", TypeName = "nvarchar(128)")]
-        public string Name { get; set; }
+        public required string Name { get; set; }

        [Column("COMPANY_NAME", TypeName = "nvarchar(128)")]
-        public string CompanyName { get; set; }
+        public string? CompanyName { get; set; }

        [Column("JOB_TITLE", TypeName = "nvarchar(128)")]
-        public string JobTitle { get; set; }
+        public string? JobTitle { get; set; }

        [Required]
        [Column("ADDED_WHEN", TypeName = "datetime")]
-        public DateTime AddedWhen { get; set; }
+        public required DateTime AddedWhen { get; init; }
    }
 }
--- a/EnvelopeGenerator.Domain/EnvelopeGenerator.Domain.csproj
+++ b/EnvelopeGenerator.Domain/EnvelopeGenerator.Domain.csproj
@@ -7,6 +7,7 @@
  </PropertyGroup>

  <ItemGroup>
+    <PackageReference Include="DigitalData.Core.Abstractions" Version="2.0.0" />
    <PackageReference Include="DigitalData.EmailProfilerDispatcher.Abstraction" Version="1.0.0" />
    <PackageReference Include="UserManager.Domain" Version="1.0.0" />
  </ItemGroup>
--- a/EnvelopeGenerator.GeneratorAPI/EnvelopeGenerator.GeneratorAPI.csproj
+++ b/EnvelopeGenerator.GeneratorAPI/EnvelopeGenerator.GeneratorAPI.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk.Web">
+<Project Sdk="Microsoft.NET.Sdk.Web">

  <PropertyGroup>
    <TargetFramework>net7.0</TargetFramework>
@@ -7,8 +7,8 @@
  </PropertyGroup>

  <ItemGroup>
-    <PackageReference Include="DigitalData.Core.Abstractions" Version="1.0.1.1" />
-    <PackageReference Include="DigitalData.Core.API" Version="1.0.2.1" />
+    <PackageReference Include="DigitalData.Core.Abstractions" Version="2.0.0" />
+    <PackageReference Include="DigitalData.Core.API" Version="2.0.0" />
    <PackageReference Include="Microsoft.AspNetCore.OpenApi" Version="7.0.15" />
    <PackageReference Include="Swashbuckle.AspNetCore" Version="6.5.0" />
    <PackageReference Include="System.DirectoryServices" Version="7.0.1" />
--- a/EnvelopeGenerator.Infrastructure/Contracts/IEnvelopeReceiverRepository.cs
+++ b/EnvelopeGenerator.Infrastructure/Contracts/IEnvelopeReceiverRepository.cs
@@ -3,7 +3,7 @@ using EnvelopeGenerator.Domain.Entities;

 namespace EnvelopeGenerator.Infrastructure.Contracts
 {
-    public interface IEnvelopeReceiverRepository : ICRUDRepository<EnvelopeReceiver, object>
+    public interface IEnvelopeReceiverRepository : ICRUDRepository<EnvelopeReceiver, (int Envelope, int Receiver)>
    {
        Task<IEnumerable<EnvelopeReceiver>> ReadByUuidAsync(string uuid, bool withEnvelope = true, bool withReceiver = false);

--- a/EnvelopeGenerator.Infrastructure/EGDbContext.cs
+++ b/EnvelopeGenerator.Infrastructure/EGDbContext.cs
@@ -1,14 +1,77 @@
 using DigitalData.EmailProfilerDispatcher.Abstraction.Entities;
+using DigitalData.UserManager.Domain.Entities;
 using DigitalData.UserManager.Infrastructure;
+using DigitalData.UserManager.Infrastructure.Contracts;
 using EnvelopeGenerator.Domain.Entities;
 using Microsoft.EntityFrameworkCore;
+using Group = DigitalData.UserManager.Domain.Entities.Group;
+using Module = DigitalData.UserManager.Domain.Entities.Module;
+using DigitalData.EmailProfilerDispatcher;

 namespace EnvelopeGenerator.Infrastructure
 {
-    public class EGDbContext : DbContext
+    //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; }
+
+        public DbSet<EnvelopeReceiver> EnvelopeReceivers { get; set; }
+
+        public DbSet<Envelope> Envelopes { get; set; }
+
+        public DbSet<DocumentReceiverElement> DocumentReceiverElements { get; set; }
+
+        public DbSet<DocumentStatus> DocumentStatus { get; set; }
+
+        public DbSet<EmailTemplate> EmailTemplate { get; set; }
+
+        public DbSet<EnvelopeCertificate> EnvelopeCertificates { get; set; }
+
+        public DbSet<EnvelopeDocument> EnvelopeDocument { get; set; }
+
+        public DbSet<EnvelopeHistory> EnvelopeHistories { get; set; }
+
+        public DbSet<EnvelopeType> EnvelopeTypes { get; set; }
+
+        public DbSet<Receiver> Receivers { get; set; }
+
+        public DbSet<GroupOfUser> GroupOfUsers { get; set; }
+
+        public DbSet<Group> Groups { get; set; }
+
+        public DbSet<ModuleOfUser> ModuleOfUsers { get; set; }
+
+        public DbSet<Module> Modules { get; set; }
+
+        public DbSet<User> Users { get; set; }
+
+        public DbSet<UserRep> UserReps { get; set; }
+
+        public DbSet<EmailOut> EMailOuts { get; set; }
+
        public EGDbContext(DbContextOptions<EGDbContext> options) : base(options)
        {
+            UserReceivers = Set<UserReceiver>();
+            Configs = Set<Config>();
+            EnvelopeReceivers = Set<EnvelopeReceiver>();
+            Envelopes = Set<Envelope>();
+            DocumentReceiverElements = Set<DocumentReceiverElement>();
+            DocumentStatus = Set<DocumentStatus>();
+            EnvelopeCertificates = Set<EnvelopeCertificate>();
+            EnvelopeDocument = Set<EnvelopeDocument>();
+            EnvelopeHistories = Set<EnvelopeHistory>();
+            EnvelopeTypes = Set<EnvelopeType>();
+            Receivers = Set<Receiver>();
+
+            GroupOfUsers = Set<GroupOfUser>();
+            Groups = Set<Group>();
+            ModuleOfUsers = Set<ModuleOfUser>();
+            Modules = Set<Module>();
+            Users = Set<User>();
+            UserReps = Set<UserRep>();
+            EMailOuts = Set<EmailOut>();
        }

        protected override void OnModelCreating(ModelBuilder modelBuilder)
--- a/EnvelopeGenerator.Infrastructure/EnvelopeGenerator.Infrastructure.csproj
+++ b/EnvelopeGenerator.Infrastructure/EnvelopeGenerator.Infrastructure.csproj
@@ -7,15 +7,16 @@
  </PropertyGroup>

  <ItemGroup>
-    <PackageReference Include="DigitalData.Core.Abstractions" Version="1.0.1.1" />
-    <PackageReference Include="DigitalData.Core.Infrastructure" Version="1.0.1.1" />
+    <PackageReference Include="DigitalData.Core.Abstractions" Version="2.0.0" />
+    <PackageReference Include="DigitalData.Core.Infrastructure" Version="2.0.0" />
+    <PackageReference Include="DigitalData.EmailProfilerDispatcher" Version="2.0.0" />
    <PackageReference Include="Microsoft.EntityFrameworkCore" Version="7.0.16" />
    <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="7.0.15">
      <PrivateAssets>all</PrivateAssets>
      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
    </PackageReference>
    <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="7.0.15" />
-    <PackageReference Include="UserManager.Infrastructure" Version="1.0.0" />
+    <PackageReference Include="UserManager.Infrastructure" Version="2.0.0" />
  </ItemGroup>

  <ItemGroup>
--- a/EnvelopeGenerator.Infrastructure/Repositories/ConfigRepository.cs
+++ b/EnvelopeGenerator.Infrastructure/Repositories/ConfigRepository.cs
@@ -1,5 +1,4 @@
 using DigitalData.Core.Infrastructure;
-using DigitalData.UserManager.Infrastructure.Repositories;
 using EnvelopeGenerator.Domain.Entities;
 using EnvelopeGenerator.Infrastructure.Contracts;
 using Microsoft.EntityFrameworkCore;
@@ -8,7 +7,7 @@ namespace EnvelopeGenerator.Infrastructure.Repositories
 {
    public class ConfigRepository : CRUDRepository<Config, int, EGDbContext>, IConfigRepository
    {
-        public ConfigRepository(EGDbContext dbContext) : base(dbContext)
+        public ConfigRepository(EGDbContext dbContext) : base(dbContext, dbContext.Configs)
        {
        }

--- a/EnvelopeGenerator.Infrastructure/Repositories/DocumentReceiverElementRepository.cs
+++ b/EnvelopeGenerator.Infrastructure/Repositories/DocumentReceiverElementRepository.cs
@@ -1,5 +1,4 @@
 using DigitalData.Core.Infrastructure;
-using DigitalData.UserManager.Infrastructure.Repositories;
 using EnvelopeGenerator.Domain.Entities;
 using EnvelopeGenerator.Infrastructure.Contracts;

@@ -7,7 +6,7 @@ namespace EnvelopeGenerator.Infrastructure.Repositories
 {
    public class DocumentReceiverElementRepository : CRUDRepository<DocumentReceiverElement, int, EGDbContext>, IDocumentReceiverElementRepository
    {
-        public DocumentReceiverElementRepository(EGDbContext dbContext) : base(dbContext)
+        public DocumentReceiverElementRepository(EGDbContext dbContext) : base(dbContext, dbContext.DocumentReceiverElements)
        {
        }
    }
--- a/EnvelopeGenerator.Infrastructure/Repositories/DocumentStatusRepository.cs
+++ b/EnvelopeGenerator.Infrastructure/Repositories/DocumentStatusRepository.cs
@@ -7,7 +7,7 @@ namespace EnvelopeGenerator.Infrastructure.Repositories
 {
    public class DocumentStatusRepository : CRUDRepository<DocumentStatus, int, EGDbContext>, IDocumentStatusRepository
    {
-        public DocumentStatusRepository(EGDbContext dbContext) : base(dbContext)
+        public DocumentStatusRepository(EGDbContext dbContext) : base(dbContext, dbContext.DocumentStatus)
        {
        }
    }
--- a/EnvelopeGenerator.Infrastructure/Repositories/EmailTemplateRepository.cs
+++ b/EnvelopeGenerator.Infrastructure/Repositories/EmailTemplateRepository.cs
@@ -1,5 +1,4 @@
 using DigitalData.Core.Infrastructure;
-using DigitalData.UserManager.Infrastructure.Repositories;
 using EnvelopeGenerator.Domain.Entities;
 using EnvelopeGenerator.Infrastructure.Contracts;
 using Microsoft.EntityFrameworkCore;
@@ -12,7 +11,7 @@ namespace EnvelopeGenerator.Infrastructure.Repositories
    {
        private readonly IMemoryCache _cache;

-		public EmailTemplateRepository(EGDbContext dbContext, IMemoryCache cache) : base(dbContext)
+		public EmailTemplateRepository(EGDbContext dbContext, IMemoryCache cache) : base(dbContext, dbContext.EmailTemplate)
        {
            _cache = cache;
        }
--- a/EnvelopeGenerator.Infrastructure/Repositories/EnvelopeCertificateRepository.cs
+++ b/EnvelopeGenerator.Infrastructure/Repositories/EnvelopeCertificateRepository.cs
@@ -1,5 +1,4 @@
 using DigitalData.Core.Infrastructure;
-using DigitalData.UserManager.Infrastructure.Repositories;
 using EnvelopeGenerator.Domain.Entities;
 using EnvelopeGenerator.Infrastructure.Contracts;

@@ -7,7 +6,7 @@ namespace EnvelopeGenerator.Infrastructure.Repositories
 {
    public class EnvelopeCertificateRepository : CRUDRepository<EnvelopeCertificate, int, EGDbContext>, IEnvelopeCertificateRepository
    {
-        public EnvelopeCertificateRepository(EGDbContext dbContext) : base(dbContext)
+        public EnvelopeCertificateRepository(EGDbContext dbContext) : base(dbContext, dbContext.EnvelopeCertificates)
        {
        }
    }
--- a/EnvelopeGenerator.Infrastructure/Repositories/EnvelopeDocumentRepository.cs
+++ b/EnvelopeGenerator.Infrastructure/Repositories/EnvelopeDocumentRepository.cs
@@ -7,7 +7,7 @@ namespace EnvelopeGenerator.Infrastructure.Repositories
 {
    public class EnvelopeDocumentRepository : CRUDRepository<EnvelopeDocument, int, EGDbContext>, IEnvelopeDocumentRepository
    {
-        public EnvelopeDocumentRepository(EGDbContext dbContext) : base(dbContext)
+        public EnvelopeDocumentRepository(EGDbContext dbContext) : base(dbContext, dbContext.EnvelopeDocument)
        {
        }
    }
--- a/EnvelopeGenerator.Infrastructure/Repositories/EnvelopeHistoryRepository.cs
+++ b/EnvelopeGenerator.Infrastructure/Repositories/EnvelopeHistoryRepository.cs
@@ -1,5 +1,4 @@
 using DigitalData.Core.Infrastructure;
-using DigitalData.UserManager.Infrastructure.Repositories;
 using EnvelopeGenerator.Domain.Entities;
 using EnvelopeGenerator.Infrastructure.Contracts;
 using Microsoft.EntityFrameworkCore;
@@ -8,7 +7,7 @@ namespace EnvelopeGenerator.Infrastructure.Repositories
 {
    public class EnvelopeHistoryRepository : CRUDRepository<EnvelopeHistory, long, EGDbContext>, IEnvelopeHistoryRepository
    {
-        public EnvelopeHistoryRepository(EGDbContext dbContext) : base(dbContext)
+        public EnvelopeHistoryRepository(EGDbContext dbContext) : base(dbContext, dbContext.EnvelopeHistories)
        {
        }

--- a/EnvelopeGenerator.Infrastructure/Repositories/EnvelopeRepository.cs
+++ b/EnvelopeGenerator.Infrastructure/Repositories/EnvelopeRepository.cs
@@ -7,7 +7,7 @@ namespace EnvelopeGenerator.Infrastructure.Repositories
 {
    public class EnvelopeRepository : CRUDRepository<Envelope, int, EGDbContext>, IEnvelopeRepository
    {
-        public EnvelopeRepository(EGDbContext dbContext) : base(dbContext)
+        public EnvelopeRepository(EGDbContext dbContext) : base(dbContext, dbContext.Envelopes)
        {
        }

--- a/EnvelopeGenerator.Infrastructure/Repositories/EnvelopeTypeRepository.cs
+++ b/EnvelopeGenerator.Infrastructure/Repositories/EnvelopeTypeRepository.cs
@@ -1,5 +1,4 @@
 using DigitalData.Core.Infrastructure;
-using DigitalData.UserManager.Infrastructure.Repositories;
 using EnvelopeGenerator.Domain.Entities;
 using EnvelopeGenerator.Infrastructure.Contracts;

@@ -7,7 +6,7 @@ namespace EnvelopeGenerator.Infrastructure.Repositories
 {
    public class EnvelopeTypeRepository : CRUDRepository<EnvelopeType, int, EGDbContext>, IEnvelopeTypeRepository
    {
-        public EnvelopeTypeRepository(EGDbContext dbContext) : base(dbContext)
+        public EnvelopeTypeRepository(EGDbContext dbContext) : base(dbContext, dbContext.EnvelopeTypes)
        {
        }
    }
--- a/EnvelopeGenerator.Infrastructure/Repositories/EnvlopeReceiverRepository.cs
+++ b/EnvelopeGenerator.Infrastructure/Repositories/EnvlopeReceiverRepository.cs
@@ -5,9 +5,9 @@ using Microsoft.EntityFrameworkCore;

 namespace EnvelopeGenerator.Infrastructure.Repositories
 {
-    public class EnvelopeReceiverRepository : CRUDRepository<EnvelopeReceiver, object, EGDbContext>, IEnvelopeReceiverRepository
+    public class EnvelopeReceiverRepository : CRUDRepository<EnvelopeReceiver, (int Envelope, int Receiver), EGDbContext>, IEnvelopeReceiverRepository
    {
-        public EnvelopeReceiverRepository(EGDbContext dbContext) : base(dbContext)
+        public EnvelopeReceiverRepository(EGDbContext dbContext) : base(dbContext, dbContext.EnvelopeReceivers)
        {
        }

--- a/EnvelopeGenerator.Infrastructure/Repositories/ReceiverRepository.cs
+++ b/EnvelopeGenerator.Infrastructure/Repositories/ReceiverRepository.cs
@@ -7,7 +7,7 @@ namespace EnvelopeGenerator.Infrastructure.Repositories
 {
    public class ReceiverRepository : CRUDRepository<Receiver, int, EGDbContext>, IReceiverRepository
    {
-        public ReceiverRepository(EGDbContext dbContext) : base(dbContext)
+        public ReceiverRepository(EGDbContext dbContext) : base(dbContext, dbContext.Receivers)
        {
        }

--- a/EnvelopeGenerator.Infrastructure/Repositories/UserReceiverRepository.cs
+++ b/EnvelopeGenerator.Infrastructure/Repositories/UserReceiverRepository.cs
@@ -1,5 +1,4 @@
 using DigitalData.Core.Infrastructure;
-using DigitalData.UserManager.Infrastructure.Repositories;
 using EnvelopeGenerator.Domain.Entities;
 using EnvelopeGenerator.Infrastructure.Contracts;

@@ -7,7 +6,7 @@ namespace EnvelopeGenerator.Infrastructure.Repositories
 {
    public class UserReceiverRepository : CRUDRepository<UserReceiver, int, EGDbContext>, IUserReceiverRepository
    {
-        public UserReceiverRepository(EGDbContext dbContext) : base(dbContext)
+        public UserReceiverRepository(EGDbContext dbContext) : base(dbContext, dbContext.UserReceivers)
        {
        }
    }
--- a/EnvelopeGenerator.Web/Controllers/Test/TestConfigController.cs
+++ b/EnvelopeGenerator.Web/Controllers/Test/TestConfigController.cs
@@ -1,10 +1,11 @@
 using EnvelopeGenerator.Application.Contracts;
 using EnvelopeGenerator.Application.DTOs;
 using EnvelopeGenerator.Domain.Entities;
+using DigitalData.Core.API;

 namespace EnvelopeGenerator.Web.Controllers.Test
 {
-    public class TestConfigController : TestControllerBase<IConfigService, ConfigDto, Config, int>
+    public class TestConfigController : ReadControllerBase<IConfigService, ConfigDto, Config, int>
    {
        public TestConfigController(ILogger<TestConfigController> logger, IConfigService service) : base(logger, service)
        {
--- a/EnvelopeGenerator.Web/Controllers/Test/TestControllerBase.cs
+++ b/EnvelopeGenerator.Web/Controllers/Test/TestControllerBase.cs
@@ -1,6 +1,7 @@
 using DigitalData.Core.API;
 using DigitalData.Core.Abstractions.Application;
 using Microsoft.AspNetCore.Mvc;
+using DigitalData.Core.Abstractions;

 namespace EnvelopeGenerator.Web.Controllers.Test
 {
@@ -8,10 +9,10 @@ namespace EnvelopeGenerator.Web.Controllers.Test
    [Route("api/test/[controller]")]
    public class TestControllerBase<TCRUDService, TDto, TEntity, TId> : BasicCRUDControllerBase<TCRUDService, TDto, TEntity, TId> 
        where TCRUDService : ICRUDService<TDto, TDto, TDto, TEntity, TId>
-        where TDto : class where TEntity : class
+        where TDto : class, IUnique<TId> where TEntity : class, IUnique<TId>
    {
        public TestControllerBase(ILogger logger, TCRUDService service) : base(logger, service)
        {
        }
    }
-}
+}
--- a/EnvelopeGenerator.Web/Controllers/Test/TestEnvelopeReceiverController.cs
+++ b/EnvelopeGenerator.Web/Controllers/Test/TestEnvelopeReceiverController.cs
@@ -8,7 +8,7 @@ using EnvelopeGenerator.Application.DTOs.EnvelopeReceiver;

 namespace EnvelopeGenerator.Web.Controllers.Test
 {
-    public class TestEnvelopeReceiverController : TestControllerBase<IEnvelopeReceiverService, EnvelopeReceiverDto, EnvelopeReceiver, object>
+    public class TestEnvelopeReceiverController : ReadControllerBase<IEnvelopeReceiverService, EnvelopeReceiverDto, EnvelopeReceiver, (int Envelope, int Receiver)>
    {
        public TestEnvelopeReceiverController(ILogger<TestEnvelopeReceiverController> logger, IEnvelopeReceiverService service) : base(logger, service)
        {
--- a/EnvelopeGenerator.Web/EnvelopeGenerator.Web.csproj
+++ b/EnvelopeGenerator.Web/EnvelopeGenerator.Web.csproj
@@ -38,9 +38,9 @@
  <ItemGroup>
    <PackageReference Include="AutoMapper" Version="13.0.1" />
    <PackageReference Include="BuildBundlerMinifier2022" Version="2.9.9" />
-    <PackageReference Include="DigitalData.Core.Abstractions" Version="1.0.1.1" />
-    <PackageReference Include="DigitalData.Core.API" Version="1.0.2.1" />
-    <PackageReference Include="DigitalData.EmailProfilerDispatcher" Version="1.0.0" />
+    <PackageReference Include="DigitalData.Core.Abstractions" Version="2.0.0" />
+    <PackageReference Include="DigitalData.Core.API" Version="2.0.0" />
+    <PackageReference Include="DigitalData.EmailProfilerDispatcher" Version="2.0.0" />
    <PackageReference Include="HtmlSanitizer" Version="8.0.865" />
    <PackageReference Include="Microsoft.AspNetCore.OpenApi" Version="7.0.4" />
    <PackageReference Include="Microsoft.EntityFrameworkCore" Version="7.0.16" />
@@ -64,7 +64,7 @@
    <PackageReference Include="System.DirectoryServices.Protocols" Version="7.0.1" />
    <PackageReference Include="System.Drawing.Common" Version="7.0.0" />
    <PackageReference Include="System.Security.Cryptography.Cng" Version="5.0.0" />
-    <PackageReference Include="UserManager.Infrastructure" Version="1.0.0" />
+    <PackageReference Include="UserManager.Infrastructure" Version="2.0.0" />
  </ItemGroup>

  <ItemGroup>
--- a/EnvelopeGenerator.Web/Views/Home/EnvelopeRejected.cshtml
+++ b/EnvelopeGenerator.Web/Views/Home/EnvelopeRejected.cshtml
@@ -2,12 +2,12 @@
 	ViewData["Title"] = _localizer[WebKey.DocRejected];
 }
@{
-    var nonce = _accessor.HttpContext?.Items["csp-nonce"] as string;
+	var nonce = _accessor.HttpContext?.Items["csp-nonce"] as string;
 }
-@    using DigitalData.Core.DTO;
-@    using EnvelopeGenerator.Application.DTOs;
-@    using Newtonsoft.Json
-@    using Newtonsoft.Json.Serialization
+@using DigitalData.Core.DTO;
+@using EnvelopeGenerator.Application.DTOs.EnvelopeReceiver
+@using Newtonsoft.Json
+@using Newtonsoft.Json.Serialization
@model EnvelopeReceiverDto;
 <partial name="_CookieConsentPartial" />
@{
--- a/EnvelopeGenerator.Web/Views/Home/ShowEnvelope.cshtml
+++ b/EnvelopeGenerator.Web/Views/Home/ShowEnvelope.cshtml
@@ -1,11 +1,10 @@
@{
    var nonce = _accessor.HttpContext?.Items["csp-nonce"] as string;
 }
-@    using DigitalData.Core.DTO;
-@    using EnvelopeGenerator.Application.DTOs;
-@    using Newtonsoft.Json
-@    using Newtonsoft.Json.Serialization
-@model EnvelopeReceiverDto;
+@using EnvelopeGenerator.Application.DTOs.EnvelopeReceiver
+@using Newtonsoft.Json
+@using Newtonsoft.Json.Serialization
+@model EnvelopeReceiverDto
@{
    ViewData["Title"] = _localizer[WebKey.SignDoc];
 }
@@ -21,40 +20,43 @@
 }
 <div class="d-flex flex-column min-vh-100">
    <nav class="navbar navbar-light bg-light">
-        <div class="container-fluid">
+        <div class="container">
            <button class="navbar-toggler" type="button" data-bs-toggle="collapse" data-bs-target="#navbarToggleExternalContent" aria-controls="navbarToggleExternalContent" aria-expanded="false" aria-label="Toggle navigation">
-                <span class="navbar-toggler-icon"></span>
+                <span class="material-symbols-outlined">
+                    more_vert
+                </span>
            </button>
-            <div class="navbar-brand me-auto ms-5 envelope-message">@($"{_localizer[WebKey.Hello]} {Model.Name}, {@envelope?.Message}".TrySanitize(_sanitizer))</div>
-            <div class="col-1  p-0 m-0 me-3 d-flex">
-                <img src="~/img/digital_data.svg" alt="...">
+            <div class="envelope-message">
+                <span class="icon material-symbols-outlined">history_edu</span>
+                <span class="message navbar-brand">@($"{_localizer[WebKey.Hello]} {Model.Name}, {@envelope?.Message}".TrySanitize(_sanitizer))</span>
+            </div>
+            <div class="logo">
+                <img class="cursor-img" src="~/img/cursor_logo.png" alt="...">
            </div>
        </div>
    </nav>
-    <div class="collapse show" id="navbarToggleExternalContent" data-bs-theme="light">
-        <div class="bg-light p-1">
-            <div class="card sender-card mb-3">
-                <div class="row g-0">
-                    <div class="col p-0 m-0">
-                        <div class="card-body p-0 m-0 ms-4">
-                            <h5 class="card-title p-0 m-0">
-                                <span class="signature-process-title">@($"{_localizer[WebKey.SigningProcessTitle]}: ".TrySanitize(_sanitizer))</span>
-                                <span class="signature-process-name">@($"{envelope?.Title}".TrySanitize(_sanitizer))</span>
-                            </h5>
-                            <p class="card-text p-0 m-0">@Html.Raw(string.Format(_localizer[WebKey.EnvelopeInfo1], pages.Count(), stPageIndexes).TrySanitize(_hlSanitizer))</p>
-                            <p class="card-text p-0 m-0">
-                                <small class="text-body-secondary">
-                                    @Html.Raw(string.Format(_localizer[WebKey.EnvelopeInfo2],   /* sanitize separately but don't sanitize the URI */
-                                        envelope?.AddedWhen.ToString(userCulture?.Info?.DateTimeFormat).TrySanitize(_sanitizer),
-                                        $"{sender?.Prename} {sender?.Name}".TrySanitize(_sanitizer),
-                                        sender?.Email.TrySanitize(_sanitizer),
-                                        envelope?.Title.TrySanitize(_sanitizer),
-                                        sender?.Prename.TrySanitize(_sanitizer),
-                                        sender?.Name.TrySanitize(_sanitizer),
-                                        sender?.Email.TrySanitize(_sanitizer)))
-                                </small>
-                            </p>
-                        </div>
+    <div class="collapse show bg-light " id="navbarToggleExternalContent" data-bs-theme="light">
+        <div class="card sender-card p-1 mb-3">
+            <div class="row g-0">
+                <div class="col p-0 m-0">
+                    <div class="card-body p-0 m-0 ms-4">
+                        <h5 class="card-title p-0 m-0">
+                            <span class="signature-process-title">@($"{_localizer[WebKey.SigningProcessTitle]}: ".TrySanitize(_sanitizer))</span>
+                            <span class="signature-process-name">@($"{envelope?.Title}".TrySanitize(_sanitizer))</span>
+                        </h5>
+                        <p class="card-text p-0 m-0">@Html.Raw(string.Format(_localizer[WebKey.EnvelopeInfo1], pages.Count(), stPageIndexes).TrySanitize(_hlSanitizer))</p>
+                        <p class="card-text p-0 m-0">
+                            <small class="text-body-secondary">
+                                @Html.Raw(string.Format(_localizer[WebKey.EnvelopeInfo2],   /* sanitize separately but don't sanitize the URI */
+                                         envelope?.AddedWhen.ToString(userCulture?.Info?.DateTimeFormat).TrySanitize(_sanitizer),
+                                         $"{sender?.Prename} {sender?.Name}".TrySanitize(_sanitizer),
+                                         sender?.Email.TrySanitize(_sanitizer),
+                                         envelope?.Title.TrySanitize(_sanitizer),
+                                         sender?.Prename.TrySanitize(_sanitizer),
+                                         sender?.Name.TrySanitize(_sanitizer),
+                                         sender?.Email.TrySanitize(_sanitizer)))
+                            </small>
+                        </p>
                    </div>
                </div>
            </div>
@@ -70,7 +72,7 @@
        </button>
        <button class="btn_reject btn btn-danger" type="button">
            <svg width="25px" height="25px" viewBox="43.5 43.5 512 512" version="1.1" fill="currentColor" xml:space="preserve" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-                <path class="st0" d="M263.24,43.5c-117.36,0-212.5,95.14-212.5,212.5s95.14,212.5,212.5,212.5s212.5-95.14,212.5-212.5    S380.6,43.5,263.24,43.5z M367.83,298.36c17.18,17.18,17.18,45.04,0,62.23v0c-17.18,17.18-45.04,17.18-62.23,0l-42.36-42.36    l-42.36,42.36c-17.18,17.18-45.04,17.18-62.23,0v0c-17.18-17.18-17.18-45.04,0-62.23L201.01,256l-42.36-42.36    c-17.18-17.18-17.18-45.04,0-62.23v0c17.18-17.18,45.04-17.18,62.23,0l42.36,42.36l42.36-42.36c17.18-17.18,45.04-17.18,62.23,0v0    c17.18,17.18,17.18,45.04,0,62.23L325.46,256L367.83,298.36z"/>
+            <path class="st0" d="M263.24,43.5c-117.36,0-212.5,95.14-212.5,212.5s95.14,212.5,212.5,212.5s212.5-95.14,212.5-212.5    S380.6,43.5,263.24,43.5z M367.83,298.36c17.18,17.18,17.18,45.04,0,62.23v0c-17.18,17.18-45.04,17.18-62.23,0l-42.36-42.36    l-42.36,42.36c-17.18,17.18-45.04,17.18-62.23,0v0c-17.18-17.18-17.18-45.04,0-62.23L201.01,256l-42.36-42.36    c-17.18-17.18-17.18-45.04,0-62.23v0c17.18-17.18,45.04-17.18,62.23,0l42.36,42.36l42.36-42.36c17.18-17.18,45.04-17.18,62.23,0v0    c17.18,17.18,17.18,45.04,0,62.23L325.46,256L367.83,298.36z" />
            </svg>
            <span>@_localizer[WebKey.Reject]</span>
        </button>
@@ -95,16 +97,16 @@
            }
        });
    }
-@if (ViewData["DocumentBytes"] is byte[] documentBytes)
-{
-    var settings = new JsonSerializerSettings
+    @if (ViewData["DocumentBytes"] is byte[] documentBytes)
    {
-        ContractResolver = new CamelCasePropertyNamesContractResolver()
-    };
-    var envelopeReceiverJson = JsonConvert.SerializeObject(Model, settings);
-    var documentBase64String = Convert.ToBase64String(documentBytes);
-    var envelopeKey = ViewData["EnvelopeKey"] as string;
+        var settings = new JsonSerializerSettings
+                {
+                    ContractResolver = new CamelCasePropertyNamesContractResolver()
+                };
+        var envelopeReceiverJson = JsonConvert.SerializeObject(Model, settings);
+        var documentBase64String = Convert.ToBase64String(documentBytes);
+        var envelopeKey = ViewData["EnvelopeKey"] as string;

-    @:document.addEventListener("DOMContentLoaded", async () => await new App("@envelopeKey.TrySanitize(_sanitizer)", @Html.Raw(envelopeReceiverJson.TrySanitize(_sanitizer)), B64ToBuff("@Html.Raw(documentBase64String.TrySanitize(_sanitizer))"), "@ViewData["PSPDFKitLicenseKey"]", "@userCulture?.Info?.TwoLetterISOLanguageName").init())
-}
+        @:document.addEventListener("DOMContentLoaded", async () => await new App("@envelopeKey.TrySanitize(_sanitizer)", @Html.Raw(envelopeReceiverJson.TrySanitize(_sanitizer)), B64ToBuff("@Html.Raw(documentBase64String.TrySanitize(_sanitizer))"), "@ViewData["PSPDFKitLicenseKey"]", "@userCulture?.Info?.TwoLetterISOLanguageName").init())
+    }
 </script>
Author	SHA1	Message	Date
Developer 02	2fb8af9a4f	chore(api): Core-Bibliotheken und UserManager.Infrastructure auf 2.0.0.0 aktualisiert - Core-Bibliotheken und UserManager.Infrastructure in den API-Schichten auf Version 2.0.0.0 erhöht.	2024-09-20 11:05:00 +02:00
Developer 02	017d03713b	refactor(dbcontext): DbContext aktualisiert, um IUserManagerDbContext zu implementieren und neue DbSets hinzuzufügen - Implementierung des `IUserManagerDbContext` Interface in `EGDbContext`. - Neue `DbSet`-Eigenschaften für `GroupOfUser`, `Group`, `ModuleOfUser`, `Module`, `User` und `UserRep` hinzugefügt. - Neue DbSets im Konstruktor injiziert. - Namespace-Importe aktualisiert, um zusätzliche Entitäten für die neuen DbSets einzubeziehen.	2024-09-20 09:46:21 +02:00
Developer 02	5f5180d937	chore(application): Core-Bibliotheken und UserManager.Infrastructure auf 2.0.0.0 aktualisiert - Core-Bibliotheken und `UserManager.Infrastructure` in der Application-Schicht auf Version 2.0.0.0 erhöht. - DbSet-Eigenschaften aus dem DbContext injiziert.	2024-09-20 09:39:14 +02:00
Developer 02	6b3e6cd6f5	chore(infrastructure): Core-Bibliotheken und UserManager.Infrastructure auf 2.0.0.0 aktualisiert - Core-Bibliotheken und UserManager.Infrastructure im Infrastructure-Layer auf Version 2.0.0.0 erhöht. - DbSet-Eigenschaften aus DbContext injiziert.	2024-09-20 01:16:47 +02:00
Developer 02	f95f3c7b1b	refactor(dbcontext): DbSet-Erstellung in DbContext verschieben und DbSet-Eigenschaften hinzufügen - Ersetzt die Erstellung von DbSet pro Entität durch DbSet-Eigenschaften in `EGDbContext`. - Hinzugefügt DbSet-Eigenschaften für `UserReceiver`, `Config`, `EnvelopeReceiver` und `Envelope`. - Aktualisierter `EGDbContext`-Konstruktor zur Initialisierung der DbSet-Eigenschaften mittels der `Set<T>`-Methode.	2024-09-19 15:06:33 +02:00
Developer 02	316b62083c	feat(core): IUnique-Schnittstelle hinzufügen und Core.Infrastructure aktualisieren - `IUnique`-Schnittstelle zu allen Entitäten im Domain-Projekt hinzugefügt. - `Core.Infrastructure` auf Version 2.0.0.0 im Infrastructure-Layer aktualisiert. - Domain-Projekt mit `Core.Abstraction` für verbesserte Abstraktion erweitert.	2024-09-19 14:48:34 +02:00