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-516 api-gateway

Browse source
This commit is contained in:
AKurakin 2023-09-07 16:06:11 +03:00
parent 6ebc2dc2c6
commit 13a45ff83a
2 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -52,9 +52,6 @@ public class FixedIncomeCashFlowValidationConfig {
}),
FieldRequiredRule.instance("nominalValue",
FixedIncomeCashFlowNewRequest::getNominalValue,
SecuritiesError.RequiredFieldIsEmpty),
FieldRequiredRule.instance("number",
FixedIncomeCashFlowNewRequest::getNumber,
SecuritiesError.RequiredFieldIsEmpty)
);
};

8
clearing-parent/securities-service/src/main/java/ru/spcex/clearing/securities/service/cud/GatewaySecurityService.java
View file

@ -37,6 +37,7 @@ 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.predicate.ImdgPredicateBuilder;
import ru.spcex.platform.utils.enumeration.IMessageResolver;
import ru.spcex.platform.utils.error.ValidationException;
@ -335,7 +336,12 @@ public class GatewaySecurityService extends QueueConsumer implements Initializin
CouponPeriod findCouponPeriod(CouponPeriodNewRequest byRequest) {
if (byRequest.getSecurityId() == null)
return null;
CouponPeriod existCouponPeriod = couponPeriodImdg.getFirstObjectByFieldValues(Map.of("securityId", byRequest.getSecurityId()));
ImdgPredicateBuilder pb = couponPeriodImdg.predicateBuilder();
CouponPeriod existCouponPeriod = couponPeriodImdg.getFirstObjectByPredicate(pb.and(
pb.equals("securityId", byRequest.getSecurityId()),
pb.equals("number", byRequest.getNumber()) // предикатом на случай null, но такого не должно быть
));
if (existCouponPeriod == null)
log.trace("CouponPeriod not found by securityId={}", byRequest.getSecurityId());