refactor: Startup-Konfiguration in Program.cs verschoben, um das Setup zu vereinfachen

StaffDBServer/Program.cs

@@ -1,21 +1,22 @@
-using HRD.AppLogger;
+using DAL;
+using HRD.AppLogger;
 using HRD.WebApi;
-using Microsoft.AspNetCore;
+using Microsoft.AspNetCore.Builder;
 using Microsoft.AspNetCore.Hosting;
+using Microsoft.EntityFrameworkCore;
 using Microsoft.Extensions.Configuration;
+using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Hosting;
 using Microsoft.Extensions.Logging;
 using NLog.Web;
+using StaffDBServer.Extends;
+using StaffDBServer.SharedExtensions;
 using System;
 using System.Reflection;
+using HRD.LDAPService.JWT;
+using HRD.WebApi.DAL.Middleware;
+using HRD.WebApi.Helpers;
 
-namespace StaffDBServer
-{
-    public class Program
-    {
-        public static void Main(string[] args)
-
-        {
 AppDomain.CurrentDomain.UnhandledException += (object sender, UnhandledExceptionEventArgs unhandledExceptionEventArgs) =>
 {
     ILoggerManager logger = new LoggerManager();
@@ -32,9 +33,59 @@ namespace StaffDBServer
 
 try
 {
-                CreateWebHostBuilder(args)
-                    .Build()
-                    .Run();
+    var builder = WebApplication.CreateBuilder(args);
+
+    // Configure logging
+    builder.Logging.ClearProviders();
+    builder.Logging.SetMinimumLevel(LogLevel.Warning);
+    builder.Host.UseNLog();
+
+    // Add services to the container
+    builder.Services.ConfigureWebApiExtensionsAtFirst(); // at first
+    builder.Services.ConfigureRepositoryWrapper(); // add repos
+
+    var cnnStr = WebApiConfig.ConnectionString(EN_ConnectionType.SQLServer);
+
+    builder.Services.AddDbContext<WebApiContext>(options =>
+    {
+        const int dbTimeoutInMin = 5;
+        options.UseSqlServer(cnnStr,
+            opts => opts.CommandTimeout((int)TimeSpan.FromMinutes(dbTimeoutInMin).TotalSeconds));
+    });
+
+    builder.Services.AddStaffDBRepositories();
+    builder.Services.ConfigureWebApiExtensionsEnd(); // should come last
+
+    var app = builder.Build();
+
+    ((IApplicationBuilder)app).ApplicationServices.SetupNLogServiceLocator();
+
+
+    // Configure the HTTP request pipeline
+    if (app.Environment.IsDevelopment())
+    {
+        app.UseDeveloperExceptionPage();
+    }
+    else
+    {
+        app.UseHsts();
+    }
+
+    app.AddCustomExceptionHandling();
+    app.UseHttpsRedirection();
+    app.UseRouting();
+    app.UseCors("AllowAllOrigins");
+    app.UseDefaultFiles();
+    app.UseStaticFiles();
+    app.UseOpenApi();
+    app.UseDALMiddleware();
+    app.UseJwtMiddleware();
+    app.ConfigureSwagger();
+
+    app.MapControllers();
+
+    app.Run();
+
 }
 catch (Exception ex)
 {
@@ -47,18 +98,3 @@ namespace StaffDBServer
     NLog.LogManager.Flush();
     NLog.LogManager.Shutdown();
 }
-        }
-
-        public static IWebHostBuilder CreateWebHostBuilder(string[] args) =>
-
-        WebHost.CreateDefaultBuilder(args)
-
-            .ConfigureLogging(options => options.ClearProviders())
-            .UseStartup<Startup>().ConfigureLogging(logging =>
-            {
-                logging.ClearProviders();
-                logging.SetMinimumLevel(LogLevel.Warning);
-            })
-            .UseNLog();
-    }
-}