From 603bec95b06bbac6825c45ac47c0332eeaec6a73 Mon Sep 17 00:00:00 2001
From: AKurakin <akurakin@mfd.ru>
Date: Wed, 31 Jan 2024 16:59:05 +0300
Subject: [PATCH] =?UTF-8?q?registry-service=20http://jira.mfd.msk:8088/bro?=
 =?UTF-8?q?wse/CLS-638=20LiabilitiesRegisterService=20=D0=B4=D0=BE=D0=B1?=
 =?UTF-8?q?=D0=B0=D0=B2=D0=BB=D0=B5=D0=BD=20=D0=BC=D1=8D=D0=BF=D0=BF=D0=B8?=
 =?UTF-8?q?=D0=BD=D0=B3=20SessionType?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../LiabilitiesRegistryReportBuilder.java     | 20 +++++++++++++++++--
 .../LiabilitiesRegisterServiceTest.java       |  8 ++++++++
 2 files changed, 26 insertions(+), 2 deletions(-)

diff --git a/clearing-parent/registry-service/src/main/java/ru/spcex/clearing/registry/reports/builders/LiabilitiesRegistryReportBuilder.java b/clearing-parent/registry-service/src/main/java/ru/spcex/clearing/registry/reports/builders/LiabilitiesRegistryReportBuilder.java
index 2fed707e9..68d4c594f 100644
--- a/clearing-parent/registry-service/src/main/java/ru/spcex/clearing/registry/reports/builders/LiabilitiesRegistryReportBuilder.java
+++ b/clearing-parent/registry-service/src/main/java/ru/spcex/clearing/registry/reports/builders/LiabilitiesRegistryReportBuilder.java
@@ -2,6 +2,7 @@ package ru.spcex.clearing.registry.reports.builders;
 
 import ru.clearing.classes.statics.data.registry.Registry;
 import ru.clearing.platform.dictionary.RegistryStatusDictionary;
+import ru.clearing.platform.dictionary.SessionTypeDictionary;
 import ru.spcex.clearing.imdg.IMDGDistributedNames;
 import ru.spcex.clearing.registry.reports.bean.LiabilitiesRegistryReport;
 import ru.spcex.platform.imdg.api.Imdg;
@@ -15,9 +16,11 @@ import java.util.stream.Collectors;
 public class LiabilitiesRegistryReportBuilder extends XLSXReportBuilder<LiabilitiesRegistryReport, Registry> {
 
     private final Imdg<RegistryStatusDictionary> registryStatusDictionaryImdg;
+    private final Imdg<SessionTypeDictionary> sessionTypesDictionaryImdg;
 
     public LiabilitiesRegistryReportBuilder(ImdgProvider imdgProvider) {
         registryStatusDictionaryImdg = imdgProvider.getImdg(IMDGDistributedNames.Map_RegistryStatusDictionary, RegistryStatusDictionary.class);
+        sessionTypesDictionaryImdg = imdgProvider.getImdg(IMDGDistributedNames.Map_SessionTypeDictionary, SessionTypeDictionary.class);
     }
 
     @Override
@@ -42,7 +45,7 @@ public class LiabilitiesRegistryReportBuilder extends XLSXReportBuilder<Liabilit
         entity.setBalance(input.getBalance());
         entity.setSettlement_date(input.getSettlementDate());
         entity.setContract(input.getContract());
-        entity.setSession_type(input.getSessionType());
+        entity.setSession_type(describeSessionType(input.getSessionType()));
 
         return entity;
     }
@@ -58,12 +61,25 @@ public class LiabilitiesRegistryReportBuilder extends XLSXReportBuilder<Liabilit
                 "code", registryStatus
         ));
         if (dictionary == null) {
-            log.warn("Dictionary not found for status=\"{}\"", dictionary);
+            log.warn("Dictionary not found for status=\"{}\"", registryStatus);
             return registryStatus;
         }
         return dictionary.getName();
     }
 
+    private String describeSessionType(String sessionType) {
+        if (sessionType == null)
+            return sessionType;
+        SessionTypeDictionary dictionary = sessionTypesDictionaryImdg.getFirstObjectByFieldValues(Map.of(
+                "code", sessionType
+        ));
+        if (dictionary == null) {
+            log.warn("Dictionary not found for sessionType=\"{}\"", sessionType);
+            return sessionType;
+        }
+        return dictionary.getName();
+    }
+
     @Override
     protected Collection<Registry> sortInput(Collection<Registry> input) {
         return input.stream()
diff --git a/clearing-parent/registry-service/src/test/java/ru/spcex/clearing/registry/service/LiabilitiesRegisterServiceTest.java b/clearing-parent/registry-service/src/test/java/ru/spcex/clearing/registry/service/LiabilitiesRegisterServiceTest.java
index 63c45ffdc..65f73a3b8 100644
--- a/clearing-parent/registry-service/src/test/java/ru/spcex/clearing/registry/service/LiabilitiesRegisterServiceTest.java
+++ b/clearing-parent/registry-service/src/test/java/ru/spcex/clearing/registry/service/LiabilitiesRegisterServiceTest.java
@@ -58,14 +58,18 @@ class LiabilitiesRegisterServiceTest {
     private static final String REGISTRY_ACCOUNT = "ANY ACCOUNT";
     private static final String REGISTRY_STATUS = RegistryStatus.CLRD.getKey();
     private static final Long REGISTRY_SESSION_ID = 1234L;
+    private static final String REGISTRY_SESSION_TYPE = SessionType.XDEP.getKey();
     private static final Long REGISTRY_COMPANY_ID = 10101L;
     private static final Long REGISTRY_SECURITY_ID = 123411L;
+    private static final String REGISTRY_CLEARING_CODE = "ANY CL CODE" ;
+    private static final String REGISTRY_SECURITY_SYMBOL = "MFD1-symbol";
     private static final BigDecimal REGISTRY_BALANCE = new BigDecimal(123411L);
     private static final LocalDate REGISTRY_SETTLEMENT_DATE = LocalDate.now();
     private static final LocalDate SESSION_CLEARING_DATE = LocalDate.now();
     private static final Instant SESSION_UPDATE = Instant.now();
     private static final String COMPANY_SYMBOL_INN = CompanySymbol.INN.getKey();
     private static final String COMPANY_SYMBOL_VALUE = "ANY VALUE";
+    private static final String REGISTRY_CONTRACT = "ANY CONTRACT VALUE";
 
     @Autowired
     private LiabilitiesRegisterService liabilitiesRegisterService;
@@ -109,6 +113,10 @@ class LiabilitiesRegisterServiceTest {
         registry.setBalance(REGISTRY_BALANCE);
         registry.setSettlementDate(REGISTRY_SETTLEMENT_DATE);
         registry.setSecurityId(REGISTRY_SECURITY_ID);
+        registry.setSessionType(REGISTRY_SESSION_TYPE);
+        registry.setClearingCode(REGISTRY_CLEARING_CODE);
+        registry.setSecuritySymbol(REGISTRY_SECURITY_SYMBOL);
+        registry.setContract(REGISTRY_CONTRACT);
         registryMap.insert(registry);
 
         Session session = new Session();