Infrastructure to acquire db log for running migrations added in User managment and Centralized logging Apis. Docker-compose update for the Integration Portal and db2 health check

Author: HasanJaved-Developer

CentralizedLoggingApi/CentralizedLoggingApi.xml

@@ -1,6 +1,7 @@
 using CentralizedLoggingApi;
 using CentralizedLoggingApi.Data;
 using CentralizedLoggingApi.DTO.Auth;
+using CentralizedLoggingApi.Infrastructure;
 using CentralizedLoggingApi.Middlewares;
 using Microsoft.AspNetCore.Authentication.JwtBearer;
 using Microsoft.EntityFrameworkCore;
@@ -134,12 +135,20 @@
 
 app.UseAuthorization();
 
+app.MapControllers();
 
 
+const string GlobalLock = "IMIS_GLOBAL_MIGRATE_SEED"; // <-- same string used in BOTH APIs
+await app.MigrateAndSeedWithSqlLockAsync<LoggingDbContext>(
+    connectionStringName: "MasterConnection",           // change if your name differs
+    globalLockName: GlobalLock,
+    seedAsync: async (sp, ct) =>
+    {
+        // IMPORTANT: remove Migrate() inside your seeder
+        // Old: DbSeeder.Seed(IServiceProvider) (sync). Wrap to awaitable:
+        DbSeeder.Seed(sp);
+        await Task.CompletedTask;
+    });
 
-app.MapControllers();
-
-// Seed sample data
-DbSeeder.Seed(app.Services);
 
 app.Run();

CentralizedLoggingApi/Program.cs

@@ -1,5 +1,6 @@
 {
   "ConnectionStrings": {
-    "DefaultConnection": "Server=(localdb)\\mssqllocaldb;Database=CentralizedLoggingDB;Trusted_Connection=True;MultipleActiveResultSets=true"
+    "DefaultConnection": "Server=(localdb)\\mssqllocaldb;Database=CentralizedLoggingDB;Trusted_Connection=True;MultipleActiveResultSets=true",
+    "MasterConnection": "Server=(localdb)\\mssqllocaldb;Trusted_Connection=True;MultipleActiveResultSets=true"
   }
 }

CentralizedLoggingApi/appsettings.Development.json

@@ -30,5 +30,4 @@
     "Key": "dmVyeV9sb25nX2Rldl9rZXlfY2hhbmdlX2luX3Byb2RfMTIzNDU2Nzg5MA==",
     "ExpiresMinutes": 60
   }
-
 }

CentralizedLoggingApi/appsettings.json

@@ -7,6 +7,7 @@
 using UserManagementApi;
 using UserManagementApi.Data;
 using UserManagementApi.DTO.Auth;
+using UserManagementApi.Infrastructure;
 using UserManagementApi.Middlewares;
 
 var builder = WebApplication.CreateBuilder(args);
@@ -135,6 +136,19 @@
 app.MapControllers();
 
 // Seed sample data
-DbSeeder.Seed(app.Services);
+//DbSeeder.Seed(app.Services);
+
+const string GlobalLock = "IMIS_GLOBAL_MIGRATE_SEED"; // <-- same string used in BOTH APIs
+await app.MigrateAndSeedWithSqlLockAsync<AppDbContext>(
+    connectionStringName: "MasterConnection",           // change if your name differs
+    globalLockName: GlobalLock,
+    seedAsync: async (sp, ct) =>
+    {
+        // IMPORTANT: remove Migrate() inside your seeder
+        // Old: DbSeeder.Seed(IServiceProvider) (sync). Wrap to awaitable:
+        DbSeeder.Seed(sp);
+        await Task.CompletedTask;
+    });
+
 
 app.Run();

UserManagementApi/Program.cs

@@ -1,30 +1,57 @@
 services:
   api:
-    build: ./CentralizedLoggingApi
+    build:
+      context: .                               
+      dockerfile: CentralizedLoggingApi/Dockerfile
     container_name: centralized_logging_api
     environment:
       - ASPNETCORE_ENVIRONMENT=Production
     ports:
       - "5000:8080"   # Map host:container for HTTP
       - "5001:8081"   # Map host:container for HTTPS (if your app supports it)   
     depends_on:
-      - db       
+      db:
+        condition: service_healthy
+    
     volumes:
       - ./CentralizedLoggingApi/logs:/app/logs   
 
   userapi:
-    build: ./UserManagementApi
+    build:
+      context: .
+      dockerfile: UserManagementApi/Dockerfile
     container_name: user_management_api
     environment:
       - ASPNETCORE_ENVIRONMENT=Production            
     ports:
       - "6000:8080"   # Host 6000 -> container 8080 (HTTP)
       # - "6001:8081" # Optional HTTPS mapping if your app listens on 8081
     depends_on:
-      - db
+      db:
+        condition: service_healthy
+    
     volumes:
       - ./UserManagementApi/logs:/app/logs    
 
+  web:    
+    build:
+      context: .
+      dockerfile: ApiIntegrationMvc/Dockerfile
+    container_name: api_integration_web
+    environment:
+      - ASPNETCORE_ENVIRONMENT=Production
+      - ASPNETCORE_URLS=http://+:8080
+      # Point the web app to APIs by service name (DNS provided by Compose)
+      - Services__CentralizedLogging__BaseUrl=http://api:8080
+      - Services__UserManagement__BaseUrl=http://userapi:8080
+    ports:
+      - "7000:8080"  # browse http://localhost:7000
+    depends_on:
+      api:
+        condition: service_started
+      userapi:
+        condition: service_started
+
   db:
     image: mcr.microsoft.com/mssql/server:2022-latest
     container_name: centralized_logging_db
@@ -34,10 +61,11 @@ services:
     ports:
       - "1433:1433"
     healthcheck:
-        test: ["CMD", "/opt/mssql-tools/bin/sqlcmd", "-S", "localhost", "-U", "sa", "-P", "Bisp@123", "-Q", "SELECT 1"]
-        interval: 10s
-        retries: 10
-        start_period: 30s            
+      test: ["CMD-SHELL", "/opt/mssql-tools18/bin/sqlcmd -S localhost,1433 -U sa -P 'Bisp@123' -C -Q \"SELECT 1\""]
+      interval: 10s
+      timeout: 5s
+      retries: 10
+      start_period: 30s          
     volumes:
       - sql_data:/var/opt/mssql