From 29ecbb895609980bf150e12f488e0c43a0b14c6d Mon Sep 17 00:00:00 2001 From: AKurakin Date: Fri, 15 Sep 2023 10:22:34 +0300 Subject: [PATCH] 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.");