From 41d66b9e969b0b738606cbf4ace580a79fbbcb90 Mon Sep 17 00:00:00 2001 From: AKurakin Date: Wed, 13 Sep 2023 15:27:05 +0300 Subject: [PATCH] =?UTF-8?q?company-service=20securities-service=20http://j?= =?UTF-8?q?ira.mfd.msk:8088/browse/CLS-454=20=D0=BF=D0=BE=D0=BF=D1=80?= =?UTF-8?q?=D0=B0=D0=B2=D0=B8=D0=BB=20=D0=B2=D1=8B=D0=B4=D0=B0=D1=87=D1=83?= =?UTF-8?q?=20=D0=BE=D1=88=D0=B8=D0=B1=D0=BE=D0=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../backend-api/src/main/resources/meta/data.xml | 4 ++-- .../config/validation/CompanyValidationConfig.java | 8 +++++--- .../ru/spcex/clearing/company/error/CompanyErrors.java | 2 +- .../spcex/clearing/company/service/CompanyService.java | 2 +- .../validation/rule/MmsDeleteValidationRule.java | 2 +- .../validation/rule/MmsUpdateValidationRule.java | 2 +- .../securities/validation/rule/WorkflowStatusActv.java | 9 +++++++-- 7 files changed, 18 insertions(+), 11 deletions(-) diff --git a/clearing-parent/backend-api/src/main/resources/meta/data.xml b/clearing-parent/backend-api/src/main/resources/meta/data.xml index bad6d650c..1563fdffb 100644 --- a/clearing-parent/backend-api/src/main/resources/meta/data.xml +++ b/clearing-parent/backend-api/src/main/resources/meta/data.xml @@ -343,7 +343,7 @@ - + @@ -377,7 +377,7 @@ - + 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 316b37a5d..8bbadda4b 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 @@ -14,11 +14,12 @@ import ru.spcex.clearing.validation.common.rules.DictionaryPresentRule; import ru.spcex.clearing.validation.common.rules.EnumPresentRule; import ru.spcex.clearing.validation.common.rules.FieldRequiredRule; import ru.spcex.clearing.validation.common.rules.IdPresentRule; +import ru.spcex.clearing.validation.common.rules.specific.IdPresentSpecificRule; import ru.spcex.platform.classes.base.SpcexObjectBase; -import ru.spcex.platform.enumeration.CompanySymbol; import ru.spcex.platform.enumeration.WorkflowStatus; import ru.spcex.platform.imdg.api.Imdg; import ru.spcex.platform.imdg.validation.ImdgValidationContext; +import ru.spcex.platform.utils.enumeration.EnumMessage; import ru.spcex.platform.utils.validation.IValidator; import ru.spcex.platform.utils.validation.ValidatorImpl; @@ -103,13 +104,14 @@ public class CompanyValidationConfig { addImdg.accept(IMDGDistributedNames.Map_Company); return new ValidatorImpl<>(context, // FieldRequiredRule.instance("id", CommonDeleteRequest::getId, CompanyErrors.RequiredFieldEmpty), - IdPresentRule.instance("id", + IdPresentSpecificRule.instance("id", CommonDeleteRequest::getId, IMDGDistributedNames.Map_Company, Company.class, CompanyErrors.RequiredFieldEmpty, CompanyErrors.CompanyNotFound, - company -> WorkflowStatus.Active.getKey().equals(company.getWorkflowStatus()) ? null : CompanyErrors.CompanyDisabled) + company -> WorkflowStatus.Active.getKey().equals(company.getWorkflowStatus()) ? null : + new EnumMessage(CompanyErrors.CompanyDisabled, company.getShortName())) ); }; } diff --git a/clearing-parent/company-service/src/main/java/ru/spcex/clearing/company/error/CompanyErrors.java b/clearing-parent/company-service/src/main/java/ru/spcex/clearing/company/error/CompanyErrors.java index 1c5b42c49..824f55545 100644 --- a/clearing-parent/company-service/src/main/java/ru/spcex/clearing/company/error/CompanyErrors.java +++ b/clearing-parent/company-service/src/main/java/ru/spcex/clearing/company/error/CompanyErrors.java @@ -13,7 +13,7 @@ public enum CompanyErrors implements IErrorEnumId { RecordNotFound(3006L), // Запись с идентификатором %s не найдена. CompanyALreadyExist(3010L), // Компания %s уже существует CompanyNotFound(3011L), // Компания %s не найдена. - CompanyDisabled(3012L), // Компания %s неактивна. + CompanyDisabled(3012L), // Компания %s неактивна. (параметр company.shortName) ProfileNotFound(3013L), // Профиль компании %s не найден. CompanyInfoNotFound(3014L), // Реквизит компании %s не найден. ContactNotFound(3015L), // Контакт компании %s не найден. 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 90003846b..25b5c83c9 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 @@ -353,7 +353,7 @@ public class CompanyService extends QueueConsumer implements InitializingBean { } if (!WorkflowStatus.Active.equalsByKey(company.getWorkflowStatus())) { log.info("Company {} already blocked", request.getId()); - return requestHelper.makeErrorResponse(companyBlockRequestBaseRequest, CompanyErrors.CompanyDisabled); + return requestHelper.makeErrorResponse(companyBlockRequestBaseRequest, CompanyErrors.CompanyDisabled, company.getShortName()); } diff --git a/clearing-parent/securities-service/src/main/java/ru/spcex/clearing/securities/validation/rule/MmsDeleteValidationRule.java b/clearing-parent/securities-service/src/main/java/ru/spcex/clearing/securities/validation/rule/MmsDeleteValidationRule.java index 71ca83735..0da4c011b 100644 --- a/clearing-parent/securities-service/src/main/java/ru/spcex/clearing/securities/validation/rule/MmsDeleteValidationRule.java +++ b/clearing-parent/securities-service/src/main/java/ru/spcex/clearing/securities/validation/rule/MmsDeleteValidationRule.java @@ -18,7 +18,7 @@ public enum MmsDeleteValidationRule implements IValidationRule