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

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

Browse source
This commit is contained in:
akulikov 2023-08-22 15:17:51 +03:00
parent ce8c397fca
commit 017f54a559
7 changed files with 7 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/bp/ExecutedDealReportBuilderCommon.java
View file

@ -17,7 +17,6 @@ import java.time.format.DateTimeFormatter;
import java.util.ArrayList;
import java.util.Collection;
import java.util.List;
import java.util.Map;
public abstract class ExecutedDealReportBuilderCommon<P> extends CSVReportBuilder<P, ExecutedDealReport> {
protected final DateTimeFormatter fileNameDateTimeFormatter = DateTimeFormatter.ofPattern("yyMMddHHmmssSSS");
@ -72,23 +71,13 @@ public abstract class ExecutedDealReportBuilderCommon<P> extends CSVReportBuilde
}
if (!WorkflowStatus.Active.equalsByKey(company.getWorkflowStatus())) continue;
STrades sTrade = null;
if (executionFond.getSide() != null && executionFond.getExchangeExecutionId() != null) {
sTrade = sTradesImdg.getFirstObjectByFieldValues(
Map.of(
"tradeNum", executionFond.getExchangeExecutionId(),
"operation", executionFond.getSide()
)
);
}
ExecutedDealReport executedDealReport = new ExecutedDealReport();
executedDealReport.setSecurityId(executionFond.getSecuritySymbol());
executedDealReport.setTradeNo(executionFond.getExchangeExecutionId());
executedDealReport.setTradeDate(executionFond.getTradingDate());
executedDealReport.setTradeTime(executionFond.getExchangeExecutionTime());
executedDealReport.setSettleDate(executionFond.getSettlementDate());
executedDealReport.setSettleCode(sTrade != null ? sTrade.getSettleCode() : "");
executedDealReport.setSettleCode(executionFond.getSettlementCode());
executedDealReport.setQuantity(executionFond.getQuantity());
executedDealReport.setValue(executionFond.getSettlementAmount());
if (executionFond.getSettlementAmount() != null && executionFond.getQuantity() != null)

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

@ -21,7 +21,6 @@ import ru.spcex.platform.imdg.api.predicate.ImdgPredicateBuilder;
import java.util.ArrayList;
import java.util.Collection;
import java.util.List;
import java.util.Map;
@Component
public class UnfulfilledDealReportBuilder extends CSVReportBuilder<SessionIdParam, UnfulfilledDealReport> {
@ -87,18 +86,11 @@ public class UnfulfilledDealReportBuilder extends CSVReportBuilder<SessionIdPara
}
if (!WorkflowStatus.Active.equalsByKey(company.getWorkflowStatus())) continue;;
STrades sTrade = sTradesImdg.getFirstObjectByFieldValues(
Map.of(
"settleCode", executionFond.getSettlementCode(),
"operation", executionFond.getSide()
)
);
UnfulfilledDealReport unfulfilledDealReport = new UnfulfilledDealReport();
unfulfilledDealReport.setSecurityId(executionFond.getSecurityId());
unfulfilledDealReport.setTradeNo(executionFond.getExchangeExecutionId());
unfulfilledDealReport.setTradeDate(executionFond.getTradingDate());
unfulfilledDealReport.setSettleCode(sTrade != null ? sTrade.getClassCode() : null);
unfulfilledDealReport.setSettleCode(executionFond.getSettlementCode());
rows.add(unfulfilledDealReport);
} catch (Throwable e) {

2
clearing-parent/reports-service/src/test/resources/expected_reports_csv/bp/KS_BR_PFX64_INFTYPE_1_expected.csv
View file

@ -1,2 +1,2 @@
"SECURITYID","TRADENO","TRADEDATE","TRADETIME","SETTLEDATE","SETTLECODE","PRICE","QUANTITY","VALUE"
"test-security-symbol-1","777","22.07.2023","01:22:57","01.08.2023","test-settle-code","1000.000000","7777","7777777.00"
"test-security-symbol-1","777","22.07.2023","01:22:57","01.08.2023","test-settlement-code","1000.000000","7777","7777777.00"

1 SECURITYID TRADENO TRADEDATE TRADETIME SETTLEDATE SETTLECODE PRICE QUANTITY VALUE
2 test-security-symbol-1 777 22.07.2023 01:22:57 01.08.2023 test-settle-code test-settlement-code 1000.000000 7777 7777777.00

2
clearing-parent/reports-service/src/test/resources/expected_reports_csv/bp/KS_BR_PFX64_INFTYPE_2_expected.csv
View file

@ -1,2 +1,2 @@
"SECURITYID","TRADENO","TRADEDATE","TRADETIME","SETTLEDATE","SETTLECODE","PRICE","QUANTITY","VALUE"
"test-security-symbol-1","777","01.08.2023","01:22:57","01.08.2023","test-settle-code","1000.000000","7777","7777777.00"
"test-security-symbol-1","777","01.08.2023","01:22:57","01.08.2023","test-settlement-code","1000.000000","7777","7777777.00"

1 SECURITYID TRADENO TRADEDATE TRADETIME SETTLEDATE SETTLECODE PRICE QUANTITY VALUE
2 test-security-symbol-1 777 01.08.2023 01:22:57 01.08.2023 test-settle-code test-settlement-code 1000.000000 7777 7777777.00

2
clearing-parent/reports-service/src/test/resources/expected_reports_csv/bp/KS_BR_PFX64_INFTYPE_3_expected.csv
View file

@ -1,2 +1,2 @@
"SECURITYID","TRADENO","TRADEDATE","TRADETIME","SETTLEDATE","SETTLECODE","PRICE","QUANTITY","VALUE"
"test-security-symbol-1","777","11.08.2023","01:22:57","11.08.2023","test-settle-code","1000.000000","7777","7777777.00"
"test-security-symbol-1","777","11.08.2023","01:22:57","11.08.2023","test-settlement-code","1000.000000","7777","7777777.00"

1 SECURITYID TRADENO TRADEDATE TRADETIME SETTLEDATE SETTLECODE PRICE QUANTITY VALUE
2 test-security-symbol-1 777 11.08.2023 01:22:57 11.08.2023 test-settle-code test-settlement-code 1000.000000 7777 7777777.00

2
clearing-parent/reports-service/src/test/resources/expected_reports_csv/bp/KS_BR_PFX64_INFTYPE_4_expected.csv
View file

@ -1,2 +1,2 @@
"SECURITYID","TRADENO","TRADEDATE","TRADETIME","SETTLEDATE","SETTLECODE","PRICE","QUANTITY","VALUE"
"test-security-symbol-1","777","11.08.2023","01:22:57","01.08.2023","test-settle-code","1000.000000","7777","7777777.00"
"test-security-symbol-1","777","11.08.2023","01:22:57","01.08.2023","test-settlement-code","1000.000000","7777","7777777.00"

1 SECURITYID TRADENO TRADEDATE TRADETIME SETTLEDATE SETTLECODE PRICE QUANTITY VALUE
2 test-security-symbol-1 777 11.08.2023 01:22:57 01.08.2023 test-settle-code test-settlement-code 1000.000000 7777 7777777.00

2
clearing-parent/reports-service/src/test/resources/expected_reports_csv/bp/KS_BR_PFX65_DEALS_expected.csv
View file

@ -1,2 +1,2 @@
"SECURITYID","TRADENO","TRADEDATE","SETTLECODE"
"3007","777","22.07.2023","test-class-code"
"3007","777","22.07.2023","test-settlement-code"

1 SECURITYID TRADENO TRADEDATE SETTLECODE
2 3007 777 22.07.2023 test-class-code test-settlement-code