From 29ecbb895609980bf150e12f488e0c43a0b14c6d Mon Sep 17 00:00:00 2001 From: AKurakin Date: Fri, 15 Sep 2023 10:22:34 +0300 Subject: [PATCH 1/3] company-service http://jira.mfd.msk:8088/browse/CLS-541 (bug fix 9dc45f21651) --- .../company/config/validation/CompanyValidationConfig.java | 7 +++++-- .../spcex/clearing/company/service/CompanyInfoService.java | 7 +++++-- .../ru/spcex/clearing/company/service/CompanyService.java | 7 +++++-- 3 files changed, 15 insertions(+), 6 deletions(-) diff --git a/clearing-parent/company-service/src/main/java/ru/spcex/clearing/company/config/validation/CompanyValidationConfig.java b/clearing-parent/company-service/src/main/java/ru/spcex/clearing/company/config/validation/CompanyValidationConfig.java index 8bbadda4b..e08945784 100644 --- a/clearing-parent/company-service/src/main/java/ru/spcex/clearing/company/config/validation/CompanyValidationConfig.java +++ b/clearing-parent/company-service/src/main/java/ru/spcex/clearing/company/config/validation/CompanyValidationConfig.java @@ -1,5 +1,6 @@ package ru.spcex.clearing.company.config.validation; +import org.apache.commons.lang3.StringUtils; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import ru.clearing.classes.statics.data.company.Company; @@ -41,7 +42,8 @@ public class CompanyValidationConfig { addImdg.accept(IMDGDistributedNames.Map_WorkflowStatusDictionary); addImdg.accept(IMDGDistributedNames.Map_Company); return new ValidatorImpl<>(context, - FieldRequiredRule.instance("shortName", CompanyNewRequest::getShortName, CompanyErrors.RequiredFieldEmpty), + FieldRequiredRule.instance("shortName", CompanyNewRequest::getShortName, CompanyErrors.RequiredFieldEmpty, + shortName -> StringUtils.isEmpty(shortName) ? CompanyErrors.RequiredFieldEmpty : null), FieldRequiredRule.instance("companySymbol", CompanyNewRequest::getCompanySymbol, CompanyErrors.RequiredFieldEmpty), FieldRequiredRule.instance("companySymbolValue", CompanyNewRequest::getCompanySymbolValue, CompanyErrors.RequiredFieldEmpty), DictionaryPresentRule.instance("workflowStatus", @@ -73,7 +75,8 @@ public class CompanyValidationConfig { return new ValidatorImpl<>(context, FieldRequiredRule.instance("id", CompanyNewRequest::getId, CompanyErrors.RequiredFieldEmpty), - FieldRequiredRule.instance("shortName", CompanyNewRequest::getShortName, CompanyErrors.RequiredFieldEmpty), + FieldRequiredRule.instance("shortName", CompanyNewRequest::getShortName, CompanyErrors.RequiredFieldEmpty, + shortName -> StringUtils.isEmpty(shortName) ? CompanyErrors.RequiredFieldEmpty : null), // FieldRequiredRule.instance("companySymbol", CompanyNewRequest::getCompanySymbol, CompanyErrors.RequiredFieldEmpty), // FieldRequiredRule.instance("companySymbolValue", CompanyNewRequest::getCompanySymbolValue, CompanyErrors.RequiredFieldEmpty), FieldRequiredRule.instance("workflowStatus", CompanyNewRequest::getWorkflowStatus, CompanyErrors.RequiredFieldEmpty), diff --git a/clearing-parent/company-service/src/main/java/ru/spcex/clearing/company/service/CompanyInfoService.java b/clearing-parent/company-service/src/main/java/ru/spcex/clearing/company/service/CompanyInfoService.java index 226aba5a5..ccdd7723e 100644 --- a/clearing-parent/company-service/src/main/java/ru/spcex/clearing/company/service/CompanyInfoService.java +++ b/clearing-parent/company-service/src/main/java/ru/spcex/clearing/company/service/CompanyInfoService.java @@ -1,5 +1,6 @@ package ru.spcex.clearing.company.service; +import org.apache.commons.lang3.StringUtils; import org.apache.kafka.clients.consumer.Consumer; import org.apache.kafka.clients.producer.Producer; import org.slf4j.Logger; @@ -87,8 +88,10 @@ public class CompanyInfoService extends QueueConsumer implements InitializingBea return requestHelper.makeErrorResponse(companyInfoReq, CompanyErrors.CompanyNotFound, companyInfoReq.getId()); } company.setUpdated(Instant.now()); - company.setShortName(req.getShortName()); - company.setFullName(req.getFullName()); + if (StringUtils.isNotEmpty(req.getShortName())) + company.setShortName(req.getShortName()); + if (StringUtils.isNotEmpty(req.getFullName())) + company.setFullName(req.getFullName()); CompanyInfo companyInfo = company.getProfile(); companyInfo.setCountryCode(req.getCountryCode()); diff --git a/clearing-parent/company-service/src/main/java/ru/spcex/clearing/company/service/CompanyService.java b/clearing-parent/company-service/src/main/java/ru/spcex/clearing/company/service/CompanyService.java index 25b5c83c9..62a0d4987 100644 --- a/clearing-parent/company-service/src/main/java/ru/spcex/clearing/company/service/CompanyService.java +++ b/clearing-parent/company-service/src/main/java/ru/spcex/clearing/company/service/CompanyService.java @@ -1,5 +1,6 @@ package ru.spcex.clearing.company.service; +import org.apache.commons.lang3.StringUtils; import org.apache.kafka.clients.consumer.Consumer; import org.apache.kafka.clients.producer.Producer; import org.slf4j.Logger; @@ -211,8 +212,10 @@ public class CompanyService extends QueueConsumer implements InitializingBean { // } company.setUpdated(Instant.now()); - company.setShortName(updateRequest.getShortName()); - company.setFullName(updateRequest.getFullName()); + if (StringUtils.isNotEmpty(updateRequest.getShortName())) + company.setShortName(updateRequest.getShortName()); + if (StringUtils.isNotEmpty(updateRequest.getFullName())) + company.setFullName(updateRequest.getFullName()); if (updateRequest.getCompanySymbol() != null || updateRequest.getCompanySymbolValue() != null) { log.trace("Request field CompanySymbol, CompanySymbolValue ignore for update company request."); From bb0f836d3c45e2a1de9cd7863992ad7abf50e5ef Mon Sep 17 00:00:00 2001 From: AKurakin Date: Fri, 15 Sep 2023 11:12:32 +0300 Subject: [PATCH 2/3] =?UTF-8?q?company-service=20http://jira.mfd.msk:8088/?= =?UTF-8?q?browse/CLS-541=20=D1=81=20=D0=BF=D1=80=D0=BE=D0=B1=D0=B5=D0=BB?= =?UTF-8?q?=D0=B0=D0=BC=D0=B8=20=D1=82=D0=BE=D0=B6=D0=B5=20=D0=BD=D0=B5=20?= =?UTF-8?q?=D0=BF=D1=83=D1=81=D0=BA=D0=B0=D1=82=D1=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../company/config/validation/CompanyValidationConfig.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/clearing-parent/company-service/src/main/java/ru/spcex/clearing/company/config/validation/CompanyValidationConfig.java b/clearing-parent/company-service/src/main/java/ru/spcex/clearing/company/config/validation/CompanyValidationConfig.java index e08945784..eb95f9f83 100644 --- a/clearing-parent/company-service/src/main/java/ru/spcex/clearing/company/config/validation/CompanyValidationConfig.java +++ b/clearing-parent/company-service/src/main/java/ru/spcex/clearing/company/config/validation/CompanyValidationConfig.java @@ -43,7 +43,7 @@ public class CompanyValidationConfig { addImdg.accept(IMDGDistributedNames.Map_Company); return new ValidatorImpl<>(context, FieldRequiredRule.instance("shortName", CompanyNewRequest::getShortName, CompanyErrors.RequiredFieldEmpty, - shortName -> StringUtils.isEmpty(shortName) ? CompanyErrors.RequiredFieldEmpty : null), + shortName -> StringUtils.isBlank(shortName) ? CompanyErrors.RequiredFieldEmpty : null), FieldRequiredRule.instance("companySymbol", CompanyNewRequest::getCompanySymbol, CompanyErrors.RequiredFieldEmpty), FieldRequiredRule.instance("companySymbolValue", CompanyNewRequest::getCompanySymbolValue, CompanyErrors.RequiredFieldEmpty), DictionaryPresentRule.instance("workflowStatus", @@ -76,7 +76,7 @@ public class CompanyValidationConfig { FieldRequiredRule.instance("id", CompanyNewRequest::getId, CompanyErrors.RequiredFieldEmpty), FieldRequiredRule.instance("shortName", CompanyNewRequest::getShortName, CompanyErrors.RequiredFieldEmpty, - shortName -> StringUtils.isEmpty(shortName) ? CompanyErrors.RequiredFieldEmpty : null), + shortName -> StringUtils.isBlank(shortName) ? CompanyErrors.RequiredFieldEmpty : null), // FieldRequiredRule.instance("companySymbol", CompanyNewRequest::getCompanySymbol, CompanyErrors.RequiredFieldEmpty), // FieldRequiredRule.instance("companySymbolValue", CompanyNewRequest::getCompanySymbolValue, CompanyErrors.RequiredFieldEmpty), FieldRequiredRule.instance("workflowStatus", CompanyNewRequest::getWorkflowStatus, CompanyErrors.RequiredFieldEmpty), From 89b6567bebe548d24b254943342374f5352eddf6 Mon Sep 17 00:00:00 2001 From: AKurakin Date: Fri, 15 Sep 2023 11:54:42 +0300 Subject: [PATCH 3/3] =?UTF-8?q?company-service=20http://jira.mfd.msk:8088/?= =?UTF-8?q?browse/CLS-541=20=D0=B7=D0=BC=D0=B5=D0=BD=D0=B8=D0=BB=20=D0=BB?= =?UTF-8?q?=D0=BE=D0=B3=20trace?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ru/spcex/clearing/company/service/MultiCompanyService.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/clearing-parent/company-service/src/main/java/ru/spcex/clearing/company/service/MultiCompanyService.java b/clearing-parent/company-service/src/main/java/ru/spcex/clearing/company/service/MultiCompanyService.java index 75b051e18..d556d62c8 100644 --- a/clearing-parent/company-service/src/main/java/ru/spcex/clearing/company/service/MultiCompanyService.java +++ b/clearing-parent/company-service/src/main/java/ru/spcex/clearing/company/service/MultiCompanyService.java @@ -206,7 +206,7 @@ public class MultiCompanyService txOk = true; } catch (ValidationException vex) { log.error("For gateway request.id={}, companyId={} error validate: {}", baseRequest.getId(), companyId, messageResolver.resolve(vex.getEnumMsg())); - log.debug("For companyId={} error validation: {}", companyId, ExceptionUtils.getStackTrace(vex)); + log.trace("For companyId={} error validation: {}", companyId, ExceptionUtils.getStackTrace(vex)); } } if (txOk) {