From 5f095e2038111a5cca314b9c7dcbaff97e2af295 Mon Sep 17 00:00:00 2001
From: akulikov <akulikov@mfd.ru>
Date: Fri, 18 Oct 2024 15:51:17 +0300
Subject: [PATCH] reports-service: KSRepLccTradesReportBuilder remove
 settlementDate condition

---
 .../reports/builders/ks/KSRepLccTradesReportBuilder.java     | 5 +----
 .../clearing/reports/services/ReportServiceTest_KS.java      | 1 +
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/builders/ks/KSRepLccTradesReportBuilder.java b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/builders/ks/KSRepLccTradesReportBuilder.java
index c8e03fe9e..7625691ea 100644
--- a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/builders/ks/KSRepLccTradesReportBuilder.java
+++ b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/builders/ks/KSRepLccTradesReportBuilder.java
@@ -81,10 +81,7 @@ public class KSRepLccTradesReportBuilder extends CSVReportBuilder<EmptyParams, K
         LocalDate now = LocalDate.now();
         ImdgPredicateBuilder pb = executionCurrencyImdg.predicateBuilder();
         Collection<ExecutionCurrency> executions = executionCurrencyImdg.getCollectionObjectsByPredicate(
-            pb.or(
-                pb.equals("tradingDate", now),
-                pb.equals("settlementDate", now)
-            )
+            pb.equals("tradingDate", now)
         );
 
         rows = new ArrayList<>(executions.size());
diff --git a/clearing-parent/reports-service/src/test/java/ru/spcex/clearing/reports/services/ReportServiceTest_KS.java b/clearing-parent/reports-service/src/test/java/ru/spcex/clearing/reports/services/ReportServiceTest_KS.java
index c1716db7f..3910e0984 100644
--- a/clearing-parent/reports-service/src/test/java/ru/spcex/clearing/reports/services/ReportServiceTest_KS.java
+++ b/clearing-parent/reports-service/src/test/java/ru/spcex/clearing/reports/services/ReportServiceTest_KS.java
@@ -1396,6 +1396,7 @@ public class ReportServiceTest_KS {
 
         ExecutionCurrency executionCurrency_2 = new ExecutionCurrency();
         executionCurrency_2.setSessionId(session_2.getId());
+        executionCurrency_2.setTradingDate(LocalDate.now());
         executionCurrency_2.setSettlementDate(LocalDate.now());
         executionCurrency_2.setSessionId(SESSION_ID_2);
         executionCurrency_2.setExchangeExecutionId(123L);