From 00ffa455fd7e4791809e9c1f0b5f9fd5a8a17570 Mon Sep 17 00:00:00 2001 From: Suphonchai Phoonsawat Date: Thu, 18 Jan 2024 05:50:21 +0700 Subject: [PATCH] change compare LeaveStatus to Contain --- .../Leaves/LeaveRequests/LeaveRequestRepository.cs | 3 ++- BMA.EHR.Leave.Service/Controllers/LeaveRequestController.cs | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/BMA.EHR.Application/Repositories/Leaves/LeaveRequests/LeaveRequestRepository.cs b/BMA.EHR.Application/Repositories/Leaves/LeaveRequests/LeaveRequestRepository.cs index 73b65065..7afc3ece 100644 --- a/BMA.EHR.Application/Repositories/Leaves/LeaveRequests/LeaveRequestRepository.cs +++ b/BMA.EHR.Application/Repositories/Leaves/LeaveRequests/LeaveRequestRepository.cs @@ -572,11 +572,12 @@ namespace BMA.EHR.Application.Repositories.Leaves.LeaveRequests public async Task CheckDuplicateLeave(Guid keycloakUserId, DateTime startDate, DateTime endDate) { + var leaveStatus = new List() { "NEW", "PENDING", "APPROVE" }; var data = await _dbContext.Set().AsQueryable() .Include(x => x.Type) .Where(x => x.KeycloakUserId == keycloakUserId) .Where(x => x.LeaveStartDate.Date == startDate.Date || x.LeaveEndDate.Date == endDate.Date) - .Where(x => x.LeaveStatus == "NEW" || x.LeaveStatus == "PENDING" || x.LeaveStatus == "APPROVE") + .Where(x => leaveStatus.Contains(x.LeaveStatus)) .ToListAsync(); return data.Count > 0; diff --git a/BMA.EHR.Leave.Service/Controllers/LeaveRequestController.cs b/BMA.EHR.Leave.Service/Controllers/LeaveRequestController.cs index 3d8681cb..534880e1 100644 --- a/BMA.EHR.Leave.Service/Controllers/LeaveRequestController.cs +++ b/BMA.EHR.Leave.Service/Controllers/LeaveRequestController.cs @@ -1563,6 +1563,7 @@ namespace BMA.EHR.Leave.Service.Controllers return Error("Document not found"); } + #endregion } } \ No newline at end of file