From 017f54a5599a48ef8fc0a5e1b16ecbf49a6802ed Mon Sep 17 00:00:00 2001
From: akulikov <akulikov@mfd.ru>
Date: Tue, 22 Aug 2023 15:17:51 +0300
Subject: [PATCH] http://jira.mfd.msk:8088/browse/CLS-358

---
 .../reports/bp/ExecutedDealReportBuilderCommon.java | 13 +------------
 .../reports/bp/UnfulfilledDealReportBuilder.java    | 10 +---------
 .../bp/KS_BR_PFX64_INFTYPE_1_expected.csv           |  2 +-
 .../bp/KS_BR_PFX64_INFTYPE_2_expected.csv           |  2 +-
 .../bp/KS_BR_PFX64_INFTYPE_3_expected.csv           |  2 +-
 .../bp/KS_BR_PFX64_INFTYPE_4_expected.csv           |  2 +-
 .../bp/KS_BR_PFX65_DEALS_expected.csv               |  2 +-
 7 files changed, 7 insertions(+), 26 deletions(-)

diff --git a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/bp/ExecutedDealReportBuilderCommon.java b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/bp/ExecutedDealReportBuilderCommon.java
index fb40d6946..7b233dbc8 100644
--- a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/bp/ExecutedDealReportBuilderCommon.java
+++ b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/bp/ExecutedDealReportBuilderCommon.java
@@ -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)
diff --git a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/bp/UnfulfilledDealReportBuilder.java b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/bp/UnfulfilledDealReportBuilder.java
index d97e80dc8..ff8937942 100644
--- a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/bp/UnfulfilledDealReportBuilder.java
+++ b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/bp/UnfulfilledDealReportBuilder.java
@@ -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) {
diff --git a/clearing-parent/reports-service/src/test/resources/expected_reports_csv/bp/KS_BR_PFX64_INFTYPE_1_expected.csv b/clearing-parent/reports-service/src/test/resources/expected_reports_csv/bp/KS_BR_PFX64_INFTYPE_1_expected.csv
index b2b458849..540980aee 100644
--- a/clearing-parent/reports-service/src/test/resources/expected_reports_csv/bp/KS_BR_PFX64_INFTYPE_1_expected.csv
+++ b/clearing-parent/reports-service/src/test/resources/expected_reports_csv/bp/KS_BR_PFX64_INFTYPE_1_expected.csv
@@ -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"
diff --git a/clearing-parent/reports-service/src/test/resources/expected_reports_csv/bp/KS_BR_PFX64_INFTYPE_2_expected.csv b/clearing-parent/reports-service/src/test/resources/expected_reports_csv/bp/KS_BR_PFX64_INFTYPE_2_expected.csv
index c51a63ea9..2f4594c69 100644
--- a/clearing-parent/reports-service/src/test/resources/expected_reports_csv/bp/KS_BR_PFX64_INFTYPE_2_expected.csv
+++ b/clearing-parent/reports-service/src/test/resources/expected_reports_csv/bp/KS_BR_PFX64_INFTYPE_2_expected.csv
@@ -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"
diff --git a/clearing-parent/reports-service/src/test/resources/expected_reports_csv/bp/KS_BR_PFX64_INFTYPE_3_expected.csv b/clearing-parent/reports-service/src/test/resources/expected_reports_csv/bp/KS_BR_PFX64_INFTYPE_3_expected.csv
index 9715c0c71..17252d286 100644
--- a/clearing-parent/reports-service/src/test/resources/expected_reports_csv/bp/KS_BR_PFX64_INFTYPE_3_expected.csv
+++ b/clearing-parent/reports-service/src/test/resources/expected_reports_csv/bp/KS_BR_PFX64_INFTYPE_3_expected.csv
@@ -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"
diff --git a/clearing-parent/reports-service/src/test/resources/expected_reports_csv/bp/KS_BR_PFX64_INFTYPE_4_expected.csv b/clearing-parent/reports-service/src/test/resources/expected_reports_csv/bp/KS_BR_PFX64_INFTYPE_4_expected.csv
index 4cd564691..20b92cff2 100644
--- a/clearing-parent/reports-service/src/test/resources/expected_reports_csv/bp/KS_BR_PFX64_INFTYPE_4_expected.csv
+++ b/clearing-parent/reports-service/src/test/resources/expected_reports_csv/bp/KS_BR_PFX64_INFTYPE_4_expected.csv
@@ -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"
diff --git a/clearing-parent/reports-service/src/test/resources/expected_reports_csv/bp/KS_BR_PFX65_DEALS_expected.csv b/clearing-parent/reports-service/src/test/resources/expected_reports_csv/bp/KS_BR_PFX65_DEALS_expected.csv
index 8ccb6ed54..c82cf1e55 100644
--- a/clearing-parent/reports-service/src/test/resources/expected_reports_csv/bp/KS_BR_PFX65_DEALS_expected.csv
+++ b/clearing-parent/reports-service/src/test/resources/expected_reports_csv/bp/KS_BR_PFX65_DEALS_expected.csv
@@ -1,2 +1,2 @@
 "SECURITYID","TRADENO","TRADEDATE","SETTLECODE"
-"3007","777","22.07.2023","test-class-code"
+"3007","777","22.07.2023","test-settlement-code"