From 073cba817f35a2da30f2e2fb8eb892f830c350f2 Mon Sep 17 00:00:00 2001 From: rajesh Date: Wed, 13 Nov 2024 17:36:23 +0530 Subject: [PATCH] Fixed issue related to evaluation status --- .../dao/ApplicationAmendmentRequestDao.java | 10 ++++++++++ .../ApplicationAmendmentRequestRepository.java | 5 +++++ 2 files changed, 15 insertions(+) diff --git a/src/main/java/net/gepafin/tendermanagement/dao/ApplicationAmendmentRequestDao.java b/src/main/java/net/gepafin/tendermanagement/dao/ApplicationAmendmentRequestDao.java index b522354d..d7698a91 100644 --- a/src/main/java/net/gepafin/tendermanagement/dao/ApplicationAmendmentRequestDao.java +++ b/src/main/java/net/gepafin/tendermanagement/dao/ApplicationAmendmentRequestDao.java @@ -523,6 +523,16 @@ public class ApplicationAmendmentRequestDao { ApplicationAmendmentRequestEntity updatedApplicationAmendment = saveApplicationAmendmentRequestEntity(existingApplicationAmendment); ApplicationAmendmentRequestResponse response = convertEntityToResponse(updatedApplicationAmendment); + + List amendmentRequests = applicationAmendmentRequestRepository.findAllByApplicationEvaluationIdAndIsDeletedFalse(existingApplicationAmendment.getApplicationEvaluationEntity().getId()); + boolean allClosed = amendmentRequests.stream() + .allMatch(amendment -> amendment.getStatus().equals(ApplicationAmendmentRequestEnum.CLOSE.getValue())); + + if (allClosed) { + existingApplicationAmendment.getApplicationEvaluationEntity().setStatus(ApplicationEvaluationStatusTypeEnum.OPEN.getValue()); + applicationEvaluationRepository.save(existingApplicationAmendment.getApplicationEvaluationEntity()); + log.info("All amendments are closed. Application Evaluation status set to OPEN."); + } log.info("Application Amendment closed successfully: {}", response); return response; } diff --git a/src/main/java/net/gepafin/tendermanagement/repositories/ApplicationAmendmentRequestRepository.java b/src/main/java/net/gepafin/tendermanagement/repositories/ApplicationAmendmentRequestRepository.java index 88561517..57331e43 100644 --- a/src/main/java/net/gepafin/tendermanagement/repositories/ApplicationAmendmentRequestRepository.java +++ b/src/main/java/net/gepafin/tendermanagement/repositories/ApplicationAmendmentRequestRepository.java @@ -23,6 +23,11 @@ public interface ApplicationAmendmentRequestRepository extends JpaRepository findAllByApplicationEvaluationIdAndIsDeletedFalse(Long id); + // ApplicationAmendmentRequestEntity findByApplicationIdAndIsDeletedFalse(Long applicationId); List findByApplicationIdAndIsDeletedFalse(Long applicationId);