added response field in lookupData response
This commit is contained in:
@@ -264,6 +264,7 @@ public class CallDao {
|
|||||||
responseBean.setLookUpDataId(entity.getLookupData().getId());
|
responseBean.setLookUpDataId(entity.getLookupData().getId());
|
||||||
responseBean.setTitle(entity.getLookupData().getTitle());
|
responseBean.setTitle(entity.getLookupData().getTitle());
|
||||||
responseBean.setValue(entity.getLookupData().getValue());
|
responseBean.setValue(entity.getLookupData().getValue());
|
||||||
|
responseBean.setResponse(entity.getLookupData().getResponse());
|
||||||
responseBean.setScore(entity.getScore());
|
responseBean.setScore(entity.getScore());
|
||||||
responseBean.setCreatedDate(entity.getCreatedDate());
|
responseBean.setCreatedDate(entity.getCreatedDate());
|
||||||
responseBean.setUpdatedDate(entity.getUpdatedDate());
|
responseBean.setUpdatedDate(entity.getUpdatedDate());
|
||||||
@@ -338,6 +339,7 @@ public class CallDao {
|
|||||||
lookUpDataResponse.setLookUpDataId(lookUpDataEntity.getId());
|
lookUpDataResponse.setLookUpDataId(lookUpDataEntity.getId());
|
||||||
lookUpDataResponse.setValue(lookUpDataEntity.getValue());
|
lookUpDataResponse.setValue(lookUpDataEntity.getValue());
|
||||||
lookUpDataResponse.setTitle(lookUpDataEntity.getTitle());
|
lookUpDataResponse.setTitle(lookUpDataEntity.getTitle());
|
||||||
|
lookUpDataResponse.setResponse(lookUpDataEntity.getResponse());
|
||||||
lookUpDataResponse.setCreatedDate(callTargetAudienceChecklistEntity.getCreatedDate());
|
lookUpDataResponse.setCreatedDate(callTargetAudienceChecklistEntity.getCreatedDate());
|
||||||
lookUpDataResponse.setUpdatedDate(callTargetAudienceChecklistEntity.getUpdatedDate());
|
lookUpDataResponse.setUpdatedDate(callTargetAudienceChecklistEntity.getUpdatedDate());
|
||||||
return lookUpDataResponse;
|
return lookUpDataResponse;
|
||||||
|
|||||||
@@ -17,6 +17,8 @@ import org.springframework.stereotype.Component;
|
|||||||
import java.util.List;
|
import java.util.List;
|
||||||
import java.util.stream.Collectors;
|
import java.util.stream.Collectors;
|
||||||
|
|
||||||
|
import static net.gepafin.tendermanagement.util.Utils.setIfUpdated;
|
||||||
|
|
||||||
@Component
|
@Component
|
||||||
public class LookUpDataDao {
|
public class LookUpDataDao {
|
||||||
|
|
||||||
@@ -32,6 +34,7 @@ public class LookUpDataDao {
|
|||||||
entity.setTitle(lookUpDataReq.getTitle());
|
entity.setTitle(lookUpDataReq.getTitle());
|
||||||
entity.setType(lookUpDataReq.getType().getValue());
|
entity.setType(lookUpDataReq.getType().getValue());
|
||||||
entity.setValue(lookUpDataReq.getValue());
|
entity.setValue(lookUpDataReq.getValue());
|
||||||
|
entity.setValue(lookUpDataReq.getResponse());
|
||||||
validateLookUpDataEntity(entity);
|
validateLookUpDataEntity(entity);
|
||||||
lookUpDataRepository.save(entity);
|
lookUpDataRepository.save(entity);
|
||||||
return entity;
|
return entity;
|
||||||
@@ -54,9 +57,9 @@ public class LookUpDataDao {
|
|||||||
|
|
||||||
public LookUpDataResponseBean updateLookUpData(Long id, LookUpDataRequest lookUpDataReq) {
|
public LookUpDataResponseBean updateLookUpData(Long id, LookUpDataRequest lookUpDataReq) {
|
||||||
LookUpDataEntity entity = validateLookUpData(id);
|
LookUpDataEntity entity = validateLookUpData(id);
|
||||||
entity.setTitle(lookUpDataReq.getTitle());
|
setIfUpdated(entity::getTitle, entity::setTitle, lookUpDataReq.getTitle());
|
||||||
entity.setType(lookUpDataReq.getType().getValue());
|
setIfUpdated(entity::getValue, entity::setValue, lookUpDataReq.getValue());
|
||||||
entity.setValue(lookUpDataReq.getValue());
|
setIfUpdated(entity::getResponse, entity::setResponse, lookUpDataReq.getResponse());
|
||||||
lookUpDataRepository.save(entity);
|
lookUpDataRepository.save(entity);
|
||||||
return convertLookUpDataEntityToResponseBean(entity);
|
return convertLookUpDataEntityToResponseBean(entity);
|
||||||
}
|
}
|
||||||
@@ -72,6 +75,7 @@ public class LookUpDataDao {
|
|||||||
response.setTitle(entity.getTitle());
|
response.setTitle(entity.getTitle());
|
||||||
response.setType(LookUpDataEntity.LookUpDataTypeEnum.valueOf(entity.getType()));
|
response.setType(LookUpDataEntity.LookUpDataTypeEnum.valueOf(entity.getType()));
|
||||||
response.setValue(entity.getValue());
|
response.setValue(entity.getValue());
|
||||||
|
response.setResponse(entity.getResponse());
|
||||||
response.setCreatedDate(entity.getCreatedDate());
|
response.setCreatedDate(entity.getCreatedDate());
|
||||||
response.setUpdatedDate(entity.getUpdatedDate());
|
response.setUpdatedDate(entity.getUpdatedDate());
|
||||||
return response;
|
return response;
|
||||||
|
|||||||
@@ -9,4 +9,5 @@ public class LookUpDataRequest {
|
|||||||
private String title;
|
private String title;
|
||||||
private LookUpDataTypeEnum type;
|
private LookUpDataTypeEnum type;
|
||||||
private String value;
|
private String value;
|
||||||
|
private String response;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -12,4 +12,6 @@ public class LookUpDataResponse extends BaseBean {
|
|||||||
|
|
||||||
private String value;
|
private String value;
|
||||||
|
|
||||||
|
private String response;
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -11,5 +11,7 @@ public class LookUpDataResponseBean extends BaseBean {
|
|||||||
|
|
||||||
private String value;
|
private String value;
|
||||||
|
|
||||||
|
private String response;
|
||||||
|
|
||||||
private LookUpDataTypeEnum type;
|
private LookUpDataTypeEnum type;
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user