From 3ce2db798cdebf98e00a5025a93d0d1a69ee5e7f Mon Sep 17 00:00:00 2001
From: akulikov <akulikov@mfd.ru>
Date: Wed, 6 Sep 2023 19:57:34 +0300
Subject: [PATCH] http://jira.mfd.msk:8088/browse/CLS-497 some fixes

---
 .../clearing/reports/reports/bean/KSRepDepoNettoReport.java    | 2 +-
 .../reports/bean/KSRepDepoRegisterQuantitiesReport.java        | 2 +-
 .../spcex/clearing/reports/reports/bean/KSRepTradesReport.java | 2 +-
 .../reports/reports/ks/KSCommissionTradesReportBuilder.java    | 2 +-
 .../reports/reports/ks/KSSessionListReportBuilder.java         | 2 +-
 .../spcex/clearing/reports/services/ReportServiceTest_KS.java  | 3 ++-
 .../expected_reports_csv/ks/KS_REP_DEPO_NETTO_expected.csv     | 2 +-
 .../ks/KS_REP_DEPO_REGISTER_QUANTITIES_expected.csv            | 2 +-
 .../expected_reports_csv/ks/KS_REP_TRADES_expected.csv         | 2 +-
 9 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/bean/KSRepDepoNettoReport.java b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/bean/KSRepDepoNettoReport.java
index 8844a3309..404bef736 100644
--- a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/bean/KSRepDepoNettoReport.java
+++ b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/bean/KSRepDepoNettoReport.java
@@ -33,7 +33,7 @@ public class KSRepDepoNettoReport {
 
     @CsvBindByName(column = "VALUE")
     @CsvBindByPosition(position = 5)
-    @CsvNumber(value = "#0.00", writeFormat = "#0.00")
+    @CsvNumber(value = "#0", writeFormat = "#0")
     private BigDecimal value;
 
     @CsvBindByName(column = "DATE")
diff --git a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/bean/KSRepDepoRegisterQuantitiesReport.java b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/bean/KSRepDepoRegisterQuantitiesReport.java
index f3256c7f2..c17a1c698 100644
--- a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/bean/KSRepDepoRegisterQuantitiesReport.java
+++ b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/bean/KSRepDepoRegisterQuantitiesReport.java
@@ -32,7 +32,7 @@ public class KSRepDepoRegisterQuantitiesReport {
 
     @CsvBindByName(column = "ADD_QUANTITY")
     @CsvBindByPosition(position = 5)
-    @CsvNumber(value = "#0.00", writeFormat = "#0.00")
+    @CsvNumber(value = "#0", writeFormat = "#0")
     private BigDecimal addQuantity;
 
     @CsvBindByName(column = "ADD_TIME")
diff --git a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/bean/KSRepTradesReport.java b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/bean/KSRepTradesReport.java
index 895d217b2..cc856ae48 100644
--- a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/bean/KSRepTradesReport.java
+++ b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/bean/KSRepTradesReport.java
@@ -38,7 +38,7 @@ public class KSRepTradesReport {
 
     @CsvBindByName(column = "DEPO_LIABILITY")
     @CsvBindByPosition(position = 6)
-    @CsvNumber(value = "#0.00", writeFormat = "#0.00")
+    @CsvNumber(value = "#0", writeFormat = "#0")
     private BigDecimal depoLiability;
 
     @CsvBindByName(column = "TRADE_NUM")
diff --git a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/ks/KSCommissionTradesReportBuilder.java b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/ks/KSCommissionTradesReportBuilder.java
index 76717a27b..4ead43379 100644
--- a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/ks/KSCommissionTradesReportBuilder.java
+++ b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/ks/KSCommissionTradesReportBuilder.java
@@ -178,7 +178,7 @@ public class KSCommissionTradesReportBuilder extends CSVReportBuilder<EmptyParam
                 pb = sTradesImdg.predicateBuilder();
                 Collection<STrades> sTradesList = sTradesImdg.getCollectionObjectsByPredicate(
                         pb.and(
-                                pb.equals("tradeNum", tradeNum),
+                                pb.equals("tradeNum", registry.getGroupId()),
                                 pb.notNull("classCode")
                         )
                 );
diff --git a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/ks/KSSessionListReportBuilder.java b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/ks/KSSessionListReportBuilder.java
index 0cdd2ee04..d25ad04fe 100644
--- a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/ks/KSSessionListReportBuilder.java
+++ b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/ks/KSSessionListReportBuilder.java
@@ -34,7 +34,7 @@ public class KSSessionListReportBuilder extends CSVReportBuilder<EmptyParams, KS
 
     @Override
     public ReportBuilderType getReportType() {
-        return ReportBuilderType.KS_REP_FIRM_DETAILS;
+        return ReportBuilderType.KS_SESSION_LIST;
     }
 
     @Override
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 613b8baf7..f6b6cf4b4 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
@@ -652,6 +652,7 @@ public class ReportServiceTest_KS {
         registry.setTradingDate(LocalDate.of(1991, 1, 1));
         registry.setContract("CONT~RACT");
         registry.setClearingCode("CLEARING_CODE");
+        registry.setGroupId(23071812300L);
         registryImdg.insert(registry);
 
         Registry omtRegistry = new Registry();
@@ -664,7 +665,7 @@ public class ReportServiceTest_KS {
         registryImdg.insert(omtRegistry);
 
         STrades sTrades = new STrades();
-        sTrades.setTradeNum(123L);
+        sTrades.setTradeNum(23071812300L);
         sTrades.setClassCode("CLASS_CODE");
         sTradesImdg.insert(sTrades);
 
diff --git a/clearing-parent/reports-service/src/test/resources/expected_reports_csv/ks/KS_REP_DEPO_NETTO_expected.csv b/clearing-parent/reports-service/src/test/resources/expected_reports_csv/ks/KS_REP_DEPO_NETTO_expected.csv
index a6b2330a1..c1eec8d89 100644
--- a/clearing-parent/reports-service/src/test/resources/expected_reports_csv/ks/KS_REP_DEPO_NETTO_expected.csv
+++ b/clearing-parent/reports-service/src/test/resources/expected_reports_csv/ks/KS_REP_DEPO_NETTO_expected.csv
@@ -1,2 +1,2 @@
 "FIRMID","SESSION_ID","SESSION_DATE","ACCOUNT","SECURITYID","VALUE","DATE"
-"TRADING_CODE","2","19.01.1970T23:49:58","ACCOUNT","SECURITY_SYMBOL","22.22","07.07.2023"
+"TRADING_CODE","2","19.01.1970T23:49:58","ACCOUNT","SECURITY_SYMBOL","22","07.07.2023"
diff --git a/clearing-parent/reports-service/src/test/resources/expected_reports_csv/ks/KS_REP_DEPO_REGISTER_QUANTITIES_expected.csv b/clearing-parent/reports-service/src/test/resources/expected_reports_csv/ks/KS_REP_DEPO_REGISTER_QUANTITIES_expected.csv
index c86d5367c..526f4f940 100644
--- a/clearing-parent/reports-service/src/test/resources/expected_reports_csv/ks/KS_REP_DEPO_REGISTER_QUANTITIES_expected.csv
+++ b/clearing-parent/reports-service/src/test/resources/expected_reports_csv/ks/KS_REP_DEPO_REGISTER_QUANTITIES_expected.csv
@@ -1,2 +1,2 @@
 "FIRMID","ACCOUNT","TKR","SECURITYID","REGISTER_CODE","ADD_QUANTITY","ADD_TIME","ADD_DATE","TRADE_NUM"
-"1","ACCOUNT","TRADING_CLEARING_REGISTRY","value","AS_T","7777.78","15:52:33","01.08.2023",""
+"1","ACCOUNT","TRADING_CLEARING_REGISTRY","value","AS_T","7778","15:52:33","01.08.2023",""
diff --git a/clearing-parent/reports-service/src/test/resources/expected_reports_csv/ks/KS_REP_TRADES_expected.csv b/clearing-parent/reports-service/src/test/resources/expected_reports_csv/ks/KS_REP_TRADES_expected.csv
index 128fb5ec6..3bead7465 100644
--- a/clearing-parent/reports-service/src/test/resources/expected_reports_csv/ks/KS_REP_TRADES_expected.csv
+++ b/clearing-parent/reports-service/src/test/resources/expected_reports_csv/ks/KS_REP_TRADES_expected.csv
@@ -1,3 +1,3 @@
 "SESSION_ID","SESSION_DATE","TR_ID","FIRM_ID","TKR","CASH_LIABILITY","DEPO_LIABILITY","TRADE_NUM","CLASS_CODE","TRADE_DATE","STATUS"
 "4","20.01.1970T04:09:07","8","TRADING_CODE","TKR","8888.89","","222",3333,"19.01.1970T23:49:58","3"
-"3","20.01.1970T12:54:43","5","TRADING_CODE","TKR","8888.89","123.46","222",3333,"19.01.1970T23:49:58","1"
+"3","20.01.1970T12:54:43","5","TRADING_CODE","TKR","8888.89","123","222",3333,"19.01.1970T23:49:58","1"