From 75db09eb1210c17cb5ad465550351642866a2d31 Mon Sep 17 00:00:00 2001 From: rajesh Date: Wed, 28 Aug 2024 17:44:20 +0530 Subject: [PATCH] remove null checks for call and put some other validation --- .../constants/GepafinConstant.java | 1 + .../gepafin/tendermanagement/dao/CallDao.java | 114 ++++++++++++------ .../gepafin/tendermanagement/dao/FaqDao.java | 11 +- .../tendermanagement/entities/CallEntity.java | 16 +-- .../enums/CallStatusEnum.java | 2 +- .../model/request/CreateCallRequestStep1.java | 17 +-- .../model/request/CreateCallRequestStep2.java | 3 - .../model/request/UpdateCallRequestStep1.java | 31 ++--- .../model/response/CallResponse.java | 4 +- .../impl/CallValidatorServiceImpl.java | 17 ++- .../web/rest/api/CallApi.java | 4 +- .../web/rest/api/impl/CallApiController.java | 2 - .../db/changelog/db.changelog-1.0.0.xml | 11 ++ src/main/resources/message_en.properties | 3 + src/main/resources/message_it.properties | 2 + 15 files changed, 134 insertions(+), 104 deletions(-) diff --git a/src/main/java/net/gepafin/tendermanagement/constants/GepafinConstant.java b/src/main/java/net/gepafin/tendermanagement/constants/GepafinConstant.java index 144f8f65..ce95453b 100644 --- a/src/main/java/net/gepafin/tendermanagement/constants/GepafinConstant.java +++ b/src/main/java/net/gepafin/tendermanagement/constants/GepafinConstant.java @@ -83,5 +83,6 @@ public class GepafinConstant { public static final String INVALID_STATUS_CHANGE_FROM_DRAFT = "invalid.status.change.from.draft"; public static final String STATUS_CANNOT_BE_CHANGED = "status.cannot.be.changed"; public static final String INVALID_STATUS_TRANSITION = "invalid.status.transition"; + public static final String PUBLISHED_CALL_NOT_UPDATE = "published.call.not.update"; } diff --git a/src/main/java/net/gepafin/tendermanagement/dao/CallDao.java b/src/main/java/net/gepafin/tendermanagement/dao/CallDao.java index 65dae9ef..cc5b00ed 100644 --- a/src/main/java/net/gepafin/tendermanagement/dao/CallDao.java +++ b/src/main/java/net/gepafin/tendermanagement/dao/CallDao.java @@ -1,6 +1,5 @@ package net.gepafin.tendermanagement.dao; -import java.math.BigDecimal; import java.time.LocalDate; import java.time.LocalDateTime; import java.util.ArrayList; @@ -8,7 +7,6 @@ import java.util.List; import java.util.Objects; import java.util.stream.Collectors; -import net.gepafin.tendermanagement.enums.UserStatusEnum; import net.gepafin.tendermanagement.model.response.*; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; @@ -78,8 +76,10 @@ public class CallDao { private UserService userService; public CallResponse createCallStep1(CreateCallRequestStep1 createCallRequest, Long userId) { + UserEntity userEntity = userService.validateUser(userId); + createCallRequest.setRegionId(userEntity.getRoleEntity().getRegion().getId()); CallEntity callEntity = convertToCallEntity(createCallRequest); - convertToFaqEntities(createCallRequest.getFaq(), callEntity, userId); + convertToFaqEntities(createCallRequest.getFaq(), callEntity, userEntity); convertLookUpDataEntities(createCallRequest.getAimedTo(), callEntity, LookUpDataTypeEnum.AIMED_TO); // createCallResponseBean = assembleCreateCallResponseBean(callEntity, Collections.emptyList(), @@ -94,7 +94,7 @@ public class CallDao { public CallEntity convertToCallEntity(CreateCallRequestStep1 createCallRequest) { CallEntity callEntity = new CallEntity(); - validateCallEntity(createCallRequest); +// validateCallEntity(createCallRequest); RegionEntity region = regionRepository.findById(createCallRequest.getRegionId()) .orElseThrow(() -> new ResourceNotFoundException(Status.VALIDATION_ERROR, Translator.toLocale(GepafinConstant.REGION_NOT_FOUND))); @@ -102,8 +102,13 @@ public class CallDao { callEntity.setName(createCallRequest.getName()); callEntity.setDescriptionShort(createCallRequest.getDescriptionShort()); callEntity.setDescriptionLong(createCallRequest.getDescriptionLong()); - callEntity.setStartDate(createCallRequest.getStartDate()); - callEntity.setEndDate(createCallRequest.getEndDate()); + List dates = createCallRequest.getDates(); + if(dates!=null) { + if(dates.size()>1) { + callEntity.setStartDate(dates.get(0)); + callEntity.setEndDate(dates.get(1)); + } + } callEntity.setStatus(CallStatusEnum.DRAFT.getValue()); callEntity.setAmountMax(createCallRequest.getAmountMax()); callEntity.setAmount(createCallRequest.getAmountMax()); @@ -194,20 +199,19 @@ public class CallDao { return documentEntity; } - public List convertToFaqEntities(List faqReqList, CallEntity callEntity, Long userId) { + public List convertToFaqEntities(List faqReqList, CallEntity callEntity, UserEntity userEntity) { if (faqReqList == null) { return null; } - List faqEntities = faqReqList.stream().map(req -> convertToFaqEntity(req, callEntity, userId)) + List faqEntities = faqReqList.stream().map(req -> convertToFaqEntity(req, callEntity, userEntity)) .collect(Collectors.toList()); faqRepository.saveAll(faqEntities); return faqEntities; } - public FaqEntity convertToFaqEntity(FaqReq faqReq, CallEntity callEntity, Long userId) { + public FaqEntity convertToFaqEntity(FaqReq faqReq, CallEntity callEntity, UserEntity userEntity) { FaqEntity faqEntity = new FaqEntity(); validateFaqEntity(faqReq.getQuestion()); - UserEntity userEntity = userService.validateUser(userId); faqEntity.setUser(userEntity); faqEntity.setIsVisible(true); if (faqReq.getIsVisible() != null) { @@ -246,32 +250,38 @@ public class CallDao { } } - public void validateCallEntity(CreateCallRequestStep1 createCallRequest) { - if (createCallRequest.getRegionId() == null) { - throw new CustomValidationException(Status.VALIDATION_ERROR, - Translator.toLocale(GepafinConstant.REGION_NOT_FOUND_MSG)); - } - - if (createCallRequest.getAmount().compareTo(BigDecimal.ZERO) <= 0 - || createCallRequest.getAmountMax().compareTo(BigDecimal.ZERO) <= 0) { - throw new CustomValidationException(Status.VALIDATION_ERROR, - Translator.toLocale(GepafinConstant.AMOUNT_GREATER_THAN_ZERO_MSG)); - } - if (createCallRequest.getStartDate().toLocalDate().isBefore(LocalDate.now()) - || createCallRequest.getEndDate().toLocalDate().isBefore(LocalDate.now()) || createCallRequest - .getStartDate().toLocalDate().isAfter(createCallRequest.getEndDate().toLocalDate())) { - throw new CustomValidationException(Status.VALIDATION_ERROR, - Translator.toLocale(GepafinConstant.INVALID_DATE_MSG)); - } - - } +// public void validateCallEntity(CreateCallRequestStep1 createCallRequest) { +// if (createCallRequest.getRegionId() == null) { +// throw new CustomValidationException(Status.VALIDATION_ERROR, +// Translator.toLocale(GepafinConstant.REGION_NOT_FOUND_MSG)); +// } +// +// if (createCallRequest.getAmount().compareTo(BigDecimal.ZERO) <= 0 +// || createCallRequest.getAmountMax().compareTo(BigDecimal.ZERO) <= 0) { +// throw new CustomValidationException(Status.VALIDATION_ERROR, +// Translator.toLocale(GepafinConstant.AMOUNT_GREATER_THAN_ZERO_MSG)); +// } +// if (createCallRequest.getStartDate().toLocalDate().isBefore(LocalDate.now()) +// || createCallRequest.getEndDate().toLocalDate().isBefore(LocalDate.now()) || createCallRequest +// .getStartDate().toLocalDate().isAfter(createCallRequest.getEndDate().toLocalDate())) { +// throw new CustomValidationException(Status.VALIDATION_ERROR, +// Translator.toLocale(GepafinConstant.INVALID_DATE_MSG)); +// } +// +// } public CallResponse convertToCallResponseBean(CallEntity callEntity) { CallResponse createCallResponseBean = new CallResponse(); createCallResponseBean.setId(callEntity.getId()); createCallResponseBean.setName(callEntity.getName()); - createCallResponseBean.setStartDate(callEntity.getStartDate()); - createCallResponseBean.setEndDate(callEntity.getEndDate()); + List dates = new ArrayList<>(); + if(callEntity.getStartDate() != null) { + dates.add(callEntity.getStartDate()); + } + if(callEntity.getStartDate() != null) { + dates.add(callEntity.getEndDate()); + } + createCallResponseBean.setDates(dates); createCallResponseBean.setDescriptionShort(callEntity.getDescriptionShort()); createCallResponseBean.setDescriptionLong(callEntity.getDescriptionLong()); createCallResponseBean.setStatus(CallStatusEnum.valueOf(callEntity.getStatus())); @@ -353,6 +363,9 @@ public class CallDao { public List convertLookUpDataEntities(List lookUpData, CallEntity callEntity, LookUpDataEntity.LookUpDataTypeEnum type) { + if(lookUpData == null) { + return null; + } List lookUpDataEntities = lookUpData.stream() .map(req -> convertLookUpDataRequestIntoLookUpDataEntity(req, type)).collect(Collectors.toList()); @@ -418,7 +431,7 @@ public class CallDao { CallEntity callEntity = callRepository.findById(callId) .orElseThrow(() -> new CustomValidationException(Status.VALIDATION_ERROR, Translator.toLocale(GepafinConstant.CALL_NOT_FOUND))); - + validateUpdate(callEntity); setIfUpdated(callEntity::getThreshold, callEntity::setThreshold, createCallRequest.getThreshold()); callRepository.save(callEntity); convertToEvaluationCriteriaEntities(createCallRequest.getCriteria(), callEntity, LookUpDataTypeEnum.EVALUATION_CRITERIA); @@ -442,11 +455,24 @@ public class CallDao { return createCallResponseBean; } + private void validateUpdate(CallEntity callEntity) { + if(callEntity.getStatus().equals(CallStatusEnum.PUBLISH.getValue())) { + throw new CustomValidationException(Status.VALIDATION_ERROR, + Translator.toLocale(GepafinConstant.PUBLISHED_CALL_NOT_UPDATE)); + } + } + public void isValidDateRange(UpdateCallRequestStep1 updateCallRequest, CallEntity callEntity) { - LocalDate startDate = updateCallRequest.getStartDate() != null ? updateCallRequest.getStartDate().toLocalDate() - : null; - LocalDate endDate = updateCallRequest.getEndDate() != null ? updateCallRequest.getEndDate().toLocalDate() - : null; + List dates = updateCallRequest.getDates(); + + LocalDate startDate = (dates != null && dates.size() > 0 && dates.get(0) != null) + ? dates.get(0).toLocalDate() + : null; + + LocalDate endDate = (dates != null && dates.size() > 1 && dates.get(1) != null) + ? dates.get(1).toLocalDate() + : null; + Boolean isValid = true; if (startDate != null && endDate != null && startDate.isAfter(endDate)) { isValid = false; @@ -473,8 +499,18 @@ public class CallDao { updateCallRequest.getDescriptionShort()); setIfUpdated(callEntity::getDescriptionLong, callEntity::setDescriptionLong, updateCallRequest.getDescriptionLong()); - setIfUpdated(callEntity::getStartDate, callEntity::setStartDate, updateCallRequest.getStartDate()); - setIfUpdated(callEntity::getEndDate, callEntity::setEndDate, updateCallRequest.getEndDate()); + List dates=updateCallRequest.getDates(); + + if (dates != null && dates.size()>1) { + if (dates.size() > 0) { + setIfUpdated(callEntity::getStartDate, callEntity::setStartDate, dates.get(0)); + } + if (dates.size() > 1) { + setIfUpdated(callEntity::getEndDate, callEntity::setEndDate, dates.get(1)); + } + } +// setIfUpdated(callEntity::getStartDate, callEntity::setStartDate, updateCallRequest.getStartDate()); +// setIfUpdated(callEntity::getEndDate, callEntity::setEndDate, updateCallRequest.getEndDate()); setIfUpdated(callEntity::getAmount, callEntity::setAmount, updateCallRequest.getAmount()); setIfUpdated(callEntity::getAmountMax, callEntity::setAmountMax, updateCallRequest.getAmountMax()); setIfUpdated(callEntity::getDocumentationRequested, callEntity::setDocumentationRequested, @@ -657,7 +693,7 @@ public class CallDao { } break; case PUBLISH: - case EXPIRE: + case EXPIRED: throw new CustomValidationException(Status.VALIDATION_ERROR, Translator.toLocale(GepafinConstant.STATUS_CANNOT_BE_CHANGED)); default: diff --git a/src/main/java/net/gepafin/tendermanagement/dao/FaqDao.java b/src/main/java/net/gepafin/tendermanagement/dao/FaqDao.java index c7ad05a2..8d38dfa4 100644 --- a/src/main/java/net/gepafin/tendermanagement/dao/FaqDao.java +++ b/src/main/java/net/gepafin/tendermanagement/dao/FaqDao.java @@ -9,7 +9,7 @@ import net.gepafin.tendermanagement.model.request.FaqReq; import net.gepafin.tendermanagement.model.response.FaqResponseBean; import net.gepafin.tendermanagement.repositories.CallRepository; import net.gepafin.tendermanagement.repositories.FaqRepository; -import net.gepafin.tendermanagement.repositories.UserRepository; +import net.gepafin.tendermanagement.service.UserService; import net.gepafin.tendermanagement.util.DateTimeUtil; import net.gepafin.tendermanagement.web.rest.api.errors.ResourceNotFoundException; import net.gepafin.tendermanagement.web.rest.api.errors.Status; @@ -25,7 +25,7 @@ public class FaqDao { private FaqRepository faqRepository; @Autowired - private UserRepository userRepository; + private UserService userService; @Autowired private CallDao callDao; @@ -38,7 +38,8 @@ public class FaqDao { CallEntity callEntity = callRepository.findById(callId) .orElseThrow(() -> new ResourceNotFoundException(Status.NOT_FOUND, Translator.toLocale(GepafinConstant.CALL_NOT_FOUND))); - entity = callDao.convertToFaqEntity(faqRequest, callEntity, userId); + UserEntity userEntity = userService.validateUser(userId); + entity = callDao.convertToFaqEntity(faqRequest, callEntity, userEntity); faqRepository.save(entity); return convertFaqEntityToResponseBean(entity); } @@ -81,9 +82,7 @@ public class FaqDao { private void updateFaqEntity(FaqEntity faqEntity, FaqReq faqReq, Long userId, CallEntity callEntity) { faqEntity.setQuestion(faqReq.getQuestion()); - UserEntity userEntity = userRepository.findById(userId) - .orElseThrow(() -> new ResourceNotFoundException(Status.VALIDATION_ERROR, - Translator.toLocale(GepafinConstant.LOOK_UP_DATA_NOT_VALID_MSG))); + UserEntity userEntity = userService.validateUser(userId); faqEntity.setUser(userEntity); faqEntity.setIsVisible(true); if (faqReq.getIsVisible() != null) { diff --git a/src/main/java/net/gepafin/tendermanagement/entities/CallEntity.java b/src/main/java/net/gepafin/tendermanagement/entities/CallEntity.java index 81da7209..b83b8dc8 100644 --- a/src/main/java/net/gepafin/tendermanagement/entities/CallEntity.java +++ b/src/main/java/net/gepafin/tendermanagement/entities/CallEntity.java @@ -17,7 +17,7 @@ import java.time.LocalDateTime; @Builder public class CallEntity extends BaseEntity { - @Column(name = "NAME", nullable = false, length = 255) + @Column(name = "NAME", length = 255) private String name; @Column(name = "DESCRIPTION_SHORT", columnDefinition = "TEXT") @@ -26,23 +26,23 @@ public class CallEntity extends BaseEntity { @Column(name = "DESCRIPTION_LONG", columnDefinition = "TEXT") private String descriptionLong; - @Column(name = "START_DATE", nullable = false) + @Column(name = "START_DATE") private LocalDateTime startDate; - @Column(name = "END_DATE", nullable = false) + @Column(name = "END_DATE") private LocalDateTime endDate; - @Column(name = "STATUS", nullable = false, length = 255) + @Column(name = "STATUS", length = 255) private String status; @ManyToOne - @JoinColumn(name = "REGION_ID", nullable = false, foreignKey = @ForeignKey(name = "fk_region_call")) + @JoinColumn(name = "REGION_ID", foreignKey = @ForeignKey(name = "fk_region_call")) private RegionEntity region; - @Column(name = "AMOUNT", nullable = false) + @Column(name = "AMOUNT") private BigDecimal amount; - @Column(name = "AMOUNT_MAX", nullable = false) + @Column(name = "AMOUNT_MAX") private BigDecimal amountMax; @Column(name = "CONTACT_INFO", columnDefinition = "TEXT") @@ -51,7 +51,7 @@ public class CallEntity extends BaseEntity { @Column(name = "SUBMISSION_METHOD", columnDefinition = "TEXT") private String submissionMethod; - @Column(name = "THRESHOLD", nullable = false) + @Column(name = "THRESHOLD") private Long threshold; @Column(name="DOCUMENTATION_REQUESTED",columnDefinition = "TEXT") diff --git a/src/main/java/net/gepafin/tendermanagement/enums/CallStatusEnum.java b/src/main/java/net/gepafin/tendermanagement/enums/CallStatusEnum.java index c31e407f..cf5f49c3 100644 --- a/src/main/java/net/gepafin/tendermanagement/enums/CallStatusEnum.java +++ b/src/main/java/net/gepafin/tendermanagement/enums/CallStatusEnum.java @@ -6,7 +6,7 @@ public enum CallStatusEnum { DRAFT("DRAFT"), PUBLISH("PUBLISH"), - EXPIRE("EXPIRED"), + EXPIRED("EXPIRED"), READY_TO_PUBLISH("READY_TO_PUBLISH"); private String value; 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 97e276a4..bfa0e84d 100644 --- a/src/main/java/net/gepafin/tendermanagement/model/request/CreateCallRequestStep1.java +++ b/src/main/java/net/gepafin/tendermanagement/model/request/CreateCallRequestStep1.java @@ -3,42 +3,27 @@ package net.gepafin.tendermanagement.model.request; 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 { - @NotEmpty private String name; - @NotEmpty private String descriptionShort; - @NotEmpty private String descriptionLong; - @NotNull - private LocalDateTime startDate; + private List dates; - @NotNull - private LocalDateTime endDate; - - @NotNull private Long regionId; - @NotNull private BigDecimal amount; - @NotNull private BigDecimal amountMax; - @NotNull private List aimedTo; - @NotEmpty private String documentationRequested; private Boolean confidi; 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 3e339d3e..6538b672 100644 --- a/src/main/java/net/gepafin/tendermanagement/model/request/CreateCallRequestStep2.java +++ b/src/main/java/net/gepafin/tendermanagement/model/request/CreateCallRequestStep2.java @@ -2,7 +2,6 @@ package net.gepafin.tendermanagement.model.request; import java.util.List; -import jakarta.validation.constraints.NotNull; import lombok.Data; @Data @@ -10,10 +9,8 @@ public class CreateCallRequestStep2 { private Long threshold; - @NotNull private List criteria; - @NotNull private List checkList; private List docs; diff --git a/src/main/java/net/gepafin/tendermanagement/model/request/UpdateCallRequestStep1.java b/src/main/java/net/gepafin/tendermanagement/model/request/UpdateCallRequestStep1.java index cecb7d4c..4d4de6e9 100644 --- a/src/main/java/net/gepafin/tendermanagement/model/request/UpdateCallRequestStep1.java +++ b/src/main/java/net/gepafin/tendermanagement/model/request/UpdateCallRequestStep1.java @@ -9,35 +9,24 @@ import lombok.Data; @Data public class UpdateCallRequestStep1 { - - private String name; + private String name; - - private String descriptionShort; + private String descriptionShort; - - private String descriptionLong; + private String descriptionLong; - - private LocalDateTime startDate; + private List dates; - - private LocalDateTime endDate; + private BigDecimal amount; - - private BigDecimal amount; + private BigDecimal amountMax; - - private BigDecimal amountMax; + private List aimedTo; - - private List aimedTo; + private String documentationRequested; - - private String documentationRequested; + private Boolean confidi; - private Boolean confidi; - - private List faq; + private List faq; } 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 4deaef67..2557327e 100644 --- a/src/main/java/net/gepafin/tendermanagement/model/response/CallResponse.java +++ b/src/main/java/net/gepafin/tendermanagement/model/response/CallResponse.java @@ -18,9 +18,7 @@ public class CallResponse { private String descriptionLong; - private LocalDateTime startDate; - - private LocalDateTime endDate; + private List dates; private CallStatusEnum status; 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 d2079cdf..f9225677 100644 --- a/src/main/java/net/gepafin/tendermanagement/service/impl/CallValidatorServiceImpl.java +++ b/src/main/java/net/gepafin/tendermanagement/service/impl/CallValidatorServiceImpl.java @@ -1,7 +1,13 @@ package net.gepafin.tendermanagement.service.impl; +import java.time.LocalDate; + +import net.gepafin.tendermanagement.config.Translator; +import net.gepafin.tendermanagement.constants.GepafinConstant; import net.gepafin.tendermanagement.model.response.CallResponse; import net.gepafin.tendermanagement.util.FieldValidator; +import net.gepafin.tendermanagement.web.rest.api.errors.CustomValidationException; +import net.gepafin.tendermanagement.web.rest.api.errors.Status; public class CallValidatorServiceImpl { @@ -11,8 +17,8 @@ public class CallValidatorServiceImpl { .notNull(response.getName(), "name") .notNull(response.getDescriptionShort(), "descriptionShort") .notNull(response.getDescriptionLong(), "descriptionLong") - .notNull(response.getStartDate(), "startDate") - .notNull(response.getEndDate(), "endDate") + .notNull(response.getDates().get(0), "startDate") + .notNull(response.getDates().get(1), "endDate") .notNull(response.getStatus(), "status") .notNull(response.getRegionId(), "regionId") .notNull(response.getAmount(), "amount") @@ -26,6 +32,13 @@ public class CallValidatorServiceImpl { .notEmpty(response.getImages(), "images") .notEmpty(response.getCheckList(), "checkList") .validate(); + + if (response.getDates().get(0).toLocalDate().isBefore(LocalDate.now()) + || response.getDates().get(1).toLocalDate().isBefore(LocalDate.now()) || + response.getDates().get(0).toLocalDate().isAfter(response.getDates().get(1).toLocalDate())) { + throw new CustomValidationException(Status.VALIDATION_ERROR, + Translator.toLocale(GepafinConstant.INVALID_DATE_MSG)); + } } } 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 1c604fc7..e32e62cd 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 @@ -3,8 +3,6 @@ package net.gepafin.tendermanagement.web.rest.api; import java.util.List; import net.gepafin.tendermanagement.enums.CallStatusEnum; -import net.gepafin.tendermanagement.enums.UserStatusEnum; -import net.gepafin.tendermanagement.model.response.UserResponseBean; import org.springframework.http.HttpStatus; import org.springframework.http.MediaType; import org.springframework.http.ResponseEntity; @@ -46,7 +44,7 @@ public interface CallApi { @Parameter(description = "Call request object", required = true) @Valid @RequestBody CreateCallRequestStep1 createCallRequest); - @Operation(summary = "Api to create call step 2", + @Operation(summary = "Api to update call step 2", responses = { @ApiResponse(responseCode = "200", description = "OK"), @ApiResponse(responseCode = "404", description = "Not Found", content = @Content(mediaType = MediaType.APPLICATION_JSON_VALUE, examples = { diff --git a/src/main/java/net/gepafin/tendermanagement/web/rest/api/impl/CallApiController.java b/src/main/java/net/gepafin/tendermanagement/web/rest/api/impl/CallApiController.java index 38c42a3e..4131dd84 100644 --- a/src/main/java/net/gepafin/tendermanagement/web/rest/api/impl/CallApiController.java +++ b/src/main/java/net/gepafin/tendermanagement/web/rest/api/impl/CallApiController.java @@ -3,8 +3,6 @@ package net.gepafin.tendermanagement.web.rest.api.impl; import java.util.List; import net.gepafin.tendermanagement.enums.CallStatusEnum; -import net.gepafin.tendermanagement.enums.UserStatusEnum; -import net.gepafin.tendermanagement.model.response.UserResponseBean; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; diff --git a/src/main/resources/db/changelog/db.changelog-1.0.0.xml b/src/main/resources/db/changelog/db.changelog-1.0.0.xml index 857689ad..662534fb 100644 --- a/src/main/resources/db/changelog/db.changelog-1.0.0.xml +++ b/src/main/resources/db/changelog/db.changelog-1.0.0.xml @@ -441,5 +441,16 @@ + + + + + + + + + + + diff --git a/src/main/resources/message_en.properties b/src/main/resources/message_en.properties index d95d85e3..2a18fd0c 100644 --- a/src/main/resources/message_en.properties +++ b/src/main/resources/message_en.properties @@ -55,6 +55,9 @@ status.same.error=Status is already set. invalid.status.change.from.draft=Status cannot be changed to READY_TO_PUBLISH or PUBLISH from DRAFT. status.cannot.be.changed=Status cannot be changed. invalid.status.transition=Invalid status transition. +published.call.not.update=Published call cannot be updated. + + # Login-related messages login.successfully=Login successfully. diff --git a/src/main/resources/message_it.properties b/src/main/resources/message_it.properties index 993d8693..948477f9 100644 --- a/src/main/resources/message_it.properties +++ b/src/main/resources/message_it.properties @@ -55,6 +55,8 @@ status.same.error=Lo stato invalid.status.change.from.draft=Lo stato non puņ essere cambiato in READY_TO_PUBLISH o PUBLISH da DRAFT. status.cannot.be.changed=Lo stato non puņ essere cambiato. invalid.status.transition=Transizione di stato non valida. +published.call.not.update=Il bando pubblicato non puņ essere aggiornato. + # Login-related messages login.successfully=Accesso effettuato con successo.