From 038f676eef5a0c5a3f56c38474576e9a90a2a0f3 Mon Sep 17 00:00:00 2001
From: akulikov <akulikov@mfd.ru>
Date: Thu, 14 Dec 2023 12:17:02 +0300
Subject: [PATCH] http://jira.mfd.msk:8088/browse/CLS-602

---
 .../reports/builders/bean/KSRepTradesReport.java   | 14 ++++++++++++++
 .../builders/ks/KSRepTradesReportBuilder.java      |  1 +
 .../reports/services/ReportServiceTest_KS.java     |  1 +
 .../ks/KS_REP_TRADES_expected.csv                  | 10 +++++-----
 4 files changed, 21 insertions(+), 5 deletions(-)

diff --git a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/builders/bean/KSRepTradesReport.java b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/builders/bean/KSRepTradesReport.java
index 229b37012..905f190cc 100644
--- a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/builders/bean/KSRepTradesReport.java
+++ b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/builders/bean/KSRepTradesReport.java
@@ -7,6 +7,7 @@ import com.opencsv.bean.CsvDate;
 import com.opencsv.bean.CsvNumber;
 
 import java.math.BigDecimal;
+import java.time.LocalDate;
 import java.time.LocalDateTime;
 
 public class KSRepTradesReport {
@@ -70,6 +71,11 @@ public class KSRepTradesReport {
     @CsvBindByPosition(position = 13)
     private String status;
 
+    @CsvBindByName(column = "REPAYM_DATE")
+    @CsvBindByPosition(position = 14)
+    @CsvDate(value = "yyyy-MM-dd")
+    private LocalDate repaymDate;
+
 
     public Long getSessionId() {
         return sessionId;
@@ -182,4 +188,12 @@ public class KSRepTradesReport {
     public void setDepoAccount(String depoAccount) {
         this.depoAccount = depoAccount;
     }
+
+    public LocalDate getRepaymDate() {
+        return repaymDate;
+    }
+
+    public void setRepaymDate(LocalDate repaymDate) {
+        this.repaymDate = repaymDate;
+    }
 }
diff --git a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/builders/ks/KSRepTradesReportBuilder.java b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/builders/ks/KSRepTradesReportBuilder.java
index 207d8fc0b..c81a43035 100644
--- a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/builders/ks/KSRepTradesReportBuilder.java
+++ b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/builders/ks/KSRepTradesReportBuilder.java
@@ -209,6 +209,7 @@ public class KSRepTradesReportBuilder extends CSVReportBuilder<EmptyParams, KSRe
                     }
                     ksRepTradesReport.setCashLiability(firstLegAmount);
                     ksRepTradesReport.setDepoLiability(BigDecimal.ZERO);
+                    ksRepTradesReport.setRepaymDate(executionDeposit.getSecondLegSettlementDate());
                 } else if (execution instanceof ExecutionFond executionFond) {
 
                     if (tkr.getDepoAccountId() != null) {
diff --git a/clearing-parent/reports-service/src/test/java/ru/spcex/clearing/reports/services/ReportServiceTest_KS.java b/clearing-parent/reports-service/src/test/java/ru/spcex/clearing/reports/services/ReportServiceTest_KS.java
index 58137beee..8baaff5f4 100644
--- a/clearing-parent/reports-service/src/test/java/ru/spcex/clearing/reports/services/ReportServiceTest_KS.java
+++ b/clearing-parent/reports-service/src/test/java/ru/spcex/clearing/reports/services/ReportServiceTest_KS.java
@@ -729,6 +729,7 @@ public class ReportServiceTest_KS {
         executionDeposit.setExchangeExecutionId(222L);
         executionDeposit.setExchangeExecutionTime(Instant.ofEpochMilli(LocalDateTime.of(2022, 1, 1, 1, 1, 1).toEpochSecond(ZoneOffset.UTC)));
         executionDeposit.setCoverageStatus(CoverageStatus.DEND.getKey());
+        executionDeposit.setSecondLegSettlementDate(LocalDate.of(2000, 1, 1));
         executionDepositImdg.insert(executionDeposit);
 
         String jsonString = TestUtils.getJsonStringForSystem(reportRequest, 0L);
diff --git a/clearing-parent/reports-service/src/test/resources/expected_reports_csv/ks/KS_REP_TRADES_expected.csv b/clearing-parent/reports-service/src/test/resources/expected_reports_csv/ks/KS_REP_TRADES_expected.csv
index 6f68fab49..250d28d0b 100644
--- a/clearing-parent/reports-service/src/test/resources/expected_reports_csv/ks/KS_REP_TRADES_expected.csv
+++ b/clearing-parent/reports-service/src/test/resources/expected_reports_csv/ks/KS_REP_TRADES_expected.csv
@@ -1,5 +1,5 @@
-"SESSION_ID","SESSION_DATE","TR_ID","AGREEMENT_NUMBER","FIRM_ID","TKR","ACCOUNT","DEPO_ACCOUNT","CASH_LIABILITY","DEPO_LIABILITY","TRADE_NUM","CLASS_CODE","TRADE_DATE","STATUS"
-"7","20.01.1970T07:09:07","222","CONTRACT","TRADING_CODE","TKR","","","8888.89","0","222","3333","20.01.1970T02:49:58","2"
-"6","20.01.1970T15:54:43","222","","TRADING_CODE","TKR","","ACCOUNT","-8888.89","123","222","3333","20.01.1970T02:49:58","1"
-"6","20.01.1970T15:54:43","222","","TRADING_CODE","TKR","","ACC_SYMBOL_VALUE","8888.89","-123","222","3333","20.01.1970T02:49:58","2"
-"6","20.01.1970T15:54:43","222","","TRADING_CODE","TKR","","ACC_SYMBOL_VALUE","-8888.89","123","222","3333","20.01.1970T02:49:58","2"
+"SESSION_ID","SESSION_DATE","TR_ID","AGREEMENT_NUMBER","FIRM_ID","TKR","ACCOUNT","DEPO_ACCOUNT","CASH_LIABILITY","DEPO_LIABILITY","TRADE_NUM","CLASS_CODE","TRADE_DATE","STATUS","REPAYM_DATE"
+"135","20.01.1970T07:09:07","222","CONTRACT","TRADING_CODE","TKR",,,"8888.89","0","222","3333","20.01.1970T02:49:58","2","2000-01-01"
+"134","20.01.1970T15:54:43","222",,"TRADING_CODE","TKR",,"ACC_SYMBOL_VALUE","8888.89","-123","222","3333","20.01.1970T02:49:58","2",
+"134","20.01.1970T15:54:43","222",,"TRADING_CODE","TKR",,"ACCOUNT","-8888.89","123","222","3333","20.01.1970T02:49:58","1",
+"134","20.01.1970T15:54:43","222",,"TRADING_CODE","TKR",,"ACC_SYMBOL_VALUE","-8888.89","123","222","3333","20.01.1970T02:49:58","2",