From 74fceb94c10a2249f1264a889f2b07efa90ac811 Mon Sep 17 00:00:00 2001 From: rajesh Date: Thu, 29 Aug 2024 02:02:17 +0530 Subject: [PATCH] updated code for get all call api --- .../net/gepafin/tendermanagement/dao/CallDao.java | 12 ++++++++---- .../model/response/CallDetailsResponseBean.java | 15 +-------------- .../model/response/CallResponse.java | 2 +- .../service/impl/CallValidatorServiceImpl.java | 2 +- 4 files changed, 11 insertions(+), 20 deletions(-) diff --git a/src/main/java/net/gepafin/tendermanagement/dao/CallDao.java b/src/main/java/net/gepafin/tendermanagement/dao/CallDao.java index 3b9773b3..61e840a5 100644 --- a/src/main/java/net/gepafin/tendermanagement/dao/CallDao.java +++ b/src/main/java/net/gepafin/tendermanagement/dao/CallDao.java @@ -213,7 +213,7 @@ public class CallDao { FaqEntity faqEntity = new FaqEntity(); validateFaqEntity(faqReq.getQuestion()); faqEntity.setUser(userEntity); - faqEntity.setIsVisible(true); + faqEntity.setIsVisible(false); if (faqReq.getIsVisible() != null) { faqEntity.setIsVisible(faqReq.getIsVisible()); } @@ -287,7 +287,7 @@ public class CallDao { createCallResponseBean.setContactInfo(callEntity.getContactInfo()); createCallResponseBean.setSubmissionMethod(callEntity.getSubmissionMethod()); createCallResponseBean.setThreshold(callEntity.getThreshold()); - createCallResponseBean.setDocumentationReqested(callEntity.getDocumentationRequested()); + createCallResponseBean.setDocumentationRequested(callEntity.getDocumentationRequested()); createCallResponseBean.setPriorityArea(callEntity.getPriorityArea()); createCallResponseBean.setConfidi(callEntity.getConfidi()); createCallResponseBean.setCreatedDate(callEntity.getCreatedDate()); @@ -547,6 +547,7 @@ public class CallDao { faqEntity = new FaqEntity(); faqEntity.setCall(callEntity); faqEntity.setUser(userEntity); + faqEntity.setIsVisible(false); faqEntity.setIsDeleted(false); } @@ -609,7 +610,10 @@ public class CallDao { CallDetailsResponseBean callDetailsResponseBean = new CallDetailsResponseBean(); callDetailsResponseBean.setId(callEntity.getId()); callDetailsResponseBean.setName(callEntity.getName()); - callDetailsResponseBean.setDates(List.of(callEntity.getStartDate(), callEntity.getEndDate())); + List dates = new ArrayList<>(); + dates.add(callEntity.getStartDate()); + dates.add(callEntity.getEndDate()); + callDetailsResponseBean.setDates(dates); callDetailsResponseBean.setDescriptionShort(callEntity.getDescriptionShort()); callDetailsResponseBean.setDescriptionLong(callEntity.getDescriptionLong()); callDetailsResponseBean.setStatus(CallStatusEnum.valueOf(callEntity.getStatus())); @@ -619,7 +623,7 @@ public class CallDao { callDetailsResponseBean.setContactInfo(callEntity.getContactInfo()); callDetailsResponseBean.setSubmissionMethod(callEntity.getSubmissionMethod()); callDetailsResponseBean.setThreshold(callEntity.getThreshold()); - callDetailsResponseBean.setDocumentationReqested(callEntity.getDocumentationRequested()); + callDetailsResponseBean.setDocumentationRequested(callEntity.getDocumentationRequested()); callDetailsResponseBean.setPriorityArea(callEntity.getPriorityArea()); callDetailsResponseBean.setCreatedDate(callEntity.getCreatedDate()); callDetailsResponseBean.setUpdatedDate(callEntity.getUpdatedDate()); diff --git a/src/main/java/net/gepafin/tendermanagement/model/response/CallDetailsResponseBean.java b/src/main/java/net/gepafin/tendermanagement/model/response/CallDetailsResponseBean.java index 0e19dd69..a7bf60b7 100644 --- a/src/main/java/net/gepafin/tendermanagement/model/response/CallDetailsResponseBean.java +++ b/src/main/java/net/gepafin/tendermanagement/model/response/CallDetailsResponseBean.java @@ -35,23 +35,10 @@ public class CallDetailsResponseBean { private String priorityArea; - private String documentationReqested; + private String documentationRequested; private LocalDateTime createdDate; private LocalDateTime updatedDate; - private List aimedTo; - - private List criteria; - - private List docs; - - private List faq; - - private List images; - - private List checkList; - - private String currentStep; } diff --git a/src/main/java/net/gepafin/tendermanagement/model/response/CallResponse.java b/src/main/java/net/gepafin/tendermanagement/model/response/CallResponse.java index 2557327e..f8fa4908 100644 --- a/src/main/java/net/gepafin/tendermanagement/model/response/CallResponse.java +++ b/src/main/java/net/gepafin/tendermanagement/model/response/CallResponse.java @@ -36,7 +36,7 @@ public class CallResponse { private String priorityArea; - private String documentationReqested; + private String documentationRequested; private Boolean confidi; diff --git a/src/main/java/net/gepafin/tendermanagement/service/impl/CallValidatorServiceImpl.java b/src/main/java/net/gepafin/tendermanagement/service/impl/CallValidatorServiceImpl.java index f9225677..0d2f651d 100644 --- a/src/main/java/net/gepafin/tendermanagement/service/impl/CallValidatorServiceImpl.java +++ b/src/main/java/net/gepafin/tendermanagement/service/impl/CallValidatorServiceImpl.java @@ -24,7 +24,7 @@ public class CallValidatorServiceImpl { .notNull(response.getAmount(), "amount") .notNull(response.getAmountMax(), "amountMax") .notNull(response.getThreshold(), "threshold") - .notNull(response.getDocumentationReqested(), "documentationReqested") + .notNull(response.getDocumentationRequested(), "documentationRequested") .notEmpty(response.getAimedTo(), "aimedTo") .notEmpty(response.getCriteria(), "criteria") .notEmpty(response.getDocs(), "docs")