From 256dfafce33cad765aebb5cf3692d035468ee2a0 Mon Sep 17 00:00:00 2001
From: akulikov <akulikov@mfd.ru>
Date: Fri, 29 Dec 2023 14:08:48 +0300
Subject: [PATCH] http://jira.mfd.msk:8088/browse/CLS-608 fix money/depo
 balance register, money/depo payment instruction report added

---
 .../reports/bean/DepoBalanceRegisterReport.java      |  2 +-
 .../reports/bean/MoneyBalanceRegisterReport.java     |  2 +-
 .../registry/reports/builders/CSVReportBuilder.java  |  2 +-
 .../builders/DepoBalanceRegisterReportBuilder.java   | 12 ++++--------
 .../builders/MoneyBalanceRegisterReportBuilder.java  |  6 ++----
 .../DepoPaymentInstructionRegisterServiceTest.java   |  2 +-
 .../MoneyPaymentInstructionRegisterServiceTest.java  |  2 +-
 .../depo_balance_register_expected.csv               |  2 +-
 8 files changed, 12 insertions(+), 18 deletions(-)

diff --git a/clearing-parent/registry-service/src/main/java/ru/spcex/clearing/registry/reports/bean/DepoBalanceRegisterReport.java b/clearing-parent/registry-service/src/main/java/ru/spcex/clearing/registry/reports/bean/DepoBalanceRegisterReport.java
index 1df0cdba5..bad7c451f 100644
--- a/clearing-parent/registry-service/src/main/java/ru/spcex/clearing/registry/reports/bean/DepoBalanceRegisterReport.java
+++ b/clearing-parent/registry-service/src/main/java/ru/spcex/clearing/registry/reports/bean/DepoBalanceRegisterReport.java
@@ -42,7 +42,7 @@ public class DepoBalanceRegisterReport implements CSVReport {
 
     @CsvBindByName(column = "Количество ЦБ")
     @CsvBindByPosition(position = 7)
-    @CsvNumber(value = "#0.00", writeFormat = "#0.00")
+    @CsvNumber(value = "#0", writeFormat = "#0")
     private BigDecimal sum;
 
     public String getHouseName() {
diff --git a/clearing-parent/registry-service/src/main/java/ru/spcex/clearing/registry/reports/bean/MoneyBalanceRegisterReport.java b/clearing-parent/registry-service/src/main/java/ru/spcex/clearing/registry/reports/bean/MoneyBalanceRegisterReport.java
index 471f78687..3399336f1 100644
--- a/clearing-parent/registry-service/src/main/java/ru/spcex/clearing/registry/reports/bean/MoneyBalanceRegisterReport.java
+++ b/clearing-parent/registry-service/src/main/java/ru/spcex/clearing/registry/reports/bean/MoneyBalanceRegisterReport.java
@@ -42,7 +42,7 @@ public class MoneyBalanceRegisterReport implements CSVReport {
 
     @CsvBindByName(column = "Остаток денежных средств")
     @CsvBindByPosition(position = 7)
-    @CsvNumber(value = "#0.00", writeFormat = "#0.00")
+    @CsvNumber(value = "#0", writeFormat = "#0")
     private BigDecimal sum;
 
 
diff --git a/clearing-parent/registry-service/src/main/java/ru/spcex/clearing/registry/reports/builders/CSVReportBuilder.java b/clearing-parent/registry-service/src/main/java/ru/spcex/clearing/registry/reports/builders/CSVReportBuilder.java
index 4ab63cfb7..d1892a99e 100644
--- a/clearing-parent/registry-service/src/main/java/ru/spcex/clearing/registry/reports/builders/CSVReportBuilder.java
+++ b/clearing-parent/registry-service/src/main/java/ru/spcex/clearing/registry/reports/builders/CSVReportBuilder.java
@@ -45,7 +45,7 @@ public abstract class CSVReportBuilder<R extends CSVReport, I extends BusinessOb
      * Название отчета, используется для формирования имени отчета (без указания формата)
      */
     protected String getReportFilename() {
-        return "%s_%s".formatted(reportName(), dateTimeFormatter_YYMMDDHHmmssSSS.format(LocalDateTime.now()));
+        return "%s %s".formatted(reportName(), dateTimeFormatter_YYMMDDHHmmssSSS.format(LocalDateTime.now()));
     }
 
     /**
diff --git a/clearing-parent/registry-service/src/main/java/ru/spcex/clearing/registry/reports/builders/DepoBalanceRegisterReportBuilder.java b/clearing-parent/registry-service/src/main/java/ru/spcex/clearing/registry/reports/builders/DepoBalanceRegisterReportBuilder.java
index 5ba136057..b548c7624 100644
--- a/clearing-parent/registry-service/src/main/java/ru/spcex/clearing/registry/reports/builders/DepoBalanceRegisterReportBuilder.java
+++ b/clearing-parent/registry-service/src/main/java/ru/spcex/clearing/registry/reports/builders/DepoBalanceRegisterReportBuilder.java
@@ -24,7 +24,7 @@ public class DepoBalanceRegisterReportBuilder extends CSVReportBuilder<DepoBalan
 
     @Override
     protected String reportName() {
-        return "depo_balance_register";
+        return "Реестр остатков ценных бумаг";
     }
 
     @Override
@@ -38,18 +38,14 @@ public class DepoBalanceRegisterReportBuilder extends CSVReportBuilder<DepoBalan
         LocalTime nowTime = LocalTime.now();
         DepoBalanceRegisterReport entity = new DepoBalanceRegisterReport();
 
-        Company company = companyImdg.getSingleObjectByID(2L);
-        if (company != null) entity.setHouseName(company.getShortName());
-
+        entity.setHouseName("АО РЦД");
         entity.setNumber(yyyyMMddFormat.format(now));
         entity.setDate(now);
         entity.setTime(nowTime);
-
-        company = companyImdg.getSingleObjectByID(input.getCompanyId());
-        if (company != null) entity.setCompany(company.getShortName());
+        entity.setCompany(input.getShortName());
 
         AccountType accountType = IEnumKey.getEnumByKey(AccountType.class, input.getAccountType());
-        if (accountType == AccountType.Clrn || accountType == AccountType.Info) entity.setAccount(input.getAccount());
+        if (accountType == AccountType.Depo) entity.setAccount(input.getAccount());
 
         entity.setSecurity(input.getSecuritySymbol());
         entity.setSum(input.getBalance());
diff --git a/clearing-parent/registry-service/src/main/java/ru/spcex/clearing/registry/reports/builders/MoneyBalanceRegisterReportBuilder.java b/clearing-parent/registry-service/src/main/java/ru/spcex/clearing/registry/reports/builders/MoneyBalanceRegisterReportBuilder.java
index 5c9d8e5f6..487e797ef 100644
--- a/clearing-parent/registry-service/src/main/java/ru/spcex/clearing/registry/reports/builders/MoneyBalanceRegisterReportBuilder.java
+++ b/clearing-parent/registry-service/src/main/java/ru/spcex/clearing/registry/reports/builders/MoneyBalanceRegisterReportBuilder.java
@@ -24,7 +24,7 @@ public class MoneyBalanceRegisterReportBuilder extends CSVReportBuilder<MoneyBal
 
     @Override
     protected String reportName() {
-        return "money_balance_register";
+        return "Реестр остатков денежных средств";
     }
 
     @Override
@@ -45,9 +45,7 @@ public class MoneyBalanceRegisterReportBuilder extends CSVReportBuilder<MoneyBal
         entity.setDate(now);
         entity.setTime(nowTime);
         entity.setCurrency("RUR");
-
-        company = companyImdg.getSingleObjectByID(input.getCompanyId());
-        if (company != null) entity.setCompany(company.getShortName());
+        entity.setCompany(input.getShortName());
 
         AccountType accountType = IEnumKey.getEnumByKey(AccountType.class, input.getAccountType());
         if (accountType == AccountType.Clrn || accountType == AccountType.Info) entity.setAccount(input.getAccount());
diff --git a/clearing-parent/registry-service/src/test/java/ru/spcex/clearing/registry/service/DepoPaymentInstructionRegisterServiceTest.java b/clearing-parent/registry-service/src/test/java/ru/spcex/clearing/registry/service/DepoPaymentInstructionRegisterServiceTest.java
index a123d3f5c..8b92c4562 100644
--- a/clearing-parent/registry-service/src/test/java/ru/spcex/clearing/registry/service/DepoPaymentInstructionRegisterServiceTest.java
+++ b/clearing-parent/registry-service/src/test/java/ru/spcex/clearing/registry/service/DepoPaymentInstructionRegisterServiceTest.java
@@ -184,7 +184,7 @@ class DepoPaymentInstructionRegisterServiceTest implements InitializingBean {
 
         File outFile = outFolder.listFiles()[0];
         File expectedFile = new File(getClass().getClassLoader().getResource("expected_reports/depo_payment_instruction_register_expected.csv").getFile());
-        ReportTestUtils.compareCSVFiles(expectedFile, outFile, Arrays.asList("Время формирования", "Дата распоряжения"));
+        ReportTestUtils.compareCSVFiles(expectedFile, outFile, Arrays.asList("Время формирования", "Дата распоряжения", "Номер распоряжения"));
 
         settings.setCsvMode(oldCsvMode);
 
diff --git a/clearing-parent/registry-service/src/test/java/ru/spcex/clearing/registry/service/MoneyPaymentInstructionRegisterServiceTest.java b/clearing-parent/registry-service/src/test/java/ru/spcex/clearing/registry/service/MoneyPaymentInstructionRegisterServiceTest.java
index 4fedfe052..b4f95b3f0 100644
--- a/clearing-parent/registry-service/src/test/java/ru/spcex/clearing/registry/service/MoneyPaymentInstructionRegisterServiceTest.java
+++ b/clearing-parent/registry-service/src/test/java/ru/spcex/clearing/registry/service/MoneyPaymentInstructionRegisterServiceTest.java
@@ -179,7 +179,7 @@ class MoneyPaymentInstructionRegisterServiceTest implements InitializingBean {
 
         File outFile = outFolder.listFiles()[0];
         File expectedFile = new File(getClass().getClassLoader().getResource("expected_reports/money_payment_instruction_register_expected.csv").getFile());
-        ReportTestUtils.compareCSVFiles(expectedFile, outFile, Arrays.asList("Время формирования", "Дата распоряжения"));
+        ReportTestUtils.compareCSVFiles(expectedFile, outFile, Arrays.asList("Время формирования", "Дата распоряжения", "Номер распоряжения"));
 
         settings.setCsvMode(oldCsvMode);
         ReportTestUtils.deleteDir(outFolder);
diff --git a/clearing-parent/registry-service/src/test/resources/expected_reports/depo_balance_register_expected.csv b/clearing-parent/registry-service/src/test/resources/expected_reports/depo_balance_register_expected.csv
index e5a4204ac..48076cd77 100644
--- a/clearing-parent/registry-service/src/test/resources/expected_reports/depo_balance_register_expected.csv
+++ b/clearing-parent/registry-service/src/test/resources/expected_reports/depo_balance_register_expected.csv
@@ -1,2 +1,2 @@
 "Наименование Расчетного депозитария","Номер отчета","Дата","Время","Краткое наименование УК","Номер торгового раздела счета депо/ код раздела «к размещению/выкупу»","Код ЦБ","Количество ЦБ"
-,"20231228","28.12.2023","18:54:21",,,"SECURITY_SYMBOL","1"
+"АО РЦД","20231228","28.12.2023","18:54:21",,"ACCOUNT","SECURITY_SYMBOL","1"