From a0d6bc202556fc93698af21932618a93f6a4c730 Mon Sep 17 00:00:00 2001
From: AKurakin <akurakin@mfd.ru>
Date: Mon, 16 Jan 2023 14:51:44 +0300
Subject: [PATCH] =?UTF-8?q?balance-service=20Sdf16ValidationRule=20=D0=B4?=
 =?UTF-8?q?=D0=BE=D0=B1=D0=B0=D0=B2=D0=B8=D0=BB=20=D0=BB=D0=BE=D0=B3=D0=B8?=
 =?UTF-8?q?,=20=D1=82=D0=BA.=20=D0=BF=D0=BE=20bic=20=D0=BD=D0=B5=20=D0=B8?=
 =?UTF-8?q?=D1=89=D0=B5=D1=82,=20=D0=BD=D0=BE=20=D0=BD=D0=B5=20=D0=BF?=
 =?UTF-8?q?=D0=BE=D0=BD=D1=8F=D0=BB=20=D0=BF=D0=BE=D1=87=D0=B5=D0=BC=D1=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../validation/Sdf16ValidationRule.java       |  5 +++
 .../validation/Sdf16ValidationRuleTest.java   | 44 +++++++++++++++++++
 2 files changed, 49 insertions(+)
 create mode 100644 clearing-parent/balance-service/src/test/java/ru/spcex/clearing/balance/validation/Sdf16ValidationRuleTest.java

diff --git a/clearing-parent/balance-service/src/main/java/ru/spcex/clearing/balance/validation/Sdf16ValidationRule.java b/clearing-parent/balance-service/src/main/java/ru/spcex/clearing/balance/validation/Sdf16ValidationRule.java
index ce0616a82..fac3d544b 100644
--- a/clearing-parent/balance-service/src/main/java/ru/spcex/clearing/balance/validation/Sdf16ValidationRule.java
+++ b/clearing-parent/balance-service/src/main/java/ru/spcex/clearing/balance/validation/Sdf16ValidationRule.java
@@ -1,5 +1,7 @@
 package ru.spcex.clearing.balance.validation;
 
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import ru.clearing.classes.statics.data.company.Company;
 import ru.clearing.classes.statics.data.company.CompanySymbols;
 import ru.clearing.classes.statics.data.sdf.SDf16;
@@ -33,11 +35,14 @@ public enum Sdf16ValidationRule implements IValidationRule<ImdgValidationContext
                 sql += String.format("(companySymbolValue = '%s' and  companySymbol = '%s') ",
                         bicStr, CompanySymbol.BIC.getKey());
             }
+            Logger log = LoggerFactory.getLogger(getClass());
+            log.debug("SQL for search company by sdf16: {}", sql);
             if (sql.isEmpty()) {
                 return of(BalanceError.CompanyNotFound, "inn and bic is empty");
             }
             Company company = null;
             CompanySymbols companySymbols = companySymbolsImdg.getSingleObjectBySQL(sql);
+            log.debug("By sdf16 found companySymbol: {}", companySymbols == null ? null : companySymbols.getId());
             if (companySymbols != null) {
                 company = companyImdg.getSingleObjectByID(companySymbols.getCompanyId());
             }
diff --git a/clearing-parent/balance-service/src/test/java/ru/spcex/clearing/balance/validation/Sdf16ValidationRuleTest.java b/clearing-parent/balance-service/src/test/java/ru/spcex/clearing/balance/validation/Sdf16ValidationRuleTest.java
new file mode 100644
index 000000000..bd833cfc1
--- /dev/null
+++ b/clearing-parent/balance-service/src/test/java/ru/spcex/clearing/balance/validation/Sdf16ValidationRuleTest.java
@@ -0,0 +1,44 @@
+package ru.spcex.clearing.balance.validation;
+
+import org.junit.jupiter.api.Test;
+import ru.clearing.classes.statics.data.sdf.SDf16;
+import ru.spcex.clearing.imdg.IMDGDistributedNames;
+import ru.spcex.platform.classes.base.SpcexObjectBase;
+import ru.spcex.platform.imdg.api.Imdg;
+import ru.spcex.platform.imdg.validation.ImdgValidationContext;
+import ru.spcex.platform.utils.enumeration.EnumMessage;
+
+import java.math.BigDecimal;
+import java.util.Optional;
+
+import static org.junit.jupiter.api.Assertions.*;
+
+class Sdf16ValidationRuleTest {
+
+    @Test
+    void values() {
+        ImdgValidationContext<SDf16> ctx = new ImdgValidationContext<>();
+        SDf16 object = new SDf16();
+//        object.setBic(BigDecimal.valueOf(1000004L));
+        object.setInn(BigDecimal.valueOf(1000024L));
+        ctx.setValidatedObject(object);
+        ctx.addImdg(IMDGDistributedNames.Map_CompanySymbols, makeTestMap());
+        ctx.addImdg(IMDGDistributedNames.Map_Company, makeTestMap());
+        Optional<EnumMessage> err = Sdf16ValidationRule.CompanyPresent.validate(ctx);
+        assertTrue(err.isPresent());
+    }
+
+    <T extends SpcexObjectBase> Imdg<T> makeTestMap() {
+        return new Imdg<T>() {
+            @Override
+            public String getMapName() {
+                return Imdg.super.getMapName();
+            }
+
+            @Override
+            public T getSingleObjectBySQL(String sql) {
+                return null;
+            }
+        };
+    }
+}
\ No newline at end of file