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

updated code for create application form api

Browse Source
This commit is contained in:
rajesh
2024-09-17 17:28:43 -07:00
parent b0881d0d45
commit db46676350
5 changed files with 16 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/net/gepafin/tendermanagement/constants/GepafinConstant.java
View File

@@ -131,5 +131,7 @@ public class GepafinConstant {
public static final String CALL_NOT_PUBLISHED="call.not.published"; public static final String CALL_NOT_PUBLISHED="call.not.published";
public static final String APPLICATION_ALREADY_SUBMITTED="application.already.submitted"; public static final String APPLICATION_ALREADY_SUBMITTED="application.already.submitted";
public static final String INITAL_AND_FINAL_FORM_CANNOT_NULL="initial.and.final.form.cannot.null"; public static final String INITAL_AND_FINAL_FORM_CANNOT_NULL="initial.and.final.form.cannot.null";
public static final String APPLICATION_FORM_NOT_FOUND="application.form.not.found";
} }

11
src/main/java/net/gepafin/tendermanagement/dao/FlowFormDao.java
View File

@@ -234,11 +234,12 @@ public class FlowFormDao {
throw new CustomValidationException(Status.VALIDATION_ERROR, throw new CustomValidationException(Status.VALIDATION_ERROR,
Translator.toLocale(GepafinConstant.ACTION_REQUIRED)); Translator.toLocale(GepafinConstant.ACTION_REQUIRED));
} }
formEntity = Optional // formEntity = Optional
.of(applicationFormRepository.findByApplicationIdAndFormId(applicationEntity.getId(), formId)) // .ofNullable(applicationFormRepository.findByApplicationIdAndFormId(applicationEntity.getId(), formId))
.orElseThrow(() -> new ResourceNotFoundException(Status.NOT_FOUND, // .orElseThrow(() -> new ResourceNotFoundException(Status.NOT_FOUND,
Translator.toLocale(GepafinConstant.FORM_NOT_FOUND))) // Translator.toLocale(GepafinConstant.APPLICATION_FORM_NOT_FOUND)))
.getForm(); // .getForm();
formEntity = formService.validateForm(formId);
if (action.equals(FormActionEnum.NEXT)) { if (action.equals(FormActionEnum.NEXT)) {
calculatedFormId = getNextForm(formEntity, applicationEntity); calculatedFormId = getNextForm(formEntity, applicationEntity);

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

@@ -22,6 +22,7 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component; import org.springframework.stereotype.Component;
import java.time.LocalDateTime; import java.time.LocalDateTime;
import java.util.LinkedHashMap;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.stream.Collectors; import java.util.stream.Collectors;
@@ -114,9 +115,11 @@ public class FormDao {
} }
public void validateFormField(List<ApplicationFormFieldRequestBean> applicationFormFieldRequestList, ApplicationEntity applicationEntity, FormEntity formEntity) { public void validateFormField(List<ApplicationFormFieldRequestBean> applicationFormFieldRequestList, ApplicationEntity applicationEntity, FormEntity formEntity) {
Map<String, String> formFieldMap = new LinkedHashMap<String, String>();
for(ApplicationFormFieldRequestBean applicationFormFieldRequestBean:applicationFormFieldRequestList) {
formFieldMap.put(applicationFormFieldRequestBean.getFieldId(),applicationFormFieldRequestBean.getFieldValue());
}
Map<String, String> formFieldMap = applicationFormFieldRequestList.stream()
.collect(Collectors.toMap(ApplicationFormFieldRequestBean::getFieldId, ApplicationFormFieldRequestBean::getFieldValue));
FormResponseBean formResponseBean = convertFormEntityToFormResponseBean(formEntity); FormResponseBean formResponseBean = convertFormEntityToFormResponseBean(formEntity);
ApplicationFormEntity applicationFormEntity=applicationFormRepository.findByApplicationIdAndFormId(applicationEntity.getId(),formEntity.getId()); ApplicationFormEntity applicationFormEntity=applicationFormRepository.findByApplicationIdAndFormId(applicationEntity.getId(),formEntity.getId());
Boolean isApplicationFormExist= getApplicationFormExist(applicationFormEntity); Boolean isApplicationFormExist= getApplicationFormExist(applicationFormEntity);

1
src/main/resources/message_en.properties
View File

@@ -165,3 +165,4 @@ flow.not.found=Flow not found.
validation.message=Validation messages. validation.message=Validation messages.
action.required=Action field required. action.required=Action field required.
call.not.published=Call is not published. call.not.published=Call is not published.
application.form.not.found=Application form not found.

3
src/main/resources/message_it.properties
View File

@@ -159,4 +159,5 @@ current.form.incomplete=il modulo corrente non <20> compilato
flow.not.found=Flow not found. flow.not.found=Flow not found.
validation.message=Messaggi di convalida. validation.message=Messaggi di convalida.
action.required=Campo azione obbligatorio. action.required=Campo azione obbligatorio.
call.not.published=La chiamata non è stata pubblicata. call.not.published=La chiamata non è stata pubblicata.
application.form.not.found=Modulo di domanda non trovato.