http://jira.mfd.msk:8088/browse/CLS-497

clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/bp/ExecutedDealReportBuilder_INFTYPE_1.java

@@ -3,6 +3,8 @@ package ru.spcex.clearing.reports.reports.bp;
 import org.springframework.stereotype.Component;
 import ru.clearing.classes.statics.data.execution.ExecutionFond;
 import ru.spcex.clearing.reports.reports.SessionIdParam;
+import ru.spcex.platform.enumeration.CoverageStatus;
+import ru.spcex.platform.enumeration.MoneyFlowSide;
 import ru.spcex.platform.enumeration.ReportKeys;
 import ru.spcex.platform.enumeration.Side;
 import ru.spcex.platform.imdg.api.ImdgProvider;
@@ -36,7 +38,11 @@ public class ExecutedDealReportBuilder_INFTYPE_1 extends ExecutedDealReportBuild
                         pb.notNull("sessionId"),
                         pb.less("tradingDate", LocalDate.now()),
                         pb.equals("settlementDate", LocalDate.now()),
-                        pb.equals("side", Side.SELL.getKey())
+                        pb.or(
+                                pb.equals("side", Side.SELL.getKey()),
+                                pb.equals("side", MoneyFlowSide.SELL.getKey())
+                        ),
+                        pb.equals("coverageStatus", CoverageStatus.ALWD)
                 )
         );
     }

clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/bp/ExecutedDealReportBuilder_INFTYPE_2.java

@@ -3,6 +3,8 @@ package ru.spcex.clearing.reports.reports.bp;
 import org.springframework.stereotype.Component;
 import ru.clearing.classes.statics.data.execution.ExecutionFond;
 import ru.spcex.clearing.reports.reports.SessionIdParam;
+import ru.spcex.platform.enumeration.CoverageStatus;
+import ru.spcex.platform.enumeration.MoneyFlowSide;
 import ru.spcex.platform.enumeration.ReportKeys;
 import ru.spcex.platform.enumeration.Side;
 import ru.spcex.platform.imdg.api.ImdgProvider;
@@ -36,7 +38,11 @@ public class ExecutedDealReportBuilder_INFTYPE_2 extends ExecutedDealReportBuild
                         pb.notNull("sessionId"),
                         pb.equals("tradingDate", LocalDate.now()),
                         pb.equals("settlementDate", LocalDate.now()),
-                        pb.equals("side", Side.SELL.getKey())
+                        pb.or(
+                                pb.equals("side", Side.SELL.getKey()),
+                                pb.equals("side", MoneyFlowSide.SELL.getKey())
+                        ),
+                        pb.equals("coverageStatus", CoverageStatus.ALWD)
                 )
         );
     }

clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/bp/ExecutedDealReportBuilder_INFTYPE_3.java

@@ -3,6 +3,7 @@ package ru.spcex.clearing.reports.reports.bp;
 import org.springframework.stereotype.Component;
 import ru.clearing.classes.statics.data.execution.ExecutionFond;
 import ru.spcex.clearing.reports.reports.SessionIdParam;
+import ru.spcex.platform.enumeration.MoneyFlowSide;
 import ru.spcex.platform.enumeration.ReportKeys;
 import ru.spcex.platform.enumeration.Side;
 import ru.spcex.platform.imdg.api.ImdgProvider;
@@ -34,7 +35,10 @@ public class ExecutedDealReportBuilder_INFTYPE_3 extends ExecutedDealReportBuild
         return executionFondImdg.getCollectionObjectsByPredicate(
                 pb.and(
                         pb.greater("settlementDate", LocalDate.now()),
-                        pb.equals("side", Side.SELL.getKey())
+                        pb.or(
+                                pb.equals("side", Side.SELL.getKey()),
+                                pb.equals("side", MoneyFlowSide.SELL.getKey())
+                        )
                 )
         );
     }

clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/bp/ExecutedDealReportBuilder_INFTYPE_4.java

@@ -4,6 +4,7 @@ import org.springframework.stereotype.Component;
 import ru.clearing.classes.statics.data.execution.ExecutionFond;
 import ru.spcex.clearing.reports.reports.SessionIdParam;
 import ru.spcex.platform.enumeration.Allowed;
+import ru.spcex.platform.enumeration.MoneyFlowSide;
 import ru.spcex.platform.enumeration.ReportKeys;
 import ru.spcex.platform.enumeration.Side;
 import ru.spcex.platform.imdg.api.ImdgProvider;
@@ -36,7 +37,10 @@ public class ExecutedDealReportBuilder_INFTYPE_4 extends ExecutedDealReportBuild
                 pb.and(
                         pb.equals("coverageStatus", Allowed.DENIED.getKey()),
                         pb.equals("settlementDate", LocalDate.now()),
-                        pb.equals("side", Side.SELL.getKey())
+                        pb.or(
+                                pb.equals("side", Side.SELL.getKey()),
+                                pb.equals("side", MoneyFlowSide.SELL.getKey())
+                        )
                 )
         );
     }

clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/bp/UnfulfilledDealReportBuilder.java

@@ -66,9 +66,13 @@ public class UnfulfilledDealReportBuilder extends CSVReportBuilder<SessionIdPara
         ImdgPredicate predicate = pb.and(
                 pb.notNull("sessionId"),
                 pb.equals("coverageStatus", Allowed.DENIED.getKey()),
-                pb.equals("side", Side.SELL.getKey())
+                pb.or(
+                        pb.equals("side", Side.SELL.getKey()),
+                        pb.equals("side", MoneyFlowSide.SELL.getKey())
+                )
         );
         Collection<ExecutionFond> executionFonds = executionFondImdg.getCollectionObjectsByPredicate(predicate);
+        log.debug("Found {} ExecutionFond by query: {}", executionFonds.size(), predicate);
 
         rows = new ArrayList<>(executionFonds.size());
         for (ExecutionFond executionFond : executionFonds) {