From e028aee516363a6e2d07467dc59808e2a225c1fe Mon Sep 17 00:00:00 2001
From: akulikov <akulikov@mfd.ru>
Date: Thu, 23 Nov 2023 14:21:27 +0300
Subject: [PATCH] http://jira.mfd.msk:8088/browse/CLS-597

---
 .../builders/bean/KSCommissionTradesReport.java    | 12 ++++++++++++
 .../ks/KSCommissionTradesReportBuilder.java        | 14 ++++++++++++--
 .../ks/KS_COMMISSION_TRADES_expected.csv           |  4 ++--
 3 files changed, 26 insertions(+), 4 deletions(-)

diff --git a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/builders/bean/KSCommissionTradesReport.java b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/builders/bean/KSCommissionTradesReport.java
index 5b3031872..d6a1eec4b 100644
--- a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/builders/bean/KSCommissionTradesReport.java
+++ b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/builders/bean/KSCommissionTradesReport.java
@@ -57,6 +57,10 @@ public class KSCommissionTradesReport {
     @CsvBindByPosition(position = 10)
     private String execStatus;
 
+    @CsvBindByName(column = "TR_ID")
+    @CsvBindByPosition(position = 11)
+    private Long trId;
+
 
     public String getFirmId() {
         return firmId;
@@ -145,4 +149,12 @@ public class KSCommissionTradesReport {
     public void setAgreementSettlementDate(LocalDate agreementSettlementDate) {
         this.agreementSettlementDate = agreementSettlementDate;
     }
+
+    public Long getTrId() {
+        return trId;
+    }
+
+    public void setTrId(Long trId) {
+        this.trId = trId;
+    }
 }
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 8d29bcf51..37c269d08 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
@@ -125,8 +125,17 @@ public class KSCommissionTradesReportBuilder extends CSVReportBuilder<EmptyParam
                 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 = "Срок исполнения не наступил";
+                else if (registryStatus == RegistryStatus.MNG || registryStatus == RegistryStatus.PROC) {
+                    if (registry.getSettlementDate() == null) {
+                        log.warn("Can't define status: registry.settlementDate is null. Registry was skipped");
+                        continue;
+                    }
+                    if (nowDate.isBefore(registry.getSettlementDate())) {
+                        execStatus = "Срок исполнения не наступил";
+                    } else {
+                        execStatus = "Ожидает исполнения";
+                    }
+                }
 
                 String agreementNumber = registry.getContract();
                 if (agreementNumber != null && agreementNumber.contains("~"))
@@ -163,6 +172,7 @@ public class KSCommissionTradesReportBuilder extends CSVReportBuilder<EmptyParam
                 ksCommissionTradesReport.setRepaymDate(registry.getRefundDate());
                 ksCommissionTradesReport.setExecStatus(execStatus);
                 ksCommissionTradesReport.setAgreementSettlementDate(registry.getValueDate());
+                ksCommissionTradesReport.setTrId(registry.getGroupId());
 
                 rows.add(ksCommissionTradesReport);
             } catch (Throwable e) {
diff --git a/clearing-parent/reports-service/src/test/resources/expected_reports_csv/ks/KS_COMMISSION_TRADES_expected.csv b/clearing-parent/reports-service/src/test/resources/expected_reports_csv/ks/KS_COMMISSION_TRADES_expected.csv
index e82b5b07c..b1292caab 100644
--- a/clearing-parent/reports-service/src/test/resources/expected_reports_csv/ks/KS_COMMISSION_TRADES_expected.csv
+++ b/clearing-parent/reports-service/src/test/resources/expected_reports_csv/ks/KS_COMMISSION_TRADES_expected.csv
@@ -1,2 +1,2 @@
-"FIRM_ID","FIRM_ID_INITIATOR","SECCODE","CLASS_CODE","AGREEMENT_NUMBER","AGREEMENT_NUMBER_POSTFIX","AGREEMENT_DATE","AGREEMENT_SETTLEMENT_DATE","SUM","REPAYM_DATE","EXEC_STATUS"
-"CLEARING_CODE","TRADING_CODE","CONT~RACT","market","CONT","CONT~RACT","01.01.1991","06.11.2023","-77.78","16.11.2023","Исполнен"
+"FIRM_ID","FIRM_ID_INITIATOR","SECCODE","CLASS_CODE","AGREEMENT_NUMBER","AGREEMENT_NUMBER_POSTFIX","AGREEMENT_DATE","AGREEMENT_SETTLEMENT_DATE","SUM","REPAYM_DATE","EXEC_STATUS","TR_ID"
+"CLEARING_CODE","TRADING_CODE","CONT~RACT","market","CONT","CONT~RACT","01.01.1991","13.11.2023","-77.78","23.11.2023","Исполнен","23071812300"