From b2015a9aa4b15c584f675092ab569e7bc7f35d7e Mon Sep 17 00:00:00 2001 From: etreschenkov Date: Tue, 28 May 2024 10:03:21 +0300 Subject: [PATCH] http://jira.mfd.msk:8088/browse/CLS-684 // http://jira.mfd.msk:8088/browse/CLS-685 --- .../service/TradingClearingRegistryService.java | 5 ++--- .../clearing/gatewayapi/service/TkrService.java | 14 +++++++++----- 2 files changed, 11 insertions(+), 8 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 430c18e95..f33f26148 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 @@ -496,9 +496,8 @@ public class TradingClearingRegistryService extends QueueConsumer implements Ini } public RequestInfoUpdate tradingClearingRegistryCheck(BaseRequest gatewayRequest) { - log.debug("TradingClearingRegistryCheckRequest received"); - TkrAccountsCheckRequest req = gatewayRequest.getRequestPayload(); + log.debug("TradingClearingRegistryCheckRequest received with requestId : {}", req.getRequestId()); for (TkrAccount accountForCheck : req.getAccounts()) { log.debug("Checking TKR with code: {}", accountForCheck.getTkrCode()); TradingClearingRegistry tradingClearingRegistry = tradingClearingRegistryImdg.getSingleObjectByFieldValues( @@ -513,7 +512,7 @@ public class TradingClearingRegistryService extends QueueConsumer implements Ini return null; } - private SendTkrRequest createRequestToGateway(TradingClearingRegistry tradingClearingRegistry){ + private SendTkrRequest createRequestToGateway(TradingClearingRegistry tradingClearingRegistry) { SendTkrRequest sendTkrRequest = new SendTkrRequest(); if (tradingClearingRegistry != null) { log.debug("Found TKR with id: {} and code: {}", tradingClearingRegistry.getId(), tradingClearingRegistry.getCode()); 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 1b6f60a1d..d0d86599c 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 @@ -2,6 +2,7 @@ package ru.spcex.clearing.gatewayapi.service; import java.util.List; import org.springframework.stereotype.Service; +import org.springframework.util.StringUtils; import ru.spcex.clearing.gatewayapi.controller.inbound.request.tkr.request.TkrRequest; import ru.spcex.clearing.gatewayapi.service.adapter.TkrAdapter; import ru.spcex.clearing.platform.messaging.domain.Consts; @@ -21,11 +22,14 @@ public class TkrService { } public void processedTkrRequest(TkrRequest tkrRequest) { - List tkrAccounts = tkrRequest.getInfoAccount().stream() + List tkrAccounts = tkrRequest.getInfoAccount() + .stream().filter(infoAccount -> !StringUtils.hasText(infoAccount.getClientCode())) .map(tkrAdapter::toTkrResponse).toList(); - TkrAccountsCheckRequest tkrAccountsCheckRequest = new TkrAccountsCheckRequest(); - tkrAccountsCheckRequest.setRequestId(tkrRequest.getId()); - tkrAccountsCheckRequest.setAccounts(tkrAccounts); - kafkaSender.sendRequestToQueue(Consts.DESTINATION_TRADING_CLEARING_REGISTRY_CHECK, tkrAccountsCheckRequest); + if (!tkrAccounts.isEmpty()) { + TkrAccountsCheckRequest tkrAccountsCheckRequest = new TkrAccountsCheckRequest(); + tkrAccountsCheckRequest.setRequestId(tkrRequest.getId()); + tkrAccountsCheckRequest.setAccounts(tkrAccounts); + kafkaSender.sendRequestToQueue(Consts.DESTINATION_TRADING_CLEARING_REGISTRY_CHECK, tkrAccountsCheckRequest); + } } }