BFLOWS/bflows-bandi-be
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Replaced field value from fields name to its actual labled value.

Browse Source
This commit is contained in:
piyushkag
2025-01-23 16:19:04 +05:30
parent 45aaf4f667
commit cd913734f4
1 changed files with 16 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/main/java/net/gepafin/tendermanagement/dao/FormDao.java
View File

@@ -465,17 +465,27 @@ public class FormDao {
String value = (String) formFieldMap.get(fieldId); String value = (String) formFieldMap.get(fieldId);
FieldValidatorBean fieldValidatorBean = Utils.convertSourceObjectToDestinationObject(contentResponseBean.getValidators(), FieldValidatorBean.class); FieldValidatorBean fieldValidatorBean = Utils.convertSourceObjectToDestinationObject(contentResponseBean.getValidators(), FieldValidatorBean.class);
validator String fieldValue = getFieldValue(contentResponseBean);
.isRequired(value,fieldValidatorBean.getIsRequired(),contentResponseBean.getLabel()); validator.isRequired(value, fieldValidatorBean.getIsRequired(), fieldValue);
}); });
if (Boolean.TRUE.equals(isSendValidationError)) { if (Boolean.TRUE.equals(isSendValidationError)) {
validator.validate(); validator.validate();
} }
if (validator.hasErrors()) { return !validator.hasErrors();
return false;
} }
return true;
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){ public String validateVatNumber(String value,String customRule,String fieldId){
String error=null; String error=null;