Merge branch 'feat/receiver-ui' of http://git.dd:3000/AppStd/EnvelopeGenerator into feat/receiver-ui

Refactored mouse event handling in pdfInterop.js to use a new getPos helper, ensuring accurate coordinate mapping on scaled or resized canvases. Updated start and move functions to use this helper. Added an empty settings.json file.

.vscode/settings.json

@@ -0,0 +1 @@
+{}

EnvelopeGenerator.API/Controllers/AnnotationController.cs

@@ -1,118 +0,0 @@
-using DigitalData.Core.Abstraction.Application.DTO;
-using DigitalData.Core.Exceptions;
-using EnvelopeGenerator.Application.Common.Extensions;
-using EnvelopeGenerator.Application.Common.Interfaces.Services;
-using EnvelopeGenerator.Application.Common.Notifications.DocSigned;
-using EnvelopeGenerator.Application.EnvelopeReceivers.Queries;
-using EnvelopeGenerator.Application.Histories.Queries;
-using EnvelopeGenerator.Domain.Constants;
-using EnvelopeGenerator.API.Extensions;
-using MediatR;
-using Microsoft.AspNetCore.Authentication;
-using Microsoft.AspNetCore.Authentication.Cookies;
-using Microsoft.AspNetCore.Authorization;
-using Microsoft.AspNetCore.Mvc;
-
-namespace EnvelopeGenerator.API.Controllers;
-
-/// <summary>
-/// Manages annotations and signature lifecycle for envelopes.
-/// </summary>
-[Authorize(Policy = AuthPolicy.Receiver)]
-[ApiController]
-[Route("api/[controller]")]
-public class AnnotationController : ControllerBase
-{
-    [Obsolete("Use MediatR")]
-    private readonly IEnvelopeHistoryService _historyService;
-
-    [Obsolete("Use MediatR")]
-    private readonly IEnvelopeReceiverService _envelopeReceiverService;
-
-    private readonly IMediator _mediator;
-
-    private readonly ILogger<AnnotationController> _logger;
-
-    /// <summary>
-    /// Initializes a new instance of <see cref="AnnotationController"/>.
-    /// </summary>
-    [Obsolete("Use MediatR")]
-    public AnnotationController(
-        ILogger<AnnotationController> logger,
-        IEnvelopeHistoryService envelopeHistoryService,
-        IEnvelopeReceiverService envelopeReceiverService,
-        IMediator mediator)
-    {
-        _historyService = envelopeHistoryService;
-        _envelopeReceiverService = envelopeReceiverService;
-        _mediator = mediator;
-        _logger = logger;
-    }
-
-    /// <summary>
-    /// Creates or updates annotations for the authenticated envelope receiver.
-    /// </summary>
-    /// <param name="psPdfKitAnnotation">Annotation payload.</param>
-    /// <param name="cancel">Cancellation token.</param>
-    [Authorize(Policy = AuthPolicy.Receiver)]
-    [HttpPost]
-    [Obsolete("PSPDF Kit will no longer be used.")]
-    public async Task<IActionResult> CreateOrUpdate([FromBody] PsPdfKitAnnotation? psPdfKitAnnotation = null, CancellationToken cancel = default)
-    {
-        var signature = User.GetReceiverSignatureOfReceiver();
-        var uuid = User.GetEnvelopeUuidOfReceiver();
-
-        var envelopeReceiver = await _mediator.ReadEnvelopeReceiverAsync(uuid, signature, cancel).ThrowIfNull(Exceptions.NotFound);
-
-        if (!envelopeReceiver.Envelope!.ReadOnly && psPdfKitAnnotation is null)
-            return BadRequest();
-
-        if (await _mediator.IsSignedAsync(uuid, signature, cancel))
-            return Problem(statusCode: StatusCodes.Status409Conflict);
-        else if (await _mediator.AnyHistoryAsync(uuid, new[] { EnvelopeStatus.EnvelopeRejected, EnvelopeStatus.DocumentRejected }, cancel))
-            return Problem(statusCode: StatusCodes.Status423Locked);
-
-        var docSignedNotification = await _mediator
-            .ReadEnvelopeReceiverAsync(uuid, signature, cancel)
-            .ToDocSignedNotification(psPdfKitAnnotation)
-            ?? throw new NotFoundException("Envelope receiver is not found.");
-
-        await _mediator.PublishSafely(docSignedNotification, cancel);
-        await HttpContext.SignOutAsync(CookieAuthenticationDefaults.AuthenticationScheme);
-
-        return Ok();
-    }
-
-    /// <summary>
-    /// Rejects the document for the current receiver.
-    /// </summary>
-    /// <param name="reason">Optional rejection reason.</param>
-    [Authorize(Policy = AuthPolicy.Receiver)]
-    [HttpPost("reject")]
-    [Obsolete("Use MediatR")]
-    public async Task<IActionResult> Reject([FromBody] string? reason = null)
-    {
-        var signature = User.GetReceiverSignatureOfReceiver();
-        var uuid = User.GetEnvelopeUuidOfReceiver();
-        var mail = User.GetReceiverMailOfReceiver();
-
-        var envRcvRes = await _envelopeReceiverService.ReadByUuidSignatureAsync(uuid: uuid, signature: signature);
-
-        if (envRcvRes.IsFailed)
-        {
-            _logger.LogNotice(envRcvRes.Notices);
-            return Unauthorized("you are not authorized");
-        }
-
-        var histRes = await _historyService.RecordAsync(envRcvRes.Data.EnvelopeId, userReference: mail, EnvelopeStatus.DocumentRejected, comment: reason);
-        if (histRes.IsSuccess)
-        {
-            await HttpContext.SignOutAsync(CookieAuthenticationDefaults.AuthenticationScheme);
-            return NoContent();
-        }
-
-        _logger.LogEnvelopeError(uuid: uuid, signature: signature, message: "Unexpected error happened in api/envelope/reject");
-        _logger.LogNotice(histRes.Notices);
-        return StatusCode(500, histRes.Messages);
-    }
-}

EnvelopeGenerator.API/Controllers/AuthController.cs

@@ -1,76 +0,0 @@
-using EnvelopeGenerator.API.Controllers.Interfaces;
-using EnvelopeGenerator.API.Models;
-using EnvelopeGenerator.Domain.Constants;
-using Microsoft.AspNetCore.Authentication;
-using Microsoft.AspNetCore.Authentication.Cookies;
-using Microsoft.AspNetCore.Authorization;
-using Microsoft.AspNetCore.Mvc;
-using Microsoft.Extensions.Options;
-
-namespace EnvelopeGenerator.API.Controllers;
-
-/// <summary>
-/// Controller verantwortlich für die Benutzer-Authentifizierung, einschließlich Anmelden, Abmelden und Überprüfung des Authentifizierungsstatus.
-/// </summary>
-[Route("api/[controller]")]
-[ApiController]
-public partial class AuthController(IOptions<AuthTokenKeys> authTokenKeyOptions, IAuthorizationService authService) : ControllerBase, IAuthController
-{
-    private readonly AuthTokenKeys authTokenKeys = authTokenKeyOptions.Value;
-
-    /// <summary>
-    /// 
-    /// </summary>
-    public IAuthorizationService AuthService { get; } = authService;
-
-    /// <summary>
-    /// Entfernt das Authentifizierungs-Cookie des Benutzers (AuthCookie)
-    /// </summary>
-    /// <returns>
-    /// Gibt eine HTTP 200 oder 401.
-    /// </returns>
-    /// <remarks>
-    /// Sample request:
-    ///
-    ///     POST /api/auth/logout
-    ///
-    /// </remarks>
-    /// <response code="200">Erfolgreich gelöscht, wenn der Benutzer ein berechtigtes Cookie hat.</response>
-    /// <response code="401">Wenn es kein zugelassenes Cookie gibt, wird „nicht zugelassen“ zurückgegeben.</response>
-    [ProducesResponseType(typeof(void), StatusCodes.Status200OK)]
-    [ProducesResponseType(typeof(void), StatusCodes.Status401Unauthorized)]
-    [Authorize(Policy = AuthPolicy.SenderOrReceiver)]
-    [HttpPost("logout")]
-    public async Task<IActionResult> Logout()
-    {
-        if (await this.IsUserInPolicyAsync(AuthPolicy.Sender))
-            Response.Cookies.Delete(authTokenKeys.Cookie);
-        else if (await this.IsUserInPolicyAsync(AuthPolicy.ReceiverOrReceiverTFA))
-            await HttpContext.SignOutAsync(CookieAuthenticationDefaults.AuthenticationScheme);
-        else
-            return Unauthorized();
-
-        return Ok();
-    }
-
-    /// <summary>
-    /// Prüft, ob der Benutzer ein autorisiertes Token hat.
-    /// </summary>
-    /// <returns>Wenn ein autorisiertes Token vorhanden ist HTTP 200 asynchron 401</returns>
-    /// <remarks>
-    /// Sample request:
-    ///
-    ///     GET /api/auth
-    ///
-    /// </remarks>
-    /// <response code="200">Wenn es einen autorisierten Cookie gibt.</response>
-    /// <response code="401">Wenn kein Cookie vorhanden ist oder nicht autorisierte.</response>
-    [ProducesResponseType(typeof(void), StatusCodes.Status200OK)]
-    [ProducesResponseType(typeof(void), StatusCodes.Status401Unauthorized)]
-    [HttpGet("check")]
-    [Authorize]
-    public IActionResult Check(string? role = null)
-        => role is not null && !User.IsInRole(role)
-            ? Unauthorized()
-            : Ok();
-}

EnvelopeGenerator.API/Controllers/ConfigController.cs

@@ -1,30 +0,0 @@
-using EnvelopeGenerator.API.Models.PsPdfKitAnnotation;
-using Microsoft.AspNetCore.Authorization;
-using Microsoft.AspNetCore.Mvc;
-using Microsoft.Extensions.Options;
-
-namespace EnvelopeGenerator.API.Controllers;
-
-/// <summary>
-/// Exposes configuration data required by the client applications.
-/// </summary>
-/// <remarks>
-/// Initializes a new instance of <see cref="ConfigController"/>.
-/// </remarks>
-[Route("api/[controller]")]
-[ApiController]
-[Authorize]
-public class ConfigController(IOptionsMonitor<AnnotationParams> annotationParamsOptions) : ControllerBase
-{
-    private readonly AnnotationParams _annotationParams = annotationParamsOptions.CurrentValue;
-
-    /// <summary>
-    /// Returns annotation configuration that was previously rendered by MVC.
-    /// </summary>
-    [HttpGet("Annotations")]
-    [Obsolete("PSPDF Kit will no longer be used.")]
-    public IActionResult GetAnnotationParams()
-    {
-        return Ok(_annotationParams.AnnotationJSObject);
-    }
-}

EnvelopeGenerator.API/Controllers/DocumentController.cs

@@ -1,63 +0,0 @@
-using EnvelopeGenerator.API.Controllers.Interfaces;
-using EnvelopeGenerator.API.Extensions;
-using EnvelopeGenerator.Application.Documents.Queries;
-using EnvelopeGenerator.Domain.Constants;
-using MediatR;
-using Microsoft.AspNetCore.Authorization;
-using Microsoft.AspNetCore.Mvc;
-
-namespace EnvelopeGenerator.API.Controllers;
-
-/// <summary>
-/// Provides access to envelope documents for authenticated receivers.
-/// </summary>
-/// <remarks>
-/// Initializes a new instance of the <see cref="DocumentController"/> class.
-/// </remarks>
-[Authorize]
-[ApiController]
-[Route("api/[controller]")]
-public class DocumentController(IMediator mediator, IAuthorizationService authService) : ControllerBase, IAuthController
-{
-    /// <summary>
-    /// 
-    /// </summary>
-    public IAuthorizationService AuthService => authService;
-
-    /// <summary>
-    /// Returns the document bytes receiver.
-    /// </summary>
-    /// <param name="query">Encoded envelope key.</param>
-    /// <param name="cancel">Cancellation token.</param>
-    [HttpGet]
-    [Authorize(Policy = AuthPolicy.SenderOrReceiver)]
-    public async Task<IActionResult> GetDocument(CancellationToken cancel, [FromQuery] ReadDocumentQuery? query = null)
-    {
-        // Sender: expects query with envelope key
-        if (await this.IsUserInPolicyAsync(AuthPolicy.Sender))
-        {
-            if (query is null)
-                return BadRequest("Missing document query.");
-
-            var senderDoc = await mediator.Send(query, cancel);
-            return senderDoc.ByteData is byte[] senderDocByte
-                ? File(senderDocByte, "application/octet-stream")
-                : NotFound("Document is empty.");
-        }
-
-        // Receiver: resolve envelope id from claims
-        if (await this.IsUserInPolicyAsync(AuthPolicy.Receiver))
-        {           
-            if (query is not null)
-                return BadRequest("Query parameters are not allowed for receiver role.");
-
-            var envelopeId = User.GetEnvelopeIdOfReceiver();
-            var receiverDoc = await mediator.Send(new ReadDocumentQuery { EnvelopeId = envelopeId }, cancel);
-            return receiverDoc.ByteData is byte[] receiverDocByte
-                ? File(receiverDocByte, "application/octet-stream")
-                : NotFound("Document is empty.");
-        }
-
-        return Unauthorized();
-    }
-}

EnvelopeGenerator.API/Controllers/EmailTemplateController.cs

@@ -1,77 +0,0 @@
-using AutoMapper;
-using EnvelopeGenerator.Application.EmailTemplates.Commands;
-using Microsoft.AspNetCore.Authorization;
-using Microsoft.AspNetCore.Mvc;
-using MediatR;
-using EnvelopeGenerator.Application.Common.Dto;
-using DigitalData.Core.Abstraction.Application.Repository;
-using EnvelopeGenerator.Domain.Entities;
-using Microsoft.EntityFrameworkCore;
-using EnvelopeGenerator.Domain.Constants;
-using EnvelopeGenerator.Application.EmailTemplates.Queries;
-
-namespace EnvelopeGenerator.API.Controllers;
-
-/// <summary>
-/// Controller for managing temp templates.
-/// Steuerung zur Verwaltung von E-Mail-Vorlagen.
-/// </summary>
-/// <remarks>
-/// Initialisiert eine neue Instanz der <see cref="EmailTemplateController"/>-Klasse.
-/// </remarks>
-/// <param name="mapper">
-/// <param name="repository">
-/// Die AutoMapper-Instanz, die zum Zuordnen von Objekten verwendet wird.
-/// </param>
-[Route("api/[controller]")]
-[ApiController]
-[Authorize(Policy = AuthPolicy.Sender)]
-public class EmailTemplateController(IMapper mapper, IRepository<EmailTemplate> repository, IMediator mediator) : ControllerBase
-{
-    /// <summary>
-    /// Ruft E-Mail-Vorlagen basierend auf der angegebenen Abfrage ab.
-    /// Gibt alles zurück, wenn keine Id- oder Typ-Informationen eingegeben wurden.
-    /// </summary>
-    /// <param name="emailTemplate">Die Abfrageparameter zum Abrufen von E-Mail-Vorlagen.</param>
-    /// <returns>Gibt HTTP-Antwort zurück</returns>
-    /// <remarks>
-    /// Sample request:
-    /// GET /api/EmailTemplate?emailTemplateId=123
-    /// </remarks>
-    /// <response code="200">Wenn die E-Mail-Vorlagen erfolgreich abgerufen werden.</response>
-    /// <response code="400">Wenn die Abfrageparameter ungültig sind.</response>
-    /// <response code="401">Wenn der Benutzer nicht authentifiziert ist.</response>
-    /// <response code="404">Wenn die gesuchte Abfrage nicht gefunden wird.</response>
-    [HttpGet]
-    public async Task<IActionResult> Get([FromQuery] ReadEmailTemplateQuery? emailTemplate = null)
-    {
-        if (emailTemplate is null || (emailTemplate.Id is null && emailTemplate.Type is null))
-        {
-            var temps = await repository.Query.ToListAsync();
-            return Ok(mapper.Map<IEnumerable<EmailTemplateDto>>(temps));
-        }
-        else
-        {
-            var temp = await mediator.Send(emailTemplate);
-            return temp is null ? NotFound() : Ok(temp);
-        }
-    }
-
-    /// <summary>
-    /// Updates an temp template or resets it if no update command is provided.
-    /// Aktualisiert eine E-Mail-Vorlage oder setzt sie zurück, wenn kein Aktualisierungsbefehl angegeben ist.
-    /// </summary>
-    /// <param name="update"></param>
-    /// <param name="cancel"></param>
-    /// <returns></returns>
-    /// <response code="200">Wenn die E-Mail-Vorlage erfolgreich aktualisiert oder zurückgesetzt wird.</response>
-    /// <response code="400">Wenn die Abfrage ohne einen String gesendet wird.</response>
-    /// <response code="401">Wenn der Benutzer nicht authentifiziert ist.</response>
-    /// <response code="404">Wenn die gesuchte Abfrage nicht gefunden wird.</response>
-    [HttpPut]
-    public async Task<IActionResult> Update([FromBody] UpdateEmailTemplateCommand update, CancellationToken cancel)
-    {
-        await mediator.Send(update, cancel);
-        return Ok();
-    }
-}

EnvelopeGenerator.API/Controllers/EnvelopeController.cs

@@ -1,111 +0,0 @@
-using EnvelopeGenerator.API.Extensions;
-using EnvelopeGenerator.Application.Envelopes.Commands;
-using EnvelopeGenerator.Application.Envelopes.Queries;
-using MediatR;
-using Microsoft.AspNetCore.Authorization;
-using Microsoft.AspNetCore.Mvc;
-using Newtonsoft.Json;
-
-namespace EnvelopeGenerator.API.Controllers;
-
-/// <summary>
-/// Dieser Controller stellt Endpunkte für die Verwaltung von Umschlägen bereit.
-/// </summary>
-/// <remarks>
-/// Die API ermöglicht das Abrufen und Verwalten von Umschlägen basierend auf Benutzerinformationen und Statusfiltern.
-/// 
-/// Mögliche Antworten:
-/// - 200 OK: Die Anfrage war erfolgreich, und die angeforderten Daten werden zurückgegeben.
-/// - 400 Bad Request: Die Anfrage war fehlerhaft oder unvollständig.
-/// - 401 Unauthorized: Der Benutzer ist nicht authentifiziert.
-/// - 403 Forbidden: Der Benutzer hat keine Berechtigung, auf die Ressource zuzugreifen.
-/// - 404 Not Found: Die angeforderte Ressource wurde nicht gefunden.
-/// - 500 Internal Server Error: Ein unerwarteter Fehler ist aufgetreten.
-/// </remarks>
-[Route("api/[controller]")]
-[ApiController]
-[Authorize]
-public class EnvelopeController : ControllerBase
-{
-    private readonly ILogger<EnvelopeController> _logger;
-    private readonly IMediator _mediator;
-
-    /// <summary>
-    /// Erstellt eine neue Instanz des EnvelopeControllers.
-    /// </summary>
-    /// <param name="logger">Der Logger, der für das Protokollieren von Informationen verwendet wird.</param>
-    /// <param name="mediator"></param>
-    public EnvelopeController(ILogger<EnvelopeController> logger, IMediator mediator)
-    {
-        _logger = logger;
-        _mediator = mediator;
-    }
-
-    /// <summary>
-    /// Ruft eine Liste von Umschlägen basierend auf dem Benutzer und den angegebenen Statusfiltern ab.
-    /// </summary>
-    /// <param name="envelope"></param>
-    /// <returns>Eine IActionResult-Instanz, die die abgerufenen Umschläge oder einen Fehlerstatus enthält.</returns>
-    /// <response code="200">Die Anfrage war erfolgreich, und die Umschläge werden zurückgegeben.</response>
-    /// <response code="400">Die Anfrage war fehlerhaft oder unvollständig.</response>
-    /// <response code="401">Der Benutzer ist nicht authentifiziert.</response>
-    /// <response code="403">Der Benutzer hat keine Berechtigung, auf die Ressource zuzugreifen.</response>
-    /// <response code="500">Ein unerwarteter Fehler ist aufgetreten.</response>
-    [Authorize]
-    [HttpGet]
-    public async Task<IActionResult> GetAsync([FromQuery] ReadEnvelopeQuery envelope)
-    {
-        var result = await _mediator.Send(envelope.Authorize(User.GetId()));
-        return result.Any() ? Ok(result) : NotFound();
-    }
-
-    /// <summary>
-    /// Ruft das Ergebnis eines Dokuments basierend auf der ID ab.
-    /// </summary>
-    /// <param name="query"></param>
-    /// <param name="view">Gibt an, ob das Dokument inline angezeigt werden soll (true) oder als Download bereitgestellt wird (false).</param>
-    /// <returns>Eine IActionResult-Instanz, die das Dokument oder einen Fehlerstatus enthält.</returns>
-    /// <response code="200">Das Dokument wurde erfolgreich abgerufen.</response>
-    /// <response code="404">Das Dokument wurde nicht gefunden oder ist nicht verfügbar.</response>
-    /// <response code="500">Ein unerwarteter Fehler ist aufgetreten.</response>
-    [HttpGet("doc-result")]
-    public async Task<IActionResult> GetDocResultAsync([FromQuery] ReadEnvelopeQuery query, [FromQuery] bool view = false)
-    {
-        var envelopes = await _mediator.Send(query.Authorize(User.GetId()));
-        var envelope = envelopes.FirstOrDefault();
-
-        if (envelope is null)
-            return NotFound("Envelope not available.");
-        if (envelope.DocResult is null)
-            return NotFound("The document has not been fully signed or the result has not yet been released.");
-
-        if (view)
-        {
-            Response.Headers.Append("Content-Disposition", "inline; filename=\"" + envelope.Uuid + ".pdf\"");
-            return File(envelope.DocResult, "application/pdf");
-        }
-
-        return File(envelope.DocResult, "application/pdf", $"{envelope.Uuid}.pdf");
-    }
-
-    /// <summary>
-    /// 
-    /// </summary>
-    /// <param name="command"></param>
-    /// <returns></returns>
-    [NonAction]
-    [Authorize]
-    [HttpPost]
-    public async Task<IActionResult> CreateAsync([FromBody] CreateEnvelopeCommand command)
-    {
-        var res = await _mediator.Send(command.Authorize(User.GetId()));
-
-        if (res is null)
-        {
-            _logger.LogError("Failed to create envelope. Envelope details: {EnvelopeDetails}", JsonConvert.SerializeObject(command));
-            return StatusCode(StatusCodes.Status500InternalServerError);
-        }
-        else
-            return Ok(res);
-    }
-}

EnvelopeGenerator.API/Controllers/EnvelopeTypeController.cs

@@ -1,39 +0,0 @@
-using MediatR;
-using EnvelopeGenerator.Application.EnvelopeTypes.Queries;
-using Microsoft.AspNetCore.Mvc;
-
-namespace EnvelopeGenerator.GeneratorAPI.Controllers;
-
-/// <summary>
-/// 
-/// </summary>
-[ApiExplorerSettings(IgnoreApi = true)]
-[Route("api/[controller]")]
-[ApiController]
-public class EnvelopeTypeController : ControllerBase
-{
-    private readonly ILogger<EnvelopeTypeController> _logger;
-    private readonly IMediator _mediator;
-
-    /// <summary>
-    /// 
-    /// </summary>
-    /// <param name="logger"></param>
-    /// <param name="mediator"></param>
-    public EnvelopeTypeController(ILogger<EnvelopeTypeController> logger, IMediator mediator)
-    {
-        _logger = logger;
-        _mediator = mediator;
-    }
-
-    /// <summary>
-    /// 
-    /// </summary>
-    /// <returns></returns>
-    [HttpGet]
-    public async Task<IActionResult> GetAllAsync()
-    {
-        var result = await _mediator.Send(new ReadEnvelopeTypesQuery());
-        return Ok(result);
-    }
-}

EnvelopeGenerator.API/Controllers/Interfaces/IAuthController.cs

@@ -1,38 +0,0 @@
-using System.Security.Claims;
-using Microsoft.AspNetCore.Authorization;
-
-namespace EnvelopeGenerator.API.Controllers.Interfaces;
-
-/// <summary>
-/// 
-/// </summary>
-public interface IAuthController
-{
-    /// <summary>
-    /// 
-    /// </summary>
-    IAuthorizationService AuthService { get; }
-
-    /// <summary>
-    /// 
-    /// </summary>
-    ClaimsPrincipal User { get; }
-}
-
-/// <summary>
-/// 
-/// </summary>
-public static class AuthControllerExtensions
-{
-    /// <summary>
-    /// 
-    /// </summary>
-    /// <param name="controller"></param>
-    /// <param name="policyName"></param>
-    /// <returns></returns>
-    public static async Task<bool> IsUserInPolicyAsync(this IAuthController controller, string policyName)
-    {
-        var result = await controller.AuthService.AuthorizeAsync(controller.User, policyName);
-        return result.Succeeded;
-    }
-}

EnvelopeGenerator.API/Controllers/ReadOnlyController.cs

@@ -1,90 +0,0 @@
-using DigitalData.Core.Abstraction.Application.DTO;
-using EnvelopeGenerator.Application.Common.Dto.EnvelopeReceiverReadOnly;
-using EnvelopeGenerator.Application.Common.Interfaces.Services;
-using EnvelopeGenerator.Domain.Constants;
-using EnvelopeGenerator.API.Extensions;
-using Microsoft.AspNetCore.Authorization;
-using Microsoft.AspNetCore.Mvc;
-using Newtonsoft.Json;
-
-namespace EnvelopeGenerator.API.Controllers;
-
-/// <summary>
-/// Manages read-only envelope sharing flows.
-/// </summary>
-[Route("api/[controller]")]
-[ApiController]
-public class ReadOnlyController : ControllerBase
-{
-    private readonly ILogger<ReadOnlyController> _logger;
-    private readonly IEnvelopeReceiverReadOnlyService _readOnlyService;
-    private readonly IEnvelopeMailService _mailService;
-    private readonly IEnvelopeHistoryService _historyService;
-
-    /// <summary>
-    /// Initializes a new instance of the <see cref="ReadOnlyController"/> class.
-    /// </summary>
-    public ReadOnlyController(ILogger<ReadOnlyController> logger, IEnvelopeReceiverReadOnlyService readOnlyService, IEnvelopeMailService mailService, IEnvelopeHistoryService historyService)
-    {
-        _logger = logger;
-        _readOnlyService = readOnlyService;
-        _mailService = mailService;
-        _historyService = historyService;
-    }
-
-    /// <summary>
-    /// Creates a new read-only receiver for the current envelope.
-    /// </summary>
-    /// <param name="createDto">Creation payload.</param>
-    [HttpPost]
-    [Authorize(Policy = AuthPolicy.Receiver)]
-    public async Task<IActionResult> CreateAsync([FromBody] EnvelopeReceiverReadOnlyCreateDto createDto)
-    {
-        var authReceiverMail = User.GetReceiverMailOfReceiver();
-        if (authReceiverMail is null)
-        {
-            _logger.LogError("EmailAddress claim is not found in envelope-receiver-read-only creation process. Create DTO is:\n {dto}", JsonConvert.SerializeObject(createDto));
-            return Unauthorized();
-        }
-
-        var envelopeId = User.GetEnvelopeIdOfReceiver();
-
-        createDto.AddedWho = authReceiverMail;
-        createDto.EnvelopeId = envelopeId;
-
-        var creationRes = await _readOnlyService.CreateAsync(createDto: createDto);
-
-        if (creationRes.IsFailed)
-        {
-            _logger.LogNotice(creationRes);
-            return StatusCode(StatusCodes.Status500InternalServerError);
-        }
-
-        var readRes = await _readOnlyService.ReadByIdAsync(creationRes.Data.Id);
-        if (readRes.IsFailed)
-        {
-            _logger.LogNotice(creationRes);
-            return StatusCode(StatusCodes.Status500InternalServerError);
-        }
-
-        var newReadOnly = readRes.Data;
-
-        return await _mailService.SendAsync(newReadOnly).ThenAsync<int, IActionResult>(SuccessAsync: async _ =>
-        {
-            var histRes = await _historyService.RecordAsync((int)createDto.EnvelopeId, createDto.AddedWho, EnvelopeStatus.EnvelopeShared);
-            if (histRes.IsFailed)
-            {
-                _logger.LogError("Although the envelope was sent as read-only, the EnvelopeShared history could not be saved. Create DTO:\n{createDto}", JsonConvert.SerializeObject(createDto));
-                _logger.LogNotice(histRes.Notices);
-            }
-
-            return Ok();
-        },
-
-        Fail: (msg, ntc) =>
-        {
-            _logger.LogNotice(ntc);
-            return StatusCode(StatusCodes.Status500InternalServerError);
-        });
-    }
-}

EnvelopeGenerator.API/Controllers/ReceiverController.cs

@@ -1,47 +0,0 @@
-using MediatR;
-using EnvelopeGenerator.Application.Receivers.Queries;
-using Microsoft.AspNetCore.Authorization;
-using Microsoft.AspNetCore.Mvc;
-
-namespace EnvelopeGenerator.GeneratorAPI.Controllers;
-
-/// <summary>
-/// Controller für die Verwaltung von Empfängern.
-/// </summary>
-/// <remarks>
-/// Dieser Controller bietet Endpunkte für das Abrufen von Empfängern basierend auf E-Mail-Adresse oder Signatur.
-/// </remarks>
-[Route("api/[controller]")]
-[ApiController]
-[Authorize]
-public class ReceiverController : ControllerBase
-{
-    private readonly IMediator _mediator;
-
-    /// <summary>
-    /// Initialisiert eine neue Instanz des <see cref="ReceiverController"/>-Controllers.
-    /// </summary>
-    /// <param name="mediator">Mediator für Anfragen.</param>
-    public ReceiverController(IMediator mediator)
-    {
-        _mediator = mediator;
-    }
-
-    /// <summary>
-    /// Ruft eine Liste von Empfängern ab, basierend auf den angegebenen Abfrageparametern.
-    /// </summary>
-    /// <param name="receiver">Die Abfrageparameter, einschließlich E-Mail-Adresse und Signatur.</param>
-    /// <returns>Eine Liste von Empfängern oder ein Fehlerstatus.</returns>
-    [HttpGet]
-    public async Task<IActionResult> Get([FromQuery] ReadReceiverQuery receiver)
-    {
-        if (!receiver.HasAnyCriteria)
-        {
-            var all = await _mediator.Send(new ReadReceiverQuery());
-            return Ok(all);
-        }
-
-        var result = await _mediator.Send(receiver);
-        return result is null ? NotFound() : Ok(result);
-    }
-}

EnvelopeGenerator.API/Controllers/TfaRegistrationController.cs

@@ -1,129 +0,0 @@
-using DigitalData.Core.Abstraction.Application.DTO;
-using EnvelopeGenerator.Application.Common.Extensions;
-using EnvelopeGenerator.Application.Common.Interfaces.Services;
-using EnvelopeGenerator.Application.Resources;
-using EnvelopeGenerator.Domain.Constants;
-using EnvelopeGenerator.API.Models;
-using Ganss.Xss;
-using Microsoft.AspNetCore.Authentication;
-using Microsoft.AspNetCore.Authentication.Cookies;
-using Microsoft.AspNetCore.Authorization;
-using Microsoft.AspNetCore.Mvc;
-using Microsoft.Extensions.Localization;
-using Microsoft.Extensions.Options;
-
-namespace EnvelopeGenerator.API.Controllers;
-
-/// <summary>
-/// Exposes endpoints for registering and managing two-factor authentication for envelope receivers.
-/// </summary>
-[ApiController]
-[Route("api/tfa")]
-public class TfaRegistrationController : ControllerBase
-{
-    private readonly ILogger<TfaRegistrationController> _logger;
-    private readonly IEnvelopeReceiverService _envelopeReceiverService;
-    private readonly IAuthenticator _authenticator;
-    private readonly IReceiverService _receiverService;
-    private readonly TFARegParams _parameters;
-    private readonly IStringLocalizer<Resource> _localizer;
-
-    /// <summary>
-    /// Initializes a new instance of the <see cref="TfaRegistrationController"/> class.
-    /// </summary>
-    public TfaRegistrationController(
-        ILogger<TfaRegistrationController> logger,
-        IEnvelopeReceiverService envelopeReceiverService,
-        IAuthenticator authenticator,
-        IReceiverService receiverService,
-        IOptions<TFARegParams> tfaRegParamsOptions,
-        IStringLocalizer<Resource> localizer)
-    {
-        _logger = logger;
-        _envelopeReceiverService = envelopeReceiverService;
-        _authenticator = authenticator;
-        _receiverService = receiverService;
-        _parameters = tfaRegParamsOptions.Value;
-        _localizer = localizer;
-    }
-
-    /// <summary>
-    /// Generates registration metadata (QR code and deadline) for a receiver.
-    /// </summary>
-    /// <param name="envelopeReceiverId">Encoded envelope receiver id.</param>
-    [Authorize]
-    [HttpGet("{envelopeReceiverId}")]
-    public async Task<IActionResult> RegisterAsync(string envelopeReceiverId)
-    {
-        try
-        {
-            var (uuid, signature) = envelopeReceiverId.DecodeEnvelopeReceiverId();
-
-            if (uuid is null || signature is null)
-            {
-                _logger.LogEnvelopeError(uuid: uuid, signature: signature, message: _localizer.WrongEnvelopeReceiverId());
-                return Unauthorized(new { message = _localizer.WrongEnvelopeReceiverId() });
-            }
-
-            var secretResult = await _envelopeReceiverService.ReadWithSecretByUuidSignatureAsync(uuid: uuid, signature: signature);
-            if (secretResult.IsFailed)
-            {
-                _logger.LogNotice(secretResult.Notices);
-                return NotFound(new { message = _localizer.WrongEnvelopeReceiverId() });
-            }
-
-            var envelopeReceiver = secretResult.Data;
-
-            if (!envelopeReceiver.Envelope!.TFAEnabled)
-                return Unauthorized(new { message = _localizer.WrongAccessCode() });
-
-            var receiver = envelopeReceiver.Receiver;
-            receiver!.TotpSecretkey = _authenticator.GenerateTotpSecretKey();
-            await _receiverService.UpdateAsync(receiver);
-            var totpQr64 = _authenticator.GenerateTotpQrCode(userEmail: receiver.EmailAddress, secretKey: receiver.TotpSecretkey).ToBase64String();
-
-            if (receiver.TfaRegDeadline is null)
-            {
-                receiver.TfaRegDeadline = _parameters.Deadline;
-                await _receiverService.UpdateAsync(receiver);
-            }
-            else if (receiver.TfaRegDeadline <= DateTime.Now)
-            {
-                return StatusCode(StatusCodes.Status410Gone, new { message = _localizer.WrongAccessCode() });
-            }
-
-            return Ok(new
-            {
-                envelopeReceiver.EnvelopeId,
-                envelopeReceiver.Envelope!.Uuid,
-                envelopeReceiver.Receiver!.Signature,
-                receiver.TfaRegDeadline,
-                TotpQR64 = totpQr64
-            });
-        }
-        catch (Exception ex)
-        {
-            _logger.LogEnvelopeError(envelopeReceiverId: envelopeReceiverId, exception: ex, message: _localizer.WrongEnvelopeReceiverId());
-            return StatusCode(StatusCodes.Status500InternalServerError, new { message = _localizer.UnexpectedError() });
-        }
-    }
-
-    /// <summary>
-    /// Logs out the envelope receiver from cookie authentication.
-    /// </summary>
-    [Authorize(Policy = AuthPolicy.Receiver)]
-    [HttpPost("auth/logout")]
-    public async Task<IActionResult> LogOutAsync()
-    {
-        try
-        {
-            await HttpContext.SignOutAsync(CookieAuthenticationDefaults.AuthenticationScheme);
-            return Ok();
-        }
-        catch (Exception ex)
-        {
-            _logger.LogError(ex, "{message}", ex.Message);
-            return StatusCode(StatusCodes.Status500InternalServerError, new { message = _localizer.UnexpectedError() });
-        }
-    }
-}

EnvelopeGenerator.API/Documentation/AuthProxyDocumentFilter.cs

@@ -1,70 +0,0 @@
-using EnvelopeGenerator.API.Models;
-using Microsoft.OpenApi.Any;
-using Microsoft.OpenApi.Models;
-using Swashbuckle.AspNetCore.SwaggerGen;
-
-namespace EnvelopeGenerator.API.Documentation;
-
-/// <summary>
-/// 
-/// </summary>
-public sealed class AuthProxyDocumentFilter : IDocumentFilter
-{
-    /// <summary>
-    /// 
-    /// </summary>
-    /// <param name="swaggerDoc"></param>
-    /// <param name="context"></param>
-    public void Apply(OpenApiDocument swaggerDoc, DocumentFilterContext context)
-    {
-        const string path = "/api/auth";
-
-        var loginSchema = context.SchemaGenerator.GenerateSchema(typeof(Login), context.SchemaRepository);
-        var loginExample = new OpenApiObject
-        {
-            ["password"] = new OpenApiString(""),
-            ["username"] = new OpenApiString("")
-        };
-
-        var operation = new OpenApiOperation
-        {
-            Summary = "Proxy login (auth-hub)",
-            Description = "Proxies the request to the auth service. Add query parameter `cookie=true|false`.",
-            Tags = [new() { Name = "Auth" }],
-            Parameters =
-            {
-                new OpenApiParameter
-                {
-                    Name = "cookie",
-                    In = ParameterLocation.Query,
-                    Required = false,
-                    Schema = new OpenApiSchema { Type = "boolean", Default = new OpenApiBoolean(true) },
-                    Example = new OpenApiBoolean(true),
-                    Description = "If true, auth service sets the auth cookie."
-                }
-            },
-            RequestBody = new OpenApiRequestBody
-            {
-                Required = true,
-                Content =
-                {
-                    ["application/json"] = new OpenApiMediaType { Schema = loginSchema, Example = loginExample },
-                    ["multipart/form-data"] = new OpenApiMediaType { Schema = loginSchema, Example = loginExample }
-                }
-            },
-            Responses =
-            {
-                ["200"] = new OpenApiResponse { Description = "OK (proxied response)" },
-                ["401"] = new OpenApiResponse { Description = "Unauthorized" }
-            }
-        };
-
-        swaggerDoc.Paths[path] = new OpenApiPathItem
-        {
-            Operations =
-            {
-                [OperationType.Post] = operation
-            }
-        };
-    }
-}

EnvelopeGenerator.API/EnvelopeClaimTypes.cs

@@ -1,17 +0,0 @@
-namespace EnvelopeGenerator.API;
-
-/// <summary>
-/// Provides custom claim types for envelope-related information.
-/// </summary>
-public static class EnvelopeClaimTypes
-{
-    /// <summary>
-    /// Claim type for the title of an envelope.
-    /// </summary>
-    public static readonly string Title = $"Envelope{nameof(Title)}";
-
-    /// <summary>
-    /// Claim type for the ID of an envelope.
-    /// </summary>
-    public static readonly string Id = $"Envelope{nameof(Id)}";
-}

EnvelopeGenerator.API/Extensions/ReceiverClaimExtensions.cs

@@ -1,101 +0,0 @@
-using System.Linq;
-using System.Security.Claims;
-using EnvelopeGenerator.Application.Common.Dto.EnvelopeReceiver;
-using Microsoft.AspNetCore.Authentication;
-using Microsoft.AspNetCore.Authentication.Cookies;
-
-namespace EnvelopeGenerator.API.Extensions;
-
-/// <summary>
-/// Provides helper methods for working with envelope-specific authentication claims.
-/// </summary>
-public static class ReceiverClaimExtensions
-{
-    private static string GetRequiredClaimOfReceiver(this ClaimsPrincipal user, string claimType)
-    {
-        var value = user.FindFirstValue(claimType);
-        if (value is not null)
-        {
-            return value;
-        }
-
-        var identity = user.Identity;
-        var principalName = identity?.Name ?? "(anonymous)";
-        var authType = identity?.AuthenticationType ?? "(none)";
-        var availableClaims = string.Join(", ", user.Claims.Select(c => $"{c.Type}={c.Value}"));
-        var message = $"Required claim '{claimType}' is missing for user '{principalName}' (auth: {authType}). Available claims: [{availableClaims}].";
-        throw new InvalidOperationException(message);
-    }
-
-    /// <summary>
-    /// Gets the authenticated envelope UUID from the claims.
-    /// </summary>
-    public static string GetEnvelopeUuidOfReceiver(this ClaimsPrincipal user) => user.GetRequiredClaimOfReceiver(ClaimTypes.NameIdentifier);
-
-    /// <summary>
-    /// Gets the authenticated receiver signature from the claims.
-    /// </summary>
-    public static string GetReceiverSignatureOfReceiver(this ClaimsPrincipal user) => user.GetRequiredClaimOfReceiver(ClaimTypes.Hash);
-
-    /// <summary>
-    /// Gets the authenticated receiver display name from the claims.
-    /// </summary>
-    public static string GetReceiverNameOfReceiver(this ClaimsPrincipal user) => user.GetRequiredClaimOfReceiver(ClaimTypes.Name);
-
-    /// <summary>
-    /// Gets the authenticated receiver email address from the claims.
-    /// </summary>
-    public static string GetReceiverMailOfReceiver(this ClaimsPrincipal user) => user.GetRequiredClaimOfReceiver(ClaimTypes.Email);
-
-    /// <summary>
-    /// Gets the authenticated envelope title from the claims.
-    /// </summary>
-    public static string GetEnvelopeTitleOfReceiver(this ClaimsPrincipal user) => user.GetRequiredClaimOfReceiver(EnvelopeClaimTypes.Title);
-
-    /// <summary>
-    /// Gets the authenticated envelope identifier from the claims.
-    /// </summary>
-    public static int GetEnvelopeIdOfReceiver(this ClaimsPrincipal user)
-    {
-        var envIdStr = user.GetRequiredClaimOfReceiver(EnvelopeClaimTypes.Id);
-        if (!int.TryParse(envIdStr, out var envId))
-        {
-            throw new InvalidOperationException($"Claim '{EnvelopeClaimTypes.Id}' is not a valid integer.");
-        }
-
-        return envId;
-    }
-
-    /// <summary>
-    /// Signs in an envelope receiver using cookie authentication and attaches envelope claims.
-    /// </summary>
-    /// <param name="context">The current HTTP context.</param>
-    /// <param name="envelopeReceiver">Envelope receiver DTO to extract claims from.</param>
-    /// <param name="receiverRole">Role to attach to the authentication ticket.</param>
-    public static async Task SignInEnvelopeAsync(this HttpContext context, EnvelopeReceiverDto envelopeReceiver, string receiverRole)
-    {
-        var claims = new List<Claim>
-        {
-            new(ClaimTypes.NameIdentifier, envelopeReceiver.Envelope!.Uuid),
-            new(ClaimTypes.Hash, envelopeReceiver.Receiver!.Signature),
-            new(ClaimTypes.Name, envelopeReceiver.Name ?? string.Empty),
-            new(ClaimTypes.Email, envelopeReceiver.Receiver.EmailAddress),
-            new(EnvelopeClaimTypes.Title, envelopeReceiver.Envelope.Title),
-            new(EnvelopeClaimTypes.Id, envelopeReceiver.Envelope.Id.ToString()),
-            new(ClaimTypes.Role, receiverRole)
-        };
-
-        var claimsIdentity = new ClaimsIdentity(claims, CookieAuthenticationDefaults.AuthenticationScheme);
-
-        var authProperties = new AuthenticationProperties
-        {
-            AllowRefresh = false,
-            IsPersistent = false
-        };
-
-        await context.SignInAsync(
-            CookieAuthenticationDefaults.AuthenticationScheme,
-            new ClaimsPrincipal(claimsIdentity),
-            authProperties);
-    }
-}

EnvelopeGenerator.API/Extensions/SenderClaimExtensions.cs

@@ -1,95 +0,0 @@
-using System.Security.Claims;
-
-namespace EnvelopeGenerator.API.Extensions
-{
-    /// <summary>
-    /// Provides extension methods for extracting user information from a <see cref="ClaimsPrincipal"/>.
-    /// </summary>
-    public static class SenderClaimExtensions
-    {
-        private static string GetRequiredClaimOfSender(this ClaimsPrincipal user, string claimType)
-        {
-            var value = user.FindFirstValue(claimType);
-            if (value is not null)
-            {
-                return value;
-            }
-
-            var identity = user.Identity;
-            var principalName = identity?.Name ?? "(anonymous)";
-            var authType = identity?.AuthenticationType ?? "(none)";
-            var availableClaims = string.Join(", ", user.Claims.Select(c => $"{c.Type}={c.Value}"));
-            var message = $"Required claim '{claimType}' is missing for user '{principalName}' (auth: {authType}). Available claims: [{availableClaims}].";
-            throw new InvalidOperationException(message);
-        }
-
-        private static string GetRequiredClaimOfSender(this ClaimsPrincipal user, params string[] claimTypes)
-        {
-            string? value = null;
-
-            foreach (var claimType in claimTypes)
-            {
-                value = user.FindFirstValue(claimType);
-                if (value is not null)
-                    return value;
-            }
-
-            var identity = user.Identity;
-            var principalName = identity?.Name ?? "(anonymous)";
-            var authType = identity?.AuthenticationType ?? "(none)";
-            var availableClaims = string.Join(", ", user.Claims.Select(c => $"{c.Type}={c.Value}"));
-            var message = $"Required claim among [{string.Join(", ", claimTypes)}] is missing for user '{principalName}' (auth: {authType}). Available claims: [{availableClaims}].";
-            throw new InvalidOperationException(message);
-        }
-
-        /// <summary>
-        /// Retrieves the user's ID from the claims. Throws an exception if the ID is missing or invalid.
-        /// </summary>
-        /// <param name="user">The <see cref="ClaimsPrincipal"/> representing the user.</param>
-        /// <returns>The user's ID as an integer.</returns>
-        /// <exception cref="InvalidOperationException">Thrown if the user ID claim is missing or invalid.</exception>
-        public static int GetId(this ClaimsPrincipal user)
-        {
-            var idValue = user.GetRequiredClaimOfSender(ClaimTypes.NameIdentifier, "sub");
-
-            if (!int.TryParse(idValue, out var result))
-            {
-                throw new InvalidOperationException("User ID claim is missing or invalid. This may indicate a misconfigured or forged JWT token.");
-            }
-
-            return result;
-        }
-
-        /// <summary>
-        /// Retrieves the username from the claims.
-        /// </summary>
-        /// <param name="user">The <see cref="ClaimsPrincipal"/> representing the user.</param>
-        /// <returns>The username as a string.</returns>
-        public static string GetUsername(this ClaimsPrincipal user)
-            => user.GetRequiredClaimOfSender(ClaimTypes.Name);
-
-        /// <summary>
-        /// Retrieves the user's surname (last name) from the claims.
-        /// </summary>
-        /// <param name="user">The <see cref="ClaimsPrincipal"/> representing the user.</param>
-        /// <returns>The surname as a string.</returns>
-        public static string GetName(this ClaimsPrincipal user)
-            => user.GetRequiredClaimOfSender(ClaimTypes.Surname);
-
-        /// <summary>
-        /// Retrieves the user's given name (first name) from the claims.
-        /// </summary>
-        /// <param name="user">The <see cref="ClaimsPrincipal"/> representing the user.</param>
-        /// <returns>The given name as a string.</returns>
-        public static string GetPrename(this ClaimsPrincipal user)
-            => user.GetRequiredClaimOfSender(ClaimTypes.GivenName);
-
-        /// <summary>
-        /// Retrieves the user's email address from the claims.
-        /// </summary>
-        /// <param name="user">The <see cref="ClaimsPrincipal"/> representing the user.</param>
-        /// <returns>The email address as a string.</returns>
-        public static string GetEmail(this ClaimsPrincipal user)
-            => user.GetRequiredClaimOfSender(ClaimTypes.Email);
-    }
-}

EnvelopeGenerator.API/Models/Auth.cs

@@ -1,14 +0,0 @@
-namespace EnvelopeGenerator.API.Models;
-
-public record Auth(string? AccessCode = null, string? SmsCode = null, string? AuthenticatorCode = null, bool UserSelectSMS = default)
-{
-    public bool HasAccessCode => AccessCode is not null;
-
-    public bool HasSmsCode => SmsCode is not null;
-
-    public bool HasAuthenticatorCode => AuthenticatorCode is not null;
-
-    public bool HasMulti => new[] { HasAccessCode, HasSmsCode, HasAuthenticatorCode }.Count(state => state) > 1;
-
-    public bool HasNone => !(HasAccessCode || HasSmsCode || HasAuthenticatorCode);
-}

EnvelopeGenerator.API/Models/ContactLink.cs

@@ -1,60 +0,0 @@
-namespace EnvelopeGenerator.API.Models
-{
-    /// <summary>
-    /// Represents a hyperlink for contact purposes with various HTML attributes.
-    /// </summary>
-    public class ContactLink
-    {
-        /// <summary>
-        /// Gets or sets the label of the hyperlink.
-        /// </summary>
-        public string Label { get; init; } = "Contact";
-
-        /// <summary>
-        /// Gets or sets the URL that the hyperlink points to.
-        /// </summary>
-        public string Href { get; set; } = string.Empty;
-
-        /// <summary>
-        /// Gets or sets the target where the hyperlink should open.
-        /// Commonly used values are "_blank", "_self", "_parent", "_top".
-        /// </summary>
-        public string Target { get; set; } = "_blank";
-
-        /// <summary>
-        /// Gets or sets the relationship of the linked URL as space-separated link types.
-        /// Examples include "nofollow", "noopener", "noreferrer".
-        /// </summary>
-        public string Rel { get; set; } = string.Empty;
-
-        /// <summary>
-        /// Gets or sets the filename that should be downloaded when clicking the hyperlink.
-        /// This attribute will only have an effect if the href attribute is set.
-        /// </summary>
-        public string Download { get; set; } = string.Empty;
-
-        /// <summary>
-        /// Gets or sets the language of the linked resource. Useful when linking to
-        /// content in another language.
-        /// </summary>
-        public string HrefLang { get; set; } = "en";
-
-        /// <summary>
-        /// Gets or sets the MIME type of the linked URL. Helps browsers to handle
-        /// the type correctly when the link is clicked.
-        /// </summary>
-        public string Type { get; set; } = string.Empty;
-
-        /// <summary>
-        /// Gets or sets additional information about the hyperlink, typically viewed
-        /// as a tooltip when the mouse hovers over the link.
-        /// </summary>
-        public string Title { get; set; } = string.Empty;
-
-        /// <summary>
-        /// Gets or sets an identifier for the hyperlink, unique within the HTML document.
-        /// </summary>
-        public string Id { get; set; } = string.Empty;
-    }
-
-}

EnvelopeGenerator.API/Models/Culture.cs

@@ -1,17 +0,0 @@
-using System.Globalization;
-
-namespace EnvelopeGenerator.API.Models;
-
-public class Culture
-{
-    private string _language = string.Empty;
-    public string Language { get => _language;
-        init {
-            _language = value;
-            Info = new(value);
-        } 
-    }
-    public string FIClass { get; init; } = string.Empty;
-
-    public CultureInfo? Info { get; init; }
-}

EnvelopeGenerator.API/Models/Cultures.cs

@@ -1,12 +0,0 @@
-namespace EnvelopeGenerator.API.Models;
-
-public class Cultures : List<Culture>
-{
-    public IEnumerable<string> Languages => this.Select(c => c.Language);
-
-    public IEnumerable<string> FIClasses => this.Select(c => c.FIClass);
-
-    public Culture Default => this.First();
-    
-    public Culture? this[string? language] => language is null ? null : this.Where(c => c.Language == language).FirstOrDefault();
-}

EnvelopeGenerator.API/Models/CustomImages.cs

@@ -1,6 +0,0 @@
-namespace EnvelopeGenerator.API.Models;
-
-public class CustomImages : Dictionary<string, Image>
-{
-    public new Image this[string key] => TryGetValue(key, out var img) && img is not null ? img : new();
-}

EnvelopeGenerator.API/Models/ErrorViewModel.cs

@@ -1,10 +0,0 @@
-namespace EnvelopeGenerator.API.Models;
-
-public class ErrorViewModel
-{
-    public string Title { get; init; } = "404";
-
-    public string Subtitle { get; init; } = "Hmmm...";
-
-    public string Body { get; init; } = "It looks like one of the developers fell asleep";
-}

EnvelopeGenerator.API/Models/Image.cs

@@ -1,10 +0,0 @@
-namespace EnvelopeGenerator.API.Models;
-
-public class Image
-{
-    public string Src { get; init; } = string.Empty;
-
-    public Dictionary<string, string> Classes { get; init; } = new();
-
-    public string GetClassIn(string page) => Classes.TryGetValue(page, out var cls) && cls is not null ? cls : string.Empty;
-}

EnvelopeGenerator.API/Models/MainViewModel.cs

@@ -1,6 +0,0 @@
-namespace EnvelopeGenerator.API.Models;
-
-public class MainViewModel
-{
-    public string? Title { get; init; }
-}

EnvelopeGenerator.API/Models/PsPdfKitAnnotation/Annotation.cs

@@ -1,93 +0,0 @@
-using EnvelopeGenerator.API.Models.PsPdfKitAnnotation;
-using System.Text.Json.Serialization;
-
-namespace EnvelopeGenerator.API.Models.PsPdfKitAnnotation;
-
-public record Annotation : IAnnotation
-{
-    public required string Name { get; init; }
-
-    #region Bound Annotation
-    [JsonIgnore]
-    public string? HorBoundAnnotName { get; init; }
-
-    [JsonIgnore]
-    public string? VerBoundAnnotName { get; init; }
-    #endregion
-
-    #region Layout
-    [JsonIgnore]
-    public double? MarginLeft { get; set; }
-
-    [JsonIgnore]
-    public double MarginLeftRatio { get; init; } = 1;
-
-    [JsonIgnore]
-    public double? MarginTop { get; set; }
-
-    [JsonIgnore]
-    public double MarginTopRatio { get; init; } = 1;
-
-    public double? Width { get; set; }
-
-    [JsonIgnore]
-    public double WidthRatio { get; init; } = 1;
-
-    public double? Height { get; set; }
-
-    [JsonIgnore]
-    public double HeightRatio { get; init; } = 1;
-    #endregion
-
-    #region Position
-    public double Left => (MarginLeft ?? 0) + (HorBoundAnnot?.HorBoundary ?? 0);
-
-    public double Top => (MarginTop ?? 0) + (VerBoundAnnot?.VerBoundary ?? 0);
-    #endregion
-
-    #region Boundary
-    [JsonIgnore]
-    public double HorBoundary => Left + (Width ?? 0);
-
-    [JsonIgnore]
-    public double VerBoundary => Top + (Height ?? 0);
-    #endregion
-
-    #region BoundAnnot
-    [JsonIgnore]
-    public Annotation? HorBoundAnnot { get; set; }
-
-    [JsonIgnore]
-    public Annotation? VerBoundAnnot { get; set; }
-    #endregion
-
-    public Color? BackgroundColor { get; init; }
-
-    #region Border
-    public Color? BorderColor { get; init; }
-
-    public string? BorderStyle { get; init; }
-
-    public int? BorderWidth { get; set; }
-    #endregion
-
-    [JsonIgnore]
-    internal Annotation Default 
-    { 
-        set 
-        {
-            // To set null value, annotation must have null (0) value but null must has non-null value
-            if (MarginLeft == null && value.MarginLeft != null)
-                MarginLeft = value.MarginLeft * MarginLeftRatio;
-
-            if (MarginTop == null && value.MarginTop != null)
-                MarginTop = value.MarginTop * MarginTopRatio;
-
-            if (Width == null && value.Width != null)
-                Width = value.Width * WidthRatio;
-
-            if (Height == null && value.Height != null)
-                Height = value.Height * HeightRatio;
-        }
-    }
-};

EnvelopeGenerator.API/Models/PsPdfKitAnnotation/AnnotationParams.cs

@@ -1,80 +0,0 @@
-using EnvelopeGenerator.API.Models.PsPdfKitAnnotation;
-using System.Text.Json.Serialization;
-
-namespace EnvelopeGenerator.API.Models.PsPdfKitAnnotation;
-
-public class AnnotationParams
-{
-    public AnnotationParams()
-    {
-        _AnnotationJSObjectInitor = new(CreateAnnotationJSObject);
-    }
-
-    public Background? Background { get; init; }
-
-    #region Annotation
-    [JsonIgnore]
-    public Annotation? DefaultAnnotation { get; init; }
-
-    private readonly List<Annotation> _annots = new List<Annotation>();
-
-    public bool TryGet(string name, out Annotation annotation)
-    {
-#pragma warning disable CS8601 // Possible null reference assignment.
-        annotation = _annots.FirstOrDefault(a => a.Name == name);
-#pragma warning restore CS8601 // Possible null reference assignment.
-        return annotation is not null;
-    }
-
-    public required IEnumerable<Annotation> Annotations
-    {
-        get => _annots;
-        init
-        {
-            _annots = value.ToList();
-
-            if (DefaultAnnotation is not null)
-                foreach (var annot in _annots)
-                    annot.Default = DefaultAnnotation;
-
-            for (int i = 0; i < _annots.Count; i++)
-            {
-                #region set bound annotations
-                // horizontal
-                if (_annots[i].HorBoundAnnotName is string horBoundAnnotName)
-                    if (TryGet(horBoundAnnotName, out var horBoundAnnot))
-                        _annots[i].HorBoundAnnot = horBoundAnnot;
-                    else
-                        throw new InvalidOperationException($"{horBoundAnnotName} added as bound anotation. However, it is not defined.");
-
-                // vertical
-                if (_annots[i].VerBoundAnnotName is string verBoundAnnotName)
-                    if (TryGet(verBoundAnnotName, out var verBoundAnnot))
-                        _annots[i].VerBoundAnnot = verBoundAnnot;
-                    else
-                        throw new InvalidOperationException($"{verBoundAnnotName} added as bound anotation. However, it is not defined.");
-                #endregion
-            }
-        }
-    }
-    #endregion
-
-    #region AnnotationJSObject
-    private Dictionary<string, IAnnotation> CreateAnnotationJSObject()
-    {
-        var dict = _annots.ToDictionary(a => a.Name.ToLower(), a => a as IAnnotation);
-
-        if (Background is not null)
-        {
-            Background.Locate(_annots);
-            dict.Add(Background.Name.ToLower(), Background);
-        }            
-
-        return dict;
-    }
-
-    private readonly Lazy<Dictionary<string, IAnnotation>> _AnnotationJSObjectInitor;
-
-    public Dictionary<string, IAnnotation> AnnotationJSObject => _AnnotationJSObjectInitor.Value;
-    #endregion
-}

EnvelopeGenerator.API/Models/PsPdfKitAnnotation/Background.cs

@@ -1,58 +0,0 @@
-using System.Text.Json.Serialization;
-
-namespace EnvelopeGenerator.API.Models.PsPdfKitAnnotation;
-
-/// <summary>
-/// The Background is an annotation for the PSPDF Kit. However, it has no function.
-/// It is only the first annotation as a background for other annotations.
-/// </summary>
-public record Background : IAnnotation
-{
-    [JsonIgnore]
-    public double Margin { get; init; }
-
-    public string Name { get; } = "Background";
-
-    public double? Width { get; set; }
-
-    public double? Height { get; set; }
-
-    public double Left { get; set; }
-
-    public double Top { get; set; }
-
-    public Color? BackgroundColor { get; init; }
-
-    #region Border
-    public Color? BorderColor { get; init; }
-
-    public string? BorderStyle { get; init; }
-
-    public int? BorderWidth { get; set; }
-    #endregion
-
-    public void Locate(IEnumerable<IAnnotation> annotations)
-    {
-        // set Top
-        if (annotations.MinBy(a => a.Top)?.Top is double minTop)
-            Top = minTop;
-
-        // set Left
-        if (annotations.MinBy(a => a.Left)?.Left is double minLeft)
-            Left = minLeft;
-
-        // set Width
-        if(annotations.MaxBy(a => a.GetRight())?.GetRight() is double maxRight)
-            Width = maxRight - Left;
-
-        // set Height
-        if (annotations.MaxBy(a => a.GetBottom())?.GetBottom() is double maxBottom)
-            Height = maxBottom - Top;
-
-        // add margins
-        Top -= Margin;
-        Left -= Margin;
-        Width += Margin * 2;
-        Height += Margin * 2;
-    }
-}

EnvelopeGenerator.API/Models/PsPdfKitAnnotation/Color.cs

@@ -1,10 +0,0 @@
-namespace EnvelopeGenerator.API.Models.PsPdfKitAnnotation;
-
-public record Color
-{
-    public int R { get; init; } = 0;
-
-    public int G { get; init; } = 0;
-
-    public int B { get; init; } = 0;
-}

EnvelopeGenerator.API/Models/PsPdfKitAnnotation/Extensions.cs

@@ -1,8 +0,0 @@
-namespace EnvelopeGenerator.API.Models.PsPdfKitAnnotation;
-
-public static class Extensions
-{
-    public static double GetRight(this IAnnotation annotation) => annotation.Left + annotation?.Width ?? 0;
-
-    public static double GetBottom(this IAnnotation annotation) => annotation.Top + annotation?.Height ?? 0;
-}

EnvelopeGenerator.API/Models/PsPdfKitAnnotation/IAnnotation.cs

@@ -1,22 +0,0 @@
-namespace EnvelopeGenerator.API.Models.PsPdfKitAnnotation;
-
-public interface IAnnotation
-{
-    string Name { get; }
-
-    double? Width { get; }
-
-    double? Height { get; }
-
-    double Left { get; }
-
-    double Top { get; }
-
-    Color? BackgroundColor { get; }
-
-    Color? BorderColor { get; }
-
-    string? BorderStyle { get; }
-
-    int? BorderWidth { get; }
-}

EnvelopeGenerator.API/Models/TFARegParams.cs

@@ -1,17 +0,0 @@
-namespace EnvelopeGenerator.API.Models;
-
-/// <summary>
-/// Represents the parameters for two-factor authentication (2FA) registration.
-/// </summary>
-public class TFARegParams
-{
-    /// <summary>
-    /// The maximum allowed time for completing the registration process.
-    /// </summary>
-    public TimeSpan TimeLimit { get; init; } = new(0, 30, 0);
-
-    /// <summary>
-    /// The deadline for registration, calculated as the current time plus the <see cref="TimeLimit"/>.
-    /// </summary>
-    public DateTime Deadline => DateTime.Now.AddTicks(TimeLimit.Ticks);
-}

EnvelopeGenerator.API/yarp.json

@@ -1,25 +0,0 @@
-{
-  "ReverseProxy": {
-    "Routes": {
-      "auth-login": {
-        "ClusterId": "auth-hub",
-        "Match": {
-          "Path": "/api/auth",
-          "Methods": [ "POST" ]
-        },
-        "Transforms": [
-          { "PathSet": "/api/auth/sign-flow" }
-        ]
-      }
-    },
-    "Clusters": {
-      "auth-hub": {
-        "Destinations": {
-          "primary": {
-            "Address": "http://172.24.12.39:9090"
-          }
-        }
-      }
-    }
-  }
-}

EnvelopeGenerator.Application/Common/Commands/CreateCommandHandler.cs

@@ -1,36 +0,0 @@
-using DigitalData.Core.Abstraction.Application.Repository;
-using MediatR;
-
-namespace EnvelopeGenerator.Application.Common.Commands;
-
-/// <summary>
-/// 
-/// </summary>
-/// <typeparam name="TCommand"></typeparam>
-/// <typeparam name="TEntity"></typeparam>
-public class CreateCommandHandler<TCommand, TEntity> : IRequestHandler<TCommand, TEntity>
-    where TCommand : class, IRequest<TEntity>
-    where TEntity : class
-{
-    /// <summary>
-    /// 
-    /// </summary>
-    protected readonly IRepository<TEntity> Repository;
-
-    /// <summary>
-    /// 
-    /// </summary>
-    /// <param name="repository"></param>
-    public CreateCommandHandler(IRepository<TEntity> repository)
-    {
-        Repository = repository;
-    }
-
-    /// <summary>
-    /// 
-    /// </summary>
-    /// <param name="request"></param>
-    /// <param name="cancel"></param>
-    /// <returns></returns>
-    public Task<TEntity> Handle(TCommand request, CancellationToken cancel) => Repository.CreateAsync(request, cancel);
-}

EnvelopeGenerator.Application/Common/Commands/UpdateCommand.cs

@@ -1,59 +0,0 @@
-using DigitalData.Core.Abstraction.Application.Repository;
-using MediatR;
-using System.Linq.Expressions;
-
-namespace EnvelopeGenerator.Application.Common.Commands;
-
-/// <summary>
-/// 
-/// </summary>
-/// <typeparam name="TUpdateDto"></typeparam>
-/// <typeparam name="TEntity"></typeparam>
-public abstract record UpdateCommand<TUpdateDto, TEntity> : IRequest where TUpdateDto : class where TEntity : class
-{
-    /// <summary>
-    /// 
-    /// </summary>
-    public TUpdateDto Update { get; init; } = null!;
-
-    /// <summary>
-    /// 
-    /// </summary>
-    /// <returns></returns>
-    public abstract Expression<Func<TEntity, bool>> BuildQueryExpression();
-}
-
-/// <summary>
-/// 
-/// </summary>
-/// <typeparam name="TCommand"></typeparam>
-/// <typeparam name="TUpdateDto"></typeparam>
-/// <typeparam name="TEntity"></typeparam>
-public class UpdateCommandHandler<TCommand, TUpdateDto, TEntity> : IRequestHandler<TCommand>
-    where TUpdateDto : class
-    where TEntity : class
-    where TCommand : UpdateCommand<TUpdateDto, TEntity>
-{
-    /// <summary>
-    /// 
-    /// </summary>
-    protected readonly IRepository<TEntity> Repository;
-
-    /// <summary>
-    /// 
-    /// </summary>
-    /// <param name="repository"></param>
-    public UpdateCommandHandler(IRepository<TEntity> repository)
-    {
-        Repository = repository;
-    }
-
-    /// <summary>
-    /// 
-    /// </summary>
-    /// <param name="request"></param>
-    /// <param name="cancel"></param>
-    /// <returns></returns>
-    public Task Handle(TCommand request, CancellationToken cancel)
-        => Repository.UpdateAsync(request.Update, request.BuildQueryExpression(), cancel);
-}

EnvelopeGenerator.Application/Common/Dto/EmailTemplateDto.cs

@@ -1,37 +1,31 @@
-namespace EnvelopeGenerator.Application.Common.Dto;
+using Microsoft.AspNetCore.Mvc;
 
-/// <summary>
-/// 
-/// </summary>
-public record EmailTemplateDto
+namespace EnvelopeGenerator.Application.Common.Dto
 {
     /// <summary>
     /// 
     /// </summary>
-    public int Id { get; init; }
+    [ApiExplorerSettings(IgnoreApi = true)]
+    public record EmailTemplateDto
+    {
+        /// <summary>
+        /// 
+        /// </summary>
+        public int Id{ get; init; }
 
-    /// <summary>
-    /// 
-    /// </summary>
-    public required string Name { get; init; }
+        /// <summary>
+        /// 
+        /// </summary>
+        public required string Name { get; init; }
 
-    /// <summary>
-    /// Das Datum und die Uhrzeit, wann die Vorlage hinzugefügt wurde.
-    /// </summary>
-    public DateTime AddedWhen { get; init; }
+        /// <summary>
+        /// 
+        /// </summary>
+        public required string Body { get; set; }
 
-    /// <summary>
-    /// Der Inhalt (Body) der E-Mail-Vorlage. Kann null sein.
-    /// </summary>
-    public string? Body { get; init; }
-
-    /// <summary>
-    /// Der Betreff der E-Mail-Vorlage. Kann null sein.
-    /// </summary>
-    public string? Subject { get; init; }
-
-    /// <summary>
-    /// Das Datum und die Uhrzeit, wann die Vorlage zuletzt geändert wurde. Kann null sein.
-    /// </summary>
-    public DateTime? ChangedWhen { get; init; }
-};
+        /// <summary>
+        /// 
+        /// </summary>
+        public required string Subject { get; set; }
+    };
+}

EnvelopeGenerator.Application/Common/Dto/EnvelopeDto.cs

@@ -74,11 +74,6 @@ public record EnvelopeDto
     /// </summary>
     public int? EnvelopeTypeId { get; set; }
 
-    /// <summary>
-    /// 
-    /// </summary>
-    public bool ReadOnly => EnvelopeTypeId == 2;
-
     /// <summary>
     /// 
     /// </summary>

EnvelopeGenerator.Application/Common/Dto/MappingProfile.cs

@@ -28,8 +28,8 @@ public class MappingProfile : Profile
         CreateMap<EmailTemplate, EmailTemplateDto>();
         CreateMap<Envelope, EnvelopeDto>();
         CreateMap<Document, DocumentDto>();
-        CreateMap<Domain.Entities.History, HistoryDto>().ForMember(dest => dest.ActionDate, opt => opt.MapFrom(src => src.ChangedWhen));
-        CreateMap<Domain.Entities.History, HistoryCreateDto>().ForMember(dest => dest.ActionDate, opt => opt.MapFrom(src => src.ChangedWhen));
+        CreateMap<Domain.Entities.History, HistoryDto>();
+        CreateMap<Domain.Entities.History, HistoryCreateDto>();
         CreateMap<Domain.Entities.EnvelopeReceiver, EnvelopeReceiverDto>();
         CreateMap<Domain.Entities.EnvelopeReceiver, EnvelopeReceiverSecretDto>();
         CreateMap<EnvelopeType, EnvelopeTypeDto>();
@@ -44,15 +44,15 @@ public class MappingProfile : Profile
         CreateMap<EmailTemplateDto, EmailTemplate>();
         CreateMap<EnvelopeDto, Envelope>();
         CreateMap<DocumentDto, Document>();
-        CreateMap<HistoryDto, Domain.Entities.History>().ForMember(dest => dest.ChangedWhen, opt => opt.MapFrom(src => src.ActionDate));
-        CreateMap<HistoryCreateDto, Domain.Entities.History>().ForMember(dest => dest.ChangedWhen, opt => opt.MapFrom(src => src.ActionDate));
+        CreateMap<HistoryDto, Domain.Entities.History>();
+        CreateMap<HistoryCreateDto, Domain.Entities.History>();
         CreateMap<EnvelopeReceiverDto, Domain.Entities.EnvelopeReceiver>();
         CreateMap<EnvelopeTypeDto, EnvelopeType>();
         CreateMap<ReceiverDto, Domain.Entities.Receiver>().ForMember(rcv => rcv.EnvelopeReceivers, rcvReadDto => rcvReadDto.Ignore());
         CreateMap<EnvelopeReceiverReadOnlyCreateDto, Domain.Entities.EnvelopeReceiverReadOnly>();
         CreateMap<EnvelopeReceiverReadOnlyUpdateDto, Domain.Entities.EnvelopeReceiverReadOnly>();
         CreateMap<AnnotationCreateDto, ElementAnnotation>()
-            .MapAddedWhen();
+            .ForMember(dest => dest.AddedWhen, opt => opt.MapFrom(_ => DateTime.UtcNow));
 
         // Messaging mappings
         // for GTX messaging

EnvelopeGenerator.Application/Common/Extensions/AutoMapperAuditingExtensions.cs

@@ -1,24 +0,0 @@
-using AutoMapper;
-using EnvelopeGenerator.Domain.Interfaces.Auditing;
-
-namespace EnvelopeGenerator.Application.Common.Extensions;
-
-/// <summary>
-/// Extension methods for applying auditing timestamps during AutoMapper mappings.
-/// </summary>
-public static class AutoMapperAuditingExtensions
-{
-    /// <summary>
-    /// Maps <see cref="IHasAddedWhen.AddedWhen"/> to the current UTC time.
-    /// </summary>
-    public static IMappingExpression<TSource, TDestination> MapAddedWhen<TSource, TDestination>(this IMappingExpression<TSource, TDestination> expression)
-        where TDestination : IHasAddedWhen
-        => expression.ForMember(dest => dest.AddedWhen, opt => opt.MapFrom(_ => DateTime.UtcNow));
-
-    /// <summary>
-    /// Maps <see cref="IHasChangedWhen.ChangedWhen"/> to the current UTC time.
-    /// </summary>
-    public static IMappingExpression<TSource, TDestination> MapChangedWhen<TSource, TDestination>(this IMappingExpression<TSource, TDestination> expression)
-        where TDestination : IHasChangedWhen
-        => expression.ForMember(dest => dest.ChangedWhen, opt => opt.MapFrom(_ => DateTime.UtcNow));
-}

EnvelopeGenerator.Application/Common/Extensions/LoggerExtensions.cs

@@ -3,19 +3,8 @@ using System.Text;
 
 namespace EnvelopeGenerator.Application.Common.Extensions
 {
-    /// <summary>
-    /// 
-    /// </summary>
     public static class LoggerExtensions
     {
-        /// <summary>
-        /// 
-        /// </summary>
-        /// <param name="logger"></param>
-        /// <param name="envelopeReceiverId"></param>
-        /// <param name="exception"></param>
-        /// <param name="message"></param>
-        /// <param name="args"></param>
         public static void LogEnvelopeError(this ILogger logger, string envelopeReceiverId, Exception? exception = null, string? message = null, params object?[] args)
         {
             var sb = new StringBuilder().AppendLine(envelopeReceiverId.DecodeEnvelopeReceiverId().ToTitle());
@@ -29,15 +18,6 @@ namespace EnvelopeGenerator.Application.Common.Extensions
                 logger.Log(LogLevel.Error, exception, sb.AppendLine(exception.Message).ToString(), args);
         }
 
-        /// <summary>
-        /// 
-        /// </summary>
-        /// <param name="logger"></param>
-        /// <param name="uuid"></param>
-        /// <param name="signature"></param>
-        /// <param name="exception"></param>
-        /// <param name="message"></param>
-        /// <param name="args"></param>
         public static void LogEnvelopeError(this ILogger logger, string? uuid, string? signature = null, Exception? exception = null, string? message = null, params object?[] args)
         {
             var sb = new StringBuilder($"Envelope Uuid: {uuid}");
@@ -54,11 +34,6 @@ namespace EnvelopeGenerator.Application.Common.Extensions
                 logger.Log(LogLevel.Error, exception, sb.ToString(), args);
         }
 
-        /// <summary>
-        /// 
-        /// </summary>
-        /// <param name="envelopeReceiverTuple"></param>
-        /// <returns></returns>
         public static string ToTitle(this (string? UUID, string? Signature) envelopeReceiverTuple)
         {
             return $"UUID is {envelopeReceiverTuple.UUID} and signature is {envelopeReceiverTuple.Signature}";

EnvelopeGenerator.Application/Common/Extensions/TaskExtensions.cs

@@ -5,7 +5,6 @@ namespace EnvelopeGenerator.Application.Common.Extensions;
 /// <summary>
 /// Extension methods for tasks
 /// </summary>
-[Obsolete("Implement Mediator behaviors in the Osolete .NET project.")]
 public static class TaskExtensions
 {
     /// <summary>
@@ -18,7 +17,6 @@ public static class TaskExtensions
     /// <param name="factory">Exception provider</param>
     /// <returns>The awaited result if not <c>null</c>.</returns>
     /// <exception>Thrown if the result is <c>null</c>.</exception>
-    [Obsolete("Implement Mediator behaviors in the Osolete .NET project.")]
     public static async Task<T> ThrowIfNull<T, TException>(this Task<T?> task, Func<TException> factory) where TException : Exception
     {
         var result = await task;
@@ -35,7 +33,6 @@ public static class TaskExtensions
     /// <param name="factory">Exception provider</param>
     /// <returns>The awaited collection if it is not <c>null</c> or empty.</returns>
     /// <exception cref="NotFoundException">Thrown if the result is <c>null</c> or empty.</exception>
-    [Obsolete("Implement Mediator behaviors in the Osolete .NET project.")]
     public static async Task<IEnumerable<T>> ThrowIfEmpty<T, TException>(this Task<IEnumerable<T>> task, Func<TException> factory) where TException : Exception
     {
         var result = await task;
@@ -50,33 +47,11 @@ public static class TaskExtensions
     /// <param name="task"></param>
     /// <param name="act"></param>
     /// <returns></returns>
-    [Obsolete("Implement Mediator behaviors in the Osolete .NET project.")]
     public static async Task<I> Then<T, I>(this Task<T> task, Func<T, I> act)
     {
         var res = await task;
         return act(res);
     }
-
-    /// <summary>
-    /// 
-    /// </summary>
-    /// <typeparam name="T"></typeparam>
-    /// <param name="task"></param>
-    /// <returns></returns>
-    [Obsolete("Implement Mediator behaviors in the Osolete .NET project.")]
-    public static Task<T?> FirstOrDefaultAsync<T>(this Task<IEnumerable<T>> task) => task.Then(t => t.FirstOrDefault());
-
-    /// <summary>
-    /// 
-    /// </summary>
-    /// <typeparam name="T"></typeparam>
-    /// <typeparam name="TException"></typeparam>
-    /// <param name="task"></param>
-    /// <param name="factory"></param>
-    /// <returns></returns>
-    public static Task<T> FirstAsync<T, TException>(this Task<IEnumerable<T>> task, Func<TException> factory) 
-        where TException : Exception 
-        => task.Then(t => t.FirstOrDefault() ?? throw factory());
 }
 
 /// <summary>
@@ -93,13 +68,11 @@ public static class Exceptions
     /// 
     /// </summary>
     /// <returns></returns>
-    [Obsolete("Implement Mediator behaviors in the Osolete .NET project.")]
     public static BadRequestException BadRequest() => new();
 
     /// <summary>
     /// 
     /// </summary>
     /// <returns></returns>
-    [Obsolete("Implement Mediator behaviors in the Osolete .NET project.")]
     public static ForbiddenException Forbidden() => new();
 }

EnvelopeGenerator.Application/Common/Extensions/XSSExtensions.cs

@@ -2,42 +2,16 @@
 using Microsoft.Extensions.Localization;
 using System.Text.Encodings.Web;
 
-namespace EnvelopeGenerator.Application.Common.Extensions;
-
-/// <summary>
-/// 
-/// </summary>
-public static class XSSExtensions
+namespace EnvelopeGenerator.Application.Common.Extensions
 {
-    /// <summary>
-    /// 
-    /// </summary>
-    /// <param name="value"></param>
-    /// <param name="encoder"></param>
-    /// <returns></returns>
-    public static string? TryEncode(this string? value, UrlEncoder encoder) => value is null ? value : encoder.Encode(value);
+    public static class XSSExtensions
+    {
+        public static string? TryEncode(this string? value, UrlEncoder encoder) => value is null ? value : encoder.Encode(value);
 
-    /// <summary>
-    /// 
-    /// </summary>
-    /// <param name="value"></param>
-    /// <param name="encoder"></param>
-    /// <returns></returns>
-    public static string? TryEncode(this LocalizedString? value, UrlEncoder encoder) => value is null ? null : encoder.Encode(value);
+        public static string? TryEncode(this LocalizedString? value, UrlEncoder encoder) => value is null ? null : encoder.Encode(value);
 
-    /// <summary>
-    /// 
-    /// </summary>
-    /// <param name="html"></param>
-    /// <param name="sanitizer"></param>
-    /// <returns></returns>
-    public static string? TrySanitize(this string? html, HtmlSanitizer sanitizer) => html is null ? html : sanitizer.Sanitize(html);
+        public static string? TrySanitize(this string? html, HtmlSanitizer sanitizer) => html is null ? html : sanitizer.Sanitize(html);
 
-    /// <summary>
-    /// 
-    /// </summary>
-    /// <param name="html"></param>
-    /// <param name="sanitizer"></param>
-    /// <returns></returns>
-    public static string? TrySanitize(this LocalizedString? html, HtmlSanitizer sanitizer) => html is null ? null : sanitizer.Sanitize(html);
+        public static string? TrySanitize(this LocalizedString? html, HtmlSanitizer sanitizer) => html is null ? null : sanitizer.Sanitize(html);
+    }
 }

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

@@ -24,7 +24,7 @@ public record DocSignedNotification(EnvelopeReceiverDto Original) : EnvelopeRece
     /// <summary>
     /// 
     /// </summary>
-    public PsPdfKitAnnotation? PsPdfKitAnnotation { get; init; }
+    public PsPdfKitAnnotation PsPdfKitAnnotation { get; init; } = null!;
 
     /// <summary>
     /// 
@@ -59,7 +59,7 @@ public static class DocSignedNotificationExtensions
     /// <param name="dtoTask"></param>
     /// <param name="psPdfKitAnnotation"></param>
     /// <returns></returns>
-    public static async Task<DocSignedNotification?> ToDocSignedNotification(this Task<EnvelopeReceiverDto?> dtoTask, PsPdfKitAnnotation? psPdfKitAnnotation)
+    public static async Task<DocSignedNotification?> ToDocSignedNotification(this Task<EnvelopeReceiverDto?> dtoTask, PsPdfKitAnnotation psPdfKitAnnotation)
         => await dtoTask is EnvelopeReceiverDto dto ? new(dto) { PsPdfKitAnnotation = psPdfKitAnnotation } : null;
 
     /// <summary>

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

@@ -29,9 +29,6 @@ public class AnnotationHandler : INotificationHandler<DocSignedNotification>
     /// <param name="notification"></param>
     /// <param name="cancel"></param>
     /// <returns></returns>
-    public async Task Handle(DocSignedNotification notification, CancellationToken cancel)
-    {
-        if (notification.PsPdfKitAnnotation is PsPdfKitAnnotation annot)
-            await _repo.CreateAsync(annot.Structured, cancel);
-    }
+    public Task Handle(DocSignedNotification notification, CancellationToken cancel)
+        => _repo.CreateAsync(notification.PsPdfKitAnnotation.Structured, cancel);
 }

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

@@ -10,8 +10,6 @@ namespace EnvelopeGenerator.Application.Common.Notifications.DocSigned.Handlers;
 /// </summary>
 public class DocStatusHandler : INotificationHandler<DocSignedNotification>
 {
-    private const string BlankAnnotationJson = "{}";
-
     private readonly ISender _sender;
 
     /// <summary>
@@ -35,9 +33,7 @@ public class DocStatusHandler : INotificationHandler<DocSignedNotification>
         {
             Envelope = new() { Id = notification.EnvelopeId },
             Receiver = new() { Id = notification.ReceiverId},
-            Value = notification.PsPdfKitAnnotation is PsPdfKitAnnotation annot 
-                    ? JsonSerializer.Serialize(annot.Instant, Format.Json.ForAnnotations) 
-                    : BlankAnnotationJson
+            Value = JsonSerializer.Serialize(notification.PsPdfKitAnnotation.Instant, Format.Json.ForAnnotations)
         }, cancel);
     }
 }

EnvelopeGenerator.Application/DocStatus/Commands/CreateDocStatusCommand.cs

@@ -1,31 +1,12 @@
-using DigitalData.Core.Abstraction.Application.Repository;
-using EnvelopeGenerator.Application.Common.Commands;
-using EnvelopeGenerator.Domain.Entities;
-using MediatR;
-
-namespace EnvelopeGenerator.Application.DocStatus.Commands;
+namespace EnvelopeGenerator.Application.DocStatus.Commands;
 
 /// <summary>
 /// 
 /// </summary>
-public record CreateDocStatusCommand : ModifyDocStatusCommandBase, IRequest<DocumentStatus>
+public record CreateDocStatusCommand : ModifyDocStatusCommandBase
 {
     /// <summary>
     /// Gets timestamp when this record was added. Returns the StatusChangedWhen value.
     /// </summary>
     public DateTime AddedWhen => StatusChangedWhen;
-}
-
-/// <summary>
-/// 
-/// </summary>
-public class CreateDocStatusCommandHandler : CreateCommandHandler<CreateDocStatusCommand, DocumentStatus>
-{
-    /// <summary>
-    /// 
-    /// </summary>
-    /// <param name="repository"></param>
-    public CreateDocStatusCommandHandler(IRepository<DocumentStatus> repository) : base(repository)
-    {
-    }
 }

EnvelopeGenerator.Application/DocStatus/MappingProfile.cs

@@ -1,5 +1,4 @@
 using AutoMapper;
-using EnvelopeGenerator.Application.Common.Extensions;
 using EnvelopeGenerator.Application.DocStatus.Commands;
 using EnvelopeGenerator.Domain.Entities;
 
@@ -17,12 +16,10 @@ public class MappingProfile : Profile
     {
         CreateMap<CreateDocStatusCommand, DocumentStatus>()
         .ForMember(dest => dest.Envelope, opt => opt.Ignore())
-        .ForMember(dest => dest.Receiver, opt => opt.Ignore())
-        .MapAddedWhen();
+        .ForMember(dest => dest.Receiver, opt => opt.Ignore());
 
         CreateMap<UpdateDocStatusCommand, DocumentStatus>()
         .ForMember(dest => dest.Envelope, opt => opt.Ignore())
-        .ForMember(dest => dest.Receiver, opt => opt.Ignore())
-        .MapChangedWhen();
+        .ForMember(dest => dest.Receiver, opt => opt.Ignore());
     }
 }

EnvelopeGenerator.Application/Documents/Queries/ReadDocumentQuery.cs

@@ -4,7 +4,6 @@ using EnvelopeGenerator.Domain.Entities;
 using Microsoft.EntityFrameworkCore;
 using AutoMapper;
 using EnvelopeGenerator.Application.Common.Dto;
-using DigitalData.Core.Exceptions;
 
 namespace EnvelopeGenerator.Application.Documents.Queries;
 
@@ -13,14 +12,14 @@ namespace EnvelopeGenerator.Application.Documents.Queries;
 /// </summary>
 /// <param name="Id">The unique identifier of the document. Optional.</param>
 /// <param name="EnvelopeId">The identifier of the envelope associated with the document. Optional.</param>
-public record ReadDocumentQuery(int? Id = null, int? EnvelopeId = null) : IRequest<DocumentDto>
+public record ReadDocumentQuery(int? Id = null, int? EnvelopeId = null) : IRequest<DocumentDto?>
 {
 }
 
 /// <summary>
 /// Handles queries for reading <see cref="Document"/> data based on either the document ID or the envelope ID.
 /// </summary>
-public class ReadDocumentQueryHandler : IRequestHandler<ReadDocumentQuery, DocumentDto>
+public class ReadDocumentQueryHandler : IRequestHandler<ReadDocumentQuery, DocumentDto?>
 {
     /// <summary>
     /// TempRepo for accessing <see cref="Document"/> entities.
@@ -51,19 +50,20 @@ public class ReadDocumentQueryHandler : IRequestHandler<ReadDocumentQuery, Docum
     /// <exception cref="InvalidOperationException">
     /// Thrown when neither <see cref="ReadDocumentQuery.Id"/> nor <see cref="ReadDocumentQuery.EnvelopeId"/> is provided.
     /// </exception>
-    public async Task<DocumentDto> Handle(ReadDocumentQuery query, CancellationToken cancel)
+    public async Task<DocumentDto?> Handle(ReadDocumentQuery query, CancellationToken cancel)
     {
         if (query.Id is not null)
         {
-            var doc = await _repo.Query.Where(d => d.Id == query.Id).FirstOrDefaultAsync(cancel);
+            var doc = await _repo.ReadOnly().Where(d => d.Id == query.Id).FirstOrDefaultAsync(cancel);
             return _mapper.Map<DocumentDto>(doc);
         }            
         else if (query.EnvelopeId is not null)
         {
-            var doc = await _repo.Query.Where(d => d.EnvelopeId == query.EnvelopeId).FirstOrDefaultAsync(cancel);
+            var doc = await _repo.ReadOnly().Where(d => d.EnvelopeId == query.EnvelopeId).FirstOrDefaultAsync(cancel);
             return _mapper.Map<DocumentDto>(doc);
         }
 
-        throw new NotFoundException();
+        throw new InvalidOperationException(
+            $"Invalid {nameof(ReadDocumentQuery)}: either {nameof(query.Id)} or {nameof(query.EnvelopeId)} must be provided.");
     }
 }

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

@@ -0,0 +1,41 @@
+using EnvelopeGenerator.Domain;
+using EnvelopeGenerator.Domain.Constants;
+using MediatR;
+
+namespace EnvelopeGenerator.Application.EmailTemplates.Commands.Reset;
+
+/// <summary>
+/// Ein Befehl zum Zurücksetzen einer E-Mail-Vorlage auf die Standardwerte.
+/// Erbt von <see cref="EmailTemplateQuery"/> und ermöglicht die Angabe einer optionalen ID und eines Typs der E-Mail-Vorlage.<br/><br/>
+/// Beispiele:<br/>
+/// 0 - DocumentReceived: Benachrichtigung über den Empfang eines Dokuments.<br/>
+/// 1 - DocumentSigned: Benachrichtigung über die Unterzeichnung eines Dokuments.<br/>
+/// 2 - DocumentDeleted: Benachrichtigung über das Löschen eines Dokuments.<br/>
+/// 3 - DocumentCompleted: Benachrichtigung über den Abschluss eines Dokuments.<br/>
+/// 4 - DocumentAccessCodeReceived: Benachrichtigung über den Erhalt eines Zugangscodes.<br/>
+/// 5 - DocumentShared: Benachrichtigung über das Teilen eines Dokuments.<br/>
+/// 6 - TotpSecret: Benachrichtigung über ein TOTP-Geheimnis.<br/>
+/// 7 - DocumentRejected_ADM (Für den Absender): Mail an den Absender, wenn das Dokument abgelehnt wird.<br/>
+/// 8 - DocumentRejected_REC (Für den ablehnenden Empfänger): Mail an den ablehnenden Empfänger, wenn das Dokument abgelehnt wird.<br/>
+/// 9 - DocumentRejected_REC_2 (Für sonstige Empfänger): Mail an andere Empfänger (Brief), wenn das Dokument abgelehnt wird.<br/>
+/// </summary>
+public record ResetEmailTemplateCommand : EmailTemplateQuery, IRequest
+{
+    /// <summary>
+    /// 
+    /// </summary>
+    /// <param name="orginal"></param>
+    public ResetEmailTemplateCommand(EmailTemplateQuery? orginal = null) : base(orginal ?? new())
+    {
+
+    }
+
+    /// <summary>
+    /// 
+    /// </summary>
+    /// <param name="Id">Die optionale ID der E-Mail-Vorlage, die zurückgesetzt werden soll.</param>
+    /// <param name="Type">Der Typ der E-Mail-Vorlage, z. B. <see cref="EmailTemplateType"/> (optional).</param>
+    public ResetEmailTemplateCommand(int? Id = null, EmailTemplateType? Type = null) : base(Id, Type)
+    {
+    }
+};

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

@@ -1,38 +1,11 @@
 using DigitalData.Core.Abstraction.Application.Repository;
-using EnvelopeGenerator.Domain.Constants;
-using MediatR;
 using EnvelopeGenerator.Application.Common.Dto;
 using EnvelopeGenerator.Domain.Entities;
+using MediatR;
 using Microsoft.EntityFrameworkCore;
+using System.Linq;
 
-namespace EnvelopeGenerator.Application.EmailTemplates.Commands;
-
-/// <summary>
-/// Ein Befehl zum Zurücksetzen einer E-Mail-Vorlage auf die Standardwerte.
-/// Erbt von <see cref="IEmailTemplateQuery"/> und ermöglicht die Angabe einer optionalen ID und eines Typs der E-Mail-Vorlage.<br/><br/>
-/// </summary>
-public record ResetEmailTemplateCommand : IEmailTemplateQuery, IRequest
-{
-    /// <summary>
-    /// Die eindeutige Kennung der E-Mail-Vorlage (optional).
-    /// </summary>
-    public int? Id { get; set; }
-
-    /// <summary>
-    /// Der Typ der E-Mail-Vorlage, z. B. <see cref="EmailTemplateType"/> (optional). Beispiele:<br/>
-    /// 0 - DocumentReceived: Benachrichtigung über den Empfang eines Dokuments.<br/>
-    /// 1 - DocumentSigned: Benachrichtigung über die Unterzeichnung eines Dokuments.<br/>
-    /// 2 - DocumentDeleted: Benachrichtigung über das Löschen eines Dokuments.<br/>
-    /// 3 - DocumentCompleted: Benachrichtigung über den Abschluss eines Dokuments.<br/>
-    /// 4 - DocumentAccessCodeReceived: Benachrichtigung über den Erhalt eines Zugangscodes.<br/>
-    /// 5 - DocumentShared: Benachrichtigung über das Teilen eines Dokuments.<br/>
-    /// 6 - TotpSecret: Benachrichtigung über ein TOTP-Geheimnis.<br/>
-    /// 7 - DocumentRejected_ADM (für den Absender): Mail an den Absender, wenn das Dokument abgelehnt wird.<br/>
-    /// 8 - DocumentRejected_REC (für den ablehnenden Empfänger): Mail an den ablehnenden Empfänger, wenn das Dokument abgelehnt wird.<br/>
-    /// 9 - DocumentRejected_REC_2 (für sonstige Empfänger): Mail an andere Empfänger (Brief), wenn das Dokument abgelehnt wird.
-    /// </summary>
-    public EmailTemplateType? Type { get; set; }
-}
+namespace EnvelopeGenerator.Application.EmailTemplates.Commands.Reset;
 
 /// <summary>
 /// 
@@ -68,7 +41,7 @@ public class ResetEmailTemplateCommandHandler : IRequestHandler<ResetEmailTempla
         foreach (var temp in temps)
         {
             var def = Defaults.Where(t => t.Name == temp.Name).FirstOrDefault();
-            if (def is not null)
+            if(def is not null)
                 await _repository.UpdateAsync(def, t => t.Id == temp.Id, cancel);
         }
     }
@@ -140,4 +113,4 @@ public class ResetEmailTemplateCommandHandler : IRequestHandler<ResetEmailTempla
         }
     };
 
-}
+}

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

@@ -0,0 +1,29 @@
+using MediatR;
+using System.Text.Json.Serialization;
+
+namespace EnvelopeGenerator.Application.EmailTemplates.Commands.Update;
+
+
+/// <summary>
+/// Befehl zum Aktualisieren einer E-Mail-Vorlage.
+/// </summary>
+/// <param name="Body">
+/// (Optional)Der neue Inhalt des E-Mail-Textkörpers. Wenn null, bleibt der vorhandene Inhalt unverändert.
+/// </param>
+/// <param name="Subject">
+/// (Optional) Der neue Betreff der E-Mail. Wenn null, bleibt der vorhandene Betreff unverändert.
+/// </param>
+public record UpdateEmailTemplateCommand(string? Body = null, string? Subject = null) : IRequest
+{
+    /// <param>
+    /// Die Abfrage, die die E-Mail-Vorlage darstellt, die aktualisiert werden soll.
+    /// </param>
+    [JsonIgnore]
+    public EmailTemplateQuery? EmailTemplateQuery { get; set; }
+
+    /// <summary>
+    /// 
+    /// </summary>
+    [JsonIgnore]
+    public DateTime ChangedWhen { get; init; } = DateTime.Now;
+}

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

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

EnvelopeGenerator.Application/EmailTemplates/Commands/UpdateEmailTemplateCommand.cs

@@ -1,63 +0,0 @@
-using DigitalData.Core.Abstraction.Application.Repository;
-using EnvelopeGenerator.Application.Common.Commands;
-using EnvelopeGenerator.Domain.Constants;
-using EnvelopeGenerator.Domain.Entities;
-using System.Linq.Expressions;
-
-namespace EnvelopeGenerator.Application.EmailTemplates.Commands;
-
-/// <summary>
-/// 
-/// </summary>
-/// <param name="Body"></param>
-/// <param name="Subject"></param>
-public record EmailTemplateUpdateDto(string Body, string Subject);
-
-/// <summary>
-/// Befehl zum Aktualisieren einer E-Mail-Vorlage.
-/// </summary>
-public record UpdateEmailTemplateCommand : UpdateCommand<EmailTemplateUpdateDto, EmailTemplate>, IEmailTemplateQuery
-{
-    /// <summary>
-    /// Die eindeutige Kennung der E-Mail-Vorlage (optional).
-    /// </summary>
-    public int? Id { get; set; }
-
-    /// <summary>
-    /// Der Typ der E-Mail-Vorlage, z. B. <see cref="EmailTemplateType"/> (optional). Beispiele:<br/>
-    /// 0 - DocumentReceived: Benachrichtigung über den Empfang eines Dokuments.<br/>
-    /// 1 - DocumentSigned: Benachrichtigung über die Unterzeichnung eines Dokuments.<br/>
-    /// 2 - DocumentDeleted: Benachrichtigung über das Löschen eines Dokuments.<br/>
-    /// 3 - DocumentCompleted: Benachrichtigung über den Abschluss eines Dokuments.<br/>
-    /// 4 - DocumentAccessCodeReceived: Benachrichtigung über den Erhalt eines Zugangscodes.<br/>
-    /// 5 - DocumentShared: Benachrichtigung über das Teilen eines Dokuments.<br/>
-    /// 6 - TotpSecret: Benachrichtigung über ein TOTP-Geheimnis.<br/>
-    /// 7 - DocumentRejected_ADM (für den Absender): Mail an den Absender, wenn das Dokument abgelehnt wird.<br/>
-    /// 8 - DocumentRejected_REC (für den ablehnenden Empfänger): Mail an den ablehnenden Empfänger, wenn das Dokument abgelehnt wird.<br/>
-    /// 9 - DocumentRejected_REC_2 (für sonstige Empfänger): Mail an andere Empfänger (Brief), wenn das Dokument abgelehnt wird.
-    /// </summary>
-    public EmailTemplateType? Type { get; set; }
-
-    /// <summary>
-    /// 
-    /// </summary>
-    /// <returns></returns>
-    public override Expression<Func<EmailTemplate, bool>> BuildQueryExpression()
-        => Id is int id
-            ? temp => temp.Id == id
-            : temp => temp!.Name == Type.ToString();
-}
-
-/// <summary>
-/// 
-/// </summary>
-public class UpdateEmailTemplateCommandHandler : UpdateCommandHandler<UpdateEmailTemplateCommand, EmailTemplateUpdateDto, EmailTemplate>
-{
-    /// <summary>
-    /// 
-    /// </summary>
-    /// <param name="repository"></param>
-    public UpdateEmailTemplateCommandHandler(IRepository<EmailTemplate> repository) : base(repository)
-    {
-    }
-}

EnvelopeGenerator.Application/EmailTemplates/EmailTemplateQuery.cs

@@ -0,0 +1,24 @@
+using EnvelopeGenerator.Domain.Constants;
+
+namespace EnvelopeGenerator.Application.EmailTemplates;
+
+/// <summary>
+/// Repräsentiert eine Abfrage für E-Mail-Vorlagen, die für Absender und Empfänger von Umschlägen verwendet werden.
+/// Die Standardkultur ist "de-DE".
+/// </summary>
+/// <param name="Id">Die eindeutige Kennung der E-Mail-Vorlage (optional).</param>
+/// <param name="Type">Der Typ der E-Mail-Vorlage, z. B. <see cref="EmailTemplateType"/> (optional). Beispiele:
+/// 0 - DocumentReceived: Benachrichtigung über den Empfang eines Dokuments.
+/// 1 - DocumentSigned: Benachrichtigung über die Unterzeichnung eines Dokuments.
+/// 2 - DocumentDeleted: Benachrichtigung über das Löschen eines Dokuments.
+/// 3 - DocumentCompleted: Benachrichtigung über den Abschluss eines Dokuments.
+/// 4 - DocumentAccessCodeReceived: Benachrichtigung über den Erhalt eines Zugangscodes.
+/// 5 - DocumentShared: Benachrichtigung über das Teilen eines Dokuments.
+/// 6 - TotpSecret: Benachrichtigung über ein TOTP-Geheimnis.
+/// 7 - DocumentRejected_ADM (Für den Absender): Mail an den Absender, wenn das Dokument abgelehnt wird.
+/// 8 - DocumentRejected_REC (Für den ablehnenden Empfänger): Mail an den ablehnenden Empfänger, wenn das Dokument abgelehnt wird.
+/// 9 - DocumentRejected_REC_2 (Für sonstige Empfänger): Mail an andere Empfänger (Brief), wenn das Dokument abgelehnt wird.
+/// </param>
+public record EmailTemplateQuery(int? Id = null, EmailTemplateType? Type = null)
+{
+}

EnvelopeGenerator.Application/EmailTemplates/IEmailTemplateQuery.cs

@@ -1,30 +0,0 @@
-using EnvelopeGenerator.Domain.Constants;
-
-namespace EnvelopeGenerator.Application.EmailTemplates;
-
-/// <summary>
-/// Stellt eine Schnittstelle für Abfragen von E-Mail-Vorlagen dar, die für Absender und Empfänger von Umschlägen verwendet werden.
-/// Die Standardkultur ist "de-DE".
-/// </summary>
-public interface IEmailTemplateQuery
-{
-    /// <summary>
-    /// Die eindeutige Kennung der E-Mail-Vorlage (optional).
-    /// </summary>
-    int? Id { get; set; }
-
-    /// <summary>
-    /// Der Typ der E-Mail-Vorlage, z. B. <see cref="EmailTemplateType"/> (optional). Beispiele:<br/>
-    /// 0 - DocumentReceived: Benachrichtigung über den Empfang eines Dokuments.<br/>
-    /// 1 - DocumentSigned: Benachrichtigung über die Unterzeichnung eines Dokuments.<br/>
-    /// 2 - DocumentDeleted: Benachrichtigung über das Löschen eines Dokuments.<br/>
-    /// 3 - DocumentCompleted: Benachrichtigung über den Abschluss eines Dokuments.<br/>
-    /// 4 - DocumentAccessCodeReceived: Benachrichtigung über den Erhalt eines Zugangscodes.<br/>
-    /// 5 - DocumentShared: Benachrichtigung über das Teilen eines Dokuments.<br/>
-    /// 6 - TotpSecret: Benachrichtigung über ein TOTP-Geheimnis.<br/>
-    /// 7 - DocumentRejected_ADM (für den Absender): Mail an den Absender, wenn das Dokument abgelehnt wird.<br/>
-    /// 8 - DocumentRejected_REC (für den ablehnenden Empfänger): Mail an den ablehnenden Empfänger, wenn das Dokument abgelehnt wird.<br/>
-    /// 9 - DocumentRejected_REC_2 (für sonstige Empfänger): Mail an andere Empfänger (Brief), wenn das Dokument abgelehnt wird.
-    /// </summary>
-    EmailTemplateType? Type { get; set; }
-}

EnvelopeGenerator.Application/EmailTemplates/MappingProfile.cs

@@ -1,24 +1,24 @@
-using AutoMapper;
-using EnvelopeGenerator.Application.Common.Dto;
-using EnvelopeGenerator.Application.Common.Extensions;
-using EnvelopeGenerator.Application.EmailTemplates.Commands;
+using AutoMapper;
+using EnvelopeGenerator.Application.EmailTemplates.Queries.Read;
 using EnvelopeGenerator.Domain.Entities;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
 
 namespace EnvelopeGenerator.Application.EmailTemplates;
 
 /// <summary>
-///
+/// 
 /// </summary>
 public class MappingProfile : Profile
 {
     /// <summary>
-    ///
+    /// 
     /// </summary>
     public MappingProfile()
     {
-        CreateMap<EmailTemplate, EmailTemplateDto>();
-
-        CreateMap<EmailTemplateUpdateDto, EmailTemplate>()
-            .MapChangedWhen();
+        CreateMap<EmailTemplate, ReadEmailTemplateResponse>();
     }
-}
+}

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

@@ -0,0 +1,12 @@
+using MediatR;
+
+namespace EnvelopeGenerator.Application.EmailTemplates.Queries.Read;
+
+
+/// <summary>
+/// Stellt eine Abfrage dar, um eine E-Mail-Vorlage zu lesen.
+/// Diese Klasse erbt von <see cref="EmailTemplateQuery"/>.
+/// </summary>
+public record ReadEmailTemplateQuery : EmailTemplateQuery, IRequest<ReadEmailTemplateResponse?>
+{
+}

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

@@ -0,0 +1,52 @@
+using AutoMapper;
+using EnvelopeGenerator.Application.Common.Interfaces.Repositories;
+using EnvelopeGenerator.Domain.Constants;
+using MediatR;
+
+namespace EnvelopeGenerator.Application.EmailTemplates.Queries.Read;
+
+/// <summary>
+/// 
+/// </summary>
+public class ReadEmailTemplateQueryHandler : IRequestHandler<ReadEmailTemplateQuery, ReadEmailTemplateResponse?>
+{
+    private readonly IMapper _mapper;
+
+    [Obsolete("Use Read-method returning IReadQuery<TEntity> instead.")]
+    private readonly IEmailTemplateRepository _repository;
+
+    /// <summary>
+    /// Initialisiert eine neue Instanz der <see cref="EmailTemplateController"/>-Klasse.
+    /// </summary>
+    /// <param name="mapper">
+    /// <param name="repository">
+    /// Die AutoMapper-Instanz, die zum Zuordnen von Objekten verwendet wird.
+    /// </param>
+    [Obsolete("Use Read-method returning IReadQuery<TEntity> instead.")]
+    public ReadEmailTemplateQueryHandler(IMapper mapper, IEmailTemplateRepository repository)
+    {
+        _mapper = mapper;
+        _repository = repository;
+    }
+
+    /// <summary>
+    /// 
+    /// </summary>
+    /// <param name="request"></param>
+    /// <param name="cancellationToken"></param>
+    /// <returns></returns>
+    /// <exception cref="InvalidOperationException"></exception>
+    [Obsolete("Use IRepository")]
+    public async Task<ReadEmailTemplateResponse?> Handle(ReadEmailTemplateQuery request, CancellationToken cancellationToken)
+    {
+        var temp = request.Id is int id
+            ? await _repository.ReadByIdAsync(id)
+            : request.Type is EmailTemplateType type
+                ? await _repository.ReadByNameAsync(type)
+                : throw new InvalidOperationException("Either a valid integer ID or a valid EmailTemplateType must be provided in the request.");
+
+        var res = _mapper.Map<ReadEmailTemplateResponse>(temp);
+
+        return res;
+    }
+}

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

@@ -0,0 +1,37 @@
+namespace EnvelopeGenerator.Application.EmailTemplates.Queries.Read;
+
+/// <summary>
+/// Stellt die Antwort für eine Abfrage von E-Mail-Vorlagen bereit.
+/// </summary>
+public class ReadEmailTemplateResponse
+{
+    /// <summary>
+    /// Die eindeutige Kennung der E-Mail-Vorlage.
+    /// </summary>
+    public int Id { get; set; }
+
+    /// <summary>
+    /// Name des Typs
+    /// </summary>
+    public required string Name { get; set; }
+
+    /// <summary>
+    /// Das Datum und die Uhrzeit, wann die Vorlage hinzugefügt wurde.
+    /// </summary>
+    public DateTime AddedWhen { get; set; }
+
+    /// <summary>
+    /// Der Inhalt (Body) der E-Mail-Vorlage. Kann null sein.
+    /// </summary>
+    public string? Body { get; set; }
+
+    /// <summary>
+    /// Der Betreff der E-Mail-Vorlage. Kann null sein.
+    /// </summary>
+    public string? Subject { get; set; }
+
+    /// <summary>
+    /// Das Datum und die Uhrzeit, wann die Vorlage zuletzt geändert wurde. Kann null sein.
+    /// </summary>
+    public DateTime? ChangedWhen { get; set; }
+}

EnvelopeGenerator.Application/EmailTemplates/Queries/ReadEmailTemplateQuery.cs

@@ -1,78 +0,0 @@
-using AutoMapper;
-using MediatR;
-using EnvelopeGenerator.Application.Common.Dto;
-using DigitalData.Core.Abstraction.Application.Repository;
-using EnvelopeGenerator.Domain.Entities;
-using Microsoft.EntityFrameworkCore;
-using EnvelopeGenerator.Domain.Constants;
-using DigitalData.Core.Exceptions;
-
-namespace EnvelopeGenerator.Application.EmailTemplates.Queries;
-
-/// <summary>
-/// Stellt eine Abfrage dar, um eine E-Mail-Vorlage zu lesen.
-/// Diese Klasse erbt von <see cref="IEmailTemplateQuery"/>.
-/// </summary>
-public record ReadEmailTemplateQuery : IEmailTemplateQuery, IRequest<EmailTemplateDto>
-{
-    /// <summary>
-    /// Die eindeutige Kennung der E-Mail-Vorlage (optional).
-    /// </summary>
-    public int? Id { get; set; }
-
-    /// <summary>
-    /// Der Typ der E-Mail-Vorlage, z. B. <see cref="EmailTemplateType"/> (optional). Beispiele:<br/>
-    /// 0 - DocumentReceived: Benachrichtigung über den Empfang eines Dokuments.<br/>
-    /// 1 - DocumentSigned: Benachrichtigung über die Unterzeichnung eines Dokuments.<br/>
-    /// 2 - DocumentDeleted: Benachrichtigung über das Löschen eines Dokuments.<br/>
-    /// 3 - DocumentCompleted: Benachrichtigung über den Abschluss eines Dokuments.<br/>
-    /// 4 - DocumentAccessCodeReceived: Benachrichtigung über den Erhalt eines Zugangscodes.<br/>
-    /// 5 - DocumentShared: Benachrichtigung über das Teilen eines Dokuments.<br/>
-    /// 6 - TotpSecret: Benachrichtigung über ein TOTP-Geheimnis.<br/>
-    /// 7 - DocumentRejected_ADM (für den Absender): Mail an den Absender, wenn das Dokument abgelehnt wird.<br/>
-    /// 8 - DocumentRejected_REC (für den ablehnenden Empfänger): Mail an den ablehnenden Empfänger, wenn das Dokument abgelehnt wird.<br/>
-    /// 9 - DocumentRejected_REC_2 (für sonstige Empfänger): Mail an andere Empfänger (Brief), wenn das Dokument abgelehnt wird.
-    /// </summary>
-    public EmailTemplateType? Type { get; set; }
-}
-
-/// <summary>
-/// 
-/// </summary>
-public class ReadEmailTemplateQueryHandler : IRequestHandler<ReadEmailTemplateQuery, EmailTemplateDto>
-{
-    private readonly IMapper _mapper;
-
-    private readonly IRepository<EmailTemplate> _repo;
-
-    /// <summary>
-    /// Initialisiert eine neue Instanz der <see cref="EmailTemplateController"/>-Klasse.
-    /// </summary>
-    /// <param name="mapper">
-    /// <param name="repo">
-    /// Die AutoMapper-Instanz, die zum Zuordnen von Objekten verwendet wird.
-    /// </param>
-    public ReadEmailTemplateQueryHandler(IMapper mapper, IRepository<EmailTemplate> repo)
-    {
-        _mapper = mapper;
-        _repo = repo;
-    }
-
-    /// <summary>
-    /// 
-    /// </summary>
-    /// <param name="request"></param>
-    /// <param name="cancel"></param>
-    /// <returns></returns>
-    /// <exception cref="InvalidOperationException"></exception>
-    public async Task<EmailTemplateDto> Handle(ReadEmailTemplateQuery request, CancellationToken cancel)
-    {
-        var query = request.Id is int id
-            ? _repo.Query.Where(temp => temp.Id == id)
-            : _repo.Query.Where(temp => temp.Name == request.Type!.ToString());
-
-        var entity = await query.FirstOrDefaultAsync(cancel) ?? throw new NotFoundException();
-
-        return _mapper.Map<EmailTemplateDto>(entity);
-    }
-}

EnvelopeGenerator.Application/EnvelopeGenerator.Application.csproj

@@ -14,7 +14,7 @@
 
 	<ItemGroup>
 		<PackageReference Include="Dapper" Version="2.1.66" />
-		<PackageReference Include="DigitalData.Core.Abstraction.Application" Version="1.6.0" />
+		<PackageReference Include="DigitalData.Core.Abstraction.Application" Version="1.4.0" />
 		<PackageReference Include="DigitalData.Core.Application" Version="3.4.0" />
 		<PackageReference Include="DigitalData.Core.Client" Version="2.1.0" />
 		<PackageReference Include="DigitalData.Core.Exceptions" Version="1.1.0" />

EnvelopeGenerator.Application/EnvelopeReceivers/Queries/ReadEnvelopeReceiverQuery.cs

@@ -1,4 +1,4 @@
-using AutoMapper;
+using AutoMapper;
 using DigitalData.Core.Abstraction.Application.Repository;
 using DigitalData.Core.Exceptions;
 using EnvelopeGenerator.Application.Envelopes.Queries;
@@ -47,13 +47,7 @@ namespace EnvelopeGenerator.Application.EnvelopeReceivers.Queries;
 /// Die Antwort enthält Details wie den Include, die Zuordnung zwischen Umschlag und Empfänger 
 /// sowie zusätzliche Metadaten.
 /// </remarks>
-public record ReadEnvelopeReceiverQuery : EnvelopeReceiverQueryBase<ReadEnvelopeQuery, ReadReceiverQuery>, IRequest<IEnumerable<EnvelopeReceiverDto>>
-{
-    /// <summary>
-    /// Optionaler Benutzernamefilter, um Ergebnisse auf Umschläge eines bestimmten Besitzers einzuschränken.
-    /// </summary>
-    public string? Username { get; init; }
-}
+public record ReadEnvelopeReceiverQuery : EnvelopeReceiverQueryBase<ReadEnvelopeQuery, ReadReceiverQuery>, IRequest<IEnumerable<EnvelopeReceiverDto>>;
 
 /// <summary>
 /// 
@@ -67,11 +61,10 @@ public static class Extensions
     /// <param name="key"></param>
     /// <param name="cancel"></param>
     /// <returns></returns>
-    public static async Task<EnvelopeReceiverDto?> ReadEnvelopeReceiverAsync(this IMediator mediator, string key, CancellationToken cancel = default)
+    public static Task<EnvelopeReceiverDto?> ReadEnvelopeReceiverAsync(this IMediator mediator, string key, CancellationToken cancel = default)
     {
         var q = new ReadEnvelopeReceiverQuery() { Key = key };
-        var envRcvs = await mediator.Send(q, cancel);
-        return envRcvs.FirstOrDefault();
+        return mediator.Send(q, cancel).Then(envRcvs => envRcvs.FirstOrDefault());
     }
 
     /// <summary>
@@ -82,82 +75,80 @@ public static class Extensions
     /// <param name="signature"></param>
     /// <param name="cancel"></param>
     /// <returns></returns>
-    public static async Task<EnvelopeReceiverDto?> ReadEnvelopeReceiverAsync(this IMediator mediator, string uuid, string signature, CancellationToken cancel = default)
+    public static Task<EnvelopeReceiverDto?> ReadEnvelopeReceiverAsync(this IMediator mediator, string uuid, string signature, CancellationToken cancel = default)
     {
         var q = new ReadEnvelopeReceiverQuery();
         q.Envelope.Uuid = uuid;
         q.Receiver.Signature = signature;
-        var envRcvs = await mediator.Send(q, cancel);
-        return envRcvs.FirstOrDefault();
+        return mediator.Send(q, cancel).Then(envRcvs => envRcvs.FirstOrDefault());
     }
+}
+
+/// <summary>
+/// 
+/// </summary>
+public class ReadEnvelopeReceiverQueryHandler : IRequestHandler<ReadEnvelopeReceiverQuery, IEnumerable<EnvelopeReceiverDto>>
+{
+    private readonly IRepository<EnvelopeReceiver> _repo;
+
+    private readonly IRepository<Receiver> _rcvRepo;
+
+    private readonly IMapper _mapper;
+
     /// <summary>
-    /// Verarbeitet <see cref="ReadEnvelopeReceiverQuery"/> und liefert passende <see cref="EnvelopeReceiverDto"/>-Ergebnisse.
+    /// 
     /// </summary>
-    public class ReadEnvelopeReceiverQueryHandler : IRequestHandler<ReadEnvelopeReceiverQuery, IEnumerable<EnvelopeReceiverDto>>
+    /// <param name="envelopeReceiver"></param>
+    /// <param name="mapper"></param>
+    public ReadEnvelopeReceiverQueryHandler(IRepository<EnvelopeReceiver> envelopeReceiver, IRepository<Receiver> rcvRepo, IMapper mapper)
     {
-        private readonly IRepository<EnvelopeReceiver> _repo;
-        private readonly IRepository<Receiver> _rcvRepo;
-        private readonly IMapper _mapper;
-
-        /// <summary>
-        /// 
-        /// </summary>
-        /// <param name="envelopeReceiver"></param>
-        /// <param name="rcvRepo"></param>
-        /// <param name="mapper"></param>
-        public ReadEnvelopeReceiverQueryHandler(IRepository<EnvelopeReceiver> envelopeReceiver, IRepository<Receiver> rcvRepo, IMapper mapper)
-        {
-            _repo = envelopeReceiver;
-            _mapper = mapper;
-            _rcvRepo = rcvRepo;
-        }
-
-        /// <summary>
-        /// 
-        /// </summary>
-        /// <param name="request"></param>
-        /// <param name="cancel"></param>
-        /// <returns></returns>
-        /// <exception cref="BadRequestException"></exception>
-        public async Task<IEnumerable<EnvelopeReceiverDto>> Handle(ReadEnvelopeReceiverQuery request, CancellationToken cancel)
-        {
-            var q = _repo.Query.Where(request, notnull: false);
-
-            if (request.Username is string username)
-                q = q.Where(er => er.Envelope!.User.Username == username);
-
-            if (request.Envelope.Status is not null)
-            {
-                var status = request.Envelope.Status;
-                if (status.Min is not null)
-                    q = q.Where(er => er.Envelope!.Status >= status.Min);
-
-                if (status.Max is not null)
-                    q = q.Where(er => er.Envelope!.Status <= status.Max);
-
-                if (status.Include?.Length > 0)
-                    q = q.Where(er => status.Include.Contains(er.Envelope!.Status));
-
-                if (status.Ignore is not null)
-                    q = q.Where(er => !status.Ignore.Contains(er.Envelope!.Status));
-            }
-
-            var envRcvs = await q
-                            .Include(er => er.Envelope).ThenInclude(e => e!.Documents!).ThenInclude(d => d.Elements)
-                            .Include(er => er.Envelope).ThenInclude(e => e!.Histories)
-                            .Include(er => er.Envelope).ThenInclude(e => e!.User)
-                            .Include(er => er.Receiver)
-                            .ToListAsync(cancel);
-
-            if (request.Receiver.HasAnyCriteria && envRcvs.Count != 0)
-            {
-                var receiver = await _rcvRepo.Query.Where(request.Receiver).FirstAsync(cancel);
-
-                foreach (var envRcv in envRcvs)
-                    envRcv.Envelope?.Documents?.FirstOrDefault()?.Elements?.RemoveAll(s => s.ReceiverId != receiver.Id);
-            }
-
-            return _mapper.Map<List<EnvelopeReceiverDto>>(envRcvs);
-        }
+        _repo = envelopeReceiver;
+        _mapper = mapper;
+        _rcvRepo = rcvRepo;
     }
-}
+
+    /// <summary>
+    /// 
+    /// </summary>
+    /// <param name="request"></param>
+    /// <param name="cancel"></param>
+    /// <returns></returns>
+    /// <exception cref="BadRequestException"></exception>
+    public async Task<IEnumerable<EnvelopeReceiverDto>> Handle(ReadEnvelopeReceiverQuery request, CancellationToken cancel)
+    {
+        var q = _repo.ReadOnly().Where(request, notnull: false);
+
+        if (request.Envelope.Status is not null)
+        {
+            var status = request.Envelope.Status;
+            if (status.Min is not null)
+                q = q.Where(er => er.Envelope!.Status >= status.Min);
+
+            if (status.Max is not null)
+                q = q.Where(er => er.Envelope!.Status <= status.Max);
+
+            if (status.Include?.Length > 0)
+                q = q.Where(er => status.Include.Contains(er.Envelope!.Status));
+
+            if (status.Ignore is not null)
+                q = q.Where(er => !status.Ignore.Contains(er.Envelope!.Status));
+        }
+
+        var envRcvs = await q
+                        .Include(er => er.Envelope).ThenInclude(e => e!.Documents!).ThenInclude(d => d.Elements)
+                        .Include(er => er.Envelope).ThenInclude(e => e!.Histories)
+                        .Include(er => er.Envelope).ThenInclude(e => e!.User)
+                        .Include(er => er.Receiver)
+                        .ToListAsync(cancel);
+
+        if (request.Receiver.HasAnyCriteria && envRcvs.Any())
+        {
+            var receiver = await _rcvRepo.ReadOnly().Where(request.Receiver).FirstAsync(cancel);
+
+            foreach (var envRcv in envRcvs)
+                envRcv.Envelope?.Documents?.First().Elements.RemoveAll(s => s.ReceiverId != receiver.Id);
+        }
+
+        return _mapper.Map<List<EnvelopeReceiverDto>>(envRcvs);
+    }
+} 

EnvelopeGenerator.Application/EnvelopeReceivers/Queries/ReceiverAlreadySignedQuery.cs

@@ -68,6 +68,6 @@ public class ReceiverAlreadySignedQueryHandler : IRequestHandler<ReceiverAlready
     /// <returns></returns>
     public async Task<bool> Handle(ReceiverAlreadySignedQuery request, CancellationToken cancel = default)
     {
-        return await _repo.Query.Where(request).Where(h => h.Status == EnvelopeStatus.DocumentSigned).AnyAsync(cancel);
+        return await _repo.ReadOnly().Where(request).Where(h => h.Status == EnvelopeStatus.DocumentSigned).AnyAsync(cancel);
     }
 }

EnvelopeGenerator.Application/EnvelopeTypes/Queries/ReadEnvelopeTypesQuery.cs

@@ -1,45 +0,0 @@
-using EnvelopeGenerator.Application.Common.Dto;
-using MediatR;
-using AutoMapper;
-using DigitalData.Core.Abstraction.Application.Repository;
-using EnvelopeGenerator.Domain.Entities;
-using Microsoft.EntityFrameworkCore;
-
-namespace EnvelopeGenerator.Application.EnvelopeTypes.Queries;
-
-/// <summary>
-/// 
-/// </summary>
-public record ReadEnvelopeTypesQuery : IRequest<IEnumerable<EnvelopeTypeDto>>;
-
-/// <summary>
-/// 
-/// </summary>
-public class ReadEnvelopeTypesQueryHandler : IRequestHandler<ReadEnvelopeTypesQuery, IEnumerable<EnvelopeTypeDto>>
-{
-    private readonly IRepository<EnvelopeType> _repository;
-    private readonly IMapper _mapper;
-
-    /// <summary>
-    /// 
-    /// </summary>
-    /// <param name="repository"></param>
-    /// <param name="mapper"></param>
-    public ReadEnvelopeTypesQueryHandler(IRepository<EnvelopeType> repository, IMapper mapper)
-    {
-        _repository = repository;
-        _mapper = mapper;
-    }
-
-    /// <summary>
-    /// 
-    /// </summary>
-    /// <param name="request"></param>
-    /// <param name="cancellationToken"></param>
-    /// <returns></returns>
-    public async Task<IEnumerable<EnvelopeTypeDto>> Handle(ReadEnvelopeTypesQuery request, CancellationToken cancellationToken)
-    {
-        var types = await _repository.Query.ToListAsync(cancellationToken);
-        return _mapper.Map<IEnumerable<EnvelopeTypeDto>>(types);
-    }
-}

EnvelopeGenerator.Application/Envelopes/Commands/CreateEnvelopeCommand.cs

@@ -33,18 +33,7 @@ public record CreateEnvelopeCommand : IRequest<EnvelopeDto?>
     /// <summary>
     /// ID des Absenders
     /// </summary>
-    internal int UserId { get; private set; }
-
-    /// <summary>
-    /// 
-    /// </summary>
-    /// <param name="userId"></param>
-    /// <returns></returns>
-    public bool Authorize(int userId)
-    {
-        UserId = userId;
-        return true;
-    }
+    public int UserId { get; set; }
 
     /// <summary>
     /// Determines which component is used for envelope processing.

EnvelopeGenerator.Application/Envelopes/Queries/ReadEnvelopeQuery.cs

@@ -1,33 +1,18 @@
 using MediatR;
 using EnvelopeGenerator.Domain.Constants;
 using EnvelopeGenerator.Application.Common.Query;
-using EnvelopeGenerator.Application.Common.Dto;
-using AutoMapper;
-using DigitalData.Core.Abstraction.Application.Repository;
-using EnvelopeGenerator.Domain.Entities;
-using Microsoft.EntityFrameworkCore;
 
 namespace EnvelopeGenerator.Application.Envelopes.Queries;
 
 /// <summary>
 /// Repräsentiert eine Abfrage für Umschläge.
 /// </summary>
-public record ReadEnvelopeQuery : EnvelopeQueryBase, IRequest<IEnumerable<EnvelopeDto>>
+public record ReadEnvelopeQuery : EnvelopeQueryBase, IRequest
 {
     /// <summary>
     /// Abfrage des Include des Umschlags
     /// </summary>
     public EnvelopeStatusQuery? Status { get; init; }
-
-    /// <summary>
-    /// Optionaler Benutzerfilter; wenn gesetzt, werden nur Umschläge des Benutzers geladen.
-    /// </summary>
-    public int? UserId { get; init; }
-
-    /// <summary>
-    /// Setzt den Benutzerkontext für die Abfrage.
-    /// </summary>
-    public ReadEnvelopeQuery Authorize(int userId) => this with { UserId = userId };
 }
 
 /// <summary>
@@ -80,62 +65,4 @@ public record EnvelopeStatusQuery
     /// Eine Liste von Statuswerten, die ignoriert werden werden.
     /// </summary>
     public EnvelopeStatus[]? Ignore { get; init; }
-}
-
-/// <summary>
-/// Verarbeitet <see cref="ReadEnvelopeQuery"/> und liefert passende <see cref="EnvelopeDto"/>-Ergebnisse.
-/// </summary>
-public class ReadEnvelopeQueryHandler : IRequestHandler<ReadEnvelopeQuery, IEnumerable<EnvelopeDto>>
-{
-    private readonly IRepository<Envelope> _repository;
-    private readonly IMapper _mapper;
-
-    /// <summary>
-    /// 
-    /// </summary>
-    /// <param name="repository"></param>
-    /// <param name="mapper"></param>
-    public ReadEnvelopeQueryHandler(IRepository<Envelope> repository, IMapper mapper)
-    {
-        _repository = repository;
-        _mapper = mapper;
-    }
-
-    /// <summary>
-    /// 
-    /// </summary>
-    /// <param name="request"></param>
-    /// <param name="cancel"></param>
-    /// <returns></returns>
-    public async Task<IEnumerable<EnvelopeDto>> Handle(ReadEnvelopeQuery request, CancellationToken cancel)
-    {
-        var query = _repository.Query;
-
-        if (request.UserId is int userId)
-            query = query.Where(e => e.UserId == userId);
-
-        if (request.Id is int id)
-            query = query.Where(e => e.Id == id);
-
-        if (request.Uuid is string uuid)
-            query = query.Where(e => e.Uuid == uuid);
-
-        if (request.Status is { } status)
-        {
-            if (status.Min is not null)
-                query = query.Where(e => e.Status >= status.Min);
-            if (status.Max is not null)
-                query = query.Where(e => e.Status <= status.Max);
-            if (status.Include?.Length > 0)
-                query = query.Where(e => status.Include.Contains(e.Status));
-            if (status.Ignore?.Length > 0)
-                query = query.Where(e => !status.Ignore.Contains(e.Status));
-        }
-
-        var envelopes = await query
-            .Include(e => e.Documents)
-            .ToListAsync(cancel);
-
-        return _mapper.Map<IEnumerable<EnvelopeDto>>(envelopes);
-    }
 }

EnvelopeGenerator.Application/Envelopes/Queries/ReadReceiverNameQuery.cs

@@ -1,8 +1,4 @@
-using DigitalData.Core.Abstraction.Application.Repository;
-using EnvelopeGenerator.Application.Common.Query;
-using MediatR;
-using EnvelopeGenerator.Domain.Entities;
-using Microsoft.EntityFrameworkCore;
+using EnvelopeGenerator.Application.Receivers.Queries;
 
 namespace EnvelopeGenerator.Application.Envelopes.Queries;
 
@@ -10,54 +6,6 @@ namespace EnvelopeGenerator.Application.Envelopes.Queries;
 /// Eine Abfrage, um die zuletzt verwendete Anrede eines Empfängers zu ermitteln, 
 /// damit diese für zukünftige Umschläge wiederverwendet werden kann.
 /// </summary>
-public record ReadReceiverNameQuery() : ReceiverQueryBase, IRequest<string?>;
-
-/// <summary>
-/// 
-/// </summary>
-public class ReadReceiverNameQueryHandler : IRequestHandler<ReadReceiverNameQuery, string?>
+public record ReadReceiverNameQuery() : ReadReceiverQuery
 {
-    private readonly IRepository<EnvelopeReceiver> _envelopeReceiverRepository;
-    private readonly IRepository<Receiver> _receiverRepository;
-
-    /// <summary>
-    /// 
-    /// </summary>
-    /// <param name="envelopeReceiverRepository"></param>
-    /// <param name="receiverRepository"></param>
-    public ReadReceiverNameQueryHandler(IRepository<EnvelopeReceiver> envelopeReceiverRepository, IRepository<Receiver> receiverRepository)
-    {
-        _envelopeReceiverRepository = envelopeReceiverRepository;
-        _receiverRepository = receiverRepository;
-    }
-
-    /// <summary>
-    /// 
-    /// </summary>
-    /// <param name="request"></param>
-    /// <param name="cancellationToken"></param>
-    /// <returns></returns>
-    public async Task<string?> Handle(ReadReceiverNameQuery request, CancellationToken cancellationToken)
-    {
-        var receiverQuery = _receiverRepository.Query.AsNoTracking();
-
-        if (request.Id is int id)
-            receiverQuery = receiverQuery.Where(r => r.Id == id);
-        if (request.EmailAddress is string email)
-            receiverQuery = receiverQuery.Where(r => r.EmailAddress == email);
-        if (request.Signature is string signature)
-            receiverQuery = receiverQuery.Where(r => r.Signature == signature);
-
-        var receiver = await receiverQuery.FirstOrDefaultAsync(cancellationToken);
-        if (receiver is null)
-            return null;
-
-        var erName = await _envelopeReceiverRepository.Query
-            .Where(er => er.ReceiverId == receiver.Id)
-            .OrderByDescending(er => er.AddedWhen)
-            .Select(er => er.Name)
-            .FirstOrDefaultAsync(cancellationToken);
-
-        return erName;
-    }
-}
+}

EnvelopeGenerator.Application/Histories/Commands/CreateHistoryCommand.cs

@@ -82,7 +82,7 @@ public class CreateHistoryCommandHandler : IRequestHandler<CreateHistoryCommand,
         if(request.UserReference is null)
         {
             var receivers = await _erRepo
-                .Query
+                .ReadOnly()
                 .Where(request)
                 .Include(er => er.Receiver)
                 .ToListAsync(cancel);

EnvelopeGenerator.Application/Receivers/Commands/CreateReceiverCommand.cs

@@ -67,7 +67,6 @@ public class CreateReceiverCommandHandler : IRequestHandler<CreateReceiverComman
     /// 
     /// </summary>
     /// <param name="repo"></param>
-    /// <param name="mapper"></param>
     public CreateReceiverCommandHandler(IRepository<Receiver> repo, IMapper mapper)
     {
         _repo = repo;
@@ -82,7 +81,7 @@ public class CreateReceiverCommandHandler : IRequestHandler<CreateReceiverComman
     /// <returns></returns>
     public async Task<(ReceiverDto Receiver, bool AlreadyExists)> Handle(CreateReceiverCommand request, CancellationToken cancel)
     {
-        var receiver = await _repo.Query
+        var receiver = await _repo.ReadOnly()
             .Where(r => r.EmailAddress == request.EmailAddress)
             .SingleOrDefaultAsync(cancel);
 

EnvelopeGenerator.Application/Receivers/Queries/ReadReceiverQuery.cs

@@ -1,10 +1,4 @@
-using AutoMapper;
-using DigitalData.Core.Abstraction.Application.Repository;
-using EnvelopeGenerator.Application.Common.Dto.Receiver;
-using EnvelopeGenerator.Application.Common.Query;
-using MediatR;
-using EnvelopeGenerator.Domain.Entities;
-using Microsoft.EntityFrameworkCore;
+using EnvelopeGenerator.Application.Common.Query;
 
 namespace EnvelopeGenerator.Application.Receivers.Queries;
 
@@ -12,53 +6,4 @@ namespace EnvelopeGenerator.Application.Receivers.Queries;
 /// Stellt eine Abfrage dar, um die Details eines Empfängers zu lesen.
 /// um spezifische Informationen über einen Empfänger abzurufen.
 /// </summary>
-public record ReadReceiverQuery : ReceiverQueryBase, IRequest<IEnumerable<ReceiverDto>>;
-
-/// <summary>
-/// 
-/// </summary>
-public class ReadReceiverQueryHandler : IRequestHandler<ReadReceiverQuery, IEnumerable<ReceiverDto>>
-{
-    private readonly IRepository<Receiver> _repository;
-    private readonly IMapper _mapper;
-
-    /// <summary>
-    /// 
-    /// </summary>
-    /// <param name="repository"></param>
-    /// <param name="mapper"></param>
-    public ReadReceiverQueryHandler(IRepository<Receiver> repository, IMapper mapper)
-    {
-        _repository = repository;
-        _mapper = mapper;
-    }
-
-    /// <summary>
-    /// 
-    /// </summary>
-    /// <param name="request"></param>
-    /// <param name="cancellationToken"></param>
-    /// <returns></returns>
-    public async Task<IEnumerable<ReceiverDto>> Handle(ReadReceiverQuery request, CancellationToken cancellationToken)
-    {
-        var query = _repository.Query;
-
-        if (request.Id is int id)
-        {
-            query = query.Where(r => r.Id == id);
-        }
-
-        if (request.EmailAddress is string email)
-        {
-            query = query.Where(r => r.EmailAddress == email);
-        }
-
-        if (request.Signature is string signature)
-        {
-            query = query.Where(r => r.Signature == signature);
-        }
-
-        var receiver = await query.ToListAsync(cancellationToken);
-        return _mapper.Map<IEnumerable<ReceiverDto>>(receiver);
-    }
-}
+public record ReadReceiverQuery : ReceiverQueryBase;

EnvelopeGenerator.BBTests/EnvelopeGenerator.BBTests.vbproj

@@ -70,8 +70,8 @@
     <Reference Include="DigitalData.Controls.DocumentViewer, Version=1.9.8.0, Culture=neutral, processorArchitecture=MSIL">
       <HintPath>..\packages\DigitalData.Controls.DocumentViewer.1.9.8\lib\net462\DigitalData.Controls.DocumentViewer.dll</HintPath>
     </Reference>
-    <Reference Include="DigitalData.Core.Abstraction.Application, Version=1.6.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\DigitalData.Core.Abstraction.Application.1.6.0\lib\net462\DigitalData.Core.Abstraction.Application.dll</HintPath>
+    <Reference Include="DigitalData.Core.Abstraction.Application, Version=1.4.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\DigitalData.Core.Abstraction.Application.1.4.0\lib\net462\DigitalData.Core.Abstraction.Application.dll</HintPath>
     </Reference>
     <Reference Include="DigitalData.Core.Abstractions, Version=4.3.0.0, Culture=neutral, processorArchitecture=MSIL">
       <HintPath>..\packages\DigitalData.Core.Abstractions.4.3.0\lib\net462\DigitalData.Core.Abstractions.dll</HintPath>
@@ -109,6 +109,9 @@
     <Reference Include="EntityFramework.SqlServer, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL">
       <HintPath>..\packages\EntityFramework.6.5.1\lib\net45\EntityFramework.SqlServer.dll</HintPath>
     </Reference>
+    <Reference Include="EnvelopeGenerator.CommonServices">
+      <HintPath>..\EnvelopeGenerator.CommonServices\bin\Debug\EnvelopeGenerator.CommonServices.dll</HintPath>
+    </Reference>
     <Reference Include="FirebirdSql.Data.FirebirdClient, Version=7.5.0.0, Culture=neutral, PublicKeyToken=3750abcc3150b00c, processorArchitecture=MSIL">
       <HintPath>..\packages\FirebirdSql.Data.FirebirdClient.7.5.0\lib\net452\FirebirdSql.Data.FirebirdClient.dll</HintPath>
     </Reference>
@@ -463,12 +466,8 @@
       <Project>{6EA0C51F-C2B1-4462-8198-3DE0B32B74F8}</Project>
       <Name>EnvelopeGenerator.CommonServices</Name>
     </ProjectReference>
-    <ProjectReference Include="..\EnvelopeGenerator.CommonServices\EnvelopeGenerator.CommonServices.vbproj">
-      <Project>{6ea0c51f-c2b1-4462-8198-3de0b32b74f8}</Project>
-      <Name>EnvelopeGenerator.CommonServices</Name>
-    </ProjectReference>
     <ProjectReference Include="..\EnvelopeGenerator.Domain\EnvelopeGenerator.Domain.csproj">
-      <Project>{4f32a98d-e6f0-4a09-bd97-1cf26107e837}</Project>
+      <Project>{4F32A98D-E6F0-4A09-BD97-1CF26107E837}</Project>
       <Name>EnvelopeGenerator.Domain</Name>
     </ProjectReference>
     <ProjectReference Include="..\EnvelopeGenerator.Infrastructure\EnvelopeGenerator.Infrastructure.csproj">
@@ -496,9 +495,6 @@
     <Content Include="MailLicense.xml" />
     <Content Include="README.txt" />
   </ItemGroup>
-  <ItemGroup>
-    <WCFMetadata Include="Connected Services\" />
-  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.VisualBasic.targets" />
   <Import Project="..\packages\GdPicture.runtimes.windows.14.3.3\build\net462\GdPicture.runtimes.windows.targets" Condition="Exists('..\packages\GdPicture.runtimes.windows.14.3.3\build\net462\GdPicture.runtimes.windows.targets')" />
   <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">

EnvelopeGenerator.BBTests/packages.config

@@ -3,7 +3,7 @@
   <package id="AutoMapper" version="10.1.1" targetFramework="net462" />
   <package id="BouncyCastle.Cryptography" version="2.5.0" targetFramework="net462" />
   <package id="DigitalData.Controls.DocumentViewer" version="1.9.8" targetFramework="net462" />
-  <package id="DigitalData.Core.Abstraction.Application" version="1.6.0" targetFramework="net462" />
+  <package id="DigitalData.Core.Abstraction.Application" version="1.4.0" targetFramework="net462" />
   <package id="DigitalData.Core.Abstractions" version="4.3.0" targetFramework="net462" />
   <package id="DigitalData.Modules.Base" version="1.3.8" targetFramework="net462" />
   <package id="DigitalData.Modules.Config" version="1.3.0" targetFramework="net462" />

EnvelopeGenerator.CommonServices/EnvelopeGenerator.CommonServices.vbproj

@@ -72,8 +72,8 @@
     <Reference Include="DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
     <Reference Include="DevExpress.XtraGauges.v21.2.Core, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
     <Reference Include="DevExpress.XtraReports.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
-    <Reference Include="DigitalData.Core.Abstraction.Application, Version=1.6.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\DigitalData.Core.Abstraction.Application.1.6.0\lib\net462\DigitalData.Core.Abstraction.Application.dll</HintPath>
+    <Reference Include="DigitalData.Core.Abstraction.Application, Version=1.4.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\DigitalData.Core.Abstraction.Application.1.4.0\lib\net462\DigitalData.Core.Abstraction.Application.dll</HintPath>
     </Reference>
     <Reference Include="DigitalData.Core.Abstractions, Version=4.3.0.0, Culture=neutral, processorArchitecture=MSIL">
       <HintPath>..\packages\DigitalData.Core.Abstractions.4.3.0\lib\net462\DigitalData.Core.Abstractions.dll</HintPath>

EnvelopeGenerator.CommonServices/Jobs/FinalizeDocument/FinalizeDocumentJob.vb

@@ -422,7 +422,7 @@ Namespace Jobs
         End Function
 
         Private Function GetEnvelopeData(pEnvelopeId As Integer) As EnvelopeData
-            Dim oSql = $"SELECT T.GUID, T.ENVELOPE_UUID, T.ENVELOPE_TYPE, T2.FILEPATH, T2.BYTE_DATA FROM [dbo].[TBSIG_ENVELOPE] T
+            Dim oSql = $"SELECT T.GUID, T.ENVELOPE_UUID,T2.FILEPATH, T2.BYTE_DATA FROM [dbo].[TBSIG_ENVELOPE] T
                 JOIN TBSIG_ENVELOPE_DOCUMENT T2 ON T.GUID = T2.ENVELOPE_ID
                 WHERE T.GUID = {pEnvelopeId}"
             Dim oTable As DataTable = Database.GetDatatable(oSql)

EnvelopeGenerator.CommonServices/Jobs/FinalizeDocument/PDFBurner.vb

@@ -37,15 +37,6 @@ Namespace Jobs.FinalizeDocument
         Public Function BurnAnnotsToPDF(pSourceBuffer As Byte(), pInstantJSONList As List(Of String), envelopeId As Integer) As Byte()
             'read the elements of envelope with their annotations
             Using scope = Factory.Shared.ScopeFactory.CreateScope()
-
-                Dim envRepo = scope.ServiceProvider.Repository(Of Envelope)()
-                Dim envelope = envRepo.Where(Function(env) env.Id = envelopeId).FirstOrDefault()
-                If envelope Is Nothing Then
-                    Throw New BurnAnnotationException($"Envelope with Id {envelopeId} not found.")
-                ElseIf envelope.ReadOnly Then
-                    Return pSourceBuffer
-                End If
-
                 Dim sigRepo = scope.ServiceProvider.Repository(Of Signature)()
                 Dim elements = sigRepo _
                     .Where(Function(sig) sig.Document.EnvelopeId = envelopeId) _

EnvelopeGenerator.CommonServices/packages.config

@@ -2,7 +2,7 @@
 <packages>
   <package id="AutoMapper" version="10.1.1" targetFramework="net462" />
   <package id="BouncyCastle.Cryptography" version="2.5.0" targetFramework="net462" />
-  <package id="DigitalData.Core.Abstraction.Application" version="1.6.0" targetFramework="net462" />
+  <package id="DigitalData.Core.Abstraction.Application" version="1.4.0" targetFramework="net462" />
   <package id="DigitalData.Core.Abstractions" version="4.3.0" targetFramework="net462" />
   <package id="DigitalData.Modules.Base" version="1.3.8" targetFramework="net462" />
   <package id="DigitalData.Modules.Config" version="1.3.0" targetFramework="net462" />

EnvelopeGenerator.Domain/Constants/AuthPolicy.cs

@@ -1,15 +0,0 @@
-namespace EnvelopeGenerator.Domain.Constants
-{
-    public static class AuthPolicy
-    {
-        public const string SenderOrReceiver = nameof(SenderOrReceiver) + nameof(AuthPolicy);
-
-        public const string ReceiverOrReceiverTFA = nameof(ReceiverOrReceiverTFA) + nameof(AuthPolicy);
-
-        public const string Sender = nameof(Sender) + nameof(AuthPolicy);
-
-        public const string Receiver = nameof(Receiver) + nameof(AuthPolicy);
-
-        public const string ReceiverTFA = nameof(ReceiverTFA) + nameof(AuthPolicy);
-    }
-}

EnvelopeGenerator.Domain/Constants/ReceiverRole.cs

@@ -0,0 +1,8 @@
+namespace EnvelopeGenerator.Domain.Constants
+{
+    public static class ReceiverRole
+    {
+        public const string PreAuth = "PreAuth";
+        public const string FullyAuth = "FullyAuth";
+    }
+}

EnvelopeGenerator.Domain/Constants/Role.cs

@@ -1,23 +0,0 @@
-#if NETFRAMEWORK
-using System;
-#endif
-
-namespace EnvelopeGenerator.Domain.Constants
-{
-    public static class Role
-    {
-        [Obsolete("Use Receiver.TFA")]
-        public const string ReceiverTFA = Receiver.TFA;
-
-        [Obsolete("Use Receiver.Full")]
-        public const string ReceiverFull = Receiver.Full;
-
-        public static class Receiver
-        {
-            public const string TFA = "EGReceiverTFA";
-            public const string Full = "EGReceiver";
-        }
-
-        public const string Sender = "EGSender";
-    }
-}

EnvelopeGenerator.Domain/Entities/Config.cs

@@ -2,22 +2,30 @@
 using System.ComponentModel.DataAnnotations.Schema;
 
 namespace EnvelopeGenerator.Domain.Entities
-{
-    [Table("TBSIG_CONFIG", Schema = "dbo")]
-    public class Config
+#if NET
+    ;
+#elif NETFRAMEWORK
     {
-        [Column("SENDING_PROFILE", TypeName = "int")]
-        [Required]
-        public int SendingProfile { get; set; }
+#endif
 
-        [Column("SIGNATURE_HOST", TypeName = "nvarchar(128)")]
-        [Required]
-        public string SignatureHost { get; set; }
+[Table("TBSIG_CONFIG", Schema = "dbo")]
+public class Config
+{
+    [Column("SENDING_PROFILE", TypeName = "int")]
+    [Required]
+    public int SendingProfile { get; set; }
 
-        [Column("EXTERNAL_PROGRAM_NAME", TypeName = "nvarchar(30)")]
-        public string ExternalProgramName { get; set; }
+    [Column("SIGNATURE_HOST", TypeName = "nvarchar(128)")]
+    [Required]
+    public string SignatureHost { get; set; }
 
-        [Column("EXPORT_PATH", TypeName = "nvarchar(256)")]
-        public string ExportPath { get; set; }
+    [Column("EXTERNAL_PROGRAM_NAME", TypeName = "nvarchar(30)")]
+    public string ExternalProgramName { get; set; }
+
+    [Column("EXPORT_PATH", TypeName = "nvarchar(256)")]
+    public string ExportPath { get; set; }
+}
+
+#if NETFRAMEWORK
     }
-}
+#endif

EnvelopeGenerator.Domain/Entities/Document.cs

@@ -1,9 +1,6 @@
-using System;
-using EnvelopeGenerator.Domain.Interfaces;
+using EnvelopeGenerator.Domain.Interfaces;
 using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
-
-using EnvelopeGenerator.Domain.Interfaces.Auditing;
 #if NETFRAMEWORK
 using System.Drawing;
 using System.Collections.Generic;
@@ -11,77 +8,81 @@ using System.Linq;
 #endif
 
 namespace EnvelopeGenerator.Domain.Entities
-{
-    [Table("TBSIG_ENVELOPE_DOCUMENT", Schema = "dbo")]
-    public class Document : IHasEnvelope, IHasAddedWhen
+#if NET
+    ;
+#elif NETFRAMEWORK
+    {
+#endif
+
+[Table("TBSIG_ENVELOPE_DOCUMENT", Schema = "dbo")]
+public class Document : IHasEnvelope
+{
+    public Document()
     {
-        public Document()
-        {
 #if NETFRAMEWORK
-            Elements = Enumerable.Empty<Signature>().ToList();
-#endif
-        }
-
-        [Key]
-        [DatabaseGenerated(DatabaseGeneratedOption.Identity)]
-        [Column("GUID")]
-        public int Id { get; set; }
-
-        [Required]
-        [Column("ENVELOPE_ID")]
-        public int EnvelopeId { get; set; }
-#if NETFRAMEWORK
-            = 0;
-#endif
-
-        [Required]
-        [Column("ADDED_WHEN", TypeName = "datetime")]
-        public DateTime AddedWhen { get; set; }
-
-        [Column("BYTE_DATA", TypeName = "varbinary(max)")]
-        public byte[]
-#if nullable
-            ?
-#endif
-            ByteData { get; set; }
-
-        #region File
-        [Column("FILENAME", TypeName = "nvarchar(256)")]
-        public string Filename { get; set; }
-
-        [Column("FILEPATH", TypeName = "nvarchar(256)")]
-        public string Filepath { get; set; }
-
-        [Column("FILENAME_ORIGINAL", TypeName = "nvarchar(256)")]
-        public string
-#if nullable
-            ?
-#endif
-            FileNameOriginal { get; set; }
-        #endregion
-
-        public virtual List<Signature>
-#if nullable
-            ?
-#endif
-            Elements { get; set; }
-
-        [ForeignKey("EnvelopeId")]
-        public virtual Envelope
-#if nullable
-            ?
-#endif
-            Envelope { get; set; }
-
-#if NETFRAMEWORK
-        [NotMapped]
-        public bool IsTempFile { get; set; }
-
-        [NotMapped]
-        public Bitmap Thumbnail { get; set; }
-
-        [NotMapped]
-        public int PageCount { get; set; }
+        Elements = Enumerable.Empty<Signature>().ToList();
 #endif
     }
-}
+
+    [Key]
+    [DatabaseGenerated(DatabaseGeneratedOption.Identity)]
+    [Column("GUID")]
+    public int Id { get; set; }
+
+    [Required]
+    [Column("ENVELOPE_ID")]
+    public int EnvelopeId { get; set; }
+#if NETFRAMEWORK
+        = 0;
+#endif
+
+    [Column("BYTE_DATA", TypeName = "varbinary(max)")]
+    public byte[]
+#if NET
+        ?
+#endif
+        ByteData { get; set; }
+
+    #region File
+    [Column("FILENAME", TypeName = "nvarchar(256)")]
+    public string Filename { get; set; }
+
+    [Column("FILEPATH", TypeName = "nvarchar(256)")]
+    public string Filepath { get; set; }
+
+    [Column("FILENAME_ORIGINAL", TypeName = "nvarchar(256)")]
+    public string
+#if NET
+        ?
+#endif
+        FileNameOriginal { get; set; }
+    #endregion
+
+    public virtual List<Signature>
+#if NET
+        ?
+#endif
+        Elements { get; set; }
+
+    [ForeignKey("EnvelopeId")]
+    public virtual Envelope
+#if NET
+        ?
+#endif
+        Envelope { get; set; }
+
+#if NETFRAMEWORK
+    [NotMapped]
+    public bool IsTempFile { get; set; }
+
+    [NotMapped]
+    public Bitmap Thumbnail { get; set; }
+
+    [NotMapped]
+    public int PageCount { get; set; }
+#endif
+}
+
+#if NETFRAMEWORK
+    }
+#endif

EnvelopeGenerator.Domain/Entities/DocumentStatus.cs

@@ -1,62 +1,65 @@
-using System;
-using System.ComponentModel.DataAnnotations;
+using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
 using DigitalData.Core.Abstractions.Interfaces;
 using EnvelopeGenerator.Domain.Interfaces;
-using EnvelopeGenerator.Domain.Interfaces.Auditing;
+
+#if NETFRAMEWORK
+using System;
+#endif
 
 namespace EnvelopeGenerator.Domain.Entities
-{
-    [Table("TBSIG_DOCUMENT_STATUS", Schema = "dbo")]
-    public class DocumentStatus : IHasEnvelope, IHasReceiver, IEntity, IHasAddedWhen, IHasChangedWhen
+#if NET
+    ;
+#elif NETFRAMEWORK
     {
-        public DocumentStatus()
-        {
-            // TODO: * check Form Application and remove default value
+#endif
+
+[Table("TBSIG_DOCUMENT_STATUS", Schema = "dbo")]
+public class DocumentStatus : IHasEnvelope, IHasReceiver, IEntity
+{
+    public DocumentStatus()
+    {
+        // TODO: * check Form Application and remove default value
 #if NETFRAMEWORK
-            Status = Constants.DocumentStatus.Created;
+        Status = Constants.DocumentStatus.Created;
 #endif
-        }
+    }
 
-        [Key]
-        [DatabaseGenerated(DatabaseGeneratedOption.Identity)]
-        [Column("GUID")]
-        public int Id { get; set; }
+    [Key]
+    [DatabaseGenerated(DatabaseGeneratedOption.Identity)]
+    [Column("GUID")]
+    public int Id { get; set; }
 
-        [Required]
-        [Column("ENVELOPE_ID")]
-        public int EnvelopeId { get; set; }
+    [Required]
+    [Column("ENVELOPE_ID")]
+    public int EnvelopeId { get; set; }
 
-        [Required]
-        [Column("RECEIVER_ID")]
-        public int ReceiverId { get; set; }
+    [Required]
+    [Column("RECEIVER_ID")]
+    public int ReceiverId { get; set; }
 
-        [Required]
-        [Column("STATUS")]
-        public Constants.DocumentStatus Status { get; set; }
+    [Required]
+    [Column("STATUS")]
+    public Constants.DocumentStatus Status { get; set; }
 
-        [Required]
-        [Column("ADDED_WHEN", TypeName = "datetime")]
-        public DateTime AddedWhen { get; set; }
+    [Column("VALUE", TypeName = "nvarchar(max)")]
+    public string Value { get; set; }
 
-        [Column("CHANGED_WHEN", TypeName = "datetime")]
-        public DateTime? ChangedWhen { get; set; }
-
-        [Column("VALUE", TypeName = "nvarchar(max)")]
-        public string Value { get; set; }
-
-        [ForeignKey("EnvelopeId")]
-        public virtual Envelope
-#if nullable
-            ?
+    [ForeignKey("EnvelopeId")]
+    public virtual Envelope
+#if NET
+        ?
 #endif
-            Envelope { get; set; }
+        Envelope { get; set; }
 
-        [ForeignKey("ReceiverId")]
-        public virtual Receiver
-#if nullable
-            ?
+    [ForeignKey("ReceiverId")]
+    public virtual Receiver
+#if NET
+        ?
 #endif
             Receiver { get; set; }
+}
+
+#if NETFRAMEWORK
     }
-}
+#endif

EnvelopeGenerator.Domain/Entities/ElementAnnotation.cs

@@ -1,85 +1,92 @@
-using System;
-using System.ComponentModel.DataAnnotations;
+using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
-using EnvelopeGenerator.Domain.Interfaces.Auditing;
 #if NETFRAMEWORK
+using System;
 #endif
 
 namespace EnvelopeGenerator.Domain.Entities
-{
-    [Table("TBSIG_DOCUMENT_RECEIVER_ELEMENT_ANNOTATION")]
-    public class ElementAnnotation : IHasAddedWhen, IUpdateAuditable
+#if NET
+    ;
+#elif NETFRAMEWORK
     {
-        [Key]
-        [DatabaseGenerated(DatabaseGeneratedOption.Identity)]
-        [Column("GUID", TypeName = "bigint")]
-        public long Id { get; set; }
-
-        [Required]
-        [Column("ELEMENT_ID", TypeName = "int")]
-        public int ElementId { get; set; }
-
-        [Required]
-        [Column("NAME", TypeName = "nvarchar(100)")]
-        [StringLength(100)]
-        public string Name { get; set; }
-
-        [Required]
-        [Column("VALUE", TypeName = "nvarchar(max)")]
-        public string Value { get; set; }
-
-        [Required]
-        [Column("TYPE", TypeName = "nvarchar(50)")]
-        public string Type { get; set; }
-
-        [Column("POSITION_X", TypeName = "float")]
-        public double
-#if nullable
-            ?
 #endif
-            X { get; set; }
 
-        [Column("POSITION_Y", TypeName = "float")]
-        public double
-#if nullable
-            ?
+[Table("TBSIG_DOCUMENT_RECEIVER_ELEMENT_ANNOTATION")]
+public class ElementAnnotation
+{
+    [Key]
+    [DatabaseGenerated(DatabaseGeneratedOption.Identity)]
+    [Column("GUID", TypeName = "bigint")]
+    public long Id { get; set; }
+
+    [Required]
+    [Column("ELEMENT_ID", TypeName = "int")]
+    public int ElementId { get; set; }
+
+    [Required]
+    [Column("NAME", TypeName = "nvarchar(100)")]
+    [StringLength(100)]
+    public string Name { get; set; }
+
+    [Required]
+    [Column("VALUE", TypeName = "nvarchar(max)")]
+    public string Value { get; set; }
+
+    [Required]
+    [Column("TYPE", TypeName = "nvarchar(50)")]
+    public string Type { get; set; }
+
+    [Column("POSITION_X", TypeName = "float")]
+    public double
+#if NET
+        ?
 #endif
-            Y { get; set; }
+        X { get; set; }
 
-        [Column("WIDTH", TypeName = "float")]
-        public double
-#if nullable
-            ?
+    [Column("POSITION_Y", TypeName = "float")]
+    public double
+#if NET
+        ?
 #endif
-            Width { get; set; }
+        Y { get; set; }
 
-        [Column("HEIGHT", TypeName = "float")]
-        public double
-#if nullable
-            ?
+    [Column("WIDTH", TypeName = "float")]
+    public double
+#if NET
+        ?
 #endif
-            Height { get; set; }
+        Width { get; set; }
 
-        [Required]
-        [Column("ADDED_WHEN", TypeName = "datetime")]
-        public DateTime AddedWhen { get; set; }
-
-        [Column("CHANGED_WHEN", TypeName = "datetime")]
-        public DateTime? ChangedWhen { get; set; }
-
-        [Column("CHANGED_WHO", TypeName = "nvarchar(100)")]
-        [StringLength(100)]
-        public string
-#if nullable
-            ?
+    [Column("HEIGHT", TypeName = "float")]
+    public double
+#if NET
+        ?
 #endif
-            ChangedWho { get; set; }
+        Height { get; set; }
 
-        [ForeignKey("ElementId")]
-        public virtual Signature
-#if nullable
-            ?
+    [Required]
+    [Column("ADDED_WHEN", TypeName = "datetime")]
+    public DateTime AddedWhen { get; set; }
+
+    [Column("CHANGED_WHEN", TypeName = "datetime")]
+    public DateTime? ChangedWhen { get; set; }
+
+    [Column("CHANGED_WHO", TypeName = "nvarchar(100)")]
+    [StringLength(100)]
+    public string
+#if NET
+        ?
 #endif
-            Element { get; set; }
+        ChangedWho { get; set; }
+
+    [ForeignKey("ElementId")]
+    public virtual Signature
+#if NET
+        ?
+#endif
+        Element { get; set; }
+}
+
+#if NETFRAMEWORK
     }
-}
+#endif

EnvelopeGenerator.Domain/Entities/EmailTemplate.cs

@@ -1,39 +1,44 @@
-using System;
-using DigitalData.Core.Abstractions.Interfaces;
+using DigitalData.Core.Abstractions.Interfaces;
 using System.ComponentModel;
 using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
-using EnvelopeGenerator.Domain.Interfaces.Auditing;
+#if NETFRAMEWORK
+using System;
+#endif
 
 namespace EnvelopeGenerator.Domain.Entities
-{
-    [Table("TBSIG_EMAIL_TEMPLATE", Schema = "dbo")]
-    public class EmailTemplate : IEntity, IHasAddedWhen, IHasChangedWhen
+#if NET
+    ;
+#elif NETFRAMEWORK
     {
-        [Key]
-        [DatabaseGenerated(DatabaseGeneratedOption.Identity)]
-        [Column("GUID")]
-        public int Id { get; set; }
+#endif
 
-        [Column("NAME", TypeName = "nvarchar(64)")]
-        public string Name { get; set; }
+[Table("TBSIG_EMAIL_TEMPLATE", Schema = "dbo")]
+public class EmailTemplate : IEntity
+{
+    [Key]
+    [DatabaseGenerated(DatabaseGeneratedOption.Identity)]
+    [Column("GUID")]
+    public int Id { get; set; }
 
-        [Column("BODY", TypeName = "nvarchar(max)")]
-        public string Body { get; set; }
+    [Column("NAME", TypeName = "nvarchar(64)")]
+    public string Name { get; set; }
 
-        [Column("SUBJECT", TypeName = "nvarchar(512)")]
-        public string Subject { get; set; }
+    [Column("BODY", TypeName = "nvarchar(max)")]
+    public string Body { get; set; }
 
-        [Required]
-        [Column("LANG_CODE", TypeName = "varchar(5)")]
-        public string LangCode { get; set; }
+    [Column("SUBJECT", TypeName = "nvarchar(512)")]
+    public string Subject { get; set; }
 
-        [Required]
-        [Column("ADDED_WHEN", TypeName = "datetime")]
-        [DefaultValue("GETDATE()")]
-        public DateTime AddedWhen { get; set; }
+    [Required]
+    [Column("ADDED_WHEN", TypeName = "datetime")]
+    [DefaultValue("GETDATE()")]
+    public DateTime AddedWhen { get; set; }
 
-        [Column("CHANGED_WHEN", TypeName = "datetime")]
-        public DateTime? ChangedWhen { get; set; }
+    [Column("CHANGED_WHEN", TypeName = "datetime")]
+    public DateTime ChangedWhen { get; set; }
+}
+
+#if NETFRAMEWORK
     }
-}
+#endif

EnvelopeGenerator.Domain/Entities/Envelope.cs

@@ -1,205 +1,203 @@
-using System;
-using DigitalData.UserManager.Domain.Entities;
+using DigitalData.UserManager.Domain.Entities;
 using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
 using EnvelopeGenerator.Domain.Constants;
-using Newtonsoft.Json;
-using EnvelopeGenerator.Domain.Interfaces.Auditing;
+
 #if NETFRAMEWORK
+using System;
 using System.Collections.Generic;
 using System.Linq;
 #endif
 
 namespace EnvelopeGenerator.Domain.Entities
-{
-    [Table("TBSIG_ENVELOPE", Schema = "dbo")]
-    public class Envelope : IHasAddedWhen, IHasChangedWhen
+#if NET
+    ;
+#elif NETFRAMEWORK
     {
-        public Envelope()
-        {
-            // TODO: * Check the Form App and remove the default value
+#endif
+
+[Table("TBSIG_ENVELOPE", Schema = "dbo")]
+public class Envelope
+{
+    public Envelope()
+    {
+        // TODO: * Check the Form App and remove the default value
 #if NETFRAMEWORK
-            Id = 0;
-            Status = EnvelopeStatus.EnvelopeCreated;
-            Uuid = Guid.NewGuid().ToString();
-            Message = My.Resources.Envelope.Please_read_and_sign_this_document;
-            Title = string.Empty;
-            Comment = string.Empty;
-            Language = "de-DE";
-            SendReminderEmails = false;
-            FirstReminderDays = 0;
-            ReminderIntervalDays = 0;
-            CertificationType = (int)Constants.CertificationType.AdvancedElectronicSignature;
-            UseAccessCode = false;
-            Documents = Enumerable.Empty<Document>().ToList();
-            Histories = Enumerable.Empty<History>().ToList();
-            EnvelopeReceivers = Enumerable.Empty<EnvelopeReceiver>().ToList();
+        Id = 0;
+        Status = EnvelopeStatus.EnvelopeCreated;
+        Uuid = Guid.NewGuid().ToString();
+        Message = My.Resources.Envelope.Please_read_and_sign_this_document;
+        Title= string.Empty;
+        Comment = string.Empty;
+        Language = "de-DE";
+        SendReminderEmails = false;
+        FirstReminderDays = 0;
+        ReminderIntervalDays = 0;
+        CertificationType = (int)Constants.CertificationType.AdvancedElectronicSignature;
+        UseAccessCode = false;
+        Documents = Enumerable.Empty<Document>().ToList();
+        Histories = Enumerable.Empty<History>().ToList();
+        EnvelopeReceivers = Enumerable.Empty<EnvelopeReceiver>().ToList();
 #endif
-        }
-
-        [Key]
-        [DatabaseGenerated(DatabaseGeneratedOption.Identity)]
-        [Column("GUID")]
-        public int Id { get; set; }
-
-        [Required]
-        [Column("USER_ID")]
-        public int UserId { get; set; }
-
-        [Required]
-        [Column("STATUS")]
-        public EnvelopeStatus Status { get; set; }
-
-        [Required]
-        [Column("ENVELOPE_UUID", TypeName = "nvarchar(36)")]
-        public string Uuid { get; set; }
-
-        [Column("MESSAGE", TypeName = "nvarchar(max)")]
-        public string Message { get; set; }
-
-        [Column("EXPIRES_WHEN", TypeName = "datetime")]
-        public DateTime? ExpiresWhen { get; set; }
-
-        [Column("EXPIRES_WARNING_WHEN", TypeName = "datetime")]
-        public DateTime? ExpiresWarningWhen { get; set; }
-
-        [Required]
-        [Column("ADDED_WHEN", TypeName = "datetime")]
-        public DateTime AddedWhen { get; set; }
-
-        [Column("CHANGED_WHEN", TypeName = "datetime")]
-        public DateTime? ChangedWhen { get; set; }
-
-        [Column("TITLE", TypeName = "nvarchar(128)")]
-        public string
-#if nullable
-        ?
-#endif
-            Title
-        { get; set; }
-
-        [Column("COMMENT", TypeName = "nvarchar(128)")]
-        public string Comment { get; set; }
-
-        [Column("CONTRACT_TYPE")]
-        public int? ContractType { get; set; }
-
-#if NETFRAMEWORK
-        [NotMapped]
-        public string ContractTypeTranslated => My.Resources.Model.ResourceManager.GetString(ContractType.ToString());
-#endif
-
-        [Column("LANGUAGE", TypeName = "nvarchar(5)")]
-        public string Language { get; set; }
-
-        [Column("SEND_REMINDER_EMAILS")]
-        public bool SendReminderEmails { get; set; }
-
-        [Column("FIRST_REMINDER_DAYS")]
-        public int? FirstReminderDays { get; set; }
-
-        [Column("REMINDER_INTERVAL_DAYS")]
-        public int? ReminderIntervalDays { get; set; }
-
-        [Column("ENVELOPE_TYPE")]
-        public int? EnvelopeTypeId { get; set; }
-
-        [JsonIgnore]
-        [NotMapped]
-        public bool ReadOnly => EnvelopeTypeId == 2;
-
-        [Column("CERTIFICATION_TYPE")]
-        public int? CertificationType { get; set; }
-
-        [Column("USE_ACCESS_CODE")]
-        public bool UseAccessCode { get; set; }
-
-        [Column("FINAL_EMAIL_TO_CREATOR")]
-        public int? FinalEmailToCreator { get; set; }
-
-        [Column("FINAL_EMAIL_TO_RECEIVERS")]
-        public int? FinalEmailToReceivers { get; set; }
-
-        [Column("EXPIRES_WHEN_DAYS")]
-        public int? ExpiresWhenDays { get; set; }
-
-        [Column("EXPIRES_WARNING_WHEN_DAYS")]
-        public int? ExpiresWarningWhenDays { get; set; }
-
-        [ForeignKey("UserId")]
-        public User User { get; set; }
-
-        [Column("TFA_ENABLED")]
-        public bool TfaEnabled { get; set; }
-#if NETFRAMEWORK
-            = false;
-#endif
-
-        [NotMapped]
-        [Column("DOC_RESULT")]
-        public byte[]
-#if nullable
-        ?
-#endif
-            DocResult
-        { get; set; }
-
-        [ForeignKey("EnvelopeTypeId")]
-        public virtual EnvelopeType
-#if nullable
-        ?
-#endif
-            Type
-        { get; set; }
-
-#if NETFRAMEWORK
-        [NotMapped]
-        public string CURRENT_WORK_APP { get; set; } = "signFLOW GUI";
-
-        [NotMapped]
-        public bool IsAlreadySent => Status > EnvelopeStatus.EnvelopeSaved;
-#endif
-
-        public List<Document>
-#if nullable
-        ?
-#endif
-            Documents
-        { get; set; }
-
-        public List<History>
-#if nullable
-        ?
-#endif
-            Histories
-        { get; set; }
-
-        public List<EnvelopeReceiver>
-#if nullable
-        ?
-#endif
-            EnvelopeReceivers
-        { get; set; }
-
-        //#if NETFRAMEWORK
-        /// <summary>
-        /// Validates whether the receiver and document data are complete.
-        /// </summary>
-        public List<string> ValidateReceiverDocumentData()
-        {
-            var errors = new List<string>();
-
-            if (!Documents?.Any() ?? true)
-                errors.Add(My.Resources.Envelope.Missing_Documents);
-
-            if (!EnvelopeReceivers?.Any() ?? true)
-                errors.Add(My.Resources.Envelope.Missing_Receivers);
-
-            if (EnvelopeReceivers?.Any(r => !r.HasEmailAndName) ?? false)
-                errors.Add(My.Resources.Envelope.Incomplete_Receivers);
-
-            return errors;
-        }
-        //#endif
     }
-}
+
+    [Key]
+    [DatabaseGenerated(DatabaseGeneratedOption.Identity)]
+    [Column("GUID")]
+    public int Id { get; set; }
+
+    [Required]
+    [Column("USER_ID")]
+    public int UserId { get; set; }
+
+    [Required]
+    [Column("STATUS")]
+    public EnvelopeStatus Status { get; set; }
+
+    [Required]
+    [Column("ENVELOPE_UUID", TypeName = "nvarchar(36)")]
+    public string Uuid { get; set; }
+
+    [Column("MESSAGE", TypeName = "nvarchar(max)")]
+    public string Message { get; set; }
+
+    [Column("EXPIRES_WHEN", TypeName = "datetime")]
+    public DateTime? ExpiresWhen { get; set; }
+
+    [Column("EXPIRES_WARNING_WHEN", TypeName = "datetime")]
+    public DateTime? ExpiresWarningWhen { get; set; }
+
+    [Required]
+    [Column("ADDED_WHEN", TypeName = "datetime")]
+    public DateTime AddedWhen { get; set; }
+
+    [Column("CHANGED_WHEN", TypeName = "datetime")]
+    public DateTime? ChangedWhen { get; set; }
+
+    [Column("TITLE", TypeName = "nvarchar(128)")]
+    public string
+#if NET
+        ?
+#endif
+        Title { get; set; }
+
+    [Column("COMMENT", TypeName = "nvarchar(128)")]
+    public string Comment { get; set; }
+
+    [Column("CONTRACT_TYPE")]
+    public int? ContractType { get; set; }
+
+#if NETFRAMEWORK
+    [NotMapped]
+    public string ContractTypeTranslated => My.Resources.Model.ResourceManager.GetString(ContractType.ToString());
+#endif
+
+    [Column("LANGUAGE", TypeName = "nvarchar(5)")]
+    public string Language { get; set; }
+
+    [Column("SEND_REMINDER_EMAILS")]
+    public bool SendReminderEmails { get; set; }
+
+    [Column("FIRST_REMINDER_DAYS")]
+    public int? FirstReminderDays { get; set; }
+
+    [Column("REMINDER_INTERVAL_DAYS")]
+    public int? ReminderIntervalDays { get; set; }
+
+    [Column("ENVELOPE_TYPE")]
+    public int? EnvelopeTypeId { get; set; }
+
+    [Column("CERTIFICATION_TYPE")]
+    public int? CertificationType { get; set; }
+
+    [Column("USE_ACCESS_CODE")]
+    public bool UseAccessCode { get; set; }
+
+    [Column("FINAL_EMAIL_TO_CREATOR")]
+    public int? FinalEmailToCreator { get; set; }
+
+    [Column("FINAL_EMAIL_TO_RECEIVERS")]
+    public int? FinalEmailToReceivers { get; set; }
+
+    [Column("EXPIRES_WHEN_DAYS")]
+    public int? ExpiresWhenDays { get; set; }
+
+    [Column("EXPIRES_WARNING_WHEN_DAYS")]
+    public int? ExpiresWarningWhenDays { get; set; }
+
+    [ForeignKey("UserId")]
+    public User User { get; set; }
+
+    [Column("TFA_ENABLED")]
+    public bool TfaEnabled { get; set; }
+#if NETFRAMEWORK
+        = false;
+#endif
+
+    [NotMapped]
+    [Column("DOC_RESULT")]
+    public byte[]
+#if NET
+        ?
+#endif
+        DocResult
+    { get; set; }
+
+    [ForeignKey("EnvelopeTypeId")]
+    public virtual EnvelopeType
+#if NET
+        ?
+#endif
+        Type { get; set; }
+
+#if NETFRAMEWORK
+    [NotMapped]
+    public string CURRENT_WORK_APP { get; set; } = "signFLOW GUI";
+
+    [NotMapped]
+    public bool IsAlreadySent => Status > EnvelopeStatus.EnvelopeSaved;
+#endif
+
+    public List<Document>
+#if NET
+        ?
+#endif
+        Documents { get; set; }
+
+    public List<History>
+#if NET
+        ?
+#endif
+        Histories { get; set; }
+
+    public List<EnvelopeReceiver>
+#if NET
+        ?
+#endif
+        EnvelopeReceivers { get; set; }
+
+//#if NETFRAMEWORK
+    /// <summary>
+    /// Validates whether the receiver and document data are complete.
+    /// </summary>
+    public List<string> ValidateReceiverDocumentData()
+    {
+        var errors = new List<string>();
+
+        if (!Documents?.Any() ?? true)
+            errors.Add(My.Resources.Envelope.Missing_Documents);
+
+        if (!EnvelopeReceivers?.Any() ?? true)
+            errors.Add(My.Resources.Envelope.Missing_Receivers);
+
+        if (EnvelopeReceivers?.Any(r => !r.HasEmailAndName) ?? false)
+            errors.Add(My.Resources.Envelope.Incomplete_Receivers);
+
+        return errors;
+    }
+//#endif
+}
+
+#if NETFRAMEWORK
+    }
+#endif

EnvelopeGenerator.Domain/Entities/EnvelopeReceiver.cs

@@ -1,94 +1,104 @@
-using System;
-using System.ComponentModel.DataAnnotations;
+using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
 using DigitalData.Core.Abstractions.Interfaces;
 using EnvelopeGenerator.Domain.Interfaces;
-using EnvelopeGenerator.Domain.Interfaces.Auditing;
+
+#if NETFRAMEWORK
+using System;
+#endif
 
 namespace EnvelopeGenerator.Domain.Entities
-{
-    [Table("TBSIG_ENVELOPE_RECEIVER", Schema = "dbo")]
-    public class EnvelopeReceiver : IHasEnvelope, IHasReceiver, IEntity, IHasAddedWhen, IHasChangedWhen
+#if NET
+    ;
+#elif NETFRAMEWORK
+    {
+#endif
+
+[Table("TBSIG_ENVELOPE_RECEIVER", Schema = "dbo")]
+public class EnvelopeReceiver : IHasEnvelope, IHasReceiver, IEntity
+{
+    public EnvelopeReceiver()
     {
-        public EnvelopeReceiver()
-        {
 #if NETFRAMEWORK
-            CompanyName = string.Empty;
+        CompanyName = string.Empty;
 #endif
-        }
+    }
 
-        [Column("ENVELOPE_ID")]
-        public int EnvelopeId { get; set; }
+    [Column("ENVELOPE_ID")]
+    public int EnvelopeId { get; set; }
 
-        [Column("RECEIVER_ID")]
-        public int ReceiverId { get; set; }
+    [Column("RECEIVER_ID")]
+    public int ReceiverId { get; set; }
 
-        [Required]
-        [Column("SEQUENCE")]
-        public int Sequence { get; set; }
+    [Required]
+    [Column("SEQUENCE")]
+    public int Sequence { get; set; }
 
-        [Column("NAME", TypeName = "nvarchar(128)")]
-        public string Name { get; set; }
+    [Column("NAME", TypeName = "nvarchar(128)")]
+    public string Name { get; set; }
 
-        [Column("JOB_TITLE", TypeName = "nvarchar(128)")]
-        public string JobTitle { get; set; }
+    [Column("JOB_TITLE", TypeName = "nvarchar(128)")]
+    public string JobTitle { get; set; }
 
-        [Column("COMPANY_NAME", TypeName = "nvarchar(128)")]
-        public string
-#if nullable
-            ?
+    [Column("COMPANY_NAME", TypeName = "nvarchar(128)")]
+    public string
+#if NET
+        ?
 #endif
-            CompanyName { get; set; }
+        CompanyName { get; set; }
 
-        [Column("PRIVATE_MESSAGE", TypeName = "nvarchar(max)")]
-        public string PrivateMessage { get; set; }
+    [Column("PRIVATE_MESSAGE", TypeName = "nvarchar(max)")]
+    public string PrivateMessage { get; set; }
 
-        [Column("ACCESS_CODE", TypeName = "nvarchar(64)")]
-        public string AccessCode { get; set; }
+    [Column("ACCESS_CODE", TypeName = "nvarchar(64)")]
+    public string AccessCode { get; set; }
 
-        [Required]
-        [Column("ADDED_WHEN", TypeName = "datetime")]
-        public DateTime AddedWhen { get; set; }
+    [Required]
+    [Column("ADDED_WHEN", TypeName = "datetime")]
+    public DateTime AddedWhen { get; set; }
 
-        [Column("CHANGED_WHEN", TypeName = "datetime")]
-        public DateTime? ChangedWhen { get; set; }
+    [Column("CHANGED_WHEN", TypeName = "datetime")]
+    public DateTime ChangedWhen { get; set; }
 
-        [Column("PHONE_NUMBER")]
-        [StringLength(20)]
-        [RegularExpression(@"^\+[0-9]+$", ErrorMessage = "Phone number must start with '+' followed by digits.")]
-        public string PhoneNumber { get; set; }
+    [Column("PHONE_NUMBER")]
+    [StringLength(20)]
+    [RegularExpression(@"^\+[0-9]+$", ErrorMessage = "Phone number must start with '+' followed by digits.")]
+    public string PhoneNumber { get; set; }
 
-        [NotMapped]
-        public Tuple<int, int> Id => Tuple.Create(EnvelopeId, ReceiverId);
+    [NotMapped]
+    public Tuple<int, int> Id => Tuple.Create(EnvelopeId, ReceiverId);
 
-        [NotMapped]
-        public bool HasPhoneNumber => !string.IsNullOrWhiteSpace(PhoneNumber);
+    [NotMapped]
+    public bool HasPhoneNumber => !string.IsNullOrWhiteSpace(PhoneNumber);
 
-        [ForeignKey("EnvelopeId")]
-        public Envelope
-#if nullable
-            ?
+    [ForeignKey("EnvelopeId")]
+    public Envelope
+#if NET
+        ?
 #endif
-                Envelope { get; set; }
+            Envelope { get; set; }
 
-        [ForeignKey("ReceiverId")]
-        public Receiver
-#if nullable
-            ?
+    [ForeignKey("ReceiverId")]
+    public Receiver
+#if NET
+        ?
 #endif
-                Receiver { get; set; }
+            Receiver { get; set; }
 
-        #region Model of old serice
-        [NotMapped]
-        public Constants.ReceiverStatus Status { get; set; }
+    #region Model of old serice
+    [NotMapped]
+    public Constants.ReceiverStatus Status { get; set; }
 
-        [NotMapped]
-        public bool HasId => Id.Item1 > 0 && Id.Item2 > 0;
+    [NotMapped]
+    public bool HasId => Id.Item1 > 0 && Id.Item2 > 0;
 
-        [NotMapped]
-        public bool HasEmailAndName =>
-            !string.IsNullOrWhiteSpace(Receiver.EmailAddress) &&
-            !string.IsNullOrWhiteSpace(Name);
+    [NotMapped]
+    public bool HasEmailAndName =>
+        !string.IsNullOrWhiteSpace(Receiver.EmailAddress) &&
+        !string.IsNullOrWhiteSpace(Name);
         #endregion
     }
-}
+
+#if NETFRAMEWORK
+    }
+#endif

EnvelopeGenerator.Domain/Entities/EnvelopeReceiverReadOnly.cs

@@ -1,13 +1,14 @@
-using System;
-using System.ComponentModel.DataAnnotations.Schema;
+using System.ComponentModel.DataAnnotations.Schema;
 using System.ComponentModel.DataAnnotations;
 using DigitalData.EmailProfilerDispatcher.Abstraction.Attributes;
-using EnvelopeGenerator.Domain.Interfaces.Auditing;
+#if NETFRAMEWORK
+using System;
+#endif
 
 namespace EnvelopeGenerator.Domain.Entities
 {
     [Table("TBSIG_ENVELOPE_RECEIVER_READ_ONLY")]
-    public class EnvelopeReceiverReadOnly : IHasChangedWhen, ICreationAuditable
+    public class EnvelopeReceiverReadOnly
     {
         [Key]
         [DatabaseGenerated(DatabaseGeneratedOption.Identity)]
@@ -41,12 +42,16 @@ namespace EnvelopeGenerator.Domain.Entities
 
         [Column("ADDED_WHEN")]
         [Required]
-        public DateTime AddedWhen { get; set; }
+        public DateTime
+#if NET
+            ?
+#endif
+            AddedWhen { get; set; }
 
         [Column("CHANGED_WHO")]
         [StringLength(100)]
         public string
-#if nullable
+#if NET
             ?
 #endif
             ChangedWho { get; set; }

EnvelopeGenerator.Domain/Entities/History.cs

@@ -1,73 +1,84 @@
-using System;
-using DigitalData.UserManager.Domain.Entities;
+using DigitalData.UserManager.Domain.Entities;
 using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
 using EnvelopeGenerator.Domain.Interfaces;
 using EnvelopeGenerator.Domain.Constants;
 using DigitalData.Core.Abstractions.Interfaces;
-using EnvelopeGenerator.Domain.Interfaces.Auditing;
 
-namespace EnvelopeGenerator.Domain.Entities
-{
-    [Table("TBSIG_ENVELOPE_HISTORY", Schema = "dbo")]
-    public class History : IHasEnvelope, IHasReceiver, IEntity, IHasAddedWhen, IHasChangedWhen
-    {
-        [Key]
-        [DatabaseGenerated(DatabaseGeneratedOption.Identity)]
-        [Column("GUID")]
-        public long Id { get; set; }
-
-        [Required]
-        [Column("ENVELOPE_ID")]
-        public int EnvelopeId { get; set; }
-
-        [Required]
-        [Column("USER_REFERENCE", TypeName = "nvarchar(128)")]
-        public string UserReference { get; set; }
-
-        [Required]
-        [Column("STATUS")]
-        public EnvelopeStatus  Status { get; set; }
-
-        [Required]
-        [Column("ADDED_WHEN", TypeName = "datetime")]
-        [DatabaseGenerated(DatabaseGeneratedOption.Computed)]
-        public DateTime AddedWhen { get; set; }
-
-        [Column("ACTION_DATE", TypeName = "datetime")]
-        public DateTime? ChangedWhen { get; set; }
-        
-        [Column("COMMENT", TypeName = "nvarchar(max)")]
-        public string
-#if nullable
-            ?
-#endif
-            Comment { get; set; }
-
-        [ForeignKey("EnvelopeId")]
-        public virtual Envelope
-#if nullable
-            ?
-#endif
-            Envelope { get; set; }
-
-        [ForeignKey("UserReference")]
-        public virtual User
-#if nullable
-            ?
-#endif
-            Sender { get; set; }
-
-        [ForeignKey("UserReference")]
-        public virtual Receiver
-#if nullable
-            ?
-#endif
-            Receiver { get; set; }
 
 #if NETFRAMEWORK
-        [NotMapped]
-        public string StatusTranslated => My.Resources.Model.ResourceManager.GetString(Status.ToString());
+using System;
 #endif
+
+namespace EnvelopeGenerator.Domain.Entities
+#if NET
+    ;
+#elif NETFRAMEWORK
+    {
+#endif
+
+[Table("TBSIG_ENVELOPE_HISTORY", Schema = "dbo")]
+public class History : IHasEnvelope, IHasReceiver, IEntity
+{
+    [Key]
+    [DatabaseGenerated(DatabaseGeneratedOption.Identity)]
+    [Column("GUID")]
+    public long Id { get; set; }
+
+    [Required]
+    [Column("ENVELOPE_ID")]
+    public int EnvelopeId { get; set; }
+
+    [Required]
+    [Column("USER_REFERENCE", TypeName = "nvarchar(128)")]
+    public string UserReference { get; set; }
+
+    [Required]
+    [Column("STATUS")]
+    public EnvelopeStatus  Status { get; set; }
+
+    [Required]
+    [Column("ADDED_WHEN", TypeName = "datetime")]
+    [DatabaseGenerated(DatabaseGeneratedOption.Computed)]
+    public DateTime AddedWhen { get; set; }
+
+    [Column("ACTION_DATE", TypeName = "datetime")]
+    public DateTime? ActionDate { get; set; } = DateTime.Now;
+    
+    [Column("COMMENT", TypeName = "nvarchar(max)")]
+    public string
+#if NET
+        ?
+#endif
+        Comment { get; set; }
+
+    [ForeignKey("EnvelopeId")]
+    public virtual Envelope
+#if NET
+        ?
+#endif
+        Envelope { get; set; }
+
+    [ForeignKey("UserReference")]
+    public virtual User
+#if NET
+        ?
+#endif
+        Sender { get; set; }
+
+    [ForeignKey("UserReference")]
+    public virtual Receiver
+#if NET
+        ?
+#endif
+        Receiver { get; set; }
+
+#if NETFRAMEWORK
+    [NotMapped]
+    public string StatusTranslated => My.Resources.Model.ResourceManager.GetString(Status.ToString());
+#endif
+}
+
+#if NETFRAMEWORK
     }
-}
+#endif

EnvelopeGenerator.Domain/Entities/Receiver.cs

@@ -1,42 +1,50 @@
 using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
-using EnvelopeGenerator.Domain.Interfaces.Auditing;
+using System.Drawing;
 #if NETFRAMEWORK
 using System;
 using System.Collections.Generic;
 #endif
 
 namespace EnvelopeGenerator.Domain.Entities
-{
-    [Table("TBSIG_RECEIVER", Schema = "dbo")]
-    public class Receiver : IHasAddedWhen
+#if NET
+    ;
+#elif NETFRAMEWORK
     {
-        [Key]
-        [DatabaseGenerated(DatabaseGeneratedOption.Identity)]
-        [Column("GUID")]
-        public int Id { get; set; }
+#endif
 
-        [Required, EmailAddress]
-        [Column("EMAIL_ADDRESS", TypeName = "nvarchar(250)")]
-        [StringLength(250)]
-        public string EmailAddress { get; set; }
+[Table("TBSIG_RECEIVER", Schema = "dbo")]
+public class Receiver
+{
+    [Key]
+    [DatabaseGenerated(DatabaseGeneratedOption.Identity)]
+    [Column("GUID")]
+    public int Id { get; set; }
 
-        [Required]
-        [Column("SIGNATURE", TypeName = "nvarchar(64)")]
-        public string Signature { get; set; }
+    [Required, EmailAddress]
+    [Column("EMAIL_ADDRESS", TypeName = "nvarchar(250)")]
+    [StringLength(250)]
+    public string EmailAddress { get; set; }
 
-        [Required]
-        [Column("ADDED_WHEN", TypeName = "datetime")]
-        public DateTime AddedWhen { get; set; }
+    [Required]
+    [Column("SIGNATURE", TypeName = "nvarchar(64)")]
+    public string Signature { get; set; }
 
-        [Column("TOTP_SECRET_KEY", TypeName = "nvarchar(MAX)")]
-        public string TotpSecretkey { get; set; }
+    [Required]
+    [Column("ADDED_WHEN", TypeName = "datetime")]
+    public DateTime AddedWhen { get; set; }
 
-        [Column("TFA_REG_DEADLINE", TypeName = "datetime")]
-        public DateTime? TfaRegDeadline { get; set; }
+    [Column("TOTP_SECRET_KEY", TypeName = "nvarchar(MAX)")]
+    public string TotpSecretkey { get; set; }
 
-        public List<EnvelopeReceiver> EnvelopeReceivers { get; set; }
+    [Column("TFA_REG_DEADLINE", TypeName = "datetime")]
+    public DateTime? TfaRegDeadline { get; set; }
 
-        public string GetSignature() => EmailAddress.ToUpperInvariant().GetChecksum();
+    public List<EnvelopeReceiver> EnvelopeReceivers { get; set; }
+
+    public string GetSignature() => EmailAddress.ToUpperInvariant().GetChecksum();
+}
+
+#if NETFRAMEWORK
     }
-}
+#endif

EnvelopeGenerator.Domain/Entities/Signature.cs

@@ -1,130 +1,134 @@
-using System;
-using EnvelopeGenerator.Domain.Interfaces;
+using EnvelopeGenerator.Domain.Interfaces;
 using System.ComponentModel;
 using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
-using EnvelopeGenerator.Domain.Interfaces.Auditing;
 #if NETFRAMEWORK
+using System;
 using System.Collections.Generic;
 #endif
 
 namespace EnvelopeGenerator.Domain.Entities
-{
-    [Table("TBSIG_DOCUMENT_RECEIVER_ELEMENT", Schema = "dbo")]
-    public class Signature : ISignature, IHasReceiver, IHasAddedWhen, IUpdateAuditable
+#if NET
+    ;
+#elif NETFRAMEWORK
     {
-        public Signature()
-        {
-            // TODO: * Check the Form App and remove the default value
+#endif
+
+[Table("TBSIG_DOCUMENT_RECEIVER_ELEMENT", Schema = "dbo")]
+public class Signature : ISignature, IHasReceiver
+{
+    public Signature()
+    {
+        // TODO: * Check the Form App and remove the default value
 #if NETFRAMEWORK
-            Id = -1;
-            Required = false;
-            ReadOnly = false;
-            AnnotationIndex = 0;
-#endif
-        }
-
-        [Key]
-        [DatabaseGenerated(DatabaseGeneratedOption.Identity)]
-        [Column("GUID")]
-        public int Id { get; set; }
-
-        [Required]
-        [Column("DOCUMENT_ID")]
-        public int DocumentId { get; set; }
-
-        [Required]
-        [Column("RECEIVER_ID")]
-        public int ReceiverId { get; set; }
-
-        [Required]
-        [Column("ELEMENT_TYPE")]
-        [DefaultValue(0)]
-        public int ElementType { get; set; }
-
-        [Required]
-        [Column("POSITION_X")]
-        [DefaultValue(0)]
-        public double X { get; set; }
-
-        [Required]
-        [Column("POSITION_Y")]
-        [DefaultValue(0)]
-        public double Y { get; set; }
-
-        [Required]
-        [Column("WIDTH")]
-        [DefaultValue(0)]
-        public double Width { get; set; }
-
-        [Required]
-        [Column("HEIGHT")]
-        [DefaultValue(0)]
-        public double Height { get; set; }
-
-        [Required]
-        [Column("PAGE")]
-        [DefaultValue(1)]
-        public int Page { get; set; }
-
-        [Required]
-        [Column("REQUIRED")]
-        [DefaultValue(false)]
-        public bool Required { get; set; }
-
-        [Column("TOOLTIP")]
-        public string Tooltip { get; set; }
-
-        [Required]
-        [Column("READ_ONLY")]
-        [DefaultValue(false)]
-        public bool ReadOnly { get; set; }
-
-        [Required]
-        [Column("ANNOTATION_INDEX")]
-        [DefaultValue(0)]
-        public int AnnotationIndex { get; set; }
-
-        [Required]
-        [Column("ADDED_WHEN", TypeName = "datetime")]
-        [DefaultValue("GETDATE()")]
-        public DateTime AddedWhen { get; set; }
-
-        [Column("CHANGED_WHEN", TypeName = "datetime")]
-        public DateTime? ChangedWhen { get; set; }
-
-        [Column("CHANGED_WHO", TypeName = "nvarchar(100)")]
-        public string
-#if nullable
-        ?
-#endif
-            ChangedWho
-        { get; set; }
-
-        [ForeignKey("DocumentId")]
-        public virtual Document Document { get; set; }
-
-        [ForeignKey("ReceiverId")]
-        public virtual Receiver
-#if nullable
-        ?
-#endif
-            Receiver
-        { get; set; }
-
-        public virtual IEnumerable<ElementAnnotation>
-#if nullable
-        ?
-#endif
-            Annotations
-        { get; set; }
-
-#if NETFRAMEWORK
-        [NotMapped]
-        public double Top => Math.Round(Y, 5);
-
-        [NotMapped]
-        public double Left => Math.Round(X, 5);
+        Id = -1;
+        Required = false;
+        ReadOnly = false;
+        AnnotationIndex = 0;
 #endif
     }
-}
+
+    [Key]
+    [DatabaseGenerated(DatabaseGeneratedOption.Identity)]
+    [Column("GUID")]
+    public int Id { get; set; }
+
+    [Required]
+    [Column("DOCUMENT_ID")]
+    public int DocumentId { get; set; }
+
+    [Required]
+    [Column("RECEIVER_ID")]
+    public int ReceiverId { get; set; }
+
+    [Required]
+    [Column("ELEMENT_TYPE")]
+    [DefaultValue(0)]
+    public int ElementType { get; set; }
+
+    [Required]
+    [Column("POSITION_X")]
+    [DefaultValue(0)]
+    public double X { get; set; }
+
+    [Required]
+    [Column("POSITION_Y")]
+    [DefaultValue(0)]
+    public double Y { get; set; }
+
+    [Required]
+    [Column("WIDTH")]
+    [DefaultValue(0)]
+    public double Width { get; set; }
+
+    [Required]
+    [Column("HEIGHT")]
+    [DefaultValue(0)]
+    public double Height { get; set; }
+
+    [Required]
+    [Column("PAGE")]
+    [DefaultValue(1)]
+    public int Page { get; set; }
+
+    [Required]
+    [Column("REQUIRED")]
+    [DefaultValue(false)]
+    public bool Required { get; set; }
+
+    [Column("TOOLTIP")]
+    public string Tooltip { get; set; }
+
+    [Required]
+    [Column("READ_ONLY")]
+    [DefaultValue(false)]
+    public bool ReadOnly { get; set; }
+
+    [Required]
+    [Column("ANNOTATION_INDEX")]
+    [DefaultValue(0)]
+    public int AnnotationIndex { get; set; }
+
+    [Required]
+    [Column("ADDED_WHEN", TypeName = "datetime")]
+    [DefaultValue("GETDATE()")]
+    public DateTime? AddedWhen { get; set; }
+
+    [Column("CHANGED_WHEN", TypeName = "datetime")]
+    public DateTime? ChangedWhen { get; set; }
+
+    [Column("CHANGED_WHO", TypeName = "nvarchar(100)")]
+    public string
+#if NET
+        ?
+#endif
+        ChangedWho { get; set; }
+
+    [ForeignKey("DocumentId")]
+    public virtual Document Document { get; set; }
+
+    [ForeignKey("ReceiverId")]
+    public virtual Receiver
+#if NET
+        ?
+#endif
+        Receiver { get; set; }
+
+    public virtual IEnumerable<ElementAnnotation>
+#if NET
+        ?
+#endif
+        Annotations { get; set; }
+
+#if NETFRAMEWORK
+    [NotMapped]
+    public double Top => Math.Round(Y, 5);
+
+    [NotMapped]
+    public double Left => Math.Round(X, 5);
+#endif
+}
+
+#if NETFRAMEWORK
+    }
+#endif

EnvelopeGenerator.Domain/Interfaces/Auditing/ICreationAuditable.cs

@@ -1,6 +0,0 @@
-namespace EnvelopeGenerator.Domain.Interfaces.Auditing
-{
-    public interface ICreationAuditable : IHasAddedWhen, IHasAddedWho
-    {
-    }
-}

EnvelopeGenerator.Domain/Interfaces/Auditing/IHasAddedWhen.cs

@@ -1,11 +0,0 @@
-#if NETFRAMEWORK
-using System;
-#endif
-
-namespace EnvelopeGenerator.Domain.Interfaces.Auditing
-{
-    public interface IHasAddedWhen
-    {
-        DateTime AddedWhen { get; set; }
-    }
-}

EnvelopeGenerator.Domain/Interfaces/Auditing/IHasAddedWho.cs

@@ -1,7 +0,0 @@
-namespace EnvelopeGenerator.Domain.Interfaces.Auditing
-{
-    public interface IHasAddedWho
-    {
-        string AddedWho { get; set; }
-    }
-}

EnvelopeGenerator.Domain/Interfaces/Auditing/IHasChangedWhen.cs

@@ -1,11 +0,0 @@
-#if NETFRAMEWORK
-using System;
-#endif
-
-namespace EnvelopeGenerator.Domain.Interfaces.Auditing
-{
-    public interface IHasChangedWhen
-    {
-        DateTime? ChangedWhen { get; set; }
-    }
-}

EnvelopeGenerator.Domain/Interfaces/Auditing/IHasChangedWho.cs

@@ -1,11 +0,0 @@
-namespace EnvelopeGenerator.Domain.Interfaces.Auditing
-{
-    public interface IHasChangedWho
-    {
-        string
-#if nullable
-            ?
-#endif
-            ChangedWho { get; set; }
-    }
-}

EnvelopeGenerator.Domain/Interfaces/Auditing/IUpdateAuditable.cs

@@ -1,6 +0,0 @@
-namespace EnvelopeGenerator.Domain.Interfaces.Auditing
-{
-    public interface IUpdateAuditable : IHasChangedWhen, IHasChangedWho
-    {
-    }
-}

EnvelopeGenerator.Domain/Interfaces/IHasEnvelope.cs

@@ -1,11 +1,22 @@
 namespace EnvelopeGenerator.Domain.Interfaces
-{
-    public interface IHasEnvelope
+#if NET
+    ;
+#elif NETFRAMEWORK
     {
+#endif
+
+public interface IHasEnvelope
+{
+#if NET
+    public 
+#endif
         Entities.Envelope
-#if nullable
-            ?
+#if NET
+        ?
 #endif
             Envelope { get; set; }
-    }
-}
+}
+
+#if NETFRAMEWORK
+}
+#endif

EnvelopeGenerator.Domain/Interfaces/IHasReceiver.cs

@@ -1,11 +1,22 @@
 namespace EnvelopeGenerator.Domain.Interfaces
-{
-    public interface IHasReceiver
+#if NET
+    ;
+#elif NETFRAMEWORK
     {
+#endif
+
+public interface IHasReceiver
+    {
+#if NET
+    public 
+#endif
         Entities.Receiver
-#if nullable
-            ?
+#if NET
+        ?
 #endif
             Receiver { get; set; }
-    }
-}
+}
+
+#if NETFRAMEWORK
+}
+#endif

EnvelopeGenerator.GeneratorAPI/.config/dotnet-tools.json

@@ -0,0 +1,13 @@
+{
+  "version": 1,
+  "isRoot": true,
+  "tools": {
+    "dotnet-ef": {
+      "version": "9.0.3",
+      "commands": [
+        "dotnet-ef"
+      ],
+      "rollForward": false
+    }
+  }
+}