From af54945fdef296a6c75e9efd4c09f344c932d1a0 Mon Sep 17 00:00:00 2001 From: AKurakin Date: Wed, 24 May 2023 10:53:28 +0300 Subject: [PATCH] =?UTF-8?q?lim-exporter=20CLS-262=20=D0=BF=D0=BE=D0=BF?= =?UTF-8?q?=D1=80=D0=B0=D0=B2=D0=B8=D0=BB=20=D1=82=D0=B5=D1=81=D1=82=D1=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../services/MoneyExporterServiceTest.java | 22 +++++++++++++++++-- .../services/SecurityExporterServiceTest.java | 4 +++- 2 files changed, 23 insertions(+), 3 deletions(-) diff --git a/clearing-parent/lim-exporter/src/test/java/ru/spcex/clearing/lim/exporter/services/MoneyExporterServiceTest.java b/clearing-parent/lim-exporter/src/test/java/ru/spcex/clearing/lim/exporter/services/MoneyExporterServiceTest.java index 4880ba280..8163fd83e 100644 --- a/clearing-parent/lim-exporter/src/test/java/ru/spcex/clearing/lim/exporter/services/MoneyExporterServiceTest.java +++ b/clearing-parent/lim-exporter/src/test/java/ru/spcex/clearing/lim/exporter/services/MoneyExporterServiceTest.java @@ -1,6 +1,7 @@ package ru.spcex.clearing.lim.exporter.services; import org.junit.jupiter.api.Test; +import org.springframework.util.StringUtils; import ru.clearing.classes.statics.data.registry.Registry; import ru.clearing.classes.statics.data.registry.TradingClearingRegistry; import ru.spcex.clearing.lim.exporter.AbstractServiceTest; @@ -58,7 +59,8 @@ class MoneyExporterServiceTest extends AbstractServiceTest { registry.setTradingClearingRegistry(tradingClearingRegistry); registry.setRegistryDesignation("A"); registry.setRegistryInstrumentType("M"); - registry.setRegistryCode("F"); + registry.setRegistryUnit("F"); + registry.setClearingCode(clearingCode(registry)); registry.setClearingDate(currentDate); registry.setSecuritySymbol("RUB"); registry.setSecurityId(securityId); @@ -73,11 +75,27 @@ class MoneyExporterServiceTest extends AbstractServiceTest { registry.setTradingClearingRegistry(tradingClearingRegistry); registry.setRegistryDesignation("D"); registry.setRegistryInstrumentType("M"); - registry.setRegistryCode("T"); + registry.setRegistryUnit("T"); + registry.setClearingCode(clearingCode(registry)); registry.setClearingDate(currentDate); registry.setSecuritySymbol("RUB"); registry.setSecurityId(securityId); registry.setTradingClearingRegistryId(securityId); return registry; } + + + // see clearing-service ReistryUtil: + + public static String clearingCode(Registry ofRegistry) { + return clearingCode(ofRegistry.getRegistryDesignation(), ofRegistry.getRegistryInstrumentType(), ofRegistry.getRegistryCapacity(), ofRegistry.getRegistryUnit()); + } + + public static String clearingCode(String registryDesignation, String registryInstrumentType, String registryCapacity, String registryUnit) { + if (StringUtils.isEmpty(registryDesignation)) registryDesignation = "-"; + if (StringUtils.isEmpty(registryInstrumentType)) registryInstrumentType = "-"; + if (StringUtils.isEmpty(registryCapacity)) registryCapacity = "-"; + if (StringUtils.isEmpty(registryUnit)) registryUnit = "-"; + return registryDesignation + registryInstrumentType + registryCapacity + registryUnit; + } } \ No newline at end of file diff --git a/clearing-parent/lim-exporter/src/test/java/ru/spcex/clearing/lim/exporter/services/SecurityExporterServiceTest.java b/clearing-parent/lim-exporter/src/test/java/ru/spcex/clearing/lim/exporter/services/SecurityExporterServiceTest.java index e6b3b4730..cf7099a4d 100644 --- a/clearing-parent/lim-exporter/src/test/java/ru/spcex/clearing/lim/exporter/services/SecurityExporterServiceTest.java +++ b/clearing-parent/lim-exporter/src/test/java/ru/spcex/clearing/lim/exporter/services/SecurityExporterServiceTest.java @@ -11,6 +11,7 @@ import java.util.Collection; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertTrue; +import static ru.spcex.clearing.lim.exporter.services.MoneyExporterServiceTest.clearingCode; import static ru.spcex.clearing.test.TestUtils.clearAllInImdg; class SecurityExporterServiceTest extends AbstractServiceTest { @@ -60,7 +61,8 @@ class SecurityExporterServiceTest extends AbstractServiceTest { registry.setTradingClearingRegistry(tradingClearingRegistry); registry.setRegistryDesignation("A"); registry.setRegistryInstrumentType("S"); - registry.setRegistryCode("T"); + registry.setRegistryUnit("T"); + registry.setClearingCode(clearingCode(registry)); registry.setClearingDate(currentDate); registry.setSecuritySymbol("RUB"); registry.setSecurityId(securityId);