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 { private final Imdg registryStatusDictionaryImdg; + private final Imdg 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 sortInput(Collection 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();