From 70aa7b974863f80a689f51f679dacd4785d4dc0a Mon Sep 17 00:00:00 2001
From: etreschenkov <ETreschenkov@mfd.ru>
Date: Tue, 25 Jun 2024 14:26:45 +0300
Subject: [PATCH] http://jira.mfd.msk:8088/browse/CLS-690

---
 .../account/validation/GatewayClientCodeValidationRule.java  | 5 ++++-
 .../ru/spcex/clearing/gatewayapi/service/TkrService.java     | 2 +-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/clearing-parent/account-service/src/main/java/ru/spcex/clearing/account/validation/GatewayClientCodeValidationRule.java b/clearing-parent/account-service/src/main/java/ru/spcex/clearing/account/validation/GatewayClientCodeValidationRule.java
index a61c012ef..8add6baf9 100644
--- a/clearing-parent/account-service/src/main/java/ru/spcex/clearing/account/validation/GatewayClientCodeValidationRule.java
+++ b/clearing-parent/account-service/src/main/java/ru/spcex/clearing/account/validation/GatewayClientCodeValidationRule.java
@@ -35,7 +35,7 @@ public enum GatewayClientCodeValidationRule implements IValidationRule<ImdgValid
 
             Imdg<Company> companyImdg = context.obtainMap(IMDGDistributedNames.Map_Company, Company.class);
             Company company = companyImdg.getFirstObjectByFieldValues(
-                Map.of("trading_code", String.valueOf(tradingCode))
+                Map.of("tradingCode", String.valueOf(tradingCode))
             );
             if (company == null) {
                 return of(AccountError.COMPANY_NOT_FOUND_GTW, "trading_code");
@@ -62,6 +62,9 @@ public enum GatewayClientCodeValidationRule implements IValidationRule<ImdgValid
             for (MoneyAccountMsgRequest moneyAccountMsg : accountList) {
                 ImdgPredicateBuilder predicateBuilder = imdg.predicateBuilder();
                 ImdgPredicate currencyPredicate;
+                if (!StringUtils.hasText(moneyAccountMsg.getAccount())){
+                    return of(AccountError.RequiredFieldEmpty, "account");
+                }
                 ImdgPredicate accountPredicate = predicateBuilder.equals("account", moneyAccountMsg.getAccount());
                 if (moneyAccountMsg.getCurrCode().equals(CurrencyCode.RUB.getKey())) {
                     currencyPredicate = predicateBuilder.or(
diff --git a/clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/service/TkrService.java b/clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/service/TkrService.java
index 9425921da..2aad05490 100644
--- a/clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/service/TkrService.java
+++ b/clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/service/TkrService.java
@@ -23,7 +23,7 @@ public class TkrService {
     }
 
     public void processedTkrRequest(TkrRequest tkrRequest) {
-        if (!tkrRequest.getErrors().isEmpty()) {
+        if (tkrRequest.getErrors() != null && !tkrRequest.getErrors().isEmpty()) {
             return;
         }
         List<TkrAccount> tkrAccountsForCheck = tkrRequest.getInfoAccount()