From 328573074c1e14ffc87dfe2b59d49a0873ca3b2b Mon Sep 17 00:00:00 2001
From: etreschenkov <ETreschenkov@mfd.ru>
Date: Tue, 26 May 2026 11:29:47 +0300
Subject: [PATCH] http://jira.mfd.msk:8088/browse/CLS-1023

---
 .../clearing/account/service/v2/facade/ClientCodeFacade.java | 3 ++-
 .../service/v2/listeners/ClientCodeMessageListener.java      | 5 ++---
 .../validation/GatewayEksClientCodeValidationRule.java       | 5 ++++-
 3 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/clearing-parent/account-service/src/main/java/ru/spcex/clearing/account/service/v2/facade/ClientCodeFacade.java b/clearing-parent/account-service/src/main/java/ru/spcex/clearing/account/service/v2/facade/ClientCodeFacade.java
index a2322728d..dcab2fce2 100644
--- a/clearing-parent/account-service/src/main/java/ru/spcex/clearing/account/service/v2/facade/ClientCodeFacade.java
+++ b/clearing-parent/account-service/src/main/java/ru/spcex/clearing/account/service/v2/facade/ClientCodeFacade.java
@@ -68,7 +68,8 @@ public class ClientCodeFacade implements IClearingFacade {
                 predicateBuilder.and(
                     predicateBuilder.equals("companyId", request.getCompanyId()),
                     predicateBuilder.equals("code", request.getCode()),
-                    predicateBuilder.equals("tradingClearingRegistryId", tradingClearingRegistry.getId())
+                    predicateBuilder.equals("tradingClearingRegistryId", tradingClearingRegistry.getId()),
+                    predicateBuilder.equals("status", Status.Active.getKey())
                 )
             );
             if (clientCode == null) {
diff --git a/clearing-parent/account-service/src/main/java/ru/spcex/clearing/account/service/v2/listeners/ClientCodeMessageListener.java b/clearing-parent/account-service/src/main/java/ru/spcex/clearing/account/service/v2/listeners/ClientCodeMessageListener.java
index 16ad89dde..3a57fbdbd 100644
--- a/clearing-parent/account-service/src/main/java/ru/spcex/clearing/account/service/v2/listeners/ClientCodeMessageListener.java
+++ b/clearing-parent/account-service/src/main/java/ru/spcex/clearing/account/service/v2/listeners/ClientCodeMessageListener.java
@@ -190,11 +190,10 @@ public class ClientCodeMessageListener extends QueueConsumer implements Initiali
                     log.debug("eks_account is filled, creating info account: {}", account.getEks_account());
                     Pair<Long, String> accId = accountFacade.createAccountInfo(account, company);
                     accountIds.add(accId);
-                } else {
-                    List<Account> clrnAccs = validator.getStored(ClientCodeStoreObjects.CLRN_ACCS);
-                    clrnAccs.forEach(acc -> accountIds.add(new Pair<>(acc.getId(), acc.getCurrency())));
                 }
             }
+            List<Account> clrnAccs = validator.getStored(ClientCodeStoreObjects.CLRN_ACCS);
+            clrnAccs.forEach(acc -> accountIds.add(new Pair<>(acc.getId(), acc.getCurrency())));
 
             Long rubMoneyAcc = accountIds.stream()
                 .filter(pair -> CurrencyCode.RUB.equalsByKey(pair.getSecond()))
diff --git a/clearing-parent/account-service/src/main/java/ru/spcex/clearing/account/validation/GatewayEksClientCodeValidationRule.java b/clearing-parent/account-service/src/main/java/ru/spcex/clearing/account/validation/GatewayEksClientCodeValidationRule.java
index 11bf79e03..5085d924d 100644
--- a/clearing-parent/account-service/src/main/java/ru/spcex/clearing/account/validation/GatewayEksClientCodeValidationRule.java
+++ b/clearing-parent/account-service/src/main/java/ru/spcex/clearing/account/validation/GatewayEksClientCodeValidationRule.java
@@ -130,6 +130,8 @@ public enum GatewayEksClientCodeValidationRule implements IValidationRule<ImdgVa
             DepoAccount depoAccount = depoAccountOpt.get();
             Imdg<TradingClearingRegistry> imdg = context.obtainMap(IMDGDistributedNames.Map_TradingClearingRegistry,
                 TradingClearingRegistry.class);
+            Imdg<Account> accountImdg = context.obtainMap(IMDGDistributedNames.Map_Account,
+                Account.class);
             TradingClearingRegistry tcr = imdg.getFirstObjectByFieldValues(
                 Map.of(
                     "depoAccountId", depoAccount.getAccountId(),
@@ -137,7 +139,8 @@ public enum GatewayEksClientCodeValidationRule implements IValidationRule<ImdgVa
                 )
             );
             if (tcr != null) {
-                return of(AccountError.TradingClearingRegistryAlreadyExist, tcr.getCode(), "code");
+                Account account = accountImdg.getSingleObjectByID(depoAccount.getAccountId());
+                return of(AccountError.AccountForTradingClearingRegistryAlreadyUsed, account.getAccount(), "account");
             }
             return Optional.empty();
         }