From ae37e501f66177b70076b7552dad8a027ad318cd Mon Sep 17 00:00:00 2001 From: AKurakin Date: Mon, 5 Jun 2023 18:12:26 +0300 Subject: [PATCH] =?UTF-8?q?securities-service=20http://jira.mfd.msk:8088/b?= =?UTF-8?q?rowse/CLS-258=20=D0=BE=D0=BF=D1=80=D0=B0=D0=B2=D0=B8=D0=BB=20?= =?UTF-8?q?=D0=B7=D0=B0=D0=BF=D0=BE=D0=BB=D0=BD=D0=B5=D0=BD=D0=B8=D0=B5=20?= =?UTF-8?q?=D0=BF=D0=BE=D0=BB=D1=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../securities/service/cud/EquitySecurityService.java | 1 + .../securities/service/cud/FixedIncomeSecurityService.java | 1 + .../securities/service/cud/MoneyMarketSecurityService.java | 3 +++ .../clearing/securities/service/AbstractServiceTest.java | 5 ++++- .../securities/service/MoneyMarketSecurityFactory.java | 4 ++++ 5 files changed, 13 insertions(+), 1 deletion(-) diff --git a/clearing-parent/securities-service/src/main/java/ru/spcex/clearing/securities/service/cud/EquitySecurityService.java b/clearing-parent/securities-service/src/main/java/ru/spcex/clearing/securities/service/cud/EquitySecurityService.java index 4b874f3f8..b55bbc06a 100644 --- a/clearing-parent/securities-service/src/main/java/ru/spcex/clearing/securities/service/cud/EquitySecurityService.java +++ b/clearing-parent/securities-service/src/main/java/ru/spcex/clearing/securities/service/cud/EquitySecurityService.java @@ -101,6 +101,7 @@ public class EquitySecurityService extends QueueConsumer implements Initializing equity.setInstrumentType(req.getInstrumentType()); equity.setSecurityId(equity.getId()); equity.setCreated(Instant.now()); + equity.setUpdated(equity.getCreated()); try { transaction.beginTransaction(); Imdg equityImdg = transaction.getImdg(IMDGDistributedNames.Map_EquitySecurity, EquitySecurity.class); diff --git a/clearing-parent/securities-service/src/main/java/ru/spcex/clearing/securities/service/cud/FixedIncomeSecurityService.java b/clearing-parent/securities-service/src/main/java/ru/spcex/clearing/securities/service/cud/FixedIncomeSecurityService.java index 1753206d9..beee6b1e4 100644 --- a/clearing-parent/securities-service/src/main/java/ru/spcex/clearing/securities/service/cud/FixedIncomeSecurityService.java +++ b/clearing-parent/securities-service/src/main/java/ru/spcex/clearing/securities/service/cud/FixedIncomeSecurityService.java @@ -105,6 +105,7 @@ public class FixedIncomeSecurityService extends QueueConsumer implements Initial fixedIncome.setInstrumentType(req.getInstrumentType()); fixedIncome.setSecurityId(fixedIncome.getId()); fixedIncome.setCreated(Instant.now()); + fixedIncome.setUpdated(fixedIncome.getCreated()); try { transaction.beginTransaction(); Imdg fixedIncomeImdg = transaction.getImdg(IMDGDistributedNames.Map_FixedIncomeSecurity, FixedIncomeSecurity.class); diff --git a/clearing-parent/securities-service/src/main/java/ru/spcex/clearing/securities/service/cud/MoneyMarketSecurityService.java b/clearing-parent/securities-service/src/main/java/ru/spcex/clearing/securities/service/cud/MoneyMarketSecurityService.java index 5fbf1afc2..3a2e38883 100644 --- a/clearing-parent/securities-service/src/main/java/ru/spcex/clearing/securities/service/cud/MoneyMarketSecurityService.java +++ b/clearing-parent/securities-service/src/main/java/ru/spcex/clearing/securities/service/cud/MoneyMarketSecurityService.java @@ -135,7 +135,9 @@ public class MoneyMarketSecurityService extends QueueConsumer implements Initial mms.setIssuerId(req.getIssuerId()); mms.setSecurityId(mms.getId()); mms.setDescription(req.getDescription()); + mms.setConvention(req.getConvention()); mms.setCreated(Instant.now()); + mms.setUpdated(mms.getCreated()); if (req.getWorkflowStatus() == null) { mms.setWorkflowStatus(WorkflowStatus.Active.getKey()); } else { @@ -206,6 +208,7 @@ public class MoneyMarketSecurityService extends QueueConsumer implements Initial mms.setIssuerId(req.getIssuerId()); mms.setSecurityId(mms.getId()); mms.setDescription(req.getDescription()); + mms.setConvention(req.getConvention()); if (req.getWorkflowStatus() != null) { mms.setWorkflowStatus(req.getWorkflowStatus()); } diff --git a/clearing-parent/securities-service/src/test/java/ru/spcex/clearing/securities/service/AbstractServiceTest.java b/clearing-parent/securities-service/src/test/java/ru/spcex/clearing/securities/service/AbstractServiceTest.java index 85df3f211..75a4070f8 100644 --- a/clearing-parent/securities-service/src/test/java/ru/spcex/clearing/securities/service/AbstractServiceTest.java +++ b/clearing-parent/securities-service/src/test/java/ru/spcex/clearing/securities/service/AbstractServiceTest.java @@ -18,10 +18,12 @@ import ru.spcex.clearing.imdg.IMDGDistributedNames; import ru.spcex.clearing.securities.config.ErrorResolverConfig; import ru.spcex.clearing.securities.config.ValidationConfig; import ru.spcex.clearing.securities.service.cud.*; +import ru.spcex.clearing.securities.validation.ListingValidationProvider; import ru.spcex.clearing.securities.validation.ValidationProvider; import ru.spcex.clearing.test.MatcherFactory; import ru.spcex.clearing.test.config.ImdgTestConfig; import ru.spcex.clearing.test.config.KafkaTestConfig; +import ru.spcex.clearing.util.security.SecuritySelector; import ru.spcex.platform.imdg.api.Imdg; import ru.spcex.platform.imdg.api.ImdgProvider; @@ -37,7 +39,8 @@ import static ru.spcex.clearing.test.config.ImdgTestConfig.waitAvailableImdgProv EquitySecurityService.class, FixedIncomeSecurityService.class, MoneyMarketSecurityService.class, - ListingService.class, + ListingService.class, ListingValidationProvider.class, + SecuritySelector.class, ImdgTestConfig.class, KafkaTestConfig.class, ValidationProvider.class, diff --git a/clearing-parent/securities-service/src/test/java/ru/spcex/clearing/securities/service/MoneyMarketSecurityFactory.java b/clearing-parent/securities-service/src/test/java/ru/spcex/clearing/securities/service/MoneyMarketSecurityFactory.java index 780630784..3e78596d8 100644 --- a/clearing-parent/securities-service/src/test/java/ru/spcex/clearing/securities/service/MoneyMarketSecurityFactory.java +++ b/clearing-parent/securities-service/src/test/java/ru/spcex/clearing/securities/service/MoneyMarketSecurityFactory.java @@ -24,6 +24,7 @@ class MoneyMarketSecurityFactory { private String fullName = "estat"; private String shortName = "esasdftat"; private String securitySymbol = "sdfafd"; + private String convention = "convention"; private String istin = "istin"; private String termType = AbstractServiceTest.termType; @@ -106,6 +107,7 @@ class MoneyMarketSecurityFactory { moneyMarketSecurity.setDescription(description); moneyMarketSecurity.setLotSize(lotSize); moneyMarketSecurity.setSecuritySymbol(securitySymbol); + moneyMarketSecurity.setConvention(convention); moneyMarketSecurity.setWorkflowStatus(ru.spcex.platform.enumeration.Status.Active.getKey()); return moneyMarketSecurity; @@ -131,6 +133,7 @@ class MoneyMarketSecurityFactory { moneyMarketSecurityUpdateRequest.setIssuerId(issuerId); moneyMarketSecurityUpdateRequest.setDescription(description); moneyMarketSecurityUpdateRequest.setSecuritySymbol(securitySymbol); + moneyMarketSecurityUpdateRequest.setConvention(convention); moneyMarketSecurityUpdateRequest.setWorkflowStatus(ru.spcex.platform.enumeration.Status.Active.getKey()); return moneyMarketSecurityUpdateRequest; @@ -160,6 +163,7 @@ class MoneyMarketSecurityFactory { keyRequest.setIsin(istin); keyRequest.setDescription(description); keyRequest.setSecuritySymbol(securitySymbol); + keyRequest.setConvention(convention); keyRequest.setWorkflowStatus(ru.spcex.platform.enumeration.Status.Active.getKey());