Created appsettings class to pull from appsettings.json files

ReportingServices.API/Models/AppSettings.cs

@@ -0,0 +1,23 @@
+using System.Text.Json;
+
+namespace ReportingServices.API.Models;
+
+public record AppSettings(string BuildNumber,
+                          string Company,
+                          string ConnectionString,
+                          string GitCommitSeven,
+                          string LoggingDirectory,
+                          bool IsDevelopment,
+                          bool IsStaging,
+                          string MonAResource,
+                          string MonASite,
+                          string URLs)
+{
+
+    public override string ToString()
+    {
+        string result = JsonSerializer.Serialize(this, new JsonSerializerOptions() { WriteIndented = true });
+        return result;
+    }
+
+}

ReportingServices.API/Models/Binder/AppSettings.cs

@@ -0,0 +1,77 @@
+using System.ComponentModel.DataAnnotations;
+using System.Text.Json;
+
+namespace ReportingServices.API.Models.Binder;
+
+public class AppSettings
+{
+
+#nullable disable
+
+    [Display(Name = "Build Number"), Required] public string BuildNumber { get; set; }
+    [Display(Name = "Company"), Required] public string Company { get; set; }
+    [Display(Name = "Connection String"), Required] public string ConnectionString { get; set; }
+    [Display(Name = "Git Commit Seven"), Required] public string GitCommitSeven { get; set; }
+    [Display(Name = "Logging Directory"), Required] public string LoggingDirectory { get; set; }
+    [Display(Name = "Is Development"), Required] public bool? IsDevelopment { get; set; }
+    [Display(Name = "Is Staging"), Required] public bool? IsStaging { get; set; }
+    [Display(Name = "MonA Resource"), Required] public string MonAResource { get; set; }
+    [Display(Name = "MonA Site"), Required] public string MonASite { get; set; }
+    [Display(Name = "URLs"), Required] public string URLs { get; set; }
+
+#nullable enable
+
+    public override string ToString()
+    {
+        string result = JsonSerializer.Serialize(this, new JsonSerializerOptions() { WriteIndented = true });
+        return result;
+    }
+
+    private static Models.AppSettings Get(AppSettings? appSettings)
+    {
+        Models.AppSettings result;
+        if (appSettings is null)
+            throw new NullReferenceException(nameof(appSettings));
+        if (appSettings.BuildNumber is null)
+            throw new NullReferenceException(nameof(BuildNumber));
+        if (appSettings.Company is null)
+            throw new NullReferenceException(nameof(Company));
+        if (appSettings.ConnectionString is null)
+            throw new NullReferenceException(nameof(ConnectionString));
+        if (appSettings.GitCommitSeven is null)
+            throw new NullReferenceException(nameof(GitCommitSeven));
+        if (appSettings.LoggingDirectory is null)
+            throw new NullReferenceException(nameof(LoggingDirectory));
+        if (appSettings.IsDevelopment is null)
+            throw new NullReferenceException(nameof(IsDevelopment));
+        if (appSettings.IsStaging is null)
+            throw new NullReferenceException(nameof(IsStaging));
+        if (appSettings.MonAResource is null)
+            throw new NullReferenceException(nameof(MonAResource));
+        if (appSettings.MonASite is null)
+            throw new NullReferenceException(nameof(MonASite));
+        if (appSettings.URLs is null)
+            throw new NullReferenceException(nameof(URLs));
+        result = new(
+            appSettings.BuildNumber,
+            appSettings.Company,
+            appSettings.ConnectionString,
+            appSettings.GitCommitSeven,
+            appSettings.LoggingDirectory,
+            appSettings.IsDevelopment.Value,
+            appSettings.IsStaging.Value,
+            appSettings.MonAResource,
+            appSettings.MonASite,
+            appSettings.URLs);
+        return result;
+    }
+
+    public static Models.AppSettings Get(IConfigurationRoot configurationRoot)
+    {
+        Models.AppSettings result;
+        AppSettings? appSettings = configurationRoot.Get<AppSettings>();
+        result = Get(appSettings);
+        return result;
+    }
+
+}

ReportingServices.API/Program.cs

@@ -1,3 +1,4 @@
+using ReportingServices.API.Models;
 using ReportingServices.Shared.Repositories;
 using Serilog;
 
@@ -8,7 +9,9 @@ internal class Program
         LoggerConfiguration loggerConfiguration = new();
 
         WebApplicationBuilder builder = WebApplication.CreateBuilder(args);
-        Environment.SetEnvironmentVariable("workingDirectory", "D:\\tmp\\logging\\MesaReportingServices\\API");
+        _ = builder.Configuration.AddUserSecrets<Program>();
+        AppSettings appSettings = ReportingServices.API.Models.Binder.AppSettings.Get(builder.Configuration);
+        Environment.SetEnvironmentVariable("workingDirectory", appSettings.LoggingDirectory);
         _ = loggerConfiguration.ReadFrom.Configuration(builder.Configuration);
         _ = builder.Host.UseSerilog();
         Log.Logger = loggerConfiguration.CreateLogger();
@@ -18,7 +21,8 @@ internal class Program
         // Learn more about configuring Swagger/OpenAPI at https://aka.ms/aspnetcore/swashbuckle
         _ = builder.Services.AddEndpointsApiExplorer();
         _ = builder.Services.AddSwaggerGen();
-        _ = builder.Services.AddScoped<IScrapeDatabaseRepository, ScrapeDatabaseRepository>();
+        _ = builder.Services.AddSingleton(_ => appSettings);
+        _ = builder.Services.AddScoped<IScrapeDatabaseRepository, ScrapeDatabaseRepository>(_ => new(appSettings.ConnectionString));
 
         WebApplication app = builder.Build();
 

ReportingServices.API/appsettings.Development.json

@@ -1,12 +1,42 @@
 {
-  "Logging": {
+  "ConnectionString": "Server=MESSV01EC.EC.LOCAL\\PROD1,53959;Database=LSL2SQL;User Id=srpadmin;Password=0okm9ijn;TrustServerCertificate=true",
-    "LogLevel": {
+  "IsDevelopment": true,
-      "Default": "Information",
+  "MonAResource": "ReportingServicesApiIfx",
-      "Microsoft.AspNetCore": "Warning"
+  "Serilog": {
+    "Using": [
+      "Serilog.Sinks.Console",
+      "Serilog.Sinks.File"
+    ],
+    "MinimumLevel": "Information",
+    "WriteTo": [
+      {
+        "Name": "Debug",
+        "Args": {
+          "outputTemplate": "{Timestamp:yyyy-MM-dd HH:mm:ss.fff zzz} [{Level}] ({SourceContext}.{MethodName} ({InstanceId}) ({RemoteIpAddress}) {Message}{NewLine}{Exception}"
+        }
+      },
+      {
+        "Name": "Console",
+        "Args": {
+          "outputTemplate": "{Timestamp:yyyy-MM-dd HH:mm:ss.fff zzz} [{Level}] ({SourceContext}.{MethodName} ({InstanceId}) ({RemoteIpAddress}) {Message}{NewLine}{Exception}"
+        }
+      },
+      {
+        "Name": "File",
+        "Args": {
+          "path": "%workingDirectory% - Log/log-.txt",
+          "outputTemplate": "{Timestamp:yyyy-MM-dd HH:mm:ss.fff zzz} [{Level}] ({SourceContext}.{MethodName} ({InstanceId}) ({RemoteIpAddress}) {Message}{NewLine}{Exception}",
+          "rollingInterval": "Hour"
+        }
+      }
+    ],
+    "Enrich": [
+      "FromLogContext",
+      "WithMachineName",
+      "WithThreadId"
+    ],
+    "Properties": {
+      "Application": "Sample"
     }
-  },
+  }
-  "ConnectionStrings": {
+}
-    "DefaultConnection": "Server=MESSV01EC.EC.LOCAL\\PROD1,53959;Database=LSL2SQL;User Id=srpadmin;Password=0okm9ijn;TrustServerCertificate=true"
-  },
-  "LoggingDirectory": "C:\\tmp\\logging"
-}

ReportingServices.API/appsettings.Release.json

@@ -1,12 +0,0 @@
-{
-  "Logging": {
-    "LogLevel": {
-      "Default": "Information",
-      "Microsoft.AspNetCore": "Warning"
-    }
-  },
-  "ConnectionStrings": {
-    "DefaultConnection": "Server=MESSV01EC.EC.LOCAL\\PROD1,53959;Database=LSL2SQL;User Id=srpadmin;Password=0okm9ijn;TrustServerCertificate=true"
-  },
-  "LoggingDirectory": "D:\\tmp\\logging\\MesaReportingServices\\API"
-}

ReportingServices.API/appsettings.json

@@ -1,11 +1,22 @@
 {
+  "AllowedHosts": "*",
+  "BuildNumber": "1",
+  "Company": "Infineon Technologies Americas Corp.",
+  "ConnectionString": "Server=MESSV01EC.EC.LOCAL\\PROD1,53959;Database=LSL2SQL;User Id=srpadmin;Password=0okm9ijn;TrustServerCertificate=true",
+  "GitCommitSeven": "1234567",
   "Logging": {
     "LogLevel": {
       "Default": "Information",
-      "Microsoft.AspNetCore": "Warning"
+      "Microsoft": "Warning",
+      "Log4netProvider": "Debug",
+      "Microsoft.Hosting.Lifetime": "Information"
     }
   },
-  "AllowedHosts": "*",
+  "LoggingDirectory": "D:/tmp/logging/MesaReportingServices/API",
+  "IsDevelopment": false,
+  "IsStaging": false,
+  "MonAResource": "ReportingServicesApiEc",
+  "MonASite": "auc",
   "Serilog": {
     "Using": [
       "Serilog.Sinks.Console",
@@ -41,7 +52,6 @@
     ],
     "Properties": {
       "Application": "Sample"
-    },
+    }
-    "LoggingDirectory": "D:\\tmp\\logging\\MesaReportingServices\\API"
   }
-}
+}

ReportingServices.Shared/Repositories/Implementations/ScrapeDatabaseRepository.cs

@@ -10,7 +10,7 @@ public class ScrapeDatabaseRepository : IScrapeDatabaseRepository
     private SqlConnection _connection;
     private readonly string _connectionString;
 
-    public ScrapeDatabaseRepository() => _connectionString = "Server=MESSV01EC.EC.LOCAL\\PROD1,53959;Database=LSL2SQL;User Id=srpadmin;Password=0okm9ijn;TrustServerCertificate=true";
+    public ScrapeDatabaseRepository(string connectionString) => _connectionString = connectionString;
 
     public void OpenConnection()
     {

ReportingServices.UI/Controllers/ProductionReportController.cs

@@ -2,20 +2,23 @@
 using ReportingServices.Shared.HelperClasses;
 using ReportingServices.Shared.Models.ProductionReport;
 using ReportingServices.Shared.ViewModels.ProductionReport;
+using ReportingServices.UI.Models;
 
 namespace ReportingServices.UI.Controllers;
 
 public class ProductionReportController : Controller
 {
     private readonly ILogger<ProductionReportController> _logger;
-    private readonly string _dailyRptFilePath = "wwwroot/Assets/DailyReportInfo.json";
+    private readonly string _dailyRptFilePath;
-    private readonly string _toolStateOwnerFilePath = "wwwroot/Assets/ToolStates.json";
+    private readonly string _toolStateOwnerFilePath;
     private readonly string _baseDBUrl;
 
-    public ProductionReportController(ILogger<ProductionReportController> logger)
+    public ProductionReportController(ILogger<ProductionReportController> logger, AppSettings appSettings)
     {
         _logger = logger;
-        _baseDBUrl = "http://localhost:50201/api/ScrapeDB/";
+        _baseDBUrl = appSettings.BaseAPIAddress;
+        _dailyRptFilePath = appSettings.DailyReportFilePath;
+        _toolStateOwnerFilePath = appSettings.ToolStateOwnerFilePath;
 
         _logger.LogInformation("Base Database Address: {baseUrl}", _baseDBUrl);
     }

ReportingServices.UI/Models/AppSettings.cs

@@ -0,0 +1,25 @@
+using System.Text.Json;
+
+namespace ReportingServices.UI.Models;
+
+public record AppSettings(string BaseAPIAddress,
+                          string BuildNumber,
+                          string Company,
+                          string DailyReportFilePath,
+                          string GitCommitSeven,
+                          string LoggingDirectory,
+                          bool IsDevelopment,
+                          bool IsStaging,
+                          string MonAResource,
+                          string MonASite,
+                          string ToolStateOwnerFilePath,
+                          string URLs)
+{
+
+    public override string ToString()
+    {
+        string result = JsonSerializer.Serialize(this, new JsonSerializerOptions() { WriteIndented = true });
+        return result;
+    }
+
+}

ReportingServices.UI/Models/Binder/AppSettings.cs

@@ -0,0 +1,85 @@
+using System.ComponentModel.DataAnnotations;
+using System.Text.Json;
+
+namespace ReportingServices.UI.Models.Binder;
+
+public class AppSettings
+{
+
+#nullable disable
+
+    [Display(Name = "Base API Address"), Required] public string BaseAPIAddress { get; set; }
+    [Display(Name = "Build Number"), Required] public string BuildNumber { get; set; }
+    [Display(Name = "Company"), Required] public string Company { get; set; }
+    [Display(Name = "Daily Report File Path"), Required] public string DailyReportFilePath { get; set; }
+    [Display(Name = "Git Commit Seven"), Required] public string GitCommitSeven { get; set; }
+    [Display(Name = "Logging Directory"), Required] public string LoggingDirectory { get; set; }
+    [Display(Name = "Is Development"), Required] public bool? IsDevelopment { get; set; }
+    [Display(Name = "Is Staging"), Required] public bool? IsStaging { get; set; }
+    [Display(Name = "MonA Resource"), Required] public string MonAResource { get; set; }
+    [Display(Name = "MonA Site"), Required] public string MonASite { get; set; }
+    [Display(Name = "Tool State Owner File Path"), Required] public string ToolStateOwnerFilePath { get; set; }
+    [Display(Name = "URLs"), Required] public string URLs { get; set; }
+
+#nullable enable
+
+    public override string ToString()
+    {
+        string result = JsonSerializer.Serialize(this, new JsonSerializerOptions() { WriteIndented = true });
+        return result;
+    }
+
+    private static Models.AppSettings Get(AppSettings? appSettings)
+    {
+        Models.AppSettings result;
+        if (appSettings is null)
+            throw new NullReferenceException(nameof(appSettings));
+        if (appSettings.BaseAPIAddress is null)
+            throw new NullReferenceException(nameof(BaseAPIAddress));
+        if (appSettings.BuildNumber is null)
+            throw new NullReferenceException(nameof(BuildNumber));
+        if (appSettings.Company is null)
+            throw new NullReferenceException(nameof(Company));
+        if (appSettings.DailyReportFilePath is null)
+            throw new NullReferenceException(nameof(DailyReportFilePath));
+        if (appSettings.GitCommitSeven is null)
+            throw new NullReferenceException(nameof(GitCommitSeven));
+        if (appSettings.LoggingDirectory is null)
+            throw new NullReferenceException(nameof(LoggingDirectory));
+        if (appSettings.IsDevelopment is null)
+            throw new NullReferenceException(nameof(IsDevelopment));
+        if (appSettings.IsStaging is null)
+            throw new NullReferenceException(nameof(IsStaging));
+        if (appSettings.MonAResource is null)
+            throw new NullReferenceException(nameof(MonAResource));
+        if (appSettings.MonASite is null)
+            throw new NullReferenceException(nameof(MonASite));
+        if (appSettings.URLs is null)
+            throw new NullReferenceException(nameof(URLs));
+        if (appSettings.ToolStateOwnerFilePath is null)
+            throw new NullReferenceException(nameof(ToolStateOwnerFilePath));
+        result = new(
+            appSettings.BaseAPIAddress,
+            appSettings.BuildNumber,
+            appSettings.Company,
+            appSettings.DailyReportFilePath,
+            appSettings.GitCommitSeven,
+            appSettings.LoggingDirectory,
+            appSettings.IsDevelopment.Value,
+            appSettings.IsStaging.Value,
+            appSettings.MonAResource,
+            appSettings.MonASite,
+            appSettings.ToolStateOwnerFilePath,
+            appSettings.URLs);
+        return result;
+    }
+
+    public static Models.AppSettings Get(IConfigurationRoot configurationRoot)
+    {
+        Models.AppSettings result;
+        AppSettings? appSettings = configurationRoot.Get<AppSettings>();
+        result = Get(appSettings);
+        return result;
+    }
+
+}

ReportingServices.UI/Program.cs

@@ -1,3 +1,4 @@
+using ReportingServices.UI.Models;
 using Serilog;
 
 internal class Program
@@ -7,6 +8,8 @@ internal class Program
         LoggerConfiguration loggerConfiguration = new();
 
         WebApplicationBuilder builder = WebApplication.CreateBuilder(args);
+        _ = builder.Configuration.AddUserSecrets<Program>();
+        AppSettings appSettings = ReportingServices.UI.Models.Binder.AppSettings.Get(builder.Configuration);
         Environment.SetEnvironmentVariable("workingDirectory", "D:\\tmp\\logging\\MesaReportingServices\\UI");
         _ = loggerConfiguration.ReadFrom.Configuration(builder.Configuration);
         _ = builder.Host.UseSerilog();
@@ -15,6 +18,7 @@ internal class Program
 
         // Add services to the container.
         _ = builder.Services.AddControllersWithViews();
+        _ = builder.Services.AddSingleton(_ => appSettings);
 
         WebApplication app = builder.Build();
 

ReportingServices.UI/appsettings.Development.json

@@ -1,16 +1,42 @@
 {
-  "Logging": {
+  "IsDevelopment": true,
-    "LogLevel": {
+  "BaseAPIAddress": "https://localhost:7196/api/ScrapeDB/",
-      "Default": "Information",
+  "MonAResource": "ReportingServicesUiIfx",
-      "Microsoft.AspNetCore": "Warning"
-    }
-  },
   "Serilog": {
-    "MinimumLevel": "Debug"
+    "Using": [
-  },
+      "Serilog.Sinks.Console",
-  "ConnectionStrings": {
+      "Serilog.Sinks.File"
-    "DefaultConnection": "Server=MESSV01EC.EC.LOCAL\\PROD1,53959;Database=LSL2SQL;User Id=srpadmin;Password=0okm9ijn;TrustServerCertificate=true"
+    ],
-  },
+    "MinimumLevel": "Debug",
-  "BaseAPIAddress": "https://localhost:7196/api/",
+    "WriteTo": [
-  "LoggingDirectory":  "C:\\tmp\\logging"
+      {
-}
+        "Name": "Debug",
+        "Args": {
+          "outputTemplate": "{Timestamp:yyyy-MM-dd HH:mm:ss.fff zzz} [{Level}] ({SourceContext}.{MethodName}) ({InstanceId}) ({RemoteIpAddress}) {Message}{NewLine}{Exception}"
+        }
+      },
+      {
+        "Name": "Console",
+        "Args": {
+          "outputTemplate": "{Timestamp:yyyy-MM-dd HH:mm:ss.fff zzz} [{Level}] ({SourceContext}.{MethodName}) ({InstanceId}) ({RemoteIpAddress}) {Message}{NewLine}{Exception}"
+        }
+      },
+      {
+        "Name": "File",
+        "Args": {
+          "path": "%workingDirectory% - Log/log-.txt",
+          "outputTemplate": "{Timestamp:yyyy-MM-dd HH:mm:ss.fff zzz} [{Level}] ({SourceContext}.{MethodName}) ({InstanceId}) ({RemoteIpAddress}) {Message}{NewLine}{Exception}",
+          "rollingInterval": "Hour"
+        }
+      }
+    ],
+    "Enrich": [
+      "FromLogContext",
+      "WithMachineName",
+      "WithThreadId"
+    ],
+    "Properties": {
+      "Application": "Sample"
+    }
+  }
+}

ReportingServices.UI/appsettings.Release.json

@@ -1,16 +0,0 @@
-{
-  "Logging": {
-    "LogLevel": {
-      "Default": "Information",
-      "Microsoft.AspNetCore": "Warning"
-    }
-  },
-  "Serilog": {
-    "MinimumLevel": "Debug"
-  },
-  "ConnectionStrings": {
-    "DefaultConnection": "Server=MESSV01EC.EC.LOCAL\\PROD1,53959;Database=LSL2SQL;User Id=srpadmin;Password=0okm9ijn;TrustServerCertificate=true"
-  },
-  "BaseAPIAddress": "http://localhost:50201/api/",
-  "LoggingDirectory": "D:\\tmp\\logging\\MesaReportingServices\\UI"
-}

ReportingServices.UI/appsettings.json

@@ -1,14 +1,23 @@
 {
+  "AllowedHosts": "*",
+  "BaseAPIAddress": "http://localhost:50201/api/ScrapeDB/",
+  "BuildNumber": "1",
+  "Company": "Infineon Technologies Americas Corp.",
+  "DailyReportFilePath": "wwwroot/Assets/DailyReportInfo.json",
+  "GitCommitSeven": "1234567",
   "Logging": {
     "LogLevel": {
       "Default": "Information",
-      "Microsoft.AspNetCore": "Warning"
+      "Microsoft": "Warning",
+      "Log4netProvider": "Debug",
+      "Microsoft.Hosting.Lifetime": "Information"
     }
   },
-  "ConnectionStrings": {
+  "LoggingDirectory": "D:/tmp/logging/MesaReportingServices/UI",
-    "DefaultConnection": "Server=MESSV01EC.EC.LOCAL\\PROD1,53959;Database=LSL2SQL;User Id=srpadmin;Password=0okm9ijn;TrustServerCertificate=true"
+  "IsDevelopment": false,
-  },
+  "IsStaging": false,
-  "AllowedHosts": "*",
+  "MonAResource": "ReportingServicesUiEc",
+  "MonASite": "auc",
   "Serilog": {
     "Using": [
       "Serilog.Sinks.Console",
@@ -44,8 +53,7 @@
     ],
     "Properties": {
       "Application": "Sample"
-    },
+    }
-    "BaseAPIAddress": "http://localhost:50201/api/",
+  },
-    "LoggingDirectory": "D:\\tmp\\logging\\MesaReportingServices\\UI"
+  "ToolStateOwnerFilePath": "wwwroot/Assets/ToolStates.json"
-  }
+}
-}