treshenkov/clearing
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source
This commit is contained in:
akulikov 2023-09-01 18:31:27 +03:00
parent ecb92d024f
commit 199d9b3c58
5 changed files with 10 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/ks/KSRepCashNettoReportBuilder.java
View file

@ -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;

4
clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/ks/KSRepDepoNettoReportBuilder.java
View file

@ -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;

2
clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/ks/KSRepTradesReportBuilder.java
View file

@ -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 = "";

1
clearing-parent/reports-service/src/test/java/ru/spcex/clearing/reports/services/ReportServiceTest_KS.java
View file

@ -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);

4
clearing-parent/reports-service/src/test/resources/expected_reports_csv/ks/KS_REP_TRADES_expected.csv
View file

@ -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"

1 SESSION_ID SESSION_DATE TR_ID FIRM_ID TKR CASH_LIABILITY DEPO_LIABILITY TRADE_NUM CLASS_CODE TRADE_DATE STATUS
2 4 20.01.1970T04:09:07 8 TRADING_CODE TKR 8888.89 222 3333 19.01.1970T23:49:58 3
3 3 20.01.1970T12:54:43 5 TRADING_CODE TKR 8888.89 123.46 222 3333 19.01.1970T23:49:58 1