Merge pull request #83 from Kitzanos/feature/GEPAFINBE-82

GEPFINBE-82 (Changes in get evaluation api -Updated the response for criteria mapped fields)

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

@@ -1,6 +1,9 @@
 package net.gepafin.tendermanagement.dao;
 
+import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.core.type.TypeReference;
+import com.fasterxml.jackson.databind.JsonNode;
+import com.fasterxml.jackson.databind.ObjectMapper;
 import net.gepafin.tendermanagement.config.Translator;
 import net.gepafin.tendermanagement.constants.GepafinConstant;
 import net.gepafin.tendermanagement.entities.*;
@@ -24,6 +27,7 @@ import java.util.*;
 import java.util.stream.Collectors;
 
 import static net.gepafin.tendermanagement.util.Utils.setIfUpdated;
+import static org.apache.commons.lang3.StringUtils.isNumeric;
 
 @Component
 public class ApplicationEvaluationDao {
@@ -48,7 +52,6 @@ public class ApplicationEvaluationDao {
 
     @Autowired
     private FormRepository formRepository;
-
     @Autowired
     private CallTargetAudienceChecklistRepository callTargetAudienceChecklistRepository;
 
@@ -163,10 +166,8 @@ public class ApplicationEvaluationDao {
     }
 
     private List<CriteriaMappedField> getMappedFieldsForCriteria(Long evaluationCriteriaId, Long applicationId) {
-
         List<CriteriaFormFieldEntity> criteriaFormFields = criteriaFormFieldRepository.findByEvaluationCriteriaIdAndIsDeletedFalse(evaluationCriteriaId);
         List<CriteriaMappedField> mappedFields = new ArrayList<>();
-
         Set<String> uniqueFieldIds = new HashSet<>();
 
         List<ApplicationFormEntity> applicationForms = applicationFormRepository.findByApplicationId(applicationId);
@@ -178,10 +179,44 @@ public class ApplicationEvaluationDao {
                     CriteriaMappedField mappedField = new CriteriaMappedField();
                     mappedField.setId(formFieldId);
 
-                    FormEntity formEntity = formRepository.findById(formField.getFormId()).orElse(null);
+                    FormEntity formEntity = getFormEntity(formField.getFormId());
                     if (formEntity != null) {
                         List<ContentResponseBean> contentBeans = Utils.convertJsonStringToList(formEntity.getContent(), ContentResponseBean.class);
-                        contentBeans.stream().filter(contentBean -> contentBean.getId().equals(formFieldId)).findFirst().ifPresent(contentBean -> {
+                        contentBeans.stream()
+                                .filter(contentBean -> contentBean.getId().equals(formFieldId))
+                                .findFirst()
+                                .ifPresent(contentBean -> {
+                                    mappedField.setFieldLabel(getLabelForField(contentBean));
+                                    switch (contentBean.getName()) {
+                                        case "fileupload":
+                                            mapFileFieldDetails(mappedField, formFieldId, applicationForm.getId(), applicationId);
+                                            break;
+
+                                        case "checkboxes":
+                                            populateOptionFieldsAsFieldValue(mappedField, formFieldId, applicationForm, applicationId, contentBean);
+                                            break;
+                                        case "paragraph":
+                                            handleParagraphField(applicationId, formField, contentBean, mappedField);
+                                            break;
+                                        default:
+                                            populateOptionFieldsAsFieldValue(mappedField, formFieldId, applicationForm, applicationId, contentBean);
+                                    }
+                                });
+                    }
+
+                    mappedFields.add(mappedField);
+                    uniqueFieldIds.add(formFieldId);
+                }
+            }
+        }
+        return mappedFields;
+    }
+
+    private FormEntity getFormEntity(Long formId) {
+        return formRepository.findById(formId).orElse(null);
+    }
+
+    private String getLabelForField(ContentResponseBean contentBean) {
         String label = contentBean.getLabel();
         if (contentBean.getSettings() != null) {
             for (SettingResponseBean setting : contentBean.getSettings()) {
@@ -191,22 +226,43 @@ public class ApplicationEvaluationDao {
                 }
             }
         }
-                            mappedField.setFieldLabel(label);
+        return label;
+    }
+
+    private void mapFileFieldDetails(CriteriaMappedField mappedField, String formFieldId, Long applicationFormId, Long applicationId) {
+        Optional<ApplicationFormFieldEntity> formFieldEntityOptional = applicationFormFieldRepository
+                .findByFieldIdAndApplicationFormIdAndApplicationFormApplicationId(formFieldId, applicationFormId, applicationId);
+
+        if (formFieldEntityOptional.isPresent()) {
+            String[] documentIds = formFieldEntityOptional.get().getFieldValue().split(",");
+            List<DocumentResponseBean> documentResponseBeans = new ArrayList<>();
+
+            for (String docId : documentIds) {
+                Long documentId = Long.valueOf(docId.trim());
+                documentRepository.findByIdAndNotDeleted(documentId).ifPresent(documentEntity -> {
+                    DocumentResponseBean responseBean = new DocumentResponseBean();
+                    responseBean.setId(documentEntity.getId());
+                    responseBean.setName(documentEntity.getFileName());
+                    responseBean.setType(DocumentTypeEnum.valueOf(documentEntity.getType()));
+                    responseBean.setSource(DocumentSourceTypeEnum.valueOf(documentEntity.getSource()));
+                    responseBean.setSourceId(documentEntity.getSourceId());
+                    responseBean.setFilePath(documentEntity.getFilePath());
+                    responseBean.setCreatedDate(documentEntity.getCreatedDate());
+                    responseBean.setUpdatedDate(documentEntity.getUpdatedDate());
+                    documentResponseBeans.add(responseBean);
                 });
             }
+            mappedField.setFieldValue(documentResponseBeans);
+        }
+    }
 
-                    Optional<ApplicationFormFieldEntity> formFieldEntityOptional = applicationFormFieldRepository.findByFieldIdAndApplicationFormIdAndApplicationFormApplicationId(
-                            formFieldId, applicationForm.getId(), applicationId);
 
-                    formFieldEntityOptional.ifPresent(field -> mappedField.setFieldValue(field.getFieldValue()));
+    private void mapNonFileFieldDetails(CriteriaMappedField mappedField, String formFieldId, Long applicationFormId, Long applicationId) {
+        applicationFormFieldRepository
+                .findByFieldIdAndApplicationFormIdAndApplicationFormApplicationId(formFieldId, applicationFormId, applicationId)
+                .ifPresent(field -> mappedField.setFieldValue(field.getFieldValue()));
+    }
 
-                    mappedFields.add(mappedField);
-                    uniqueFieldIds.add(formFieldId);
-                }
-            }
-        }
-        return mappedFields;
-    }
 
     private void setChecklistResponses(ApplicationEvaluationEntity entity, ApplicationEvaluationResponse response, List<CallTargetAudienceChecklistEntity> checklistEntities) {
 
@@ -562,36 +618,116 @@ public class ApplicationEvaluationDao {
         return response;
     }
 
-    private void setCriteriaResponses(ApplicationEvaluationEntity entity, Long applicationId, ApplicationEvaluationResponse response,
+    private void setCriteriaResponses(ApplicationEvaluationEntity entity, Long applicationId,
+                                      ApplicationEvaluationResponse response,
                                       List<EvaluationCriteriaEntity> evaluationCriterias) {
 
-        List<CriteriaResponse> criteriaResponses = entity.getCriteria() != null ? Utils.convertJsonToList(entity.getCriteria(), new TypeReference<List<CriteriaResponse>>() {
-        }) : getCriteriaResponse(applicationId);
+        List<CriteriaResponse> criteriaResponses = getInitialCriteriaResponses(entity, applicationId);
 
         criteriaResponses.forEach(criteriaResponse -> {
-            EvaluationCriteriaEntity matchingEvaluationCriteria = evaluationCriterias.stream()
-                    .filter(evaluationCriteria -> evaluationCriteria.getId().equals(criteriaResponse.getId())).findFirst().orElse(null);
-
-            List<ApplicationFormEntity> applicationForms = applicationFormRepository.findByApplicationId(applicationId);
-            Map<String, CriteriaMappedField> mappedFieldMap = new HashMap<>();
+            EvaluationCriteriaEntity matchingEvaluationCriteria =
+                    findMatchingEvaluationCriteria(criteriaResponse, evaluationCriterias);
 
             if (matchingEvaluationCriteria != null) {
+                List<ApplicationFormEntity> applicationForms = applicationFormRepository.findByApplicationId(applicationId);
+                Map<String, CriteriaMappedField> mappedFieldMap = populateMappedFields(
+                        matchingEvaluationCriteria, applicationForms, applicationId);
+
                 criteriaResponse.setLabel(matchingEvaluationCriteria.getLookupData().getValue());
                 criteriaResponse.setMaxScore(matchingEvaluationCriteria.getScore());
+                criteriaResponse.setCriteriaMappedFields(new ArrayList<>(mappedFieldMap.values()));
+            }
+        });
 
-                List<CriteriaFormFieldEntity> criteriaFormFields = criteriaFormFieldRepository.findByEvaluationCriteriaIdAndIsDeletedFalse(matchingEvaluationCriteria.getId());
+        response.setCriteria(criteriaResponses);
+    }
+
+    private List<CriteriaResponse> getInitialCriteriaResponses(ApplicationEvaluationEntity entity, Long applicationId) {
+        return entity.getCriteria() != null
+                ? Utils.convertJsonToList(entity.getCriteria(), new TypeReference<List<CriteriaResponse>>() {})
+                : getCriteriaResponse(applicationId);
+    }
+
+    private EvaluationCriteriaEntity findMatchingEvaluationCriteria(CriteriaResponse criteriaResponse,
+                                                                    List<EvaluationCriteriaEntity> evaluationCriterias) {
+        return evaluationCriterias.stream()
+                .filter(evaluationCriteria -> evaluationCriteria.getId().equals(criteriaResponse.getId()))
+                .findFirst()
+                .orElse(null);
+    }
+
+    private Map<String, CriteriaMappedField> populateMappedFields(EvaluationCriteriaEntity matchingEvaluationCriteria,
+                                                                  List<ApplicationFormEntity> applicationForms,
+                                                                  Long applicationId) {
+        Map<String, CriteriaMappedField> mappedFieldMap = new HashMap<>();
+        List<CriteriaFormFieldEntity> criteriaFormFields = criteriaFormFieldRepository
+                .findByEvaluationCriteriaIdAndIsDeletedFalse(matchingEvaluationCriteria.getId());
 
         for (ApplicationFormEntity applicationForm : applicationForms) {
             for (CriteriaFormFieldEntity criteriaFormField : criteriaFormFields) {
                 String formFieldId = criteriaFormField.getFormFieldId();
                 if (!mappedFieldMap.containsKey(formFieldId)) {
                     CriteriaMappedField mappedField = new CriteriaMappedField();
-                            mappedField.setId(formFieldId);
-                            FormEntity formEntity = formRepository.findById(criteriaFormField.getFormId()).orElse(null);
+                    populateMappedField(mappedField, formFieldId, criteriaFormField, applicationForm, applicationId);
+                    mappedFieldMap.put(formFieldId, mappedField);
+                }
+            }
+        }
 
-                            if (formEntity != null) {
+        return mappedFieldMap;
+    }
+
+    private void populateMappedField(CriteriaMappedField mappedField, String formFieldId,
+                                     CriteriaFormFieldEntity criteriaFormField,
+                                     ApplicationFormEntity applicationForm, Long applicationId) {
+        mappedField.setId(formFieldId);
+        formRepository.findById(criteriaFormField.getFormId()).ifPresent(formEntity -> {
             List<ContentResponseBean> contentResponseBeans = Utils.convertJsonStringToList(formEntity.getContent(), ContentResponseBean.class);
             contentResponseBeans.stream().filter(bean -> bean.getId().equals(formFieldId)).findFirst().ifPresent(contentResponseBean -> {
+                String label = getLabel(contentResponseBean);
+                mappedField.setFieldLabel(label);
+                switch (contentResponseBean.getName()) {
+                    case "fileupload":
+                        populateFileDetailsAsFieldValue(mappedField, formFieldId, applicationForm, applicationId);
+                        break;
+
+                    case "checkboxes":
+                        populateOptionFieldsAsFieldValue(mappedField, formFieldId, applicationForm, applicationId, contentResponseBean);
+                        break;
+
+                    case "paragraph":
+                        handleParagraphField(applicationId, criteriaFormField, contentResponseBean, mappedField);
+                        break;
+
+                    default:
+                        populateOptionFieldsAsFieldValue(mappedField, formFieldId, applicationForm, applicationId, contentResponseBean);
+                }
+            });
+        });
+    }
+
+
+    private void populateFileDetailsAsFieldValue(CriteriaMappedField mappedField, String formFieldId,
+                                                 ApplicationFormEntity applicationForm, Long applicationId) {
+        applicationFormFieldRepository.findByFieldIdAndApplicationFormIdAndApplicationFormApplicationId(
+                        formFieldId, applicationForm.getId(), applicationId)
+                .ifPresent(formField -> {
+                    if (formField.getFieldValue() != null) {
+                        List<DocumentResponseBean> documentResponseBeans = new ArrayList<>();
+                        for (String docId : formField.getFieldValue().split(",")) {
+                            Long documentId = Long.valueOf(docId.trim());
+                            documentRepository.findByIdAndNotDeleted(documentId).ifPresent(documentEntity -> {
+                                DocumentResponseBean responseBean = createDocumentResponseBean(documentEntity);
+                                documentResponseBeans.add(responseBean);
+                            });
+                        }
+                        // Set the list of DocumentResponseBean directly
+                        mappedField.setFieldValue(documentResponseBeans);
+                    }
+                });
+    }
+
+    private String getLabel(ContentResponseBean contentResponseBean) {
         String label = contentResponseBean.getLabel();
         if (contentResponseBean.getSettings() != null) {
             for (SettingResponseBean setting : contentResponseBean.getSettings()) {
@@ -601,23 +737,62 @@ public class ApplicationEvaluationDao {
                 }
             }
         }
-                                    mappedField.setFieldLabel(label);
+        return label;
+    }
+    private void populateOptionFieldsAsFieldValue(CriteriaMappedField mappedField, String formFieldId, ApplicationFormEntity applicationForm, Long applicationId, ContentResponseBean contentBean) {
+        ObjectMapper objectMapper = new ObjectMapper();
+        findFormFieldValue(applicationId, formFieldId).ifPresent(formField -> {
+            Object value = formField.getFieldValue();
+            List<String> labels = new ArrayList<>();
+            if (value instanceof String) {
+                String fieldValue = (String) value;
+                if (fieldValue.contains(",")) {
+                    try {
+                        List<?> parsedValue = objectMapper.readValue(fieldValue, new TypeReference<List<?>>() {});
+                        parsedValue.forEach(item -> addLabelToList(labels, item, contentBean));
+                    } catch (JsonProcessingException e) {
+
+                        String[] fallbackValues = fieldValue.split(",");
+                        for (String item : fallbackValues) {
+                            addLabelToList(labels, item.trim(), contentBean);
+                        }
+                    }
+                    mappedField.setFieldValue(!labels.isEmpty() ? labels : null);
+                } else {
+
+                    addLabelToList(labels, fieldValue.trim(), contentBean);
+                    mappedField.setFieldValue(!labels.isEmpty() ? labels.get(0) : null);
+                }
+            } else if (value instanceof List<?>) {
+
+                List<?> parsedValue = (List<?>) value;
+                parsedValue.forEach(item -> addLabelToList(labels, item, contentBean));
+                mappedField.setFieldValue(!labels.isEmpty() ? labels : null);
+            }
         });
     }
-                            Optional<ApplicationFormFieldEntity> formFieldEntityOptional =
-                                    applicationFormFieldRepository.findByFieldIdAndApplicationFormIdAndApplicationFormApplicationId(
-                                    formFieldId, applicationForm.getId(), applicationId);
 
-                            formFieldEntityOptional.ifPresent(formField -> mappedField.setFieldValue(formField.getFieldValue()));
-                            mappedFieldMap.put(formFieldId, mappedField);
+    private void addLabelToList(List<String> labels, Object item, ContentResponseBean contentBean) {
+        if (item instanceof String) {
+            Object label = PdfDao.findLabelInOptions(contentBean.getSettings(), item);
+            if (label != null) {
+                labels.add(label.toString());
             }
         }
     }
-                criteriaResponse.setCriteriaMappedFields(new ArrayList<>(mappedFieldMap.values()));
-            }
-        });
 
-        response.setCriteria(criteriaResponses);
+
+    private DocumentResponseBean createDocumentResponseBean(DocumentEntity documentEntity) {
+        DocumentResponseBean responseBean = new DocumentResponseBean();
+        responseBean.setId(documentEntity.getId());
+        responseBean.setName(documentEntity.getFileName());
+        responseBean.setType(DocumentTypeEnum.valueOf(documentEntity.getType()));
+        responseBean.setSource(DocumentSourceTypeEnum.valueOf(documentEntity.getSource()));
+        responseBean.setSourceId(documentEntity.getSourceId());
+        responseBean.setFilePath(documentEntity.getFilePath());
+        responseBean.setCreatedDate(documentEntity.getCreatedDate());
+        responseBean.setUpdatedDate(documentEntity.getUpdatedDate());
+        return responseBean;
     }
 
     private void setChecklistResponses(ApplicationEvaluationEntity entity, Long applicationId, ApplicationEvaluationResponse response,
@@ -693,8 +868,6 @@ public class ApplicationEvaluationDao {
 
                                 fieldResponse.setFileDetail(documentResponseBeans);
                             }
-
-                            // Mark this field ID as processed to prevent duplicates
                             processedFieldIds.add(fieldResponse.getId());
                         }
                     });
@@ -721,13 +894,31 @@ public class ApplicationEvaluationDao {
         response.setEvaluationDate(application.getSubmissionDate() != null ? application.getSubmissionDate().plusDays(30) : null);
 
     }
+    private Optional<ApplicationFormFieldEntity> findFormFieldValue(Long applicationId, String formFieldId) {
+        return applicationFormRepository.findByApplicationId(applicationId).stream()
+                .flatMap(applicationForm -> applicationFormFieldRepository.findByFieldIdAndApplicationFormIdAndApplicationFormApplicationId(
+                        formFieldId, applicationForm.getId(), applicationId).stream())
+                .findFirst();
+    }
 
     List<CriteriaResponse> getCriteriaResponse(Long applicationId) {
+        CallEntity call = getCallEntityByApplicationId(applicationId);
+        List<EvaluationCriteriaEntity> evaluationCriterias = getEvaluationCriterias(call);
 
-        CallEntity call = callRepository.findCallEntityByApplicationId(applicationId);
-        List<EvaluationCriteriaEntity> evaluationCriterias = evaluationCriteriaRepository.findByCallId(call.getId());
+        return evaluationCriterias.stream()
+                .map(criteria -> buildCriteriaResponse(applicationId, criteria))
+                .collect(Collectors.toList());
+    }
 
-        List<CriteriaResponse> criteriaResponses = evaluationCriterias.stream().map(criteria -> {
+    private CallEntity getCallEntityByApplicationId(Long applicationId) {
+        return callRepository.findCallEntityByApplicationId(applicationId);
+    }
+
+    private List<EvaluationCriteriaEntity> getEvaluationCriterias(CallEntity call) {
+        return evaluationCriteriaRepository.findByCallId(call.getId());
+    }
+
+    private CriteriaResponse buildCriteriaResponse(Long applicationId, EvaluationCriteriaEntity criteria) {
         CriteriaResponse response = new CriteriaResponse();
         response.setId(criteria.getId());
         response.setLabel(criteria.getLookupData().getValue());
@@ -735,7 +926,13 @@ public class ApplicationEvaluationDao {
         response.setMaxScore(criteria.getScore());
         response.setValid(null);
 
-            List<CriteriaFormFieldEntity> criteriaFormFields = criteriaFormFieldRepository.findByEvaluationCriteriaIdAndIsDeletedFalse(criteria.getId());
+        List<CriteriaMappedField> mappedFields = getMappedFields(applicationId, criteria);
+        response.setCriteriaMappedFields(mappedFields);
+        return response;
+    }
+
+    private List<CriteriaMappedField> getMappedFields(Long applicationId, EvaluationCriteriaEntity criteria) {
+        List<CriteriaFormFieldEntity> criteriaFormFields = getCriteriaFormFields(criteria);
 
         List<CriteriaMappedField> mappedFields = new ArrayList<>();
         Set<String> processedFormFieldIds = new HashSet<>();
@@ -745,13 +942,71 @@ public class ApplicationEvaluationDao {
                 continue;
             }
 
+            CriteriaMappedField mappedField = mapField(applicationId, criteriaFormField);
+            mappedFields.add(mappedField);
+            processedFormFieldIds.add(criteriaFormField.getFormFieldId());
+        }
+
+        return mappedFields;
+    }
+
+    private List<CriteriaFormFieldEntity> getCriteriaFormFields(EvaluationCriteriaEntity criteria) {
+        return criteriaFormFieldRepository.findByEvaluationCriteriaIdAndIsDeletedFalse(criteria.getId());
+    }
+
+    private CriteriaMappedField mapField(Long applicationId, CriteriaFormFieldEntity criteriaFormField) {
         CriteriaMappedField mappedField = new CriteriaMappedField();
         mappedField.setId(criteriaFormField.getFormFieldId());
 
         FormEntity formEntity = formRepository.findById(criteriaFormField.getFormId()).orElse(null);
         if (formEntity != null) {
             List<ContentResponseBean> contentResponseBeans = Utils.convertJsonStringToList(formEntity.getContent(), ContentResponseBean.class);
-                    contentResponseBeans.stream().filter(bean -> bean.getId().equals(criteriaFormField.getFormFieldId())).findFirst().ifPresent(contentResponseBean -> {
+            contentResponseBeans.stream()
+                    .filter(bean -> bean.getId().equals(criteriaFormField.getFormFieldId()))
+                    .findFirst()
+                    .ifPresent(contentResponseBean -> processFieldValue(applicationId, criteriaFormField, contentResponseBean, mappedField));
+        }
+
+        return mappedField;
+    }
+
+    private void processFieldValue(Long applicationId, CriteriaFormFieldEntity criteriaFormField, ContentResponseBean contentResponseBean, CriteriaMappedField mappedField) {
+        String label = getLabelFromSettings(contentResponseBean);
+
+        mappedField.setFieldLabel(label);
+
+        boolean isCheckbox = "checkboxes".equals(contentResponseBean.getName());
+        boolean isFileUpload = "fileupload".equals(contentResponseBean.getName());
+        boolean isParagraph = "paragraph".equals(contentResponseBean.getName());
+
+        if (isFileUpload) {
+            handleFileUpload(applicationId, criteriaFormField, mappedField);
+        } else if (isCheckbox) {
+            handleCheckbox(applicationId, criteriaFormField, contentResponseBean, mappedField);
+        }
+         else if (isParagraph) {
+            handleParagraphField(applicationId, criteriaFormField, contentResponseBean, mappedField);
+        }
+        else {
+            handleOtherFields(applicationId, criteriaFormField, contentResponseBean, mappedField);
+        }
+    }
+    private void handleParagraphField(Long applicationId, CriteriaFormFieldEntity criteriaFormField, ContentResponseBean contentResponseBean, CriteriaMappedField mappedField) {
+        findFormFieldValue(applicationId, criteriaFormField.getFormFieldId()).ifPresent(formField -> {
+                String paragraph = contentResponseBean.getSettings().stream()
+                        .filter(setting -> "text".equals(setting.getName()))
+                        .map(SettingResponseBean::getValue)
+                        .map(Object::toString)
+                        .findFirst()
+                        .orElse(null);
+                if (paragraph != null) {
+                    mappedField.setFieldValue(paragraph.trim());
+                }
+
+        });
+    }
+
+    private String getLabelFromSettings(ContentResponseBean contentResponseBean) {
         String label = contentResponseBean.getLabel();
         if (contentResponseBean.getSettings() != null) {
             for (SettingResponseBean setting : contentResponseBean.getSettings()) {
@@ -761,25 +1016,90 @@ public class ApplicationEvaluationDao {
                 }
             }
         }
-                        mappedField.setFieldLabel(label);
+        return label;
+    }
+
+    private void handleFileUpload(Long applicationId, CriteriaFormFieldEntity criteriaFormField, CriteriaMappedField mappedField) {
+        List<DocumentResponseBean> documentResponseBeans = new ArrayList<>();
+        findFormFieldValue(applicationId, criteriaFormField.getFormFieldId()).ifPresent(formField -> {
+            String fieldValue = formField.getFieldValue();
+            if (fieldValue != null) {
+                String[] fieldValues = fieldValue.split(",");
+                for (String value : fieldValues) {
+                    Long documentId = Long.valueOf(value.trim());
+                    documentRepository.findByIdAndNotDeleted(documentId).ifPresent(documentEntity -> {
+                        DocumentResponseBean responseBean = mapDocumentEntityToResponse(documentEntity);
+                        documentResponseBeans.add(responseBean);
+                    });
+                }
+            }
+            mappedField.setFieldValue(!documentResponseBeans.isEmpty() ? documentResponseBeans : null);
         });
     }
 
-                applicationFormRepository.findByApplicationId(applicationId).stream().flatMap(
-                        applicationForm -> applicationFormFieldRepository.findByFieldIdAndApplicationFormIdAndApplicationFormApplicationId(criteriaFormField.getFormFieldId(),
-                                applicationForm.getId(), applicationId).stream()).findFirst().ifPresent(formField -> mappedField.setFieldValue(formField.getFieldValue()));
-
-                mappedFields.add(mappedField);
-                processedFormFieldIds.add(criteriaFormField.getFormFieldId());
+    private DocumentResponseBean mapDocumentEntityToResponse(DocumentEntity documentEntity) {
+        DocumentResponseBean responseBean = new DocumentResponseBean();
+        responseBean.setId(documentEntity.getId());
+        responseBean.setName(documentEntity.getFileName());
+        responseBean.setType(DocumentTypeEnum.valueOf(documentEntity.getType()));
+        responseBean.setSource(DocumentSourceTypeEnum.valueOf(documentEntity.getSource()));
+        responseBean.setSourceId(documentEntity.getSourceId());
+        responseBean.setFilePath(documentEntity.getFilePath());
+        responseBean.setCreatedDate(documentEntity.getCreatedDate());
+        responseBean.setUpdatedDate(documentEntity.getUpdatedDate());
+        return responseBean;
     }
 
-            response.setCriteriaMappedFields(mappedFields);
-            return response;
-        }).collect(Collectors.toList());
+    private void handleCheckbox(Long applicationId, CriteriaFormFieldEntity criteriaFormField, ContentResponseBean contentResponseBean, CriteriaMappedField mappedField) {
+        ObjectMapper objectMapper = new ObjectMapper();
+        findFormFieldValue(applicationId, criteriaFormField.getFormFieldId()).ifPresent(formField -> {
+            Object value = formField.getFieldValue();
+            List<String> labels = new ArrayList<>();
 
-        return criteriaResponses;
+            if (value instanceof String) {
+                List<?> parsedValue = parseJsonValue((String) value, objectMapper);
+                addLabelsFromParsedValues(parsedValue, contentResponseBean, labels);
+            } else if (value instanceof List<?>) {
+                List<?> parsedValue = (List<?>) value;
+                addLabelsFromParsedValues(parsedValue, contentResponseBean, labels);
             }
 
+            mappedField.setFieldValue(!labels.isEmpty() ? (labels.size() == 1 ? labels.get(0) : labels) : null);
+        });
+    }
+
+    private List<?> parseJsonValue(String value, ObjectMapper objectMapper) {
+        try {
+            return objectMapper.readValue(value, new TypeReference<List<?>>() {});
+        } catch (JsonProcessingException e) {
+            throw new RuntimeException(e);
+        }
+    }
+
+    private void addLabelsFromParsedValues(List<?> parsedValue, ContentResponseBean contentResponseBean, List<String> labels) {
+        for (Object item : parsedValue) {
+            if (item instanceof String) {
+                Object label = PdfDao.findLabelInOptions(contentResponseBean.getSettings(), item);
+                if (label != null) {
+                    labels.add(label.toString());
+                }
+            }
+        }
+    }
+
+    private void handleOtherFields(Long applicationId, CriteriaFormFieldEntity criteriaFormField, ContentResponseBean contentResponseBean, CriteriaMappedField mappedField) {
+        findFormFieldValue(applicationId, criteriaFormField.getFormFieldId()).ifPresent(formField -> {
+            String fieldValue = formField.getFieldValue() != null ? formField.getFieldValue().trim() : null;
+            Object label = PdfDao.findLabelInOptions(contentResponseBean.getSettings(), fieldValue);
+            if (label != null) {
+                mappedField.setFieldValue(fieldValue != null && !fieldValue.isEmpty() && !fieldValue.contains(",")
+                        ? label.toString()
+                        : Arrays.asList(label.toString()));
+            }
+        });
+    }
+
+
     List<ChecklistResponse> getChecklistResponse(Long applicationId) {
 
         CallEntity call = callRepository.findCallEntityByApplicationId(applicationId);
@@ -852,8 +1172,6 @@ public class ApplicationEvaluationDao {
                                 }
 
                                 fieldResponse.setFileDetail(documentResponseBeans);
-
-                                // Now add fieldResponse to the list
                                 fieldResponses.add(fieldResponse);
                             }
                         }

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

@@ -1,10 +1,11 @@
 package net.gepafin.tendermanagement.model.response;
 
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import lombok.Data;
 
 @Data
 public class CriteriaMappedField {
     private String id;
     private String fieldLabel;
-    private String fieldValue;
+    private Object fieldValue;
 }