From 8473346e4bb667028d7b3851fb5cb0a948f2c7f8 Mon Sep 17 00:00:00 2001
From: nisha <nisha01kashyap01@gmail.com>
Date: Tue, 4 Mar 2025 15:45:09 +0530
Subject: [PATCH] Fixed application amendment issue

---
 .../tendermanagement/dao/ApplicationAmendmentRequestDao.java    | 2 +-
 1 file changed, 1 insertion(+), 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 23747301..e9621798 100644
--- a/src/main/java/net/gepafin/tendermanagement/dao/ApplicationAmendmentRequestDao.java
+++ b/src/main/java/net/gepafin/tendermanagement/dao/ApplicationAmendmentRequestDao.java
@@ -1047,7 +1047,7 @@ public class ApplicationAmendmentRequestDao {
 
         List<ApplicationAmendmentRequestEntity> amendmentRequests = applicationAmendmentRequestRepository.findAllByApplicationEvaluationIdAndIsDeletedFalse(
                 existingApplicationAmendment.getApplicationEvaluationEntity().getId());
-        Boolean allClosed = amendmentRequests.stream().allMatch(amendment -> amendment.getStatus().equals(ApplicationAmendmentRequestEnum.CLOSE.getValue()));
+        Boolean allClosed = amendmentRequests.stream().allMatch(amendment -> (amendment.getStatus().equals(ApplicationAmendmentRequestEnum.CLOSE.getValue()) || amendment.getStatus().equals(ApplicationAmendmentRequestEnum.EXPIRED.getValue())));
         ApplicationEntity application = applicationService.validateApplication(existingApplicationAmendment.getApplicationId());
         ApplicationEntity oldApplicationEntityData = Utils.getClonedEntityForData(application);
         if (Boolean.TRUE.equals(allClosed)) {