treshenkov/clearing
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

securities-service http://jira.mfd.msk:8088/browse/CLS-258 оправил заполнение поля

Browse source
This commit is contained in:
AKurakin 2023-06-05 18:12:26 +03:00
parent c10dd23a38
commit ae37e501f6
5 changed files with 13 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
clearing-parent/securities-service/src/main/java/ru/spcex/clearing/securities/service/cud/EquitySecurityService.java
View file

@ -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<EquitySecurity> equityImdg = transaction.getImdg(IMDGDistributedNames.Map_EquitySecurity, EquitySecurity.class);

1
clearing-parent/securities-service/src/main/java/ru/spcex/clearing/securities/service/cud/FixedIncomeSecurityService.java
View file

@ -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<FixedIncomeSecurity> fixedIncomeImdg = transaction.getImdg(IMDGDistributedNames.Map_FixedIncomeSecurity, FixedIncomeSecurity.class);

3
clearing-parent/securities-service/src/main/java/ru/spcex/clearing/securities/service/cud/MoneyMarketSecurityService.java
View file

@ -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());
}

5
clearing-parent/securities-service/src/test/java/ru/spcex/clearing/securities/service/AbstractServiceTest.java
View file

@ -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,

4
clearing-parent/securities-service/src/test/java/ru/spcex/clearing/securities/service/MoneyMarketSecurityFactory.java
View file

@ -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());