Amendment Scheduler updates

src/main/java/net/gepafin/tendermanagement/dao/ApplicationEvaluationDao.java

@@ -1775,6 +1775,7 @@ public class ApplicationEvaluationDao {
             String statusType = application.getStatus();
             if (application.getStatus().equals(ApplicationStatusTypeEnum.APPROVED.getValue()) || application.getStatus().equals(ApplicationStatusTypeEnum.REJECTED.getValue())) {
                 existingEntity.setStatus(ApplicationEvaluationStatusTypeEnum.CLOSE.getValue());
+                existingEntity.setClosingDate(DateTimeUtil.DateServerToUTC(LocalDateTime.now()));
                 assignedApplicationsEntity.setStatus(AssignedApplicationEnum.CLOSE.getValue());
             }
             entity = applicationEvaluationRepository.save(existingEntity);

src/main/java/net/gepafin/tendermanagement/entities/ApplicationEvaluationEntity.java

@@ -62,4 +62,7 @@ public class ApplicationEvaluationEntity extends BaseEntity{
     @Column(name = "STOP_DATE_TIME")
     private LocalDateTime stopDateTime;
 
+    @Column(name = "CLOSING_DATE")
+    private LocalDateTime closingDate;
+
 }

src/main/java/net/gepafin/tendermanagement/scheduler/ApplicationAmendmentScheduler.java

@@ -6,24 +6,24 @@ import java.util.List;
 import java.util.Set;
 import java.util.stream.Collectors;
 
+import net.gepafin.tendermanagement.entities.ApplicationEntity;
+import net.gepafin.tendermanagement.entities.AssignedApplicationsEntity;
+import net.gepafin.tendermanagement.enums.*;
+import net.gepafin.tendermanagement.repositories.ApplicationEvaluationRepository;
+import net.gepafin.tendermanagement.repositories.ApplicationRepository;
+import net.gepafin.tendermanagement.repositories.AssignedApplicationsRepository;
+import net.gepafin.tendermanagement.service.ApplicationService;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.mock.web.MockHttpServletRequest;
 import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Component;
-import org.springframework.web.context.request.RequestContextHolder;
+
-import org.springframework.web.context.request.ServletRequestAttributes;
 
 import jakarta.servlet.http.HttpServletRequest;
 import net.gepafin.tendermanagement.dao.ApplicationAmendmentRequestDao;
-import net.gepafin.tendermanagement.dao.EmailNotificationDao;
 import net.gepafin.tendermanagement.entities.ApplicationAmendmentRequestEntity;
 import net.gepafin.tendermanagement.entities.ApplicationEvaluationEntity;
-import net.gepafin.tendermanagement.enums.ApplicationAmendmentRequestEnum;
-import net.gepafin.tendermanagement.enums.UserActionContextEnum;
-import net.gepafin.tendermanagement.enums.UserActionLogsEnum;
-import net.gepafin.tendermanagement.enums.VersionActionTypeEnum;
 import net.gepafin.tendermanagement.model.request.UserActionRequest;
 import net.gepafin.tendermanagement.model.request.VersionHistoryRequest;
 import net.gepafin.tendermanagement.repositories.ApplicationAmendmentRequestRepository;
@@ -40,8 +40,6 @@ public class ApplicationAmendmentScheduler {
 	@Autowired
 	private ApplicationAmendmentRequestRepository applicationAmendmentRepository;
 
-	@Autowired
-	private EmailNotificationDao emailNotificationDao;
 
 	@Autowired
 	private ApplicationAmendmentRequestDao applicationAmendmentRequestDao;
@@ -49,6 +47,18 @@ public class ApplicationAmendmentScheduler {
 	@Autowired
 	private LoggingUtil loggingUtil;
 
+	@Autowired
+	private AssignedApplicationsRepository assignedApplicationsRepository;
+
+	@Autowired
+	private ApplicationService applicationService;
+
+	@Autowired
+	private ApplicationRepository applicationRepository;
+
+	@Autowired
+	private ApplicationEvaluationRepository applicationEvaluationRepository;
+
 	private static final Logger log = LoggerFactory.getLogger(ApplicationAmendmentScheduler.class);
 
 	@Scheduled(cron = "0 0 1 * * ?")
@@ -79,14 +89,14 @@ public class ApplicationAmendmentScheduler {
 		amendmentRequests.forEach(request -> {
 			try {
 				ApplicationAmendmentRequestEntity oldAmendmentRequestEntity = Utils.getClonedEntityForData(request);
-				request.setStatus(ApplicationAmendmentRequestEnum.CLOSE.getValue());
+				request.setStatus(ApplicationAmendmentRequestEnum.EXPIRED.getValue());
 				request = applicationAmendmentRepository.save(request);
 				
 				/** This code is responsible for adding a version history log for the "Update Application Amendment" operation. **/
 		        loggingUtil.addVersionHistory(VersionHistoryRequest.builder().request(httpServletRequest).actionType(VersionActionTypeEnum.UPDATE).oldData(oldAmendmentRequestEntity).newData(request).build());
 
 //				emailNotificationDao.sendApplicationFailureNotificationEmail(request);
-				log.info("Updated status to CLOSED for ApplicationAmendmentRequest with ID: {}", request.getId());
+				log.info("Updated status to EXPIRED for ApplicationAmendmentRequest with ID: {}", request.getId());
 			} catch (Exception e) {
 				log.error("Error expiring ApplicationAmendmentRequest with ID {}: {}", request.getId(), e.getMessage(),
 						e);
@@ -104,6 +114,16 @@ public class ApplicationAmendmentScheduler {
 			evaluationsWithoutActiveAmendmentList.forEach(evaluation -> {
 				try {
 					applicationAmendmentRequestDao.calculateEndDateAndSuspensionDays(evaluation);
+
+					updateEvaluationStatus(evaluation);
+
+					// Update AssignedApplicationsEntity status
+					updateAssignedApplicationStatus(evaluation.getAssignedApplicationsEntity());
+
+					// Update ApplicationEntity status
+					updateApplicationStatus(evaluation.getAssignedApplicationsEntity().getApplication());
+
+
 					log.info("Updated EndDate and suspension days for ApplicationEvaluation with ID: {}",
 							evaluation.getId());
 				} catch (Exception e) {
@@ -119,4 +139,35 @@ public class ApplicationAmendmentScheduler {
 
 	}
 
+	public void updateAssignedApplicationStatus(AssignedApplicationsEntity assignedApplicationsEntity){
+		AssignedApplicationsEntity oldAssignedApplicationEntity = Utils.getClonedEntityForData(assignedApplicationsEntity);
+		assignedApplicationsEntity.setStatus(AssignedApplicationEnum.OPEN.getValue());
+		assignedApplicationsRepository.save(assignedApplicationsEntity);
+		log.info("Updated status to OPEN for Assigned Application with ID: {}", assignedApplicationsEntity.getId());
+
+		/** This code is responsible for adding a version history log for the "Update Assigned Application status" operation. **/
+		loggingUtil.addVersionHistory(VersionHistoryRequest.builder().request(httpServletRequest).actionType(VersionActionTypeEnum.UPDATE).oldData(oldAssignedApplicationEntity).newData(assignedApplicationsEntity).build());
+
+	}
+
+	public void updateApplicationStatus(ApplicationEntity applicationEntity){
+		ApplicationEntity oldApplicationEntity = Utils.getClonedEntityForData(applicationEntity);
+		applicationEntity.setStatus(ApplicationStatusTypeEnum.EVALUATION.getValue());
+		applicationRepository.save(applicationEntity);
+		log.info("Updated status to EVALUATION for Application with ID: {}",applicationEntity.getId());
+
+		/** This code is responsible for adding a version history log for the "Update Application Status" operation. **/
+		loggingUtil.addVersionHistory(VersionHistoryRequest.builder().request(httpServletRequest).actionType(VersionActionTypeEnum.UPDATE).oldData(oldApplicationEntity).newData(applicationEntity).build());
+
+	}
+	public void updateEvaluationStatus(ApplicationEvaluationEntity applicationEvaluationEntity){
+		ApplicationEvaluationEntity oldApplicationEvaluationEntity = Utils.getClonedEntityForData(applicationEvaluationEntity);
+		applicationEvaluationEntity.setStatus(ApplicationEvaluationStatusTypeEnum.OPEN.getValue());
+		applicationEvaluationRepository.save(applicationEvaluationEntity);
+		log.info("Updated status to OPEN for ApplicationEvaluation with ID: {}", applicationEvaluationEntity.getId());
+
+		/** This code is responsible for adding a version history log for the "Update Application Status" operation. **/
+		loggingUtil.addVersionHistory(VersionHistoryRequest.builder().request(httpServletRequest).actionType(VersionActionTypeEnum.UPDATE).oldData(oldApplicationEvaluationEntity).newData(applicationEvaluationEntity).build());
+
+	}
 }

src/main/resources/db/changelog/db.changelog-1.0.0.xml

@@ -2064,5 +2064,10 @@
         <column name="hub_id" value="1"/>
     </insert>
     </changeSet>
+    <changeSet id="24-12-2024_1" author="Nisha kashyap">
+        <addColumn tableName="application_evaluation">
+            <column name="closing_date" type="TIMESTAMP WITHOUT TIME ZONE"></column>
+        </addColumn>
+    </changeSet>
 
 </databaseChangeLog>