From b90a0ad489ec8dc5851364a5fd7d4c45f569509a Mon Sep 17 00:00:00 2001
From: Suphonchai Phoonsawat <suphonchai.ph@gmail.com>
Date: Thu, 24 Apr 2025 17:02:01 +0700
Subject: [PATCH] fix api

---
 .../Leaves/LeaveRequests/LeaveRequestRepository.cs   | 12 ++++++++++--
 BMA.EHR.Leave/Controllers/LeaveRequestController.cs  |  1 +
 .../LeaveRequest/GetLeaveRequestTableResultDto.cs    |  2 ++
 3 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/BMA.EHR.Application/Repositories/Leaves/LeaveRequests/LeaveRequestRepository.cs b/BMA.EHR.Application/Repositories/Leaves/LeaveRequests/LeaveRequestRepository.cs
index 565cdf97..9b18fbf5 100644
--- a/BMA.EHR.Application/Repositories/Leaves/LeaveRequests/LeaveRequestRepository.cs
+++ b/BMA.EHR.Application/Repositories/Leaves/LeaveRequests/LeaveRequestRepository.cs
@@ -91,7 +91,9 @@ namespace BMA.EHR.Application.Repositories.Leaves.LeaveRequests
 
         public override async Task<LeaveRequest?> GetByIdAsync(Guid id)
         {
-            var data = await _dbContext.Set<LeaveRequest>().AsQueryable()
+            try
+            {
+                var data = await _dbContext.Set<LeaveRequest>().AsQueryable()
                                 .AsNoTracking()
                                 .Include(x => x.Approvers)
                                 .Include(x => x.LeaveDocument)
@@ -101,7 +103,13 @@ namespace BMA.EHR.Application.Repositories.Leaves.LeaveRequests
                                 .Include(x => x.Type)
                                 .FirstOrDefaultAsync(x => x.Id == id);
 
-            return data;
+                return data;
+            }
+            catch
+            {
+                throw;
+            }
+            
         }
 
         public override async Task<LeaveRequest> AddAsync(LeaveRequest entity)
diff --git a/BMA.EHR.Leave/Controllers/LeaveRequestController.cs b/BMA.EHR.Leave/Controllers/LeaveRequestController.cs
index 75264540..40fd5471 100644
--- a/BMA.EHR.Leave/Controllers/LeaveRequestController.cs
+++ b/BMA.EHR.Leave/Controllers/LeaveRequestController.cs
@@ -1303,6 +1303,7 @@ namespace BMA.EHR.Leave.Service.Controllers
                     Id = item.Id,
                     LeaveTypeId = item.Type.Id,
                     LeaveTypeName = item.Type.Name,
+                    LeaveSubTypeName = item.LeaveSubTypeName ?? "",
                     FullName = $"{item.Prefix}{item.FirstName} {item.LastName}",
                     DateSendLeave = item.CreatedAt,
                     IsDelete = item.LeaveStatus == "DELETE",
diff --git a/BMA.EHR.Leave/DTOs/LeaveRequest/GetLeaveRequestTableResultDto.cs b/BMA.EHR.Leave/DTOs/LeaveRequest/GetLeaveRequestTableResultDto.cs
index 9ba93ec2..aad7661c 100644
--- a/BMA.EHR.Leave/DTOs/LeaveRequest/GetLeaveRequestTableResultDto.cs
+++ b/BMA.EHR.Leave/DTOs/LeaveRequest/GetLeaveRequestTableResultDto.cs
@@ -6,6 +6,8 @@
 
         public string LeaveTypeName { get; set; }
 
+        public string? LeaveSubTypeName { get; set; } = string.Empty;
+
         public Guid LeaveTypeId { get; set; }
 
         public string FullName { get; set; }