From 503710f19b088f45f4af87124ae0f1c902f3e9fb Mon Sep 17 00:00:00 2001
From: AKurakin <akurakin@mfd.ru>
Date: Tue, 31 Jan 2023 17:05:01 +0300
Subject: [PATCH] =?UTF-8?q?reports-service=20=D0=BF=D0=BE=D0=BC=D0=B5?=
 =?UTF-8?q?=D0=BD=D1=8F=D0=BB=D0=B8=20=D1=82=D0=B8=D0=BF=D1=8B=20=D0=B2=20?=
 =?UTF-8?q?LiabilitiesClaimsAssets.refundDate?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../reports/services/ReportWithPeriodCollector.java  | 12 ++++++------
 .../collector/ReportBR_0420314_P2_Collector.java     |  2 +-
 .../collector/ReportBR_0420317_Collector.java        |  2 +-
 .../services/collector/ReportPA_B_Collector.java     |  4 ++--
 .../services/collector/ReportPA_IV_Collector.java    |  4 ++--
 .../services/AbstractReportCollectorTest.java        |  8 ++++----
 6 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/ReportWithPeriodCollector.java b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/ReportWithPeriodCollector.java
index e7687ed87..b11179d01 100644
--- a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/ReportWithPeriodCollector.java
+++ b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/ReportWithPeriodCollector.java
@@ -20,9 +20,9 @@ public abstract class ReportWithPeriodCollector<T extends AbstractReport> extend
                                                                                 LocalDate startDate,
                                                                                 LocalDate endDate) {
         ImdgPredicateBuilder pb = liabilitiesClaimsAssetsImdg.predicateBuilder();
-        Instant dateTimeLo = toInstantStartDay(startDate);
-        Instant dateTimeHi = toInstantStartDay(endDate);
-        ImdgPredicate p = pb.and(pb.greatEqual("refundDate", dateTimeLo), pb.lessEqual("refundDate", dateTimeHi));
+//        Instant dateTimeLo = toInstantStartDay(startDate);
+//        Instant dateTimeHi = toInstantEndDay(endDate);
+        ImdgPredicate p = pb.and(pb.greatEqual("refundDate", startDate), pb.lessEqual("refundDate", endDate));
         Collection<LiabilitiesClaimsAssets> liabilities = liabilitiesClaimsAssetsImdg.getCollectionObjectsByPredicate(p);
         return liabilities;
     }
@@ -31,9 +31,9 @@ public abstract class ReportWithPeriodCollector<T extends AbstractReport> extend
                                                                       LocalDate startDate, LocalDate endDate,
                                                                       Long allowClearingStatusId) {
         ImdgPredicateBuilder pb = liabilitiesClaimsAssetsImdg.predicateBuilder();
-        Instant dateTimeLo = toInstantStartDay(startDate);
-        Instant dateTimeHi = toInstantStartDay(endDate);
-        ImdgPredicate p = pb.and(pb.greatEqual("refundDate", dateTimeLo), pb.lessEqual("refundDate", dateTimeHi),
+//        Instant dateTimeLo = toInstantStartDay(startDate);
+//        Instant dateTimeHi = toInstantEndDay(endDate);
+        ImdgPredicate p = pb.and(pb.greatEqual("refundDate", startDate), pb.lessEqual("refundDate", endDate),
                 pb.equals("clearingStatus", allowClearingStatusId));
         Collection<LiabilitiesClaimsAssets> liabilities = liabilitiesClaimsAssetsImdg.getCollectionObjectsByPredicate(p);
         return liabilities;
diff --git a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/collector/ReportBR_0420314_P2_Collector.java b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/collector/ReportBR_0420314_P2_Collector.java
index 46bacd498..367d11525 100644
--- a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/collector/ReportBR_0420314_P2_Collector.java
+++ b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/collector/ReportBR_0420314_P2_Collector.java
@@ -45,7 +45,7 @@ public class ReportBR_0420314_P2_Collector extends ReportWithPeriodCollector<Rep
     Collection<PaymentInstruction> searchPaymentInstruction(LocalDate startDate, LocalDate endDate) {
         ImdgPredicateBuilder pb = paymentInstructionImdg.predicateBuilder();
         Instant dateTimeLo = toInstantStartDay(startDate);
-        Instant dateTimeHi = toInstantStartDay(endDate);
+        Instant dateTimeHi = toInstantEndDay(endDate);
         ImdgPredicate p = pb.and(pb.greatEqual("created", dateTimeLo), pb.lessEqual("created", dateTimeHi));
         Collection<PaymentInstruction> paymentInstructionsAll = paymentInstructionImdg.getCollectionObjectsByPredicate(p);
         return paymentInstructionsAll;
diff --git a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/collector/ReportBR_0420317_Collector.java b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/collector/ReportBR_0420317_Collector.java
index 8699ec969..c0d7748b0 100644
--- a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/collector/ReportBR_0420317_Collector.java
+++ b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/collector/ReportBR_0420317_Collector.java
@@ -35,7 +35,7 @@ public class ReportBR_0420317_Collector extends ReportWithPeriodCollector<Report
     Collection<Relation> searchRelation(LocalDate startDate, LocalDate endDate, String service) {
         ImdgPredicateBuilder pb = relationImdg.predicateBuilder();
         Instant dateTimeLo = toInstantStartDay(startDate);
-        Instant dateTimeHi = toInstantStartDay(endDate);
+        Instant dateTimeHi = toInstantEndDay(endDate);
         ImdgPredicate p = pb.and(pb.greatEqual("updated", dateTimeLo), pb.lessEqual("updated", dateTimeHi),
                 pb.equals("service", service));
         Collection<Relation> relations = relationImdg.getCollectionObjectsByPredicate(p);
diff --git a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/collector/ReportPA_B_Collector.java b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/collector/ReportPA_B_Collector.java
index 8f6fe2bc4..bc373378d 100644
--- a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/collector/ReportPA_B_Collector.java
+++ b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/collector/ReportPA_B_Collector.java
@@ -49,8 +49,8 @@ public class ReportPA_B_Collector extends ReportWithPeriodCollector<ReportPA_B>
 
         ImdgPredicateBuilder builder = liabilitiesClaimsAssetsImdg.predicateBuilder();
         ImdgPredicate refundDatePredicate = builder.and(
-                builder.greatEqual("refundDate", toInstantStartDay(startDate)),
-                builder.lessEqual("refundDate", toInstantStartDay(endDate))
+                builder.greatEqual("refundDate", (startDate)),
+                builder.lessEqual("refundDate", (endDate))
         );
         ImdgPredicate companyIdPredicates = builder.in("companyId", companyIds.toArray(new Comparable[0]));
         ImdgPredicate finalPredicate = builder.and(refundDatePredicate, companyIdPredicates);
diff --git a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/collector/ReportPA_IV_Collector.java b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/collector/ReportPA_IV_Collector.java
index c7bef06e6..159b72c32 100644
--- a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/collector/ReportPA_IV_Collector.java
+++ b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/collector/ReportPA_IV_Collector.java
@@ -55,8 +55,8 @@ public class ReportPA_IV_Collector extends ReportWithPeriodCollector<ReportPA_IV
 
         ImdgPredicateBuilder builder = liabilitiesClaimsAssetsImdg.predicateBuilder();
         ImdgPredicate refundDatePredicate = builder.and(
-                builder.greatEqual("refundDate", toInstantStartDay(startDate)),
-                builder.lessEqual("refundDate", toInstantStartDay(endDate))
+                builder.greatEqual("refundDate", (startDate)),
+                builder.lessEqual("refundDate", (endDate))
         );
         ImdgPredicate companyIdPredicates = builder.in("companyId", companyIds.toArray(new Comparable[0]));
         ImdgPredicate finalPredicate = builder.and(refundDatePredicate, companyIdPredicates);
diff --git a/clearing-parent/reports-service/src/test/java/ru/spcex/clearing/reports/services/AbstractReportCollectorTest.java b/clearing-parent/reports-service/src/test/java/ru/spcex/clearing/reports/services/AbstractReportCollectorTest.java
index 29842b5c2..275a02798 100644
--- a/clearing-parent/reports-service/src/test/java/ru/spcex/clearing/reports/services/AbstractReportCollectorTest.java
+++ b/clearing-parent/reports-service/src/test/java/ru/spcex/clearing/reports/services/AbstractReportCollectorTest.java
@@ -14,7 +14,7 @@ class AbstractReportCollectorTest extends AbstractReportCollector {
     @Test
     void testToString() {
         AbstractReportCollectorTest instance = new AbstractReportCollectorTest();
-        assertEquals(null, instance.toString((Long) null));
+        assertEquals("", instance.toString((Long) null));
         assertEquals("1", instance.toString((Long) 1L));
         assertEquals("1230", instance.toString((Long) 1230L));
 
@@ -23,7 +23,7 @@ class AbstractReportCollectorTest extends AbstractReportCollector {
     @Test
     void testToString1() {
         AbstractReportCollectorTest instance = new AbstractReportCollectorTest();
-        assertEquals(null, instance.toString((Instant) null));
+        assertEquals("", instance.toString((Instant) null));
         Instant val = Instant.ofEpochMilli(1672058774338L);
         assertEquals("26.12.2022T15:46:14", instance.toString(val)); // msk timezone
     }
@@ -38,7 +38,7 @@ class AbstractReportCollectorTest extends AbstractReportCollector {
     @Test
     void testToString3() {
         AbstractReportCollectorTest instance = new AbstractReportCollectorTest();
-        assertEquals(null, instance.toString((BigDecimal)null));
+        assertEquals("", instance.toString((BigDecimal)null));
         assertEquals("0.00", instance.toString(BigDecimal.ZERO));
         assertEquals("1.10", instance.toString(BigDecimal.valueOf(1.10)));
         assertEquals("100.12", instance.toString(BigDecimal.valueOf(100.12)));
@@ -49,7 +49,7 @@ class AbstractReportCollectorTest extends AbstractReportCollector {
     @Test
     void testToString4() {
         AbstractReportCollectorTest instance = new AbstractReportCollectorTest();
-        assertEquals(null, instance.toString((Double) null));
+        assertEquals("", instance.toString((Double) null));
         assertEquals("0.00", instance.toString(0.0));
         assertEquals("1.10", instance.toString(1.10));
         assertEquals("100.12", instance.toString(100.12));