From d6995b98e4fa63ac76e03a3eff39309055b2aa11 Mon Sep 17 00:00:00 2001 From: rajesh Date: Wed, 4 Sep 2024 21:35:59 +0530 Subject: [PATCH] added response field in lookupData response --- .../java/net/gepafin/tendermanagement/dao/CallDao.java | 2 ++ .../gepafin/tendermanagement/dao/LookUpDataDao.java | 10 +++++++--- .../model/request/LookUpDataRequest.java | 1 + .../model/response/LookUpDataResponse.java | 2 ++ .../model/response/LookUpDataResponseBean.java | 2 ++ 5 files changed, 14 insertions(+), 3 deletions(-) diff --git a/src/main/java/net/gepafin/tendermanagement/dao/CallDao.java b/src/main/java/net/gepafin/tendermanagement/dao/CallDao.java index ae87ecf2..905aa0dc 100644 --- a/src/main/java/net/gepafin/tendermanagement/dao/CallDao.java +++ b/src/main/java/net/gepafin/tendermanagement/dao/CallDao.java @@ -264,6 +264,7 @@ public class CallDao { responseBean.setLookUpDataId(entity.getLookupData().getId()); responseBean.setTitle(entity.getLookupData().getTitle()); responseBean.setValue(entity.getLookupData().getValue()); + responseBean.setResponse(entity.getLookupData().getResponse()); responseBean.setScore(entity.getScore()); responseBean.setCreatedDate(entity.getCreatedDate()); responseBean.setUpdatedDate(entity.getUpdatedDate()); @@ -338,6 +339,7 @@ public class CallDao { lookUpDataResponse.setLookUpDataId(lookUpDataEntity.getId()); lookUpDataResponse.setValue(lookUpDataEntity.getValue()); lookUpDataResponse.setTitle(lookUpDataEntity.getTitle()); + lookUpDataResponse.setResponse(lookUpDataEntity.getResponse()); lookUpDataResponse.setCreatedDate(callTargetAudienceChecklistEntity.getCreatedDate()); lookUpDataResponse.setUpdatedDate(callTargetAudienceChecklistEntity.getUpdatedDate()); return lookUpDataResponse; diff --git a/src/main/java/net/gepafin/tendermanagement/dao/LookUpDataDao.java b/src/main/java/net/gepafin/tendermanagement/dao/LookUpDataDao.java index f83d7c76..1a31c306 100644 --- a/src/main/java/net/gepafin/tendermanagement/dao/LookUpDataDao.java +++ b/src/main/java/net/gepafin/tendermanagement/dao/LookUpDataDao.java @@ -17,6 +17,8 @@ import org.springframework.stereotype.Component; import java.util.List; import java.util.stream.Collectors; +import static net.gepafin.tendermanagement.util.Utils.setIfUpdated; + @Component public class LookUpDataDao { @@ -32,6 +34,7 @@ public class LookUpDataDao { entity.setTitle(lookUpDataReq.getTitle()); entity.setType(lookUpDataReq.getType().getValue()); entity.setValue(lookUpDataReq.getValue()); + entity.setValue(lookUpDataReq.getResponse()); validateLookUpDataEntity(entity); lookUpDataRepository.save(entity); return entity; @@ -54,9 +57,9 @@ public class LookUpDataDao { public LookUpDataResponseBean updateLookUpData(Long id, LookUpDataRequest lookUpDataReq) { LookUpDataEntity entity = validateLookUpData(id); - entity.setTitle(lookUpDataReq.getTitle()); - entity.setType(lookUpDataReq.getType().getValue()); - entity.setValue(lookUpDataReq.getValue()); + setIfUpdated(entity::getTitle, entity::setTitle, lookUpDataReq.getTitle()); + setIfUpdated(entity::getValue, entity::setValue, lookUpDataReq.getValue()); + setIfUpdated(entity::getResponse, entity::setResponse, lookUpDataReq.getResponse()); lookUpDataRepository.save(entity); return convertLookUpDataEntityToResponseBean(entity); } @@ -72,6 +75,7 @@ public class LookUpDataDao { response.setTitle(entity.getTitle()); response.setType(LookUpDataEntity.LookUpDataTypeEnum.valueOf(entity.getType())); response.setValue(entity.getValue()); + response.setResponse(entity.getResponse()); response.setCreatedDate(entity.getCreatedDate()); response.setUpdatedDate(entity.getUpdatedDate()); return response; diff --git a/src/main/java/net/gepafin/tendermanagement/model/request/LookUpDataRequest.java b/src/main/java/net/gepafin/tendermanagement/model/request/LookUpDataRequest.java index 459e1416..98e15d52 100644 --- a/src/main/java/net/gepafin/tendermanagement/model/request/LookUpDataRequest.java +++ b/src/main/java/net/gepafin/tendermanagement/model/request/LookUpDataRequest.java @@ -9,4 +9,5 @@ public class LookUpDataRequest { private String title; private LookUpDataTypeEnum type; private String value; + private String response; } diff --git a/src/main/java/net/gepafin/tendermanagement/model/response/LookUpDataResponse.java b/src/main/java/net/gepafin/tendermanagement/model/response/LookUpDataResponse.java index 4fb3f5d9..d61e20d0 100644 --- a/src/main/java/net/gepafin/tendermanagement/model/response/LookUpDataResponse.java +++ b/src/main/java/net/gepafin/tendermanagement/model/response/LookUpDataResponse.java @@ -11,5 +11,7 @@ public class LookUpDataResponse extends BaseBean { private String title; private String value; + + private String response; } diff --git a/src/main/java/net/gepafin/tendermanagement/model/response/LookUpDataResponseBean.java b/src/main/java/net/gepafin/tendermanagement/model/response/LookUpDataResponseBean.java index 554db7bd..b3c873de 100644 --- a/src/main/java/net/gepafin/tendermanagement/model/response/LookUpDataResponseBean.java +++ b/src/main/java/net/gepafin/tendermanagement/model/response/LookUpDataResponseBean.java @@ -10,6 +10,8 @@ public class LookUpDataResponseBean extends BaseBean { private String title; private String value; + + private String response; private LookUpDataTypeEnum type; }