Merge remote-tracking branch 'origin/dev' into dev

clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/session/stage/FinalMkrSession.java

@@ -88,11 +88,13 @@ public class FinalMkrSession extends AbstractSession implements InitializingBean
         //fixme спросить у Кости нужны ли эти поправки
         ImdgPredicateBuilder rgsPrctBuilder = registryImdg.predicateBuilder();
         inclusionObligations.addRegistryCondition(
-                rgsPrctBuilder.or(rgsPrctBuilder.equals("registryStatus", RegistryStatus.PROC.getKey()),
+                rgsPrctBuilder.and(
-                        rgsPrctBuilder.equals("registryStatus", RegistryStatus.MNG.getKey()))
+                        rgsPrctBuilder.or(
-        );
+                                rgsPrctBuilder.equals("registryStatus", RegistryStatus.PROC.getKey()),
-        inclusionObligations.addRegistryCondition(
+                                rgsPrctBuilder.equals("registryStatus", RegistryStatus.MNG.getKey())
-                rgsPrctBuilder.less("valueDate", LocalDate.now())
+                        ),
+                        rgsPrctBuilder.lessEqual("valueDate", LocalDate.now())
+                )
         );
         inspectionObligations.setSessionType(sectionType());
     }

clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/session/stage/ReturnDepositSession.java

@@ -75,11 +75,13 @@ public class ReturnDepositSession extends AbstractSession implements Initializin
     public void afterPropertiesSet() throws Exception {
         ImdgPredicateBuilder rgsPrctBuilder = registryImdg.predicateBuilder();
         inclusionObligations.addRegistryCondition(
-                rgsPrctBuilder.or(rgsPrctBuilder.equals("registryStatus", RegistryStatus.PROC.getKey()),
+                rgsPrctBuilder.and(
-                        rgsPrctBuilder.equals("registryStatus", RegistryStatus.MNG.getKey()))
+                        rgsPrctBuilder.or(
-        );
+                                rgsPrctBuilder.equals("registryStatus", RegistryStatus.PROC.getKey()),
-        inclusionObligations.addRegistryCondition(
+                                rgsPrctBuilder.equals("registryStatus", RegistryStatus.MNG.getKey())
-                rgsPrctBuilder.less("valueDate", LocalDate.now())
+                        ),
+                        rgsPrctBuilder.less("valueDate", LocalDate.now())
+                )
         );
 
     }
@@ -120,7 +122,6 @@ public class ReturnDepositSession extends AbstractSession implements Initializin
             //stage 4
             {
                 InclusionToPoolPayload inclusionToPoolPayload = new InclusionToPoolPayload();
-                inclusionToPoolPayload.setSessionType(currSession.getSessionType());
                 runStage(TaskType.InclusionToPool, inclusionToPoolPayload, inclusionObligations);
             }
             //stage 5

clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/session/stage/impl/InclusionObligations.java

@@ -13,7 +13,10 @@ import ru.spcex.clearing.session.stage.ISessionStage;
 import ru.spcex.clearing.session.stage.StageResult;
 import ru.spcex.clearing.session.stage.Task;
 import ru.spcex.clearing.session.stage.task.InclusionToPoolPayload;
+import ru.spcex.platform.enumeration.RegistryDesignation;
+import ru.spcex.platform.enumeration.RegistryInstrumentType;
 import ru.spcex.platform.enumeration.RegistryStatus;
+import ru.spcex.platform.enumeration.RegistryUnit;
 import ru.spcex.platform.imdg.api.Imdg;
 import ru.spcex.platform.imdg.api.ImdgId;
 import ru.spcex.platform.imdg.api.ImdgProvider;
@@ -74,22 +77,25 @@ public class InclusionObligations implements ISessionStage {
     private StageResult inclusionToPool(String sessionType, Long counterPartyId) {
         String sqlCondition = String.format("registryDesignation in ('%s', '%s') and " +
                         "registryInstrumentType in ('%s', '%s') and " +
-                        "registryUnit = '%s' and " +
+                        "registryUnit = '%s'",
-                        "sessionType = '%s'",
+                RegistryDesignation.O.getKey(), RegistryDesignation.T.getKey(),
-                "O", "T",
+                RegistryInstrumentType.S.getKey(), RegistryInstrumentType.M.getKey(),
-                "S", "M",
+                RegistryUnit.T.getKey());
-                "T",
-                sessionType);
         ImdgPredicateBuilder prdctBuilder = registryImdg.predicateBuilder();
+        ImdgPredicate defaultCondition = prdctBuilder.sql(sqlCondition);
+        if (sessionType != null) {
+            //не всегда нужное условие
+            defaultCondition = prdctBuilder.and(defaultCondition, prdctBuilder.equals("sessionType", sessionType));
+        }
         ImdgPredicate registryPredicate;
         if (registryConditions.size() > 0) {
             registryPredicate = prdctBuilder.and(
-                    prdctBuilder.sql(sqlCondition),
+                    defaultCondition,
                     prdctBuilder.and(registryConditions.toArray(new ImdgPredicate[0]))
             );
         } else {
             registryPredicate = prdctBuilder.and(
-                    prdctBuilder.sql(sqlCondition),
+                    defaultCondition,
                     prdctBuilder.equals("registryStatus", RegistryStatus.PROC.getKey())
             );
         }

platform-parent/platform-utils/src/main/java/ru/spcex/platform/utils/collection/Pair.java

@@ -1,5 +1,7 @@
 package ru.spcex.platform.utils.collection;
 
+import java.util.function.Consumer;
+
 public class Pair<T1, T2> {
     private T1 first;
     private T2 second;
@@ -24,4 +26,9 @@ public class Pair<T1, T2> {
     public void setSecond(T2 second) {
         this.second = second;
     }
+
+    public static <T1> void forEach(Pair<T1, T1> p, Consumer<T1> consumer) {
+        consumer.accept(p.getFirst());
+        consumer.accept(p.getSecond());
+    }
 }