From bef57e096b662f966bbf972e6c161e2cf8080a24 Mon Sep 17 00:00:00 2001
From: AKurakin <akurakin@mfd.ru>
Date: Fri, 22 Sep 2023 14:22:02 +0300
Subject: [PATCH] =?UTF-8?q?reports-service=20http://jira.mfd.msk:8088/brow?=
 =?UTF-8?q?se/CLS-497=20ksCommisonTrades,=20=D0=B5=D1=89=D1=91=20=D0=BB?=
 =?UTF-8?q?=D0=BE=D0=B3=D0=BE=D0=B2=20trace?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../reports/ks/KSCommissionTradesReportBuilder.java | 13 ++++++++++---
 .../reports/ks/KSRepCashNettoReportBuilder.java     |  1 +
 .../ks/KSRepCashRegisterSumsReportBuilder.java      |  1 +
 .../reports/ks/KSRepDepoNettoReportBuilder.java     |  1 +
 .../KSRepDepoRegisterQuantitiesReportBuilder.java   |  1 +
 .../reports/ks/KSRepDepoRegistersReportBuilder.java |  1 +
 .../reports/ks/KSRepFirmDetailsReportBuilder.java   |  1 +
 .../reports/ks/KSSessionListReportBuilder.java      |  4 +++-
 8 files changed, 19 insertions(+), 4 deletions(-)

diff --git a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/ks/KSCommissionTradesReportBuilder.java b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/ks/KSCommissionTradesReportBuilder.java
index db4e3a829..b177c2899 100644
--- a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/ks/KSCommissionTradesReportBuilder.java
+++ b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/ks/KSCommissionTradesReportBuilder.java
@@ -77,16 +77,23 @@ public class KSCommissionTradesReportBuilder extends CSVReportBuilder<EmptyParam
         LocalDate nowDate = LocalDate.now();
 
         ImdgPredicateBuilder pb = registryImdg.predicateBuilder();
-        String sql = RegistryCodeSqlBuilder.getInstance(RegistryTradingParams.DM_T, RegistryTradingParams.DM_X).build();
+        String sql = RegistryCodeSqlBuilder.getInstance(RegistryTradingParams.TS_T).build();
         ImdgPredicate finalPredicate = pb.and(
                 pb.sql(sql),
                 pb.equals("refundDate", nowDate),
-                pb.equals("registryStatus", RegistryStatus.OK.getKey()),
-                pb.notNull("tradingDate")
+                pb.less("valueDate", nowDate),
+                pb.or(pb.equals("registryStatus", RegistryStatus.OK.getKey()), pb.equals("registryStatus", RegistryStatus.CLRD.getKey())),
+                pb.or(pb.equals("sessionType", SessionType.XDEP.getKey()), pb.equals("sessionType", SessionType.FINL.getKey()))
         );
         Collection<Registry> registries = registryImdg.getCollectionObjectsByPredicate(finalPredicate);
+        log.trace("Found {} Registry by query: {}", registries.size(), finalPredicate);
         rows = new ArrayList<>(registries.size());
         for (Registry registry : registries) {
+            if (registry.getTradingDate() == null) {
+                log.warn("For registry id = {} field TradingDate was null, registry was skipped",
+                        registry.getId());
+                continue;
+            }
             try {
                 RegistryUnit registryUnit = IEnumKey.getEnumByKey(RegistryUnit.class, registry.getRegistryUnit());
                 Company company = companyImdg.getSingleObjectByID(registry.getCompanyId());
diff --git a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/ks/KSRepCashNettoReportBuilder.java b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/ks/KSRepCashNettoReportBuilder.java
index cccd5e79a..57243eb7d 100644
--- a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/ks/KSRepCashNettoReportBuilder.java
+++ b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/ks/KSRepCashNettoReportBuilder.java
@@ -80,6 +80,7 @@ public class KSRepCashNettoReportBuilder extends CSVReportBuilder<SessionIdParam
                 pb.notNull("account")
         );
         Collection<Registry> registries = registryImdg.getCollectionObjectsByPredicate(finalPredicate);
+        log.trace("Found {} Registry by query: {}", registries.size(), finalPredicate);
         Map<PairRegistryId, List<Registry>> registryMap = registries.stream().collect(Collectors.groupingBy(PairRegistryId::new));
 
         rows = new ArrayList<>(registryMap.size());
diff --git a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/ks/KSRepCashRegisterSumsReportBuilder.java b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/ks/KSRepCashRegisterSumsReportBuilder.java
index dcda88de0..10a09bc66 100644
--- a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/ks/KSRepCashRegisterSumsReportBuilder.java
+++ b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/ks/KSRepCashRegisterSumsReportBuilder.java
@@ -80,6 +80,7 @@ public class KSRepCashRegisterSumsReportBuilder extends CSVReportBuilder<EmptyPa
                 pb.equals("operationStatus", OperationStatus.Executed.getKey())
         );
         Collection<Statement> statements = statementImdg.getCollectionObjectsByPredicate(finalPredicate);
+        log.trace("Found {} Statements by query: {}", statements.size(), finalPredicate);
         rows = new ArrayList<>(statements.size());
         for (Statement statement : statements) {
             if (statement.getAmount() == null) {
diff --git a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/ks/KSRepDepoNettoReportBuilder.java b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/ks/KSRepDepoNettoReportBuilder.java
index ce8bec92c..bfbfbf923 100644
--- a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/ks/KSRepDepoNettoReportBuilder.java
+++ b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/ks/KSRepDepoNettoReportBuilder.java
@@ -77,6 +77,7 @@ public class KSRepDepoNettoReportBuilder extends CSVReportBuilder<SessionIdParam
                 pb.notNull("account")
         );
         Collection<Registry> registries = registryImdg.getCollectionObjectsByPredicate(finalPredicate);
+        log.trace("Found {} Registry by query: {}", registries.size(), finalPredicate);
 
         Map<PairRegistryId, List<Registry>> registryMap = registries.stream().collect(Collectors.groupingBy(PairRegistryId::new));
         rows = new ArrayList<>(registries.size());
diff --git a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/ks/KSRepDepoRegisterQuantitiesReportBuilder.java b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/ks/KSRepDepoRegisterQuantitiesReportBuilder.java
index ac9bfb256..914e57e2c 100644
--- a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/ks/KSRepDepoRegisterQuantitiesReportBuilder.java
+++ b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/ks/KSRepDepoRegisterQuantitiesReportBuilder.java
@@ -87,6 +87,7 @@ public class KSRepDepoRegisterQuantitiesReportBuilder extends CSVReportBuilder<E
                 pb.notNull("amount")
         );
         Collection<Statement> statements = statementImdg.getCollectionObjectsByPredicate(finalPredicate);
+        log.trace("Found {} Statement by query: {}", statements.size(), finalPredicate);
 
         rows = new ArrayList<>(statements.size());
         for (Statement statement : statements) {
diff --git a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/ks/KSRepDepoRegistersReportBuilder.java b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/ks/KSRepDepoRegistersReportBuilder.java
index 680956858..74f8b7308 100644
--- a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/ks/KSRepDepoRegistersReportBuilder.java
+++ b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/ks/KSRepDepoRegistersReportBuilder.java
@@ -78,6 +78,7 @@ public class KSRepDepoRegistersReportBuilder extends CSVReportBuilder<EmptyParam
                 pb.notNull("tradingClearingRegistry")
         );
         Collection<Registry> registries = registryImdg.getCollectionObjectsByPredicate(finalPredicate);
+        log.trace("Found {} Registry by query: {}", registries.size(), finalPredicate);
 
         rows = new ArrayList<>(registries.size());
         for (Registry registry : registries) {
diff --git a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/ks/KSRepFirmDetailsReportBuilder.java b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/ks/KSRepFirmDetailsReportBuilder.java
index db55c5854..c8b619395 100644
--- a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/ks/KSRepFirmDetailsReportBuilder.java
+++ b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/ks/KSRepFirmDetailsReportBuilder.java
@@ -59,6 +59,7 @@ public class KSRepFirmDetailsReportBuilder extends CSVReportBuilder<EmptyParams,
     @Override
     protected void collect(EmptyParams params) {
         Collection<Company> companies = companyImdg.getCollectionObjectsByFieldValues(Map.of("workflowStatus", WorkflowStatus.Active.getKey()));
+        log.trace("Found {} Company", companies.size());
 
         rows = new ArrayList<>(companies.size());
         for (Company company : companies) {
diff --git a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/ks/KSSessionListReportBuilder.java b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/ks/KSSessionListReportBuilder.java
index 5862951e4..82a44b81d 100644
--- a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/ks/KSSessionListReportBuilder.java
+++ b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/ks/KSSessionListReportBuilder.java
@@ -55,7 +55,9 @@ public class KSSessionListReportBuilder extends CSVReportBuilder<EmptyParams, KS
 
     @Override
     protected void collect(EmptyParams params) {
-        Collection<Session> sessions = sessionImdg.getCollectionObjectsByFieldValues(Map.of("clearingDate", LocalDate.now()));
+        Map<String, LocalDate> query = Map.of("clearingDate", LocalDate.now());
+        Collection<Session> sessions = sessionImdg.getCollectionObjectsByFieldValues(query);
+        log.trace("Found {} Session by query: {}", sessions.size(), query);
         rows = new ArrayList<>(sessions.size());
         for (Session session : sessions) {
             try {