From c705b4e27c9b40a7719c9f576713566a393c5aff Mon Sep 17 00:00:00 2001
From: AKurakin <akurakin@mfd.ru>
Date: Mon, 4 Mar 2024 13:03:51 +0300
Subject: [PATCH] registry-service http://jira.mfd.msk:8088/browse/CLS-653
 improvement MoneyBalanceRegisterService

---
 .../reports/builders/ExecutionRegisterReportBuilder.java  | 8 +++++++-
 .../registry/service/MoneyBalanceRegisterService.java     | 1 +
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/clearing-parent/registry-service/src/main/java/ru/spcex/clearing/registry/reports/builders/ExecutionRegisterReportBuilder.java b/clearing-parent/registry-service/src/main/java/ru/spcex/clearing/registry/reports/builders/ExecutionRegisterReportBuilder.java
index 488f17e55..a8762f3b9 100644
--- a/clearing-parent/registry-service/src/main/java/ru/spcex/clearing/registry/reports/builders/ExecutionRegisterReportBuilder.java
+++ b/clearing-parent/registry-service/src/main/java/ru/spcex/clearing/registry/reports/builders/ExecutionRegisterReportBuilder.java
@@ -93,7 +93,7 @@ public class ExecutionRegisterReportBuilder extends XLSXReportBuilder<ExecutionR
                     entity.setBuyerCode(companySymbolsByCompanyId.getCompanySymbolValue());
                 }
                 entity.setBuyerTkr(input.getPartyTradingClearingRegistry());
-            }
+            } else
             if (Arrays.asList(Side.SELL.getKey(), MoneyFlowSide.SELL.getKey()).contains(input.getSide().toUpperCase())) {
                 if (companyByCompanyId != null) {
                     entity.setSeller(companyByCompanyId.getShortName());
@@ -108,7 +108,13 @@ public class ExecutionRegisterReportBuilder extends XLSXReportBuilder<ExecutionR
                     entity.setBuyerCode(companySymbolsByCounterPartyId.getCompanySymbolValue());
                 }
                 entity.setBuyerTkr(input.getCounterPartyTradingClearingRegistry());
+            } else {
+                log.warn("{}[{}] has wrong or empty field: side={}. Can not fill buyer/seller.",
+                        input.getClass().getSimpleName(), input.getId(), input.getSide());
             }
+        } else {
+            log.warn("{}[{}] has wrong or empty field: side={} CompanyId={} CounterPartyId={}. Can not fill buyer/seller.",
+                    input.getClass().getSimpleName(), input.getId(), input.getSide(), input.getCompanyId(), input.getCounterPartyId());
         }
 
         if (input.getExchangeExecutionTime() != null)
diff --git a/clearing-parent/registry-service/src/main/java/ru/spcex/clearing/registry/service/MoneyBalanceRegisterService.java b/clearing-parent/registry-service/src/main/java/ru/spcex/clearing/registry/service/MoneyBalanceRegisterService.java
index 1575fbea1..ff0d31ccf 100644
--- a/clearing-parent/registry-service/src/main/java/ru/spcex/clearing/registry/service/MoneyBalanceRegisterService.java
+++ b/clearing-parent/registry-service/src/main/java/ru/spcex/clearing/registry/service/MoneyBalanceRegisterService.java
@@ -148,6 +148,7 @@ public class MoneyBalanceRegisterService extends QueueConsumer implements Initia
         ImdgPredicate finalPredicate = pb.and(
                 registryPredicate,
                 pb.notNull("object.tradingClearingRegistry"),
+                pb.equals("object.accountType", AccountType.Info.getKey()),
                 pb.and(
                         pb.greatEqual("eventTime", now),
                         pb.less("eventTime", now.plus(1, ChronoUnit.DAYS))