From 66cf85a688144931cd4db44a0642c3ea16328c9a Mon Sep 17 00:00:00 2001 From: AKurakin Date: Thu, 8 Jun 2023 19:29:56 +0300 Subject: [PATCH] =?UTF-8?q?account-service=20fix=20TCR=20validation;=20cle?= =?UTF-8?q?aring-service=20swt-importer=20=D0=BB=D0=BE=D0=B3=D0=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../TradingClearingRegistryValidationConfig.java | 3 ++- .../clearing/account/service/ClearingAccountService.java | 3 ++- .../java/ru/spcex/clearing/service/StatementService.java | 4 +++- .../importer/logic/stages/SWTImportKafkaMessenger.java | 8 +++++++- 4 files changed, 14 insertions(+), 4 deletions(-) diff --git a/clearing-parent/account-service/src/main/java/ru/spcex/clearing/account/config/validation/TradingClearingRegistryValidationConfig.java b/clearing-parent/account-service/src/main/java/ru/spcex/clearing/account/config/validation/TradingClearingRegistryValidationConfig.java index f936a6925..c98933433 100644 --- a/clearing-parent/account-service/src/main/java/ru/spcex/clearing/account/config/validation/TradingClearingRegistryValidationConfig.java +++ b/clearing-parent/account-service/src/main/java/ru/spcex/clearing/account/config/validation/TradingClearingRegistryValidationConfig.java @@ -62,7 +62,8 @@ public class TradingClearingRegistryValidationConfig { Imdg informationAccountImdg = context.obtainMap( IMDGDistributedNames.Map_InformationAccount, InformationAccount.class ); - InformationAccount infoAccount = informationAccountImdg.getSingleObjectByID(moneyAccountId); + InformationAccount infoAccount = informationAccountImdg.getSingleObjectByFieldValues( + Map.of("accountId",moneyAccountId)); if (infoAccount == null) return AccountError.AccountNotFound; } return null; diff --git a/clearing-parent/account-service/src/main/java/ru/spcex/clearing/account/service/ClearingAccountService.java b/clearing-parent/account-service/src/main/java/ru/spcex/clearing/account/service/ClearingAccountService.java index 9d28ae3f3..de3bd3411 100644 --- a/clearing-parent/account-service/src/main/java/ru/spcex/clearing/account/service/ClearingAccountService.java +++ b/clearing-parent/account-service/src/main/java/ru/spcex/clearing/account/service/ClearingAccountService.java @@ -232,12 +232,13 @@ public class ClearingAccountService extends QueueConsumer implements Initializin clearingAccount.setAccountId(accountId); clearingAccount.setClearingAccountType(accountReq.getAccountType()); clearingAccountId = clearingAccountImdg.insert(clearingAccount); - log.trace("New account {}, clearingAccount {} was created.", accountId, clearingAccountId); + log.debug("New account {}, clearingAccount {} was created.", accountId, clearingAccountId); { TradingClearingRegistryNewRequest request = new TradingClearingRegistryNewRequest(); request.setMoneyAccountId(accountId); request.setCompanyId(clearingAccount.getCompanyId()); +// request.setTradingClearingRegistryType(cl); toTCRRequests.add(request); } { diff --git a/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/service/StatementService.java b/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/service/StatementService.java index 106e78c81..2189b0065 100644 --- a/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/service/StatementService.java +++ b/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/service/StatementService.java @@ -109,7 +109,9 @@ public class StatementService extends QueueConsumer implements InitializingBean } } } - if (!doSomeone) { + if (doSomeone) { + log.debug("For table {} done.", table); + } else { log.warn("No operation for request.id={}; statementRequest GroupId={}, table={}", systemRequest.getId(), statementRequest.getGroupId(), statementRequest.getTable()); } diff --git a/clearing-parent/swt-importer/src/main/java/ru/spcex/clearing/swt/importer/logic/stages/SWTImportKafkaMessenger.java b/clearing-parent/swt-importer/src/main/java/ru/spcex/clearing/swt/importer/logic/stages/SWTImportKafkaMessenger.java index f37ec2930..bc0533656 100644 --- a/clearing-parent/swt-importer/src/main/java/ru/spcex/clearing/swt/importer/logic/stages/SWTImportKafkaMessenger.java +++ b/clearing-parent/swt-importer/src/main/java/ru/spcex/clearing/swt/importer/logic/stages/SWTImportKafkaMessenger.java @@ -1,5 +1,7 @@ package ru.spcex.clearing.swt.importer.logic.stages; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.springframework.beans.factory.InitializingBean; import org.springframework.stereotype.Component; import ru.spcex.clearing.platform.messaging.domain.Consts; @@ -15,6 +17,7 @@ import java.util.function.Supplier; @Component public class SWTImportKafkaMessenger implements InitializingBean { + final Logger log = LoggerFactory.getLogger(getClass()); private final Supplier kafka; private final Map> messengers; @@ -38,6 +41,8 @@ public class SWTImportKafkaMessenger implements InitializingBean { Consumer messenger = messengers.get(table); if (messenger != null) { messenger.accept(groupId); + } else { + log.debug("No message stage for table {}", table); } } @@ -45,7 +50,8 @@ public class SWTImportKafkaMessenger implements InitializingBean { StatementRequest statementRequest = new StatementRequest(); statementRequest.setGroupId(groupId); statementRequest.setTable(table); - kafka.get().sendRequestToQueue(Consts.STATEMENT_PROCESS, statementRequest); + Long rid = kafka.get().sendRequestToQueue(Consts.STATEMENT_PROCESS, statementRequest); + log.debug("Send message id={}; groupId={} to kafka \"{}\"", rid, groupId, Consts.STATEMENT_PROCESS); } }