From 632bdf9e09625b334b2b9bcc3abf3c5b87e3a184 Mon Sep 17 00:00:00 2001
From: akulikov <akulikov@mfd.ru>
Date: Mon, 20 Nov 2023 11:12:08 +0300
Subject: [PATCH] http://jira.mfd.msk:8088/browse/CLS-497
 KSRepCashNettoReportBuilder

---
 .../ks/KSRepCashNettoReportBuilder.java       | 28 ++++++++++++++-----
 .../ks/KS_REP_CASH_NETTO_expected.csv         |  4 +--
 2 files changed, 23 insertions(+), 9 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 632e53ebc..f5d4efb5b 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
@@ -179,6 +179,8 @@ public class KSRepCashNettoReportBuilder extends CSVReportBuilder<SessionIdParam
                 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,
@@ -195,21 +197,33 @@ public class KSRepCashNettoReportBuilder extends CSVReportBuilder<SessionIdParam
                     if (cmtRegistry.getBalance() != null) {
                         SessionType sessionType = IEnumKey.getEnumByKey(SessionType.class, cmtRegistry.getSessionType());
                         if (sessionType == null) continue;
-                        if (sessionTypeForValue.contains(sessionType)) cmtBalance = cmtBalance.add(cmtRegistry.getBalance());
-                        if (sessionTypeForOblReqValue.contains(sessionType)) reqValue = reqValue.add(cmtRegistry.getBalance());
+                        if (sessionTypeForValue.contains(sessionType)) {
+                            cmtBalance = cmtBalance.add(cmtRegistry.getBalance());
+                            withValue = true;
+                        }
+                        if (sessionTypeForOblReqValue.contains(sessionType)) {
+                            reqValue = reqValue.add(cmtRegistry.getBalance());
+                            withOblReqValue = true;
+                        }
                     }
                 }
                 for (Registry lmtRegistry : lmtRegistries) {
                     if (lmtRegistry.getBalance() != null) {
                         SessionType sessionType = IEnumKey.getEnumByKey(SessionType.class, lmtRegistry.getSessionType());
                         if (sessionType == null) continue;
-                        if (sessionTypeForValue.contains(sessionType)) lmtBalance = lmtBalance.add(lmtRegistry.getBalance());
-                        if (sessionTypeForOblReqValue.contains(sessionType)) oblValue = oblValue.add(lmtRegistry.getBalance());
+                        if (sessionTypeForValue.contains(sessionType)) {
+                            lmtBalance = lmtBalance.add(lmtRegistry.getBalance());
+                            withValue = true;
+                        }
+                        if (sessionTypeForOblReqValue.contains(sessionType)) {
+                            oblValue = oblValue.add(lmtRegistry.getBalance());
+                            withOblReqValue = true;
+                        }
                     }
                 }
-                ksRepCashNettoReport.setValue(cmtBalance.subtract(lmtBalance));
-                ksRepCashNettoReport.setOblValue(oblValue);
-                ksRepCashNettoReport.setReqValue(reqValue);
+                ksRepCashNettoReport.setValue(withValue ? cmtBalance.subtract(lmtBalance) : null);
+                ksRepCashNettoReport.setOblValue(withOblReqValue ? oblValue : null);
+                ksRepCashNettoReport.setReqValue(withOblReqValue ? reqValue : null);
 
                 rows.add(ksRepCashNettoReport);
             } catch (Throwable e) {
diff --git a/clearing-parent/reports-service/src/test/resources/expected_reports_csv/ks/KS_REP_CASH_NETTO_expected.csv b/clearing-parent/reports-service/src/test/resources/expected_reports_csv/ks/KS_REP_CASH_NETTO_expected.csv
index 7bc88c3da..d10562182 100644
--- a/clearing-parent/reports-service/src/test/resources/expected_reports_csv/ks/KS_REP_CASH_NETTO_expected.csv
+++ b/clearing-parent/reports-service/src/test/resources/expected_reports_csv/ks/KS_REP_CASH_NETTO_expected.csv
@@ -1,3 +1,3 @@
 "FIRMID","SESSION_ID","SESSION_DATE","ACCOUNT","TKR","VALUE","DATE","OBL_VALUE","REQ_VALUE"
-"TRADING_CODE","2","20.01.1970T02:49:58","ACCOUNT","TKR","22.22","16.11.2023","0.00","0.00"
-"TRADING_CODE","2","20.01.1970T02:49:58","ACCOUNT_FROM_ACCOUNT","TKR","0.00","16.11.2023","22.22","44.44"
+"TRADING_CODE","2","20.01.1970T02:49:58","ACCOUNT","TKR","22.22","16.11.2023","",""
+"TRADING_CODE","2","20.01.1970T02:49:58","ACCOUNT_FROM_ACCOUNT","TKR","","16.11.2023","22.22","44.44"
\ No newline at end of file