diff --git a/CarParkValidationAPI/Controllers/ConcessionValidationController.cs b/CarParkValidationAPI/Controllers/ConcessionValidationController.cs index b483dc3..13bb118 100644 --- a/CarParkValidationAPI/Controllers/ConcessionValidationController.cs +++ b/CarParkValidationAPI/Controllers/ConcessionValidationController.cs @@ -56,9 +56,9 @@ namespace CarParkValidationAPI.Controllers } [HttpGet("[action]")] - public async Task CheckConcessionValidationByStaff(string staffLinkNo, string concessionCard, DateTime currentDate) + public async Task CheckConcessionValidationByStaff(string staffLinkNo, string concessionCard, DateTime currentDate, int id) { - var retval = await _concessionValidation.CheckConcessionValidationStaffLinkNoAsync(staffLinkNo, concessionCard, currentDate); + var retval = await _concessionValidation.CheckConcessionValidationStaffLinkNoAsync(staffLinkNo, concessionCard, currentDate, id); return Ok(retval); } diff --git a/CarParkValidationAPI/Interface/IConcessionValidation.cs b/CarParkValidationAPI/Interface/IConcessionValidation.cs index dd81f90..2357fef 100644 --- a/CarParkValidationAPI/Interface/IConcessionValidation.cs +++ b/CarParkValidationAPI/Interface/IConcessionValidation.cs @@ -12,7 +12,7 @@ namespace CarParkValidationAPI.Interface { Task>> LoadConcessionValidationAsync(bool OnlyActive); Task>> LoadConcessionValidationStaffLinkNoAsync(string staffLinkNo, DateTime currentDate); - Task> CheckConcessionValidationStaffLinkNoAsync(string staffLinkNo, string concessionCard, DateTime currentDate); + Task> CheckConcessionValidationStaffLinkNoAsync(string staffLinkNo, string concessionCard, DateTime currentDate, int id); Task> SaveConcessionValidationAsync(ConcessionValidationDto item); Task> LoadConcessionValidationByIdAsync(int id); Task> DeleteConcessionValidationAsync(int id); diff --git a/CarParkValidationAPI/Repository/ConcessionValidationRepository.cs b/CarParkValidationAPI/Repository/ConcessionValidationRepository.cs index 9e2e581..beedd6f 100644 --- a/CarParkValidationAPI/Repository/ConcessionValidationRepository.cs +++ b/CarParkValidationAPI/Repository/ConcessionValidationRepository.cs @@ -162,16 +162,17 @@ namespace CarParkValidationAPI.Repository }; } - public async Task> CheckConcessionValidationStaffLinkNoAsync(string staffLinkNo, string concessionCard, DateTime currentDate) + public async Task> CheckConcessionValidationStaffLinkNoAsync(string staffLinkNo, string concessionCard, DateTime currentDate, int id) { int statuscode = 1; int result = 1; + int number = id < 1 ? 0 : 1; // if insert check > 0 . if modify > 1 string message = "warning you already add concession card on this date!"; try { var anyRecord = await _context.SelectCheckConcessionValidationAsync(currentDate.ToLocalTime().Date, concessionCard, staffLinkNo); - if (anyRecord.Count > 1) + if (anyRecord.Count > number) { result = -1; }