From e0eebea89056b807cc071777de78ce7087db75a1 Mon Sep 17 00:00:00 2001
From: etreschenkov <ETreschenkov@mfd.ru>
Date: Tue, 28 May 2024 11:56:45 +0300
Subject: [PATCH] http://jira.mfd.msk:8088/browse/CLS-684 //
 http://jira.mfd.msk:8088/browse/CLS-685

---
 .../TradingClearingRegistryService.java       | 24 +++++++++++--------
 .../service/adapter/TkrAdapter.java           |  8 ++++---
 .../messaging/domain/cud/gateway/Tkr.java     | 16 ++++++-------
 3 files changed, 27 insertions(+), 21 deletions(-)

diff --git a/clearing-parent/account-service/src/main/java/ru/spcex/clearing/account/service/TradingClearingRegistryService.java b/clearing-parent/account-service/src/main/java/ru/spcex/clearing/account/service/TradingClearingRegistryService.java
index f33f26148..1c6d47af2 100644
--- a/clearing-parent/account-service/src/main/java/ru/spcex/clearing/account/service/TradingClearingRegistryService.java
+++ b/clearing-parent/account-service/src/main/java/ru/spcex/clearing/account/service/TradingClearingRegistryService.java
@@ -544,18 +544,22 @@ public class TradingClearingRegistryService extends QueueConsumer implements Ini
                 accountType = "Клиентский обособленный";
             }
             tkr.setAccountTypeName(accountType);
-            DepoAccount depoAccount = depoAccountImdg.getSingleObjectByID(tradingClearingRegistry.getDepoAccountId());
-            Account account = null;
-            if (depoAccount != null) {
-                account = accountImdg.getSingleObjectByID(depoAccount.getAccountId());
-                tkr.setDepoAccount(account.getAccount());
+            if (tradingClearingRegistry.getDepoAccountId() != null) {
+                DepoAccount depoAccount = depoAccountImdg.getSingleObjectByID(tradingClearingRegistry.getDepoAccountId());
+                Account account = null;
+                if (depoAccount != null) {
+                    account = accountImdg.getSingleObjectByID(depoAccount.getAccountId());
+                    tkr.setDepoAccount(account.getAccount());
+                }
             }
             {
-                Account moneyAccount = accountImdg.getSingleObjectByID(tradingClearingRegistry.getMoneyAccountId());
-                MoneyAccountMsg moneyAccountMsg = new MoneyAccountMsg();
-                moneyAccountMsg.setAccount(moneyAccount.getAccount());
-                moneyAccountMsg.setCurrCode(StringUtils.hasText(moneyAccount.getCurrency()) ? moneyAccount.getCurrency() : "RUB");
-                tkr.getMoneyAccounts().add(moneyAccountMsg);
+                if (tradingClearingRegistry.getMoneyAccountId() != null) {
+                    Account moneyAccount = accountImdg.getSingleObjectByID(tradingClearingRegistry.getMoneyAccountId());
+                    MoneyAccountMsg moneyAccountMsg = new MoneyAccountMsg();
+                    moneyAccountMsg.setAccount(moneyAccount.getAccount());
+                    moneyAccountMsg.setCurrCode(StringUtils.hasText(moneyAccount.getCurrency()) ? moneyAccount.getCurrency() : "RUB");
+                    tkr.getMoneyAccounts().add(moneyAccountMsg);
+                }
             }
             {
                 Collection<TradingClearingRegistryList> tradingClearingRegistries = tradingClearingRegistryListImdg.getCollectionObjectsByFieldValues(
diff --git a/clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/service/adapter/TkrAdapter.java b/clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/service/adapter/TkrAdapter.java
index 50ab20364..36be9d6b6 100644
--- a/clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/service/adapter/TkrAdapter.java
+++ b/clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/service/adapter/TkrAdapter.java
@@ -17,9 +17,11 @@ public class TkrAdapter {
         tkrResponse.setEnabled(infoAccount.getEnabled());
         tkrResponse.setTkrCode(infoAccount.getTkrCode());
         tkrResponse.setDepoAccount(infoAccount.getDepoAccount());
-        List<MoneyAccountMsg> moneyAccountMsgs = infoAccount.getMoneyAccounts().stream()
-            .map(this::toMoneyAccountMsg).toList();
-        tkrResponse.setMoneyAccounts(moneyAccountMsgs);
+        if (infoAccount.getMoneyAccounts() != null) {
+            List<MoneyAccountMsg> moneyAccountMsgs = infoAccount.getMoneyAccounts().stream()
+                .map(this::toMoneyAccountMsg).toList();
+            tkrResponse.setMoneyAccounts(moneyAccountMsgs);
+        }
         return tkrResponse;
     }
 
diff --git a/platform-parent/platform-messaging/src/main/java/ru/spcex/clearing/platform/messaging/domain/cud/gateway/Tkr.java b/platform-parent/platform-messaging/src/main/java/ru/spcex/clearing/platform/messaging/domain/cud/gateway/Tkr.java
index fe265253c..da61b4823 100644
--- a/platform-parent/platform-messaging/src/main/java/ru/spcex/clearing/platform/messaging/domain/cud/gateway/Tkr.java
+++ b/platform-parent/platform-messaging/src/main/java/ru/spcex/clearing/platform/messaging/domain/cud/gateway/Tkr.java
@@ -5,21 +5,21 @@ import java.util.List;
 import com.fasterxml.jackson.annotation.JsonProperty;
 
 public class Tkr {
-    @JsonProperty
+    @JsonProperty("company_id")
     private String companyId;
-    @JsonProperty
+    @JsonProperty("trading_code")
     private Long tradingCode;
-    @JsonProperty
+    @JsonProperty("client_code")
     private String clientCode;
-    @JsonProperty
+    @JsonProperty("tkr_code")
     private String tkrCode;
-    @JsonProperty
+    @JsonProperty("tkr_type")
     private String tkrType;
-    @JsonProperty
+    @JsonProperty("account_type_name")
     private String accountTypeName;
-    @JsonProperty
+    @JsonProperty("depo_account")
     private String depoAccount;
-    @JsonProperty
+    @JsonProperty("money_account")
     private List<MoneyAccountMsg> moneyAccounts = new ArrayList<>();
 
     public String getCompanyId() {