From a13b874b3ebd737ca6773d9fa7422e15a9d66906 Mon Sep 17 00:00:00 2001 From: ialbert Date: Fri, 16 Jun 2023 19:09:04 +0300 Subject: [PATCH] bugfix sdf06 validation --- .../spcex/clearing/config/ValidationConfig.java | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/config/ValidationConfig.java b/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/config/ValidationConfig.java index 2e4b75411..cbbc71d6a 100644 --- a/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/config/ValidationConfig.java +++ b/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/config/ValidationConfig.java @@ -19,12 +19,9 @@ import ru.clearing.classes.statics.data.sdf.SDf57; import ru.clearing.classes.statics.data.security.MoneyMarketSecurity; import ru.clearing.classes.statics.data.security.Security; import ru.clearing.platform.dictionary.SectionDictionary; -import ru.spcex.clearing.error.ClearingError; import ru.spcex.clearing.imdg.IMDGDistributedNames; import ru.spcex.clearing.service.validation.*; -import ru.spcex.clearing.util.security.UserRoleVerification; import ru.spcex.platform.enumeration.ClearingCategory; -import ru.spcex.platform.enumeration.UserRole; import ru.spcex.platform.imdg.api.Imdg; import ru.spcex.platform.imdg.api.ImdgProvider; import ru.spcex.platform.imdg.validation.ImdgValidationContext; @@ -65,12 +62,12 @@ public class ValidationConfig { this.imdgProvider = imdgProvider; } - @Bean("adminRoleVerification") - public UserRoleVerification adminRoleVerification() { - return new UserRoleVerification( - imdgProvider, null, UserRole.Admin, ClearingError.GeneralError //fixme no UserVerifyDenial error - ); - } + //@Bean("adminRoleVerification") + //public UserRoleVerification adminRoleVerification() { + // return new UserRoleVerification( + // imdgProvider, null, UserRole.Admin, ClearingError.GeneralError //fixme no UserVerifyDenial error + // ); + //} @Bean("executionDepositValidator") public BiFunction executionDepositValidator(ImdgProvider imdgProvider) { @@ -210,7 +207,7 @@ public class ValidationConfig { ImdgValidationContext context = new ImdgValidationContext<>(); context.setValidatedObject(sDf06); context.addImdg(IMDGDistributedNames.Map_Account, imdgAccount); - context.addImdg(IMDGDistributedNames.Map_CompanySymbols, imdgCompany); + context.addImdg(IMDGDistributedNames.Map_CompanySymbols, imdgCompanySymbols); context.addImdg(IMDGDistributedNames.Map_Registry, imdgCompany); return new ValidatorImpl<>(context, Sdf06NewValidationRule.CompanySymbolPresent,