From d62829f3b1b1075e6230fba612fb5f67ee02e1e5 Mon Sep 17 00:00:00 2001
From: akulikov <akulikov@mfd.ru>
Date: Thu, 1 Jun 2023 20:48:33 +0300
Subject: [PATCH] http://jira.mfd.msk:8088/browse/CLS-283 some fixes

---
 .../bp/ExecutedDealReportBuilderCommon.java       |  3 ++-
 .../bp/LiabilitiesClaimsReportBuilder.java        |  3 ++-
 .../reports/bp/MoneyChangeReportBuilder.java      | 15 ++++++++++++---
 .../bp/PeriodMoneyChangeReportBuilder.java        |  2 +-
 .../bp/SummaryLiabilitiesClaimsReportBuilder.java |  2 +-
 .../bp/SummaryMoneyChangeReportBuilder.java       |  2 +-
 .../reports/bp/UnfulfilledDealReportBuilder.java  |  3 ++-
 .../reports/services/ReportServiceTest.java       | 11 +++++------
 .../KS_BR_PFX64_INFTYPE_1_expected.csv            |  2 +-
 .../KS_BR_PFX64_INFTYPE_2_expected.csv            |  2 +-
 .../KS_BR_PFX64_INFTYPE_3_expected.csv            |  2 +-
 .../KS_BR_PFX64_INFTYPE_4_expected.csv            |  2 +-
 .../operational_liabilities_claims_expected.csv   |  4 ++--
 .../operational_money_change_expected.csv         |  4 ++--
 .../period_liabilities_claims_expected.csv        |  4 ++--
 .../period_money_change_expected.csv              |  4 ++--
 .../summary_liabilities_claims_expected.csv       |  4 ++--
 .../summary_money_change_expected.csv             |  4 ++--
 .../unfulfilled_deal_report_expected.csv          |  2 +-
 19 files changed, 43 insertions(+), 32 deletions(-)

diff --git a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/bp/ExecutedDealReportBuilderCommon.java b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/bp/ExecutedDealReportBuilderCommon.java
index d394f1d0c..c2d7ab7e7 100644
--- a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/bp/ExecutedDealReportBuilderCommon.java
+++ b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/bp/ExecutedDealReportBuilderCommon.java
@@ -59,6 +59,7 @@ public abstract class ExecutedDealReportBuilderCommon<T> extends CSVReportBuilde
         Collection<ExecutionFond> executionFonds = getExecutionFondsForReport(params);
 
         lines = new ArrayList<>(executionFonds.size());
+        long reportRowId = 0L;
         for (ExecutionFond executionFond : executionFonds) {
             try {
                 Company company = companyImdg.getSingleObjectByID(executionFond.getCompanyId());
@@ -74,7 +75,7 @@ public abstract class ExecutedDealReportBuilderCommon<T> extends CSVReportBuilde
                     );
                 }
 
-                String id = String.valueOf(executionFond.getId());
+                String id = String.valueOf(reportRowId++);
                 String securityId = String.valueOf(executionFond.getSecurityId());
                 String tradeNo = String.valueOf(executionFond.getExchangeExecutionId());
                 String tradeDate = "";
diff --git a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/bp/LiabilitiesClaimsReportBuilder.java b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/bp/LiabilitiesClaimsReportBuilder.java
index f723df32c..0fde3a277 100644
--- a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/bp/LiabilitiesClaimsReportBuilder.java
+++ b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/bp/LiabilitiesClaimsReportBuilder.java
@@ -88,6 +88,7 @@ public abstract class LiabilitiesClaimsReportBuilder<P> extends CSVReportBuilder
         LocalTime nowTime = LocalTime.now();
 
         lines = new ArrayList<>(executions.size());
+        long reportRowId = 0L;
         for (ExecutionCommon execution : executions) {
             try {
                 Company company = companyImdg.getSingleObjectByID(execution.getCompanyId());
@@ -123,7 +124,7 @@ public abstract class LiabilitiesClaimsReportBuilder<P> extends CSVReportBuilder
                     log.warn("registry not found for companyId={}", execution.getCompanyId());
                 }
 
-                String id = String.valueOf(execution.getId());
+                String id = String.valueOf(reportRowId++);
                 String docDate = dateFormatter.format(nowDate);
                 String docTime = timeFormatter.format(nowTime);
                 String docName = "Отчет об обязательствах/требованиях Участника клиринга";
diff --git a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/bp/MoneyChangeReportBuilder.java b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/bp/MoneyChangeReportBuilder.java
index 401c9f0fb..e1a4baf1f 100644
--- a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/bp/MoneyChangeReportBuilder.java
+++ b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/bp/MoneyChangeReportBuilder.java
@@ -65,6 +65,7 @@ public abstract class MoneyChangeReportBuilder<P> extends CSVReportBuilder<P> {
         LocalDate nowDate = LocalDate.now();
         LocalTime nowTime = LocalTime.now();
         lines = new ArrayList<>(registries.size());
+        long reportRowId = 0L;
         for (Registry registry : registries) {
             try {
                 Company company = companyImdg.getSingleObjectByID(registry.getCompanyId());
@@ -90,7 +91,7 @@ public abstract class MoneyChangeReportBuilder<P> extends CSVReportBuilder<P> {
                     );
                 }
 
-                String id = String.valueOf(registry.getId());
+                String id = String.valueOf(reportRowId++);
                 String docDate = dateFormatter.format(nowDate);
                 String docTime = timeFormatter.format(nowTime);
                 String docName = "Отчет об изменении суммы денежных средств и (или) количества иного имущества Участника клиринга";
@@ -103,8 +104,16 @@ public abstract class MoneyChangeReportBuilder<P> extends CSVReportBuilder<P> {
                 String registryCode = String.valueOf(registry.getId());
                 String registryName = registry.getRegistryCode();
                 String openBalance = String.valueOf(registry.getOpenBalance());
-                String changeBalance = String.valueOf(registry.getCloseBalance().subtract(registry.getOpenBalance()));
-                String addWithdraw = String.valueOf(registry.getCredit().subtract(registry.getDebit()));
+                String changeBalance = "";
+                if (registry.getCloseBalance() != null && registry.getOpenBalance() != null) {
+                    changeBalance = String.valueOf(registry.getCloseBalance().subtract(registry.getOpenBalance()));
+                }
+                String addWithdraw = "";
+                if (registry.getCredit() != null) {
+                    if (registry.getDebit() != null) {
+                        addWithdraw = String.valueOf(registry.getCredit().subtract(registry.getDebit()));
+                    } else addWithdraw = String.valueOf(registry.getCredit());
+                }
                 String closeBalance = String.valueOf(registry.getCloseBalance());
                 String remarks = "";
                 String addSum = String.valueOf(registry.getCredit());
diff --git a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/bp/PeriodMoneyChangeReportBuilder.java b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/bp/PeriodMoneyChangeReportBuilder.java
index d4a4b2886..547d7d5d7 100644
--- a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/bp/PeriodMoneyChangeReportBuilder.java
+++ b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/bp/PeriodMoneyChangeReportBuilder.java
@@ -26,7 +26,7 @@ public class PeriodMoneyChangeReportBuilder extends MoneyChangeReportBuilder<Per
                 )
         );
         registries = registries.stream()
-                .filter(registry -> registry.getRegistryCode().startsWith("AM"))
+                .filter(registry -> registry.getRegistryCode().startsWith("CM") || registry.getRegistryCode().startsWith("LM"))
                 .collect(Collectors.toList());
         return registries;
     }
diff --git a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/bp/SummaryLiabilitiesClaimsReportBuilder.java b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/bp/SummaryLiabilitiesClaimsReportBuilder.java
index 448b3e34e..9656aca33 100644
--- a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/bp/SummaryLiabilitiesClaimsReportBuilder.java
+++ b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/bp/SummaryLiabilitiesClaimsReportBuilder.java
@@ -34,7 +34,7 @@ public class SummaryLiabilitiesClaimsReportBuilder extends LiabilitiesClaimsRepo
 
     @Override
     protected String getReportFilename(EmptyParams params) {
-        return "summary_money_change.%s".formatted(dateTimeFormatter.format(LocalDateTime.now()));
+        return "summary_liabilities_claims.%s".formatted(dateTimeFormatter.format(LocalDateTime.now()));
     }
 
     @Override
diff --git a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/bp/SummaryMoneyChangeReportBuilder.java b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/bp/SummaryMoneyChangeReportBuilder.java
index 2cf12fc9f..e9272ff1d 100644
--- a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/bp/SummaryMoneyChangeReportBuilder.java
+++ b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/bp/SummaryMoneyChangeReportBuilder.java
@@ -29,7 +29,7 @@ public class SummaryMoneyChangeReportBuilder extends MoneyChangeReportBuilder<Em
                 )
         );
         registries = registries.stream()
-                .filter(registry -> registry.getRegistryCode().startsWith("AM"))
+                .filter(registry -> registry.getRegistryCode().startsWith("CM") || registry.getRegistryCode().startsWith("LM"))
                 .collect(Collectors.toList());
         return registries;
     }
diff --git a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/bp/UnfulfilledDealReportBuilder.java b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/bp/UnfulfilledDealReportBuilder.java
index 249b53211..ca3a03b8b 100644
--- a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/bp/UnfulfilledDealReportBuilder.java
+++ b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/bp/UnfulfilledDealReportBuilder.java
@@ -64,6 +64,7 @@ public class UnfulfilledDealReportBuilder extends CSVReportBuilder<SessionIdPara
         );
         Collection<ExecutionFond> executionFonds = executionFondImdg.getCollectionObjectsByPredicate(predicate);
 
+        long reportRowId = 0L;
         lines = new ArrayList<>(executionFonds.size());
         for (ExecutionFond executionFond : executionFonds) {
             Company company = companyImdg.getSingleObjectByID(executionFond.getCompanyId());
@@ -75,7 +76,7 @@ public class UnfulfilledDealReportBuilder extends CSVReportBuilder<SessionIdPara
                     )
             );
 
-            String id = String.valueOf(executionFond.getId());
+            String id = String.valueOf(reportRowId++);
             String securityId = String.valueOf(executionFond.getSecurityId());
             String tradeNo = String.valueOf(executionFond.getExchangeExecutionId());
             String tradeDate = dateFormatter.format(executionFond.getTradingDate());
diff --git a/clearing-parent/reports-service/src/test/java/ru/spcex/clearing/reports/services/ReportServiceTest.java b/clearing-parent/reports-service/src/test/java/ru/spcex/clearing/reports/services/ReportServiceTest.java
index a0e09f150..56d455290 100644
--- a/clearing-parent/reports-service/src/test/java/ru/spcex/clearing/reports/services/ReportServiceTest.java
+++ b/clearing-parent/reports-service/src/test/java/ru/spcex/clearing/reports/services/ReportServiceTest.java
@@ -115,8 +115,6 @@ public class ReportServiceTest {
     private final Long TEST_SESSION_ID_1 = 10007L;
     private final Long TEST_SESSION_ID_2 = 10008L;
     private final Long TEST_SESSION_ID_3 = 10009L;
-    private final LocalDate TEST_CLEARING_DATE_1 = LocalDate.now().minus(30, ChronoUnit.DAYS);
-    private final LocalDate TEST_CLEARING_DATE_2 = LocalDate.now().minus(40, ChronoUnit.DAYS);
     private final BigDecimal TEST_SETTLEMENT_AMOUNT = BigDecimal.valueOf(7777777L);
     private final LocalDate TEST_SETTLEMENT_DATE = LocalDate.now().minus(22, ChronoUnit.DAYS);
     private final Instant TEST_EXCHANGE_EXECUTION_MICROSECONDS = Instant.now().minus(777L, ChronoUnit.SECONDS);
@@ -688,7 +686,8 @@ public class ReportServiceTest {
         testExecutionFond.setCounterPartyId(TEST_COUNTER_PARTY_ID_1);
         testExecutionFond.setCoverageStatus(TEST_COVERAGE_STATUS_1);
         testExecutionFond.setSessionId(TEST_SESSION_ID_1);
-        testExecutionFond.setClearingDate(TEST_CLEARING_DATE_1);
+//        testExecutionFond.setClearingDate(TEST_CLEARING_DATE_1);
+        testExecutionFond.setClearingDate(LocalDate.now());
         Long TEST_EXCHANGE_ORDER_ID = 20007L;
         testExecutionFond.setExchangeOrderId(TEST_EXCHANGE_ORDER_ID);
         testExecutionFond.setSettlementAmount(TEST_SETTLEMENT_AMOUNT);
@@ -732,7 +731,7 @@ public class ReportServiceTest {
         testExecutionDeposit.setCounterPartyId(TEST_COUNTER_PARTY_ID_2);
         testExecutionDeposit.setCoverageStatus(TEST_COVERAGE_STATUS_2);
         testExecutionDeposit.setSessionId(TEST_SESSION_ID_2);
-        testExecutionDeposit.setClearingDate(TEST_CLEARING_DATE_2);
+        testExecutionDeposit.setClearingDate(LocalDate.now());
         testExecutionDeposit.setFirstLegAmount(TEST_FIRST_LEG_AMOUNT);
         testExecutionDeposit.setSecondLegAmount(TEST_SECOND_LEG_AMOUNT);
         testExecutionDeposit.setFirstLegSettlementDate(TEST_FIRST_LEG_SETTLEMENT_DATE);
@@ -778,7 +777,7 @@ public class ReportServiceTest {
         testRegistry_1.setTradingClearingRegistry(TEST_TRADING_CLEARING_REGISTRY_1);
         Long TEST_MONEY_ACCOUNT_1 = 11L;
         testRegistry_1.setAccountId(TEST_MONEY_ACCOUNT_1);
-        String TEST_REGISTRY_CODE_1 = "test-registry-code-1";
+        String TEST_REGISTRY_CODE_1 = "CM";
         testRegistry_1.setRegistryCode(TEST_REGISTRY_CODE_1);
         testRegistry_1.setOpenBalance(TEST_OPEN_BALANCE_1);
         testRegistry_1.setCloseBalance(TEST_CLOSE_BALANCE_1);
@@ -796,7 +795,7 @@ public class ReportServiceTest {
         testRegistry_2.setTradingClearingRegistry(TEST_TRADING_CLEARING_REGISTRY_2);
         Long TEST_MONEY_ACCOUNT_2 = 12L;
         testRegistry_2.setAccountId(TEST_MONEY_ACCOUNT_2);
-        String TEST_REGISTRY_CODE_2 = "test-registry-code-2";
+        String TEST_REGISTRY_CODE_2 = "CM";
         testRegistry_2.setRegistryCode(TEST_REGISTRY_CODE_2);
         testRegistry_2.setOpenBalance(TEST_OPEN_BALANCE_2);
         testRegistry_2.setCloseBalance(TEST_CLOSE_BALANCE_2);
diff --git a/clearing-parent/reports-service/src/test/resources/expected_reports_csv/KS_BR_PFX64_INFTYPE_1_expected.csv b/clearing-parent/reports-service/src/test/resources/expected_reports_csv/KS_BR_PFX64_INFTYPE_1_expected.csv
index e56f1778b..4b77a6238 100644
--- a/clearing-parent/reports-service/src/test/resources/expected_reports_csv/KS_BR_PFX64_INFTYPE_1_expected.csv
+++ b/clearing-parent/reports-service/src/test/resources/expected_reports_csv/KS_BR_PFX64_INFTYPE_1_expected.csv
@@ -1,2 +1,2 @@
 id,securityId,tradeNo,tradeDate,tradeTime,settleDate,settleCode,price,quanity,value
-"888","3007","777","07.05.2023","17.05.2023","17.05.2023","test-settle-code","1000","7777","7777777"
+"0","3007","777","07.05.2023","17.05.2023","17.05.2023","test-settle-code","1000","7777","7777777"
diff --git a/clearing-parent/reports-service/src/test/resources/expected_reports_csv/KS_BR_PFX64_INFTYPE_2_expected.csv b/clearing-parent/reports-service/src/test/resources/expected_reports_csv/KS_BR_PFX64_INFTYPE_2_expected.csv
index 0e82e2d79..e639c0e85 100644
--- a/clearing-parent/reports-service/src/test/resources/expected_reports_csv/KS_BR_PFX64_INFTYPE_2_expected.csv
+++ b/clearing-parent/reports-service/src/test/resources/expected_reports_csv/KS_BR_PFX64_INFTYPE_2_expected.csv
@@ -1,2 +1,2 @@
 id,securityId,tradeNo,tradeDate,tradeTime,settleDate,settleCode,price,quanity,value
-"888","3007","777","17.05.2023","17.05.2023","17.05.2023","test-settle-code","1000","7777","7777777"
+"0","3007","777","17.05.2023","17.05.2023","17.05.2023","test-settle-code","1000","7777","7777777"
diff --git a/clearing-parent/reports-service/src/test/resources/expected_reports_csv/KS_BR_PFX64_INFTYPE_3_expected.csv b/clearing-parent/reports-service/src/test/resources/expected_reports_csv/KS_BR_PFX64_INFTYPE_3_expected.csv
index 473063b11..b5ee192b4 100644
--- a/clearing-parent/reports-service/src/test/resources/expected_reports_csv/KS_BR_PFX64_INFTYPE_3_expected.csv
+++ b/clearing-parent/reports-service/src/test/resources/expected_reports_csv/KS_BR_PFX64_INFTYPE_3_expected.csv
@@ -1,2 +1,2 @@
 id,securityId,tradeNo,tradeDate,tradeTime,settleDate,settleCode,price,quanity,value
-"888","3007","777","27.05.2023","17.05.2023","27.05.2023","test-settle-code","1000","7777","7777777"
+"0","3007","777","27.05.2023","17.05.2023","27.05.2023","test-settle-code","1000","7777","7777777"
diff --git a/clearing-parent/reports-service/src/test/resources/expected_reports_csv/KS_BR_PFX64_INFTYPE_4_expected.csv b/clearing-parent/reports-service/src/test/resources/expected_reports_csv/KS_BR_PFX64_INFTYPE_4_expected.csv
index fae8b0a3f..68b4b8df8 100644
--- a/clearing-parent/reports-service/src/test/resources/expected_reports_csv/KS_BR_PFX64_INFTYPE_4_expected.csv
+++ b/clearing-parent/reports-service/src/test/resources/expected_reports_csv/KS_BR_PFX64_INFTYPE_4_expected.csv
@@ -1,2 +1,2 @@
 id,securityId,tradeNo,tradeDate,tradeTime,settleDate,settleCode,price,quanity,value
-"888","3007","777","27.05.2023","17.05.2023","17.05.2023","test-settle-code","1000","7777","7777777"
+"0","3007","777","27.05.2023","17.05.2023","17.05.2023","test-settle-code","1000","7777","7777777"
diff --git a/clearing-parent/reports-service/src/test/resources/expected_reports_csv/operational_liabilities_claims_expected.csv b/clearing-parent/reports-service/src/test/resources/expected_reports_csv/operational_liabilities_claims_expected.csv
index 262bcead4..ece5004dd 100644
--- a/clearing-parent/reports-service/src/test/resources/expected_reports_csv/operational_liabilities_claims_expected.csv
+++ b/clearing-parent/reports-service/src/test/resources/expected_reports_csv/operational_liabilities_claims_expected.csv
@@ -1,3 +1,3 @@
 id,doc_date,doc_time,doc_name,doc_type,clearingHouse,firmId,firName,session_id,clearing_date,clearing_time,trdAccId,account,depo_account,currency,tr_id,securityId,tr_buySell,tr_date,tr_execDate,exec_status,repaym_date,tr_price,nominal,lot_value,tr_lot,tr_quantity,tr_value,tr_accruedint,accruedint,tr_clrComm,tr_exhComm,cash_liability,depo_liability,cash_netto,depo_netto
-"888","16.05.2023","20:45:22","Отчет об обязательствах/требованиях Участника клиринга","KS_FIRMID_LIABILITIES","COMPANY_HOUSE","1007","test-company-fullname-1","10007","16.04.2023","16.04.2023","test-trading-clearing-registry-1","11","13","test-settlement-currency-1","777","3007","S","06.05.2023","24.04.2023","","","1000","333","12","777","7777","7777777","3333","0","","","7777777","7777","777","888"
-"777","16.05.2023","20:45:25","Отчет об обязательствах/требованиях Участника клиринга","KS_FIRMID_LIABILITIES","COMPANY_HOUSE","1008","test-company-fullname-2","10007","06.04.2023","06.04.2023","test-trading-clearing-registry-2","12","14","test-settlement-currency-2","888","3008","B","26.04.2023","14.05.2023","Y","14.05.2023","88","","34","888","","1","","","","","1","","777","888"
+"0","16.05.2023","20:45:22","Отчет об обязательствах/требованиях Участника клиринга","KS_FIRMID_LIABILITIES","COMPANY_HOUSE","1007","test-company-fullname-1","10007","16.04.2023","16.04.2023","test-trading-clearing-registry-1","11","13","test-settlement-currency-1","777","3007","S","06.05.2023","24.04.2023","","","1000","333","12","777","7777","7777777","3333","0","","","7777777","7777","777","888"
+"1","16.05.2023","20:45:25","Отчет об обязательствах/требованиях Участника клиринга","KS_FIRMID_LIABILITIES","COMPANY_HOUSE","1008","test-company-fullname-2","10007","06.04.2023","06.04.2023","test-trading-clearing-registry-2","12","14","test-settlement-currency-2","888","3008","B","26.04.2023","14.05.2023","Y","14.05.2023","88","","34","888","","1","","","","","1","","777","888"
diff --git a/clearing-parent/reports-service/src/test/resources/expected_reports_csv/operational_money_change_expected.csv b/clearing-parent/reports-service/src/test/resources/expected_reports_csv/operational_money_change_expected.csv
index 0e4a9fb03..b9417e3f8 100644
--- a/clearing-parent/reports-service/src/test/resources/expected_reports_csv/operational_money_change_expected.csv
+++ b/clearing-parent/reports-service/src/test/resources/expected_reports_csv/operational_money_change_expected.csv
@@ -1,3 +1,3 @@
 id,doc_date,doc_time,doc_name,doc_type,clearingHouse,firmId,firName,trdAccId,account,currency,registry_code,registry_name,open_balance,change_balance,add_withdraw,close_balance,remarks,add_sum,add_time,withdraw_sum,withdraw_time
-"999","17.05.2023","12:10:51","Отчет об изменении суммы денежных средств и (или) количества иного имущества Участника клиринга","KS_FIRMID_ASSETS","COMPANY_HOUSE","1007","test-company-fullname-1","test-trading-clearing-registry-1","11","test-trading-currency-1","999","test-registry-code-1","3","777","700000","780","","777777","17.05.2023T12:10:50","77777","17.05.2023T12:10:50"
-"666","17.05.2023","12:10:51","Отчет об изменении суммы денежных средств и (или) количества иного имущества Участника клиринга","KS_FIRMID_ASSETS","COMPANY_HOUSE","1008","test-company-fullname-2","test-trading-clearing-registry-2","12","test-trading-currency-2","666","test-registry-code-2","2","888","900000","890","","999999","17.05.2023T12:10:50","99999","17.05.2023T12:10:50"
+"0","17.05.2023","12:10:51","Отчет об изменении суммы денежных средств и (или) количества иного имущества Участника клиринга","KS_FIRMID_ASSETS","COMPANY_HOUSE","1007","test-company-fullname-1","test-trading-clearing-registry-1","11","test-trading-currency-1","999","CM","3","777","700000","780","","777777","17.05.2023T12:10:50","77777","17.05.2023T12:10:50"
+"1","17.05.2023","12:10:51","Отчет об изменении суммы денежных средств и (или) количества иного имущества Участника клиринга","KS_FIRMID_ASSETS","COMPANY_HOUSE","1008","test-company-fullname-2","test-trading-clearing-registry-2","12","test-trading-currency-2","666","CM","2","888","900000","890","","999999","17.05.2023T12:10:50","99999","17.05.2023T12:10:50"
diff --git a/clearing-parent/reports-service/src/test/resources/expected_reports_csv/period_liabilities_claims_expected.csv b/clearing-parent/reports-service/src/test/resources/expected_reports_csv/period_liabilities_claims_expected.csv
index 56594dd85..85759fa8b 100644
--- a/clearing-parent/reports-service/src/test/resources/expected_reports_csv/period_liabilities_claims_expected.csv
+++ b/clearing-parent/reports-service/src/test/resources/expected_reports_csv/period_liabilities_claims_expected.csv
@@ -1,3 +1,3 @@
 id,doc_date,doc_time,doc_name,doc_type,clearingHouse,firmId,firName,session_id,clearing_date,clearing_time,trdAccId,account,depo_account,currency,tr_id,securityId,tr_buySell,tr_date,tr_execDate,exec_status,repaym_date,tr_price,nominal,lot_value,tr_lot,tr_quantity,tr_value,tr_accruedint,accruedint,tr_clrComm,tr_exhComm,cash_liability,depo_liability,cash_netto,depo_netto
-"888","17.05.2023","10:51:13","Отчет об обязательствах/требованиях Участника клиринга","KS_FIRMID_LIABILITIES","COMPANY_HOUSE","1007","test-company-fullname-1","10007","17.04.2023","17.04.2023","test-trading-clearing-registry-1","11","13","test-settlement-currency-1","777","3007","S","07.05.2023","25.04.2023","","","1000","333","12","777","7777","7777777","3333","0","","","7777777","7777","777","888"
-"777","17.05.2023","10:51:13","Отчет об обязательствах/требованиях Участника клиринга","KS_FIRMID_LIABILITIES","COMPANY_HOUSE","1008","test-company-fullname-2","10008","07.04.2023","07.04.2023","test-trading-clearing-registry-2","12","14","test-settlement-currency-2","888","3008","B","27.04.2023","15.05.2023","Y","15.05.2023","88","","34","888","","1","","","","","1","","777","888"
+"0","17.05.2023","10:51:13","Отчет об обязательствах/требованиях Участника клиринга","KS_FIRMID_LIABILITIES","COMPANY_HOUSE","1007","test-company-fullname-1","10007","17.04.2023","17.04.2023","test-trading-clearing-registry-1","11","13","test-settlement-currency-1","777","3007","S","07.05.2023","25.04.2023","","","1000","333","12","777","7777","7777777","3333","0","","","7777777","7777","777","888"
+"1","17.05.2023","10:51:13","Отчет об обязательствах/требованиях Участника клиринга","KS_FIRMID_LIABILITIES","COMPANY_HOUSE","1008","test-company-fullname-2","10008","07.04.2023","07.04.2023","test-trading-clearing-registry-2","12","14","test-settlement-currency-2","888","3008","B","27.04.2023","15.05.2023","Y","15.05.2023","88","","34","888","","1","","","","","1","","777","888"
diff --git a/clearing-parent/reports-service/src/test/resources/expected_reports_csv/period_money_change_expected.csv b/clearing-parent/reports-service/src/test/resources/expected_reports_csv/period_money_change_expected.csv
index 655fa902b..a37c93d19 100644
--- a/clearing-parent/reports-service/src/test/resources/expected_reports_csv/period_money_change_expected.csv
+++ b/clearing-parent/reports-service/src/test/resources/expected_reports_csv/period_money_change_expected.csv
@@ -1,3 +1,3 @@
 id,doc_date,doc_time,doc_name,doc_type,clearingHouse,firmId,firName,trdAccId,account,currency,registry_code,registry_name,open_balance,change_balance,add_withdraw,close_balance,remarks,add_sum,add_time,withdraw_sum,withdraw_time
-"999","17.05.2023","12:18:01","Отчет об изменении суммы денежных средств и (или) количества иного имущества Участника клиринга","KS_FIRMID_ASSETS","COMPANY_HOUSE","1007","test-company-fullname-1","test-trading-clearing-registry-1","11","test-trading-currency-1","999","test-registry-code-1","3","777","700000","780","","777777","17.05.2023T12:18:01","77777","17.05.2023T12:18:01"
-"666","17.05.2023","12:18:01","Отчет об изменении суммы денежных средств и (или) количества иного имущества Участника клиринга","KS_FIRMID_ASSETS","COMPANY_HOUSE","1008","test-company-fullname-2","test-trading-clearing-registry-2","12","test-trading-currency-2","666","test-registry-code-2","2","888","900000","890","","999999","17.05.2023T12:18:01","99999","17.05.2023T12:18:01"
+"0","17.05.2023","12:18:01","Отчет об изменении суммы денежных средств и (или) количества иного имущества Участника клиринга","KS_FIRMID_ASSETS","COMPANY_HOUSE","1007","test-company-fullname-1","test-trading-clearing-registry-1","11","test-trading-currency-1","999","CM","3","777","700000","780","","777777","17.05.2023T12:18:01","77777","17.05.2023T12:18:01"
+"1","17.05.2023","12:18:01","Отчет об изменении суммы денежных средств и (или) количества иного имущества Участника клиринга","KS_FIRMID_ASSETS","COMPANY_HOUSE","1008","test-company-fullname-2","test-trading-clearing-registry-2","12","test-trading-currency-2","666","CM","2","888","900000","890","","999999","17.05.2023T12:18:01","99999","17.05.2023T12:18:01"
diff --git a/clearing-parent/reports-service/src/test/resources/expected_reports_csv/summary_liabilities_claims_expected.csv b/clearing-parent/reports-service/src/test/resources/expected_reports_csv/summary_liabilities_claims_expected.csv
index 7f5048002..b8140509a 100644
--- a/clearing-parent/reports-service/src/test/resources/expected_reports_csv/summary_liabilities_claims_expected.csv
+++ b/clearing-parent/reports-service/src/test/resources/expected_reports_csv/summary_liabilities_claims_expected.csv
@@ -1,3 +1,3 @@
 id,doc_date,doc_time,doc_name,doc_type,clearingHouse,firmId,firName,session_id,clearing_date,clearing_time,trdAccId,account,depo_account,currency,tr_id,securityId,tr_buySell,tr_date,tr_execDate,exec_status,repaym_date,tr_price,nominal,lot_value,tr_lot,tr_quantity,tr_value,tr_accruedint,accruedint,tr_clrComm,tr_exhComm,cash_liability,depo_liability,cash_netto,depo_netto
-888,"17.05.2023","10:58:08","Отчет об обязательствах/требованиях Участника клиринга","KS_FIRMID_LIABILITIES","COMPANY_HOUSE","1007","test-company-fullname-1","10007","17.04.2023","17.04.2023","test-trading-clearing-registry-1","11","13","test-settlement-currency-1","777","3007","S","07.05.2023","25.04.2023","","","1000","333","12","777","7777","7777777","3333","0","","","7777777","7777","777","888"
-777,"17.05.2023","10:58:08","Отчет об обязательствах/требованиях Участника клиринга","KS_FIRMID_LIABILITIES","COMPANY_HOUSE","1008","test-company-fullname-2","10008","07.04.2023","07.04.2023","test-trading-clearing-registry-2","12","14","test-settlement-currency-2","888","3008","B","27.04.2023","15.05.2023",Y,"15.05.2023","88","","34","888","","1","","","","","1","","777","888"
+0,"17.05.2023","10:58:08","Отчет об обязательствах/требованиях Участника клиринга","KS_FIRMID_LIABILITIES","COMPANY_HOUSE","1007","test-company-fullname-1","10007","17.04.2023","17.04.2023","test-trading-clearing-registry-1","11","13","test-settlement-currency-1","777","3007","S","07.05.2023","25.04.2023","","","1000","333","12","777","7777","7777777","3333","0","","","7777777","7777","777","888"
+1,"17.05.2023","10:58:08","Отчет об обязательствах/требованиях Участника клиринга","KS_FIRMID_LIABILITIES","COMPANY_HOUSE","1008","test-company-fullname-2","10008","07.04.2023","07.04.2023","test-trading-clearing-registry-2","12","14","test-settlement-currency-2","888","3008","B","27.04.2023","15.05.2023",Y,"15.05.2023","88","","34","888","","1","","","","","1","","777","888"
diff --git a/clearing-parent/reports-service/src/test/resources/expected_reports_csv/summary_money_change_expected.csv b/clearing-parent/reports-service/src/test/resources/expected_reports_csv/summary_money_change_expected.csv
index a9085ae59..f117db7c2 100644
--- a/clearing-parent/reports-service/src/test/resources/expected_reports_csv/summary_money_change_expected.csv
+++ b/clearing-parent/reports-service/src/test/resources/expected_reports_csv/summary_money_change_expected.csv
@@ -1,3 +1,3 @@
 id,doc_date,doc_time,doc_name,doc_type,clearingHouse,firmId,firName,trdAccId,account,currency,registry_code,registry_name,open_balance,change_balance,add_withdraw,close_balance,remarks,add_sum,add_time,withdraw_sum,withdraw_time
-"999","17.05.2023","12:25:42","Отчет об изменении суммы денежных средств и (или) количества иного имущества Участника клиринга","KS_FIRMID_ASSETS","COMPANY_HOUSE","1007","test-company-fullname-1","test-trading-clearing-registry-1","11","test-trading-currency-1","999","test-registry-code-1","3","777","700000","780","","777777","17.05.2023T12:25:42","77777","17.05.2023T12:25:42"
-"666","17.05.2023","12:25:42","Отчет об изменении суммы денежных средств и (или) количества иного имущества Участника клиринга","KS_FIRMID_ASSETS","COMPANY_HOUSE","1008","test-company-fullname-2","test-trading-clearing-registry-2","12","test-trading-currency-2","666","test-registry-code-2","2","888","900000","890","","999999","17.05.2023T12:25:42","99999","17.05.2023T12:25:42"
+"0","17.05.2023","12:25:42","Отчет об изменении суммы денежных средств и (или) количества иного имущества Участника клиринга","KS_FIRMID_ASSETS","COMPANY_HOUSE","1007","test-company-fullname-1","test-trading-clearing-registry-1","11","test-trading-currency-1","999","CM","3","777","700000","780","","777777","17.05.2023T12:25:42","77777","17.05.2023T12:25:42"
+"1","17.05.2023","12:25:42","Отчет об изменении суммы денежных средств и (или) количества иного имущества Участника клиринга","KS_FIRMID_ASSETS","COMPANY_HOUSE","1008","test-company-fullname-2","test-trading-clearing-registry-2","12","test-trading-currency-2","666","CM","2","888","900000","890","","999999","17.05.2023T12:25:42","99999","17.05.2023T12:25:42"
diff --git a/clearing-parent/reports-service/src/test/resources/expected_reports_csv/unfulfilled_deal_report_expected.csv b/clearing-parent/reports-service/src/test/resources/expected_reports_csv/unfulfilled_deal_report_expected.csv
index 866e1ccdb..85ff732d3 100644
--- a/clearing-parent/reports-service/src/test/resources/expected_reports_csv/unfulfilled_deal_report_expected.csv
+++ b/clearing-parent/reports-service/src/test/resources/expected_reports_csv/unfulfilled_deal_report_expected.csv
@@ -1,2 +1,2 @@
 id,securityId,tradeNo,tradeDate,settleCode
-"888","3007","777","07.05.2023","test-class-code"
+"0","3007","777","07.05.2023","test-class-code"