From c7ad0a181c3a544cae2bef96586286bf0628a16a Mon Sep 17 00:00:00 2001
From: akulikov <akulikov@mfd.ru>
Date: Wed, 8 Nov 2023 15:47:30 +0300
Subject: [PATCH] http://jira.mfd.msk:8088/browse/CLS-497

---
 .../builders/bean/UnfulfilledDealReport.java  | 14 +++++++
 .../bp/UnfulfilledDealReportBuilder.java      |  1 +
 .../ks/KSCommissionTradesReportBuilder.java   | 37 ++++---------------
 .../services/ReportServiceTest_BP.java        |  2 +-
 .../bp/KS_BR_PFX65_DEALS_expected.csv         |  4 +-
 5 files changed, 26 insertions(+), 32 deletions(-)

diff --git a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/builders/bean/UnfulfilledDealReport.java b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/builders/bean/UnfulfilledDealReport.java
index 009ccbc27..5deb8290a 100644
--- a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/builders/bean/UnfulfilledDealReport.java
+++ b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/builders/bean/UnfulfilledDealReport.java
@@ -3,7 +3,9 @@ package ru.spcex.clearing.reports.builders.bean;
 import com.opencsv.bean.CsvBindByName;
 import com.opencsv.bean.CsvBindByPosition;
 import com.opencsv.bean.CsvDate;
+import com.opencsv.bean.CsvNumber;
 
+import java.math.BigDecimal;
 import java.time.LocalDate;
 
 public class UnfulfilledDealReport {
@@ -25,6 +27,11 @@ public class UnfulfilledDealReport {
     @CsvBindByPosition(position = 3)
     private String settleCode;
 
+    @CsvBindByName(column = "VALUE")
+    @CsvBindByPosition(position = 4)
+    @CsvNumber(value = "#0.00", writeFormat = "#0.00")
+    private BigDecimal value;
+
 
     public String getSecurityId() {
         return securityId;
@@ -58,4 +65,11 @@ public class UnfulfilledDealReport {
         this.settleCode = settleCode;
     }
 
+    public BigDecimal getValue() {
+        return value;
+    }
+
+    public void setValue(BigDecimal value) {
+        this.value = value;
+    }
 }
diff --git a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/builders/bp/UnfulfilledDealReportBuilder.java b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/builders/bp/UnfulfilledDealReportBuilder.java
index ce17130d2..fa91651d9 100644
--- a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/builders/bp/UnfulfilledDealReportBuilder.java
+++ b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/builders/bp/UnfulfilledDealReportBuilder.java
@@ -89,6 +89,7 @@ public class UnfulfilledDealReportBuilder extends CSVReportBuilder<SessionIdPara
                 unfulfilledDealReport.setTradeNo(executionFond.getExchangeExecutionId());
                 unfulfilledDealReport.setTradeDate(executionFond.getTradingDate());
                 unfulfilledDealReport.setSettleCode(executionFond.getSettlementCode());
+                unfulfilledDealReport.setValue(executionFond.getSettlementAmount());
 
                 rows.add(unfulfilledDealReport);
             } catch (Throwable e) {
diff --git a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/builders/ks/KSCommissionTradesReportBuilder.java b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/builders/ks/KSCommissionTradesReportBuilder.java
index c61ec26c1..7ca025d53 100644
--- a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/builders/ks/KSCommissionTradesReportBuilder.java
+++ b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/builders/ks/KSCommissionTradesReportBuilder.java
@@ -2,7 +2,6 @@ package ru.spcex.clearing.reports.builders.ks;
 
 import org.springframework.stereotype.Component;
 import ru.clearing.classes.statics.data.company.Company;
-import ru.clearing.classes.statics.data.company.CompanySymbols;
 import ru.clearing.classes.statics.data.execution.ExecutionDeposit;
 import ru.clearing.classes.statics.data.registry.Registry;
 import ru.spcex.clearing.imdg.IMDGDistributedNames;
@@ -30,7 +29,6 @@ public class KSCommissionTradesReportBuilder extends CSVReportBuilder<EmptyParam
 
     private final Imdg<Registry> registryImdg;
     private final Imdg<Company> companyImdg;
-    private final Imdg<CompanySymbols> companySymbolsImdg;
     private final Imdg<ExecutionDeposit> executionDepositImdg;
 
     private List<KSCommissionTradesReport> rows = null;
@@ -38,7 +36,6 @@ public class KSCommissionTradesReportBuilder extends CSVReportBuilder<EmptyParam
     public KSCommissionTradesReportBuilder(ImdgProvider imdgProvider) {
         registryImdg = imdgProvider.getImdg(IMDGDistributedNames.Map_Registry, Registry.class);
         companyImdg = imdgProvider.getImdg(IMDGDistributedNames.Map_Company, Company.class);
-        companySymbolsImdg = imdgProvider.getImdg(IMDGDistributedNames.Map_CompanySymbols, CompanySymbols.class);
         executionDepositImdg = imdgProvider.getImdg(IMDGDistributedNames.Map_ExecutionDeposit, ExecutionDeposit.class);
     }
 
@@ -80,9 +77,8 @@ public class KSCommissionTradesReportBuilder extends CSVReportBuilder<EmptyParam
         String sql = RegistryCodeSqlBuilder.getInstance(RegistryTradingParams.TS_T).build();
         ImdgPredicate finalPredicate = pb.and(
                 pb.sql(sql),
-                pb.equals("refundDate", nowDate),
+                pb.greatEqual("refundDate", nowDate),
                 pb.less("valueDate", nowDate),
-                pb.equals("registryStatus", RegistryStatus.CLRD.getKey()),
                 pb.or(pb.equals("sessionType", SessionType.XDEP.getKey()), pb.equals("sessionType", SessionType.FINL.getKey()))
         );
         Collection<Registry> registries = registryImdg.getCollectionObjectsByPredicate(finalPredicate);
@@ -125,29 +121,12 @@ public class KSCommissionTradesReportBuilder extends CSVReportBuilder<EmptyParam
                     }
                 }
 
-//                sql = RegistryCodeSqlBuilder.getInstance(RegistryTradingParams.OM_T).build();
-//                Registry omtRegistry = registryImdg.getFirstObjectByPredicate(
-//                        pb.and(
-//                                pb.sql(sql),
-//                                pb.equals("contract", registry.getContract()),
-//                                pb.notNull("groupId")
-//                        )
-//                );
-//                if (omtRegistry == null) {
-//                    log.warn("Can't find pair OM_T registry for contract = {}. Registry id = {} skipped",
-//                            registry.getContract(),
-//                            registry.getId());
-//                    continue;
-//                }
-//                String tradeNum = extractPartAgreementNumber(String.valueOf(omtRegistry.getGroupId()));
-//                if (tradeNum == null) {
-//                    log.warn("Can't extract TradeNum from GroupId (groupId = {} for OM_T registry id = {}). " +
-//                                    "Registry id = {} skipped",
-//                            omtRegistry.getGroupId(),
-//                            omtRegistry.getId(),
-//                            registry.getId());
-//                    continue;
-//                }
+                String execStatus = "";
+                RegistryStatus registryStatus = IEnumKey.getEnumByKey(RegistryStatus.class, registry.getRegistryStatus());
+                if (registryStatus == RegistryStatus.CLRD) execStatus = "Исполнено";
+                else if (registryStatus == RegistryStatus.FAIL) execStatus = "Не исполнено";
+                else if (registryStatus == RegistryStatus.MNG || registryStatus == RegistryStatus.PROC)
+                    execStatus = "В ожидании";
 
                 String agreementNumber = registry.getContract();
                 if (agreementNumber != null && agreementNumber.contains("~"))
@@ -182,7 +161,7 @@ public class KSCommissionTradesReportBuilder extends CSVReportBuilder<EmptyParam
                 ksCommissionTradesReport.setAgreementDate(registry.getTradingDate());
                 ksCommissionTradesReport.setSum(registry.getBalance() != null ? registry.getBalance().negate() : BigDecimal.ZERO);
                 ksCommissionTradesReport.setRepaymDate(registry.getRefundDate());
-                ksCommissionTradesReport.setExecStatus("Исполнено");
+                ksCommissionTradesReport.setExecStatus(execStatus);
 
                 rows.add(ksCommissionTradesReport);
             } catch (Throwable e) {
diff --git a/clearing-parent/reports-service/src/test/java/ru/spcex/clearing/reports/services/ReportServiceTest_BP.java b/clearing-parent/reports-service/src/test/java/ru/spcex/clearing/reports/services/ReportServiceTest_BP.java
index bb242d6dc..133cf1f4e 100644
--- a/clearing-parent/reports-service/src/test/java/ru/spcex/clearing/reports/services/ReportServiceTest_BP.java
+++ b/clearing-parent/reports-service/src/test/java/ru/spcex/clearing/reports/services/ReportServiceTest_BP.java
@@ -419,7 +419,7 @@ public class ReportServiceTest_BP {
 
         File outFile = outFolder.listFiles()[0];
         File expectedFile = new File(getClass().getClassLoader().getResource("expected_reports_csv/bp/KS_BR_PFX65_DEALS_expected.csv").getFile());
-        compareCSVFiles(expectedFile, outFile, Arrays.asList("TRADEDATE"));
+        compareCSVFiles(expectedFile, outFile, List.of());
 
         testExecutionFond.setSessionId(oldExecutionFondSessionId);
         testExecutionFond.setCoverageStatus(oldExecutionFondCoverageStatus);
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 f1d61bde1..a411785e1 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"
-"test-security-symbol-1","777","22.07.2023","test-settlement-code"
+"SECURITYID","TRADENO","TRADEDATE","SETTLECODE","VALUE"
+"test-security-symbol-1","777","2023-10-29","test-settlement-code","7777777.00"