From b6eb7a9d71b96b9ae9472e409e7584f671db35b3 Mon Sep 17 00:00:00 2001 From: AKurakin Date: Thu, 4 May 2023 17:10:55 +0300 Subject: [PATCH] =?UTF-8?q?company-service=20http://jira.mfd.msk:8088/brow?= =?UTF-8?q?se/CLS-272=20=D0=B4=D0=BE=D0=B4=D0=B5=D0=BB=D0=B0=D0=BB=20?= =?UTF-8?q?=D0=BA=D0=BE=D0=BC=D0=BC=D0=B5=D0=BD=D1=82=20=D0=BA=20=D1=82?= =?UTF-8?q?=D0=B0=D1=81=D0=BA=D1=83=2027/=D0=B0=D0=BF=D1=80/23=2016:24?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ClientCodeValidationConfig.java | 20 -------- .../company/service/ClientCodeService.java | 47 +++++++++---------- .../service/ClientCodeServiceTest.java | 4 +- 3 files changed, 24 insertions(+), 47 deletions(-) diff --git a/clearing-parent/company-service/src/main/java/ru/spcex/clearing/company/config/validation/ClientCodeValidationConfig.java b/clearing-parent/company-service/src/main/java/ru/spcex/clearing/company/config/validation/ClientCodeValidationConfig.java index 653c6320d..c3b2776ae 100644 --- a/clearing-parent/company-service/src/main/java/ru/spcex/clearing/company/config/validation/ClientCodeValidationConfig.java +++ b/clearing-parent/company-service/src/main/java/ru/spcex/clearing/company/config/validation/ClientCodeValidationConfig.java @@ -68,16 +68,6 @@ public class ClientCodeValidationConfig { acc -> Objects.equals(context.getValidatedObject().getCompanyId(), acc.getCompanyId()) ? null : CompanyErrors.AccountNotFound ), - IdPresentRule.instance("tradingClearingRegistryId", - ClientCodeNewRequest::getTradingClearingRegistryId, - IMDGDistributedNames.Map_TradingClearingRegistry, - TradingClearingRegistry.class, - CompanyErrors.RequiredFieldEmpty, - CompanyErrors.TradingClearingRegistryNotFound, - false, - acc -> Objects.equals(context.getValidatedObject().getCompanyId(), acc.getCompanyId()) - ? null : CompanyErrors.TradingClearingRegistryNotFound - ), DictionaryPresentRule.instance("stauts", @@ -139,16 +129,6 @@ public class ClientCodeValidationConfig { acc -> Objects.equals(context.getValidatedObject().getCompanyId(), acc.getCompanyId()) ? null : CompanyErrors.AccountNotFound ), - IdPresentRule.instance("tradingClearingRegistryId", - ClientCodeUpdateRequest::getTradingClearingRegistryId, - IMDGDistributedNames.Map_TradingClearingRegistry, - TradingClearingRegistry.class, - CompanyErrors.RequiredFieldEmpty, - CompanyErrors.TradingClearingRegistryNotFound, - false, - acc -> Objects.equals(context.getValidatedObject().getCompanyId(), acc.getCompanyId()) - ? null : CompanyErrors.TradingClearingRegistryNotFound - ), DictionaryPresentRule.instance("stauts", ClientCodeUpdateRequest::getStatus, diff --git a/clearing-parent/company-service/src/main/java/ru/spcex/clearing/company/service/ClientCodeService.java b/clearing-parent/company-service/src/main/java/ru/spcex/clearing/company/service/ClientCodeService.java index a795a26db..183e6da6d 100644 --- a/clearing-parent/company-service/src/main/java/ru/spcex/clearing/company/service/ClientCodeService.java +++ b/clearing-parent/company-service/src/main/java/ru/spcex/clearing/company/service/ClientCodeService.java @@ -147,14 +147,6 @@ public class ClientCodeService extends QueueConsumer implements InitializingBean } } - if (req.getTradingClearingRegistryId() == null && req.getMoneyAccountId() != null) { - TradingClearingRegistry tradingClearingRegistry = selectTradingClearingRegistry(req.getCompanyId(), req.getMoneyAccountId(), req.getDepoAccountId()); - if (tradingClearingRegistry == null) { - return makeErrorResponse(userRequest, CompanyErrors.TradingClearingRegistryNotFound); - } else { - req.setTradingClearingRegistryId(tradingClearingRegistry.getId()); - } - } ClientCode newClientCode = buildClientCode(req); clientCodeMap.insert(newClientCode); log.debug("successfully processed, new clientCode id {}", newClientCode.getId()); @@ -188,14 +180,6 @@ public class ClientCodeService extends QueueConsumer implements InitializingBean } } - if (req.getTradingClearingRegistryId() == null && req.getMoneyAccountId() != null) { - TradingClearingRegistry tradingClearingRegistry = selectTradingClearingRegistry(req.getCompanyId(), req.getMoneyAccountId(), req.getDepoAccountId()); - if (tradingClearingRegistry == null) { - return makeErrorResponse(userRequest, CompanyErrors.TradingClearingRegistryNotFound); - } else { - req.setTradingClearingRegistryId(tradingClearingRegistry.getId()); - } - } ClientCode newClientCode = buildClientCode(req); clientCodeMap.insert(newClientCode); log.debug("successfully processed, new clientCode id {}", newClientCode.getId()); @@ -233,14 +217,6 @@ public class ClientCodeService extends QueueConsumer implements InitializingBean } } - if (req.getTradingClearingRegistryId() == null && req.getMoneyAccountId() != null) { - TradingClearingRegistry tradingClearingRegistry = selectTradingClearingRegistry(req.getCompanyId(), req.getMoneyAccountId(), req.getDepoAccountId()); - if (tradingClearingRegistry == null) { - return makeErrorResponse(userRequest, CompanyErrors.TradingClearingRegistryNotFound); - } else { - req.setTradingClearingRegistryId(tradingClearingRegistry.getId()); - } - } updateClientCode(clientCode, req); clientCodeMap.update(clientCode); @@ -392,7 +368,17 @@ public class ClientCodeService extends QueueConsumer implements InitializingBean clientCode.setCompanyId(req.getCompanyId()); clientCode.setCode(req.getCode()); - clientCode.setTradingClearingRegistryId(req.getTradingClearingRegistryId()); + + if (req.getMoneyAccountId() != null) { + TradingClearingRegistry tradingClearingRegistry = selectTradingClearingRegistry(req.getCompanyId(), req.getMoneyAccountId(), req.getDepoAccountId()); + if (tradingClearingRegistry == null) { + log.warn("TCR not found: CompanyId {}, MoneyAccountId {}, DepoAccountId {}", + req.getCompanyId(), req.getMoneyAccountId(), req.getDepoAccountId()); + } else { + clientCode.setTradingClearingRegistryId(tradingClearingRegistry.getId()); + } + } + clientCode.setMoneyAccountId(req.getMoneyAccountId()); clientCode.setDepoAccountId(req.getDepoAccountId()); clientCode.setStatus(req.getStatus()); @@ -405,6 +391,17 @@ public class ClientCodeService extends QueueConsumer implements InitializingBean clientCode.setCompanyId(req.getCompanyId()); clientCode.setCode(req.getCode()); + + if (req.getMoneyAccountId() != null) { + TradingClearingRegistry tradingClearingRegistry = selectTradingClearingRegistry(req.getCompanyId(), req.getMoneyAccountId(), req.getDepoAccountId()); + if (tradingClearingRegistry == null) { + log.warn("TCR not found: CompanyId {}, MoneyAccountId {}, DepoAccountId {}", + req.getCompanyId(), req.getMoneyAccountId(), req.getDepoAccountId()); + } else { + clientCode.setTradingClearingRegistryId(tradingClearingRegistry.getId()); + } + } + clientCode.setTradingClearingRegistryId(req.getTradingClearingRegistryId()); clientCode.setMoneyAccountId(req.getMoneyAccountId()); clientCode.setDepoAccountId(req.getDepoAccountId()); diff --git a/clearing-parent/company-service/src/test/java/ru/spcex/clearing/company/service/ClientCodeServiceTest.java b/clearing-parent/company-service/src/test/java/ru/spcex/clearing/company/service/ClientCodeServiceTest.java index 0f34d0778..2599a0ec9 100644 --- a/clearing-parent/company-service/src/test/java/ru/spcex/clearing/company/service/ClientCodeServiceTest.java +++ b/clearing-parent/company-service/src/test/java/ru/spcex/clearing/company/service/ClientCodeServiceTest.java @@ -184,7 +184,7 @@ class ClientCodeServiceTest { predictableClientCode.setCompanyId(COMPANY_ID); // predictableClientCode.setMoneyAccountId(131L); // predictableClientCode.setDepoAccountId(132L); - predictableClientCode.setTradingClearingRegistryId(TCR_ID); +// predictableClientCode.setTradingClearingRegistryId(TCR_ID); //ACT String jsonString = getJsonStringForNew(clientCodeNewRequest, ID); @@ -222,7 +222,7 @@ class ClientCodeServiceTest { predictableClientCode.setCompanyId(COMPANY_ID); // predictableClientCode.setMoneyAccountId(131L); // predictableClientCode.setDepoAccountId(132L); - predictableClientCode.setTradingClearingRegistryId(TCR_ID); +// predictableClientCode.setTradingClearingRegistryId(TCR_ID); //ACT String jsonString = getJsonStringForNew(clientCodeNewRequest, ID);