http://jira.mfd.msk:8088/browse/CLS-608 fix money/depo balance register, money/depo payment instruction report added

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() {

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;
 
 

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()));
     }
 
     /**

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);
+        entity.setHouseName("АО РЦД");
-        if (company != null) entity.setHouseName(company.getShortName());
-
         entity.setNumber(yyyyMMddFormat.format(now));
         entity.setDate(now);
         entity.setTime(nowTime);
-
+        entity.setCompany(input.getShortName());
-        company = companyImdg.getSingleObjectByID(input.getCompanyId());
-        if (company != null) entity.setCompany(company.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());

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");
-
+        entity.setCompany(input.getShortName());
-        company = companyImdg.getSingleObjectByID(input.getCompanyId());
-        if (company != null) entity.setCompany(company.getShortName());
 
         AccountType accountType = IEnumKey.getEnumByKey(AccountType.class, input.getAccountType());
         if (accountType == AccountType.Clrn || accountType == AccountType.Info) entity.setAccount(input.getAccount());

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);
 

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);

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"