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

http://jira.mfd.msk:8088/browse/CLS-1039

Browse source
This commit is contained in:
etreschenkov 2026-06-18 18:46:05 +03:00
parent 459fe3db6c
commit 2f94fcfe50
4 changed files with 28 additions and 38 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -174,6 +174,7 @@ public class ClientCodeValidationConfig {
addImdg.accept(IMDGDistributedNames.Map_CompanySymbols); addImdg.accept(IMDGDistributedNames.Map_CompanySymbols);
addImdg.accept(IMDGDistributedNames.Map_Account); addImdg.accept(IMDGDistributedNames.Map_Account);
addImdg.accept(IMDGDistributedNames.Map_TradingClearingRegistry); addImdg.accept(IMDGDistributedNames.Map_TradingClearingRegistry);
addImdg.accept(IMDGDistributedNames.Map_TradingClearingRegistryList);
addImdg.accept(IMDGDistributedNames.Map_AccountSymbols); addImdg.accept(IMDGDistributedNames.Map_AccountSymbols);
addImdg.accept(IMDGDistributedNames.Map_DepoAccount); addImdg.accept(IMDGDistributedNames.Map_DepoAccount);
addImdg.accept(IMDGDistributedNames.Map_ClientCode); addImdg.accept(IMDGDistributedNames.Map_ClientCode);

4
clearing-parent/account-service/src/main/java/ru/spcex/clearing/account/errors/AccountError.java
View file

@ -32,8 +32,8 @@ public enum AccountError implements IErrorEnumId {
CurrencyForTradingClearingRegistryListAlreadyUsed(5031L), CurrencyForTradingClearingRegistryListAlreadyUsed(5031L),
BadSymbol(5032L), BadSymbol(5032L),
TradingClearingRegistryNotFound(3022L), TradingClearingRegistryNotFound(3022L),
ClientCodeNotLinedToTkr(3033L), DepoAccountChangeNotAllowed(5033L),
AccountRubForbiddenForAdd(3033L), ClientCodeNotFound(5034L),
CurrencyNotFound(1016L), CurrencyNotFound(1016L),
; ;

16
clearing-parent/account-service/src/main/java/ru/spcex/clearing/account/service/v2/listeners/ClientCodeMessageListener.java
View file

@ -8,7 +8,6 @@ import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.Optional; import java.util.Optional;
import java.util.concurrent.atomic.AtomicBoolean; import java.util.concurrent.atomic.AtomicBoolean;
import java.util.stream.Stream;
import org.apache.kafka.clients.consumer.Consumer; import org.apache.kafka.clients.consumer.Consumer;
import org.apache.kafka.clients.producer.Producer; import org.apache.kafka.clients.producer.Producer;
import org.slf4j.Logger; import org.slf4j.Logger;
@ -221,12 +220,21 @@ public class ClientCodeMessageListener extends QueueConsumer implements Initiali
TkrAccount tkrAccount = entry.getKey(); TkrAccount tkrAccount = entry.getKey();
ValidationResult validationResult = entry.getValue(); ValidationResult validationResult = entry.getValue();
IValidator validator = validationResult.validator(); IValidator validator = validationResult.validator();
Company company = validator.getStored(ClientCodeStoreObjects.COMPANY);
List<Account> clrnAccs = validator.getStored(ClientCodeStoreObjects.CLRN_ACCS); List<Account> clrnAccs = validator.getStored(ClientCodeStoreObjects.CLRN_ACCS);
List<Account> anltAccs = validator.getStored(ClientCodeStoreObjects.ANLT_ACCS); List<Account> anltAccs = validator.getStored(ClientCodeStoreObjects.ANLT_ACCS);
TradingClearingRegistry tradingClearingRegistry = validator.getStored(ClientCodeStoreObjects.TRADING_CLEARING_REGISTRY); TradingClearingRegistry tradingClearingRegistry = validator.getStored(ClientCodeStoreObjects.TRADING_CLEARING_REGISTRY);
List<Long> accIds = Stream.concat(clrnAccs.stream(), anltAccs.stream())
.map(Account::getId) List<Long> accIds = new ArrayList<>();
.toList(); for (MoneyAccountMsgRequest account : tkrAccount.getMoneyAccounts()) {
if (StringUtils.hasText(account.getEks_account())) {
log.debug("eks_account is filled, creating info account: {}", account.getEks_account());
Pair<Long, String> accId = accountFacade.createAccountInfo(account, company);
accIds.add(accId.getFirst());
}
}
clrnAccs.forEach(account -> accIds.add(account.getId()));
TradingClearingRegistryListNewRequest tcrListNew = new TradingClearingRegistryListNewRequest(); TradingClearingRegistryListNewRequest tcrListNew = new TradingClearingRegistryListNewRequest();
tcrListNew.setTradingClearingRegistryId(tradingClearingRegistry.getId()); tcrListNew.setTradingClearingRegistryId(tradingClearingRegistry.getId());

45
clearing-parent/account-service/src/main/java/ru/spcex/clearing/account/validation/GatewayUpdateEksClientCodeValidationRule.java
View file

@ -97,10 +97,10 @@ public enum GatewayUpdateEksClientCodeValidationRule implements IValidationRule<
); );
if (depoAccount == null) { if (depoAccount == null) {
context.storeObject(ClientCodeStoreObjects.DEPO_ACCOUNT, Optional.empty()); context.storeObject(ClientCodeStoreObjects.DEPO_ACCOUNT, Optional.empty());
return of(AccountError.DepoAccountNotFound, "depo_account"); return of(AccountError.AccountNotFound, "depo_account");
} }
if (!tkr.getDepoAccountId().equals(depoAccount.getAccountId())) { if (!depoAccount.getAccountId().equals(tkr.getDepoAccountId())) {
return of(AccountError.AccountForTradingClearingRegistryAlreadyUsed, depoAccount.getAccountId()); return of(AccountError.DepoAccountChangeNotAllowed, depoAccount.getAccountId());
} }
} }
return empty(); return empty();
@ -116,7 +116,7 @@ public enum GatewayUpdateEksClientCodeValidationRule implements IValidationRule<
&& CurrencyCode.RUB.equalsByKey(moneyAccountMsgRequest.getCurrCode())) && CurrencyCode.RUB.equalsByKey(moneyAccountMsgRequest.getCurrCode()))
.toList(); .toList();
if (!accounts.isEmpty()) { if (!accounts.isEmpty()) {
return of(AccountError.AccountRubForbiddenForAdd, accounts.stream().findFirst().get().getAccount()); return of(AccountError.AccountForTradingClearingRegistryAlreadyUsed, accounts.stream().findFirst().get().getAccount());
} }
return empty(); return empty();
} }
@ -140,7 +140,7 @@ public enum GatewayUpdateEksClientCodeValidationRule implements IValidationRule<
) )
); );
if (existClientCode == null) { if (existClientCode == null) {
return of(AccountError.ClientCodeNotLinedToTkr, trkCode); return of(AccountError.ClientCodeNotFound, trkCode);
} }
context.storeObject(ClientCodeStoreObjects.CLIENT_CODE, existClientCode); context.storeObject(ClientCodeStoreObjects.CLIENT_CODE, existClientCode);
return empty(); return empty();
@ -155,12 +155,12 @@ public enum GatewayUpdateEksClientCodeValidationRule implements IValidationRule<
ImdgPredicateBuilder predicateBuilder = accountImdg.predicateBuilder(); ImdgPredicateBuilder predicateBuilder = accountImdg.predicateBuilder();
List<MoneyAccountMsgRequest> accounts = validatedObject.getMoneyAccounts().stream() List<MoneyAccountMsgRequest> accounts = validatedObject.getMoneyAccounts().stream()
.filter(moneyAccountMsgRequest -> .filter(moneyAccountMsgRequest ->
moneyAccountMsgRequest.getStatus().equals("NEW") StringUtils.hasText(moneyAccountMsgRequest.getAccount()) && moneyAccountMsgRequest.getStatus().equals("NEW")
&& !CurrencyCode.RUB.equalsByKey(moneyAccountMsgRequest.getCurrCode())) && !CurrencyCode.RUB.equalsByKey(moneyAccountMsgRequest.getCurrCode()))
.toList(); .toList();
List<MoneyAccountMsgRequest> existAccounts = validatedObject.getMoneyAccounts().stream() List<MoneyAccountMsgRequest> existAccounts = validatedObject.getMoneyAccounts().stream()
.filter(moneyAccountMsgRequest -> .filter(moneyAccountMsgRequest ->
moneyAccountMsgRequest.getStatus().equals("NEW") StringUtils.hasText(moneyAccountMsgRequest.getAccount()) && moneyAccountMsgRequest.getStatus().equals("NOW")
&& !CurrencyCode.RUB.equalsByKey(moneyAccountMsgRequest.getCurrCode())) && !CurrencyCode.RUB.equalsByKey(moneyAccountMsgRequest.getCurrCode()))
.toList(); .toList();
List<Account> clrnAccounts = new ArrayList<>(); List<Account> clrnAccounts = new ArrayList<>();
@ -171,6 +171,7 @@ public enum GatewayUpdateEksClientCodeValidationRule implements IValidationRule<
predicateBuilder.equals("accountType", AccountType.Clrn.getKey()) predicateBuilder.equals("accountType", AccountType.Clrn.getKey())
) )
); );
if (account == null) { if (account == null) {
return of(AccountError.AccountNotFound, request.getAccount()); return of(AccountError.AccountNotFound, request.getAccount());
} }
@ -194,7 +195,10 @@ public enum GatewayUpdateEksClientCodeValidationRule implements IValidationRule<
return of(AccountError.AccountNotFound, request.getAccount()); return of(AccountError.AccountNotFound, request.getAccount());
} }
TradingClearingRegistryList tkrListByAccount = tkrList.getSingleObjectByPredicate( TradingClearingRegistryList tkrListByAccount = tkrList.getSingleObjectByPredicate(
predicateBuilder.equals("accountId", account.getId()) predicateBuilder.and(
predicateBuilder.equals("accountId", account.getId()),
predicateBuilder.equals("currency", account.getCurrency())
)
); );
if (tkrListByAccount == null) { if (tkrListByAccount == null) {
return of(AccountError.AccountForTradingClearingRegistryAlreadyUsed, account.getId()); return of(AccountError.AccountForTradingClearingRegistryAlreadyUsed, account.getId());
@ -229,7 +233,7 @@ public enum GatewayUpdateEksClientCodeValidationRule implements IValidationRule<
return of(AccountError.AccountNotFound, request.getAccount()); return of(AccountError.AccountNotFound, request.getAccount());
} }
TradingClearingRegistryList tkrListByAccount = tkrList.getSingleObjectByPredicate( TradingClearingRegistryList tkrListByAccount = tkrList.getSingleObjectByPredicate(
predicateBuilder.equals("accountId", account.getId()) predicateBuilder.equals("currency", account.getCurrency())
); );
if (tkrListByAccount != null) { if (tkrListByAccount != null) {
return of(AccountError.AccountForTradingClearingRegistryAlreadyUsed, account.getId()); return of(AccountError.AccountForTradingClearingRegistryAlreadyUsed, account.getId());
@ -237,29 +241,6 @@ public enum GatewayUpdateEksClientCodeValidationRule implements IValidationRule<
anltAccounts.add(account); anltAccounts.add(account);
} }
List<MoneyAccountMsgRequest> existAccounts = validatedObject.getMoneyAccounts().stream()
.filter(moneyAccountMsgRequest ->
StringUtils.hasText(moneyAccountMsgRequest.getEks_account()) && moneyAccountMsgRequest.getStatus().equals("NOW")
&& !CurrencyCode.RUB.equalsByKey(moneyAccountMsgRequest.getCurrCode()))
.toList();
for (MoneyAccountMsgRequest request : existAccounts) {
Account account = accountImdg.getFirstObjectByPredicate(
predicateBuilder.and(
predicateBuilder.equals("accountType", AccountType.Anlt.getKey()),
predicateBuilder.equals("currency", request.getCurrCode()),
predicateBuilder.equals("account", request.getEks_account())
)
);
if (account == null) {
return of(AccountError.AccountNotFound, request.getAccount());
}
TradingClearingRegistryList tkrListByAccount = tkrList.getSingleObjectByPredicate(
predicateBuilder.equals("accountId", account.getId())
);
if (tkrListByAccount == null) {
return of(AccountError.AccountForTradingClearingRegistryAlreadyUsed, account.getId());
}
}
context.storeObject(ClientCodeStoreObjects.ANLT_ACCS, anltAccounts); context.storeObject(ClientCodeStoreObjects.ANLT_ACCS, anltAccounts);
return empty(); return empty();
} }