updated code

src/main/java/net/gepafin/tendermanagement/constants/GepafinConstant.java

@@ -233,5 +233,6 @@ public class GepafinConstant {
     public static final String CANNOT_DELETE_COMPANY_WITH_APPLICATION_SUBMITT = "application.in.submit.status.cannot.delete.company";
     public static final String GET_USERS_SUCCESS_MSG = "get.users.success.msg";
     public static final String CANNOT_CREATE_BENEFICIARY_USER="cannot.create.beneficiary.user";
+	public static final String EVALUATIONCRITERIA_INVALID = "evaluationCriteria.invalid";
 }
 

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

@@ -212,8 +212,12 @@ public class CallDao {
 	private void softDeleteEvaluationCriteria(EvaluationCriteriaEntity evaluationCriteriaEntity) {
 		evaluationCriteriaEntity.setIsDeleted(true);
 		evaluationCriteriaRepository.save(evaluationCriteriaEntity);
-		List<CriteriaFormFieldEntity> list = criteriaFormFieldRepository.findByEvaluationCriteriaId(evaluationCriteriaEntity.getId());
+		List<CriteriaFormFieldEntity> list = criteriaFormFieldRepository
-		criteriaFormFieldRepository.deleteAll(list);
+				.findByEvaluationCriteriaIdAndIsDeletedFalse(evaluationCriteriaEntity.getId())
+				.stream()
+				.peek(data -> data.setIsDeleted(Boolean.TRUE))
+				.toList();
+		criteriaFormFieldRepository.saveAll(list);
 	}
 
 	private EvaluationCriteriaEntity convertToEvaluationCriteriaEntity(EvaluationCriteriaReq criteriaReq,

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

@@ -81,8 +81,11 @@ public class EvaluationCriteriaDao {
 			EvaluationCriteriaEntity evaluationCriteriaEntity = validateEvaluationCriteria(id);
 			evaluationCriteriaEntity.setIsDeleted(Boolean.TRUE);
 			evaluationCriteriaRepository.save(evaluationCriteriaEntity);
-			List<CriteriaFormFieldEntity> list = criteriaFormFieldRepository.findByEvaluationCriteriaId(evaluationCriteriaEntity.getId());
+			List<CriteriaFormFieldEntity> list = criteriaFormFieldRepository.findByEvaluationCriteriaIdAndIsDeletedFalse(evaluationCriteriaEntity.getId())
-			criteriaFormFieldRepository.deleteAll(list);
+					.stream()
+					.peek(data -> data.setIsDeleted(Boolean.TRUE))
+					.toList();;
+			criteriaFormFieldRepository.saveAll(list);
 	}
 
 	private EvaluationCriteriaResponseBean convertEvaluationCriteriaEntityEvaluationCriteriaToResponseBean(

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

@@ -92,7 +92,7 @@ public class FormDao {
 				ContentResponseBean.class);
 		contentList.forEach(data -> {
 			List<Long> criteriaIds = criteriaFormFieldRepository
-					.findByCallIdAndFormIdAndFormFieldId(formEntity.getCall().getId(), formEntity.getId(), data.getId())
+					.findByCallIdAndFormIdAndFormFieldIdAndIsDeletedFalse(formEntity.getCall().getId(), formEntity.getId(), data.getId())
 					.stream().map(CriteriaFormFieldEntity::getEvaluationCriteriaId).toList();
 			data.setCriteria(criteriaIds);
 		});
@@ -122,7 +122,7 @@ public class FormDao {
         contentResponseBeans.forEach(content -> {
             // Fetch existing records from the repository based on the call, form, and field ID
             List<CriteriaFormFieldEntity> existingCriteriaFields = criteriaFormFieldRepository
-                    .findByCallIdAndFormIdAndFormFieldId(callEntity.getId(), formEntity.getId(), content.getId());
+                    .findByCallIdAndFormIdAndFormFieldIdAndIsDeletedFalse(callEntity.getId(), formEntity.getId(), content.getId());
 
             // Extract existing evaluation criteria IDs into a set for quick lookup
             Set<Long> existingEvaluationCriteriaIds = existingCriteriaFields.stream()
@@ -139,10 +139,11 @@ public class FormDao {
 
             List<CriteriaFormFieldEntity> toBeDeleted = existingCriteriaFields.stream()
                 .filter(criteriaFormField -> !criteriaList.contains(criteriaFormField.getEvaluationCriteriaId()))
+                .peek(data->data.setIsDeleted(Boolean.TRUE))
                 .collect(Collectors.toList());
 
             if (!toBeDeleted.isEmpty()) {
-                criteriaFormFieldRepository.deleteAll(toBeDeleted);
+                criteriaFormFieldRepository.saveAll(toBeDeleted);
             }
         });
     }
@@ -150,11 +151,16 @@ public class FormDao {
 
 	private void createCriteriaFormField(CallEntity callEntity, FormEntity formEntity,
 			String formFieldId,Long evaluationCriteriaId) {
-		evaluationCriteriaService.validateEvaluationCriteria(evaluationCriteriaId);
+		EvaluationCriteriaEntity evaluationCriteria = evaluationCriteriaService.validateEvaluationCriteria(evaluationCriteriaId);
+		if (Boolean.FALSE.equals(evaluationCriteria.getCall().getId().equals(callEntity.getId()))) {
+			throw new CustomValidationException(Status.VALIDATION_ERROR,
+					Translator.toLocale(GepafinConstant.EVALUATIONCRITERIA_INVALID));
+		}
     	CriteriaFormFieldEntity criteriaFormField = new CriteriaFormFieldEntity();
     	criteriaFormField.setCallId(callEntity.getId());
     	criteriaFormField.setFormId(formEntity.getId());
     	criteriaFormField.setFormFieldId(formFieldId);
+    	criteriaFormField.setIsDeleted(Boolean.FALSE);
     	criteriaFormField.setEvaluationCriteriaId(evaluationCriteriaId);
     	criteriaFormFieldRepository.save(criteriaFormField);
 		

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

@@ -1,5 +1,6 @@
 package net.gepafin.tendermanagement.entities;
 
+import jakarta.persistence.Column;
 import jakarta.persistence.Entity;
 import jakarta.persistence.Table;
 import lombok.Data;
@@ -17,4 +18,7 @@ public class CriteriaFormFieldEntity extends BaseEntity {
 	
 	private Long evaluationCriteriaId;
 	
+	@Column(name ="IS_DELETED", nullable = false)
+    private Boolean isDeleted = false;
+
 }

src/main/java/net/gepafin/tendermanagement/repositories/CriteriaFormFieldRepository.java

@@ -10,8 +10,8 @@ import net.gepafin.tendermanagement.entities.CriteriaFormFieldEntity;
 @Repository
 public interface CriteriaFormFieldRepository extends JpaRepository<CriteriaFormFieldEntity, Long>{
 
-	List<CriteriaFormFieldEntity> findByCallIdAndFormIdAndFormFieldId(Long callId, Long formId, String formFieldId);
+	List<CriteriaFormFieldEntity> findByCallIdAndFormIdAndFormFieldIdAndIsDeletedFalse(Long callId, Long formId, String formFieldId);
 
-	List<CriteriaFormFieldEntity> findByEvaluationCriteriaId(Long evaluationCriteriaId);
+	List<CriteriaFormFieldEntity> findByEvaluationCriteriaIdAndIsDeletedFalse(Long evaluationCriteriaId);
 
 }

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

@@ -1113,6 +1113,9 @@
             <column name="form_id" type="INTEGER" />
             <column name="form_field_id" type="varchar(255)" />
             <column name="evaluation_criteria_id" type="INTEGER" />
+            <column name="IS_DELETED" type="BOOLEAN" defaultValueBoolean="true">
+	            <constraints nullable="false"/>
+	        </column>
             <column name="created_date" type="TIMESTAMP WITHOUT TIME ZONE" />
         	<column name="updated_date" type="TIMESTAMP WITHOUT TIME ZONE" />
         </createTable>
@@ -1121,22 +1124,19 @@
                                  baseColumnNames="call_id"
                                  referencedTableName="call"
                                  referencedColumnNames="id"
-                                 constraintName="fk_criteria_form_field_call_id"
+                                 constraintName="fk_criteria_form_field_call_id"/>
-                                 onDelete="CASCADE"/>
 
         <addForeignKeyConstraint baseTableName="criteria_form_field"
                                  baseColumnNames="form_id"
                                  referencedTableName="form"
                                  referencedColumnNames="id"
-                                 constraintName="fk_criteria_form_field_form_id"
+                                 constraintName="fk_criteria_form_field_form_id"/>
-                                 onDelete="CASCADE"/>
 
         <addForeignKeyConstraint baseTableName="criteria_form_field"
                                  baseColumnNames="evaluation_criteria_id"
                                  referencedTableName="evaluation_criteria"
                                  referencedColumnNames="id"
-                                 constraintName="fk_criteria_form_field_evaluation_criteria_id"
+                                 constraintName="fk_criteria_form_field_evaluation_criteria_id"/>
-                                 onDelete="CASCADE"/>
     </changeSet>
     
     <changeSet id="16-10-2024_1" author="Harish Bagora">

src/main/resources/message_en.properties

@@ -253,6 +253,8 @@ get_login_attempt_se_msg=Login attempts fetched successfully.
 application.in.submit.status.cannot.delete.company=The company cannot be deleted because there are active applications in the SUBMITTED status.
 get.users.success.msg = Successfully fetched users.
 cannot.create.beneficiary.user = Creation of a Beneficiary user is not allowed. Please assign the appropriate role.
+evaluationCriteria.invalid=This evaluation criterion does not belong to the current call.
+
 
 
 

src/main/resources/message_it.properties

@@ -250,4 +250,6 @@ application.in.submit.status.cannot.delete.company=Non
 
 get.users.success.msg = Utenti recuperati con successo
 cannot.create.beneficiary.user = La creazione di un utente beneficiario non è consentita. Si prega di assegnare il ruolo appropriato.
+evaluationCriteria.invalid=Questo criterio di valutazione non appartiene alla chiamata corrente.
+