From 45008556abd60a8ba7b10bbe7b6a69366e5bad49 Mon Sep 17 00:00:00 2001
From: AKurakin <akurakin@mfd.ru>
Date: Mon, 18 Sep 2023 12:46:04 +0300
Subject: [PATCH] =?UTF-8?q?account-service=20http://jira.mfd.msk:8088/brow?=
 =?UTF-8?q?se/CLS-509=20http://jira.mfd.msk:8088/browse/CLS-542=20=D0=B8?=
 =?UTF-8?q?=D0=BC=D1=8F=20=D1=81=D1=87=D0=B5=D1=82=D0=BE=D0=B2=20=D1=83?=
 =?UTF-8?q?=D0=BD=D0=B8=D0=BA=D0=B0=D0=BB=D1=8C=D0=BD=D0=BE=D0=B5=20=D0=BC?=
 =?UTF-8?q?=D0=B5=D0=B6=D0=B4=D1=83=20=D0=B2=D1=81=D0=B5=D0=BC=D0=B8=20?=
 =?UTF-8?q?=D1=82=D0=B8=D0=BF=D0=B0=D0=BC=D0=B8=20(=D0=BF=D0=BE=D0=BF?=
 =?UTF-8?q?=D1=80=D0=B0=D0=B2=D0=B8=D0=BB=20=D0=B4=D0=BB=D1=8F=20=D1=81?=
 =?UTF-8?q?=D0=BE=D0=B7=D0=B4=D0=B0=D0=BD=D0=B8=D1=8F=20=D0=BF=D0=BE=20sdf?=
 =?UTF-8?q?01-sdf08)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../account/config/validation/SameAccountValidationRule.java    | 2 +-
 .../spcex/clearing/account/service/ClearingAccountService.java  | 2 +-
 .../ru/spcex/clearing/account/service/DepoAccountService.java   | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/clearing-parent/account-service/src/main/java/ru/spcex/clearing/account/config/validation/SameAccountValidationRule.java b/clearing-parent/account-service/src/main/java/ru/spcex/clearing/account/config/validation/SameAccountValidationRule.java
index e30fd631a..fed529fdf 100644
--- a/clearing-parent/account-service/src/main/java/ru/spcex/clearing/account/config/validation/SameAccountValidationRule.java
+++ b/clearing-parent/account-service/src/main/java/ru/spcex/clearing/account/config/validation/SameAccountValidationRule.java
@@ -33,7 +33,7 @@ class SameAccountValidationRule<R> implements IValidationRule<ImdgValidationCont
         ImdgPredicateBuilder pb = accountImdg.predicateBuilder();
         ImdgPredicate query = pb.and(
                 pb.equals("account", accountGetter.apply(req)), // req.getAccount()
-                pb.equals("accountType", accountType),
+//                pb.equals("accountType", accountType), имена всех счетов уникальны, вне зависимости от типа
                 pb.in("status", ServiceStatus.Active.getKey(), ServiceStatus.Reopened.getKey(), ServiceStatus.Appl.getKey())
         );
         Account existAccount = accountImdg.getFirstObjectByPredicate(query);
diff --git a/clearing-parent/account-service/src/main/java/ru/spcex/clearing/account/service/ClearingAccountService.java b/clearing-parent/account-service/src/main/java/ru/spcex/clearing/account/service/ClearingAccountService.java
index 1e7341809..d5d337440 100644
--- a/clearing-parent/account-service/src/main/java/ru/spcex/clearing/account/service/ClearingAccountService.java
+++ b/clearing-parent/account-service/src/main/java/ru/spcex/clearing/account/service/ClearingAccountService.java
@@ -259,7 +259,7 @@ public class ClearingAccountService extends QueueConsumer implements Initializin
                     }
                 }
 
-                if (accountImdg.getFirstObjectBySQL("accountType = '%s' and account = '%s'".formatted(AccountType.Clrn.getKey(), accountReq.getAccount())) != null) {
+                if (accountImdg.getFirstObjectBySQL("account = '%s'".formatted(accountReq.getAccount())) != null) {
                     log.debug("Account {} already exists", accountReq.getAccount());
                     {
                         AccountSdfToStatementRequestPart responsePart = new AccountSdfToStatementRequestPart();
diff --git a/clearing-parent/account-service/src/main/java/ru/spcex/clearing/account/service/DepoAccountService.java b/clearing-parent/account-service/src/main/java/ru/spcex/clearing/account/service/DepoAccountService.java
index 65418b9db..d8300b86b 100644
--- a/clearing-parent/account-service/src/main/java/ru/spcex/clearing/account/service/DepoAccountService.java
+++ b/clearing-parent/account-service/src/main/java/ru/spcex/clearing/account/service/DepoAccountService.java
@@ -168,7 +168,7 @@ public class DepoAccountService extends QueueConsumer implements InitializingBea
                         continue accountsLoop;
                     }
                 }
-                if (accountImdg.getFirstObjectBySQL("accountType = '%s' and account = '%s'".formatted(AccountType.Depo.getKey(), accountReq.getAccount())) != null) {
+                if (accountImdg.getFirstObjectBySQL("account = '%s'".formatted(accountReq.getAccount())) != null) {
                     log.debug("Account {} already exists", accountReq.getAccount());
                     {
                         AccountSdfToStatementRequestPart responsePart = new AccountSdfToStatementRequestPart();