From 552fbe26d0b93e28b10d2e1b0202ffc93e195d96 Mon Sep 17 00:00:00 2001
From: AKurakin <akurakin@mfd.ru>
Date: Tue, 10 Jan 2023 16:52:07 +0300
Subject: [PATCH] =?UTF-8?q?reports-service=20=D0=BF=D0=BE=D0=BF=D1=80?=
 =?UTF-8?q?=D0=B0=D0=B2=D0=B8=D0=BB=20CLS-25?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ...ava => ReportBR_0420315_P1_Collector.java} | 13 +++++------
 .../ReportBR_0420315_P2_collector.java        | 22 +++++++++----------
 2 files changed, 16 insertions(+), 19 deletions(-)
 rename clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/collector/{ReportBR_0420315_Collector.java => ReportBR_0420315_P1_Collector.java} (92%)

diff --git a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/collector/ReportBR_0420315_Collector.java b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/collector/ReportBR_0420315_P1_Collector.java
similarity index 92%
rename from clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/collector/ReportBR_0420315_Collector.java
rename to clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/collector/ReportBR_0420315_P1_Collector.java
index e25acfdce..a3c1b5268 100644
--- a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/collector/ReportBR_0420315_Collector.java
+++ b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/collector/ReportBR_0420315_P1_Collector.java
@@ -25,7 +25,7 @@ import java.time.LocalDate;
 import java.util.*;
 
 @Component
-public class ReportBR_0420315_Collector extends ReportWithPeriodCollector<ReportBR_0420315_P1> {
+public class ReportBR_0420315_P1_Collector extends ReportWithPeriodCollector<ReportBR_0420315_P1> {
     protected static final List<String> ALLOW_CLEARING_MEMBER_CATEGORY = Arrays.asList(ClearingCategory.I.getKey(), ClearingCategory.V.getKey());
 
     private Imdg<Company> companyImdg;
@@ -35,7 +35,7 @@ public class ReportBR_0420315_Collector extends ReportWithPeriodCollector<Report
     private Imdg<Listing> listingImdg;
 
     @Autowired
-    public ReportBR_0420315_Collector(ImdgProvider imdgProvider) {
+    public ReportBR_0420315_P1_Collector(ImdgProvider imdgProvider) {
         companyImdg = imdgProvider.getImdg(IMDGDistributedNames.Map_Company, Company.class);
         liabilitiesClaimsAssetsImdg = imdgProvider.getImdg(IMDGDistributedNames.Map_LiabilitiesClaimsAssets, LiabilitiesClaimsAssets.class);
         clearingMemberCategoryImdg = imdgProvider.getImdg(IMDGDistributedNames.Map_ClearingMemberCategory, ClearingMemberCategory.class);
@@ -99,7 +99,7 @@ public class ReportBR_0420315_Collector extends ReportWithPeriodCollector<Report
                 long contractorQty;
                 BigDecimal liabilitiesAmount = BigDecimal.ZERO;
                 {
-                    HashSet<String> collectedToSum = new HashSet<>(); // чтобы дважды не посчитать 1 и тот же контракт
+                    HashSet<String> collectedContract = new HashSet<>();
                     HashSet<Long> onMarketSecurity = new HashSet<>();
                     for (LiabilitiesClaimsAssets lContract : liabilitiesOfCompany) {
                         if (!onMarketSecurity.contains(lContract.getSecurityId())) {
@@ -109,13 +109,12 @@ public class ReportBR_0420315_Collector extends ReportWithPeriodCollector<Report
                             }
                             onMarketSecurity.add(lContract.getSecurityId());
                         }
-                        if (lContract.getLiabilitiesQuantity() != null && StringUtils.isNotEmpty(lContract.getContract())
-                                && !collectedToSum.contains(lContract.getContract())) {
-                            collectedToSum.add(lContract.getContract());
+                        if (lContract.getLiabilitiesQuantity() != null && StringUtils.isNotEmpty(lContract.getContract())) {
+                            collectedContract.add(lContract.getContract());
                             liabilitiesAmount = liabilitiesAmount.add(lContract.getLiabilitiesQuantity());
                         }
                     }
-                    contractorQty = collectedToSum.size();
+                    contractorQty = collectedContract.size();
                 }
                 String onMarketString = StringUtils.join(onMarket, ",");
                 if (onMarket.size() != 1) { // Сейчас по коду ожидается один listing.market="MKRS" но потом могут быть несколько
diff --git a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/collector/ReportBR_0420315_P2_collector.java b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/collector/ReportBR_0420315_P2_collector.java
index eb3d266fc..c4a0d72da 100644
--- a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/collector/ReportBR_0420315_P2_collector.java
+++ b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/collector/ReportBR_0420315_P2_collector.java
@@ -12,6 +12,7 @@ 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;
@@ -43,27 +44,24 @@ public class ReportBR_0420315_P2_collector extends ReportWithPeriodCollector<Rep
         validateDateRange(startDate, endDate);
         Collection<LiabilitiesClaimsAssets> liabilities = searchLiabilitiesClaimsAssets(startDate, endDate);
 
-        long contractorQty;
-        double liabilitiesAmount = 0;
+        long liabilitiesAmount;
+        BigDecimal contractorQty = BigDecimal.ZERO;
         {
             HashSet<String> collectedToSumm = new HashSet<>();
             for (LiabilitiesClaimsAssets lContract : liabilities) {
-                if (lContract.getLiabilitiesQuantity() != null && StringUtils.isNotEmpty(lContract.getContract())
-                        && !collectedToSumm.contains(lContract.getContract())) {
+                if (lContract.getLiabilitiesQuantity() != null && StringUtils.isNotEmpty(lContract.getContract())) {
                     collectedToSumm.add(lContract.getContract());
-                    liabilitiesAmount += lContract.getLiabilitiesQuantity().doubleValue();
+                    contractorQty = contractorQty.add(lContract.getLiabilitiesQuantity());
                 }
             }
-            contractorQty = collectedToSumm.size();
+            liabilitiesAmount = collectedToSumm.size();
         }
 
-//        ReportBR_0420315_P2 reportBR_0420315_p2 = new ReportBR_0420315_P2(startDate, endDate,
-//                "BR",
-//                toString(contractorQty),
-//                toString(liabilitiesAmount));
+        ReportBR_0420315_P2 reportBR_0420315_p2 = new ReportBR_0420315_P2(startDate, endDate);
+        reportBR_0420315_p2.setRows(new ReportBR_0420315_P2.Info_0420315_P2(toString(contractorQty),
+                toString(liabilitiesAmount)));
 
-//        return reportBR_0420315_p2;
-        return null;
+        return reportBR_0420315_p2;
     }
 
     @Override