From ab30f36f5121c89fddbe2ec7074474058985be9f Mon Sep 17 00:00:00 2001
From: rajesh <rajeshkhoreupwork@gmail.com>
Date: Mon, 26 May 2025 12:46:18 +0530
Subject: [PATCH] Fixed close amendment issue

---
 .../dao/ApplicationAmendmentRequestDao.java            | 10 +++++++++-
 .../ApplicationAmendmentRequestRepository.java         |  2 ++
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/src/main/java/net/gepafin/tendermanagement/dao/ApplicationAmendmentRequestDao.java b/src/main/java/net/gepafin/tendermanagement/dao/ApplicationAmendmentRequestDao.java
index 76ce5d3d..02a92762 100644
--- a/src/main/java/net/gepafin/tendermanagement/dao/ApplicationAmendmentRequestDao.java
+++ b/src/main/java/net/gepafin/tendermanagement/dao/ApplicationAmendmentRequestDao.java
@@ -1050,7 +1050,7 @@ public class ApplicationAmendmentRequestDao {
     public ApplicationAmendmentRequestResponse closeAmendmentRequest(Long id, CloseAmendmentRequest closeAmendmentRequest) {
 
         log.info("Closing application amendement with ID: {}", id);
-        ApplicationAmendmentRequestEntity existingApplicationAmendment = validatApplicationAmendmentRequestByStatus(id,ApplicationAmendmentRequestEnum.AWAITING.getValue());
+        ApplicationAmendmentRequestEntity existingApplicationAmendment = validatApplicationAmendmentRequestByListStatus(id,List.of(ApplicationAmendmentRequestEnum.AWAITING.getValue(),ApplicationAmendmentRequestEnum.RESPONSE_RECEIVED.getValue()));
         //cloned entity for old data and versioning
         ApplicationAmendmentRequestEntity oldApplicationAmendmentEntity = Utils.getClonedEntityForData(existingApplicationAmendment);
              List<ApplicationAmendmentRequestEntity> amendmentRequestList = applicationAmendmentRequestRepository.findAllByApplicationEvaluationIdAndIsDeletedFalse(
@@ -1670,4 +1670,12 @@ public class ApplicationAmendmentRequestDao {
         amendment.setEmailSendResponse(mergedResponses);
         applicationAmendmentRequestRepository.save(amendment);
     }
+    public ApplicationAmendmentRequestEntity validatApplicationAmendmentRequestByListStatus(Long id,List<String> status) {
+        ApplicationAmendmentRequestEntity applicationAmendmentRequestEntity = applicationAmendmentRequestRepository.findByIdAndIsDeletedFalseAndStatusIn(id, status);
+        if (applicationAmendmentRequestEntity == null) {
+            throw new ResourceNotFoundException(Status.NOT_FOUND,
+                    Translator.toLocale(GepafinConstant.APPLICATION_AMENDMENT_NOT_FOUND_MSG));
+        }
+        return applicationAmendmentRequestEntity;
+    }
 }
diff --git a/src/main/java/net/gepafin/tendermanagement/repositories/ApplicationAmendmentRequestRepository.java b/src/main/java/net/gepafin/tendermanagement/repositories/ApplicationAmendmentRequestRepository.java
index 4cd6d413..d063eb37 100644
--- a/src/main/java/net/gepafin/tendermanagement/repositories/ApplicationAmendmentRequestRepository.java
+++ b/src/main/java/net/gepafin/tendermanagement/repositories/ApplicationAmendmentRequestRepository.java
@@ -152,4 +152,6 @@ public interface ApplicationAmendmentRequestRepository extends JpaRepository<App
     Long countAmendmentsByApplicationIds(@Param("applicationIds") List<Long> applicationIds,  @Param("statuses") List<String> statuses);
 
     ApplicationAmendmentRequestEntity findByIdAndIsDeletedFalseAndStatus(Long id,String status);
+
+    ApplicationAmendmentRequestEntity findByIdAndIsDeletedFalseAndStatusIn(Long id, List<String> statusList);
 }