From 2c17d440c02477c8457dd5777f7d8a5426754388 Mon Sep 17 00:00:00 2001 From: Developer 02 Date: Tue, 9 Apr 2024 13:52:38 +0200 Subject: [PATCH] =?UTF-8?q?Integration=20von=20RemoveIfControllerConventio?= =?UTF-8?q?n=20zur=20bedingten=20Ausschlie=C3=9Fung=20von=20Test-Controlle?= =?UTF-8?q?rn?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Implementierung von RemoveIfControllerConvention in der Startup-Klasse, um Controller, die mit "Test" beginnen, basierend auf einem Konfigurationsflag auszuschließen, was die Flexibilität der Dienstregistrierung erhöht. --- .../DTOs/DocumentReceiverElementDto.cs | 5 ++--- .../DTOs/EnvelopeDocumentDto.cs | 6 ++---- .../DTOs/ReceiverDto.cs | 3 ++- .../Entities/DocumentReceiverElement.cs | 8 +++---- .../Repositories/EnvelopeRepository.cs | 2 +- .../{ => Test}/TestConfigController.cs | 4 ++-- .../Controllers/Test/TestControllerBase.cs | 21 +++++++++++++++++++ .../TestDocumentReceiverElementController.cs | 4 ++-- .../TestDocumentStatusController.cs | 4 ++-- .../{ => Test}/TestEmailTemplateController.cs | 7 +++---- .../TestEnvelopeCertificateController.cs | 4 ++-- .../{ => Test}/TestEnvelopeController.cs | 11 +++++----- .../TestEnvelopeDocumentController.cs | 4 ++-- .../TestEnvelopeHistoryController.cs | 4 ++-- .../TestEnvelopeReceiverController.cs | 4 ++-- .../{ => Test}/TestEnvelopeTypeController.cs | 4 ++-- .../{ => Test}/TestReceiverController.cs | 4 ++-- .../{ => Test}/TestUserReceiverController.cs | 4 ++-- EnvelopeGenerator.Web/Program.cs | 10 +++++++-- .../Views/Home/ShowEnvelope.cshtml | 3 --- EnvelopeGenerator.Web/appsettings.json | 3 ++- 21 files changed, 70 insertions(+), 49 deletions(-) rename EnvelopeGenerator.Web/Controllers/{ => Test}/TestConfigController.cs (66%) create mode 100644 EnvelopeGenerator.Web/Controllers/Test/TestControllerBase.cs rename EnvelopeGenerator.Web/Controllers/{ => Test}/TestDocumentReceiverElementController.cs (58%) rename EnvelopeGenerator.Web/Controllers/{ => Test}/TestDocumentStatusController.cs (62%) rename EnvelopeGenerator.Web/Controllers/{ => Test}/TestEmailTemplateController.cs (57%) rename EnvelopeGenerator.Web/Controllers/{ => Test}/TestEnvelopeCertificateController.cs (60%) rename EnvelopeGenerator.Web/Controllers/{ => Test}/TestEnvelopeController.cs (76%) rename EnvelopeGenerator.Web/Controllers/{ => Test}/TestEnvelopeDocumentController.cs (61%) rename EnvelopeGenerator.Web/Controllers/{ => Test}/TestEnvelopeHistoryController.cs (61%) rename EnvelopeGenerator.Web/Controllers/{ => Test}/TestEnvelopeReceiverController.cs (61%) rename EnvelopeGenerator.Web/Controllers/{ => Test}/TestEnvelopeTypeController.cs (63%) rename EnvelopeGenerator.Web/Controllers/{ => Test}/TestReceiverController.cs (64%) rename EnvelopeGenerator.Web/Controllers/{ => Test}/TestUserReceiverController.cs (63%) diff --git a/EnvelopeGenerator.Application/DTOs/DocumentReceiverElementDto.cs b/EnvelopeGenerator.Application/DTOs/DocumentReceiverElementDto.cs index 208f6868..06e700b1 100644 --- a/EnvelopeGenerator.Application/DTOs/DocumentReceiverElementDto.cs +++ b/EnvelopeGenerator.Application/DTOs/DocumentReceiverElementDto.cs @@ -16,8 +16,7 @@ int AnnotationIndex, DateTime AddedWhen, DateTime? ChangedWhen, - EnvelopeDocumentDto? Document, - EnvelopeReceiverDto? Receiver, double Top, - double Left); + double Left + ); } \ No newline at end of file diff --git a/EnvelopeGenerator.Application/DTOs/EnvelopeDocumentDto.cs b/EnvelopeGenerator.Application/DTOs/EnvelopeDocumentDto.cs index afd62f87..6f1d816c 100644 --- a/EnvelopeGenerator.Application/DTOs/EnvelopeDocumentDto.cs +++ b/EnvelopeGenerator.Application/DTOs/EnvelopeDocumentDto.cs @@ -1,6 +1,4 @@ -using EnvelopeGenerator.Domain.Entities; - -namespace EnvelopeGenerator.Application.DTOs +namespace EnvelopeGenerator.Application.DTOs { public record EnvelopeDocumentDto ( @@ -10,6 +8,6 @@ namespace EnvelopeGenerator.Application.DTOs string Filepath, DateTime AddedWhen, string FilenameOriginal, - IEnumerable? Elements + IEnumerable? Elements ); } \ No newline at end of file diff --git a/EnvelopeGenerator.Application/DTOs/ReceiverDto.cs b/EnvelopeGenerator.Application/DTOs/ReceiverDto.cs index 8c74df33..8e3a3f96 100644 --- a/EnvelopeGenerator.Application/DTOs/ReceiverDto.cs +++ b/EnvelopeGenerator.Application/DTOs/ReceiverDto.cs @@ -4,5 +4,6 @@ int Id, string EmailAddress, string Signature, - DateTime AddedWhen); + DateTime AddedWhen, + IEnumerable? EnvelopeReceivers); } \ No newline at end of file diff --git a/EnvelopeGenerator.Domain/Entities/DocumentReceiverElement.cs b/EnvelopeGenerator.Domain/Entities/DocumentReceiverElement.cs index 381b268d..537f215c 100644 --- a/EnvelopeGenerator.Domain/Entities/DocumentReceiverElement.cs +++ b/EnvelopeGenerator.Domain/Entities/DocumentReceiverElement.cs @@ -28,12 +28,12 @@ namespace EnvelopeGenerator.Domain.Entities [Required] [Column("POSITION_X")] [DefaultValue(0)] - public double X { get; set; } + public double PositionX { get; set; } [Required] [Column("POSITION_Y")] [DefaultValue(0)] - public double Y { get; set; } + public double PositionY { get; set; } [Required] [Column("WIDTH")] @@ -83,9 +83,9 @@ namespace EnvelopeGenerator.Domain.Entities public virtual Receiver? Receiver { get; set; } [NotMapped] - public double Top => Math.Round(Y, 5); + public double Top => Math.Round(PositionY, 5); [NotMapped] - public double Left => Math.Round(X, 5); + public double Left => Math.Round(PositionX, 5); } } \ No newline at end of file diff --git a/EnvelopeGenerator.Infrastructure/Repositories/EnvelopeRepository.cs b/EnvelopeGenerator.Infrastructure/Repositories/EnvelopeRepository.cs index 7629f3b0..0c6244eb 100644 --- a/EnvelopeGenerator.Infrastructure/Repositories/EnvelopeRepository.cs +++ b/EnvelopeGenerator.Infrastructure/Repositories/EnvelopeRepository.cs @@ -39,7 +39,7 @@ namespace EnvelopeGenerator.Infrastructure.Repositories query = query.Where(e => e.Receivers != null && e.Receivers.Any(er => er.Receiver != null && er.Receiver.Signature == signature)); if (withAll || withDocuments) - if (withDocumentReceiverElement) + if (withAll || withDocumentReceiverElement) query = query.Include(e => e.Documents!).ThenInclude(d => d.Elements); else query = query.Include(e => e.Documents); diff --git a/EnvelopeGenerator.Web/Controllers/TestConfigController.cs b/EnvelopeGenerator.Web/Controllers/Test/TestConfigController.cs similarity index 66% rename from EnvelopeGenerator.Web/Controllers/TestConfigController.cs rename to EnvelopeGenerator.Web/Controllers/Test/TestConfigController.cs index 11952810..7981dde9 100644 --- a/EnvelopeGenerator.Web/Controllers/TestConfigController.cs +++ b/EnvelopeGenerator.Web/Controllers/Test/TestConfigController.cs @@ -4,9 +4,9 @@ using EnvelopeGenerator.Application.DTOs; using EnvelopeGenerator.Domain.Entities; using EnvelopeGenerator.Infrastructure.Contracts; -namespace EnvelopeGenerator.Web.Controllers +namespace EnvelopeGenerator.Web.Controllers.Test { - public class TestConfigController : BasicCRUDControllerBase + public class TestConfigController : TestControllerBase { 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 new file mode 100644 index 00000000..51868264 --- /dev/null +++ b/EnvelopeGenerator.Web/Controllers/Test/TestControllerBase.cs @@ -0,0 +1,21 @@ +using DigitalData.Core.API; +using DigitalData.Core.Contracts.Application; +using DigitalData.Core.Contracts.Infrastructure; +using EnvelopeGenerator.Application.Contracts; +using EnvelopeGenerator.Application.DTOs; +using EnvelopeGenerator.Infrastructure.Contracts; +using Microsoft.AspNetCore.Authorization; +using Microsoft.AspNetCore.Mvc; + +namespace EnvelopeGenerator.Web.Controllers.Test +{ + //[NonController] + [ApiController] + [Route("api/test/[controller]")] + public class TestControllerBase : BasicCRUDControllerBase where TOriginalController : CRUDControllerBase where TCRUDService : ICRUDService where TCRUDRepository : ICRUDRepository where TDto : class where TEntity : class + { + public TestControllerBase(ILogger logger, TCRUDService service) : base(logger, service) + { + } + } +} diff --git a/EnvelopeGenerator.Web/Controllers/TestDocumentReceiverElementController.cs b/EnvelopeGenerator.Web/Controllers/Test/TestDocumentReceiverElementController.cs similarity index 58% rename from EnvelopeGenerator.Web/Controllers/TestDocumentReceiverElementController.cs rename to EnvelopeGenerator.Web/Controllers/Test/TestDocumentReceiverElementController.cs index 49ff2f62..29e3c74f 100644 --- a/EnvelopeGenerator.Web/Controllers/TestDocumentReceiverElementController.cs +++ b/EnvelopeGenerator.Web/Controllers/Test/TestDocumentReceiverElementController.cs @@ -4,9 +4,9 @@ using EnvelopeGenerator.Application.DTOs; using EnvelopeGenerator.Domain.Entities; using EnvelopeGenerator.Infrastructure.Contracts; -namespace EnvelopeGenerator.Web.Controllers +namespace EnvelopeGenerator.Web.Controllers.Test { - public class TestDocumentReceiverElementController : BasicCRUDControllerBase + public class TestDocumentReceiverElementController : TestControllerBase { public TestDocumentReceiverElementController(ILogger logger, IDocumentReceiverElementService service) : base(logger, service) { diff --git a/EnvelopeGenerator.Web/Controllers/TestDocumentStatusController.cs b/EnvelopeGenerator.Web/Controllers/Test/TestDocumentStatusController.cs similarity index 62% rename from EnvelopeGenerator.Web/Controllers/TestDocumentStatusController.cs rename to EnvelopeGenerator.Web/Controllers/Test/TestDocumentStatusController.cs index a8db90fc..a8ea37bb 100644 --- a/EnvelopeGenerator.Web/Controllers/TestDocumentStatusController.cs +++ b/EnvelopeGenerator.Web/Controllers/Test/TestDocumentStatusController.cs @@ -4,9 +4,9 @@ using EnvelopeGenerator.Application.DTOs; using EnvelopeGenerator.Domain.Entities; using EnvelopeGenerator.Infrastructure.Contracts; -namespace EnvelopeGenerator.Web.Controllers +namespace EnvelopeGenerator.Web.Controllers.Test { - public class TestDocumentStatusController : BasicCRUDControllerBase + public class TestDocumentStatusController : TestControllerBase { public TestDocumentStatusController(ILogger logger, IDocumentStatusService service) : base(logger, service) { diff --git a/EnvelopeGenerator.Web/Controllers/TestEmailTemplateController.cs b/EnvelopeGenerator.Web/Controllers/Test/TestEmailTemplateController.cs similarity index 57% rename from EnvelopeGenerator.Web/Controllers/TestEmailTemplateController.cs rename to EnvelopeGenerator.Web/Controllers/Test/TestEmailTemplateController.cs index f5d7ee0a..8bd7016b 100644 --- a/EnvelopeGenerator.Web/Controllers/TestEmailTemplateController.cs +++ b/EnvelopeGenerator.Web/Controllers/Test/TestEmailTemplateController.cs @@ -1,12 +1,11 @@ -using DigitalData.Core.API; -using EnvelopeGenerator.Application.Contracts; +using EnvelopeGenerator.Application.Contracts; using EnvelopeGenerator.Application.DTOs; using EnvelopeGenerator.Domain.Entities; using EnvelopeGenerator.Infrastructure.Contracts; -namespace EnvelopeGenerator.Web.Controllers +namespace EnvelopeGenerator.Web.Controllers.Test { - public class TestEmailTemplateController : CRUDControllerBase + public class TestEmailTemplateController : TestControllerBase { public TestEmailTemplateController(ILogger logger, IEmailTemplateService service) : base(logger, service) { diff --git a/EnvelopeGenerator.Web/Controllers/TestEnvelopeCertificateController.cs b/EnvelopeGenerator.Web/Controllers/Test/TestEnvelopeCertificateController.cs similarity index 60% rename from EnvelopeGenerator.Web/Controllers/TestEnvelopeCertificateController.cs rename to EnvelopeGenerator.Web/Controllers/Test/TestEnvelopeCertificateController.cs index d28dde4e..b29981cc 100644 --- a/EnvelopeGenerator.Web/Controllers/TestEnvelopeCertificateController.cs +++ b/EnvelopeGenerator.Web/Controllers/Test/TestEnvelopeCertificateController.cs @@ -4,9 +4,9 @@ using EnvelopeGenerator.Application.DTOs; using EnvelopeGenerator.Domain.Entities; using EnvelopeGenerator.Infrastructure.Contracts; -namespace EnvelopeGenerator.Web.Controllers +namespace EnvelopeGenerator.Web.Controllers.Test { - public class TestEnvelopeCertificateController : BasicCRUDControllerBase + public class TestEnvelopeCertificateController : TestControllerBase { public TestEnvelopeCertificateController(ILogger logger, IEnvelopeCertificateService service) : base(logger, service) { diff --git a/EnvelopeGenerator.Web/Controllers/TestEnvelopeController.cs b/EnvelopeGenerator.Web/Controllers/Test/TestEnvelopeController.cs similarity index 76% rename from EnvelopeGenerator.Web/Controllers/TestEnvelopeController.cs rename to EnvelopeGenerator.Web/Controllers/Test/TestEnvelopeController.cs index 0779961a..e7d84eea 100644 --- a/EnvelopeGenerator.Web/Controllers/TestEnvelopeController.cs +++ b/EnvelopeGenerator.Web/Controllers/Test/TestEnvelopeController.cs @@ -1,14 +1,13 @@ -using DigitalData.Core.API; -using EnvelopeGenerator.Application.Contracts; +using EnvelopeGenerator.Application.Contracts; using EnvelopeGenerator.Application.DTOs; using EnvelopeGenerator.Application.Services; using EnvelopeGenerator.Domain.Entities; using EnvelopeGenerator.Infrastructure.Contracts; using Microsoft.AspNetCore.Mvc; -namespace EnvelopeGenerator.Web.Controllers +namespace EnvelopeGenerator.Web.Controllers.Test { - public class TestEnvelopeController : CRUDControllerBase + public class TestEnvelopeController : TestControllerBase { public TestEnvelopeController(ILogger logger, IEnvelopeService service) : base(logger, service) { @@ -21,7 +20,7 @@ namespace EnvelopeGenerator.Web.Controllers } [HttpGet] - public virtual async Task GetAll([FromQuery] string? envelopeKey = default, [FromQuery] bool withDocuments = true, [FromQuery] bool withReceivers = true, [FromQuery] bool withHistory = true) + public virtual async Task GetAll([FromQuery] string? envelopeKey = default, [FromQuery] bool withDocuments = false, [FromQuery] bool withReceivers = false, [FromQuery] bool withHistory = false, [FromQuery] bool withDocumentReceiverElement = false, [FromQuery] bool withAll = true) { if(envelopeKey is not null) { @@ -30,7 +29,7 @@ namespace EnvelopeGenerator.Web.Controllers var envlopeServiceResult = await _service.ReadByUuidAsync( uuid: decoded.EnvelopeUuid, signature: decoded.ReceiverSignature, - withDocuments: withDocuments, withReceivers: withReceivers, withHistory: withHistory); + withDocuments: withDocuments, withReceivers: withReceivers, withHistory: withHistory, withDocumentReceiverElement:withDocumentReceiverElement, withAll:withAll); if (envlopeServiceResult.IsSuccess) { diff --git a/EnvelopeGenerator.Web/Controllers/TestEnvelopeDocumentController.cs b/EnvelopeGenerator.Web/Controllers/Test/TestEnvelopeDocumentController.cs similarity index 61% rename from EnvelopeGenerator.Web/Controllers/TestEnvelopeDocumentController.cs rename to EnvelopeGenerator.Web/Controllers/Test/TestEnvelopeDocumentController.cs index e55db2ac..bfbafaef 100644 --- a/EnvelopeGenerator.Web/Controllers/TestEnvelopeDocumentController.cs +++ b/EnvelopeGenerator.Web/Controllers/Test/TestEnvelopeDocumentController.cs @@ -4,9 +4,9 @@ using EnvelopeGenerator.Application.DTOs; using EnvelopeGenerator.Domain.Entities; using EnvelopeGenerator.Infrastructure.Contracts; -namespace EnvelopeGenerator.Web.Controllers +namespace EnvelopeGenerator.Web.Controllers.Test { - public class TestEnvelopeDocumentController : BasicCRUDControllerBase + public class TestEnvelopeDocumentController : TestControllerBase { public TestEnvelopeDocumentController(ILogger logger, IEnvelopeDocumentService service) : base(logger, service) { diff --git a/EnvelopeGenerator.Web/Controllers/TestEnvelopeHistoryController.cs b/EnvelopeGenerator.Web/Controllers/Test/TestEnvelopeHistoryController.cs similarity index 61% rename from EnvelopeGenerator.Web/Controllers/TestEnvelopeHistoryController.cs rename to EnvelopeGenerator.Web/Controllers/Test/TestEnvelopeHistoryController.cs index 6e5f9362..98c990f8 100644 --- a/EnvelopeGenerator.Web/Controllers/TestEnvelopeHistoryController.cs +++ b/EnvelopeGenerator.Web/Controllers/Test/TestEnvelopeHistoryController.cs @@ -4,9 +4,9 @@ using EnvelopeGenerator.Application.DTOs; using EnvelopeGenerator.Domain.Entities; using EnvelopeGenerator.Infrastructure.Contracts; -namespace EnvelopeGenerator.Web.Controllers +namespace EnvelopeGenerator.Web.Controllers.Test { - public class TestEnvelopeHistoryController : BasicCRUDControllerBase + public class TestEnvelopeHistoryController : TestControllerBase { public TestEnvelopeHistoryController(ILogger logger, IEnvelopeHistoryService service) : base(logger, service) { diff --git a/EnvelopeGenerator.Web/Controllers/TestEnvelopeReceiverController.cs b/EnvelopeGenerator.Web/Controllers/Test/TestEnvelopeReceiverController.cs similarity index 61% rename from EnvelopeGenerator.Web/Controllers/TestEnvelopeReceiverController.cs rename to EnvelopeGenerator.Web/Controllers/Test/TestEnvelopeReceiverController.cs index 78256f2d..073720ef 100644 --- a/EnvelopeGenerator.Web/Controllers/TestEnvelopeReceiverController.cs +++ b/EnvelopeGenerator.Web/Controllers/Test/TestEnvelopeReceiverController.cs @@ -4,9 +4,9 @@ using EnvelopeGenerator.Application.DTOs; using EnvelopeGenerator.Domain.Entities; using EnvelopeGenerator.Infrastructure.Contracts; -namespace EnvelopeGenerator.Web.Controllers +namespace EnvelopeGenerator.Web.Controllers.Test { - public class TestEnvelopeReceiverController : BasicCRUDControllerBase + public class TestEnvelopeReceiverController : TestControllerBase { public TestEnvelopeReceiverController(ILogger logger, IEnvelopeReceiverService service) : base(logger, service) { diff --git a/EnvelopeGenerator.Web/Controllers/TestEnvelopeTypeController.cs b/EnvelopeGenerator.Web/Controllers/Test/TestEnvelopeTypeController.cs similarity index 63% rename from EnvelopeGenerator.Web/Controllers/TestEnvelopeTypeController.cs rename to EnvelopeGenerator.Web/Controllers/Test/TestEnvelopeTypeController.cs index 7e891c37..06815b29 100644 --- a/EnvelopeGenerator.Web/Controllers/TestEnvelopeTypeController.cs +++ b/EnvelopeGenerator.Web/Controllers/Test/TestEnvelopeTypeController.cs @@ -4,9 +4,9 @@ using EnvelopeGenerator.Application.DTOs; using EnvelopeGenerator.Domain.Entities; using EnvelopeGenerator.Infrastructure.Contracts; -namespace EnvelopeGenerator.Web.Controllers +namespace EnvelopeGenerator.Web.Controllers.Test { - public class TestEnvelopeTypeController : BasicCRUDControllerBase + public class TestEnvelopeTypeController : TestControllerBase { public TestEnvelopeTypeController(ILogger logger, IEnvelopeTypeService service) : base(logger, service) { diff --git a/EnvelopeGenerator.Web/Controllers/TestReceiverController.cs b/EnvelopeGenerator.Web/Controllers/Test/TestReceiverController.cs similarity index 64% rename from EnvelopeGenerator.Web/Controllers/TestReceiverController.cs rename to EnvelopeGenerator.Web/Controllers/Test/TestReceiverController.cs index a05b5b33..543d4ed5 100644 --- a/EnvelopeGenerator.Web/Controllers/TestReceiverController.cs +++ b/EnvelopeGenerator.Web/Controllers/Test/TestReceiverController.cs @@ -4,9 +4,9 @@ using EnvelopeGenerator.Application.DTOs; using EnvelopeGenerator.Domain.Entities; using EnvelopeGenerator.Infrastructure.Contracts; -namespace EnvelopeGenerator.Web.Controllers +namespace EnvelopeGenerator.Web.Controllers.Test { - public class TestReceiverController : BasicCRUDControllerBase + public class TestReceiverController : TestControllerBase { public TestReceiverController(ILogger logger, IReceiverService service) : base(logger, service) { diff --git a/EnvelopeGenerator.Web/Controllers/TestUserReceiverController.cs b/EnvelopeGenerator.Web/Controllers/Test/TestUserReceiverController.cs similarity index 63% rename from EnvelopeGenerator.Web/Controllers/TestUserReceiverController.cs rename to EnvelopeGenerator.Web/Controllers/Test/TestUserReceiverController.cs index 57406b3b..f8778b5e 100644 --- a/EnvelopeGenerator.Web/Controllers/TestUserReceiverController.cs +++ b/EnvelopeGenerator.Web/Controllers/Test/TestUserReceiverController.cs @@ -4,9 +4,9 @@ using EnvelopeGenerator.Application.DTOs; using EnvelopeGenerator.Domain.Entities; using EnvelopeGenerator.Infrastructure.Contracts; -namespace EnvelopeGenerator.Web.Controllers +namespace EnvelopeGenerator.Web.Controllers.Test { - public class TestUserReceiverController : BasicCRUDControllerBase + public class TestUserReceiverController : TestControllerBase { public TestUserReceiverController(ILogger logger, IUserReceiverService service) : base(logger, service) { diff --git a/EnvelopeGenerator.Web/Program.cs b/EnvelopeGenerator.Web/Program.cs index c32a6ada..fb294e56 100644 --- a/EnvelopeGenerator.Web/Program.cs +++ b/EnvelopeGenerator.Web/Program.cs @@ -10,6 +10,7 @@ using Microsoft.EntityFrameworkCore; using NLog; using Quartz; using NLog.Web; +using DigitalData.Core.API; var logger = LogManager.Setup().LoadConfigurationFromAppSettings().GetCurrentClassLogger(); logger.Info("Logging initialized!"); @@ -27,7 +28,12 @@ try builder.Services.AddScoped(); // Add services to the container. - builder.Services.AddControllersWithViews().AddJsonOptions(q => + builder.Services.AddControllersWithViews(options => + { + options.Conventions.Add(new RemoveIfControllerConvention() + .AndIf(c => c.ControllerName.StartsWith("Test")) + .AndIf(c => !builder.Configuration.GetValue("AddTestControllers"))); + }).AddJsonOptions(q => { // Prevents serialization error when serializing SvgBitmap in EnvelopeReceiver q.JsonSerializerOptions.ReferenceHandler = System.Text.Json.Serialization.ReferenceHandler.IgnoreCycles; @@ -76,7 +82,7 @@ try //Auto mapping profiles builder.Services.AddAutoMapper(typeof(BasicDtoMappingProfile).Assembly); - + var app = builder.Build(); // Configure the HTTP request pipeline. diff --git a/EnvelopeGenerator.Web/Views/Home/ShowEnvelope.cshtml b/EnvelopeGenerator.Web/Views/Home/ShowEnvelope.cshtml index ba254590..3145a808 100644 --- a/EnvelopeGenerator.Web/Views/Home/ShowEnvelope.cshtml +++ b/EnvelopeGenerator.Web/Views/Home/ShowEnvelope.cshtml @@ -44,7 +44,6 @@ } - -
\ No newline at end of file diff --git a/EnvelopeGenerator.Web/appsettings.json b/EnvelopeGenerator.Web/appsettings.json index 8bed492c..4e1b460c 100644 --- a/EnvelopeGenerator.Web/appsettings.json +++ b/EnvelopeGenerator.Web/appsettings.json @@ -42,5 +42,6 @@ } ] - } + }, + "AddTestControllers": false } \ No newline at end of file