From 553d829b4f9789e24ac0c2b4f144c8095e140e5b Mon Sep 17 00:00:00 2001
From: ialbert <ialbert@mfd.ru>
Date: Mon, 2 Oct 2023 11:13:31 +0300
Subject: [PATCH 1/3] when account is ANLT TCR search fix status condition

---
 .../main/java/ru/spcex/clearing/service/AnltSearcher.java    | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/service/AnltSearcher.java b/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/service/AnltSearcher.java
index 5eed48609..4b654bd81 100644
--- a/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/service/AnltSearcher.java
+++ b/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/service/AnltSearcher.java
@@ -52,7 +52,10 @@ public class AnltSearcher {
         ImdgPredicateBuilder pb = tradingClearingRegistryImdg.predicateBuilder();
         ImdgPredicate tcrPredicate = pb.and(
                 pb.equals("code", commentTcrStripped),
-                pb.equals("status", ServiceStatus.Active.getKey())
+                pb.or(
+                        pb.equals("status", ServiceStatus.Active.getKey()),
+                        pb.equals("status", ServiceStatus.Reopened.getKey())
+                )
         );
 
         TradingClearingRegistry tcr = tradingClearingRegistryImdg.getSingleObjectByPredicate(tcrPredicate);

From 93080c76c91e8e3249ab67c2d1bf4274d592b454 Mon Sep 17 00:00:00 2001
From: ialbert <ialbert@mfd.ru>
Date: Mon, 2 Oct 2023 11:17:24 +0300
Subject: [PATCH 2/3] IdentificationFundsValidationRule TCR search status

---
 .../service/validation/IdentificationFundsValidationRule.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/service/validation/IdentificationFundsValidationRule.java b/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/service/validation/IdentificationFundsValidationRule.java
index 672acc2a8..544d695b8 100644
--- a/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/service/validation/IdentificationFundsValidationRule.java
+++ b/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/service/validation/IdentificationFundsValidationRule.java
@@ -84,7 +84,7 @@ public enum IdentificationFundsValidationRule implements IValidationRule<ImdgVal
             if (tcr == null) {
                 return of(ClearingError.TCRegistryNotFound, validatedObject.getTradingClearingRegistryId());
             }
-            if (!ServiceStatus.Active.equalsByKey(tcr.getStatus())) {
+            if (!ServiceStatus.Active.equalsByKey(tcr.getStatus()) && !ServiceStatus.Reopened.equalsByKey(tcr.getStatus())) {
                 return of(ClearingError.TradingClearingRegistryNotActive, tcr.getCode());
             }
 

From 5aca4dc82ff5027d4e3db2d8e58c4d9697c29c33 Mon Sep 17 00:00:00 2001
From: ialbert <ialbert@mfd.ru>
Date: Mon, 2 Oct 2023 12:56:17 +0300
Subject: [PATCH 3/3] SDF57 gateway request only when
 A**T.TradingClearingRegistry not empty

---
 .../clearing/service/executors/Sdf57Executor.java | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/service/executors/Sdf57Executor.java b/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/service/executors/Sdf57Executor.java
index 4986c50fd..6885b4ae4 100644
--- a/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/service/executors/Sdf57Executor.java
+++ b/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/service/executors/Sdf57Executor.java
@@ -355,11 +355,16 @@ public class Sdf57Executor extends AbstractExecutor<SDf57> {
                     statementImdg.update(stmt);
                     log.debug("stmt.id={} status -> {}", stmt.getId(), OperationStatus.Executed.getKey());
                     if (!dm_tWasCreated && timeService.isTradingTime() && InOutDirection.in.equalsByKey(stmt.getInOutDirection())) {
-                        log.trace("sending gateway request for stmt.id={}", stmt.getId());
-                        kafka.sendRequestToQueue(Consts.ASSET_OPERATION,
-                                gatewayRequest(stmt,
-                                        company.getTradingCode(),
-                                        asts.a__t().getTradingClearingRegistry()));
+                        if (TextUtil.isEmpty(asts.a__t().getTradingClearingRegistry())) {
+                            log.trace("stmt.id={} {}.id={} TCR is empty, skipping gateway request",
+                                    stmt.getId(), asts.a__t().getRegistryCode(), asts.a__t().getId());
+                        } else {
+                            log.trace("sending gateway request for stmt.id={}", stmt.getId());
+                            kafka.sendRequestToQueue(Consts.ASSET_OPERATION,
+                                    gatewayRequest(stmt,
+                                            company.getTradingCode(),
+                                            asts.a__t().getTradingClearingRegistry()));
+                        }
                     }
                     return Optional.of(asts);
                 } else {