From 751da613a5a1b65745f9b69790c78df35df0d430 Mon Sep 17 00:00:00 2001 From: AKurakin Date: Mon, 29 May 2023 14:14:08 +0300 Subject: [PATCH] =?UTF-8?q?securities-service=20=D0=BF=D0=BE=D0=BF=D1=80?= =?UTF-8?q?=D0=B0=D0=B2=D0=B8=D0=BB=20WorkflowStatus?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/cud/EquitySecurityService.java | 12 +++++++++--- .../service/cud/FixedIncomeSecurityService.java | 12 +++++++++--- .../service/cud/MoneyMarketSecurityService.java | 12 +++++++++--- 3 files changed, 27 insertions(+), 9 deletions(-) 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 70a7e49af..4b874f3f8 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 @@ -23,13 +23,13 @@ import ru.spcex.clearing.util.security.UserRoleVerification; import ru.spcex.clearing.validation.common.ValidationHelper; import ru.spcex.platform.enumeration.Market; import ru.spcex.platform.enumeration.UserRole; +import ru.spcex.platform.enumeration.WorkflowStatus; import ru.spcex.platform.imdg.api.Imdg; import ru.spcex.platform.imdg.api.ImdgId; import ru.spcex.platform.imdg.api.ImdgProvider; import ru.spcex.platform.imdg.api.ImdgTransaction; import java.time.Instant; -import java.util.Map; @Service public class EquitySecurityService extends QueueConsumer implements InitializingBean { @@ -93,7 +93,11 @@ public class EquitySecurityService extends QueueConsumer implements Initializing equity.setIssuerId(req.getIssuerId()); equity.setShortNameEng(req.getShortNameEng()); equity.setFullNameEng(req.getFullNameEng()); - equity.setWorkflowStatus(req.workflowStatus); + if (req.getWorkflowStatus() == null) { + equity.setWorkflowStatus(WorkflowStatus.Active.getKey()); + } else { + equity.setWorkflowStatus(req.getWorkflowStatus()); + } equity.setInstrumentType(req.getInstrumentType()); equity.setSecurityId(equity.getId()); equity.setCreated(Instant.now()); @@ -140,7 +144,9 @@ public class EquitySecurityService extends QueueConsumer implements Initializing equity.setIssuerId(req.getIssuerId()); equity.setShortNameEng(req.getShortNameEng()); equity.setFullNameEng(req.getFullNameEng()); - equity.setWorkflowStatus(req.workflowStatus); + if (req.getWorkflowStatus() != null) { + equity.setWorkflowStatus(req.getWorkflowStatus()); + } equity.setInstrumentType(req.getInstrumentType()); equitySecurityImdg.update(equity); 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 6cc5448fd..1753206d9 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 @@ -22,13 +22,13 @@ import ru.spcex.clearing.securities.validation.ValidationProvider; import ru.spcex.clearing.util.security.UserRoleVerification; import ru.spcex.clearing.validation.common.ValidationHelper; import ru.spcex.platform.enumeration.UserRole; +import ru.spcex.platform.enumeration.WorkflowStatus; import ru.spcex.platform.imdg.api.Imdg; import ru.spcex.platform.imdg.api.ImdgId; import ru.spcex.platform.imdg.api.ImdgProvider; import ru.spcex.platform.imdg.api.ImdgTransaction; import java.time.Instant; -import java.util.Map; @Service public class FixedIncomeSecurityService extends QueueConsumer implements InitializingBean { @@ -97,7 +97,11 @@ public class FixedIncomeSecurityService extends QueueConsumer implements Initial fixedIncome.setIssuerId(req.getIssuerId()); fixedIncome.setShortNameEng(req.getShortNameEng()); fixedIncome.setFullNameEng(req.getFullNameEng()); - fixedIncome.setWorkflowStatus(req.getWorkflowStatus()); + if (req.getWorkflowStatus() == null) { + fixedIncome.setWorkflowStatus(WorkflowStatus.Active.getKey()); + } else { + fixedIncome.setWorkflowStatus(req.getWorkflowStatus()); + } fixedIncome.setInstrumentType(req.getInstrumentType()); fixedIncome.setSecurityId(fixedIncome.getId()); fixedIncome.setCreated(Instant.now()); @@ -149,7 +153,9 @@ public class FixedIncomeSecurityService extends QueueConsumer implements Initial fixedIncome.setIssuerId(req.getIssuerId()); fixedIncome.setShortNameEng(req.getShortNameEng()); fixedIncome.setFullNameEng(req.getFullNameEng()); - fixedIncome.setWorkflowStatus(req.getWorkflowStatus()); + if (req.getWorkflowStatus() != null) { + fixedIncome.setWorkflowStatus(req.getWorkflowStatus()); + } fixedIncome.setInstrumentType(req.getInstrumentType()); fixedIncome.setSecurityId(fixedIncome.getId()); 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 f6273c1c4..bf555c7da 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 @@ -24,6 +24,7 @@ import ru.spcex.clearing.securities.validation.ValidationProvider; import ru.spcex.clearing.util.security.UserRoleVerification; import ru.spcex.clearing.validation.common.ValidationHelper; import ru.spcex.platform.enumeration.UserRole; +import ru.spcex.platform.enumeration.WorkflowStatus; import ru.spcex.platform.imdg.api.Imdg; import ru.spcex.platform.imdg.api.ImdgId; import ru.spcex.platform.imdg.api.ImdgProvider; @@ -34,7 +35,6 @@ import ru.spcex.platform.utils.enumeration.IMessageResolver; import ru.spcex.platform.utils.validation.IValidator; import java.time.Instant; -import java.util.Map; import java.util.Optional; @Service @@ -131,7 +131,11 @@ public class MoneyMarketSecurityService extends QueueConsumer implements Initial mms.setSecurityId(mms.getId()); mms.setDescription(req.getDescription()); mms.setCreated(Instant.now()); - mms.setWorkflowStatus(req.getWorkflowStatus()); + if (req.getWorkflowStatus() == null) { + mms.setWorkflowStatus(WorkflowStatus.Active.getKey()); + } else { + mms.setWorkflowStatus(req.getWorkflowStatus()); + } try { transaction.beginTransaction(); Imdg moneyMarketSecurityMap = transaction.getImdg(IMDGDistributedNames.Map_MoneyMarketSecurity, MoneyMarketSecurity.class); @@ -188,7 +192,9 @@ public class MoneyMarketSecurityService extends QueueConsumer implements Initial mms.setIssuerId(req.getIssuerId()); mms.setSecurityId(mms.getId()); mms.setDescription(req.getDescription()); - mms.setWorkflowStatus(req.getWorkflowStatus()); + if (req.getWorkflowStatus() != null) { + mms.setWorkflowStatus(req.getWorkflowStatus()); + } moneyMarketSecurityMap.update(mms); // Listing listing = listingImdg.getSingleObjectByFieldValues(Map.of("securityId", mms.getId()));