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

FixedIncomeCashFlow update request and test

Browse source
This commit is contained in:
akulikov 2023-04-06 11:36:03 +03:00
parent 398307b6b5
commit 61953777e6
4 changed files with 106 additions and 40 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

72
clearing-parent/securities-service/src/main/java/ru/spcex/clearing/securities/config/validation/FixedIncomeCashFlowValidationConfig.java
View file

@ -5,8 +5,10 @@ import org.springframework.context.annotation.Configuration;
import ru.clearing.classes.statics.data.instrument.issue.FixedIncomeCashFlow;
import ru.spcex.clearing.imdg.IMDGDistributedNames;
import ru.spcex.clearing.platform.messaging.domain.cud.securitites.FixedIncomeCashFlowNewRequest;
import ru.spcex.clearing.platform.messaging.domain.cud.securitites.FixedIncomeCashFlowUpdateRequest;
import ru.spcex.clearing.securities.errors.SecuritiesError;
import ru.spcex.clearing.validation.common.rules.FieldRequiredRule;
import ru.spcex.clearing.validation.common.rules.IdPresentRule;
import ru.spcex.clearing.validation.common.rules.IsLongValueRule;
import ru.spcex.platform.classes.base.SpcexObjectBase;
import ru.spcex.platform.imdg.api.Imdg;
@ -50,7 +52,7 @@ public class FixedIncomeCashFlowValidationConfig {
}),
FieldRequiredRule.instance("accruedCoupon",
FixedIncomeCashFlowNewRequest::getAccruedCoupon,
SecuritiesError.RequiredFieldIsEmpty),
SecuritiesError.RequiredFieldIsEmpty),
FieldRequiredRule.instance("nominalValue",
FixedIncomeCashFlowNewRequest::getNominalValue,
SecuritiesError.RequiredFieldIsEmpty),
@ -61,43 +63,35 @@ public class FixedIncomeCashFlowValidationConfig {
};
}
// @Bean("fixedIncomeCashFlowUpdateRequestValidator")
// public Function<FixedIncomeCashFlowUpdateRequest, IValidator> fixedIncomeCashFlowUpdateRequestValidator(
// Map<String, Imdg<? extends SpcexObjectBase>> imdgForValidation
// ) {
// return fixedIncomeCashFlowUpdateRequest -> {
// ImdgValidationContext<FixedIncomeCashFlowUpdateRequest> context = new ImdgValidationContext<>();
// context.setValidatedObject(fixedIncomeCashFlowUpdateRequest);
// Consumer<String> addImdg = (s) -> context.addImdg(s, imdgForValidation.get(s));
// addImdg.accept(IMDGDistributedNames.Map_FixedIncomeCashFlow);
// return new ValidatorImpl<>(context,
// IsLongValueRule.instance("securitySymbol",
// FixedIncomeCashFlowNewRequest::getSecuritySymbol,
// SecuritiesError.RequiredFieldIsEmpty,
// SecuritiesError.WrongFieldValue),
// FieldRequiredRule.instance("securitySymbol",
// FixedIncomeCashFlowNewRequest::getSecuritySymbol,
// SecuritiesError.RequiredFieldIsEmpty,
// request -> {
// Imdg<FixedIncomeCashFlow> fixedIncomeCashFlowImdg = context.obtainMap(
// IMDGDistributedNames.Map_FixedIncomeCashFlow, FixedIncomeCashFlow.class
// );
// Long securityId = Long.valueOf(request.getSecuritySymbol());
// Collection<FixedIncomeCashFlow> fixedIncomeCashFlows = fixedIncomeCashFlowImdg.getCollectionObjectsByFieldValues(Map.of("securityId", securityId));
// if (!fixedIncomeCashFlows.isEmpty()) return SecuritiesError.CouponPeriodAlreadyExists;
// return null;
// }),
// FieldRequiredRule.instance("accruedCoupon",
// FixedIncomeCashFlowNewRequest::getAccruedCoupon,
// SecuritiesError.RequiredFieldIsEmpty),
// FieldRequiredRule.instance("nominalValue",
// FixedIncomeCashFlowNewRequest::getNominalValue,
// SecuritiesError.RequiredFieldIsEmpty),
// FieldRequiredRule.instance("number",
// FixedIncomeCashFlowNewRequest::getNumber,
// SecuritiesError.RequiredFieldIsEmpty)
// );
// };
// }
@Bean("fixedIncomeCashFlowUpdateRequestValidator")
public Function<FixedIncomeCashFlowUpdateRequest, IValidator> fixedIncomeCashFlowUpdateRequestValidator(
Map<String, Imdg<? extends SpcexObjectBase>> imdgForValidation
) {
return fixedIncomeCashFlowUpdateRequest -> {
ImdgValidationContext<FixedIncomeCashFlowUpdateRequest> context = new ImdgValidationContext<>();
context.setValidatedObject(fixedIncomeCashFlowUpdateRequest);
Consumer<String> addImdg = (s) -> context.addImdg(s, imdgForValidation.get(s));
addImdg.accept(IMDGDistributedNames.Map_FixedIncomeCashFlow);
return new ValidatorImpl<>(context,
IsLongValueRule.instance("securitySymbol",
FixedIncomeCashFlowUpdateRequest::getSecuritySymbol,
SecuritiesError.RequiredFieldIsEmpty,
SecuritiesError.WrongFieldValue,
false),
IdPresentRule.instance("id",
FixedIncomeCashFlowUpdateRequest::getId,
IMDGDistributedNames.Map_FixedIncomeCashFlow,
FixedIncomeCashFlow.class,
SecuritiesError.RequiredFieldIsEmpty,
SecuritiesError.CouponPeriodNotFound,
fixedIncomeCashFlow -> {
if (fixedIncomeCashFlowUpdateRequest.getSecuritySymbol() == null) return null;
if (!fixedIncomeCashFlowUpdateRequest.getSecuritySymbol().equalsIgnoreCase(String.valueOf(fixedIncomeCashFlow.getSecurityId())))
return SecuritiesError.WrongFieldValue;
return null;
})
);
};
}
}

29
clearing-parent/securities-service/src/main/java/ru/spcex/clearing/securities/service/cud/FixedIncomeCashFlowService.java
View file

@ -12,6 +12,7 @@ import ru.spcex.clearing.imdg.IMDGDistributedNames;
import ru.spcex.clearing.platform.messaging.domain.BaseRequest;
import ru.spcex.clearing.platform.messaging.domain.Consts;
import ru.spcex.clearing.platform.messaging.domain.cud.securitites.FixedIncomeCashFlowNewRequest;
import ru.spcex.clearing.platform.messaging.domain.cud.securitites.FixedIncomeCashFlowUpdateRequest;
import ru.spcex.clearing.platform.messaging.service.QueueConsumer;
import ru.spcex.clearing.platform.messaging.service.RequestInfoUpdate;
import ru.spcex.clearing.validation.common.ValidationHelper;
@ -29,16 +30,19 @@ public class FixedIncomeCashFlowService extends QueueConsumer implements Initial
private final ValidationHelper validationHelper;
private final Function<FixedIncomeCashFlowNewRequest, IValidator> fixedIncomeCashFlowNewRequestValidator;
private final Function<FixedIncomeCashFlowUpdateRequest, IValidator> fixedIncomeCashFlowUpdateRequestValidator;
public FixedIncomeCashFlowService(Consumer<String, Object> kafkaQueue,
Producer<String, Object> kafkaResponseQueue,
ImdgProvider imdgProvider,
ValidationHelper validationHelper,
@Qualifier("fixedIncomeCashFlowNewRequestValidator") Function<FixedIncomeCashFlowNewRequest, IValidator> fixedIncomeCashFlowNewRequestValidator) {
@Qualifier("fixedIncomeCashFlowNewRequestValidator") Function<FixedIncomeCashFlowNewRequest, IValidator> fixedIncomeCashFlowNewRequestValidator,
@Qualifier("fixedIncomeCashFlowUpdateRequestValidator") Function<FixedIncomeCashFlowUpdateRequest, IValidator> fixedIncomeCashFlowUpdateRequestValidator) {
super(kafkaQueue, kafkaResponseQueue);
this.imdgProvider = imdgProvider;
this.validationHelper = validationHelper;
this.fixedIncomeCashFlowNewRequestValidator = fixedIncomeCashFlowNewRequestValidator;
this.fixedIncomeCashFlowUpdateRequestValidator = fixedIncomeCashFlowUpdateRequestValidator;
this.fixedIncomeCashFlowImdg = imdgProvider.getImdg(
IMDGDistributedNames.Map_FixedIncomeCashFlow, FixedIncomeCashFlow.class
);
@ -50,6 +54,9 @@ public class FixedIncomeCashFlowService extends QueueConsumer implements Initial
callback(FixedIncomeCashFlowNewRequest.class)
.setConsumer(this::fixedIncomeCashFlowNew)
.forDestination(Consts.DESTINATION_FIXED_INCOME_CASH_FLOW_NEW, callbacks::put);
callback(FixedIncomeCashFlowUpdateRequest.class)
.setConsumer(this::fixedIncomeCashFlowUpdate)
.forDestination(Consts.DESTINATION_FIXED_INCOME_CASH_FLOW_UPDATE, callbacks::put);
init();
}
@ -72,5 +79,25 @@ public class FixedIncomeCashFlowService extends QueueConsumer implements Initial
return null;
}
public RequestInfoUpdate fixedIncomeCashFlowUpdate(BaseRequest<FixedIncomeCashFlowUpdateRequest> userRequest) {
log.debug("FixedIncomeCashFlowUpdateRequest received {}", userRequest.getId());
RequestInfoUpdate requestInfoUpdate = validationHelper.validateTillFirstError(userRequest, fixedIncomeCashFlowUpdateRequestValidator);
if (requestInfoUpdate != null) return requestInfoUpdate;
FixedIncomeCashFlowUpdateRequest req = userRequest.getRequestPayload();
FixedIncomeCashFlow fixedIncomeCashFlow = fixedIncomeCashFlowImdg.getSingleObjectByID(req.getId());
if (req.getAccruedCoupon() != null) fixedIncomeCashFlow.setAccruedCoupon(req.getAccruedCoupon());
if (req.getNominalValue() != null) fixedIncomeCashFlow.setNominalValue(req.getNominalValue());
if (req.getNumber() != null) fixedIncomeCashFlow.setNumber(req.getNumber());
if (req.getValueDate() != null) fixedIncomeCashFlow.setValueDate(req.getValueDate());
fixedIncomeCashFlowImdg.update(fixedIncomeCashFlow);
log.debug("successfully processed, id {}", fixedIncomeCashFlow.getId());
return null;
}
}

40
clearing-parent/securities-service/src/test/java/ru/spcex/clearing/securities/service/FixedIncomeCashFlowServiceTest.java
View file

@ -16,6 +16,7 @@ import ru.clearing.classes.statics.data.instrument.issue.FixedIncomeCashFlow;
import ru.spcex.clearing.imdg.IMDGDistributedNames;
import ru.spcex.clearing.platform.messaging.domain.Consts;
import ru.spcex.clearing.platform.messaging.domain.cud.securitites.FixedIncomeCashFlowNewRequest;
import ru.spcex.clearing.platform.messaging.domain.cud.securitites.FixedIncomeCashFlowUpdateRequest;
import ru.spcex.clearing.securities.config.ErrorResolverConfig;
import ru.spcex.clearing.securities.config.ImdgTestConfig;
import ru.spcex.clearing.securities.config.KafkaTestConfig;
@ -110,4 +111,43 @@ class FixedIncomeCashFlowServiceTest {
FIXED_INCOME_CASH_FLOW_MATCHER.assertMatch(resultNew, predictableFixedIncomeCashFlow);
}
@Test
void fixedIncomeCashFlowUpdateTest() throws InterruptedException {
//ARRANGE
FixedIncomeCashFlow existFixedIncomeCashFlow = new FixedIncomeCashFlow();
existFixedIncomeCashFlow.setSecurityId(SECURITY_SYMBOL_LONG);
existFixedIncomeCashFlow.setNominalValue(BigDecimal.ZERO);
existFixedIncomeCashFlow.setAccruedCoupon(BigDecimal.ZERO);
existFixedIncomeCashFlow.setNumber(0L);
existFixedIncomeCashFlow.setValueDate(LocalDate.now().plusDays(7));
Long id = fixedIncomeCashFlowImdg.insert(existFixedIncomeCashFlow);
FixedIncomeCashFlowUpdateRequest updateRequest = new FixedIncomeCashFlowUpdateRequest();
updateRequest.setId(id);
updateRequest.setSecuritySymbol(SECURITY_SYMBOL_STR);
updateRequest.setNominalValue(TEST_BIG_DECIMAL);
updateRequest.setAccruedCoupon(TEST_BIG_DECIMAL);
updateRequest.setNumber(TEST_LONG);
updateRequest.setValueDate(TEST_DATE);
FixedIncomeCashFlow predictableFixedIncomeCashFlow = new FixedIncomeCashFlow();
predictableFixedIncomeCashFlow.setSecurityId(SECURITY_SYMBOL_LONG);
predictableFixedIncomeCashFlow.setNominalValue(TEST_BIG_DECIMAL);
predictableFixedIncomeCashFlow.setAccruedCoupon(TEST_BIG_DECIMAL);
predictableFixedIncomeCashFlow.setNumber(TEST_LONG);
predictableFixedIncomeCashFlow.setValueDate(TEST_DATE);
//ACT
String jsonString = getJsonStringForUPDATE(updateRequest, id);
addRecordToKafka((MockConsumer) fixedIncomeCashFlowService.getConsumer(), TOPIC_FIXED_INCOME_CASH_FLOW_UPDATE, PARTITION, 0, jsonString);
//ASSERT
waitingWhenAddedRecordAndCheckIt(id, mockProducer, producerRecord);
FixedIncomeCashFlow resultUpdate = fixedIncomeCashFlowImdg.getSingleObjectBySQL(String.format("securityId = %s", SECURITY_SYMBOL_STR));
predictableFixedIncomeCashFlow.setId(id);
FIXED_INCOME_CASH_FLOW_MATCHER.assertMatch(resultUpdate, predictableFixedIncomeCashFlow);
}
}

5
platform-parent/platform-messaging/src/main/java/ru/spcex/clearing/platform/messaging/domain/cud/securitites/FixedIncomeCashFlowUpdateRequest.java
View file

@ -2,7 +2,10 @@ package ru.spcex.clearing.platform.messaging.domain.cud.securitites;
import com.fasterxml.jackson.annotation.JsonProperty;
import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.deser.std.NumberDeserializers;
import ru.spcex.clearing.platform.messaging.domain.json.deserialize.LocalDateDeserializer;
import ru.spcex.clearing.platform.messaging.domain.json.serialize.LocalDateSerializer;
import ru.spcex.platform.classes.base.interfaces.WithSecuritySymbol;
import java.math.BigDecimal;
@ -27,6 +30,8 @@ public class FixedIncomeCashFlowUpdateRequest implements WithSecuritySymbol {
public Long number;
@JsonProperty
@JsonSerialize(using = LocalDateSerializer.class)
@JsonDeserialize(using = LocalDateDeserializer.class)
public LocalDate valueDate;