From 9f6adf7b924512c6ec5f03e5ff23e7327e5f0b57 Mon Sep 17 00:00:00 2001
From: rajesh <rajeshkhoreupwork@gmail.com>
Date: Mon, 27 Jan 2025 12:00:32 +0530
Subject: [PATCH] Added applicationEvalutionId in application table

---
 .../dao/ApplicationEvaluationDao.java         | 32 +++++++++++++------
 .../entities/ApplicationEntity.java           |  3 ++
 .../db/changelog/db.changelog-1.0.0.xml       | 13 ++++++++
 3 files changed, 38 insertions(+), 10 deletions(-)

diff --git a/src/main/java/net/gepafin/tendermanagement/dao/ApplicationEvaluationDao.java b/src/main/java/net/gepafin/tendermanagement/dao/ApplicationEvaluationDao.java
index 48573e4f..74a14114 100644
--- a/src/main/java/net/gepafin/tendermanagement/dao/ApplicationEvaluationDao.java
+++ b/src/main/java/net/gepafin/tendermanagement/dao/ApplicationEvaluationDao.java
@@ -634,16 +634,33 @@ public class ApplicationEvaluationDao {
                 application.setAmountAccepted(req.getAmountAccepted());
             }
             actionType = VersionActionTypeEnum.UPDATE;
+
+            entity = applicationEvaluationRepository.save(entity);
+            
         } else {
             AssignedApplicationsEntity assignedApplicationsEntity = assignedApplicationsService.validateAssignedApplication(assignedApplicationId);
             entity = convertToEntity(user, req, assignedApplicationId);
             actionType = VersionActionTypeEnum.INSERT;
+            
+            entity = applicationEvaluationRepository.save(entity);
+            
+            ApplicationEntity oldApplication = Utils.getClonedEntityForData(application);
+            
+            application.setApplicationEvaluationId(entity.getId());
+            
+            /** This code is responsible for adding a version history log for the "Update Application" operation. **/
+            loggingUtil.addVersionHistory(VersionHistoryRequest.builder().request(request).actionType(actionType).oldData(oldApplication).newData(application).build());
 
             Map<String, String> placeHolders = notificationDao.sendNotificationToBeneficiary(application, NotificationTypeEnum.EVALUATION_CREATION);
             notificationDao.sendNotificationToSuperUser(application,placeHolders,NotificationTypeEnum.EVALUATION_CREATION);
             notificationDao.sendNotificationToInstructor(placeHolders,entity,NotificationTypeEnum.EVALUATION_CREATION);
 
         }
+        
+
+        /** This code is responsible for adding a version history log for the "Update Application Evaluation" operation. **/
+        loggingUtil.addVersionHistory(VersionHistoryRequest.builder().request(request).actionType(actionType).oldData(oldApplicationEvaluation).newData(entity).build());
+        
         ApplicationStatusForEvaluation status = req.getApplicationStatus();
         // Fetch all amendment request entities associated with the evaluation ID
         List<ApplicationAmendmentRequestEntity> applicationAmendmentRequestEntities =
@@ -653,21 +670,16 @@ public class ApplicationEvaluationDao {
         }
 // Fetch amendment details from the request
         if(req.getAmendmentDetails()!=null) {
-        List<AmendmentDetailsRequest> amendmentDetailsRequests = req.getAmendmentDetails();
-
-        updateAmendmentDocumentsAndFormFields(applicationAmendmentRequestEntities, amendmentDetailsRequests);
-}
-
-        ApplicationEvaluationEntity savedEntity = applicationEvaluationRepository.save(entity);
-
-        /** This code is responsible for adding a version history log for the "Update Application Evaluation" operation. **/
-        loggingUtil.addVersionHistory(VersionHistoryRequest.builder().request(request).actionType(actionType).oldData(oldApplicationEvaluation).newData(entity).build());
+	        List<AmendmentDetailsRequest> amendmentDetailsRequests = req.getAmendmentDetails();
+	
+	        updateAmendmentDocumentsAndFormFields(applicationAmendmentRequestEntities, amendmentDetailsRequests);
+        }
 
         if (status != null) {
             AssignedApplicationsEntity assignedApplicationsEntity = assignedApplications.get();
             return updateApplicationEvaluationStatus(application, assignedApplicationsEntity, status);
         } else {
-            return convertToResponse(savedEntity);
+            return convertToResponse(entity);
         }
     }
 
diff --git a/src/main/java/net/gepafin/tendermanagement/entities/ApplicationEntity.java b/src/main/java/net/gepafin/tendermanagement/entities/ApplicationEntity.java
index a482f453..50d16557 100644
--- a/src/main/java/net/gepafin/tendermanagement/entities/ApplicationEntity.java
+++ b/src/main/java/net/gepafin/tendermanagement/entities/ApplicationEntity.java
@@ -70,5 +70,8 @@ public class ApplicationEntity extends BaseEntity {
 
     @Column(name = "evaluationVersion")
     private String evaluationVersion;
+    
+    @Column(name = "APPLICATION_EVALUATION_ID")
+    private Long applicationEvaluationId;
 
 }
\ No newline at end of file
diff --git a/src/main/resources/db/changelog/db.changelog-1.0.0.xml b/src/main/resources/db/changelog/db.changelog-1.0.0.xml
index e4bfdfe5..b987fd7c 100644
--- a/src/main/resources/db/changelog/db.changelog-1.0.0.xml
+++ b/src/main/resources/db/changelog/db.changelog-1.0.0.xml
@@ -2292,5 +2292,18 @@
             </column>
         </addColumn>
     </changeSet>
+    
+    <changeSet id="24-01-2025_RK_194615" author="Rajesh Khore">
+    	<addColumn tableName="application">
+	        <column name="application_evaluation_id" type="INTEGER"> </column>
+        </addColumn>
+        
+         <!-- Updating the new column with data from 'application_evaluation' -->
+        <update tableName="application">
+            <column name="application_evaluation_id" valueComputed="(SELECT ae.id FROM application_evaluation ae WHERE ae.application_id = application.id)"/>
+            <where>EXISTS (SELECT 1 FROM application_evaluation ae WHERE ae.application_id = application.id)</where>
+        </update>
+    </changeSet>    
+    
 
 </databaseChangeLog>