Added evaluation version in the evaluation API's response.

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

@@ -165,6 +165,7 @@ public class ApplicationEvaluationDao {
         entity.setSuspendedDays(0L);
         entity.setStartDate(DateTimeUtil.DateServerToUTC(LocalDateTime.now()));
         entity.setEndDate(DateTimeUtil.DateServerToUTC(application.getSubmissionDate().plusDays(30)));
+        entity.setEvaluationVersion(application.getEvaluationVersion());
         entity.setStatus(ApplicationEvaluationStatusTypeEnum.OPEN.getValue());
         return entity;
     }
@@ -286,6 +287,7 @@ public class ApplicationEvaluationDao {
         response.setNote(entity.getNote());
         response.setMotivation(entity.getMotivation());
         response.setStatus(ApplicationEvaluationStatusTypeEnum.valueOf(entity.getStatus()));
+        response.setEvaluationVersion(EvaluationVersionEnum.valueOf(entity.getEvaluationVersion()));
         response.setEvaluationEndDate(entity.getEndDate());
         response.setCreatedDate(entity.getCreatedDate());
         response.setUpdatedDate(entity.getUpdatedDate());
@@ -635,6 +637,7 @@ public class ApplicationEvaluationDao {
         ApplicationEvaluationEntity oldApplicationEvaluation = null;
         ApplicationEntity application = applicationService.validateApplication(assignedApplications.get().getApplication().getId());
         VersionActionTypeEnum actionType = VersionActionTypeEnum.INSERT;
+        validateApplicationEvaluationRequest(req, application);
         if (existingEntityOptional.isPresent()) {
             entity = existingEntityOptional.get();
             oldApplicationEvaluation = Utils.getClonedEntityForData(entity);
@@ -706,7 +709,14 @@ public class ApplicationEvaluationDao {
         }
     }
 
-    private void updateAmendmentDocumentsAndFormFields(List<ApplicationAmendmentRequestEntity> applicationAmendmentRequestEntities, List<AmendmentDetailsRequest> amendmentFormFields) {
+    private void validateApplicationEvaluationRequest(ApplicationEvaluationRequest req, ApplicationEntity application) {
+    	if(EvaluationVersionEnum.V2.getValue().equals(application.getEvaluationVersion())) {
+    		req.setChecklist(null);
+    		req.setCriteria(null);
+    	}
+	}
+
+	private void updateAmendmentDocumentsAndFormFields(List<ApplicationAmendmentRequestEntity> applicationAmendmentRequestEntities, List<AmendmentDetailsRequest> amendmentFormFields) {
         // Iterate through amendment request entities
 
 //
@@ -1130,6 +1140,7 @@ public class ApplicationEvaluationDao {
         List<ApplicationFormEntity> applicationFormEntities = applicationFormRepository.findByApplicationId(applicationId);
         response.setApplicationId(application.getId());
         response.setAssignedApplicationId(assignedApplications.getId());
+        response.setEvaluationVersion(EvaluationVersionEnum.valueOf(application.getEvaluationVersion()));
         response.setNote(null);
         response.setMotivation(null);
         response.setApplicationStatus(ApplicationStatusTypeEnum.valueOf(application.getStatus()));
@@ -2001,7 +2012,7 @@ public class ApplicationEvaluationDao {
                                                                                              ApplicationEvaluationFormEntity applicationEvaluationFormEntity,
                                                                                              List<ApplicationEvaluationFormFieldEntity> applicationEvaluationFormFieldEntities,
                                                                                              EvaluationFormEntity evaluationFormEntity){
-        ApplicationEvaluationFormFieldEntity applicationEvaluationFormFieldEntity = null;
+        ApplicationEvaluationFormFieldEntity applicationEvaluationFormFieldEntity = new ApplicationEvaluationFormFieldEntity();
         validateFileUploadDocuments(applicationFormFieldRequestBean, evaluationFormEntity);
         VersionActionTypeEnum actionType = VersionActionTypeEnum.INSERT;
         ApplicationEvaluationFormFieldEntity oldApplicationEvaluationFormFieldData = null;
@@ -2018,6 +2029,7 @@ public class ApplicationEvaluationDao {
                     break;
                 } else {
                     applicationEvaluationFormFieldEntity.setApplicationEvaluationForm(applicationEvaluationFormEntity);
+                    applicationEvaluationFormFieldEntity.setIsDeleted(Boolean.FALSE);
                 }
             }
         }
@@ -2131,6 +2143,7 @@ public class ApplicationEvaluationDao {
         response.setApplicationId(entity.getApplicationId());
         response.setEvaluationId(entity.getId());
         response.setNote(entity.getNote());
+        response.setEvaluationVersion(EvaluationVersionEnum.valueOf(entity.getEvaluationVersion()));
         response.setCreatedDate(entity.getCreatedDate());
         response.setUpdatedDate(entity.getUpdatedDate());
         return response;
@@ -2152,6 +2165,7 @@ public class ApplicationEvaluationDao {
         response.setApplicationId(evaluationEntity.getApplicationId());
         response.setNote(evaluationEntity.getNote());
         response.setStatus(evaluationEntity.getStatus());
+        response.setEvaluationVersion(EvaluationVersionEnum.valueOf(evaluationEntity.getEvaluationVersion()));
         response.setAssignedApplicationId(evaluationEntity.getAssignedApplicationsEntity().getId());
 
         EvaluationFormEntity evaluationFormEntity = evaluationFormRepository.findByCallIdAndIsDeletedFalse(evaluationEntity.getAssignedApplicationsEntity().getApplication().getCall().getId());

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

@@ -68,4 +68,7 @@ public class ApplicationEvaluationEntity extends BaseEntity{
     @Column(name = "ACTIVE_DAYS")
     private Long activeDays;
     
+    @Column(name = "evaluationVersion")
+    private String evaluationVersion;
+
 }

src/main/java/net/gepafin/tendermanagement/model/response/ApplicationEvaluationFormResponse.java

@@ -1,6 +1,7 @@
 package net.gepafin.tendermanagement.model.response;
 
 import lombok.Data;
+import net.gepafin.tendermanagement.enums.EvaluationVersionEnum;
 
 @Data
 public class ApplicationEvaluationFormResponse {
@@ -10,6 +11,7 @@ public class ApplicationEvaluationFormResponse {
     private Long assignedApplicationId;
     private String note;
     private String status;
+    private EvaluationVersionEnum evaluationVersion;
     private ApplicationEvaluationFormResponseBean applicationEvaluationFormResponse;
 
 

src/main/java/net/gepafin/tendermanagement/model/response/ApplicationEvaluationResponse.java

@@ -3,6 +3,7 @@ package net.gepafin.tendermanagement.model.response;
 import lombok.Data;
 import net.gepafin.tendermanagement.enums.ApplicationEvaluationStatusTypeEnum;
 import net.gepafin.tendermanagement.enums.ApplicationStatusTypeEnum;
+import net.gepafin.tendermanagement.enums.EvaluationVersionEnum;
 
 import java.math.BigDecimal;
 import java.time.LocalDateTime;
@@ -43,4 +44,6 @@ public class ApplicationEvaluationResponse {
     private BigDecimal amountAccepted;
     private LocalDateTime dateAccepted;
     private LocalDateTime dateRejected;
+    private EvaluationVersionEnum evaluationVersion;
+    
 }

src/main/java/net/gepafin/tendermanagement/model/response/ApplicationEvaluationResponseBean.java

@@ -2,6 +2,7 @@ package net.gepafin.tendermanagement.model.response;
 
 import lombok.Data;
 import net.gepafin.tendermanagement.enums.ApplicationEvaluationStatusTypeEnum;
+import net.gepafin.tendermanagement.enums.EvaluationVersionEnum;
 import net.gepafin.tendermanagement.model.BaseBean;
 
 import java.util.List;
@@ -11,5 +12,6 @@ public class ApplicationEvaluationResponseBean extends BaseBean {
     private Long applicationId;
     private Long evaluationId;
     private String note;
+    private EvaluationVersionEnum evaluationVersion;
     private List<ApplicationEvaluationFormFieldReponseBean> formFields;
 }

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

@@ -2366,4 +2366,13 @@
                 columnName="field_value"
                 newDataType="TEXT"/>
     </changeSet>
+    
+    <changeSet id="03-01-2025_PK_124115" author="Rajesh Khore">
+        <addColumn tableName="application_evaluation">
+            <column name="evaluation_version" type="VARCHAR(255)" defaultValue="V1">
+                <constraints nullable="false"/>
+            </column>
+        </addColumn>
+    </changeSet>
+    
 </databaseChangeLog>