From 96dc0d031343208d8ffb40f6cc3199d5fc900462 Mon Sep 17 00:00:00 2001
From: AKurakin <akurakin@mfd.ru>
Date: Tue, 4 Apr 2023 17:23:59 +0300
Subject: [PATCH] =?UTF-8?q?clearing-utils=20=D1=83=D0=BB=D1=83=D1=87=D1=88?=
 =?UTF-8?q?=D0=B8=D0=BB=20=D1=87=D0=B8=D1=82=D0=B0=D0=B5=D0=BC=D0=BE=D1=81?=
 =?UTF-8?q?=D1=82=D1=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 clearing-parent/clearing-utils/pom.xml                       | 5 +++--
 .../validation/common/rules/DictionaryPresentRule.java       | 5 +++++
 .../clearing/validation/common/rules/EnumPresentRule.java    | 5 +++++
 .../clearing/validation/common/rules/FieldRequiredRule.java  | 5 +++++
 .../clearing/validation/common/rules/IdPresentRule.java      | 5 +++++
 5 files changed, 23 insertions(+), 2 deletions(-)

diff --git a/clearing-parent/clearing-utils/pom.xml b/clearing-parent/clearing-utils/pom.xml
index 4b9ecb09b..580382cc7 100644
--- a/clearing-parent/clearing-utils/pom.xml
+++ b/clearing-parent/clearing-utils/pom.xml
@@ -4,8 +4,9 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
 
-    <artifactId>clearing-utils</artifactId>
-    <name>Clearing-module, dependency version of platform-utils</name>
+    <artifactId>clearing-utils</artifactId> <!-- todo refactor - rename to clearing-validation -->
+    <name>clearing-utils</name>
+    <description>Clearing-module, dependency version of platform-utils</description>
     <packaging>jar</packaging>
     <version>SPCEX-1.0.0.0</version>
 
diff --git a/clearing-parent/clearing-utils/src/main/java/ru/spcex/clearing/validation/common/rules/DictionaryPresentRule.java b/clearing-parent/clearing-utils/src/main/java/ru/spcex/clearing/validation/common/rules/DictionaryPresentRule.java
index 8fed6e5ed..ab42f8bc0 100644
--- a/clearing-parent/clearing-utils/src/main/java/ru/spcex/clearing/validation/common/rules/DictionaryPresentRule.java
+++ b/clearing-parent/clearing-utils/src/main/java/ru/spcex/clearing/validation/common/rules/DictionaryPresentRule.java
@@ -99,4 +99,9 @@ public record DictionaryPresentRule<R, D extends AbstractDictionary>(String fiel
         }
         return empty();
     }
+
+    @Override
+    public String ruleName() {
+        return getClass().getSimpleName() + "{" + fieldName + " - " + dictionaryName + "}";
+    }
 }
diff --git a/clearing-parent/clearing-utils/src/main/java/ru/spcex/clearing/validation/common/rules/EnumPresentRule.java b/clearing-parent/clearing-utils/src/main/java/ru/spcex/clearing/validation/common/rules/EnumPresentRule.java
index a819a26e6..13a3494ff 100644
--- a/clearing-parent/clearing-utils/src/main/java/ru/spcex/clearing/validation/common/rules/EnumPresentRule.java
+++ b/clearing-parent/clearing-utils/src/main/java/ru/spcex/clearing/validation/common/rules/EnumPresentRule.java
@@ -69,4 +69,9 @@ public record EnumPresentRule<R, E extends IEnumKey>(String fieldName,
         }
         return of(errorWrongEnumValue, fieldName);
     }
+
+    @Override
+    public String ruleName() {
+        return getClass().getSimpleName() + "{" + fieldName + "}";
+    }
 }
diff --git a/clearing-parent/clearing-utils/src/main/java/ru/spcex/clearing/validation/common/rules/FieldRequiredRule.java b/clearing-parent/clearing-utils/src/main/java/ru/spcex/clearing/validation/common/rules/FieldRequiredRule.java
index 93473976a..2e215648e 100644
--- a/clearing-parent/clearing-utils/src/main/java/ru/spcex/clearing/validation/common/rules/FieldRequiredRule.java
+++ b/clearing-parent/clearing-utils/src/main/java/ru/spcex/clearing/validation/common/rules/FieldRequiredRule.java
@@ -40,4 +40,9 @@ public record FieldRequiredRule<R, V>(
         if (value == null) return of(errorEmptyRequiredValue, fieldName);
         return empty();
     }
+
+    @Override
+    public String ruleName() {
+        return getClass().getSimpleName() + "{" + fieldName + "}";
+    }
 }
diff --git a/clearing-parent/clearing-utils/src/main/java/ru/spcex/clearing/validation/common/rules/IdPresentRule.java b/clearing-parent/clearing-utils/src/main/java/ru/spcex/clearing/validation/common/rules/IdPresentRule.java
index 02db04c3e..5ce3c570f 100644
--- a/clearing-parent/clearing-utils/src/main/java/ru/spcex/clearing/validation/common/rules/IdPresentRule.java
+++ b/clearing-parent/clearing-utils/src/main/java/ru/spcex/clearing/validation/common/rules/IdPresentRule.java
@@ -103,4 +103,9 @@ public record IdPresentRule<R, V extends SpcexObjectBase>(
         }
         return empty();
     }
+
+    @Override
+    public String ruleName() {
+        return getClass().getSimpleName() + "{" + fieldName + "}";
+    }
 }