From c01d1ba0c6f7c8ecf9149eff9675e06f03fdf1b7 Mon Sep 17 00:00:00 2001
From: akulikov <akulikov@mfd.ru>
Date: Tue, 11 Apr 2023 16:31:14 +0300
Subject: [PATCH] remove redundant validation rules

---
 .../BankAccountValidationConfig.java          | 42 +------------------
 1 file changed, 1 insertion(+), 41 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 694ba7b33..6fe593523 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
@@ -88,47 +88,7 @@ public class BankAccountValidationConfig {
                             AccountError.RequiredFieldEmpty),
                     FieldRequiredRule.instance("destination",
                             BankAccountNewRequest::getDestination,
-                            AccountError.RequiredFieldEmpty),
-                    FieldRequiredRule.instance("correspondentAccount",
-                            BankAccountNewRequest::getCorrespondentAccount,
-                            AccountError.RequiredFieldEmpty,
-                            false,
-                            correspondentAccount -> {
-                                String currency = bankAccountNewRequest.getCurrency();
-                                if (CurrencyCode.RUB.getKey().equalsIgnoreCase(currency) && correspondentAccount == null)
-                                    return AccountError.RequiredFieldEmpty;
-                                return null;
-                            }),
-                    FieldRequiredRule.instance("correspondentAccountName",
-                            BankAccountNewRequest::getCorrespondentAccountName,
-                            AccountError.RequiredFieldEmpty,
-                            false,
-                            correspondentAccountName -> {
-                                String currency = bankAccountNewRequest.getCurrency();
-                                if (CurrencyCode.RUB.getKey().equalsIgnoreCase(currency) && correspondentAccountName == null)
-                                    return AccountError.RequiredFieldEmpty;
-                                return null;
-                            }),
-                    FieldRequiredRule.instance("taxpayerIdentificationNumber",
-                            BankAccountNewRequest::getTaxpayerIdentificationNumber,
-                            AccountError.RequiredFieldEmpty,
-                            false,
-                            taxpayerIdentificationNumber -> {
-                                String currency = bankAccountNewRequest.getCurrency();
-                                if (CurrencyCode.RUB.getKey().equalsIgnoreCase(currency) && taxpayerIdentificationNumber == null)
-                                    return AccountError.RequiredFieldEmpty;
-                                return null;
-                            }),
-                    FieldRequiredRule.instance("taxRegistrationReasonCode",
-                            BankAccountNewRequest::getTaxRegistrationReasonCode,
-                            AccountError.RequiredFieldEmpty,
-                            false,
-                            taxRegistrationReasonCode -> {
-                                String currency = bankAccountNewRequest.getCurrency();
-                                if (CurrencyCode.RUB.getKey().equalsIgnoreCase(currency) && taxRegistrationReasonCode == null)
-                                    return AccountError.RequiredFieldEmpty;
-                                return null;
-                            })
+                            AccountError.RequiredFieldEmpty)
             );
         };
     }