From a998f75ed9ec2d93b05d9414f735c10db8a529ec Mon Sep 17 00:00:00 2001
From: AKurakin <akurakin@mfd.ru>
Date: Fri, 7 Jul 2023 14:20:49 +0300
Subject: [PATCH] =?UTF-8?q?account-service=20http://jira.mfd.msk:8088/brow?=
 =?UTF-8?q?se/CLS-271=20=D0=BF=D0=BE=D0=BF=D1=80=D0=B0=D0=B2=D0=B8=D0=BB?=
 =?UTF-8?q?=20=D0=B2=D0=B0=D0=BB=D0=B8=D0=B4=D0=B0=D1=86=D0=B8=D1=8E.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../TradingClearingRegistryValidationConfig.java         | 9 ++-------
 .../ru/spcex/clearing/account/errors/AccountError.java   | 2 +-
 .../account/service/TradingClearingRegistryService.java  | 2 ++
 3 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/clearing-parent/account-service/src/main/java/ru/spcex/clearing/account/config/validation/TradingClearingRegistryValidationConfig.java b/clearing-parent/account-service/src/main/java/ru/spcex/clearing/account/config/validation/TradingClearingRegistryValidationConfig.java
index 47960f9e4..ac11c2bb5 100644
--- a/clearing-parent/account-service/src/main/java/ru/spcex/clearing/account/config/validation/TradingClearingRegistryValidationConfig.java
+++ b/clearing-parent/account-service/src/main/java/ru/spcex/clearing/account/config/validation/TradingClearingRegistryValidationConfig.java
@@ -125,12 +125,7 @@ public class TradingClearingRegistryValidationConfig {
                             ServiceStatusDictionary.class,
                             AccountError.RequiredFieldEmpty,
                             AccountError.WrongFieldValue,
-                            false,
-                            statusValue -> {
-                                String statusCode = statusValue.getCode();
-                                if (ServiceStatus.Active.equalsByKey(statusCode)) return null;
-                                return AccountError.WrongFieldValue;
-                            }),
+                            false),
                     new newTCRDuplicateCheck()
             );
         };
@@ -162,7 +157,7 @@ public class TradingClearingRegistryValidationConfig {
                 return empty();
             } else {
                 String tcrIds = existTCR.stream().map(tcr -> String.valueOf(tcr.getId())).collect(Collectors.joining(";"));
-                return of(AccountError.AccountForTradingClearingRegistryAlreadyUsed, validatedObject.getCompanyId(), tcrIds);
+                return of(AccountError.AccountForTradingClearingRegistryAlreadyUsed, tcrIds);
             }
         }
     }
diff --git a/clearing-parent/account-service/src/main/java/ru/spcex/clearing/account/errors/AccountError.java b/clearing-parent/account-service/src/main/java/ru/spcex/clearing/account/errors/AccountError.java
index d6369f9c9..ad479b785 100644
--- a/clearing-parent/account-service/src/main/java/ru/spcex/clearing/account/errors/AccountError.java
+++ b/clearing-parent/account-service/src/main/java/ru/spcex/clearing/account/errors/AccountError.java
@@ -20,8 +20,8 @@ public enum AccountError implements IErrorEnumId {
     MoneyAccountNotFound(5018L),
     ClearingCategoryNotFound(5019L),
     ClearingCompanySymbolNotFound(5022L), // Для компании %s отсутствует клиринговый код».
+    AccountForTradingClearingRegistryAlreadyUsed(5023L),
     TradingClearingRegistryNotFound(3022L),
-    AccountForTradingClearingRegistryAlreadyUsed(3023L),
     ;
 
     private final Long id;
diff --git a/clearing-parent/account-service/src/main/java/ru/spcex/clearing/account/service/TradingClearingRegistryService.java b/clearing-parent/account-service/src/main/java/ru/spcex/clearing/account/service/TradingClearingRegistryService.java
index 14be75988..fb9172df7 100644
--- a/clearing-parent/account-service/src/main/java/ru/spcex/clearing/account/service/TradingClearingRegistryService.java
+++ b/clearing-parent/account-service/src/main/java/ru/spcex/clearing/account/service/TradingClearingRegistryService.java
@@ -306,8 +306,10 @@ public class TradingClearingRegistryService extends QueueConsumer implements Ini
 
         if (req.getStatus() == null) {
             tradingClearingRegistry.setStatus(ServiceStatus.Active.getKey());
+            log.trace("TCR status in request not set. Use default: {}", tradingClearingRegistry.getStatus());
         } else {
             tradingClearingRegistry.setStatus(req.getStatus());
+            log.trace("TCR status in request set: {}", tradingClearingRegistry.getStatus());
         }
 
         String tradingRegistryType;