From c55ca10d03c065714fe1652a046455c6548c86da Mon Sep 17 00:00:00 2001 From: rajesh Date: Mon, 26 Aug 2024 15:09:17 +0530 Subject: [PATCH] updated code --- .../tendermanagement/constants/GepafinConstant.java | 2 ++ .../java/net/gepafin/tendermanagement/dao/CallDao.java | 7 +++++-- .../model/request/CreateCallRequestStep1.java | 7 +------ .../model/request/CreateCallRequestStep2.java | 1 + .../model/response/CreateCallResponseBean.java | 8 +++++--- .../gepafin/tendermanagement/web/rest/api/CallApi.java | 3 ++- 6 files changed, 16 insertions(+), 12 deletions(-) diff --git a/src/main/java/net/gepafin/tendermanagement/constants/GepafinConstant.java b/src/main/java/net/gepafin/tendermanagement/constants/GepafinConstant.java index ab9f75cc..f8239a1d 100644 --- a/src/main/java/net/gepafin/tendermanagement/constants/GepafinConstant.java +++ b/src/main/java/net/gepafin/tendermanagement/constants/GepafinConstant.java @@ -43,6 +43,8 @@ public class GepafinConstant { public static final String EMAIL_ALREADY_EXISTS = "email.already.exists"; public static final String DOCUMENT_ID_NOT_FOUND="document.id.not.found"; public static final String INVALID_DATE_MSG = "call.invalid.date"; + public static final String STEP_1 = "STEP_1"; + public static final String STEP_2 = "STEP_2"; } diff --git a/src/main/java/net/gepafin/tendermanagement/dao/CallDao.java b/src/main/java/net/gepafin/tendermanagement/dao/CallDao.java index 0b99ceb6..c6265391 100644 --- a/src/main/java/net/gepafin/tendermanagement/dao/CallDao.java +++ b/src/main/java/net/gepafin/tendermanagement/dao/CallDao.java @@ -84,6 +84,7 @@ public class CallDao { createCallResponseBean = assembleCreateCallResponseBean(callEntity, Collections.emptyList(), Collections.emptyList(), faqEntities, Collections.emptyList()); createCallResponseBean.setAimedTo(amiedTo); + createCallResponseBean.setCurrentStep(GepafinConstant.STEP_1); return createCallResponseBean; } @@ -100,7 +101,7 @@ public class CallDao { callEntity.setDescriptionLong(createCallRequest.getDescriptionLong()); callEntity.setStartDate(createCallRequest.getStartDate()); callEntity.setEndDate(createCallRequest.getEndDate()); - callEntity.setStatus(String.valueOf(createCallRequest.getStatus())); + callEntity.setStatus(CallTypeEnum.DRAFT.getValue()); callEntity.setAmountMax(createCallRequest.getAmountMax()); callEntity.setAmount(createCallRequest.getAmountMax()); callEntity.setConfidi(false); @@ -349,6 +350,8 @@ public class CallDao { Translator.toLocale(GepafinConstant.NAME_NOT_EMPTY_MSG))); callEntity.setThreshold(createCallRequest.getThreshold()); + callEntity.setStatus(createCallRequest.getStatus().getValue()); + callRepository.save(callEntity); List evaluationCriteriaEntities = convertToEvaluationCriteriaEntities( createCallRequest.getCriteria(), callEntity); List documentEntities = convertToDocumentEntities(createCallRequest.getDocs(), callEntity); @@ -363,8 +366,8 @@ public class CallDao { documentEntities, faqEntities, imageEntities); createCallResponseBean.setAimedTo(amiedTo); createCallResponseBean.setCheckList(checkList); + createCallResponseBean.setCurrentStep(GepafinConstant.STEP_2); return createCallResponseBean; - } } diff --git a/src/main/java/net/gepafin/tendermanagement/model/request/CreateCallRequestStep1.java b/src/main/java/net/gepafin/tendermanagement/model/request/CreateCallRequestStep1.java index e6cbc3e9..0c18cd1e 100644 --- a/src/main/java/net/gepafin/tendermanagement/model/request/CreateCallRequestStep1.java +++ b/src/main/java/net/gepafin/tendermanagement/model/request/CreateCallRequestStep1.java @@ -1,14 +1,12 @@ package net.gepafin.tendermanagement.model.request; -import lombok.Data; -import net.gepafin.tendermanagement.enums.CallTypeEnum; - import java.math.BigDecimal; import java.time.LocalDateTime; import java.util.List; import jakarta.validation.constraints.NotEmpty; import jakarta.validation.constraints.NotNull; +import lombok.Data; @Data public class CreateCallRequestStep1 { @@ -47,7 +45,4 @@ public class CreateCallRequestStep1 { private List faq; - @NotNull - private CallTypeEnum status; - } diff --git a/src/main/java/net/gepafin/tendermanagement/model/request/CreateCallRequestStep2.java b/src/main/java/net/gepafin/tendermanagement/model/request/CreateCallRequestStep2.java index 7908c9ae..d4264977 100644 --- a/src/main/java/net/gepafin/tendermanagement/model/request/CreateCallRequestStep2.java +++ b/src/main/java/net/gepafin/tendermanagement/model/request/CreateCallRequestStep2.java @@ -24,6 +24,7 @@ public class CreateCallRequestStep2 { private List images; + @NotNull private CallTypeEnum status; } diff --git a/src/main/java/net/gepafin/tendermanagement/model/response/CreateCallResponseBean.java b/src/main/java/net/gepafin/tendermanagement/model/response/CreateCallResponseBean.java index 56a42a2a..cfeaa4b1 100644 --- a/src/main/java/net/gepafin/tendermanagement/model/response/CreateCallResponseBean.java +++ b/src/main/java/net/gepafin/tendermanagement/model/response/CreateCallResponseBean.java @@ -1,12 +1,12 @@ package net.gepafin.tendermanagement.model.response; -import lombok.Data; -import net.gepafin.tendermanagement.enums.CallTypeEnum; - import java.math.BigDecimal; import java.time.LocalDateTime; import java.util.List; +import lombok.Data; +import net.gepafin.tendermanagement.enums.CallTypeEnum; + @Data public class CreateCallResponseBean { @@ -53,6 +53,8 @@ public class CreateCallResponseBean { private List images; private List checkList; + + private String currentStep; } diff --git a/src/main/java/net/gepafin/tendermanagement/web/rest/api/CallApi.java b/src/main/java/net/gepafin/tendermanagement/web/rest/api/CallApi.java index 3da8bab6..2bf116e9 100644 --- a/src/main/java/net/gepafin/tendermanagement/web/rest/api/CallApi.java +++ b/src/main/java/net/gepafin/tendermanagement/web/rest/api/CallApi.java @@ -17,6 +17,7 @@ import org.springframework.http.ResponseEntity; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.PutMapping; import org.springframework.web.bind.annotation.RequestBody; @Validated @@ -48,7 +49,7 @@ public interface CallApi { @ApiResponse(responseCode = "400", description = "Bad Request", content = @Content(mediaType = MediaType.APPLICATION_JSON_VALUE, examples = { @ExampleObject(value = ErrorConstants.BADREQUEST_ERROR_EXAMPLE) })) }) - @PostMapping(value = "/step2", produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE) + @PutMapping(value = "/step2", produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE) @PreAuthorize("hasRole('ROLE_SUPER_ADMIN')") public ResponseEntity> createCallStep2(HttpServletRequest request, @Parameter(description = "Call request object", required = true)