From 4b25a6d1e961d01ad47e4c2c92b43dd7a087be06 Mon Sep 17 00:00:00 2001
From: AKurakin <akurakin@mfd.ru>
Date: Sat, 27 May 2023 18:41:08 +0300
Subject: [PATCH 1/2] =?UTF-8?q?account-service=20securities-service=20?=
 =?UTF-8?q?=D0=92=D0=B0=D0=BB=D0=B8=D0=B4=D0=B0=D1=82=D0=BE=D1=80=D1=8B...?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../config/validation/BankAccountValidationConfig.java        | 4 +---
 .../securities/validation/rule/HaveValidCodeByDictionary.java | 2 +-
 2 files changed, 2 insertions(+), 4 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 3c6b00d6e..4b5693806 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
@@ -53,6 +53,7 @@ public class BankAccountValidationConfig {
                             Company.class,
                             AccountError.RequiredFieldEmpty,
                             AccountError.CompanyNotFound,
+                            false,
                             company -> WorkflowStatus.Active.equalsByKey(company.getWorkflowStatus()) ? null : AccountError.CompanyNotActive),
                     FieldRequiredRule.instance("account",
                             BankAccountNewRequest::getAccount,
@@ -83,9 +84,6 @@ public class BankAccountValidationConfig {
                             AccountError.RequiredFieldEmpty),
                     FieldRequiredRule.instance("bankName",
                             BankAccountNewRequest::getBankName,
-                            AccountError.RequiredFieldEmpty),
-                    FieldRequiredRule.instance("destination",
-                            BankAccountNewRequest::getDestination,
                             AccountError.RequiredFieldEmpty)
             );
         };
diff --git a/clearing-parent/securities-service/src/main/java/ru/spcex/clearing/securities/validation/rule/HaveValidCodeByDictionary.java b/clearing-parent/securities-service/src/main/java/ru/spcex/clearing/securities/validation/rule/HaveValidCodeByDictionary.java
index 995367116..62643e3de 100644
--- a/clearing-parent/securities-service/src/main/java/ru/spcex/clearing/securities/validation/rule/HaveValidCodeByDictionary.java
+++ b/clearing-parent/securities-service/src/main/java/ru/spcex/clearing/securities/validation/rule/HaveValidCodeByDictionary.java
@@ -38,7 +38,7 @@ public class HaveValidCodeByDictionary<R> implements IValidationRule<ImdgValidat
             if (required)
                 return of(SecuritiesError.RequiredFieldIsEmpty, errArg);
             else
-                return null;
+                return empty();
         }
         Imdg<SpcexObjectBase> imdgDictionary = context.obtainMap(mapName, SpcexObjectBase.class);
         SpcexObjectBase dictionary = imdgDictionary.getSingleObjectByFieldValues(Map.of(

From ebe8bbb13f377de47a8dcba023235fb8aae12841 Mon Sep 17 00:00:00 2001
From: AKurakin <akurakin@mfd.ru>
Date: Sat, 27 May 2023 19:04:05 +0300
Subject: [PATCH 2/2] =?UTF-8?q?account-service=20=D0=92=D0=B0=D0=BB=D0=B8?=
 =?UTF-8?q?=D0=B4=D0=B0=D1=82=D0=BE=D1=80r=D1=8B...?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../account/config/validation/BankAccountValidationConfig.java | 3 +--
 1 file changed, 1 insertion(+), 2 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 4b5693806..9f153e56d 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
@@ -53,8 +53,7 @@ public class BankAccountValidationConfig {
                             Company.class,
                             AccountError.RequiredFieldEmpty,
                             AccountError.CompanyNotFound,
-                            false,
-                            company -> WorkflowStatus.Active.equalsByKey(company.getWorkflowStatus()) ? null : AccountError.CompanyNotActive),
+                            false),
                     FieldRequiredRule.instance("account",
                             BankAccountNewRequest::getAccount,
                             AccountError.RequiredFieldEmpty,