From 1d0f669c4130dafe3adc77ec0568602445691be6 Mon Sep 17 00:00:00 2001
From: akulikov <akulikov@mfd.ru>
Date: Fri, 21 Jun 2024 18:47:39 +0300
Subject: [PATCH] report-service fixes

---
 .../ks/KSRepCashNettoReportBuilder.java       | 79 +++++++++----------
 1 file changed, 39 insertions(+), 40 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 a3c265717..b3c43a621 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
@@ -127,8 +127,6 @@ public class KSRepCashNettoReportBuilder extends CSVReportBuilder<SessionIdParam
                 }
 
                 boolean invalid = false;
-                BigDecimal currencyNettoCmt = BigDecimal.ZERO;
-                BigDecimal currencyNettoLmt = BigDecimal.ZERO;
                 if (!cmtRegistries.isEmpty() || !lmtRegistries.isEmpty()) {
                     String sourceTradingCode = null;
                     String sourceTkr = null;
@@ -153,9 +151,6 @@ public class KSRepCashNettoReportBuilder extends CSVReportBuilder<SessionIdParam
                             log.warn("Invalid CM_T registries set, tradingClearingRegistry not equals. Registries was skipped");
                             break;
                         }
-                        if (currRegistry.getBalance().compareTo(ReportConst.DB_ZERO) != 0) {
-                            currencyNettoCmt = currencyNettoCmt.add(currRegistry.getBalance());
-                        }
                     }
                     for (Registry currRegistry : lmtRegistries) {
                         if (!Objects.equals(sourceTradingCode, currRegistry.getTradingCode())) {
@@ -168,9 +163,6 @@ public class KSRepCashNettoReportBuilder extends CSVReportBuilder<SessionIdParam
                             log.warn("Invalid CM_T registries set, tradingClearingRegistry not equals. Registries was skipped");
                             break;
                         }
-                        if (currRegistry.getBalance().compareTo(ReportConst.DB_ZERO) != 0) {
-                            currencyNettoLmt = currencyNettoLmt.add(currRegistry.getBalance());
-                        }
                     }
                     if (invalid) continue;
                 }
@@ -204,37 +196,45 @@ public class KSRepCashNettoReportBuilder extends CSVReportBuilder<SessionIdParam
                 BigDecimal lmtBalance = BigDecimal.ZERO;
                 BigDecimal oblValue = BigDecimal.ZERO;
                 BigDecimal reqValue = BigDecimal.ZERO;
+                BigDecimal cmtCurrencyNetto = BigDecimal.ZERO;
+                BigDecimal lmtCurrencyNetto = BigDecimal.ZERO;
                 boolean withValue = false;
                 boolean withOblReqValue = false;
-                boolean forUnitSession = false;
+                boolean withCurrencyNettoValue = false;
                 Set<SessionType> sessionTypeForValue = Set.of(
-                        SessionType.IPOT,
-                        SessionType.TRDT,
-                        SessionType.LIQU,
-                        SessionType.IPOB,
-                        SessionType.IPO0,
-                        SessionType.UNIT
+                    SessionType.IPOT,
+                    SessionType.TRDT,
+                    SessionType.LIQU,
+                    SessionType.IPOB,
+                    SessionType.IPO0
                 );
                 Set<SessionType> sessionTypeForOblReqValue = Set.of(
-                        SessionType.FINL,
-                        SessionType.MEDM,
-                        SessionType.XDEP,
-                        SessionType.UNIT
+                    SessionType.FINL,
+                    SessionType.MEDM,
+                    SessionType.XDEP
                 );
                 for (Registry cmtRegistry : cmtRegistries) {
                     if (cmtRegistry.getBalance() != null) {
                         SessionType sessionType = IEnumKey.getEnumByKey(SessionType.class, cmtRegistry.getSessionType());
                         Section section = IEnumKey.getEnumByKey(Section.class, cmtRegistry.getSection());
                         if (sessionType == null || section == null) continue;
-                        if (sessionTypeForValue.contains(sessionType)) {
-                            cmtBalance = cmtBalance.add(cmtRegistry.getBalance());
-                            if (sessionType == SessionType.UNIT && section == Section.CURR) forUnitSession = true;
-                            else withValue = true;
+                        if (section == Section.FOND || sessionTypeForValue.contains(sessionType)) {
+                            if (ReportConst.DB_ZERO.compareTo(cmtRegistry.getBalance()) != 0) {
+                                cmtBalance = cmtBalance.add(cmtRegistry.getBalance());
+                                withValue = true;
+                            }
                         }
-                        if (sessionTypeForOblReqValue.contains(sessionType)) {
-                            reqValue = reqValue.add(cmtRegistry.getBalance());
-                            if (sessionType == SessionType.UNIT && section == Section.CURR) forUnitSession = true;
-                            else withOblReqValue = true;
+                        if (section == Section.MKR || sessionTypeForOblReqValue.contains(sessionType)) {
+                            if (ReportConst.DB_ZERO.compareTo(cmtRegistry.getBalance()) != 0) {
+                                reqValue = reqValue.add(cmtRegistry.getBalance());
+                                withOblReqValue = true;
+                            }
+                        }
+                        if (section == Section.CURR || sessionType == SessionType.CURR) {
+                            if (ReportConst.DB_ZERO.compareTo(cmtRegistry.getBalance()) != 0) {
+                                cmtCurrencyNetto = cmtCurrencyNetto.add(cmtBalance);
+                                withCurrencyNettoValue = true;
+                            }
                         }
                     }
                 }
@@ -243,23 +243,22 @@ public class KSRepCashNettoReportBuilder extends CSVReportBuilder<SessionIdParam
                         SessionType sessionType = IEnumKey.getEnumByKey(SessionType.class, lmtRegistry.getSessionType());
                         Section section = IEnumKey.getEnumByKey(Section.class, lmtRegistry.getSection());
                         if (sessionType == null) continue;
-                        if (sessionTypeForValue.contains(sessionType)) {
+                        if (section == Section.FOND || sessionTypeForValue.contains(sessionType)) {
                             lmtBalance = lmtBalance.add(lmtRegistry.getBalance());
-                            if (section == Section.CURR) forUnitSession = true;
-                            else withValue = true;
+                            withValue = true;
                         }
-                        if (sessionTypeForOblReqValue.contains(sessionType)) {
+                        if (section == Section.MKR || sessionTypeForOblReqValue.contains(sessionType)) {
                             oblValue = oblValue.add(lmtRegistry.getBalance());
-                            if (section == Section.CURR) forUnitSession = true;
-                            else withOblReqValue = true;
+                            withOblReqValue = true;
+                        }
+                        if (section == Section.CURR && sessionType == SessionType.UNIT) {
+                            lmtCurrencyNetto = lmtCurrencyNetto.add(lmtCurrencyNetto);
+                            withCurrencyNettoValue = true;
                         }
                     }
                 }
-                BigDecimal value;
-                value = cmtBalance.subtract(lmtBalance);
-                ksRepCashNettoReport.setValue(withValue ? value : null);
-                ksRepCashNettoReport.setOblValue(withOblReqValue ? oblValue : null);
-                ksRepCashNettoReport.setReqValue(withOblReqValue ? reqValue : null);
+                BigDecimal value = cmtBalance.subtract(lmtBalance);
+                BigDecimal currencyNetto = cmtCurrencyNetto.subtract(lmtCurrencyNetto);
                 ksRepCashNettoReport.setLotCurrency(registry.getSecuritySymbol());
                 if (withValue) {
                     KSRepCashNettoReport withoutValueClone = ksRepCashNettoReport.cloneWithoutValues();
@@ -272,9 +271,9 @@ public class KSRepCashNettoReportBuilder extends CSVReportBuilder<SessionIdParam
                     withoutValueClone.setReqValue(reqValue);
                     rows.add(withoutValueClone);
                 }
-                if (forUnitSession) {
+                if (withCurrencyNettoValue) {
                     KSRepCashNettoReport withoutValueClone = ksRepCashNettoReport.cloneWithoutValues();
-                    withoutValueClone.setCurrencyNetto(currencyNettoCmt.subtract(currencyNettoLmt));
+                    withoutValueClone.setCurrencyNetto(currencyNetto);
                     withoutValueClone.setTrExecDate(LocalDate.now());
                     rows.add(withoutValueClone);
                 }