From 1621a3cfb9d43fa7e02641f833e5b3d612df9f85 Mon Sep 17 00:00:00 2001
From: ialbert <ialbert@mfd.ru>
Date: Wed, 31 May 2023 15:56:50 +0300
Subject: [PATCH] DealsPrepare session stage tradingDate condition

---
 .../ru/spcex/clearing/session/stage/FinalMkrSession.java | 4 ----
 .../spcex/clearing/session/stage/impl/DealsPrepare.java  | 9 ++++++++-
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/session/stage/FinalMkrSession.java b/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/session/stage/FinalMkrSession.java
index 57dab9676..a9b63a66b 100644
--- a/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/session/stage/FinalMkrSession.java
+++ b/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/session/stage/FinalMkrSession.java
@@ -19,7 +19,6 @@ import ru.spcex.platform.enumeration.SessionStatus;
 import ru.spcex.platform.enumeration.SessionType;
 import ru.spcex.platform.imdg.api.Imdg;
 import ru.spcex.platform.imdg.api.ImdgProvider;
-import ru.spcex.platform.imdg.api.predicate.ImdgPredicateBuilder;
 import ru.spcex.platform.utils.enumeration.IMessageResolver;
 
 import java.time.LocalDate;
@@ -81,9 +80,6 @@ public class FinalMkrSession extends AbstractSession implements InitializingBean
     @Override
     public void afterPropertiesSet() throws Exception {
         dealsPrepare.searchForExecutions(ExecutionType.ExecutionDeposit);
-        ImdgPredicateBuilder execFondPb = executionDepositImdg.predicateBuilder();
-        dealsPrepare.addExecutionDepositCondition(execFondPb.equals("tradingDate", LocalDate.now()));
-//        dealsPrepare.addExecutionDepositCondition(execFondPb.in("market", marketCodes.get().toArray(new String[0])));
     }
 
     @Override
diff --git a/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/session/stage/impl/DealsPrepare.java b/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/session/stage/impl/DealsPrepare.java
index 5fca664d3..7afd3c886 100644
--- a/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/session/stage/impl/DealsPrepare.java
+++ b/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/session/stage/impl/DealsPrepare.java
@@ -20,6 +20,7 @@ import ru.spcex.platform.imdg.api.ImdgProvider;
 import ru.spcex.platform.imdg.api.predicate.ImdgPredicate;
 import ru.spcex.platform.imdg.api.predicate.ImdgPredicateBuilder;
 
+import java.time.LocalDate;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.function.BiFunction;
@@ -67,7 +68,13 @@ public class DealsPrepare implements ISessionStage {
         if (securityId != null) {
             executionDepositSQL.append(" and securityId = ").append(securityId);
         }
-        ImdgPredicate sqlPredicate = executionFondImdg.predicateBuilder().sql(executionDepositSQL.toString());
+        ImdgPredicateBuilder prdctBuilder = executionFondImdg.predicateBuilder();
+
+        ImdgPredicate sqlPredicate = prdctBuilder.and(
+                prdctBuilder.sql(executionDepositSQL.toString()),
+                prdctBuilder.equals("tradingDate", LocalDate.now())
+
+        );
         BiFunction<List<ImdgPredicate>, Imdg<?>, ImdgPredicate> prdComposer = (imdgPredicates, imdg) -> {
             ImdgPredicateBuilder pb = imdg.predicateBuilder();
             if (imdgPredicates.isEmpty()) {