From 199d9b3c58c8c14d367cdd8d2d33b9472f0ce839 Mon Sep 17 00:00:00 2001
From: akulikov <akulikov@mfd.ru>
Date: Fri, 1 Sep 2023 18:31:27 +0300
Subject: [PATCH] http://jira.mfd.msk:8088/browse/CLS-497

---
 .../reports/reports/ks/KSRepCashNettoReportBuilder.java       | 4 +++-
 .../reports/reports/ks/KSRepDepoNettoReportBuilder.java       | 4 +++-
 .../clearing/reports/reports/ks/KSRepTradesReportBuilder.java | 2 +-
 .../spcex/clearing/reports/services/ReportServiceTest_KS.java | 1 +
 .../expected_reports_csv/ks/KS_REP_TRADES_expected.csv        | 4 ++--
 5 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/ks/KSRepCashNettoReportBuilder.java b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/ks/KSRepCashNettoReportBuilder.java
index f3f24523c..eaae10b4c 100644
--- a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/ks/KSRepCashNettoReportBuilder.java
+++ b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/ks/KSRepCashNettoReportBuilder.java
@@ -108,7 +108,9 @@ public class KSRepCashNettoReportBuilder extends CSVReportBuilder<SessionIdParam
 
                 boolean invalid = false;
                 if (!tmtRegistries.isEmpty() || !omtRegistries.isEmpty()) {
-                    String sourceTradingCode = tmtRegistries.iterator().next().getTradingCode();
+                    String sourceTradingCode = "";
+                    if (!tmtRegistries.isEmpty()) sourceTradingCode = tmtRegistries.iterator().next().getTradingCode();
+                    if (!omtRegistries.isEmpty()) sourceTradingCode = omtRegistries.iterator().next().getTradingCode();
                     for (Registry currRegistry : tmtRegistries) {
                         if (sourceTradingCode.equals(currRegistry.getTradingCode())) continue;
                         invalid = true;
diff --git a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/ks/KSRepDepoNettoReportBuilder.java b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/ks/KSRepDepoNettoReportBuilder.java
index a8dab0684..b0880950a 100644
--- a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/ks/KSRepDepoNettoReportBuilder.java
+++ b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/ks/KSRepDepoNettoReportBuilder.java
@@ -105,7 +105,9 @@ public class KSRepDepoNettoReportBuilder extends CSVReportBuilder<SessionIdParam
 
                 boolean invalid = false;
                 if (!tstRegistries.isEmpty() || !ostRegistries.isEmpty()) {
-                    String sourceTradingCode = tstRegistries.iterator().next().getTradingCode();
+                    String sourceTradingCode = "";
+                    if (!tstRegistries.isEmpty()) sourceTradingCode = tstRegistries.iterator().next().getTradingCode();
+                    if (!ostRegistries.isEmpty()) sourceTradingCode = ostRegistries.iterator().next().getTradingCode();
                     for (Registry currRegistry : tstRegistries) {
                         if (sourceTradingCode.equals(currRegistry.getTradingCode())) continue;
                         invalid = true;
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 6a164d6ed..ddce8862e 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
@@ -131,7 +131,7 @@ public class KSRepTradesReportBuilder extends CSVReportBuilder<EmptyParams, KSRe
                 }
 
                 ksRepTradesReport.setTradeNum(execution.getExchangeExecutionId());
-                ksRepTradesReport.setClassCode(null);
+                ksRepTradesReport.setClassCode(execution.getMarket());
                 ksRepTradesReport.setTradeDate(execution.getExchangeExecutionTime());
 
                 String status = "";
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 03ca2e9ab..0e8cc26fa 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
@@ -334,6 +334,7 @@ public class ReportServiceTest_KS {
         Long sessionId_2 = sessionImdg.insert(session_2);
 
         ExecutionFond executionFond = new ExecutionFond();
+        executionFond.setMarket("3333");
         executionFond.setCompanyId(COMPANY_ID);
         executionFond.setTradingDate(LocalDate.now());
         executionFond.setSessionId(sessionId_1);
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 eab1a94da..128fb5ec6 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","","19.01.1970T23:49:58","3"
-"3","20.01.1970T12:54:43","5","TRADING_CODE","TKR","8888.89","123.46","222","","19.01.1970T23:49:58","1"
+"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"