From ad0d807b2cf5e16caf10b6eba11aaaa26db9cf9c Mon Sep 17 00:00:00 2001
From: AKurakin <akurakin@mfd.ru>
Date: Wed, 24 Jan 2024 13:16:56 +0300
Subject: [PATCH] registry-service http://jira.mfd.msk:8088/browse/CLS-634

---
 ...ymentInstructionRegisterReportBuilder.java |  5 ++++-
 .../ExecutionRegisterReportBuilder.java       |  3 ++-
 ...ymentInstructionRegisterReportBuilder.java |  5 ++++-
 ...DepoPaymentInstructionRegisterService.java |  3 ++-
 .../platform/utils/number/BigDecimalUtil.java | 22 +++++++++++++++++++
 .../utils/number/BigDecimalUtilTest.java      | 18 +++++++++++++++
 6 files changed, 52 insertions(+), 4 deletions(-)

diff --git a/clearing-parent/registry-service/src/main/java/ru/spcex/clearing/registry/reports/builders/DepoPaymentInstructionRegisterReportBuilder.java b/clearing-parent/registry-service/src/main/java/ru/spcex/clearing/registry/reports/builders/DepoPaymentInstructionRegisterReportBuilder.java
index 544a682e7..6d3e4bbdb 100644
--- a/clearing-parent/registry-service/src/main/java/ru/spcex/clearing/registry/reports/builders/DepoPaymentInstructionRegisterReportBuilder.java
+++ b/clearing-parent/registry-service/src/main/java/ru/spcex/clearing/registry/reports/builders/DepoPaymentInstructionRegisterReportBuilder.java
@@ -41,7 +41,10 @@ public class DepoPaymentInstructionRegisterReportBuilder extends XLSXReportBuild
     protected DepoPaymentInstructionRegisterReport toRow(PaymentInstruction input) {
         DepoPaymentInstructionRegisterReport entity = new DepoPaymentInstructionRegisterReport();
 
-        entity.setNumber(input.getId());
+        if (input.getSessionId() == null)
+            entity.setNumber(input.getId());
+        else
+            entity.setNumber(input.getSessionId());
         entity.setDate(input.getClearingDate());
 
         if (input.getCreated() != null) entity.setTime(LocalDateTime.from(input.getCreated().atZone(ZoneId.systemDefault())));
diff --git a/clearing-parent/registry-service/src/main/java/ru/spcex/clearing/registry/reports/builders/ExecutionRegisterReportBuilder.java b/clearing-parent/registry-service/src/main/java/ru/spcex/clearing/registry/reports/builders/ExecutionRegisterReportBuilder.java
index 17d07d660..ecda2152b 100644
--- a/clearing-parent/registry-service/src/main/java/ru/spcex/clearing/registry/reports/builders/ExecutionRegisterReportBuilder.java
+++ b/clearing-parent/registry-service/src/main/java/ru/spcex/clearing/registry/reports/builders/ExecutionRegisterReportBuilder.java
@@ -14,6 +14,7 @@ import ru.spcex.platform.enumeration.MoneyFlowSide;
 import ru.spcex.platform.enumeration.Side;
 import ru.spcex.platform.imdg.api.Imdg;
 import ru.spcex.platform.imdg.api.ImdgProvider;
+import ru.spcex.platform.utils.number.BigDecimalUtil;
 
 import java.time.LocalDateTime;
 import java.time.ZoneId;
@@ -117,7 +118,7 @@ public class ExecutionRegisterReportBuilder extends XLSXReportBuilder<ExecutionR
         } else if (input instanceof ExecutionFond fond) {
             entity.setSettlementDate(fond.getSettlementDate());
             entity.setSecurity(fond.getSecuritySymbol());
-            entity.setAmount(fond.getSettlementAmount());
+            entity.setAmount(BigDecimalUtil.safeSumBD(fond.getSettlementAmount(), fond.getInterestAmount()));
             entity.setQuantity(fond.getQuantity());
         }
 
diff --git a/clearing-parent/registry-service/src/main/java/ru/spcex/clearing/registry/reports/builders/MoneyPaymentInstructionRegisterReportBuilder.java b/clearing-parent/registry-service/src/main/java/ru/spcex/clearing/registry/reports/builders/MoneyPaymentInstructionRegisterReportBuilder.java
index 20e93cd0a..88a6e1fd7 100644
--- a/clearing-parent/registry-service/src/main/java/ru/spcex/clearing/registry/reports/builders/MoneyPaymentInstructionRegisterReportBuilder.java
+++ b/clearing-parent/registry-service/src/main/java/ru/spcex/clearing/registry/reports/builders/MoneyPaymentInstructionRegisterReportBuilder.java
@@ -38,7 +38,10 @@ public class MoneyPaymentInstructionRegisterReportBuilder extends XLSXReportBuil
     protected MoneyPaymentInstructionRegisterReport toRow(PaymentInstruction input) {
         MoneyPaymentInstructionRegisterReport entity = new MoneyPaymentInstructionRegisterReport();
 
-        entity.setNumber(input.getId());
+        if (input.getSessionId() == null)
+            entity.setNumber(input.getId());
+        else
+            entity.setNumber(input.getSessionId());
         entity.setDate(input.getClearingDate());
 
         if (input.getCreated() != null) entity.setTime(LocalDateTime.from(input.getCreated().atZone(ZoneId.systemDefault())));
diff --git a/clearing-parent/registry-service/src/main/java/ru/spcex/clearing/registry/service/DepoPaymentInstructionRegisterService.java b/clearing-parent/registry-service/src/main/java/ru/spcex/clearing/registry/service/DepoPaymentInstructionRegisterService.java
index 9a97baf28..264185998 100644
--- a/clearing-parent/registry-service/src/main/java/ru/spcex/clearing/registry/service/DepoPaymentInstructionRegisterService.java
+++ b/clearing-parent/registry-service/src/main/java/ru/spcex/clearing/registry/service/DepoPaymentInstructionRegisterService.java
@@ -27,6 +27,7 @@ import ru.spcex.platform.enumeration.AccountType;
 import ru.spcex.platform.enumeration.TransactionStatus;
 import ru.spcex.platform.imdg.api.Imdg;
 import ru.spcex.platform.imdg.api.ImdgProvider;
+import ru.spcex.platform.utils.enumeration.IEnumKey;
 import ru.spcex.platform.utils.validation.IValidator;
 
 import java.io.File;
@@ -110,7 +111,7 @@ public class DepoPaymentInstructionRegisterService extends QueueConsumer impleme
                     log.warn("Account id={} not found for paymentInstruction.id={}",
                             paymentInstruction.getCreditLeg_accountId(), paymentInstruction.getId());
                 else {
-                    if (AccountType.Depo.equalsByKey(account.getAccountType())) {
+                    if (IEnumKey.contains(account.getAccountType(), AccountType.Depo, AccountType.Dtrn)) {
                         depoPaymentInstructions.add(paymentInstruction);
                     }
                 }
diff --git a/platform-parent/platform-utils/src/main/java/ru/spcex/platform/utils/number/BigDecimalUtil.java b/platform-parent/platform-utils/src/main/java/ru/spcex/platform/utils/number/BigDecimalUtil.java
index b238d0f1e..987b4456f 100644
--- a/platform-parent/platform-utils/src/main/java/ru/spcex/platform/utils/number/BigDecimalUtil.java
+++ b/platform-parent/platform-utils/src/main/java/ru/spcex/platform/utils/number/BigDecimalUtil.java
@@ -23,6 +23,7 @@ public class BigDecimalUtil {
 
     /**
      * для парсинга вида '-00001234'/'00000123'
+     *
      * @param number
      * @return
      */
@@ -44,6 +45,7 @@ public class BigDecimalUtil {
 
     /**
      * Для кейсов когда есть String поле с десятичной частью, и хотим ограничить число знаков после запятой
+     *
      * @param fillZero - дополнить 0 если не хватает знаков дробной части
      */
     public static String limitDecimalPlaces(String number, int decimalPlaces, boolean fillZero) {
@@ -75,4 +77,24 @@ public class BigDecimalUtil {
         return bd == null ? BigDecimal.ZERO : bd;
     }
 
+    /**
+     * Null safe add:
+     *
+     * @param a nullable
+     * @param b nullable
+     * @return если оба числа null то результат ZERO, иначе сложит их.
+     */
+    public static BigDecimal safeSumBD(BigDecimal a, BigDecimal b) {
+        if (b == null) {
+            if (a == null)
+                return BigDecimal.ZERO;
+            else
+                return a;
+        } else {
+            if (a == null)
+                return b;
+            else
+                return a.add(b);
+        }
+    }
 }
diff --git a/platform-parent/platform-utils/src/test/java/ru/spcex/platform/utils/number/BigDecimalUtilTest.java b/platform-parent/platform-utils/src/test/java/ru/spcex/platform/utils/number/BigDecimalUtilTest.java
index be5b5f9d7..a1bde35cd 100644
--- a/platform-parent/platform-utils/src/test/java/ru/spcex/platform/utils/number/BigDecimalUtilTest.java
+++ b/platform-parent/platform-utils/src/test/java/ru/spcex/platform/utils/number/BigDecimalUtilTest.java
@@ -3,6 +3,8 @@ package ru.spcex.platform.utils.number;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 
+import java.math.BigDecimal;
+
 import static org.junit.jupiter.api.Assertions.*;
 
 class BigDecimalUtilTest {
@@ -21,4 +23,20 @@ class BigDecimalUtilTest {
         Assertions.assertEquals("123.00", BigDecimalUtil.limitDecimalPlaces("123.", 2, true));
         Assertions.assertEquals("123.00", BigDecimalUtil.limitDecimalPlaces("123", 2, true));
     }
+
+
+    @Test
+    void safeBD() {
+        Assertions.assertEquals("1", BigDecimalUtil.safeBD(BigDecimal.ONE).toString());
+        Assertions.assertEquals("0", BigDecimalUtil.safeBD(null).toString());
+    }
+
+    @Test
+    void safeSumBD() {
+        Assertions.assertEquals("11", BigDecimalUtil.safeSumBD(BigDecimal.ONE, BigDecimal.TEN).toString());
+        Assertions.assertEquals("1", BigDecimalUtil.safeSumBD(BigDecimal.ONE, null).toString());
+        Assertions.assertEquals("10", BigDecimalUtil.safeSumBD(null, BigDecimal.TEN).toString());
+        Assertions.assertEquals("0", BigDecimalUtil.safeSumBD(null, null).toString());
+    }
+
 }
\ No newline at end of file