From 21b8c0450c2b2c73703f55368159230d097644c3 Mon Sep 17 00:00:00 2001
From: Suphonchai Phoonsawat <suphonchai.ph@gmail.com>
Date: Fri, 8 Dec 2023 14:06:14 +0700
Subject: [PATCH] =?UTF-8?q?fix=20defect=20LV2=5F010=20-=20=E0=B8=A3?=
 =?UTF-8?q?=E0=B8=B2=E0=B8=A2=E0=B8=81=E0=B8=B2=E0=B8=A3=E0=B8=A5=E0=B8=B2?=
 =?UTF-8?q?=20(ADMIN)=5Fdefect=5F001=20#169?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Leaves/LeaveRequests/LeaveRequestRepository.cs   | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/BMA.EHR.Application/Repositories/Leaves/LeaveRequests/LeaveRequestRepository.cs b/BMA.EHR.Application/Repositories/Leaves/LeaveRequests/LeaveRequestRepository.cs
index 1c714867..a1b97c1d 100644
--- a/BMA.EHR.Application/Repositories/Leaves/LeaveRequests/LeaveRequestRepository.cs
+++ b/BMA.EHR.Application/Repositories/Leaves/LeaveRequests/LeaveRequestRepository.cs
@@ -106,18 +106,20 @@ namespace BMA.EHR.Application.Repositories.Leaves.LeaveRequests
 
         public async Task<List<LeaveRequest>> GetLeaveRequestForAdminAsync(int year, Guid type, string status)
         {
-            var rawData = _dbContext.Set<LeaveRequest>().AsQueryable()
-                                    .Include(x => x.Type);
+            var rawData = _dbContext.Set<LeaveRequest>()
+                                    .Include(x => x.Type)
+                                    .AsQueryable();
+                                    
 
 
             if (year != 0)
-                rawData = (IIncludableQueryable<LeaveRequest, LeaveType>)rawData.Where(x => x.LeaveStartDate.Year == year);
+                rawData = rawData.Where(x => x.LeaveStartDate.Year == year);
 
             if (type != Guid.Empty)
-                rawData = (IIncludableQueryable<LeaveRequest, LeaveType>)rawData.Where(x => x.Type.Id == type);
+                rawData = rawData.Where(x => x.Type.Id == type);
 
             if (status.Trim().ToUpper() != "ALL")
-                rawData = (IIncludableQueryable<LeaveRequest, LeaveType>)rawData.Where(x => x.LeaveStatus == status);
+                rawData = rawData.Where(x => x.LeaveStatus == status);
 
             return await rawData.ToListAsync();
         }