From 202feebf0c3a5c991adf2c2dbcaa1656c3627147 Mon Sep 17 00:00:00 2001
From: akulikov <akulikov@mfd.ru>
Date: Thu, 27 Apr 2023 12:37:24 +0300
Subject: [PATCH] equals -> equals by key

---
 .../config/validation/AccountValidationConfig.java        | 7 +++----
 .../config/validation/BankAccountValidationConfig.java    | 8 +++-----
 2 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/clearing-parent/account-service/src/main/java/ru/spcex/clearing/account/config/validation/AccountValidationConfig.java b/clearing-parent/account-service/src/main/java/ru/spcex/clearing/account/config/validation/AccountValidationConfig.java
index 315021ac9..e1f279b10 100644
--- a/clearing-parent/account-service/src/main/java/ru/spcex/clearing/account/config/validation/AccountValidationConfig.java
+++ b/clearing-parent/account-service/src/main/java/ru/spcex/clearing/account/config/validation/AccountValidationConfig.java
@@ -53,7 +53,7 @@ public class AccountValidationConfig {
                             Company.class,
                             AccountError.RequiredFieldEmpty,
                             AccountError.CompanyNotFound,
-                            company -> WorkflowStatus.Active.getKey().equals(company.getWorkflowStatus()) ? null : AccountError.CompanyNotActive),
+                            company -> WorkflowStatus.Active.equalsByKey(company.getWorkflowStatus()) ? null : AccountError.CompanyNotActive),
                     FieldRequiredRule.instance("account",
                             CorrespondentAccountNewRequest::getAccount,
                             AccountError.RequiredFieldEmpty,
@@ -74,8 +74,7 @@ public class AccountValidationConfig {
                             AccountError.RequiredFieldEmpty,
                             false,
                             statusValue -> {
-                                if (statusValue == null || AccountStatus.ACTIVE.getKey().equalsIgnoreCase(statusValue))
-                                    return null;
+                                if (statusValue == null || AccountStatus.ACTIVE.equalsByKey(statusValue)) return null;
                                 return AccountError.WrongFieldValue;
                             }),
                     EnumPresentRule.instance("accountType",
@@ -129,7 +128,7 @@ public class AccountValidationConfig {
                             AccountError.CompanyNotFound,
                             false,
                             company -> {
-                                IErrorEnumId error = WorkflowStatus.Active.getKey().equals(company.getWorkflowStatus()) ? null : AccountError.CompanyNotActive;
+                                IErrorEnumId error = WorkflowStatus.Active.equalsByKey(company.getWorkflowStatus()) ? null : AccountError.CompanyNotActive;
                                 error = Objects.equals(company.getId(), correspondentAccountUpdateRequest.getCompanyId()) ? error : AccountError.WrongFieldValue;
                                 return error;
                             }),
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 a95571cd6..a6f997549 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,7 +53,7 @@ public class BankAccountValidationConfig {
                             Company.class,
                             AccountError.RequiredFieldEmpty,
                             AccountError.CompanyNotFound,
-                            company -> WorkflowStatus.Active.getKey().equals(company.getWorkflowStatus()) ? null : AccountError.CompanyNotActive),
+                            company -> WorkflowStatus.Active.equalsByKey(company.getWorkflowStatus()) ? null : AccountError.CompanyNotActive),
                     FieldRequiredRule.instance("account",
                             BankAccountNewRequest::getAccount,
                             AccountError.RequiredFieldEmpty,
@@ -119,8 +119,7 @@ public class BankAccountValidationConfig {
                                 );
                                 Account account = accountImdg.getSingleObjectByID(accountId);
                                 if (account == null) return AccountError.AccountNotFound;
-                                if (!AccountStatus.ACTIVE.getKey().equalsIgnoreCase(account.getStatus()))
-                                    return AccountError.AccountNotActive;
+                                if (!AccountStatus.ACTIVE.equalsByKey(account.getStatus())) return AccountError.AccountNotActive;
                                 return null;
                             }),
                     EnumPresentRule.instance("currency",
@@ -164,8 +163,7 @@ public class BankAccountValidationConfig {
                                 );
                                 Account account = accountImdg.getSingleObjectByID(accountId);
                                 if (account == null) return AccountError.AccountNotFound;
-                                if (!AccountStatus.ACTIVE.getKey().equalsIgnoreCase(account.getStatus()))
-                                    return AccountError.AccountNotActive;
+                                if (!AccountStatus.ACTIVE.equalsByKey(account.getStatus())) return AccountError.AccountNotActive;
                                 return null;
                             })
             );