merge: integrate BD-847 (EF Core, connection flags, entity fixes) into main

Resolve conflicts between BD-845 YAML config and BD-847 EF Core migration.
Keep YAML config structure from BD-845, add connection enable flags and
recipients to YAML files, use EF Core DbContext from BD-847.

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>

Author: ranganathan2020

OrderMonitor_ENV.development.yml

@@ -2,6 +2,11 @@
 # Non-sensitive values for local development.
 # Sensitive values (passwords, keys) should be set as OS environment variables.
 
+# ===== Database Connection Enable/Disable =====
+SQL_CONNECTIONENABLE: "true"
+MYSQL_CONNECTIONENABLE: "false"
+POSTGRES_CONNECTIONENABLE: "false"
+
 # ===== Database Configuration =====
 Database__Provider: "sqlserver"
 Database__ConnectionString: "Server=localhost,1433;Database=PrinterPix_BO_Live;User Id=sa;Password={ENCRYPTED};TrustServerCertificate=True;ApplicationIntent=ReadOnly;"
@@ -20,7 +25,7 @@ SmtpSettings__UseSsl: "true"
 
 # ===== Alert Configuration =====
 Alerts__Enabled: "true"
-Alerts__Recipients: "ranganathan.e@syncoms.com"
+Alerts__Recipients: "ranganathan.e@syncoms.com,muhammad.zakir@syncoms.co.uk,yarik.sobanski@syncoms.co.uk,michael.sobanski@syncoms.co.uk"
 Alerts__SubjectPrefix: "[Order Monitor DEV]"
 
 # ===== Scanner Configuration =====

OrderMonitor_ENV.yml

@@ -5,8 +5,13 @@
 # Key naming: Use double-underscore (__) as hierarchy separator.
 # Example: Database__ConnectionString maps to IConfiguration["Database:ConnectionString"]
 
+# ===== Database Connection Enable/Disable =====
+SQL_CONNECTIONENABLE: "true"                       # Enable SQL Server connection
+MYSQL_CONNECTIONENABLE: "false"                    # Enable MySQL connection
+POSTGRES_CONNECTIONENABLE: "false"                 # Enable PostgreSQL connection
+
 # ===== Database Configuration =====
-Database__Provider: "sqlserver"                    # sqlserver | mysql | postgresql
+Database__Provider: "sqlserver"                    # sqlserver | mysql | postgresql (fallback if no enable flags set)
 Database__ConnectionString: ""                     # Full connection string (without password if using EncryptedPassword)
 Database__EncryptedPassword: ""                    # Base64-encoded AES-encrypted password
 Database__EncryptionKey: ""                        # AES-256 key for decrypting EncryptedPassword (32 chars)

src/OrderMonitor.Api/Controllers/DiagnosticsController.cs

@@ -1,4 +1,3 @@
-using Dapper;
 using Microsoft.AspNetCore.Mvc;
 using OrderMonitor.Core.Interfaces;
 
@@ -12,12 +11,12 @@ namespace OrderMonitor.Api.Controllers;
 [Produces("application/json")]
 public class DiagnosticsController : ControllerBase
 {
-    private readonly IDbConnectionFactory _connectionFactory;
+    private readonly IDiagnosticsService _diagnosticsService;
     private readonly ILogger<DiagnosticsController> _logger;
 
-    public DiagnosticsController(IDbConnectionFactory connectionFactory, ILogger<DiagnosticsController> logger)
+    public DiagnosticsController(IDiagnosticsService diagnosticsService, ILogger<DiagnosticsController> logger)
     {
-        _connectionFactory = connectionFactory;
+        _diagnosticsService = diagnosticsService;
         _logger = logger;
     }
 
@@ -29,9 +28,7 @@ public async Task<IActionResult> GetOrderTables()
     {
         try
         {
-            using var conn = _connectionFactory.CreateConnection();
-            var tables = await conn.QueryAsync<string>(
-                "SELECT TABLE_NAME FROM INFORMATION_SCHEMA.TABLES WHERE TABLE_NAME LIKE '%Order%' ORDER BY TABLE_NAME");
+            var tables = await _diagnosticsService.GetTablesAsync("Order");
             return Ok(tables);
         }
         catch (Exception ex)
@@ -48,13 +45,7 @@ public async Task<IActionResult> GetTableColumns(string tableName)
     {
         try
         {
-            using var conn = _connectionFactory.CreateConnection();
-            var columns = await conn.QueryAsync<dynamic>(
-                @"SELECT COLUMN_NAME, DATA_TYPE, IS_NULLABLE, CHARACTER_MAXIMUM_LENGTH
-                  FROM INFORMATION_SCHEMA.COLUMNS
-                  WHERE TABLE_NAME = @TableName
-                  ORDER BY ORDINAL_POSITION",
-                new { TableName = tableName });
+            var columns = await _diagnosticsService.GetColumnsAsync(tableName);
             return Ok(columns);
         }
         catch (Exception ex)
@@ -78,9 +69,8 @@ public async Task<IActionResult> RunQuery([FromBody] QueryRequest request)
 
         try
         {
-            using var conn = _connectionFactory.CreateConnection();
-            var results = await conn.QueryAsync<dynamic>(request.Sql);
-            return Ok(results.Take(100)); // Limit to 100 rows
+            var results = await _diagnosticsService.ExecuteQueryAsync(request.Sql);
+            return Ok(results);
         }
         catch (Exception ex)
         {

src/OrderMonitor.Api/appsettings.json

@@ -1,4 +1,10 @@
 {
+  "DatabaseConnections": {
+    "SqlConnectionEnable": true,
+    "MySqlConnectionEnable": false,
+    "PostgresConnectionEnable": false
+  },
+
   "StatusThresholds": {
     "PrepStatuses": {
       "MinStatusId": 3001,

src/OrderMonitor.Core/Interfaces/IDbConnectionFactory.cs

@@ -0,0 +1,33 @@
+namespace OrderMonitor.Core.Interfaces;
+
+/// <summary>
+/// Service interface for database diagnostics and schema discovery.
+/// </summary>
+public interface IDiagnosticsService
+{
+    /// <summary>
+    /// Gets table names matching a pattern.
+    /// </summary>
+    Task<IEnumerable<string>> GetTablesAsync(string pattern, CancellationToken cancellationToken = default);
+
+    /// <summary>
+    /// Gets column information for a specific table.
+    /// </summary>
+    Task<IEnumerable<ColumnInfo>> GetColumnsAsync(string tableName, CancellationToken cancellationToken = default);
+
+    /// <summary>
+    /// Executes a read-only query and returns results.
+    /// </summary>
+    Task<IEnumerable<IDictionary<string, object?>>> ExecuteQueryAsync(string sql, CancellationToken cancellationToken = default);
+}
+
+/// <summary>
+/// Represents column metadata for diagnostics.
+/// </summary>
+public class ColumnInfo
+{
+    public string ColumnName { get; set; } = string.Empty;
+    public string DataType { get; set; } = string.Empty;
+    public string IsNullable { get; set; } = string.Empty;
+    public int? CharacterMaximumLength { get; set; }
+}

src/OrderMonitor.Core/Interfaces/IDiagnosticsService.cs

@@ -0,0 +1,93 @@
+using Microsoft.EntityFrameworkCore;
+using Microsoft.Extensions.DependencyInjection;
+
+namespace OrderMonitor.Infrastructure.Data;
+
+/// <summary>
+/// Supported database providers for multi-database support.
+/// </summary>
+public enum DatabaseProvider
+{
+    SqlServer,
+    MySql,
+    PostgreSql
+}
+
+/// <summary>
+/// Factory for configuring the DbContext with the appropriate database provider.
+/// </summary>
+public static class DatabaseProviderFactory
+{
+    private static readonly HashSet<string> ValidProviders = new(StringComparer.OrdinalIgnoreCase)
+    {
+        "SqlServer", "MySql", "PostgreSql"
+    };
+
+    /// <summary>
+    /// Parses a provider string into a DatabaseProvider enum value.
+    /// </summary>
+    public static DatabaseProvider ParseProvider(string provider)
+    {
+        if (string.IsNullOrWhiteSpace(provider))
+            throw new ArgumentException("Database provider cannot be null or empty.", nameof(provider));
+
+        return provider.Trim().ToLowerInvariant() switch
+        {
+            "sqlserver" => DatabaseProvider.SqlServer,
+            "mysql" => DatabaseProvider.MySql,
+            "postgresql" or "postgres" => DatabaseProvider.PostgreSql,
+            _ => throw new ArgumentException(
+                $"Invalid database provider '{provider}'. Allowed values: {string.Join(", ", ValidProviders)}.",
+                nameof(provider))
+        };
+    }
+
+    /// <summary>
+    /// Adds the OrderMonitorDbContext to the service collection with the specified provider.
+    /// </summary>
+    public static IServiceCollection AddOrderMonitorDbContext(
+        this IServiceCollection services,
+        DatabaseProvider provider,
+        string connectionString)
+    {
+        if (string.IsNullOrWhiteSpace(connectionString))
+            throw new ArgumentException("Connection string cannot be null or empty.", nameof(connectionString));
+
+        services.AddDbContext<OrderMonitorDbContext>(options =>
+        {
+            ConfigureProvider(options, provider, connectionString);
+            options.UseQueryTrackingBehavior(QueryTrackingBehavior.NoTracking);
+        });
+
+        return services;
+    }
+
+    /// <summary>
+    /// Configures the DbContextOptionsBuilder for the specified provider.
+    /// </summary>
+    public static void ConfigureProvider(
+        DbContextOptionsBuilder options,
+        DatabaseProvider provider,
+        string connectionString)
+    {
+        switch (provider)
+        {
+            case DatabaseProvider.SqlServer:
+                options.UseSqlServer(connectionString);
+                break;
+
+            case DatabaseProvider.MySql:
+                var serverVersion = ServerVersion.AutoDetect(connectionString);
+                options.UseMySql(connectionString, serverVersion);
+                break;
+
+            case DatabaseProvider.PostgreSql:
+                options.UseNpgsql(connectionString);
+                break;
+
+            default:
+                throw new ArgumentOutOfRangeException(nameof(provider), provider,
+                    $"Unsupported database provider: {provider}");
+        }
+    }
+}

src/OrderMonitor.Infrastructure/Data/DatabaseProviderFactory.cs

@@ -0,0 +1,92 @@
+using Microsoft.EntityFrameworkCore;
+using OrderMonitor.Core.Interfaces;
+
+namespace OrderMonitor.Infrastructure.Data;
+
+/// <summary>
+/// EF Core implementation of database diagnostics.
+/// Uses raw SQL for schema introspection queries.
+/// </summary>
+public class DiagnosticsService : IDiagnosticsService
+{
+    private readonly OrderMonitorDbContext _dbContext;
+
+    public DiagnosticsService(OrderMonitorDbContext dbContext)
+    {
+        _dbContext = dbContext ?? throw new ArgumentNullException(nameof(dbContext));
+    }
+
+    /// <inheritdoc />
+    public async Task<IEnumerable<string>> GetTablesAsync(
+        string pattern,
+        CancellationToken cancellationToken = default)
+    {
+        // Use INFORMATION_SCHEMA which is supported by SQL Server, MySQL, and PostgreSQL
+        var tables = await _dbContext.Database
+            .SqlQueryRaw<string>(
+                "SELECT TABLE_NAME AS Value FROM INFORMATION_SCHEMA.TABLES WHERE TABLE_NAME LIKE {0} ORDER BY TABLE_NAME",
+                $"%{pattern}%")
+            .ToListAsync(cancellationToken);
+
+        return tables;
+    }
+
+    /// <inheritdoc />
+    public async Task<IEnumerable<ColumnInfo>> GetColumnsAsync(
+        string tableName,
+        CancellationToken cancellationToken = default)
+    {
+        var columns = await _dbContext.Database
+            .SqlQueryRaw<ColumnInfo>(
+                @"SELECT COLUMN_NAME AS ColumnName, DATA_TYPE AS DataType,
+                         IS_NULLABLE AS IsNullable, CHARACTER_MAXIMUM_LENGTH AS CharacterMaximumLength
+                  FROM INFORMATION_SCHEMA.COLUMNS
+                  WHERE TABLE_NAME = {0}
+                  ORDER BY ORDINAL_POSITION",
+                tableName)
+            .ToListAsync(cancellationToken);
+
+        return columns;
+    }
+
+    /// <inheritdoc />
+    public async Task<IEnumerable<IDictionary<string, object?>>> ExecuteQueryAsync(
+        string sql,
+        CancellationToken cancellationToken = default)
+    {
+        var results = new List<IDictionary<string, object?>>();
+
+        var connection = _dbContext.Database.GetDbConnection();
+        await connection.OpenAsync(cancellationToken);
+
+        try
+        {
+            using var command = connection.CreateCommand();
+            command.CommandText = sql;
+
+            using var reader = await command.ExecuteReaderAsync(cancellationToken);
+            var columnNames = Enumerable.Range(0, reader.FieldCount)
+                .Select(reader.GetName)
+                .ToList();
+
+            var count = 0;
+            while (await reader.ReadAsync(cancellationToken) && count < 100)
+            {
+                var row = new Dictionary<string, object?>();
+                foreach (var col in columnNames)
+                {
+                    var value = reader[col];
+                    row[col] = value == DBNull.Value ? null : value;
+                }
+                results.Add(row);
+                count++;
+            }
+        }
+        finally
+        {
+            await connection.CloseAsync();
+        }
+
+        return results;
+    }
+}