From cd913734f40821883c512491fa7ac7cf2ffcf8d8 Mon Sep 17 00:00:00 2001
From: piyushkag <piyush1.kag1@gmail.com>
Date: Thu, 23 Jan 2025 16:19:04 +0530
Subject: [PATCH] Replaced field value from fields name to its actual labled
 value.

---
 .../gepafin/tendermanagement/dao/FormDao.java | 22 ++++++++++++++-----
 1 file changed, 16 insertions(+), 6 deletions(-)

diff --git a/src/main/java/net/gepafin/tendermanagement/dao/FormDao.java b/src/main/java/net/gepafin/tendermanagement/dao/FormDao.java
index b9b4da07..1c7ed019 100644
--- a/src/main/java/net/gepafin/tendermanagement/dao/FormDao.java
+++ b/src/main/java/net/gepafin/tendermanagement/dao/FormDao.java
@@ -465,17 +465,27 @@ public class FormDao {
             String value = (String) formFieldMap.get(fieldId);
 
             FieldValidatorBean fieldValidatorBean  = Utils.convertSourceObjectToDestinationObject(contentResponseBean.getValidators(), FieldValidatorBean.class);
-            validator
-                    .isRequired(value,fieldValidatorBean.getIsRequired(),contentResponseBean.getLabel());
+            String fieldValue = getFieldValue(contentResponseBean);
+            validator.isRequired(value, fieldValidatorBean.getIsRequired(), fieldValue);
         });
         if (Boolean.TRUE.equals(isSendValidationError)) {
             validator.validate();
         }
-        if (validator.hasErrors()) {
-            return false;
-        }
-        return true;
+        return !validator.hasErrors();
     }
+
+    private String getFieldValue(ContentResponseBean contentResponseBean) {
+        // Use Optional with pattern matching for type checks
+        return contentResponseBean.getSettings().stream().filter(setting -> "label".equals(setting.getName()) && setting.getValue() != null)
+                .map(setting -> {
+            if (setting.getValue() instanceof String value) {
+                return value.trim();
+            } else {
+                return String.valueOf(setting.getValue()).trim();
+            }
+        }).filter(value -> !value.isEmpty()).findFirst().orElse(contentResponseBean.getId());
+    }
+
     public String validateVatNumber(String value,String customRule,String fieldId){
         String error=null;