From 827e6b7954103082e6c3316b0ff5a73b1414b743 Mon Sep 17 00:00:00 2001
From: akulikov <akulikov@mfd.ru>
Date: Tue, 7 May 2024 12:25:37 +0300
Subject: [PATCH] http://jira.mfd.msk:8088/browse/CLS-629

---
 .../builders/bean/KSRepCashNettoReport.java   | 24 +++++++++++++++++++
 .../KSRepDepoRegisterQuantitiesReport.java    | 12 +++++-----
 .../ks/KSRepCashNettoReportBuilder.java       | 20 ++++++----------
 ...epDepoRegisterQuantitiesReportBuilder.java | 18 +++-----------
 4 files changed, 40 insertions(+), 34 deletions(-)

diff --git a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/builders/bean/KSRepCashNettoReport.java b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/builders/bean/KSRepCashNettoReport.java
index 37a06eba5..5feee9809 100644
--- a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/builders/bean/KSRepCashNettoReport.java
+++ b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/builders/bean/KSRepCashNettoReport.java
@@ -54,6 +54,14 @@ public class KSRepCashNettoReport {
     @CsvBindByPosition(position = 9)
     private String lotCurrency;
 
+    @CsvBindByName(column = "CURRENCY_NETTO")
+    @CsvBindByPosition(position = 10)
+    private BigDecimal currencyNetto;
+
+    @CsvBindByName(column = "TR_EXECDATE")
+    @CsvBindByPosition(position = 11)
+    @CsvDate(value = "dd.MM.yyyy")
+    private LocalDate trExecDate;
 
     public String getFirmId() {
         return firmId;
@@ -134,4 +142,20 @@ public class KSRepCashNettoReport {
     public void setLotCurrency(String lotCurrency) {
         this.lotCurrency = lotCurrency;
     }
+
+    public BigDecimal getCurrencyNetto() {
+        return currencyNetto;
+    }
+
+    public void setCurrencyNetto(BigDecimal currencyNetto) {
+        this.currencyNetto = currencyNetto;
+    }
+
+    public LocalDate getTrExecDate() {
+        return trExecDate;
+    }
+
+    public void setTrExecDate(LocalDate trExecDate) {
+        this.trExecDate = trExecDate;
+    }
 }
diff --git a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/builders/bean/KSRepDepoRegisterQuantitiesReport.java b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/builders/bean/KSRepDepoRegisterQuantitiesReport.java
index 0d289e862..693a6f56e 100644
--- a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/builders/bean/KSRepDepoRegisterQuantitiesReport.java
+++ b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/builders/bean/KSRepDepoRegisterQuantitiesReport.java
@@ -48,9 +48,9 @@ public class KSRepDepoRegisterQuantitiesReport {
     @CsvBindByPosition(position = 8)
     private String tradeNum;
 
-    @CsvBindByName(column = "LOT_CURRENCY")
+    @CsvBindByName(column = "OPER_TYPE")
     @CsvBindByPosition(position = 8)
-    private String lotCurrency;
+    private String operType;
 
 
     public String getFirmId() {
@@ -125,12 +125,12 @@ public class KSRepDepoRegisterQuantitiesReport {
         this.tradeNum = tradeNum;
     }
 
-    public String getLotCurrency() {
-        return lotCurrency;
+    public String getOperType() {
+        return operType;
     }
 
-    public void setLotCurrency(String lotCurrency) {
-        this.lotCurrency = lotCurrency;
+    public void setOperType(String operType) {
+        this.operType = operType;
     }
 
 }
diff --git a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/builders/ks/KSRepCashNettoReportBuilder.java b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/builders/ks/KSRepCashNettoReportBuilder.java
index bd933ca64..9c4ac65f5 100644
--- a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/builders/ks/KSRepCashNettoReportBuilder.java
+++ b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/builders/ks/KSRepCashNettoReportBuilder.java
@@ -125,6 +125,7 @@ public class KSRepCashNettoReportBuilder extends CSVReportBuilder<SessionIdParam
                 }
 
                 boolean invalid = false;
+                BigDecimal currencyNetto = null;
                 if (!cmtRegistries.isEmpty() || !lmtRegistries.isEmpty()) {
                     String sourceTradingCode = null;
                     String sourceTkr = null;
@@ -149,6 +150,7 @@ public class KSRepCashNettoReportBuilder extends CSVReportBuilder<SessionIdParam
                             log.warn("Invalid CM_T registries set, tradingClearingRegistry not equals. Registries was skipped");
                             break;
                         }
+                        currencyNetto = currRegistry.getBalance();
                     }
                     for (Registry currRegistry : lmtRegistries) {
                         if (!Objects.equals(sourceTradingCode, currRegistry.getTradingCode())) {
@@ -241,19 +243,11 @@ public class KSRepCashNettoReportBuilder extends CSVReportBuilder<SessionIdParam
                 ksRepCashNettoReport.setValue(withValue ? value : null);
                 ksRepCashNettoReport.setOblValue(withOblReqValue ? oblValue : null);
                 ksRepCashNettoReport.setReqValue(withOblReqValue ? reqValue : null);
-
-                CurrencyPairSecurity currencyPairSecurity = currencyPairSecurityImdg.getFirstObjectByFieldValues(Map.of(
-                    "securityId", registry.getSecurityId()
-                ));
-                if (currencyPairSecurity != null) {
-                    CurrencyPairDictionary currencyPairDictionary = currencyPairDictionaryImdg.getSingleObjectByFieldValues(
-                        Map.of(
-                            "baseCurrency", currencyPairSecurity.getCurrencyPairId()
-                        )
-                    );
-                    if (currencyPairDictionary != null) {
-                        ksRepCashNettoReport.setLotCurrency(currencyPairDictionary.getBaseCurrency());
-                    }
+                ksRepCashNettoReport.setLotCurrency(registry.getSecuritySymbol());
+                SessionType sessionType = IEnumKey.getEnumByKey(SessionType.class, registry.getSessionType());
+                if (sessionType == SessionType.CURR) {
+                    ksRepCashNettoReport.setCurrencyNetto(currencyNetto);
+                    ksRepCashNettoReport.setTrExecDate(LocalDate.now());
                 }
 
                 rows.add(ksRepCashNettoReport);
diff --git a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/builders/ks/KSRepDepoRegisterQuantitiesReportBuilder.java b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/builders/ks/KSRepDepoRegisterQuantitiesReportBuilder.java
index fffd2f54d..107c7923d 100644
--- a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/builders/ks/KSRepDepoRegisterQuantitiesReportBuilder.java
+++ b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/builders/ks/KSRepDepoRegisterQuantitiesReportBuilder.java
@@ -21,6 +21,7 @@ import ru.spcex.clearing.reports.builders.CSVReportBuilder;
 import ru.spcex.clearing.reports.builders.EmptyParams;
 import ru.spcex.clearing.reports.builders.bean.KSRepDepoRegisterQuantitiesReport;
 import ru.spcex.platform.enumeration.AccountType;
+import ru.spcex.platform.enumeration.OperationType;
 import ru.spcex.platform.enumeration.RegistryStatus;
 import ru.spcex.platform.enumeration.RegistryTradingParams;
 import ru.spcex.platform.enumeration.ReportBuilderType;
@@ -136,20 +137,7 @@ public class KSRepDepoRegisterQuantitiesReportBuilder extends CSVReportBuilder<E
             BigDecimal addQuantity = registry.getBalance();
             Instant addTime = registry.getUpdated();
             LocalDate addDate = LocalDate.now();
-            String lotCurrency = null;
-            CurrencyPairSecurity currencyPairSecurity = currencyPairSecurityImdg.getFirstObjectByFieldValues(Map.of(
-                "securityId", registry.getSecurityId()
-            ));
-            if (currencyPairSecurity != null) {
-                CurrencyPairDictionary currencyPairDictionary = currencyPairDictionaryImdg.getSingleObjectByFieldValues(
-                    Map.of(
-                        "baseCurrency", currencyPairSecurity.getCurrencyPairId()
-                    )
-                );
-                if (currencyPairDictionary != null) {
-                    lotCurrency = currencyPairDictionary.getBaseCurrency();
-                }
-            }
+            OperationType operationType = OperationType.forBigDecimal(registry.getBalance());
 
             KSRepDepoRegisterQuantitiesReport ksRepDepoRegisterQuantitiesReport = new KSRepDepoRegisterQuantitiesReport();
             ksRepDepoRegisterQuantitiesReport.setFirmId(firmId);
@@ -161,7 +149,7 @@ public class KSRepDepoRegisterQuantitiesReportBuilder extends CSVReportBuilder<E
             ksRepDepoRegisterQuantitiesReport.setAddQuantity(addQuantity);
             ksRepDepoRegisterQuantitiesReport.setAddTime(LocalTime.ofInstant(addTime, getReportZoneId()));
             ksRepDepoRegisterQuantitiesReport.setAddDate(addDate);
-            ksRepDepoRegisterQuantitiesReport.setLotCurrency(lotCurrency);
+            ksRepDepoRegisterQuantitiesReport.setOperType(operationType.getCode());
             rows.add(ksRepDepoRegisterQuantitiesReport);
         }