Add IHasChangedWhen support and cleanup using statements

Introduced IHasChangedWhen interface to EnvelopeReceiver and History.
Added HasEmailAndName property to EnvelopeReceiver.
Updated AutoMapperAuditingExtensions to map ChangedWhen to UTC.
Removed redundant using statements and fixed formatting.

EnvelopeGenerator.API/Controllers/EmailTemplateController.cs

@@ -1,17 +1,14 @@
 using AutoMapper;
-using EnvelopeGenerator.Application.EmailTemplates;
-using EnvelopeGenerator.Application.EmailTemplates.Commands.Update;
-using EnvelopeGenerator.Application.EmailTemplates.Commands.Reset;
-using EnvelopeGenerator.Application.EmailTemplates.Queries.Read;
+using EnvelopeGenerator.Application.EmailTemplates.Commands;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
 using MediatR;
-using System.Threading.Tasks;
 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;
 
@@ -64,40 +61,17 @@ public class EmailTemplateController(IMapper mapper, IRepository<EmailTemplate>
     /// 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="temp">Die E-Mail-Vorlagenabfrage.</param>
-    /// <param name="update">Der Aktualisierungsbefehl für die E-Mail-Vorlage.
-    /// Wird auf Standardwert aktualisiert, wenn die Anfrage ohne http-Body gesendet wird.
-    /// </param>
-    /// <returns>Gibt HTTP-Antwort zurück</returns>
-    /// <remarks>
-    /// Sample request:
-    /// PUT /api/EmailTemplate
-    /// {
-    ///     "emailTemplateId": 123,
-    ///     "newContent": "Updated content"
-    /// }
-    /// </remarks>
+    /// <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([FromQuery] EmailTemplateQueryBase? temp = null, [FromBody] UpdateEmailTemplateCommand? update = null)
+    public async Task<IActionResult> Update([FromBody] UpdateEmailTemplateCommand update, CancellationToken cancel)
     {
-        if (update is null)
-        {
-            await mediator.Send(new ResetEmailTemplateCommand(temp));
-            return Ok();
-        }
-        else if (temp is null)
-        {
-            return BadRequest("No both id and type");
-        }
-        else
-        {
-            update.EmailTemplateQuery = temp;
-            await mediator.Send(update);
-            return Ok();
-        }
+        await mediator.Send(update, cancel);
+        return Ok();
     }
 }

EnvelopeGenerator.Application/Common/Commands/CreateCommandHandler.cs

@@ -0,0 +1,36 @@
+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

@@ -0,0 +1,59 @@
+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/MappingProfile.cs

@@ -28,8 +28,8 @@ public class MappingProfile : Profile
         CreateMap<EmailTemplate, EmailTemplateDto>();
         CreateMap<Envelope, EnvelopeDto>();
         CreateMap<Document, DocumentDto>();
-        CreateMap<Domain.Entities.History, HistoryDto>();
-        CreateMap<Domain.Entities.History, HistoryCreateDto>();
+        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.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>();
-        CreateMap<HistoryCreateDto, Domain.Entities.History>();
+        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<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>()
-            .ForMember(dest => dest.AddedWhen, opt => opt.MapFrom(_ => DateTime.UtcNow));
+            .MapAddedWhen();
 
         // Messaging mappings
         // for GTX messaging

EnvelopeGenerator.Application/Common/Extensions/AutoMapperAuditingExtensions.cs

@@ -0,0 +1,24 @@
+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/DocStatus/Commands/CreateDocStatusCommand.cs

@@ -1,12 +1,31 @@
-namespace EnvelopeGenerator.Application.DocStatus.Commands;
+using DigitalData.Core.Abstraction.Application.Repository;
+using EnvelopeGenerator.Application.Common.Commands;
+using EnvelopeGenerator.Domain.Entities;
+using MediatR;
+
+namespace EnvelopeGenerator.Application.DocStatus.Commands;
 
 /// <summary>
 /// 
 /// </summary>
-public record CreateDocStatusCommand : ModifyDocStatusCommandBase
+public record CreateDocStatusCommand : ModifyDocStatusCommandBase, IRequest<DocumentStatus>
 {
     /// <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,4 +1,5 @@
 using AutoMapper;
+using EnvelopeGenerator.Application.Common.Extensions;
 using EnvelopeGenerator.Application.DocStatus.Commands;
 using EnvelopeGenerator.Domain.Entities;
 
@@ -16,10 +17,12 @@ public class MappingProfile : Profile
     {
         CreateMap<CreateDocStatusCommand, DocumentStatus>()
         .ForMember(dest => dest.Envelope, opt => opt.Ignore())
-        .ForMember(dest => dest.Receiver, opt => opt.Ignore());
+        .ForMember(dest => dest.Receiver, opt => opt.Ignore())
+        .MapAddedWhen();
 
         CreateMap<UpdateDocStatusCommand, DocumentStatus>()
         .ForMember(dest => dest.Envelope, opt => opt.Ignore())
-        .ForMember(dest => dest.Receiver, opt => opt.Ignore());
+        .ForMember(dest => dest.Receiver, opt => opt.Ignore())
+        .MapChangedWhen();
     }
 }

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

@@ -1,41 +0,0 @@
-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="EmailTemplateQueryBase"/> 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 : EmailTemplateQueryBase, IRequest
-{
-    /// <summary>
-    /// 
-    /// </summary>
-    /// <param name="orginal"></param>
-    public ResetEmailTemplateCommand(EmailTemplateQueryBase? 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/ResetEmailTemplateCommand.cs

@@ -1,11 +1,38 @@
 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.Reset;
+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; }
+}
 
 /// <summary>
 /// 
@@ -41,7 +68,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);
         }
     }
@@ -113,4 +140,4 @@ public class ResetEmailTemplateCommandHandler : IRequestHandler<ResetEmailTempla
         }
     };
 
-}
+}

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

@@ -1,29 +0,0 @@
-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 EmailTemplateQueryBase? EmailTemplateQuery { get; set; }
-
-    /// <summary>
-    /// 
-    /// </summary>
-    [JsonIgnore]
-    public DateTime ChangedWhen { get; init; } = DateTime.Now;
-}

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

@@ -1,67 +0,0 @@
-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>
-    /// <param name="mapper"></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();
-        }
-
-        await _repository.UpdateAsync(tempDto, t => t.Id == tempDto.Id, cancel);
-    }
-}

EnvelopeGenerator.Application/EmailTemplates/Commands/UpdateEmailTemplateCommand.cs

@@ -0,0 +1,63 @@
+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/EmailTemplateQueryBase.cs

@@ -1,24 +0,0 @@
-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 EmailTemplateQueryBase(int? Id = null, EmailTemplateType? Type = null)
-{
-}

EnvelopeGenerator.Application/EmailTemplates/IEmailTemplateQuery.cs

@@ -0,0 +1,30 @@
+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

@@ -0,0 +1,24 @@
+using AutoMapper;
+using EnvelopeGenerator.Application.Common.Dto;
+using EnvelopeGenerator.Application.Common.Extensions;
+using EnvelopeGenerator.Application.EmailTemplates.Commands;
+using EnvelopeGenerator.Domain.Entities;
+
+namespace EnvelopeGenerator.Application.EmailTemplates;
+
+/// <summary>
+///
+/// </summary>
+public class MappingProfile : Profile
+{
+    /// <summary>
+    ///
+    /// </summary>
+    public MappingProfile()
+    {
+        CreateMap<EmailTemplate, EmailTemplateDto>();
+
+        CreateMap<EmailTemplateUpdateDto, EmailTemplate>()
+            .MapChangedWhen();
+    }
+}

EnvelopeGenerator.Application/EmailTemplates/Queries/ReadEmailTemplateQuery.cs

@@ -4,21 +4,42 @@ 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.Read;
+namespace EnvelopeGenerator.Application.EmailTemplates.Queries;
 
 /// <summary>
 /// Stellt eine Abfrage dar, um eine E-Mail-Vorlage zu lesen.
-/// Diese Klasse erbt von <see cref="EmailTemplateQueryBase"/>.
+/// Diese Klasse erbt von <see cref="IEmailTemplateQuery"/>.
 /// </summary>
-public record ReadEmailTemplateQuery : EmailTemplateQueryBase, IRequest<EmailTemplateDto?>
+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?>
+public class ReadEmailTemplateQueryHandler : IRequestHandler<ReadEmailTemplateQuery, EmailTemplateDto>
 {
     private readonly IMapper _mapper;
 
@@ -44,12 +65,14 @@ public class ReadEmailTemplateQueryHandler : IRequestHandler<ReadEmailTemplateQu
     /// <param name="cancel"></param>
     /// <returns></returns>
     /// <exception cref="InvalidOperationException"></exception>
-    public async Task<EmailTemplateDto?> Handle(ReadEmailTemplateQuery request, CancellationToken cancel)
+    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());
 
-        return _mapper.Map<EmailTemplateDto>(await query.FirstOrDefaultAsync(cancel));
+        var entity = await query.FirstOrDefaultAsync(cancel) ?? throw new NotFoundException();
+
+        return _mapper.Map<EmailTemplateDto>(entity);
     }
 }

EnvelopeGenerator.Domain/Entities/Config.cs

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

EnvelopeGenerator.Domain/Entities/Document.cs

@@ -1,6 +1,9 @@
-using EnvelopeGenerator.Domain.Interfaces;
+using System;
+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;
@@ -8,81 +11,77 @@ using System.Linq;
 #endif
 
 namespace EnvelopeGenerator.Domain.Entities
-#if NET
-    ;
-#elif NETFRAMEWORK
-    {
-#endif
-
-[Table("TBSIG_ENVELOPE_DOCUMENT", Schema = "dbo")]
-public class Document : IHasEnvelope
 {
-    public Document()
+    [Table("TBSIG_ENVELOPE_DOCUMENT", Schema = "dbo")]
+    public class Document : IHasEnvelope, IHasAddedWhen
     {
+        public Document()
+        {
 #if NETFRAMEWORK
-        Elements = Enumerable.Empty<Signature>().ToList();
+            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; }
 #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,65 +1,62 @@
-using System.ComponentModel.DataAnnotations;
+using System;
+using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
 using DigitalData.Core.Abstractions.Interfaces;
 using EnvelopeGenerator.Domain.Interfaces;
-
-#if NETFRAMEWORK
-using System;
-#endif
+using EnvelopeGenerator.Domain.Interfaces.Auditing;
 
 namespace EnvelopeGenerator.Domain.Entities
-#if NET
-    ;
-#elif NETFRAMEWORK
-    {
-#endif
-
-[Table("TBSIG_DOCUMENT_STATUS", Schema = "dbo")]
-public class DocumentStatus : IHasEnvelope, IHasReceiver, IEntity
 {
-    public DocumentStatus()
+    [Table("TBSIG_DOCUMENT_STATUS", Schema = "dbo")]
+    public class DocumentStatus : IHasEnvelope, IHasReceiver, IEntity, IHasAddedWhen, IHasChangedWhen
     {
-        // TODO: * check Form Application and remove default value
+        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; }
 
-    [Column("VALUE", TypeName = "nvarchar(max)")]
-    public string Value { get; set; }
+        [Required]
+        [Column("ADDED_WHEN", TypeName = "datetime")]
+        public DateTime AddedWhen { get; set; }
 
-    [ForeignKey("EnvelopeId")]
-    public virtual Envelope
-#if NET
-        ?
+        [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
+            ?
 #endif
-        Envelope { get; set; }
+            Envelope { get; set; }
 
-    [ForeignKey("ReceiverId")]
-    public virtual Receiver
-#if NET
-        ?
+        [ForeignKey("ReceiverId")]
+        public virtual Receiver
+#if nullable
+            ?
 #endif
             Receiver { get; set; }
-}
-
-#if NETFRAMEWORK
     }
-#endif
+}

EnvelopeGenerator.Domain/Entities/ElementAnnotation.cs

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

EnvelopeGenerator.Domain/Entities/EmailTemplate.cs

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

EnvelopeGenerator.Domain/Entities/Envelope.cs

@@ -1,208 +1,205 @@
-using DigitalData.UserManager.Domain.Entities;
+using System;
+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
-#if NET
-    ;
-#elif NETFRAMEWORK
-    {
-#endif
-
-[Table("TBSIG_ENVELOPE", Schema = "dbo")]
-public class Envelope
 {
-    public Envelope()
+    [Table("TBSIG_ENVELOPE", Schema = "dbo")]
+    public class Envelope : IHasAddedWhen, IHasChangedWhen
     {
-        // TODO: * Check the Form App and remove the default value
+        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; }
-
-    [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 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,104 +1,94 @@
-using System.ComponentModel.DataAnnotations;
+using System;
+using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
 using DigitalData.Core.Abstractions.Interfaces;
 using EnvelopeGenerator.Domain.Interfaces;
-
-#if NETFRAMEWORK
-using System;
-#endif
+using EnvelopeGenerator.Domain.Interfaces.Auditing;
 
 namespace EnvelopeGenerator.Domain.Entities
-#if NET
-    ;
-#elif NETFRAMEWORK
-    {
-#endif
-
-[Table("TBSIG_ENVELOPE_RECEIVER", Schema = "dbo")]
-public class EnvelopeReceiver : IHasEnvelope, IHasReceiver, IEntity
 {
-    public EnvelopeReceiver()
+    [Table("TBSIG_ENVELOPE_RECEIVER", Schema = "dbo")]
+    public class EnvelopeReceiver : IHasEnvelope, IHasReceiver, IEntity, IHasAddedWhen, IHasChangedWhen
     {
+        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 NET
-        ?
+        [Column("COMPANY_NAME", TypeName = "nvarchar(128)")]
+        public string
+#if nullable
+            ?
 #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 NET
-        ?
+        [ForeignKey("EnvelopeId")]
+        public Envelope
+#if nullable
+            ?
 #endif
-            Envelope { get; set; }
+                Envelope { get; set; }
 
-    [ForeignKey("ReceiverId")]
-    public Receiver
-#if NET
-        ?
+        [ForeignKey("ReceiverId")]
+        public Receiver
+#if nullable
+            ?
 #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,14 +1,13 @@
-using System.ComponentModel.DataAnnotations.Schema;
+using System;
+using System.ComponentModel.DataAnnotations.Schema;
 using System.ComponentModel.DataAnnotations;
 using DigitalData.EmailProfilerDispatcher.Abstraction.Attributes;
-#if NETFRAMEWORK
-using System;
-#endif
+using EnvelopeGenerator.Domain.Interfaces.Auditing;
 
 namespace EnvelopeGenerator.Domain.Entities
 {
     [Table("TBSIG_ENVELOPE_RECEIVER_READ_ONLY")]
-    public class EnvelopeReceiverReadOnly
+    public class EnvelopeReceiverReadOnly : IHasChangedWhen, ICreationAuditable
     {
         [Key]
         [DatabaseGenerated(DatabaseGeneratedOption.Identity)]
@@ -42,16 +41,12 @@ namespace EnvelopeGenerator.Domain.Entities
 
         [Column("ADDED_WHEN")]
         [Required]
-        public DateTime
-#if NET
-            ?
-#endif
-            AddedWhen { get; set; }
+        public DateTime AddedWhen { get; set; }
 
         [Column("CHANGED_WHO")]
         [StringLength(100)]
         public string
-#if NET
+#if nullable
             ?
 #endif
             ChangedWho { get; set; }

EnvelopeGenerator.Domain/Entities/History.cs

@@ -1,84 +1,73 @@
-using DigitalData.UserManager.Domain.Entities;
+using System;
+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;
-
-
-#if NETFRAMEWORK
-using System;
-#endif
+using EnvelopeGenerator.Domain.Interfaces.Auditing;
 
 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; }
+    [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("ENVELOPE_ID")]
+        public int EnvelopeId { get; set; }
 
-    [Required]
-    [Column("USER_REFERENCE", TypeName = "nvarchar(128)")]
-    public string UserReference { get; set; }
+        [Required]
+        [Column("USER_REFERENCE", TypeName = "nvarchar(128)")]
+        public string UserReference { get; set; }
 
-    [Required]
-    [Column("STATUS")]
-    public EnvelopeStatus  Status { get; set; }
+        [Required]
+        [Column("STATUS")]
+        public EnvelopeStatus  Status { get; set; }
 
-    [Required]
-    [Column("ADDED_WHEN", TypeName = "datetime")]
-    [DatabaseGenerated(DatabaseGeneratedOption.Computed)]
-    public DateTime AddedWhen { 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
-        ?
+        [Column("ACTION_DATE", TypeName = "datetime")]
+        public DateTime? ChangedWhen { get; set; }
+        
+        [Column("COMMENT", TypeName = "nvarchar(max)")]
+        public string
+#if nullable
+            ?
 #endif
-        Comment { get; set; }
+            Comment { get; set; }
 
-    [ForeignKey("EnvelopeId")]
-    public virtual Envelope
-#if NET
-        ?
+        [ForeignKey("EnvelopeId")]
+        public virtual Envelope
+#if nullable
+            ?
 #endif
-        Envelope { get; set; }
+            Envelope { get; set; }
 
-    [ForeignKey("UserReference")]
-    public virtual User
-#if NET
-        ?
+        [ForeignKey("UserReference")]
+        public virtual User
+#if nullable
+            ?
 #endif
-        Sender { get; set; }
+            Sender { get; set; }
 
-    [ForeignKey("UserReference")]
-    public virtual Receiver
-#if NET
-        ?
+        [ForeignKey("UserReference")]
+        public virtual Receiver
+#if nullable
+            ?
 #endif
-        Receiver { get; set; }
+            Receiver { get; set; }
 
 #if NETFRAMEWORK
-    [NotMapped]
-    public string StatusTranslated => My.Resources.Model.ResourceManager.GetString(Status.ToString());
+        [NotMapped]
+        public string StatusTranslated => My.Resources.Model.ResourceManager.GetString(Status.ToString());
 #endif
-}
-
-#if NETFRAMEWORK
     }
-#endif
+}

EnvelopeGenerator.Domain/Entities/Receiver.cs

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

EnvelopeGenerator.Domain/Entities/Signature.cs

@@ -1,134 +1,130 @@
-using EnvelopeGenerator.Domain.Interfaces;
+using System;
+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
-#if NET
-    ;
-#elif NETFRAMEWORK
-    {
-#endif
-
-[Table("TBSIG_DOCUMENT_RECEIVER_ELEMENT", Schema = "dbo")]
-public class Signature : ISignature, IHasReceiver
 {
-    public Signature()
+    [Table("TBSIG_DOCUMENT_RECEIVER_ELEMENT", Schema = "dbo")]
+    public class Signature : ISignature, IHasReceiver, IHasAddedWhen, IUpdateAuditable
     {
-        // TODO: * Check the Form App and remove the default value
+        public Signature()
+        {
+            // TODO: * Check the Form App and remove the default value
 #if NETFRAMEWORK
-        Id = -1;
-        Required = false;
-        ReadOnly = false;
-        AnnotationIndex = 0;
+            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);
 #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

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

EnvelopeGenerator.Domain/Interfaces/Auditing/IHasAddedWhen.cs

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

EnvelopeGenerator.Domain/Interfaces/Auditing/IHasAddedWho.cs

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

EnvelopeGenerator.Domain/Interfaces/Auditing/IHasChangedWhen.cs

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

EnvelopeGenerator.Domain/Interfaces/Auditing/IHasChangedWho.cs

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

EnvelopeGenerator.Domain/Interfaces/Auditing/IUpdateAuditable.cs

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

EnvelopeGenerator.Domain/Interfaces/IHasEnvelope.cs

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

EnvelopeGenerator.Domain/Interfaces/IHasReceiver.cs

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