DTO für EnvelopeHistory-Erstellung hinzugefügt, asynchrone Record-Methode implementiert und Datenbank-Trigger für Envelope- und EnvelopeHistory-Entitäten konfiguriert.

EnvelopeGenerator.Application/Contracts/IEnvelopeHistoryService.cs

@@ -1,17 +1,20 @@
 using DigitalData.Core.Contracts.Application;
-using EnvelopeGenerator.Application.DTOs;
+using DigitalData.Core.DTO;
+using EnvelopeGenerator.Application.DTOs.EnvelopeHistory;
 using EnvelopeGenerator.Domain.Entities;
 using EnvelopeGenerator.Infrastructure.Contracts;
 using static EnvelopeGenerator.Common.Constants;
 
 namespace EnvelopeGenerator.Application.Contracts
 {
-    public interface IEnvelopeHistoryService : IBasicCRUDService<IEnvelopeHistoryRepository, EnvelopeHistoryDto, EnvelopeHistory, long>
+    public interface IEnvelopeHistoryService : ICRUDService<IEnvelopeHistoryRepository, EnvelopeHistoryCreateDto, EnvelopeHistoryDto, EnvelopeHistoryDto, EnvelopeHistory, long>
     {
         Task<int> CountAsync(int? envelopeId = null, string? userReference = null, int? status = null);
 
         Task<bool> AccessCodeAlreadyRequested(int envelopeId, string userReference);
 
         Task<bool> IsSigned(int envelopeId, string userReference);
+
+        Task<DataResult<long>> RecordAsync(int envelopeId, string userReference, EnvelopeStatus status);
     }
 }

EnvelopeGenerator.Application/DTOs/EnvelopeDto.cs

@@ -1,4 +1,5 @@
 using DigitalData.UserManager.Domain.Entities;
+using EnvelopeGenerator.Application.DTOs.EnvelopeHistory;
 using EnvelopeGenerator.Domain.Entities;
 
 namespace EnvelopeGenerator.Application.DTOs

EnvelopeGenerator.Application/DTOs/EnvelopeHistory/EnvelopeHistoryCreateDto.cs

@@ -0,0 +1,8 @@
+namespace EnvelopeGenerator.Application.DTOs.EnvelopeHistory
+{
+    public record EnvelopeHistoryCreateDto(
+        int EnvelopeId,
+        string UserReference,
+        int Status,
+        DateTime? ActionDate);
+}

EnvelopeGenerator.Application/DTOs/EnvelopeHistory/EnvelopeHistoryDto.cs

@@ -1,4 +1,4 @@
-namespace EnvelopeGenerator.Application.DTOs
+namespace EnvelopeGenerator.Application.DTOs.EnvelopeHistory
 {
     public record EnvelopeHistoryDto(
         long Id,

EnvelopeGenerator.Application/MappingProfiles/BasicDtoMappingProfile.cs

@@ -1,5 +1,6 @@
 using AutoMapper;
 using EnvelopeGenerator.Application.DTOs;
+using EnvelopeGenerator.Application.DTOs.EnvelopeHistory;
 using EnvelopeGenerator.Domain.Entities;
 
 namespace EnvelopeGenerator.Application.MappingProfiles
@@ -17,6 +18,7 @@ namespace EnvelopeGenerator.Application.MappingProfiles
             CreateMap<EnvelopeCertificate, EnvelopeCertificateDto>();
             CreateMap<EnvelopeDocument, EnvelopeDocumentDto>();
             CreateMap<EnvelopeHistory, EnvelopeHistoryDto>();
+            CreateMap<EnvelopeHistory, EnvelopeHistoryCreateDto>();
             CreateMap<EnvelopeReceiver, EnvelopeReceiverDto>();
             CreateMap<EnvelopeType, EnvelopeTypeDto>();
             CreateMap<Receiver, ReceiverDto>();
@@ -32,6 +34,7 @@ namespace EnvelopeGenerator.Application.MappingProfiles
             CreateMap<EnvelopeCertificateDto, EnvelopeCertificate>();
             CreateMap<EnvelopeDocumentDto, EnvelopeDocument>();
             CreateMap<EnvelopeHistoryDto, EnvelopeHistory>();
+            CreateMap<EnvelopeHistoryCreateDto, EnvelopeHistory>();
             CreateMap<EnvelopeReceiverDto, EnvelopeReceiver>();
             CreateMap<EnvelopeTypeDto, EnvelopeType>();
             CreateMap<ReceiverDto, Receiver>();

EnvelopeGenerator.Application/Services/EnvelopeHistoryService.cs

@@ -2,15 +2,16 @@
 using DigitalData.Core.Application;
 using Microsoft.Extensions.Localization;
 using EnvelopeGenerator.Application.Contracts;
-using EnvelopeGenerator.Application.DTOs;
 using EnvelopeGenerator.Domain.Entities;
 using EnvelopeGenerator.Infrastructure.Contracts;
 using static EnvelopeGenerator.Common.Constants;
 using EnvelopeGenerator.Application.Resources;
+using DigitalData.Core.DTO;
+using EnvelopeGenerator.Application.DTOs.EnvelopeHistory;
 
 namespace EnvelopeGenerator.Application.Services
 {
-    public class EnvelopeHistoryService : BasicCRUDService<IEnvelopeHistoryRepository, EnvelopeHistoryDto, EnvelopeHistory, long>, IEnvelopeHistoryService
+    public class EnvelopeHistoryService : CRUDService<IEnvelopeHistoryRepository, EnvelopeHistoryCreateDto, EnvelopeHistoryDto, EnvelopeHistoryDto, EnvelopeHistory, long>, IEnvelopeHistoryService
     {
         public EnvelopeHistoryService(IEnvelopeHistoryRepository repository, IStringLocalizer<Resource> localizer, IMapper mapper)
             : base(repository, localizer, mapper)
@@ -33,5 +34,12 @@ namespace EnvelopeGenerator.Application.Services
             envelopeId: envelopeId,
             userReference: userReference,
             status: (int) EnvelopeStatus.DocumentSigned) > 0;
+
+        public async Task<DataResult<long>> RecordAsync(int envelopeId, string userReference, EnvelopeStatus status) => 
+            await CreateAsync(new (EnvelopeId: envelopeId, UserReference: userReference, Status: (int)status, ActionDate: DateTime.Now))
+                .ThenAsync(
+                    Success: id => Result.Success(id),
+                    Fail: (mssg, ntc) => Result.Fail<long>().Message(mssg).Notice(ntc)
+                );
     }
 }

EnvelopeGenerator.Domain/Entities/EnvelopeHistory.cs

@@ -25,6 +25,7 @@ namespace EnvelopeGenerator.Domain.Entities
 
         [Required]
         [Column("ADDED_WHEN", TypeName = "datetime")]
+        [DatabaseGenerated(DatabaseGeneratedOption.Computed)]
         public DateTime AddedWhen { get; set; }
 
         [Column("ACTION_DATE", TypeName = "datetime")]

EnvelopeGenerator.Infrastructure/EGDbContext.cs

@@ -33,11 +33,6 @@ namespace DigitalData.UserManager.Infrastructure.Repositories
                 .WithOne()
                 .HasForeignKey(ed => ed.EnvelopeId);
 
-            //modelBuilder.Entity<Envelope>()
-            //    .HasMany(e => e.Receivers)
-            //    .WithOne(er => er.Envelope)
-            //    .HasForeignKey(er => er.EnvelopeId);
-
             modelBuilder.Entity<Envelope>()
                 .HasMany(e => e.History)
                 .WithOne()
@@ -53,10 +48,9 @@ namespace DigitalData.UserManager.Infrastructure.Repositories
                 .WithMany(ed => ed.Elements)
                 .HasForeignKey(dre => dre.DocumentId);
 
-            //modelBuilder.Entity<Receiver>()
+            // Configure entities to handle database triggers
-            //    .HasMany(e => e.EnvelopeReceivers)
+            modelBuilder.Entity<Envelope>().ToTable(tb => tb.HasTrigger("TBSIG_ENVELOPE_HISTORY_AFT_INS"));
-            //    .WithOne(er => er.Receiver)
+            modelBuilder.Entity<EnvelopeHistory>().ToTable(tb => tb.HasTrigger("TBSIG_ENVELOPE_HISTORY_AFT_INS"));
-            //    .HasForeignKey(er => er.ReceiverId);
 
             base.OnModelCreating(modelBuilder);
         }

EnvelopeGenerator.Web/Controllers/HomeController.cs

@@ -56,8 +56,8 @@ namespace EnvelopeGenerator.Web.Controllers
                         bool accessCodeAlreadyRequested = await _historyService.AccessCodeAlreadyRequested(envelopeId: er.Envelope!.Id, userReference: er.Receiver!.EmailAddress);
                         if (!accessCodeAlreadyRequested)
                         {
-                            // Send email with password
+                            await _historyService.RecordAsync(er.EnvelopeId, er.Receiver.EmailAddress, Constants.EnvelopeStatus.AccessCodeRequested);
-                            bool actionResult = database.Services.actionService.RequestAccessCode(response.Envelope, response.Receiver);
+
                             bool result = database.Services.emailService.SendDocumentAccessCodeReceivedEmail(response.Envelope, response.Receiver);
                         }
 
@@ -89,13 +89,12 @@ namespace EnvelopeGenerator.Web.Controllers
                     UserLanguage = _cultures.Default.Language;
                     return Redirect($"{Request.Headers["Referer"]}?culture={_cultures.Default.Language}");
                 }
-
+                else if (UserLanguage is not null && culture is not null)
-                if (UserLanguage is not null && culture is not null)
                 {
                     return Redirect($"Locked");
                 }
 
-                ViewData["UserLanguage"] = UserLanguage;
+                ViewData["UserLanguage"] = UserLanguage ?? culture;
 
                 return await _envRcvService.IsExisting(envelopeReceiverId: envelopeReceiverId).ThenAsync(
                     Success: isExisting => isExisting ? View().WithData("EnvelopeKey", envelopeReceiverId) : this.ViewEnvelopeNotFound(),

EnvelopeGenerator.Web/Controllers/Test/TestEnvelopeHistoryController.cs

@@ -1,13 +1,13 @@
 using DigitalData.Core.API;
 using EnvelopeGenerator.Application.Contracts;
-using EnvelopeGenerator.Application.DTOs;
+using EnvelopeGenerator.Application.DTOs.EnvelopeHistory;
 using EnvelopeGenerator.Domain.Entities;
 using EnvelopeGenerator.Infrastructure.Contracts;
 using Microsoft.AspNetCore.Mvc;
 
 namespace EnvelopeGenerator.Web.Controllers.Test
 {
-    public class TestEnvelopeHistoryController : TestControllerBase<IEnvelopeHistoryService, IEnvelopeHistoryRepository, EnvelopeHistoryDto, EnvelopeHistory, long>
+    public class TestEnvelopeHistoryController : CRUDControllerBase<IEnvelopeHistoryService, IEnvelopeHistoryRepository, EnvelopeHistoryCreateDto, EnvelopeHistoryDto, EnvelopeHistoryDto, EnvelopeHistory, long>
     {
         public TestEnvelopeHistoryController(ILogger<TestEnvelopeHistoryController> logger, IEnvelopeHistoryService service) : base(logger, service)
         {

EnvelopeGenerator.Web/appsettings.json

@@ -19,7 +19,7 @@
   },
   "PSPDFKitLicenseKey": null,
   /* The first format parameter {0} will be replaced by the nonce value. */
-  "TestCSP": true,
+  "TestCSP": false,
   "Content-Security-Policy": [
     "default-src 'self'",
     "script-src 'self' 'nonce-{0}' 'unsafe-inline' 'unsafe-eval' blob: data:",