treshenkov/clearing
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

bugfix sdf06 validation

Browse source
This commit is contained in:
ialbert 2023-06-16 19:09:04 +03:00
parent e5e7f774e5
commit a13b874b3e
1 changed files with 7 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/config/ValidationConfig.java
View file

@ -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.MoneyMarketSecurity;
import ru.clearing.classes.statics.data.security.Security; import ru.clearing.classes.statics.data.security.Security;
import ru.clearing.platform.dictionary.SectionDictionary; import ru.clearing.platform.dictionary.SectionDictionary;
import ru.spcex.clearing.error.ClearingError;
import ru.spcex.clearing.imdg.IMDGDistributedNames; import ru.spcex.clearing.imdg.IMDGDistributedNames;
import ru.spcex.clearing.service.validation.*; import ru.spcex.clearing.service.validation.*;
import ru.spcex.clearing.util.security.UserRoleVerification;
import ru.spcex.platform.enumeration.ClearingCategory; 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.Imdg;
import ru.spcex.platform.imdg.api.ImdgProvider; import ru.spcex.platform.imdg.api.ImdgProvider;
import ru.spcex.platform.imdg.validation.ImdgValidationContext; import ru.spcex.platform.imdg.validation.ImdgValidationContext;
@ -65,12 +62,12 @@ public class ValidationConfig {
this.imdgProvider = imdgProvider; this.imdgProvider = imdgProvider;
} }
@Bean("adminRoleVerification") //@Bean("adminRoleVerification")
public UserRoleVerification adminRoleVerification() { //public UserRoleVerification adminRoleVerification() {
return new UserRoleVerification( // return new UserRoleVerification(
imdgProvider, null, UserRole.Admin, ClearingError.GeneralError //fixme no UserVerifyDenial error // imdgProvider, null, UserRole.Admin, ClearingError.GeneralError //fixme no UserVerifyDenial error
); // );
} //}
@Bean("executionDepositValidator") @Bean("executionDepositValidator")
public BiFunction<ClearingCategory, ExecutionDeposit, IValidator> executionDepositValidator(ImdgProvider imdgProvider) { public BiFunction<ClearingCategory, ExecutionDeposit, IValidator> executionDepositValidator(ImdgProvider imdgProvider) {
@ -210,7 +207,7 @@ public class ValidationConfig {
ImdgValidationContext<SDf06> context = new ImdgValidationContext<>(); ImdgValidationContext<SDf06> context = new ImdgValidationContext<>();
context.setValidatedObject(sDf06); context.setValidatedObject(sDf06);
context.addImdg(IMDGDistributedNames.Map_Account, imdgAccount); context.addImdg(IMDGDistributedNames.Map_Account, imdgAccount);
context.addImdg(IMDGDistributedNames.Map_CompanySymbols, imdgCompany); context.addImdg(IMDGDistributedNames.Map_CompanySymbols, imdgCompanySymbols);
context.addImdg(IMDGDistributedNames.Map_Registry, imdgCompany); context.addImdg(IMDGDistributedNames.Map_Registry, imdgCompany);
return new ValidatorImpl<>(context, return new ValidatorImpl<>(context,
Sdf06NewValidationRule.CompanySymbolPresent, Sdf06NewValidationRule.CompanySymbolPresent,