From 01013ad5219c063c8852fe2e15aefc2f1ec24d7b Mon Sep 17 00:00:00 2001
From: "ivanov.denis" <ivanov.denis@cg.ru>
Date: Fri, 14 Mar 2025 14:55:47 +0300
Subject: [PATCH] mattmat 2

---
 .../org/micord/service/ValidationService.java  | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

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