From e6ede79021c8cb721bdb8428b5c9ead55148c1e7 Mon Sep 17 00:00:00 2001
From: akulikov <akulikov@mfd.ru>
Date: Thu, 9 Nov 2023 14:59:11 +0300
Subject: [PATCH] http://jira.mfd.msk:8088/browse/CLS-497

---
 .../reports/builders/ks/KSCommissionTradesReportBuilder.java | 5 +++--
 .../clearing/reports/services/ReportServiceTest_BP.java      | 2 +-
 2 files changed, 4 insertions(+), 3 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 7ca025d53..74efb4bba 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
@@ -78,13 +78,14 @@ public class KSCommissionTradesReportBuilder extends CSVReportBuilder<EmptyParam
         ImdgPredicate finalPredicate = pb.and(
                 pb.sql(sql),
                 pb.greatEqual("refundDate", nowDate),
-                pb.less("valueDate", nowDate),
-                pb.or(pb.equals("sessionType", SessionType.XDEP.getKey()), pb.equals("sessionType", SessionType.FINL.getKey()))
+                pb.lessEqual("valueDate", nowDate),
+                pb.in("sessionType", SessionType.XDEP.getKey(), SessionType.FINL.getKey(), SessionType.MEDM.getKey())
         );
         Collection<Registry> registries = registryImdg.getCollectionObjectsByPredicate(finalPredicate);
         log.debug("Found {} Registry by query: {}", registries.size(), finalPredicate);
         rows = new ArrayList<>(registries.size());
         for (Registry registry : registries) {
+            if (registry.getValueDate().equals(registry.getSettlementDate())) continue;
             if (registry.getTradingDate() == null) {
                 log.warn("For registry id = {} field TradingDate was null, registry was skipped",
                         registry.getId());
diff --git a/clearing-parent/reports-service/src/test/java/ru/spcex/clearing/reports/services/ReportServiceTest_BP.java b/clearing-parent/reports-service/src/test/java/ru/spcex/clearing/reports/services/ReportServiceTest_BP.java
index 133cf1f4e..04b5531be 100644
--- a/clearing-parent/reports-service/src/test/java/ru/spcex/clearing/reports/services/ReportServiceTest_BP.java
+++ b/clearing-parent/reports-service/src/test/java/ru/spcex/clearing/reports/services/ReportServiceTest_BP.java
@@ -419,7 +419,7 @@ public class ReportServiceTest_BP {
 
         File outFile = outFolder.listFiles()[0];
         File expectedFile = new File(getClass().getClassLoader().getResource("expected_reports_csv/bp/KS_BR_PFX65_DEALS_expected.csv").getFile());
-        compareCSVFiles(expectedFile, outFile, List.of());
+        compareCSVFiles(expectedFile, outFile, List.of("TRADEDATE"));
 
         testExecutionFond.setSessionId(oldExecutionFondSessionId);
         testExecutionFond.setCoverageStatus(oldExecutionFondCoverageStatus);