replace id -> orderID

This commit is contained in:
etreschenkov 2026-04-10 13:25:13 +03:00
parent d0a82dce34
commit c16bf5ea3b
2 changed files with 4 additions and 6 deletions

View file

@ -24,7 +24,6 @@ import ru.spcex.clearing.validation.common.rules.SpecialIdPresentRule;
import ru.spcex.platform.imdg.api.Imdg; import ru.spcex.platform.imdg.api.Imdg;
import ru.spcex.platform.imdg.api.ImdgProvider; import ru.spcex.platform.imdg.api.ImdgProvider;
import ru.spcex.platform.imdg.api.predicate.specific.IdEqualPredicate; import ru.spcex.platform.imdg.api.predicate.specific.IdEqualPredicate;
import static ru.spcex.platform.imdg.api.predicate.specific.IdEqualPredicate.byId;
import ru.spcex.platform.imdg.validation.ImdgValidationContext; import ru.spcex.platform.imdg.validation.ImdgValidationContext;
import ru.spcex.platform.imdg.validation.LogPrefixId; import ru.spcex.platform.imdg.validation.LogPrefixId;
import ru.spcex.platform.imdg.validation.rule.PresentById; import ru.spcex.platform.imdg.validation.rule.PresentById;
@ -158,14 +157,14 @@ public class ValidationConfig {
return req -> { return req -> {
ImdgValidationContext<OrderCompanyNewRequest> ctx = new ImdgValidationContext<>(); ImdgValidationContext<OrderCompanyNewRequest> ctx = new ImdgValidationContext<>();
ctx.setValidatedObject(req); ctx.setValidatedObject(req);
ctx.setLogPrefix(LogPrefixId.INSTANCE); ctx.setLogPrefix(r -> "(#orderId=%d) ".formatted(r.getOrderId()));
ctx.addImdg(IMDGDistributedNames.Map_OrderCurrency, orderCurrencyImdg); ctx.addImdg(IMDGDistributedNames.Map_OrderCurrency, orderCurrencyImdg);
ctx.addImdg(IMDGDistributedNames.Map_Company, companyImdg); ctx.addImdg(IMDGDistributedNames.Map_Company, companyImdg);
ctx.addImdg(IMDGDistributedNames.Map_TradingClearingRegistry, tcrImdg); ctx.addImdg(IMDGDistributedNames.Map_TradingClearingRegistry, tcrImdg);
var orderCurrencyPresent = PresentByPredicate var orderCurrencyPresent = PresentByPredicate
.builder(byId(orderCurrencyImdg.predicateBuilder(), req)) .builder(new IdEqualPredicate<>(orderCurrencyImdg.predicateBuilder(), OrderCompanyNewRequest::getOrderId))
.mapName(IMDGDistributedNames.Map_OrderCurrency) .mapName(IMDGDistributedNames.Map_OrderCurrency)
.errorProvider(r -> recordNotFound(r.getId())) .errorProvider(r -> recordNotFound(r.getOrderId()))
.store(OrderCurrencyValidationStored.OrderCurrency) .store(OrderCurrencyValidationStored.OrderCurrency)
.build(); .build();

View file

@ -1,9 +1,8 @@
package ru.spcex.clearing.platform.messaging.domain.cud.order; package ru.spcex.clearing.platform.messaging.domain.cud.order;
import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonProperty;
import ru.spcex.platform.classes.base.interfaces.WithId;
public class OrderCompanyNewRequest implements WithId { public class OrderCompanyNewRequest {
@JsonProperty @JsonProperty
private Long orderId; private Long orderId;
@JsonProperty @JsonProperty