From 2db5bbc7c0c6a6a9b89858f6091919c02adde537 Mon Sep 17 00:00:00 2001
From: akulikov <akulikov@mfd.ru>
Date: Mon, 18 Sep 2023 14:29:57 +0300
Subject: [PATCH] 
 http://jira.mfd.msk:8088/browse/CLS-497?focusedCommentId=56715&page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel#comment-56715

---
 .../reports/ks/KSRepCashRegisterSumsReportBuilder.java        | 2 +-
 .../reports/ks/KSRepDepoRegisterQuantitiesReportBuilder.java  | 2 +-
 .../clearing/reports/reports/ks/KSRepTradesReportBuilder.java | 3 +++
 .../spcex/clearing/reports/services/ReportServiceTest_KS.java | 4 ++--
 4 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/ks/KSRepCashRegisterSumsReportBuilder.java b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/ks/KSRepCashRegisterSumsReportBuilder.java
index 20f8e5592..39b7cfc7b 100644
--- a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/ks/KSRepCashRegisterSumsReportBuilder.java
+++ b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/ks/KSRepCashRegisterSumsReportBuilder.java
@@ -72,7 +72,7 @@ public class KSRepCashRegisterSumsReportBuilder extends CSVReportBuilder<EmptyPa
         ImdgPredicate finalPredicate = pb.and(
                 pb.greatEqual("updated", instantNow.truncatedTo(ChronoUnit.DAYS)),
                 pb.less("updated", instantNow.plus(1, ChronoUnit.DAYS).truncatedTo(ChronoUnit.DAYS)),
-                pb.equals("inOutSDfType", InOutSDfType.type6.getKey()),
+                pb.equals("inOutSDfType", InOutSDfType.type57.getKey()),
                 pb.equals("operationStatus", OperationStatus.Executed.getKey()),
                 pb.notNull("amount")
         );
diff --git a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/ks/KSRepDepoRegisterQuantitiesReportBuilder.java b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/ks/KSRepDepoRegisterQuantitiesReportBuilder.java
index 71e47f77b..a9fee27a8 100644
--- a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/ks/KSRepDepoRegisterQuantitiesReportBuilder.java
+++ b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/ks/KSRepDepoRegisterQuantitiesReportBuilder.java
@@ -82,7 +82,7 @@ public class KSRepDepoRegisterQuantitiesReportBuilder extends CSVReportBuilder<E
         ImdgPredicate finalPredicate = pb.and(
                 pb.greatEqual("updated", instantNow.truncatedTo(ChronoUnit.DAYS)),
                 pb.less("updated", instantNow.plus(1, ChronoUnit.DAYS).truncatedTo(ChronoUnit.DAYS)),
-                pb.equals("inOutSDfType", InOutSDfType.type10.getKey()),
+                pb.equals("inOutSDfType", InOutSDfType.type21.getKey()),
                 pb.equals("operationStatus", OperationStatus.Executed.getKey()),
                 pb.notNull("amount")
         );
diff --git a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/ks/KSRepTradesReportBuilder.java b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/ks/KSRepTradesReportBuilder.java
index e1c3e7b03..034b35547 100644
--- a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/ks/KSRepTradesReportBuilder.java
+++ b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/ks/KSRepTradesReportBuilder.java
@@ -128,11 +128,14 @@ public class KSRepTradesReportBuilder extends CSVReportBuilder<EmptyParams, KSRe
 
                 if (execution instanceof ExecutionDeposit executionDeposit) {
                     BigDecimal firstLegAmount = executionDeposit.getFirstLegAmount() != null ? executionDeposit.getFirstLegAmount() : BigDecimal.ZERO;
+                    if (Side.SELL.equalsByKey(executionDeposit.getSide())) firstLegAmount = firstLegAmount.negate();
                     ksRepTradesReport.setCashLiability(firstLegAmount);
                     ksRepTradesReport.setDepoLiability(BigDecimal.ZERO);
                 } else if (execution instanceof ExecutionFond executionFond) {
                     BigDecimal settlementAmount = executionFond.getSettlementAmount() != null ? executionFond.getSettlementAmount() : BigDecimal.ZERO;
+                    if (Side.BUY.equalsByKey(executionFond.getSide())) settlementAmount = settlementAmount.negate();
                     BigDecimal quantity = executionFond.getQuantity() != null ? executionFond.getQuantity() : BigDecimal.ZERO;
+                    if (Side.SELL.equalsByKey(executionFond.getSide())) quantity = quantity.negate();
                     ksRepTradesReport.setCashLiability(settlementAmount);
                     ksRepTradesReport.setDepoLiability(quantity);
                 }
diff --git a/clearing-parent/reports-service/src/test/java/ru/spcex/clearing/reports/services/ReportServiceTest_KS.java b/clearing-parent/reports-service/src/test/java/ru/spcex/clearing/reports/services/ReportServiceTest_KS.java
index 2d27bf1d3..fd67852cc 100644
--- a/clearing-parent/reports-service/src/test/java/ru/spcex/clearing/reports/services/ReportServiceTest_KS.java
+++ b/clearing-parent/reports-service/src/test/java/ru/spcex/clearing/reports/services/ReportServiceTest_KS.java
@@ -185,7 +185,7 @@ public class ReportServiceTest_KS {
         statement_1.setAddresseeId(COMPANY_ID);
         statement_1.setAccount("ACCOUNT");
         statement_1.setInOutDirection(InOutDirection.in.getKey());
-        statement_1.setInOutSDfType(InOutSDfType.type6.getKey());
+        statement_1.setInOutSDfType(InOutSDfType.type57.getKey());
         statement_1.setOperationStatus(OperationStatus.Executed.getKey());
         statement_1.setAmount(BigDecimal.valueOf(7777.777777777));
         statement_1.setUpdated(Instant.now());
@@ -287,7 +287,7 @@ public class ReportServiceTest_KS {
         statement_1.setAddresseeId(COMPANY_ID);
         statement_1.setAccount("ACCOUNT");
         statement_1.setInOutDirection(InOutDirection.in.getKey());
-        statement_1.setInOutSDfType(InOutSDfType.type10.getKey());
+        statement_1.setInOutSDfType(InOutSDfType.type21.getKey());
         statement_1.setOperationStatus(OperationStatus.Executed.getKey());
         statement_1.setAmount(BigDecimal.valueOf(7777.777777777));
         statement_1.setUpdated(Instant.now());