From 7e73870f29ee50e95721c7b9c97d2563bc0e1423 Mon Sep 17 00:00:00 2001
From: rajesh <rajeshkhoreupwork@gmail.com>
Date: Thu, 13 Nov 2025 12:17:21 +0530
Subject: [PATCH] Fixed application status issue

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

diff --git a/src/main/java/net/gepafin/tendermanagement/dao/ApplicationAmendmentRequestDao.java b/src/main/java/net/gepafin/tendermanagement/dao/ApplicationAmendmentRequestDao.java
index 0a0dd23f..d478e730 100644
--- a/src/main/java/net/gepafin/tendermanagement/dao/ApplicationAmendmentRequestDao.java
+++ b/src/main/java/net/gepafin/tendermanagement/dao/ApplicationAmendmentRequestDao.java
@@ -380,6 +380,15 @@ public class ApplicationAmendmentRequestDao {
                 //Set stop date time in the entity becuase amendment has started
                 applicationEvaluationEntity.setStopDateTime(DateTimeUtil.DateServerToUTC(LocalDateTime.now()));
             }
+        }
+
+        boolean noneClosedOrExpired = amendmentRequest.stream()
+                .noneMatch(amendment ->
+                        amendment.getStatus().equals(ApplicationAmendmentRequestEnum.CLOSE.getValue()) ||
+                                amendment.getStatus().equals(ApplicationAmendmentRequestEnum.EXPIRED.getValue())
+                );
+
+        if(Boolean.TRUE.equals(noneClosedOrExpired)){
             applicationEntity.setPreviousStatus(oldApplicationEntity.getStatus());
         }
 
diff --git a/src/main/java/net/gepafin/tendermanagement/repositories/ApplicationAmendmentRequestRepository.java b/src/main/java/net/gepafin/tendermanagement/repositories/ApplicationAmendmentRequestRepository.java
index d063eb37..3b0de711 100644
--- a/src/main/java/net/gepafin/tendermanagement/repositories/ApplicationAmendmentRequestRepository.java
+++ b/src/main/java/net/gepafin/tendermanagement/repositories/ApplicationAmendmentRequestRepository.java
@@ -73,6 +73,7 @@ public interface ApplicationAmendmentRequestRepository extends JpaRepository<App
     	       "    SELECT 1 FROM ApplicationAmendmentRequestEntity activeAmendment" +
     	       "    WHERE activeAmendment.applicationEvaluationEntity.id = a.applicationEvaluationEntity.id " +
     	       "    AND activeAmendment.status  NOT IN('CLOSE','EXPIRED') " +
+    	       "    AND activeAmendment.type  NOT IN('SPECIAL') " +
     	       "    AND activeAmendment.isDeleted = false) ")
 	Set<ApplicationEvaluationEntity> findEvaluationsWithoutActiveAmendmentsByIds(@Param("applicationEvaluationIds") Set<Long> applicationEvaluationIds);
 
@@ -154,4 +155,5 @@ public interface ApplicationAmendmentRequestRepository extends JpaRepository<App
     ApplicationAmendmentRequestEntity findByIdAndIsDeletedFalseAndStatus(Long id,String status);
 
     ApplicationAmendmentRequestEntity findByIdAndIsDeletedFalseAndStatusIn(Long id, List<String> statusList);
+
 }