From dd101f97d0dc3263a72b6b5e4a270f98f5bc3243 Mon Sep 17 00:00:00 2001
From: akulikov <akulikov@mfd.ru>
Date: Wed, 11 Jan 2023 11:50:45 +0300
Subject: [PATCH] cls29 collector10 fix

---
 ...va => ReportBR_0420312_P10_Collector.java} | 24 ++++---------------
 ...ava => ReportBR_0420312_P9_Collector.java} |  4 ++--
 2 files changed, 7 insertions(+), 21 deletions(-)
 rename clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/collector/{ReportBR_0420312_P10_collector.java => ReportBR_0420312_P10_Collector.java} (55%)
 rename clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/collector/{ReportBR_0420312_P9_collector.java => ReportBR_0420312_P9_Collector.java} (94%)

diff --git a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/collector/ReportBR_0420312_P10_collector.java b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/collector/ReportBR_0420312_P10_Collector.java
similarity index 55%
rename from clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/collector/ReportBR_0420312_P10_collector.java
rename to clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/collector/ReportBR_0420312_P10_Collector.java
index 8514ca132..37d1d334b 100644
--- a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/collector/ReportBR_0420312_P10_collector.java
+++ b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/collector/ReportBR_0420312_P10_Collector.java
@@ -8,41 +8,26 @@ import ru.spcex.clearing.reports.reports.bt_17_5.ReportBR_0420312_P10;
 import ru.spcex.clearing.reports.services.ReportWithPeriodCollector;
 import ru.spcex.platform.imdg.api.Imdg;
 import ru.spcex.platform.imdg.api.ImdgProvider;
-import ru.spcex.platform.imdg.api.predicate.ImdgPredicate;
-import ru.spcex.platform.imdg.api.predicate.ImdgPredicateBuilder;
 
 import java.math.BigDecimal;
-import java.time.Instant;
 import java.time.LocalDate;
 import java.util.Collection;
 import java.util.Objects;
 
 @Component
-public class ReportBR_0420312_P10_collector extends ReportWithPeriodCollector<ReportBR_0420312_P10> {
+public class ReportBR_0420312_P10_Collector extends ReportWithPeriodCollector<ReportBR_0420312_P10> {
     private Imdg<LiabilitiesClaimsAssets> liabilitiesClaimsAssetsImdg;
 
     @Autowired
-    public ReportBR_0420312_P10_collector(ImdgProvider imdgProvider) {
+    public ReportBR_0420312_P10_Collector(ImdgProvider imdgProvider) {
         liabilitiesClaimsAssetsImdg = imdgProvider.getImdg(IMDGDistributedNames.Map_LiabilitiesClaimsAssets, LiabilitiesClaimsAssets.class);
     }
 
-    Collection<LiabilitiesClaimsAssets> searchLiabilitiesClaimsAssets(LocalDate startDate, LocalDate endDate) {
-//        String ql = String.format("'%s' <= refundDate and refundDate <= '%s'", formatToIMDGInstant(startDate), formatToIMDGInstant(endDate));
-//        Collection<LiabilitiesClaimsAssets> liabilities = liabilitiesClaimsAssetsImdg.getCollectionObjectsBySQL(ql);
-
-        ImdgPredicateBuilder pb = liabilitiesClaimsAssetsImdg.predicateBuilder();
-        Instant dateTimeLo = toInstantStartDay(startDate);
-        Instant dateTimeHi = toInstantStartDay(endDate);
-        ImdgPredicate p = pb.and(pb.greatEqual("refundDate", dateTimeLo), pb.lessEqual("refundDate", dateTimeHi));
-        Collection<LiabilitiesClaimsAssets> liabilities = liabilitiesClaimsAssetsImdg.getCollectionObjectsByPredicate(p);
-        return liabilities;
-    }
-
     @Override
     public ReportBR_0420312_P10 collectReportWithPeriod(LocalDate startDate, LocalDate endDate) {
         validateDateRange(startDate, endDate);
 
-        Collection<LiabilitiesClaimsAssets> liabilities = searchLiabilitiesClaimsAssets(startDate, endDate);
+        Collection<LiabilitiesClaimsAssets> liabilities = searchLiabilitiesClaimsAssets(liabilitiesClaimsAssetsImdg, startDate, endDate);
 
         BigDecimal liabilitiesQuantitySum = liabilities.stream()
                     .map(LiabilitiesClaimsAssets::getLiabilitiesQuantity)
@@ -50,7 +35,8 @@ public class ReportBR_0420312_P10_collector extends ReportWithPeriodCollector<Re
                     .reduce(BigDecimal::add).orElse(BigDecimal.ZERO);
 
         ReportBR_0420312_P10 reportBR_0420312P10 = new ReportBR_0420312_P10(startDate, endDate);
-        reportBR_0420312P10.getRows().add(new ReportBR_0420312_P10.Info_0420312_P10(toString(liabilitiesQuantitySum)));
+        ReportBR_0420312_P10.Info_0420312_P10 reportInfo = new ReportBR_0420312_P10.Info_0420312_P10(toString(liabilitiesQuantitySum));
+        reportBR_0420312P10.getRows().add(reportInfo);
 
         return reportBR_0420312P10;
     }
diff --git a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/collector/ReportBR_0420312_P9_collector.java b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/collector/ReportBR_0420312_P9_Collector.java
similarity index 94%
rename from clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/collector/ReportBR_0420312_P9_collector.java
rename to clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/collector/ReportBR_0420312_P9_Collector.java
index 07544db40..347c0e45c 100644
--- a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/collector/ReportBR_0420312_P9_collector.java
+++ b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/collector/ReportBR_0420312_P9_Collector.java
@@ -19,13 +19,13 @@ import java.util.Map;
 import java.util.Objects;
 
 @Component
-public class ReportBR_0420312_P9_collector extends ReportWithPeriodCollector<ReportBR_0420312_P9> {
+public class ReportBR_0420312_P9_Collector extends ReportWithPeriodCollector<ReportBR_0420312_P9> {
     private Imdg<Company> companyImdg;
     private Imdg<LiabilitiesClaimsAssets> liabilitiesClaimsAssetsImdg;
     private Imdg<CurrencyCodeDictionary> currencyCodeDictionaryImdg;
 
     @Autowired
-    public ReportBR_0420312_P9_collector(ImdgProvider imdgProvider) {
+    public ReportBR_0420312_P9_Collector(ImdgProvider imdgProvider) {
         companyImdg = imdgProvider.getImdg(IMDGDistributedNames.Map_Company, Company.class);
         liabilitiesClaimsAssetsImdg = imdgProvider.getImdg(IMDGDistributedNames.Map_LiabilitiesClaimsAssets, LiabilitiesClaimsAssets.class);
         currencyCodeDictionaryImdg = imdgProvider.getImdg(IMDGDistributedNames.Map_CurrencyCodeDictionary, CurrencyCodeDictionary.class);