@@ -2,14 +2,21 @@ package ru.soune.nocopy.entity.tarif;
|
|||||||
|
|
||||||
import lombok.Getter;
|
import lombok.Getter;
|
||||||
|
|
||||||
|
import java.util.List;
|
||||||
|
|
||||||
@Getter
|
@Getter
|
||||||
public enum TariffTimeTerm {
|
public enum TariffTimeTerm {
|
||||||
MONTHLY(30),YEAR(365);
|
MONTHLY(30, "MONTHLY"),YEAR(365, "YEAR");
|
||||||
|
|
||||||
private final Integer days;
|
private final Integer days;
|
||||||
|
private final String name;
|
||||||
|
|
||||||
TariffTimeTerm(Integer days) {
|
TariffTimeTerm(Integer days, String name) {
|
||||||
this.days = days;
|
this.days = days;
|
||||||
|
this.name = name;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public static List<String> validTerms() {
|
||||||
|
return List.of(MONTHLY.name(), YEAR.name());
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -123,6 +123,16 @@ public class TariffHandler implements RequestHandler {
|
|||||||
private BaseResponse handleGetTariffs(BaseRequest request, TariffRequest tariffRequest) {
|
private BaseResponse handleGetTariffs(BaseRequest request, TariffRequest tariffRequest) {
|
||||||
AuthToken authToken = authTokenRepository.findByToken(tariffRequest.getUserToken()).orElseThrow();
|
AuthToken authToken = authTokenRepository.findByToken(tariffRequest.getUserToken()).orElseThrow();
|
||||||
User user = authToken.getUser();
|
User user = authToken.getUser();
|
||||||
|
|
||||||
|
if (tariffRequest.getTariffTerm() == null || !TariffTimeTerm.validTerms().contains(
|
||||||
|
tariffRequest.getTariffTerm())) {
|
||||||
|
return new BaseResponse(
|
||||||
|
request.getMsgId(),
|
||||||
|
MessageCode.SUCCESS.getCode(),
|
||||||
|
"Not valid tariff_term",
|
||||||
|
Map.of("Valid term", TariffTimeTerm.validTerms()));
|
||||||
|
}
|
||||||
|
|
||||||
List<TariffDTO> allTariffs = tariffService.getTariffByAccountTypeAndTariffTerm(user,
|
List<TariffDTO> allTariffs = tariffService.getTariffByAccountTypeAndTariffTerm(user,
|
||||||
TariffTimeTerm.valueOf(tariffRequest.getTariffTerm().toUpperCase()));
|
TariffTimeTerm.valueOf(tariffRequest.getTariffTerm().toUpperCase()));
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user