From 960ed3f0c838a2c05ee56974ed63907ae8f7a725 Mon Sep 17 00:00:00 2001
From: AKurakin <akurakin@mfd.ru>
Date: Wed, 30 Aug 2023 16:07:18 +0300
Subject: [PATCH] gateway-api http://jira.mfd.msk:8088/browse/CLS-347 bug fix

---
 .../service/adapter/CompanyRequestAdapter.java       | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/service/adapter/CompanyRequestAdapter.java b/clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/service/adapter/CompanyRequestAdapter.java
index f8a31a3ca..45158d490 100644
--- a/clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/service/adapter/CompanyRequestAdapter.java
+++ b/clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/service/adapter/CompanyRequestAdapter.java
@@ -78,10 +78,6 @@ public class CompanyRequestAdapter {
     }
 
     public ClientCodeNewRequest toClientRequest(Client client) {
-        ClientCodeNewRequest clientCodeNewRequest = new ClientCodeNewRequest();
-        clientCodeNewRequest.setCode(client.getClientCode());
-        clientCodeNewRequest.setMoneyAccountId(client.getMoneyAccountId());
-        clientCodeNewRequest.setDepoAccountId(client.getDepoAccountId());
         if (client.getMoneyAccount() != null) try {
             Account mAccount = accountMap.getSingleObjectByFieldValues(Map.of(
                     // "accountType", AccountType.Clrn.getKey(), or "accountType", AccountType.Info.getKey(),
@@ -90,7 +86,7 @@ public class CompanyRequestAdapter {
             if (mAccount == null) {
                 log.warn("Money account \"{}\" not found", client.getMoneyAccount());
             } else {
-                log.trace("Money account \"{}\" found with id={}", client.getMoneyAccount(), mAccount.getId());
+                log.debug("Money account \"{}\" found with id={}", client.getMoneyAccount(), mAccount.getId());
                 client.setDepoAccountId(mAccount.getId());
             }
         } catch (Exception e) {
@@ -104,12 +100,16 @@ public class CompanyRequestAdapter {
             if (dAccount == null) {
                 log.warn("Depo account \"{}\" not found", client.getDepoAccount());
             } else {
-                log.trace("Depo account \"{}\" found with id={}", client.getDepoAccount(), dAccount.getId());
+                log.debug("Depo account \"{}\" found with id={}", client.getDepoAccount(), dAccount.getId());
                 client.setDepoAccountId(dAccount.getId());
             }
         } catch (Exception e) {
             log.warn("Error happened when search depo account \"{}\": {}", client.getMoneyAccount(), ExceptionUtils.getStackTrace(e));
         }
+        ClientCodeNewRequest clientCodeNewRequest = new ClientCodeNewRequest();
+        clientCodeNewRequest.setCode(client.getClientCode());
+        clientCodeNewRequest.setMoneyAccountId(client.getMoneyAccountId());
+        clientCodeNewRequest.setDepoAccountId(client.getDepoAccountId());
         return clientCodeNewRequest;
     }