From 38db4ed80280baf3252b7df5cbcc6283bb6e9648 Mon Sep 17 00:00:00 2001
From: Suphonchai Phoonsawat <suphonchai.ph@gmail.com>
Date: Fri, 19 Jan 2024 09:26:20 +0700
Subject: [PATCH] =?UTF-8?q?=E0=B9=80=E0=B8=9B=E0=B8=A5=E0=B8=B5=E0=B9=88?=
 =?UTF-8?q?=E0=B8=A2=E0=B8=99=E0=B8=82=E0=B8=B1=E0=B9=89=E0=B8=99=E0=B8=95?=
 =?UTF-8?q?=E0=B8=AD=E0=B8=99=E0=B8=81=E0=B8=B2=E0=B8=A3=E0=B8=95=E0=B8=A3?=
 =?UTF-8?q?=E0=B8=A7=E0=B8=88=E0=B8=AA=E0=B8=AD=E0=B8=9A=E0=B8=81=E0=B8=B2?=
 =?UTF-8?q?=E0=B8=A3=E0=B8=A5=E0=B8=B2=E0=B8=8B=E0=B9=89=E0=B8=B3=E0=B9=84?=
 =?UTF-8?q?=E0=B8=9B=E0=B9=84=E0=B8=A7=E0=B9=89=E0=B9=83=E0=B8=99=E0=B8=95?=
 =?UTF-8?q?=E0=B8=AD=E0=B8=99=E0=B8=97=E0=B8=B5=E0=B9=88=E0=B8=88=E0=B8=B0?=
 =?UTF-8?q?=E0=B8=AA=E0=B9=88=E0=B8=87=20=E0=B8=88=E0=B8=99=E0=B8=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../LeaveRequests/LeaveRequestRepository.cs   |  7 +++++++
 .../Controllers/LeaveRequestController.cs     | 20 +++++++++----------
 2 files changed, 17 insertions(+), 10 deletions(-)

diff --git a/BMA.EHR.Application/Repositories/Leaves/LeaveRequests/LeaveRequestRepository.cs b/BMA.EHR.Application/Repositories/Leaves/LeaveRequests/LeaveRequestRepository.cs
index 7afc3ece..e79e309f 100644
--- a/BMA.EHR.Application/Repositories/Leaves/LeaveRequests/LeaveRequestRepository.cs
+++ b/BMA.EHR.Application/Repositories/Leaves/LeaveRequests/LeaveRequestRepository.cs
@@ -344,6 +344,13 @@ namespace BMA.EHR.Application.Repositories.Leaves.LeaveRequests
                 throw new Exception(GlobalMessages.DataNotFound);
             }
 
+            var isDuplicate = await CheckDuplicateLeave(rawData.KeycloakUserId, rawData.LeaveStartDate.Date, rawData.LeaveEndDate.Date);
+            if (isDuplicate)
+            {
+                throw new Exception("ไม่สามารถขอลาในช่วงเวลาเดียวกันได้ เนื่องจากมีการขอลาในช่วงเวลาดังกล่าวแล้ว");
+            }
+
+
             rawData.LeaveStatus = "NEW";
             //rawData.ApproveStep = "st2";
 
diff --git a/BMA.EHR.Leave.Service/Controllers/LeaveRequestController.cs b/BMA.EHR.Leave.Service/Controllers/LeaveRequestController.cs
index 8cbcea53..7f2dab00 100644
--- a/BMA.EHR.Leave.Service/Controllers/LeaveRequestController.cs
+++ b/BMA.EHR.Leave.Service/Controllers/LeaveRequestController.cs
@@ -116,11 +116,11 @@ namespace BMA.EHR.Leave.Service.Controllers
         {
             var userId = UserId == null ? Guid.Empty : Guid.Parse(UserId);
 
-            var isDuplicate = await _leaveRequestRepository.CheckDuplicateLeave(userId, req.LeaveStartDate.Date, req.LeaveEndDate.Date);
-            if (isDuplicate)
-            {
-                return Error("ไม่สามารถขอลาในช่วงเวลาเดียวกันได้ เนื่องจากมีการขอลาในช่วงเวลาดังกล่าวแล้ว");
-            }
+            // var isDuplicate = await _leaveRequestRepository.CheckDuplicateLeave(userId, req.LeaveStartDate.Date, req.LeaveEndDate.Date);
+            // if (isDuplicate)
+            // {
+            //     return Error("ไม่สามารถขอลาในช่วงเวลาเดียวกันได้ เนื่องจากมีการขอลาในช่วงเวลาดังกล่าวแล้ว");
+            // }
 
             var thisYear = DateTime.Now.Year;
 
@@ -338,11 +338,11 @@ namespace BMA.EHR.Leave.Service.Controllers
             var userId = UserId == null ? Guid.Empty : Guid.Parse(UserId);
             var thisYear = DateTime.Now.Year;
 
-            var isDuplicate = await _leaveRequestRepository.CheckDuplicateLeave(userId, req.LeaveStartDate.Date, req.LeaveEndDate.Date);
-            if (isDuplicate)
-            {
-                return Error("ไม่สามารถขอลาในช่วงเวลาเดียวกันได้");
-            }
+            // var isDuplicate = await _leaveRequestRepository.CheckDuplicateLeave(userId, req.LeaveStartDate.Date, req.LeaveEndDate.Date);
+            // if (isDuplicate)
+            // {
+            //     return Error("ไม่สามารถขอลาในช่วงเวลาเดียวกันได้");
+            // }
 
             var profile = await _userProfileRepository.GetProfileByKeycloakIdAsync(userId);