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

Merge remote-tracking branch 'origin/dev' into dev

Browse source
This commit is contained in:
ialbert 2023-05-27 19:29:08 +03:00
commit d18504377f
2 changed files with 2 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
clearing-parent/account-service/src/main/java/ru/spcex/clearing/account/config/validation/BankAccountValidationConfig.java
View file

@ -53,7 +53,7 @@ public class BankAccountValidationConfig {
Company.class, Company.class,
AccountError.RequiredFieldEmpty, AccountError.RequiredFieldEmpty,
AccountError.CompanyNotFound, AccountError.CompanyNotFound,
company -> WorkflowStatus.Active.equalsByKey(company.getWorkflowStatus()) ? null : AccountError.CompanyNotActive), false),
FieldRequiredRule.instance("account", FieldRequiredRule.instance("account",
BankAccountNewRequest::getAccount, BankAccountNewRequest::getAccount,
AccountError.RequiredFieldEmpty, AccountError.RequiredFieldEmpty,
@ -83,9 +83,6 @@ public class BankAccountValidationConfig {
AccountError.RequiredFieldEmpty), AccountError.RequiredFieldEmpty),
FieldRequiredRule.instance("bankName", FieldRequiredRule.instance("bankName",
BankAccountNewRequest::getBankName, BankAccountNewRequest::getBankName,
AccountError.RequiredFieldEmpty),
FieldRequiredRule.instance("destination",
BankAccountNewRequest::getDestination,
AccountError.RequiredFieldEmpty) AccountError.RequiredFieldEmpty)
); );
}; };

2
clearing-parent/securities-service/src/main/java/ru/spcex/clearing/securities/validation/rule/HaveValidCodeByDictionary.java
View file

@ -38,7 +38,7 @@ public class HaveValidCodeByDictionary<R> implements IValidationRule<ImdgValidat
if (required) if (required)
return of(SecuritiesError.RequiredFieldIsEmpty, errArg); return of(SecuritiesError.RequiredFieldIsEmpty, errArg);
else else
return null; return empty();
} }
Imdg<SpcexObjectBase> imdgDictionary = context.obtainMap(mapName, SpcexObjectBase.class); Imdg<SpcexObjectBase> imdgDictionary = context.obtainMap(mapName, SpcexObjectBase.class);
SpcexObjectBase dictionary = imdgDictionary.getSingleObjectByFieldValues(Map.of( SpcexObjectBase dictionary = imdgDictionary.getSingleObjectByFieldValues(Map.of(