From 8da958385449d53423c75c7c9dc946621a3fdbb6 Mon Sep 17 00:00:00 2001
From: etreschenkov <etreschenkov@mfd.ru>
Date: Wed, 12 Jul 2023 13:52:11 +0300
Subject: [PATCH] =?UTF-8?q?=D0=BF=D0=BE=D0=BF=D1=80=D0=B0=D0=B2=D0=B8?=
 =?UTF-8?q?=D0=BB=20=D0=B1=D0=B0=D0=B3=20=D0=B2=20gateway?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ru/spcex/clearing/gatewayapi/service/GatewayService.java  | 2 +-
 .../service/adapter/MoneyMarketSecurityRequestAdapter.java    | 1 +
 .../gatewayapi/service/processor/ListingMMProcessor.java      | 4 ++++
 3 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/service/GatewayService.java b/clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/service/GatewayService.java
index a52f33025..c16e49004 100644
--- a/clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/service/GatewayService.java
+++ b/clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/service/GatewayService.java
@@ -58,7 +58,7 @@ public class GatewayService extends QueueConsumer implements InitializingBean {
         super(kafkaQueue, kafkaProducer);
         this.restTemplate = restTemplate;
         this.userRoleVerification = userRoleVerification;
-        this.inboundServerSettings = null;
+        this.inboundServerSettings = gatewayApiSettings.getInboundServer();
         this.sentAssets = sentAssets;
         this.outboundRequestByUuid = outboundRequestByUuid;
     }
diff --git a/clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/service/adapter/MoneyMarketSecurityRequestAdapter.java b/clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/service/adapter/MoneyMarketSecurityRequestAdapter.java
index e7c31701d..1c08dfa1c 100644
--- a/clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/service/adapter/MoneyMarketSecurityRequestAdapter.java
+++ b/clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/service/adapter/MoneyMarketSecurityRequestAdapter.java
@@ -10,6 +10,7 @@ public class MoneyMarketSecurityRequestAdapter {
 
     public MoneyMarketSecurityNewRequest toMoneyMarketSecurityNewRequest(ExchangeInstrument exchangeInstrument) {
         MoneyMarketSecurityNewRequest moneyMarketSecurityNewRequest = new MoneyMarketSecurityNewRequest();
+        moneyMarketSecurityNewRequest.setSecuritySymbol(exchangeInstrument.getCode().substring(0, 6));
         moneyMarketSecurityNewRequest.setNominalCurrency(exchangeInstrument.getSettlementCurrencyLetterCode());
         moneyMarketSecurityNewRequest.setInstrumentType(InstrumentType.RATE.getKey());
         moneyMarketSecurityNewRequest.setShortName(exchangeInstrument.getName());
diff --git a/clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/service/processor/ListingMMProcessor.java b/clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/service/processor/ListingMMProcessor.java
index 46310e0a6..9220e4a4d 100644
--- a/clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/service/processor/ListingMMProcessor.java
+++ b/clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/service/processor/ListingMMProcessor.java
@@ -1,5 +1,6 @@
 package ru.spcex.clearing.gatewayapi.service.processor;
 
+import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Service;
@@ -31,6 +32,9 @@ public class ListingMMProcessor {
         for (ExchangeInstrument exchangeInstrument : exchangeInstrumentList) {
             UUID exchangeInstrumentId = exchangeInstrument.getId();
             log.debug("Process exchangeInstrumentId : {}", exchangeInstrumentId);
+            if (StringUtils.isEmpty(exchangeInstrument.getCode()) || exchangeInstrument.getCode().length() < 6) {
+                log.warn("Incorrect code : {}, skip record", exchangeInstrument.getCode());
+            }
 
             MoneyMarketSecurityNewRequest moneyMarketSecurityNewRequest = moneyMarketSecurityRequestAdapter
                     .toMoneyMarketSecurityNewRequest(exchangeInstrument);