From 18b94c71fe8dfec528c1ed7b8d04f28884daeac3 Mon Sep 17 00:00:00 2001
From: AKurakin <akurakin@mfd.ru>
Date: Wed, 10 Jul 2024 16:01:06 +0300
Subject: [PATCH] =?UTF-8?q?account-service=20BankAccount=20SameAccountVali?=
 =?UTF-8?q?dationRule=20=D0=BF=D0=BE=D0=BB=D0=B5=20account=20=D0=BD=D0=B5?=
 =?UTF-8?q?=20=D0=BE=D0=B1=D1=8F=D0=B7=D0=B0=D1=82=D0=B5=D0=BB=D1=8C=D0=BD?=
 =?UTF-8?q?=D0=BE=D0=B5.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../config/validation/BankAccountValidationConfig.java      | 4 ----
 .../config/validation/SameAccountValidationRule.java        | 6 +++++-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/clearing-parent/account-service/src/main/java/ru/spcex/clearing/account/config/validation/BankAccountValidationConfig.java b/clearing-parent/account-service/src/main/java/ru/spcex/clearing/account/config/validation/BankAccountValidationConfig.java
index a708769cd..2fbb58b85 100644
--- a/clearing-parent/account-service/src/main/java/ru/spcex/clearing/account/config/validation/BankAccountValidationConfig.java
+++ b/clearing-parent/account-service/src/main/java/ru/spcex/clearing/account/config/validation/BankAccountValidationConfig.java
@@ -56,10 +56,6 @@ public class BankAccountValidationConfig {
                             AccountError.RequiredFieldEmpty,
                             AccountError.CompanyNotFound,
                             false),
-                    FieldNotBlankRequiredRule.instance("account",
-                            BankAccountNewRequest::getAccount,
-                            AccountError.RequiredFieldEmpty
-                    ),
                     new SameAccountValidationRule<>(AccountType.Bank, BankAccountNewRequest::getAccount),
                     DictionaryPresentRule.instance("currency",
                             BankAccountNewRequest::getCurrency,
diff --git a/clearing-parent/account-service/src/main/java/ru/spcex/clearing/account/config/validation/SameAccountValidationRule.java b/clearing-parent/account-service/src/main/java/ru/spcex/clearing/account/config/validation/SameAccountValidationRule.java
index fed529fdf..8404d09bb 100644
--- a/clearing-parent/account-service/src/main/java/ru/spcex/clearing/account/config/validation/SameAccountValidationRule.java
+++ b/clearing-parent/account-service/src/main/java/ru/spcex/clearing/account/config/validation/SameAccountValidationRule.java
@@ -31,8 +31,12 @@ class SameAccountValidationRule<R> implements IValidationRule<ImdgValidationCont
         R req = context.getValidatedObject();
         Imdg<Account> accountImdg = context.obtainMap(IMDGDistributedNames.Map_Account, Account.class);
         ImdgPredicateBuilder pb = accountImdg.predicateBuilder();
+        String account = accountGetter.apply(req); // req.getAccount()
+        if (account == null) {
+            return empty();
+        }
         ImdgPredicate query = pb.and(
-                pb.equals("account", accountGetter.apply(req)), // req.getAccount()
+                pb.equals("account", account),
 //                pb.equals("accountType", accountType), имена всех счетов уникальны, вне зависимости от типа
                 pb.in("status", ServiceStatus.Active.getKey(), ServiceStatus.Reopened.getKey(), ServiceStatus.Appl.getKey())
         );