From 18ab28e335ecbc88eac5648ac61cf33dadaa4b5b Mon Sep 17 00:00:00 2001
From: Suphonchai Phoonsawat <suphonchai.ph@gmail.com>
Date: Mon, 15 Dec 2025 11:12:29 +0700
Subject: [PATCH] fix: enhance database context configuration with retry logic
 for resilience

---
 .../InfrastructureServiceRegistration.cs      | 24 +++++++++++++------
 .../Controllers/LeaveReportController.cs      |  7 +++---
 2 files changed, 21 insertions(+), 10 deletions(-)

diff --git a/BMA.EHR.Infrastructure/InfrastructureServiceRegistration.cs b/BMA.EHR.Infrastructure/InfrastructureServiceRegistration.cs
index 36ba47ef..deee6910 100644
--- a/BMA.EHR.Infrastructure/InfrastructureServiceRegistration.cs
+++ b/BMA.EHR.Infrastructure/InfrastructureServiceRegistration.cs
@@ -20,8 +20,6 @@ namespace BMA.EHR.Infrastructure
         public static IServiceCollection AddLeavePersistence(this IServiceCollection services,
             IConfiguration configuration)
         {
-
-
             // leave db context
             var connectionStringLeave = configuration.GetConnectionString("LeaveConnection");
 
@@ -31,6 +29,10 @@ namespace BMA.EHR.Infrastructure
                 {
                     b.MigrationsAssembly(typeof(LeaveDbContext).Assembly.FullName);
                     b.MigrationsHistoryTable("__LeaveMigrationsHistory");
+                    b.EnableRetryOnFailure(
+                        maxRetryCount: 5,
+                        maxRetryDelay: System.TimeSpan.FromSeconds(30),
+                        errorNumbersToAdd: null);
 
                 }),
                 ServiceLifetime.Transient);
@@ -43,8 +45,6 @@ namespace BMA.EHR.Infrastructure
         public static IServiceCollection AddDisciplinePersistence(this IServiceCollection services,
             IConfiguration configuration)
         {
-
-
             // discipline db context
             var connectionStringDiscipline = configuration.GetConnectionString("DisciplineConnection");
 
@@ -54,7 +54,10 @@ namespace BMA.EHR.Infrastructure
                 {
                     b.MigrationsAssembly(typeof(DisciplineDbContext).Assembly.FullName);
                     b.MigrationsHistoryTable("__DisciplineMigrationsHistory");
-
+                    b.EnableRetryOnFailure(
+                        maxRetryCount: 5,
+                        maxRetryDelay: System.TimeSpan.FromSeconds(30),
+                        errorNumbersToAdd: null);
                 }),
                 ServiceLifetime.Transient);
 
@@ -67,8 +70,6 @@ namespace BMA.EHR.Infrastructure
             IConfiguration configuration)
         {
             services.AddTransient<MinIOService>();
-
-
             var connectionString = configuration.GetConnectionString("DefaultConnection");
 
             services.AddDbContext<ApplicationDBContext>(options =>
@@ -77,9 +78,14 @@ namespace BMA.EHR.Infrastructure
                 {
                     b.MigrationsAssembly(typeof(ApplicationDBContext).Assembly.FullName);
                     b.MigrationsHistoryTable("__EHRMigrationsHistory");
+                    b.EnableRetryOnFailure(
+                        maxRetryCount: 5,
+                        maxRetryDelay: System.TimeSpan.FromSeconds(30),
+                        errorNumbersToAdd: null);
 
                 }),
                 ServiceLifetime.Transient);
+                
 
             services.AddTransient<IApplicationDBContext>(provider => provider.GetService<ApplicationDBContext>());
 
@@ -91,6 +97,10 @@ namespace BMA.EHR.Infrastructure
                 {
                     b.MigrationsAssembly(typeof(ApplicationDBExamContext).Assembly.FullName);
                     b.MigrationsHistoryTable("__EHRMigrationsHistory");
+                    b.EnableRetryOnFailure(
+                        maxRetryCount: 5,
+                        maxRetryDelay: System.TimeSpan.FromSeconds(30),
+                        errorNumbersToAdd: null);
 
                 }),
                 ServiceLifetime.Transient);
diff --git a/BMA.EHR.Leave/Controllers/LeaveReportController.cs b/BMA.EHR.Leave/Controllers/LeaveReportController.cs
index 2b1c90be..ea798ed9 100644
--- a/BMA.EHR.Leave/Controllers/LeaveReportController.cs
+++ b/BMA.EHR.Leave/Controllers/LeaveReportController.cs
@@ -2167,8 +2167,8 @@ namespace BMA.EHR.Leave.Service.Controllers
                                              timeStamps.CheckOut != null ?
                                              timeStamps.CheckOut.Value.ToThaiFullDate2() :
                                              "",
-                            checkInTimeRaw = timeStamps?.CheckIn,
-                            checkOutTimeRaw = timeStamps?.CheckOut,
+                            checkInTimeRaw = timeStamps == null ? dd.date.Date : timeStamps?.CheckIn,
+                            checkOutTimeRaw = timeStamps == null ? dd.date.Date : timeStamps?.CheckOut != null ? timeStamps?.CheckOut : null,
                         };
 
                         if (timeStamps != null)
@@ -2204,7 +2204,8 @@ namespace BMA.EHR.Leave.Service.Controllers
                         count++;
                     }
                 }
-                employees = employees.OrderBy(x => x.checkInDate).ThenBy(x => x.checkInTimeRaw ?? DateTime.MaxValue).ThenBy(x => x.checkOutTimeRaw ?? DateTime.MaxValue).ToList();
+                //employees = employees.OrderBy(x => x.checkInDate).ThenBy(x => x.checkInTimeRaw ?? DateTime.MaxValue).ThenBy(x => x.checkOutTimeRaw ?? DateTime.MaxValue).ToList();
+                employees = employees.OrderBy(x => x.checkInTimeRaw ?? DateTime.MaxValue).ThenBy(x => x.checkOutTimeRaw ?? DateTime.MaxValue).ToList();
                 for (int i = 0; i < employees.Count; i++)
                 {
                     employees[i].no = i + 1;