From edb00e4608db6b21568f9aeabbd98020006689c5 Mon Sep 17 00:00:00 2001
From: ialbert <ialbert@mfd.ru>
Date: Fri, 4 Aug 2023 16:26:07 +0300
Subject: [PATCH] =?UTF-8?q?SDF01=20=D0=BF=D1=80=D0=BE=D0=B2=D0=B5=D1=80?=
 =?UTF-8?q?=D0=BA=D0=B0=20curr=5Fcode=20RUR/RUB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/ru/spcex/clearing/config/ValidationConfig.java | 2 +-
 .../clearing/service/validation/Sdf01NewValidationRule.java  | 5 +++--
 .../java/ru/spcex/platform/utils/enumeration/IEnumKey.java   | 2 +-
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/config/ValidationConfig.java b/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/config/ValidationConfig.java
index c46b1de32..27b840287 100644
--- a/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/config/ValidationConfig.java
+++ b/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/config/ValidationConfig.java
@@ -202,7 +202,7 @@ public class ValidationConfig {
                     Sdf01NewValidationRule.CompanyPresent,
                     Sdf01NewValidationRule.AccountType,
                     Sdf01NewValidationRule.AccountPresent,
-                    Sdf01NewValidationRule.CurrencyCode,
+                    Sdf01NewValidationRule.CurrencyCodeCheck,
                     Sdf01NewValidationRule.DatIsCurrentDt
             );
         };
diff --git a/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/service/validation/Sdf01NewValidationRule.java b/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/service/validation/Sdf01NewValidationRule.java
index 37022f69b..342dc084a 100644
--- a/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/service/validation/Sdf01NewValidationRule.java
+++ b/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/service/validation/Sdf01NewValidationRule.java
@@ -7,6 +7,7 @@ import ru.spcex.clearing.error.ClearingError;
 import ru.spcex.clearing.error.ClearingErrorInternal;
 import ru.spcex.clearing.imdg.IMDGDistributedNames;
 import ru.spcex.platform.enumeration.AccType;
+import ru.spcex.platform.enumeration.CurrencyCode;
 import ru.spcex.platform.imdg.api.Imdg;
 import ru.spcex.platform.imdg.validation.ImdgValidationContext;
 import ru.spcex.platform.utils.enumeration.EnumMessage;
@@ -59,11 +60,11 @@ public enum Sdf01NewValidationRule implements IValidationRule<ImdgValidationCont
             context.storeObject(ValidationStored.Sdf01Account, acc);
             return empty();
         }
-    }, CurrencyCode() {
+    }, CurrencyCodeCheck() {
         @Override
         public Optional<EnumMessage> validate(ImdgValidationContext<SDf01> context) {
             SDf01 sdf01 = context.getValidatedObject();
-            if (!ru.spcex.platform.enumeration.CurrencyCode.RUR.equalsByKey(sdf01.getCurr_code())) {
+            if (!IEnumKey.contains(sdf01.getCurr_code(), CurrencyCode.class)) {
                 return of(ClearingError.CurrencyNotFound, sdf01.getCurr_code());
             }
             return empty();
diff --git a/platform-parent/platform-utils/src/main/java/ru/spcex/platform/utils/enumeration/IEnumKey.java b/platform-parent/platform-utils/src/main/java/ru/spcex/platform/utils/enumeration/IEnumKey.java
index 7bf725710..981f8694f 100644
--- a/platform-parent/platform-utils/src/main/java/ru/spcex/platform/utils/enumeration/IEnumKey.java
+++ b/platform-parent/platform-utils/src/main/java/ru/spcex/platform/utils/enumeration/IEnumKey.java
@@ -34,7 +34,7 @@ public interface IEnumKey extends Serializable {
      * Проверяет что среди всех Enum данного класса, присутствует элемент с данным id
      * id может быть null
      */
-    static <T extends Enum<T> & IEnumKey> boolean contains(Class<T> enumClass, String key) {
+    static <T extends Enum<T> & IEnumKey> boolean contains(String key, Class<T> enumClass) {
         for (T e : enumClass.getEnumConstants()) {
             if (Objects.equals(key, e.getKey()))
                 return true;