From 970da463fc0519af9673a6f3b757e98e327ca3e2 Mon Sep 17 00:00:00 2001
From: akulikov <akulikov@mfd.ru>
Date: Wed, 22 Nov 2023 15:28:18 +0300
Subject: [PATCH] http://jira.mfd.msk:8088/browse/CLS-596 fixes

---
 .../ks/KSRepCashNettoReportBuilder.java       | 32 ++++++++-----------
 1 file changed, 14 insertions(+), 18 deletions(-)

diff --git a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/builders/ks/KSRepCashNettoReportBuilder.java b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/builders/ks/KSRepCashNettoReportBuilder.java
index e45532acc..2f74eb7d0 100644
--- a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/builders/ks/KSRepCashNettoReportBuilder.java
+++ b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/builders/ks/KSRepCashNettoReportBuilder.java
@@ -175,10 +175,12 @@ public class KSRepCashNettoReportBuilder extends CSVReportBuilder<SessionIdParam
                 ksRepCashNettoReport.setTkr(registry.getTradingClearingRegistry());
                 ksRepCashNettoReport.setDate(nowDate);
 
-                BigDecimal cmtBalance = null;
-                BigDecimal lmtBalance = null;
-                BigDecimal oblValue = null;
-                BigDecimal reqValue = null;
+                BigDecimal cmtBalance = BigDecimal.ZERO;
+                BigDecimal lmtBalance = BigDecimal.ZERO;
+                BigDecimal oblValue = BigDecimal.ZERO;
+                BigDecimal reqValue = BigDecimal.ZERO;
+                boolean withValue = false;
+                boolean withOblReqValue = false;
                 Set<SessionType> sessionTypeForValue = Set.of(
                         SessionType.IPOT,
                         SessionType.TRDT,
@@ -196,12 +198,12 @@ public class KSRepCashNettoReportBuilder extends CSVReportBuilder<SessionIdParam
                         SessionType sessionType = IEnumKey.getEnumByKey(SessionType.class, cmtRegistry.getSessionType());
                         if (sessionType == null) continue;
                         if (sessionTypeForValue.contains(sessionType)) {
-                            if (cmtBalance == null) cmtBalance = BigDecimal.ZERO;
                             cmtBalance = cmtBalance.add(cmtRegistry.getBalance());
+                            withValue = true;
                         }
                         if (sessionTypeForOblReqValue.contains(sessionType)) {
-                            if (reqValue == null) reqValue = BigDecimal.ZERO;
                             reqValue = reqValue.add(cmtRegistry.getBalance());
+                            withOblReqValue = true;
                         }
                     }
                 }
@@ -210,26 +212,20 @@ public class KSRepCashNettoReportBuilder extends CSVReportBuilder<SessionIdParam
                         SessionType sessionType = IEnumKey.getEnumByKey(SessionType.class, lmtRegistry.getSessionType());
                         if (sessionType == null) continue;
                         if (sessionTypeForValue.contains(sessionType)) {
-                            if (lmtBalance == null) lmtBalance = BigDecimal.ZERO;
                             lmtBalance = lmtBalance.add(lmtRegistry.getBalance());
+                            withValue = true;
                         }
                         if (sessionTypeForOblReqValue.contains(sessionType)) {
-                            if (oblValue == null) oblValue = BigDecimal.ZERO;
                             oblValue = oblValue.add(lmtRegistry.getBalance());
+                            withOblReqValue = true;
                         }
                     }
                 }
                 BigDecimal value;
-                if (cmtBalance != null) {
-                    value = cmtBalance.subtract(Objects.requireNonNullElse(lmtBalance, BigDecimal.ZERO));
-                }
-                else {
-                    if (lmtBalance != null) value = lmtBalance.negate();
-                    else value = null;
-                }
-                ksRepCashNettoReport.setValue(value);
-                ksRepCashNettoReport.setOblValue(oblValue);
-                ksRepCashNettoReport.setReqValue(reqValue);
+                value = cmtBalance.subtract(lmtBalance);
+                ksRepCashNettoReport.setValue(withValue ? value : null);
+                ksRepCashNettoReport.setOblValue(withOblReqValue ? oblValue : null);
+                ksRepCashNettoReport.setReqValue(withOblReqValue ? reqValue : null);
 
                 rows.add(ksRepCashNettoReport);
             } catch (Throwable e) {