From 317b24748c48123f5b7af350f458aa850bdce332 Mon Sep 17 00:00:00 2001
From: akulikov <akulikov@mfd.ru>
Date: Thu, 31 Aug 2023 12:13:33 +0300
Subject: [PATCH] http://jira.mfd.msk:8088/browse/CLS-497 change predicate

---
 .../reports/bp/ExecutedDealReportBuilder_INFTYPE_1.java      | 5 +----
 .../reports/bp/ExecutedDealReportBuilder_INFTYPE_2.java      | 5 +----
 .../reports/reports/bp/UnfulfilledDealReportBuilder.java     | 4 +---
 3 files changed, 3 insertions(+), 11 deletions(-)

diff --git a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/bp/ExecutedDealReportBuilder_INFTYPE_1.java b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/bp/ExecutedDealReportBuilder_INFTYPE_1.java
index 31f8eadd7..efc4f1e79 100644
--- a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/bp/ExecutedDealReportBuilder_INFTYPE_1.java
+++ b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/bp/ExecutedDealReportBuilder_INFTYPE_1.java
@@ -9,7 +9,6 @@ import ru.spcex.platform.imdg.api.predicate.ImdgPredicateBuilder;
 
 import java.time.LocalDate;
 import java.util.Collection;
-import java.util.List;
 
 @Component
 public class ExecutedDealReportBuilder_INFTYPE_1 extends ExecutedDealReportBuilderCommon<SessionIdParam> {
@@ -31,11 +30,9 @@ public class ExecutedDealReportBuilder_INFTYPE_1 extends ExecutedDealReportBuild
     @Override
     protected Collection<ExecutionFond> getExecutionFondsForReport(SessionIdParam params) {
         ImdgPredicateBuilder pb = executionFondImdg.predicateBuilder();
-        List<Long> sessionIds = params.getSessionId();
-        if (sessionIds == null || sessionIds.isEmpty()) sessionIds = getSessionIdsForCurrentDate(sessionImdg);
         return executionFondImdg.getCollectionObjectsByPredicate(
                 pb.and(
-                        pb.in("sessionId", sessionIds.toArray(new Long[0])),
+                        pb.notNull("sessionId"),
                         pb.less("tradingDate", LocalDate.now()),
                         pb.equals("settlementDate", LocalDate.now())
                 )
diff --git a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/bp/ExecutedDealReportBuilder_INFTYPE_2.java b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/bp/ExecutedDealReportBuilder_INFTYPE_2.java
index 04a0a7b4b..7b4917075 100644
--- a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/bp/ExecutedDealReportBuilder_INFTYPE_2.java
+++ b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/bp/ExecutedDealReportBuilder_INFTYPE_2.java
@@ -9,7 +9,6 @@ import ru.spcex.platform.imdg.api.predicate.ImdgPredicateBuilder;
 
 import java.time.LocalDate;
 import java.util.Collection;
-import java.util.List;
 
 @Component
 public class ExecutedDealReportBuilder_INFTYPE_2 extends ExecutedDealReportBuilderCommon<SessionIdParam> {
@@ -31,11 +30,9 @@ public class ExecutedDealReportBuilder_INFTYPE_2 extends ExecutedDealReportBuild
     @Override
     protected Collection<ExecutionFond> getExecutionFondsForReport(SessionIdParam params) {
         ImdgPredicateBuilder pb = executionFondImdg.predicateBuilder();
-        List<Long> sessionIds = params.getSessionId();
-        if (sessionIds == null || sessionIds.isEmpty()) sessionIds = getSessionIdsForCurrentDate(sessionImdg);
         return executionFondImdg.getCollectionObjectsByPredicate(
                 pb.and(
-                        pb.in("sessionId",sessionIds.toArray(new Long[0])),
+                        pb.notNull("sessionId"),
                         pb.equals("tradingDate", LocalDate.now()),
                         pb.equals("settlementDate", LocalDate.now())
                 )
diff --git a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/bp/UnfulfilledDealReportBuilder.java b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/bp/UnfulfilledDealReportBuilder.java
index ff8937942..7c5fa19f3 100644
--- a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/bp/UnfulfilledDealReportBuilder.java
+++ b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/bp/UnfulfilledDealReportBuilder.java
@@ -66,10 +66,8 @@ public class UnfulfilledDealReportBuilder extends CSVReportBuilder<SessionIdPara
     @Override
     protected void collect(SessionIdParam params) {
         ImdgPredicateBuilder pb = executionFondImdg.predicateBuilder();
-        List<Long> sessionIds = params.getSessionId();
-        if (sessionIds == null || sessionIds.isEmpty()) sessionIds = getSessionIdsForCurrentDate(sessionImdg);
         ImdgPredicate predicate = pb.and(
-                pb.in("sessionId", sessionIds.toArray(new Long[0])),
+                pb.notNull("sessionId"),
                 pb.equals("coverageStatus", Allowed.DENIED.getKey())
         );
         Collection<ExecutionFond> executionFonds = executionFondImdg.getCollectionObjectsByPredicate(predicate);