From 3bf9d651cde768258be460831c88e204a887db1d Mon Sep 17 00:00:00 2001
From: etreschenkov <etreschenkov@mfd.ru>
Date: Mon, 29 May 2023 18:33:28 +0300
Subject: [PATCH] http://jira.mfd.msk:8088/browse/CLS-290

---
 .../stage/impl/InspectionObligations.java     | 23 +++++++++++++------
 1 file changed, 16 insertions(+), 7 deletions(-)

diff --git a/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/session/stage/impl/InspectionObligations.java b/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/session/stage/impl/InspectionObligations.java
index e464dcc9d..51e1ee39a 100644
--- a/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/session/stage/impl/InspectionObligations.java
+++ b/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/session/stage/impl/InspectionObligations.java
@@ -71,6 +71,11 @@ public class InspectionObligations implements ISessionStage {
                 null,
                 RegistryUnit.T);
 
+        RegistryTradingParams registryTradingParamsTST = new RegistryTradingParams(RegistryDesignation.T,
+                RegistryInstrumentType.S,
+                null,
+                RegistryUnit.T);
+
         RegistryTradingParams registryTradingParamsTMT = new RegistryTradingParams(RegistryDesignation.T,
                 RegistryInstrumentType.M,
                 null,
@@ -78,7 +83,7 @@ public class InspectionObligations implements ISessionStage {
 
 
         String sqlCondition = String.format("%s and registryStatus = '%s'",
-                RegistryCodeSqlBuilder.getInstance(registryTradingParamsOST, registryTradingParamsTMT, registryTradingParamsOMT).build(),
+                RegistryCodeSqlBuilder.getInstance(registryTradingParamsOST, registryTradingParamsTMT, registryTradingParamsOMT, registryTradingParamsTST).build(),
                 RegistryStatus.POOL.getKey());
 
         Collection<Registry> obligations = registryImdg.getCollectionObjectsBySQL(sqlCondition);
@@ -92,10 +97,6 @@ public class InspectionObligations implements ISessionStage {
                 log.debug("Skip insecurity groupId: {}", currentRegistry.getGroupId());
                 continue;
             }
-            if (IEnumKey.getEnumByKey(RegistryDesignation.class, currentRegistry.getRegistryDesignation()) == RegistryDesignation.O) {
-                log.debug("Its t registry, skip");
-                continue;
-            }
 
             RegistryTradingParams counterRegistryTradingParams = null;
             if (IEnumKey.getEnumByKey(RegistryDesignation.class, currentRegistry.getRegistryDesignation()) == RegistryDesignation.O
@@ -112,15 +113,23 @@ public class InspectionObligations implements ISessionStage {
                         RegistryUnit.F);
             }
 
+            if (counterRegistryTradingParams == null) {
+                continue;
+            }
             String sqlCounterRegistryCondition = String.format("%s and " +
                             "tradingClearingRegistryId = '%s' and " +
-                            "companyId = '%s' and ",
+                            "companyId = '%s'",
                     RegistryCodeSqlBuilder.getInstance(counterRegistryTradingParams).build(),
                     currentRegistry.getTradingClearingRegistryId(),
                     currentRegistry.getCompanyId());
             Registry counterRegistry = registryImdg.getSingleObjectBySQL(sqlCounterRegistryCondition);
+            if (counterRegistry == null) {
+                log.warn("Not found registry by params: {}", sqlCounterRegistryCondition);
+                continue;
+            }
             if (currentRegistry.getBalance().compareTo(counterRegistry.getBalance()) > 0) {
-                log.warn("{}", msgResolver.resolve(new EnumMessage(ClearingError.InsecurityObligation, currentRegistry.getCompanyId())));
+                log.warn("groupId: {}: {}", currentRegistry.getGroupId(),
+                        msgResolver.resolve(new EnumMessage(ClearingError.InsecurityObligation, currentRegistry.getCompanyId())));
                 currentRegistry.setRegistryStatus("UNCV");
                 alreadyUpdatedToUncover.add(currentRegistry.getId());
                 insecurityGroups.add(currentRegistry.getGroupId());