From d707d6ab6e24690d04b29029965b949e694e1ab8 Mon Sep 17 00:00:00 2001
From: Aleksey Kulikov <akulikov@mfd.ru>
Date: Tue, 1 Jul 2025 13:17:09 +0300
Subject: [PATCH] http://jira.mfd.msk:8088/browse/CLS-877

---
 .../builders/ks/KSCommissionTradesReportBuilder.java   |  7 +++++--
 .../clearing/reports/db_direct/DBPredicateBuilder.java | 10 ++++++++++
 .../spcex/clearing/reports/db_direct/DBProvider.java   |  1 +
 3 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/builders/ks/KSCommissionTradesReportBuilder.java b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/builders/ks/KSCommissionTradesReportBuilder.java
index c4bea14ca..e0d1ffa2f 100644
--- a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/builders/ks/KSCommissionTradesReportBuilder.java
+++ b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/builders/ks/KSCommissionTradesReportBuilder.java
@@ -175,7 +175,7 @@ public class KSCommissionTradesReportBuilder extends CSVReportBuilder<EmptyParam
                         )
                 );
                 if (!executionDeposits.isEmpty()) {
-                    if (executionDeposits.size() > 1) log.warn("ExecutionDeposit[exchangeExecutionId = {}].size > 1, use first", registry.getGroupId());
+                    if (executionDeposits.size() > 1) log.warn("ExecutionDeposit[exchangeExecutionId = {}, market = {}].size > 1, use first", registry.getGroupId(), registry.getMarket());
                     ExecutionDeposit executionDeposit = executionDeposits.iterator().next();
                     classCode = executionDeposit.getMarket();
                 }
@@ -201,7 +201,10 @@ public class KSCommissionTradesReportBuilder extends CSVReportBuilder<EmptyParam
                 Registry tmtRegistry = registryImdg.getFirstObjectByPredicate(
                         pb.and(
                                 pb.equals("counterPartyId", registry.getCompanyId()),
-                                pb.equals("groupId", registry.getGroupId()),
+                                pb.and(
+                                    pb.equals("groupId", registry.getGroupId()),
+                                    pb.equals("market", registry.getMarket())
+                                ),
                                 tmtPredicate
                         )
                 );
diff --git a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/db_direct/DBPredicateBuilder.java b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/db_direct/DBPredicateBuilder.java
index ab47d61ac..a442b335b 100644
--- a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/db_direct/DBPredicateBuilder.java
+++ b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/db_direct/DBPredicateBuilder.java
@@ -135,6 +135,16 @@ public class DBPredicateBuilder extends ImdgPredicateBuilderHazelcast {
         );
     }
 
+    @Override
+    public ImdgPredicate alwaysTrue() {
+        return new DBPredicate(" (true) ");
+    }
+
+    @Override
+    public ImdgPredicate alwaysFalse() {
+        return new DBPredicate(" (false) ");
+    }
+
     @Override
     public ImdgPredicate sql(String sql) {
         return new DBPredicate(sql);
diff --git a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/db_direct/DBProvider.java b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/db_direct/DBProvider.java
index 339a5d9ff..193230b8d 100644
--- a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/db_direct/DBProvider.java
+++ b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/db_direct/DBProvider.java
@@ -204,6 +204,7 @@ public class DBProvider implements ImdgProvider {
         registryMatcher.put("sessionId", "session_id");
         registryMatcher.put("sessionType", "session_type");
         registryMatcher.put("paymentId", "payment_id");
+        registryMatcher.put("market", "market");
         this.fieldsMatcherForTable.put(Registry.class, registryMatcher);
 
         Map<String, String> sessionMatcher = new HashMap<>();