From b43b1ef866652fd4184e952781ab682a36411c95 Mon Sep 17 00:00:00 2001 From: Developer 02 Date: Thu, 4 Apr 2024 08:58:03 +0200 Subject: [PATCH] =?UTF-8?q?Implementierte=20individuelle=20Controller=20f?= =?UTF-8?q?=C3=BCr=20alle=20Tabellen=20unter=20Verwendung=20der=20WebCore.?= =?UTF-8?q?API=20Bibliothek.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../DTOs/ConfigDto.cs | 1 - .../DTOs/DocumentReceiverElementDto.cs | 10 +++---- .../Entities/DocumentReceiverElement.cs | 12 ++++----- .../Entities/EnvelopeReceiver.cs | 3 +-- .../EGDbContext.cs | 5 ++-- .../Controllers/ConfigTestController.cs | 26 ------------------- .../EnvelopeDocumentTestController.cs | 15 ----------- .../Controllers/TestConfigController.cs | 16 ++++++++++++ .../TestDocumentReceiverElementController.cs | 16 ++++++++++++ .../TestDocumentStatusController.cs | 16 ++++++++++++ .../TestEmailTemplateController.cs | 16 ++++++++++++ .../TestEnvelopeCertificateController.cs | 16 ++++++++++++ .../Controllers/TestEnvelopeController.cs | 16 ++++++++++++ .../TestEnvelopeDocumentController.cs | 16 ++++++++++++ .../TestEnvelopeHistoryController.cs | 16 ++++++++++++ .../TestEnvelopeReceiverController.cs | 16 ++++++++++++ .../Controllers/TestEnvelopeTypeController.cs | 16 ++++++++++++ .../Controllers/TestReceiverController.cs | 16 ++++++++++++ .../Controllers/TestUserReceiverController.cs | 16 ++++++++++++ EnvelopeGenerator.Web/Program.cs | 2 ++ 20 files changed, 209 insertions(+), 57 deletions(-) delete mode 100644 EnvelopeGenerator.Web/Controllers/ConfigTestController.cs delete mode 100644 EnvelopeGenerator.Web/Controllers/EnvelopeDocumentTestController.cs create mode 100644 EnvelopeGenerator.Web/Controllers/TestConfigController.cs create mode 100644 EnvelopeGenerator.Web/Controllers/TestDocumentReceiverElementController.cs create mode 100644 EnvelopeGenerator.Web/Controllers/TestDocumentStatusController.cs create mode 100644 EnvelopeGenerator.Web/Controllers/TestEmailTemplateController.cs create mode 100644 EnvelopeGenerator.Web/Controllers/TestEnvelopeCertificateController.cs create mode 100644 EnvelopeGenerator.Web/Controllers/TestEnvelopeController.cs create mode 100644 EnvelopeGenerator.Web/Controllers/TestEnvelopeDocumentController.cs create mode 100644 EnvelopeGenerator.Web/Controllers/TestEnvelopeHistoryController.cs create mode 100644 EnvelopeGenerator.Web/Controllers/TestEnvelopeReceiverController.cs create mode 100644 EnvelopeGenerator.Web/Controllers/TestEnvelopeTypeController.cs create mode 100644 EnvelopeGenerator.Web/Controllers/TestReceiverController.cs create mode 100644 EnvelopeGenerator.Web/Controllers/TestUserReceiverController.cs diff --git a/EnvelopeGenerator.Application/DTOs/ConfigDto.cs b/EnvelopeGenerator.Application/DTOs/ConfigDto.cs index 9fb1b545..751ab329 100644 --- a/EnvelopeGenerator.Application/DTOs/ConfigDto.cs +++ b/EnvelopeGenerator.Application/DTOs/ConfigDto.cs @@ -8,6 +8,5 @@ string ExportPath, string DocumentPathDmz, string ExportPathDmz, - string SignedMailPath, string DocumentPathMoveAftsend); } \ No newline at end of file diff --git a/EnvelopeGenerator.Application/DTOs/DocumentReceiverElementDto.cs b/EnvelopeGenerator.Application/DTOs/DocumentReceiverElementDto.cs index 4fb9ebcf..1b7811ca 100644 --- a/EnvelopeGenerator.Application/DTOs/DocumentReceiverElementDto.cs +++ b/EnvelopeGenerator.Application/DTOs/DocumentReceiverElementDto.cs @@ -5,13 +5,13 @@ int DocumentId, int ReceiverId, int ElementType, - float PositionX, - float PositionY, - float Width, - float Height, + double PositionX, + double PositionY, + double Width, + double Height, int Page, bool Required, - string Tooltip, + string? Tooltip, bool ReadOnly, int AnnotationIndex, DateTime AddedWhen, diff --git a/EnvelopeGenerator.Domain/Entities/DocumentReceiverElement.cs b/EnvelopeGenerator.Domain/Entities/DocumentReceiverElement.cs index 442c593d..71c21e05 100644 --- a/EnvelopeGenerator.Domain/Entities/DocumentReceiverElement.cs +++ b/EnvelopeGenerator.Domain/Entities/DocumentReceiverElement.cs @@ -28,22 +28,22 @@ namespace EnvelopeGenerator.Domain.Entities [Required] [Column("POSITION_X")] [DefaultValue(0)] - public float PositionX { get; set; } + public double PositionX { get; set; } [Required] [Column("POSITION_Y")] [DefaultValue(0)] - public float PositionY { get; set; } + public double PositionY { get; set; } [Required] [Column("WIDTH")] [DefaultValue(0)] - public float Width { get; set; } + public double Width { get; set; } [Required] [Column("HEIGHT")] [DefaultValue(0)] - public float Height { get; set; } + public double Height { get; set; } [Required] [Column("PAGE")] @@ -56,7 +56,7 @@ namespace EnvelopeGenerator.Domain.Entities public bool Required { get; set; } [Column("TOOLTIP")] - public string Tooltip { get; set; } + public string? Tooltip { get; set; } [Required] [Column("READ_ONLY")] @@ -80,6 +80,6 @@ namespace EnvelopeGenerator.Domain.Entities public virtual EnvelopeDocument? Document { get; set; } [ForeignKey("ReceiverId")] - public virtual EnvelopeReceiver? Receiver { get; set; } + public virtual Receiver? Receiver { get; set; } } } \ No newline at end of file diff --git a/EnvelopeGenerator.Domain/Entities/EnvelopeReceiver.cs b/EnvelopeGenerator.Domain/Entities/EnvelopeReceiver.cs index 8d32a8f8..f617fac8 100644 --- a/EnvelopeGenerator.Domain/Entities/EnvelopeReceiver.cs +++ b/EnvelopeGenerator.Domain/Entities/EnvelopeReceiver.cs @@ -6,11 +6,10 @@ namespace EnvelopeGenerator.Domain.Entities [Table("TBSIG_ENVELOPE_RECEIVER", Schema = "dbo")] public class EnvelopeReceiver { - [Key] + [Column("ENVELOPE_ID")] public int EnvelopeId { get; set; } - [Key] [Column("RECEIVER_ID")] public int ReceiverId { get; set; } diff --git a/EnvelopeGenerator.Infrastructure/EGDbContext.cs b/EnvelopeGenerator.Infrastructure/EGDbContext.cs index 803e3067..4169dff2 100644 --- a/EnvelopeGenerator.Infrastructure/EGDbContext.cs +++ b/EnvelopeGenerator.Infrastructure/EGDbContext.cs @@ -12,15 +12,16 @@ namespace DigitalData.UserManager.Infrastructure.Repositories protected override void OnModelCreating(ModelBuilder modelBuilder) { modelBuilder.Entity().HasNoKey(); - modelBuilder.Entity(); + modelBuilder.Entity().HasNoKey(); + + modelBuilder.Entity(); modelBuilder.Entity(); modelBuilder.Entity(); modelBuilder.Entity(); modelBuilder.Entity(); modelBuilder.Entity(); modelBuilder.Entity(); - modelBuilder.Entity(); modelBuilder.Entity(); modelBuilder.Entity(); modelBuilder.Entity(); diff --git a/EnvelopeGenerator.Web/Controllers/ConfigTestController.cs b/EnvelopeGenerator.Web/Controllers/ConfigTestController.cs deleted file mode 100644 index 265760f6..00000000 --- a/EnvelopeGenerator.Web/Controllers/ConfigTestController.cs +++ /dev/null @@ -1,26 +0,0 @@ -using DigitalData.Core.API; -using EnvelopeGenerator.Application.Contracts; -using EnvelopeGenerator.Application.DTOs; -using EnvelopeGenerator.Domain.Entities; -using EnvelopeGenerator.Infrastructure.Contracts; -using Microsoft.AspNetCore.Mvc; - -namespace EnvelopeGenerator.Web.Controllers -{ - public class ConfigTestController : CRUDControllerBase - { - public ConfigTestController(ILogger logger, IConfigService service) : base(logger, service) - { - _logger.LogInformation("TEST_INFO"); - _logger.LogError("TEST_ERROR"); - } - - [HttpGet("test")] - public IActionResult Test() - { - _logger.LogError("Test Error"); - _logger.LogInformation("Test Info"); - throw new ArgumentNullException(); - } - } -} \ No newline at end of file diff --git a/EnvelopeGenerator.Web/Controllers/EnvelopeDocumentTestController.cs b/EnvelopeGenerator.Web/Controllers/EnvelopeDocumentTestController.cs deleted file mode 100644 index 70685dd5..00000000 --- a/EnvelopeGenerator.Web/Controllers/EnvelopeDocumentTestController.cs +++ /dev/null @@ -1,15 +0,0 @@ -using DigitalData.Core.API; -using EnvelopeGenerator.Application.Contracts; -using EnvelopeGenerator.Application.DTOs; -using EnvelopeGenerator.Domain.Entities; -using EnvelopeGenerator.Infrastructure.Contracts; - -namespace EnvelopeGenerator.Web.Controllers -{ - public class EnvelopeDocumentTestController : CRUDControllerBase - { - public EnvelopeDocumentTestController(ILogger logger, IEnvelopeDocumentService service) : base(logger, service) - { - } - } -} \ No newline at end of file diff --git a/EnvelopeGenerator.Web/Controllers/TestConfigController.cs b/EnvelopeGenerator.Web/Controllers/TestConfigController.cs new file mode 100644 index 00000000..11952810 --- /dev/null +++ b/EnvelopeGenerator.Web/Controllers/TestConfigController.cs @@ -0,0 +1,16 @@ +using DigitalData.Core.API; +using EnvelopeGenerator.Application.Contracts; +using EnvelopeGenerator.Application.DTOs; +using EnvelopeGenerator.Domain.Entities; +using EnvelopeGenerator.Infrastructure.Contracts; + +namespace EnvelopeGenerator.Web.Controllers +{ + public class TestConfigController : BasicCRUDControllerBase + { + public TestConfigController(ILogger logger, IConfigService service) : base(logger, service) + { + + } + } +} \ No newline at end of file diff --git a/EnvelopeGenerator.Web/Controllers/TestDocumentReceiverElementController.cs b/EnvelopeGenerator.Web/Controllers/TestDocumentReceiverElementController.cs new file mode 100644 index 00000000..49ff2f62 --- /dev/null +++ b/EnvelopeGenerator.Web/Controllers/TestDocumentReceiverElementController.cs @@ -0,0 +1,16 @@ +using DigitalData.Core.API; +using EnvelopeGenerator.Application.Contracts; +using EnvelopeGenerator.Application.DTOs; +using EnvelopeGenerator.Domain.Entities; +using EnvelopeGenerator.Infrastructure.Contracts; + +namespace EnvelopeGenerator.Web.Controllers +{ + public class TestDocumentReceiverElementController : BasicCRUDControllerBase + { + public TestDocumentReceiverElementController(ILogger logger, IDocumentReceiverElementService service) : base(logger, service) + { + + } + } +} \ No newline at end of file diff --git a/EnvelopeGenerator.Web/Controllers/TestDocumentStatusController.cs b/EnvelopeGenerator.Web/Controllers/TestDocumentStatusController.cs new file mode 100644 index 00000000..a8db90fc --- /dev/null +++ b/EnvelopeGenerator.Web/Controllers/TestDocumentStatusController.cs @@ -0,0 +1,16 @@ +using DigitalData.Core.API; +using EnvelopeGenerator.Application.Contracts; +using EnvelopeGenerator.Application.DTOs; +using EnvelopeGenerator.Domain.Entities; +using EnvelopeGenerator.Infrastructure.Contracts; + +namespace EnvelopeGenerator.Web.Controllers +{ + public class TestDocumentStatusController : BasicCRUDControllerBase + { + public TestDocumentStatusController(ILogger logger, IDocumentStatusService service) : base(logger, service) + { + + } + } +} \ No newline at end of file diff --git a/EnvelopeGenerator.Web/Controllers/TestEmailTemplateController.cs b/EnvelopeGenerator.Web/Controllers/TestEmailTemplateController.cs new file mode 100644 index 00000000..f5d7ee0a --- /dev/null +++ b/EnvelopeGenerator.Web/Controllers/TestEmailTemplateController.cs @@ -0,0 +1,16 @@ +using DigitalData.Core.API; +using EnvelopeGenerator.Application.Contracts; +using EnvelopeGenerator.Application.DTOs; +using EnvelopeGenerator.Domain.Entities; +using EnvelopeGenerator.Infrastructure.Contracts; + +namespace EnvelopeGenerator.Web.Controllers +{ + public class TestEmailTemplateController : CRUDControllerBase + { + public TestEmailTemplateController(ILogger logger, IEmailTemplateService service) : base(logger, service) + { + + } + } +} \ No newline at end of file diff --git a/EnvelopeGenerator.Web/Controllers/TestEnvelopeCertificateController.cs b/EnvelopeGenerator.Web/Controllers/TestEnvelopeCertificateController.cs new file mode 100644 index 00000000..d28dde4e --- /dev/null +++ b/EnvelopeGenerator.Web/Controllers/TestEnvelopeCertificateController.cs @@ -0,0 +1,16 @@ +using DigitalData.Core.API; +using EnvelopeGenerator.Application.Contracts; +using EnvelopeGenerator.Application.DTOs; +using EnvelopeGenerator.Domain.Entities; +using EnvelopeGenerator.Infrastructure.Contracts; + +namespace EnvelopeGenerator.Web.Controllers +{ + public class TestEnvelopeCertificateController : BasicCRUDControllerBase + { + public TestEnvelopeCertificateController(ILogger logger, IEnvelopeCertificateService service) : base(logger, service) + { + + } + } +} \ No newline at end of file diff --git a/EnvelopeGenerator.Web/Controllers/TestEnvelopeController.cs b/EnvelopeGenerator.Web/Controllers/TestEnvelopeController.cs new file mode 100644 index 00000000..09e1ae5c --- /dev/null +++ b/EnvelopeGenerator.Web/Controllers/TestEnvelopeController.cs @@ -0,0 +1,16 @@ +using DigitalData.Core.API; +using EnvelopeGenerator.Application.Contracts; +using EnvelopeGenerator.Application.DTOs; +using EnvelopeGenerator.Domain.Entities; +using EnvelopeGenerator.Infrastructure.Contracts; + +namespace EnvelopeGenerator.Web.Controllers +{ + public class TestEnvelopeController : CRUDControllerBase + { + public TestEnvelopeController(ILogger logger, IEnvelopeService service) : base(logger, service) + { + + } + } +} \ No newline at end of file diff --git a/EnvelopeGenerator.Web/Controllers/TestEnvelopeDocumentController.cs b/EnvelopeGenerator.Web/Controllers/TestEnvelopeDocumentController.cs new file mode 100644 index 00000000..e55db2ac --- /dev/null +++ b/EnvelopeGenerator.Web/Controllers/TestEnvelopeDocumentController.cs @@ -0,0 +1,16 @@ +using DigitalData.Core.API; +using EnvelopeGenerator.Application.Contracts; +using EnvelopeGenerator.Application.DTOs; +using EnvelopeGenerator.Domain.Entities; +using EnvelopeGenerator.Infrastructure.Contracts; + +namespace EnvelopeGenerator.Web.Controllers +{ + public class TestEnvelopeDocumentController : BasicCRUDControllerBase + { + public TestEnvelopeDocumentController(ILogger logger, IEnvelopeDocumentService service) : base(logger, service) + { + + } + } +} \ No newline at end of file diff --git a/EnvelopeGenerator.Web/Controllers/TestEnvelopeHistoryController.cs b/EnvelopeGenerator.Web/Controllers/TestEnvelopeHistoryController.cs new file mode 100644 index 00000000..6e5f9362 --- /dev/null +++ b/EnvelopeGenerator.Web/Controllers/TestEnvelopeHistoryController.cs @@ -0,0 +1,16 @@ +using DigitalData.Core.API; +using EnvelopeGenerator.Application.Contracts; +using EnvelopeGenerator.Application.DTOs; +using EnvelopeGenerator.Domain.Entities; +using EnvelopeGenerator.Infrastructure.Contracts; + +namespace EnvelopeGenerator.Web.Controllers +{ + public class TestEnvelopeHistoryController : BasicCRUDControllerBase + { + public TestEnvelopeHistoryController(ILogger logger, IEnvelopeHistoryService service) : base(logger, service) + { + + } + } +} \ No newline at end of file diff --git a/EnvelopeGenerator.Web/Controllers/TestEnvelopeReceiverController.cs b/EnvelopeGenerator.Web/Controllers/TestEnvelopeReceiverController.cs new file mode 100644 index 00000000..78256f2d --- /dev/null +++ b/EnvelopeGenerator.Web/Controllers/TestEnvelopeReceiverController.cs @@ -0,0 +1,16 @@ +using DigitalData.Core.API; +using EnvelopeGenerator.Application.Contracts; +using EnvelopeGenerator.Application.DTOs; +using EnvelopeGenerator.Domain.Entities; +using EnvelopeGenerator.Infrastructure.Contracts; + +namespace EnvelopeGenerator.Web.Controllers +{ + public class TestEnvelopeReceiverController : BasicCRUDControllerBase + { + public TestEnvelopeReceiverController(ILogger logger, IEnvelopeReceiverService service) : base(logger, service) + { + + } + } +} \ No newline at end of file diff --git a/EnvelopeGenerator.Web/Controllers/TestEnvelopeTypeController.cs b/EnvelopeGenerator.Web/Controllers/TestEnvelopeTypeController.cs new file mode 100644 index 00000000..7e891c37 --- /dev/null +++ b/EnvelopeGenerator.Web/Controllers/TestEnvelopeTypeController.cs @@ -0,0 +1,16 @@ +using DigitalData.Core.API; +using EnvelopeGenerator.Application.Contracts; +using EnvelopeGenerator.Application.DTOs; +using EnvelopeGenerator.Domain.Entities; +using EnvelopeGenerator.Infrastructure.Contracts; + +namespace EnvelopeGenerator.Web.Controllers +{ + public class TestEnvelopeTypeController : BasicCRUDControllerBase + { + public TestEnvelopeTypeController(ILogger logger, IEnvelopeTypeService service) : base(logger, service) + { + + } + } +} \ No newline at end of file diff --git a/EnvelopeGenerator.Web/Controllers/TestReceiverController.cs b/EnvelopeGenerator.Web/Controllers/TestReceiverController.cs new file mode 100644 index 00000000..a05b5b33 --- /dev/null +++ b/EnvelopeGenerator.Web/Controllers/TestReceiverController.cs @@ -0,0 +1,16 @@ +using DigitalData.Core.API; +using EnvelopeGenerator.Application.Contracts; +using EnvelopeGenerator.Application.DTOs; +using EnvelopeGenerator.Domain.Entities; +using EnvelopeGenerator.Infrastructure.Contracts; + +namespace EnvelopeGenerator.Web.Controllers +{ + public class TestReceiverController : BasicCRUDControllerBase + { + public TestReceiverController(ILogger logger, IReceiverService service) : base(logger, service) + { + + } + } +} \ No newline at end of file diff --git a/EnvelopeGenerator.Web/Controllers/TestUserReceiverController.cs b/EnvelopeGenerator.Web/Controllers/TestUserReceiverController.cs new file mode 100644 index 00000000..57406b3b --- /dev/null +++ b/EnvelopeGenerator.Web/Controllers/TestUserReceiverController.cs @@ -0,0 +1,16 @@ +using DigitalData.Core.API; +using EnvelopeGenerator.Application.Contracts; +using EnvelopeGenerator.Application.DTOs; +using EnvelopeGenerator.Domain.Entities; +using EnvelopeGenerator.Infrastructure.Contracts; + +namespace EnvelopeGenerator.Web.Controllers +{ + public class TestUserReceiverController : BasicCRUDControllerBase + { + public TestUserReceiverController(ILogger logger, IUserReceiverService service) : base(logger, service) + { + + } + } +} \ No newline at end of file diff --git a/EnvelopeGenerator.Web/Program.cs b/EnvelopeGenerator.Web/Program.cs index 258d8801..c32a6ada 100644 --- a/EnvelopeGenerator.Web/Program.cs +++ b/EnvelopeGenerator.Web/Program.cs @@ -45,6 +45,7 @@ try //Inject CRUD Service and repositories builder.Services.AddScoped(); + builder.Services.AddScoped(); builder.Services.AddScoped(); builder.Services.AddScoped(); builder.Services.AddScoped(); @@ -60,6 +61,7 @@ try builder.Services.AddScoped(); builder.Services.AddScoped(); + builder.Services.AddScoped(); builder.Services.AddScoped(); builder.Services.AddScoped(); builder.Services.AddScoped();