updated code
This commit is contained in:
@@ -238,9 +238,31 @@ public class FormDao {
|
|||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public Boolean validateCompletedSteps(List<ApplicationFormFieldEntity> applicationFormFieldEntityList, ApplicationEntity applicationEntity, FormEntity formEntity) {
|
||||||
|
Map<String, Object> formFieldMap = new LinkedHashMap<String, Object>();
|
||||||
|
for(ApplicationFormFieldEntity applicationFormFieldEntity:applicationFormFieldEntityList) {
|
||||||
|
formFieldMap.put(applicationFormFieldEntity.getFieldId(),applicationFormFieldEntity.getFieldValue());
|
||||||
|
}
|
||||||
|
|
||||||
|
FormResponseBean formResponseBean = convertFormEntityToFormResponseBean(formEntity);
|
||||||
|
FieldValidator validator = FieldValidator.create();
|
||||||
|
formResponseBean.getContent().forEach(contentResponseBean -> {
|
||||||
|
String fieldId = contentResponseBean.getId();
|
||||||
|
String value = (String) formFieldMap.get(fieldId);
|
||||||
|
|
||||||
|
FieldValidatorBean fieldValidatorBean = Utils.convertSourceObjectToDestinationObject(contentResponseBean.getValidators(), FieldValidatorBean.class);
|
||||||
|
validator
|
||||||
|
.isRequired(value,fieldValidatorBean.getIsRequired(),fieldId);
|
||||||
|
});
|
||||||
|
if (validator.hasErrors()) {
|
||||||
|
return false; // Validation failed, return false
|
||||||
|
}
|
||||||
|
return true;
|
||||||
|
}
|
||||||
public String validateVatNumber(String value,String customRule,String fieldId){
|
public String validateVatNumber(String value,String customRule,String fieldId){
|
||||||
String error=null;
|
String error=null;
|
||||||
if (value.matches("^\\d{1,11}$")) {
|
|
||||||
|
if (value!=null && value.matches("^\\d{1,11}$")) {
|
||||||
Map<String, Object> customData=null;
|
Map<String, Object> customData=null;
|
||||||
try {
|
try {
|
||||||
Map<String, Object> vatCheckResponse = vatCheckDao.checkVatNumberApi(value);
|
Map<String, Object> vatCheckResponse = vatCheckDao.checkVatNumberApi(value);
|
||||||
@@ -253,37 +275,5 @@ public class FormDao {
|
|||||||
}
|
}
|
||||||
return error;
|
return error;
|
||||||
}
|
}
|
||||||
public Boolean validateCompletedSteps(List<ApplicationFormFieldEntity> applicationFormFieldEntityList, ApplicationEntity applicationEntity, FormEntity formEntity) {
|
|
||||||
Map<String, Object> formFieldMap = new LinkedHashMap<String, Object>();
|
|
||||||
for(ApplicationFormFieldEntity applicationFormFieldEntity:applicationFormFieldEntityList) {
|
|
||||||
formFieldMap.put(applicationFormFieldEntity.getFieldId(),applicationFormFieldEntity.getFieldValue());
|
|
||||||
}
|
|
||||||
|
|
||||||
FormResponseBean formResponseBean = convertFormEntityToFormResponseBean(formEntity);
|
|
||||||
ApplicationFormEntity applicationFormEntity=applicationFormRepository.findByApplicationIdAndFormId(applicationEntity.getId(),formEntity.getId());
|
|
||||||
Boolean isApplicationFormExist= getApplicationFormExist(applicationFormEntity);
|
|
||||||
FieldValidator validator = FieldValidator.create();
|
|
||||||
formResponseBean.getContent().forEach(contentResponseBean -> {
|
|
||||||
String fieldId = contentResponseBean.getId();
|
|
||||||
String value = (String) formFieldMap.get(fieldId);
|
|
||||||
|
|
||||||
if(value == null && isApplicationFormExist) {
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
FieldValidatorBean fieldValidatorBean = Utils.convertSourceObjectToDestinationObject(contentResponseBean.getValidators(), FieldValidatorBean.class);
|
|
||||||
validator
|
|
||||||
.isRequired(value,fieldValidatorBean.getIsRequired(),fieldId);
|
|
||||||
if (fieldValidatorBean.getCustom() != null && fieldValidatorBean.getCustom().equals(GepafinConstant.IS_PIVA)) {
|
|
||||||
String error = validateVatNumber(value, fieldValidatorBean.getCustom(), fieldId);
|
|
||||||
if(error != null) {
|
|
||||||
validator.addError(error);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
});
|
|
||||||
if (validator.hasErrors()) {
|
|
||||||
return false; // Validation failed, return false
|
|
||||||
}
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user