From cc19a1b76389102b4d77775747f0ecd2f3f55fc7 Mon Sep 17 00:00:00 2001 From: nisha Date: Thu, 20 Feb 2025 11:56:12 +0530 Subject: [PATCH] Done ticket GEPAFINBE-172 --- .../constants/GepafinConstant.java | 4 ++ .../dao/ApplicationAmendmentRequestDao.java | 64 ++++++++++++++++--- ...licationEvaluationFormFieldRepository.java | 8 +++ .../gepafin/tendermanagement/util/Utils.java | 4 +- src/main/resources/message_en.properties | 1 + src/main/resources/message_it.properties | 1 + 6 files changed, 71 insertions(+), 11 deletions(-) diff --git a/src/main/java/net/gepafin/tendermanagement/constants/GepafinConstant.java b/src/main/java/net/gepafin/tendermanagement/constants/GepafinConstant.java index 8e469734..4bf0f7fa 100644 --- a/src/main/java/net/gepafin/tendermanagement/constants/GepafinConstant.java +++ b/src/main/java/net/gepafin/tendermanagement/constants/GepafinConstant.java @@ -426,6 +426,10 @@ public class GepafinConstant { public static final String APPOINTMENT_CANNOT_BE_CREATED = "appointment.cannot.be.created"; public static final String APPOINTMENT_NOT_CREATED = "appointment.not.created"; + + public static final String SWITCH="switch"; + public static final String IS_CHECK_LIST_ITEM="isChecklistItem"; + public static final String VALIDATION_FAILED_FOR_CHECKLIST="validation.failed.checklist"; } diff --git a/src/main/java/net/gepafin/tendermanagement/dao/ApplicationAmendmentRequestDao.java b/src/main/java/net/gepafin/tendermanagement/dao/ApplicationAmendmentRequestDao.java index ab5a159b..6caf7e71 100644 --- a/src/main/java/net/gepafin/tendermanagement/dao/ApplicationAmendmentRequestDao.java +++ b/src/main/java/net/gepafin/tendermanagement/dao/ApplicationAmendmentRequestDao.java @@ -119,6 +119,15 @@ public class ApplicationAmendmentRequestDao { @Autowired private UserRepository userRepository; + @Autowired + private EvaluationFormRepository evaluationFormRepository; + + @Autowired + private ApplicationEvaluationFormFieldRepository applicationEvaluationFormFieldRepository; + + @Autowired + private ApplicationEvaluationFormRepository applicationEvaluationFormRepository; + public ApplicationAmendmentRequestResponse getApplicationDataForAmendment(Long applicationEvaluationId) { log.info("Fetching the application data for the Amendment process {}", applicationEvaluationId); ApplicationEvaluationEntity applicationEvaluationEntity = applicationEvaluationService.validateApplicationEvaluation(applicationEvaluationId); @@ -132,16 +141,10 @@ public class ApplicationAmendmentRequestDao { if(file != null){ evaluationFileRequests=Utils.convertJsonStringToList(file,FieldRequest.class); } - Boolean allValid = evaluationFileRequests.stream() - .anyMatch(fieldRequest -> fieldRequest.getValid() == null); - if(checkList != null) { - checklistRequests=Utils.convertJsonStringToList(checkList,ChecklistRequest.class); - } - boolean resultCheckList = checklistRequests.stream() - .anyMatch(checklistRequest -> Boolean.TRUE.equals(checklistRequest.getValid())) ? false : true; - - if(Boolean.TRUE.equals(allValid) || Boolean.TRUE.equals(resultCheckList)){ - throw new CustomValidationException(Status.BAD_REQUEST,Translator.toLocale(GepafinConstant.All_DOCUMENT_CHECKED_AND_ONE_CHECKLIST_CHECKED)); + if(applicationEvaluationEntity.getEvaluationVersion().equals(EvaluationVersionEnum.V1.getValue())) { + checklistValidationForEvaluationV1(evaluationFileRequests, checkList, checklistRequests); + } else if (applicationEvaluationEntity.getEvaluationVersion().equals(EvaluationVersionEnum.V2.getValue())) { + validationCheckEvaluationV2(applicationEvaluationEntity, application); } // Set common application-level details String callName = application.getCall().getName(); @@ -186,6 +189,47 @@ public class ApplicationAmendmentRequestDao { return response; } + private void validationCheckEvaluationV2(ApplicationEvaluationEntity applicationEvaluationEntity, ApplicationEntity application) { + Long callId= applicationEvaluationEntity.getAssignedApplicationsEntity().getApplication().getCall().getId(); + EvaluationFormEntity evaluationFormEntity=evaluationFormRepository.findByCallIdAndIsDeletedFalse(callId); + Long numberOfCheck= application.getCall().getNumberOfCheck(); + ApplicationEvaluationFormEntity applicationEvaluationForm=applicationEvaluationFormRepository.findByApplicationEvaluation_IdAndIsDeletedFalse(applicationEvaluationEntity.getId()); + List contentResponseBeans=Utils.convertJsonStringToList(evaluationFormEntity.getContent(),ContentResponseBean.class); + int count = 0; + for (ContentResponseBean content : contentResponseBeans) { + if (GepafinConstant.SWITCH.equals(content.getName()) && content.getSettings().stream() + .anyMatch(setting -> GepafinConstant.IS_CHECK_LIST_ITEM.equals(setting.getName()))) { + + ApplicationEvaluationFormFieldEntity field = applicationEvaluationFormFieldRepository + .findByFieldIdAndApplicationEvaluationFormId(content.getId(), applicationEvaluationForm.getId()); + + if (field != null && Utils.isValidBoolean(field.getFieldValue())) { + Boolean fieldValueAsBoolean = Boolean.parseBoolean(field.getFieldValue()); + + if (Boolean.FALSE.equals(fieldValueAsBoolean)) { + throw new CustomValidationException(Status.VALIDATION_ERROR,GepafinConstant.VALIDATION_FAILED_FOR_CHECKLIST); + } + + if (++count >= numberOfCheck) break; + } + } + } + } + + private static void checklistValidationForEvaluationV1(List evaluationFileRequests, String checkList, List checklistRequests) { + Boolean allValid = evaluationFileRequests.stream() + .anyMatch(fieldRequest -> fieldRequest.getValid() == null); + if(checkList != null) { + checklistRequests =Utils.convertJsonStringToList(checkList,ChecklistRequest.class); + } + boolean resultCheckList = checklistRequests.stream() + .anyMatch(checklistRequest -> Boolean.TRUE.equals(checklistRequest.getValid())) ? false : true; + + if(Boolean.TRUE.equals(allValid) || Boolean.TRUE.equals(resultCheckList)){ + throw new CustomValidationException(Status.BAD_REQUEST,Translator.toLocale(GepafinConstant.All_DOCUMENT_CHECKED_AND_ONE_CHECKLIST_CHECKED)); + } + } + public List getIdAndLabelFromResult(List> result) { List formFieldResponses = new ArrayList<>(); diff --git a/src/main/java/net/gepafin/tendermanagement/repositories/ApplicationEvaluationFormFieldRepository.java b/src/main/java/net/gepafin/tendermanagement/repositories/ApplicationEvaluationFormFieldRepository.java index 07a0d318..0f64e218 100644 --- a/src/main/java/net/gepafin/tendermanagement/repositories/ApplicationEvaluationFormFieldRepository.java +++ b/src/main/java/net/gepafin/tendermanagement/repositories/ApplicationEvaluationFormFieldRepository.java @@ -15,4 +15,12 @@ public interface ApplicationEvaluationFormFieldRepository extends JpaRepository< "AND f.isDeleted = false") List findByApplicationEvaluationFormId( @Param("applicationEvaluationFormId") Long applicationEvaluationFormId); + + @Query("SELECT f FROM ApplicationEvaluationFormFieldEntity f " + + "WHERE f.applicationEvaluationForm.id = :applicationEvaluationFormId " + + "AND f.fieldId = :fieldId " + + "AND f.isDeleted = false") + ApplicationEvaluationFormFieldEntity findByFieldIdAndApplicationEvaluationFormId( + @Param("fieldId") String fieldId, + @Param("applicationEvaluationFormId") Long applicationEvaluationFormId); } diff --git a/src/main/java/net/gepafin/tendermanagement/util/Utils.java b/src/main/java/net/gepafin/tendermanagement/util/Utils.java index f444d69d..06abaaab 100644 --- a/src/main/java/net/gepafin/tendermanagement/util/Utils.java +++ b/src/main/java/net/gepafin/tendermanagement/util/Utils.java @@ -785,5 +785,7 @@ public class Utils { return input.matches("-?\\d+(\\.\\d+)?"); } - + public static boolean isValidBoolean(String value) { + return "true".equalsIgnoreCase(value) || "false".equalsIgnoreCase(value); + } } \ No newline at end of file diff --git a/src/main/resources/message_en.properties b/src/main/resources/message_en.properties index c3b03dd7..9cf0149a 100644 --- a/src/main/resources/message_en.properties +++ b/src/main/resources/message_en.properties @@ -373,3 +373,4 @@ formula.amount.not.matches.requested.amount= The {0} does not matches to calcula appointment.cannot.be.created = Appointment cannot be created because call doesn't have the template id. appointment.not.created = Appointment not created please try again. +validation.failed.checklist=Validation failed for checklist. diff --git a/src/main/resources/message_it.properties b/src/main/resources/message_it.properties index 20705aa8..7ab7b2b4 100644 --- a/src/main/resources/message_it.properties +++ b/src/main/resources/message_it.properties @@ -364,3 +364,4 @@ formula.amount.not.matches.requested.amount=Il {0} non corrisponde all'importo c appointment.cannot.be.created = Impossibile creare l'appuntamento perché la chiamata non ha l'ID del modello di appuntamento. appointment.not.created = Appuntamento non creato, riprova +validation.failed.checklist=Convalida fallita per la checklist.