micord/ervu-eks
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

mattmat 2

Browse source
This commit is contained in:
ivanov.denis 2025-03-14 14:55:47 +03:00
parent e8a2a3a19d
commit 01013ad521
1 changed files with 11 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

18
config-data-executor/src/main/java/org/micord/service/ValidationService.java
View file

@ -146,8 +146,8 @@ public class ValidationService {
} }
private <R extends BaseRequest, T extends RequestParameters> Map<String, Boolean> getRulesForEmptyDates(R request, T parameters) { private static <R extends BaseRequest, T extends RequestParameters> Map<String, Boolean> getRulesForEmptyDates(R request, T parameters) {
Boolean emptyDatesAllowed = validateEmptyDates(request, parameters); Boolean emptyDatesAllowed = isEmptyDatesAllowed(request, parameters);
if (!emptyDatesAllowed && parameters.getStartDate() != null && parameters.getEndDate() != null) { if (!emptyDatesAllowed && parameters.getStartDate() != null && parameters.getEndDate() != null) {
if (parameters.getStartDate().isAfter(parameters.getEndDate())) { if (parameters.getStartDate().isAfter(parameters.getEndDate())) {
@ -158,17 +158,21 @@ public class ValidationService {
return Map.of(ValidationService.IS_EMPTY_DATES_ALLOWED, emptyDatesAllowed); return Map.of(ValidationService.IS_EMPTY_DATES_ALLOWED, emptyDatesAllowed);
} }
private static <T extends RequestParameters> Boolean validateEmptyDates(BaseRequest request, T parameters) { private static <T extends RequestParameters> Boolean isEmptyDatesAllowed(BaseRequest request, T parameters) {
if (request.getRequestValidationRules() == null) {
return Boolean.FALSE; Boolean emptyDatesAllowed = request.getRequestValidationRules() == null
} ? Boolean.FALSE
Boolean emptyDatesAllowed = request.getRequestValidationRules().getIsEmptyDatesAllowed(); : request.getRequestValidationRules().getIsEmptyDatesAllowed();
LocalDate startDate = parameters.getStartDate(); LocalDate startDate = parameters.getStartDate();
LocalDate endDate = parameters.getEndDate(); LocalDate endDate = parameters.getEndDate();
if (Boolean.FALSE.equals(emptyDatesAllowed) && (startDate == null || endDate == null)) { if (Boolean.FALSE.equals(emptyDatesAllowed) && (startDate == null || endDate == null)) {
throw new IllegalRequestParametersException("eks.error.date.empty"); throw new IllegalRequestParametersException("eks.error.date.empty");
} }
return emptyDatesAllowed; return emptyDatesAllowed;
} }
public <T> Map<String, String> validateByValidationConfig(List<String> ids, T c) throws ValidationException, FileNotFoundException, SQLException { public <T> Map<String, String> validateByValidationConfig(List<String> ids, T c) throws ValidationException, FileNotFoundException, SQLException {