Updated form field response bean
This commit is contained in:
@@ -4,7 +4,9 @@ import net.gepafin.tendermanagement.config.Translator;
|
||||
import net.gepafin.tendermanagement.constants.GepafinConstant;
|
||||
import net.gepafin.tendermanagement.entities.CallEntity;
|
||||
import net.gepafin.tendermanagement.entities.FormEntity;
|
||||
import net.gepafin.tendermanagement.model.request.ContentRequestBean;
|
||||
import net.gepafin.tendermanagement.model.request.FormRequest;
|
||||
import net.gepafin.tendermanagement.model.response.ContentResponseBean;
|
||||
import net.gepafin.tendermanagement.model.response.FormResponseBean;
|
||||
import net.gepafin.tendermanagement.repositories.FormRepository;
|
||||
import net.gepafin.tendermanagement.service.CallService;
|
||||
@@ -37,11 +39,11 @@ public class FormDao {
|
||||
}
|
||||
|
||||
public FormEntity convertFormRequestToFormEntity(Long callId,FormRequest formRequest){
|
||||
FormEntity formEntity=null;
|
||||
FormEntity formEntity=new FormEntity();
|
||||
CallEntity callEntity=callService.getCallEntityById(callId);
|
||||
formEntity.setCall(callEntity);
|
||||
formEntity.setLabel(formRequest.getLabel());
|
||||
formEntity.setContent(formRequest.getContent());
|
||||
formEntity.setContent(setContentResponseBean(formRequest.getContent()));
|
||||
formEntity.setOrderNo(formRequest.getOrderNo());
|
||||
formEntity=saveFormEntity(formEntity);
|
||||
return formEntity;
|
||||
@@ -49,12 +51,10 @@ public class FormDao {
|
||||
public FormResponseBean convertFormEntityToFormResponseBean(FormEntity formEntity){
|
||||
FormResponseBean formResponseBean=new FormResponseBean();
|
||||
formResponseBean.setId(formEntity.getId());
|
||||
formResponseBean.setContent(formEntity.getContent());
|
||||
formResponseBean.setContent(Utils.convertJsonStringToList(formEntity.getContent(), ContentResponseBean.class));
|
||||
formResponseBean.setLabel(formEntity.getLabel());
|
||||
formResponseBean.setCallId(formEntity.getCall().getId());
|
||||
formResponseBean.setOrderNo(formEntity.getOrderNo());
|
||||
formResponseBean.setCreatedDate(formEntity.getCreatedDate());
|
||||
formResponseBean.setUpdatedDate(formEntity.getUpdatedDate());
|
||||
return formResponseBean;
|
||||
}
|
||||
public FormResponseBean createForm(Long callId,FormRequest formRequest){
|
||||
@@ -70,7 +70,7 @@ public class FormDao {
|
||||
public FormResponseBean updateForm(Long formId, FormRequest formRequest){
|
||||
FormEntity formEntity = formService.getFormEntityById(formId);
|
||||
Utils.setIfUpdated(formEntity::getLabel,formEntity::setLabel,formRequest.getLabel());
|
||||
Utils.setIfUpdated(formEntity::getContent,formEntity::setContent,formRequest.getContent());
|
||||
Utils.setIfUpdated(formEntity::getContent,formEntity::setContent,setContentResponseBean(formRequest.getContent()));
|
||||
if(formRequest.getOrderNo()!=null && formRequest.getOrderNo() > 0) {
|
||||
Utils.setIfUpdated(formEntity::getOrderNo, formEntity::setOrderNo, formRequest.getOrderNo());
|
||||
}
|
||||
@@ -102,4 +102,7 @@ public class FormDao {
|
||||
.collect(Collectors.toList());
|
||||
return formResponseBeanList;
|
||||
}
|
||||
public String setContentResponseBean(List<ContentRequestBean> contentRequestBeans){
|
||||
return Utils.convertListToJsonString(contentRequestBeans);
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user