From 2fb8af9a4ff2d2e9bc82fab8a045a6389e233fee Mon Sep 17 00:00:00 2001 From: Developer 02 Date: Fri, 20 Sep 2024 11:05:00 +0200 Subject: [PATCH] chore(api): Core-Bibliotheken und UserManager.Infrastructure auf 2.0.0.0 aktualisiert MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - Core-Bibliotheken und UserManager.Infrastructure in den API-Schichten auf Version 2.0.0.0 erhöht. --- .../DTOs/ConfigDto.cs | 12 ++- .../EnvelopeGenerator.GeneratorAPI.csproj | 6 +- .../EGDbContext.cs | 7 +- .../EnvelopeGenerator.Infrastructure.csproj | 1 + .../Controllers/Test/TestConfigController.cs | 3 +- .../Controllers/Test/TestControllerBase.cs | 5 +- .../Test/TestEnvelopeReceiverController.cs | 2 +- .../Views/Home/EnvelopeRejected.cshtml | 10 +- .../Views/Home/ShowEnvelope.cshtml | 92 ++++++++++--------- 9 files changed, 78 insertions(+), 60 deletions(-) diff --git a/EnvelopeGenerator.Application/DTOs/ConfigDto.cs b/EnvelopeGenerator.Application/DTOs/ConfigDto.cs index 751ab329..f96f131d 100644 --- a/EnvelopeGenerator.Application/DTOs/ConfigDto.cs +++ b/EnvelopeGenerator.Application/DTOs/ConfigDto.cs @@ -1,4 +1,7 @@ -namespace EnvelopeGenerator.Application.DTOs +using DigitalData.Core.Abstractions; +using System.Text.Json.Serialization; + +namespace EnvelopeGenerator.Application.DTOs { public record ConfigDto( string DocumentPath, @@ -8,5 +11,10 @@ string ExportPath, string DocumentPathDmz, string ExportPathDmz, - string DocumentPathMoveAftsend); + string DocumentPathMoveAftsend) : IUnique + { + [JsonIgnore] + [Obsolete("Configuration does not have an ID; it represents a single table in the database.")] + public int Id => throw new InvalidOperationException("This configuration does not support an ID as it represents a single row in the database."); + }; } \ No newline at end of file diff --git a/EnvelopeGenerator.GeneratorAPI/EnvelopeGenerator.GeneratorAPI.csproj b/EnvelopeGenerator.GeneratorAPI/EnvelopeGenerator.GeneratorAPI.csproj index d42159a2..2684ed2c 100644 --- a/EnvelopeGenerator.GeneratorAPI/EnvelopeGenerator.GeneratorAPI.csproj +++ b/EnvelopeGenerator.GeneratorAPI/EnvelopeGenerator.GeneratorAPI.csproj @@ -1,4 +1,4 @@ - + net7.0 @@ -7,8 +7,8 @@ - - + + diff --git a/EnvelopeGenerator.Infrastructure/EGDbContext.cs b/EnvelopeGenerator.Infrastructure/EGDbContext.cs index 877dfec9..449bd55e 100644 --- a/EnvelopeGenerator.Infrastructure/EGDbContext.cs +++ b/EnvelopeGenerator.Infrastructure/EGDbContext.cs @@ -6,10 +6,12 @@ using EnvelopeGenerator.Domain.Entities; using Microsoft.EntityFrameworkCore; using Group = DigitalData.UserManager.Domain.Entities.Group; using Module = DigitalData.UserManager.Domain.Entities.Module; +using DigitalData.EmailProfilerDispatcher; namespace EnvelopeGenerator.Infrastructure { - public class EGDbContext : DbContext, IUserManagerDbContext + //TODO: Adding EmailOut instead of EmailOut.Abst is not correct for the arch. Re-design EmailPut consedering this. IMailDbContext shoud move to Abstraction layer (hint: in this case using DBSet in abst. will be problem because entity framework will have to be added. + public class EGDbContext : DbContext, IUserManagerDbContext, IMailDbContext { public DbSet UserReceivers { get; set; } @@ -47,6 +49,8 @@ namespace EnvelopeGenerator.Infrastructure public DbSet UserReps { get; set; } + public DbSet EMailOuts { get; set; } + public EGDbContext(DbContextOptions options) : base(options) { UserReceivers = Set(); @@ -67,6 +71,7 @@ namespace EnvelopeGenerator.Infrastructure Modules = Set(); Users = Set(); UserReps = Set(); + EMailOuts = Set(); } protected override void OnModelCreating(ModelBuilder modelBuilder) diff --git a/EnvelopeGenerator.Infrastructure/EnvelopeGenerator.Infrastructure.csproj b/EnvelopeGenerator.Infrastructure/EnvelopeGenerator.Infrastructure.csproj index 399d3269..f295ff69 100644 --- a/EnvelopeGenerator.Infrastructure/EnvelopeGenerator.Infrastructure.csproj +++ b/EnvelopeGenerator.Infrastructure/EnvelopeGenerator.Infrastructure.csproj @@ -9,6 +9,7 @@ + all diff --git a/EnvelopeGenerator.Web/Controllers/Test/TestConfigController.cs b/EnvelopeGenerator.Web/Controllers/Test/TestConfigController.cs index ad7e0ec3..0117f542 100644 --- a/EnvelopeGenerator.Web/Controllers/Test/TestConfigController.cs +++ b/EnvelopeGenerator.Web/Controllers/Test/TestConfigController.cs @@ -1,10 +1,11 @@ using EnvelopeGenerator.Application.Contracts; using EnvelopeGenerator.Application.DTOs; using EnvelopeGenerator.Domain.Entities; +using DigitalData.Core.API; namespace EnvelopeGenerator.Web.Controllers.Test { - public class TestConfigController : TestControllerBase + public class TestConfigController : ReadControllerBase { public TestConfigController(ILogger logger, IConfigService service) : base(logger, service) { diff --git a/EnvelopeGenerator.Web/Controllers/Test/TestControllerBase.cs b/EnvelopeGenerator.Web/Controllers/Test/TestControllerBase.cs index e39b0ed8..b92ae934 100644 --- a/EnvelopeGenerator.Web/Controllers/Test/TestControllerBase.cs +++ b/EnvelopeGenerator.Web/Controllers/Test/TestControllerBase.cs @@ -1,6 +1,7 @@ using DigitalData.Core.API; using DigitalData.Core.Abstractions.Application; using Microsoft.AspNetCore.Mvc; +using DigitalData.Core.Abstractions; namespace EnvelopeGenerator.Web.Controllers.Test { @@ -8,10 +9,10 @@ namespace EnvelopeGenerator.Web.Controllers.Test [Route("api/test/[controller]")] public class TestControllerBase : BasicCRUDControllerBase where TCRUDService : ICRUDService - where TDto : class where TEntity : class + where TDto : class, IUnique where TEntity : class, IUnique { public TestControllerBase(ILogger logger, TCRUDService service) : base(logger, service) { } } -} +} \ No newline at end of file diff --git a/EnvelopeGenerator.Web/Controllers/Test/TestEnvelopeReceiverController.cs b/EnvelopeGenerator.Web/Controllers/Test/TestEnvelopeReceiverController.cs index a88a8887..592688de 100644 --- a/EnvelopeGenerator.Web/Controllers/Test/TestEnvelopeReceiverController.cs +++ b/EnvelopeGenerator.Web/Controllers/Test/TestEnvelopeReceiverController.cs @@ -8,7 +8,7 @@ using EnvelopeGenerator.Application.DTOs.EnvelopeReceiver; namespace EnvelopeGenerator.Web.Controllers.Test { - public class TestEnvelopeReceiverController : TestControllerBase + public class TestEnvelopeReceiverController : ReadControllerBase { public TestEnvelopeReceiverController(ILogger logger, IEnvelopeReceiverService service) : base(logger, service) { diff --git a/EnvelopeGenerator.Web/Views/Home/EnvelopeRejected.cshtml b/EnvelopeGenerator.Web/Views/Home/EnvelopeRejected.cshtml index d927d11d..7e7999ba 100644 --- a/EnvelopeGenerator.Web/Views/Home/EnvelopeRejected.cshtml +++ b/EnvelopeGenerator.Web/Views/Home/EnvelopeRejected.cshtml @@ -2,12 +2,12 @@ ViewData["Title"] = _localizer[WebKey.DocRejected]; } @{ - var nonce = _accessor.HttpContext?.Items["csp-nonce"] as string; + var nonce = _accessor.HttpContext?.Items["csp-nonce"] as string; } -@ using DigitalData.Core.DTO; -@ using EnvelopeGenerator.Application.DTOs; -@ using Newtonsoft.Json -@ using Newtonsoft.Json.Serialization +@using DigitalData.Core.DTO; +@using EnvelopeGenerator.Application.DTOs.EnvelopeReceiver +@using Newtonsoft.Json +@using Newtonsoft.Json.Serialization @model EnvelopeReceiverDto; @{ diff --git a/EnvelopeGenerator.Web/Views/Home/ShowEnvelope.cshtml b/EnvelopeGenerator.Web/Views/Home/ShowEnvelope.cshtml index fd46d857..8494d850 100644 --- a/EnvelopeGenerator.Web/Views/Home/ShowEnvelope.cshtml +++ b/EnvelopeGenerator.Web/Views/Home/ShowEnvelope.cshtml @@ -1,11 +1,10 @@ @{ var nonce = _accessor.HttpContext?.Items["csp-nonce"] as string; } -@ using DigitalData.Core.DTO; -@ using EnvelopeGenerator.Application.DTOs; -@ using Newtonsoft.Json -@ using Newtonsoft.Json.Serialization -@model EnvelopeReceiverDto; +@using EnvelopeGenerator.Application.DTOs.EnvelopeReceiver +@using Newtonsoft.Json +@using Newtonsoft.Json.Serialization +@model EnvelopeReceiverDto @{ ViewData["Title"] = _localizer[WebKey.SignDoc]; } @@ -21,40 +20,43 @@ }
-