Behebung von Post-Merge-Fehlern.

- CommonServices in den Ordner core verschieben

EnvelopeGenerator.CommonServices/Jobs/FinalizeDocument/FinalizeDocumentJob.vb

@@ -143,7 +143,9 @@ Namespace Jobs
                         Logger.Debug("Documents merged!")
 
                         Dim oOutputDirectoryPath = Path.Combine(Config.ExportPath, ParentFolderUID)
+                        Logger.Debug($"oOutputDirectoryPath is {oOutputDirectoryPath}")
                         If Not Directory.Exists(oOutputDirectoryPath) Then
+                            Logger.Debug($"Directory not existing. Creating ... ")
                             Directory.CreateDirectory(oOutputDirectoryPath)
                         End If
                         Dim oOutputFilePath = Path.Combine(oOutputDirectoryPath, $"{oEnvelope.Uuid}.pdf")
@@ -172,6 +174,7 @@ Namespace Jobs
                             Throw New ApplicationException("Envelope could not be finalized")
                         End If
                     Catch ex As Exception
+                        Logger.Error(ex)
                         Logger.Warn(ex, $"Unhandled exception while working envelope [{oId}]")
                     End Try
 

EnvelopeGenerator.Form/frmMain.vb

@@ -594,6 +594,8 @@ Public Class frmMain
     End Sub
 
     Private Sub BarButtonItem2_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles bbtnitm_ResendInvitation.ItemClick
+        Dim oHandle = SplashScreenManager.ShowOverlayForm(Me)
+        Try
             Dim oView As GridView = GridEnvelopes.FocusedView
             Dim selReceiver As Receiver
             If oView.Name = ViewReceivers.Name Then
@@ -619,6 +621,13 @@ Public Class frmMain
                     End If
                 End If
             Next
+        Catch ex As Exception
+        Logger.Error(ex)
+        Finally
+
+
+        End Try
+        SplashScreenManager.CloseOverlayForm(oHandle)
 
 
     End Sub

EnvelopeGenerator.Infrastructure/Executor/EnvelopeExecutor.cs

@@ -28,7 +28,7 @@ public class EnvelopeExecutor : SQLExecutor, IEnvelopeExecutor
         var envelopes = await connection.QueryAsync<Envelope>(formattedSql);
         var envelope = envelopes.FirstOrDefault()
             ?? throw new InvalidOperationException($"Envelope creation failed. Parameters:" +
-            $"userId={userId}, title='{title}', message='{message}', tfaEnabled={tfaEnabled}."); ;
+            $"userId={userId}, title='{title}', message='{message}', tfaEnabled={tfaEnabled}.");
 
         envelope.User = await _userRepository.ReadByIdAsync(envelope.UserId);
 

EnvelopeGenerator.Service/Scheduler_FinishEnvelope.vb

@@ -67,7 +67,7 @@ Public Class Scheduler_FinishEnvelope
 
             Await Scheduler.Start()
 
-            Logger.Info("Scheduler started!")
+            Logger.Debug("Scheduler started!")
         Catch ex As Exception
             Logger.Error(ex)
         End Try

EnvelopeGenerator.Service/Service.vb

@@ -34,7 +34,7 @@ Public Class Service
             TempFiles.Create()
 
             ' === Initialize Databases ===
-            Logger.Info("Inititalize Database ...")
+            Logger.Debug("Inititalize Database ...")
 
             If Config.ConnectionString = String.Empty Then
                 Throw New ApplicationException("Connection String is empty!")

EnvelopeGenerator.Web/Controllers/EnvelopeController.cs

@@ -1,27 +1,33 @@
-using DigitalData.Core.DTO;
-using EnvelopeGenerator.CommonServices;
+using EnvelopeGenerator.CommonServices;
 using EnvelopeGenerator.Web.Services;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
 using System.Text.Encodings.Web;
-using static EnvelopeGenerator.CommonServices.Constants;
 using EnvelopeGenerator.Extensions;
 using EnvelopeGenerator.Application.Contracts.Services;
+using static EnvelopeGenerator.Domain.Constants;
+using EnvelopeGenerator.Domain.Entities;
+using EnvelopeGenerator.Domain;
+using DigitalData.Core.Abstraction.Application.DTO;
 
-namespace EnvelopeGenerator.Web.Controllers
+namespace EnvelopeGenerator.Web.Controllers;
+
+[Authorize(Roles = ReceiverRole.FullyAuth)]
+[ApiController]
+[Route("api/[controller]")]
+public class EnvelopeController : BaseController
 {
-    [Authorize(Roles = ReceiverRole.FullyAuth)]
-    [ApiController]
-    [Route("api/[controller]")]
-    public class EnvelopeController : BaseController
-    {
     private readonly EnvelopeOldService envelopeService;
     private readonly ActionService? actionService;
     private readonly UrlEncoder _urlEncoder;
+    [Obsolete("Use MediatR")]
     private readonly IEnvelopeHistoryService _histService;
+    [Obsolete("Use MediatR")]
     private readonly IReceiverService _receiverService;
+    [Obsolete("Use MediatR")]
     private readonly IEnvelopeReceiverService _envRcvService;
 
+    [Obsolete("Use MediatR")]
     public EnvelopeController(DatabaseService database,
         EnvelopeOldService envelope,
         ILogger<EnvelopeController> logger, UrlEncoder urlEncoder,
@@ -38,6 +44,7 @@ namespace EnvelopeGenerator.Web.Controllers
     }
 
     [NonAction]
+    [Obsolete("Use MediatR")]
     public async Task<IActionResult> Get([FromRoute] string envelopeKey)
     {
         try
@@ -66,6 +73,7 @@ namespace EnvelopeGenerator.Web.Controllers
 
     [Authorize(Roles = ReceiverRole.FullyAuth)]
     [HttpPost("{envelopeKey}")]
+    [Obsolete("Use MediatR")]
     public async Task<IActionResult> Update(string envelopeKey, int index)
     {
         try
@@ -91,12 +99,12 @@ namespace EnvelopeGenerator.Web.Controllers
 
             string? annotationData = await envelopeService.EnsureValidAnnotationData(Request);
 
-                envelopeService.InsertDocumentStatus(new Common.DocumentStatus()
+            envelopeService.InsertDocumentStatus(new Domain.Entities.DocumentStatus()
             {
                 EnvelopeId = response.Envelope.Id,
                 ReceiverId = response.Receiver.Id,
                 Value = annotationData,
-                    Status = Common.Constants.DocumentStatus.Signed
+                Status = Constants.DocumentStatus.Signed
             });
 
             var signResult = actionService?.SignEnvelope(response.Envelope, response.Receiver);
@@ -112,6 +120,7 @@ namespace EnvelopeGenerator.Web.Controllers
 
     [Authorize(Roles = ReceiverRole.FullyAuth)]
     [HttpPost("reject")]
+    [Obsolete("Use DigitalData.Core.Exceptions and .Middleware")]
     public async Task<IActionResult> Reject([FromBody] string? reason = null)
     {
         try
@@ -149,5 +158,4 @@ namespace EnvelopeGenerator.Web.Controllers
             return StatusCode(StatusCodes.Status500InternalServerError);
         }
     }
-    }
 }

EnvelopeGenerator.Web/Controllers/HomeController.cs

@@ -1,5 +1,4 @@
-using EnvelopeGenerator.CommonServices;
-using EnvelopeGenerator.Web.Services;
+using EnvelopeGenerator.Web.Services;
 using Microsoft.AspNetCore.Authentication.Cookies;
 using Microsoft.AspNetCore.Authentication;
 using Microsoft.AspNetCore.Mvc;
@@ -8,33 +7,40 @@ using Microsoft.AspNetCore.Authorization;
 using DigitalData.Core.API;
 using EnvelopeGenerator.Extensions;
 using Microsoft.Extensions.Localization;
-using DigitalData.Core.DTO;
 using Microsoft.AspNetCore.Localization;
 using EnvelopeGenerator.Web.Models;
 using EnvelopeGenerator.Application.Resources;
 using EnvelopeGenerator.Application.DTOs.EnvelopeReceiver;
-using static EnvelopeGenerator.CommonServices.Constants;
 using Ganss.Xss;
 using Newtonsoft.Json;
 using EnvelopeGenerator.Application.DTOs;
 using DigitalData.Core.Client;
 using OtpNet;
 using EnvelopeGenerator.Application.Contracts.Services;
+using static EnvelopeGenerator.Domain.Constants;
+using DigitalData.Core.Abstraction.Application.DTO;
+using EnvelopeGenerator.Domain.Entities;
 
 namespace EnvelopeGenerator.Web.Controllers;
 
 public class HomeController : ViewControllerBase
 {
     private readonly EnvelopeOldService envelopeOldService;
+    [Obsolete("Use MediatR")]
     private readonly IEnvelopeReceiverService _envRcvService;
+    [Obsolete("Use MediatR")]
     private readonly IEnvelopeHistoryService _historyService;
     private readonly IConfiguration _configuration;
+    [Obsolete("Use MediatR")]
     private readonly IEnvelopeMailService _mailService;
+    [Obsolete("Use MediatR")]
     private readonly IEnvelopeReceiverReadOnlyService _readOnlyService;
     private readonly IAuthenticator _authenticator;
+    [Obsolete("Use MediatR")]
     private readonly IReceiverService _rcvService;
     private readonly IEnvelopeSmsHandler _envSmsHandler;
 
+    [Obsolete("Use MediatR")]
     public HomeController(EnvelopeOldService envelopeOldService, ILogger<HomeController> logger, IEnvelopeReceiverService envelopeReceiverService, IEnvelopeHistoryService historyService, IStringLocalizer<Resource> localizer, IConfiguration configuration, HtmlSanitizer sanitizer, Cultures cultures, IEnvelopeMailService envelopeMailService, IEnvelopeReceiverReadOnlyService readOnlyService, IAuthenticator authenticator, IReceiverService receiverService, IEnvelopeSmsHandler envelopeSmsService) : base(logger, sanitizer, cultures, localizer)
     {
         this.envelopeOldService = envelopeOldService;
@@ -69,6 +75,7 @@ public class HomeController : ViewControllerBase
     }
 
     [HttpGet("EnvelopeKey/{envelopeReceiverId}")]
+    [Obsolete("Use MediatR")]
     public async Task<IActionResult> MainAsync([FromRoute] string envelopeReceiverId, [FromQuery] string? culture = null)
     {
         try
@@ -131,6 +138,7 @@ public class HomeController : ViewControllerBase
     }
 
     [HttpGet("EnvelopeKey/{envelopeReceiverId}/Locked")]
+    [Obsolete("Use DigitalData.Core.Exceptions and .Middleware")]
     public async Task<IActionResult> EnvelopeLocked([FromRoute] string envelopeReceiverId)
     {
         try
@@ -401,6 +409,7 @@ public class HomeController : ViewControllerBase
 
     [Authorize(Roles = ReceiverRole.FullyAuth)]
     [HttpGet("EnvelopeKey/{envelopeReceiverId}/Success")]
+    [Obsolete("Use DigitalData.Core.Exceptions and .Middleware")]
     public async Task<IActionResult> EnvelopeSigned(string envelopeReceiverId)
     {
         try
@@ -412,7 +421,7 @@ public class HomeController : ViewControllerBase
                     if(!isExisting)
                         return this.ViewEnvelopeNotFound();
 
-                    Common.EnvelopeReceiver response = await envelopeOldService.LoadEnvelope(envelopeReceiverId);
+                    EnvelopeReceiver response = await envelopeOldService.LoadEnvelope(envelopeReceiverId);
                     if (!envelopeOldService.ReceiverAlreadySigned((Envelope)response.Envelope, (int)response.Receiver.Id))
                         return base.Redirect($"/EnvelopeKey/{envelopeReceiverId}/Locked");
 
@@ -436,6 +445,7 @@ public class HomeController : ViewControllerBase
 
     [Authorize(Roles = ReceiverRole.FullyAuth)]
     [HttpGet("EnvelopeKey/{envelopeReceiverId}/Rejected")]
+    [Obsolete("Use MediatR")]
     public async Task<IActionResult> EnvelopeRejected(string envelopeReceiverId)
     {
         try
@@ -467,6 +477,7 @@ public class HomeController : ViewControllerBase
     }
 
     [HttpGet("EnvelopeKey/{readOnlyKey}/ReadOnly")]
+    [Obsolete("Use MediatR")]
     public async Task<IActionResult> EnvelopeReceiverReadOnly([FromRoute] string readOnlyKey)
     {
         try

EnvelopeGenerator.Web/Controllers/ReadOnlyController.cs

@@ -1,10 +1,10 @@
-using DigitalData.Core.DTO;
+using DigitalData.Core.Abstraction.Application.DTO;
 using EnvelopeGenerator.Application.Contracts.Services;
 using EnvelopeGenerator.Application.DTOs.EnvelopeReceiverReadOnly;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
 using Newtonsoft.Json;
-using static EnvelopeGenerator.CommonServices.Constants;
+using static EnvelopeGenerator.Domain.Constants;
 
 namespace EnvelopeGenerator.Web.Controllers
 {
@@ -14,12 +14,16 @@ namespace EnvelopeGenerator.Web.Controllers
     {
         private readonly ILogger<ReadOnlyController> _logger;
 
+        [Obsolete("Use MediatR")]
         private readonly IEnvelopeReceiverReadOnlyService _erroService;
 
+        [Obsolete("Use MediatR")]
         private readonly IEnvelopeMailService _mailService;
 
+        [Obsolete("Use MediatR")]
         private readonly IEnvelopeHistoryService _histService;
 
+        [Obsolete("Use MediatR")]
         public ReadOnlyController(ILogger<ReadOnlyController> logger, IEnvelopeReceiverReadOnlyService erroService, IEnvelopeMailService mailService, IEnvelopeHistoryService histService)
         {
             _logger = logger;
@@ -30,6 +34,7 @@ namespace EnvelopeGenerator.Web.Controllers
 
         [HttpPost]
         [Authorize(Roles = ReceiverRole.FullyAuth)]
+        [Obsolete("Use MediatR")]
         public async Task<IActionResult> CreateAsync([FromBody] EnvelopeReceiverReadOnlyCreateDto createDto)
         {
             try
@@ -62,7 +67,7 @@ namespace EnvelopeGenerator.Web.Controllers
                 }
 
                 //read new entity
-                var read_res = await _erroService.ReadByIdAsync(creation_res.Data);
+                var read_res = await _erroService.ReadByIdAsync(creation_res.Data.Id);
                 if (read_res.IsFailed)
                 {
                     _logger.LogNotice(creation_res);
@@ -76,7 +81,7 @@ namespace EnvelopeGenerator.Web.Controllers
                 {
                     //TODO: implement multi-threading to history process (Task)
                     //TODO: remove casting after change the id type
-                    var hist_res = await _histService.RecordAsync((int)createDto.EnvelopeId, createDto.AddedWho, Common.Constants.EnvelopeStatus.EnvelopeShared);
+                    var hist_res = await _histService.RecordAsync((int)createDto.EnvelopeId, createDto.AddedWho, EnvelopeStatus.EnvelopeShared);
                     if (hist_res.IsFailed)
                     {
                         _logger.LogError("Although the envelope was sent as read-only, the EnvelopeShared hisotry could not be saved. Create DTO:\n{createDto}", JsonConvert.SerializeObject(createDto));

EnvelopeGenerator.Web/Controllers/TFARegController.cs

@@ -4,25 +4,28 @@ using Microsoft.AspNetCore.Mvc;
 using EnvelopeGenerator.Extensions;
 using Microsoft.Extensions.Localization;
 using EnvelopeGenerator.Application.Resources;
-using DigitalData.Core.DTO;
 using EnvelopeGenerator.Application.Extensions;
 using Microsoft.Extensions.Options;
 using Microsoft.AspNetCore.Authorization;
-using static EnvelopeGenerator.CommonServices.Constants;
 using Microsoft.AspNetCore.Authentication.Cookies;
 using Microsoft.AspNetCore.Authentication;
 using EnvelopeGenerator.Application.Contracts.Services;
+using DigitalData.Core.Abstraction.Application.DTO;
+using static EnvelopeGenerator.Domain.Constants;
 
 namespace EnvelopeGenerator.Web.Controllers;
 
 //TODO: Add authorization as well as limiting the link duration (intermediate token with different role) or sign it
 public class TFARegController : ViewControllerBase
 {
+    [Obsolete("Use MediatR")]
     private readonly IEnvelopeReceiverService _envRcvService;
     private readonly IAuthenticator _authenticator;
+    [Obsolete("Use MediatR")]
     private readonly IReceiverService _rcvService;
     private readonly TFARegParams _params;
 
+    [Obsolete("Use MediatR")]
     public TFARegController(ILogger<TFARegController> logger, HtmlSanitizer sanitizer, Cultures cultures, IStringLocalizer<Resource> localizer, IEnvelopeReceiverService erService, IAuthenticator authenticator, IReceiverService receiverService, IOptions<TFARegParams> tfaRegParamsOptions) : base(logger, sanitizer, cultures, localizer)
     {
         _envRcvService = erService;
@@ -34,6 +37,7 @@ public class TFARegController : ViewControllerBase
     //TODO: move under auth route
     [Authorize]
     [HttpGet("tfa/{envelopeReceiverId}")]
+    [Obsolete("Use MediatR")]
     public async Task<IActionResult> Reg(string envelopeReceiverId)
     {
         try

EnvelopeGenerator.Web/Controllers/Test/TestControllerBase.cs

@@ -1,18 +1,18 @@
 using DigitalData.Core.API;
 using DigitalData.Core.Abstraction.Application;
 using Microsoft.AspNetCore.Mvc;
-using DigitalData.Core.Abstractions;
 
-namespace EnvelopeGenerator.Web.Controllers.Test
-{
-    [ApiController]
-    [Route("api/test/[controller]")]
-    public class TestControllerBase<TCRUDService, TDto, TEntity, TId> : BasicCRUDControllerBase<TCRUDService, TDto, TEntity, TId> 
+namespace EnvelopeGenerator.Web.Controllers.Test;
+
+[ApiController]
+[Route("api/test/[controller]")]
+[Obsolete("Use MediatR")]
+public class TestControllerBase<TCRUDService, TDto, TEntity, TId> : BasicCRUDControllerBase<TCRUDService, TDto, TEntity, TId> 
     where TCRUDService : ICRUDService<TDto, TDto, TEntity, TId>
-        where TDto : class, IUnique<TId> where TEntity : class, IUnique<TId>
-    {
+    where TDto : class
+    where TEntity : class
+{
     public TestControllerBase(ILogger logger, TCRUDService service) : base(logger, service)
     {
     }
-    }
 }

EnvelopeGenerator.Web/Controllers/Test/TestDocumentStatusController.cs

@@ -2,13 +2,12 @@
 using EnvelopeGenerator.Application.DTOs;
 using EnvelopeGenerator.Domain.Entities;
 
-namespace EnvelopeGenerator.Web.Controllers.Test
+namespace EnvelopeGenerator.Web.Controllers.Test;
+
+[Obsolete("Use MediatR")]
+public class TestDocumentStatusController : TestControllerBase<IDocumentStatusService, DocumentStatusDto, DocumentStatus, int>
 {
-    public class TestDocumentStatusController : TestControllerBase<IDocumentStatusService, DocumentStatusDto, DocumentStatus, int>
-    {
     public TestDocumentStatusController(ILogger<TestDocumentStatusController> logger, IDocumentStatusService service) : base(logger, service)
     {
-
-        }
     }
 }

EnvelopeGenerator.Web/Controllers/Test/TestEmailTemplateController.cs

@@ -1,19 +1,21 @@
-using DigitalData.Core.DTO;
+using DigitalData.Core.Abstraction.Application.DTO;
 using EnvelopeGenerator.Application.Contracts.Services;
 using EnvelopeGenerator.Application.DTOs;
 using EnvelopeGenerator.Domain.Entities;
 using Microsoft.AspNetCore.Mvc;
-using static EnvelopeGenerator.CommonServices.Constants;
+using static EnvelopeGenerator.Domain.Constants;
 
-namespace EnvelopeGenerator.Web.Controllers.Test
+namespace EnvelopeGenerator.Web.Controllers.Test;
+
+[Obsolete("Use MediatR")]
+public class TestEmailTemplateController : TestControllerBase<IEmailTemplateService, EmailTemplateDto, EmailTemplate, int>
 {
-    public class TestEmailTemplateController : TestControllerBase<IEmailTemplateService, EmailTemplateDto, EmailTemplate, int>
-    {
     public TestEmailTemplateController(ILogger<TestEmailTemplateController> logger, IEmailTemplateService service) : base(logger, service)
     {
     }
 
     [HttpGet]
+    [Obsolete("Use MediatR")]
     public virtual async Task<IActionResult> GetAll([FromQuery] string? tempType = null)
     {
         return tempType is null
@@ -29,5 +31,4 @@ namespace EnvelopeGenerator.Web.Controllers.Test
 
     [NonAction]
     public override Task<IActionResult> GetAll() => base.GetAll();
-    }
 }

EnvelopeGenerator.Web/Controllers/Test/TestEnvelopeCertificateController.cs

@@ -2,13 +2,13 @@
 using EnvelopeGenerator.Application.DTOs;
 using EnvelopeGenerator.Domain.Entities;
 
-namespace EnvelopeGenerator.Web.Controllers.Test
+namespace EnvelopeGenerator.Web.Controllers.Test;
+
+[Obsolete("Use MediatR")]
+public class TestEnvelopeCertificateController : TestControllerBase<IEnvelopeCertificateService, EnvelopeCertificateDto, EnvelopeCertificate, int>
 {
-    public class TestEnvelopeCertificateController : TestControllerBase<IEnvelopeCertificateService, EnvelopeCertificateDto, EnvelopeCertificate, int>
-    {
     public TestEnvelopeCertificateController(ILogger<TestEnvelopeCertificateController> logger, IEnvelopeCertificateService service) : base(logger, service)
     {
 
     }
-    }
 }

EnvelopeGenerator.Web/Controllers/Test/TestEnvelopeDocumentController.cs

@@ -4,6 +4,7 @@ using EnvelopeGenerator.Domain.Entities;
 
 namespace EnvelopeGenerator.Web.Controllers.Test;
 
+[Obsolete("Use MediatR")]
 public class TestEnvelopeDocumentController : TestControllerBase<IEnvelopeDocumentService, EnvelopeDocumentDto, EnvelopeDocument, int>
 {
     public TestEnvelopeDocumentController(ILogger<TestEnvelopeDocumentController> logger, IEnvelopeDocumentService service) : base(logger, service)

EnvelopeGenerator.Web/Controllers/Test/TestEnvelopeHistoryController.cs

@@ -3,9 +3,11 @@ using EnvelopeGenerator.Application.Contracts.Services;
 using EnvelopeGenerator.Application.DTOs.EnvelopeHistory;
 using EnvelopeGenerator.Domain.Entities;
 using Microsoft.AspNetCore.Mvc;
+using static EnvelopeGenerator.Domain.Constants;
 
 namespace EnvelopeGenerator.Web.Controllers.Test;
 
+[Obsolete("Use MediatR")]
 public class TestEnvelopeHistoryController : CRUDControllerBase<IEnvelopeHistoryService, EnvelopeHistoryCreateDto, EnvelopeHistoryDto, EnvelopeHistoryDto, EnvelopeHistory, long>
 {
     public TestEnvelopeHistoryController(ILogger<TestEnvelopeHistoryController> logger, IEnvelopeHistoryService service) : base(logger, service)
@@ -13,7 +15,7 @@ public class TestEnvelopeHistoryController : CRUDControllerBase<IEnvelopeHistory
     }
 
     [HttpGet("Count")]
-    public async Task<IActionResult> Count(int? envelopeId = null, string? userReference = null, int? status = null)
+    public async Task<IActionResult> Count(int? envelopeId = null, string? userReference = null, EnvelopeStatus? status = null)
     {
         return Ok(await _service.CountAsync(envelopeId, userReference, status));
     }
@@ -25,7 +27,7 @@ public class TestEnvelopeHistoryController : CRUDControllerBase<IEnvelopeHistory
     }
 
     [HttpGet]
-    public async Task<IActionResult> GetAsyncWith(int? envelopeId = null, string? userReference = null, int? status = null)
+    public async Task<IActionResult> GetAsyncWith(int? envelopeId = null, string? userReference = null, EnvelopeStatus? status = null)
     {
         return Ok(await _service.ReadAsync(envelopeId: envelopeId, userReference: userReference, status: status));
     }

EnvelopeGenerator.Web/Controllers/Test/TestEnvelopeMailController.cs

@@ -1,19 +1,21 @@
-using DigitalData.Core.DTO;
+using DigitalData.Core.Abstraction.Application.DTO;
 using EnvelopeGenerator.Application.Contracts.Services;
 using EnvelopeGenerator.Application.DTOs.EnvelopeReceiver;
 using Microsoft.AspNetCore.Mvc;
-using System.Net;
 
-namespace EnvelopeGenerator.Web.Controllers.Test
+namespace EnvelopeGenerator.Web.Controllers.Test;
+
+[ApiController]
+[Route("api/test/[controller]")]
+public class TestEnvelopeMailController : ControllerBase
 {
-    [ApiController]
-	[Route("api/test/[controller]")]
-	public class TestEnvelopeMailController : ControllerBase
-	{
 	private readonly ILogger<TestEnvelopeMailController> _logger;
+    [Obsolete("Use MediatR")]
     private readonly IEnvelopeMailService _mailService;
+    [Obsolete("Use MediatR")]
     private readonly IEnvelopeReceiverService _envRcvService;
 
+    [Obsolete("Use MediatR")]
     public TestEnvelopeMailController(ILogger<TestEnvelopeMailController> logger, IEnvelopeMailService envelopeMailService, IEnvelopeReceiverService envelopeReceiverService)
 	{
 		_logger = logger;
@@ -22,6 +24,7 @@ namespace EnvelopeGenerator.Web.Controllers.Test
 	}
 
 	[HttpGet]
+    [Obsolete("Use MediatR")]
     public async Task<IActionResult> SendAccessCode([FromQuery] string envelopeReceiverId = "ZDlmYjZmYjctNTBhNS00NTcyLWI5NTQtYzJjYmY4N2UwZmZhOjowRDI3MkEwNTdGMjRBMkY3MEZDMzM3QkRBQzA1MjYxRjU3NTI2QzgxQ0IyMUE5NzE1RjA1NTJFQzdFNjIwNjY1")
 	{
 		return await _envRcvService.ReadByEnvelopeReceiverIdAsync(envelopeReceiverId: envelopeReceiverId).ThenAsync<EnvelopeReceiverDto, IActionResult>(
@@ -44,5 +47,4 @@ namespace EnvelopeGenerator.Web.Controllers.Test
 				return StatusCode(500, notices);
 			});
 	}
-	}
 }

EnvelopeGenerator.Web/Controllers/Test/TestEnvelopeReceiverController.cs

@@ -1,15 +1,16 @@
 using DigitalData.Core.API;
-using DigitalData.Core.DTO;
 using EnvelopeGenerator.Extensions;
 using EnvelopeGenerator.Domain.Entities;
 using Microsoft.AspNetCore.Mvc;
 using EnvelopeGenerator.Application.DTOs.EnvelopeReceiver;
 using EnvelopeGenerator.Application.Contracts.Services;
+using DigitalData.Core.Abstraction.Application.DTO;
 
-namespace EnvelopeGenerator.Web.Controllers.Test
+namespace EnvelopeGenerator.Web.Controllers.Test;
+
+[Obsolete("Use MediatR")]
+public class TestEnvelopeReceiverController : ReadControllerBase<IEnvelopeReceiverService, EnvelopeReceiverDto, EnvelopeReceiver, (int Envelope, int Receiver)>
 {
-    public class TestEnvelopeReceiverController : ReadControllerBase<IEnvelopeReceiverService, EnvelopeReceiverDto, EnvelopeReceiver, (int Envelope, int Receiver)>
-    {
     public TestEnvelopeReceiverController(ILogger<TestEnvelopeReceiverController> logger, IEnvelopeReceiverService service) : base(logger, service)
     {
     }
@@ -62,5 +63,4 @@ namespace EnvelopeGenerator.Web.Controllers.Test
         else
             return Ok((uuid ?? string.Empty, signature ?? string.Empty).EncodeEnvelopeReceiverId());
     }
-    }
 }

EnvelopeGenerator.Web/Controllers/Test/TestEnvelopeTypeController.cs

@@ -4,6 +4,7 @@ using EnvelopeGenerator.Domain.Entities;
 
 namespace EnvelopeGenerator.Web.Controllers.Test;
 
+[Obsolete("Use MediatR")]
 public class TestEnvelopeTypeController : TestControllerBase<IEnvelopeTypeService, EnvelopeTypeDto, EnvelopeType, int>
 {
     public TestEnvelopeTypeController(ILogger<TestEnvelopeTypeController> logger, IEnvelopeTypeService service) : base(logger, service)

EnvelopeGenerator.Web/Controllers/Test/TestUserReceiverController.cs

@@ -2,13 +2,13 @@
 using EnvelopeGenerator.Application.DTOs;
 using EnvelopeGenerator.Domain.Entities;
 
-namespace EnvelopeGenerator.Web.Controllers.Test
+namespace EnvelopeGenerator.Web.Controllers.Test;
+
+[Obsolete("Use MediatR")]
+public class TestUserReceiverController : TestControllerBase< IUserReceiverService, UserReceiverDto, UserReceiver, int>
 {
-    public class TestUserReceiverController : TestControllerBase< IUserReceiverService, UserReceiverDto, UserReceiver, int>
-    {
     public TestUserReceiverController(ILogger<TestUserReceiverController> logger, IUserReceiverService service) : base(logger, service)
     {
 
     }
-    }
 }

EnvelopeGenerator.Web/Controllers/Test/TestViewController.cs

@@ -1,12 +1,12 @@
-using EnvelopeGenerator.CommonServices;
+using EnvelopeGenerator.Domain.Entities;
 using EnvelopeGenerator.Web.Services;
 using Microsoft.AspNetCore.Mvc;
 
-namespace EnvelopeGenerator.Web.Controllers.Test
+namespace EnvelopeGenerator.Web.Controllers.Test;
+
+[Route("api/test/[controller]")]
+public class TestViewController : BaseController
 {
-    [Route("api/test/[controller]")]
-    public class TestViewController : BaseController
-    {
     private readonly EnvelopeOldService envelopeOldService;
     private readonly IConfiguration _config;
 
@@ -52,5 +52,4 @@ namespace EnvelopeGenerator.Web.Controllers.Test
             return View("AnnotationIndex");
         }         
     }
-    }
 }

EnvelopeGenerator.Web/Services/EnvelopeOldService.cs

@@ -1,20 +1,23 @@
 using EnvelopeGenerator.Application.Contracts.Services;
 using EnvelopeGenerator.CommonServices;
+using EnvelopeGenerator.Domain.Entities;
 using System.Text;
 
-namespace EnvelopeGenerator.Web.Services
+namespace EnvelopeGenerator.Web.Services;
+
+public class EnvelopeOldService
 {
-    public class EnvelopeOldService
-    {
     private readonly ReceiverModel receiverModel;
     private readonly EnvelopeModel envelopeModel;
     private readonly HistoryModel historyModel;
     
     private readonly DocumentStatusModel documentStatusModel;
 
+    [Obsolete("Use MediatR")]
     private readonly IConfigService _configService;
     private readonly ILogger<EnvelopeOldService> _logger;
 
+    [Obsolete("Use MediatR")]
     public EnvelopeOldService(DatabaseService database, IConfigService configService, ILogger<EnvelopeOldService> logger)
     {
         _logger = logger;
@@ -48,6 +51,7 @@ namespace EnvelopeGenerator.Web.Services
             throw new ArgumentNullException("ReceiverSignature");
     }
 
+    [Obsolete("Use MediatR")]
     public async Task<EnvelopeReceiver> LoadEnvelope(string pEnvelopeKey)
     {
         _logger.LogInformation("Loading Envelope by Key [{0}]", pEnvelopeKey);
@@ -150,6 +154,7 @@ namespace EnvelopeGenerator.Web.Services
         }
     }
 
+    [Obsolete("Use MediatR")]
     public async Task<EnvelopeDocument> GetDocument(int documentId, string envelopeKey)
     {
         EnvelopeReceiver response = await LoadEnvelope(envelopeKey);
@@ -168,7 +173,7 @@ namespace EnvelopeGenerator.Web.Services
         return document;
     }
 
-        public bool InsertDocumentStatus(Common.DocumentStatus documentStatus)
+    public bool InsertDocumentStatus(DocumentStatus documentStatus)
     {
         _logger.LogInformation("Saving annotation data..");
         return documentStatusModel.InsertOrUpdate(documentStatus);
@@ -182,5 +187,4 @@ namespace EnvelopeGenerator.Web.Services
 
         return bytes;
     }
-    }
 }

EnvelopeGenerator.Web/Views/Home/EnvelopeRejected.cshtml

@@ -4,7 +4,7 @@
 @{
 	var nonce = _accessor.HttpContext?.Items["csp-nonce"] as string;
 }
-@using DigitalData.Core.DTO;
+@using DigitalData.Core.Abstraction.Application.DTO;
 @using EnvelopeGenerator.Application.DTOs.EnvelopeReceiver
 @using Newtonsoft.Json
 @using Newtonsoft.Json.Serialization

EnvelopeGenerator.Web/Views/Home/ShowEnvelope.cshtml

@@ -2,7 +2,7 @@
     var nonce = _accessor.HttpContext?.Items["csp-nonce"] as string;
     var cImg = _cImgOpt.Value;
 }
-@using DigitalData.Core.DTO;
+@using DigitalData.Core.Abstraction.Application;
 @using EnvelopeGenerator.Application.DTOs;
 @using EnvelopeGenerator.Application.DTOs.EnvelopeReceiver
 @using EnvelopeGenerator.Application.DTOs.EnvelopeReceiverReadOnly

EnvelopeGenerator.Web/Views/TestView/DebugEnvelopes.cshtml

@@ -1,5 +1,6 @@
 @using EnvelopeGenerator.CommonServices;
-@using static EnvelopeGenerator.CommonServices.Constants;
+@using EnvelopeGenerator.Domain.Entities;
+@using static EnvelopeGenerator.Domain.Constants;
 @{
     ViewData["Title"] = "Debug";
 }
@@ -13,7 +14,7 @@
 
     IEnumerable<IGrouping<EnvelopeStatus, Envelope>> groupEnvelopes(List<Envelope> envelopes)
     {
-        return envelopes.GroupBy(item => item.Status).OrderBy(item => (int)item.Key);
+        return envelopes.GroupBy(item => (EnvelopeStatus) item.Status).OrderBy(item => item.Key);
     }
 }
 

EnvelopeGenerator.sln

@@ -53,8 +53,8 @@ Global
 		{6D56C01F-D6CB-4D8A-BD3D-4FD34326998C}.Release|Any CPU.Build.0 = Debug|Any CPU
 		{6EA0C51F-C2B1-4462-8198-3DE0B32B74F8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{6EA0C51F-C2B1-4462-8198-3DE0B32B74F8}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{6EA0C51F-C2B1-4462-8198-3DE0B32B74F8}.Release|Any CPU.ActiveCfg = Debug|Any CPU
-		{6EA0C51F-C2B1-4462-8198-3DE0B32B74F8}.Release|Any CPU.Build.0 = Debug|Any CPU
+		{6EA0C51F-C2B1-4462-8198-3DE0B32B74F8}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{6EA0C51F-C2B1-4462-8198-3DE0B32B74F8}.Release|Any CPU.Build.0 = Release|Any CPU
 		{5E0E17C0-FF5A-4246-BF87-1ADD85376A27}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{5E0E17C0-FF5A-4246-BF87-1ADD85376A27}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{5E0E17C0-FF5A-4246-BF87-1ADD85376A27}.Release|Any CPU.ActiveCfg = Debug|Any CPU