From c16bf5ea3be824b9410dc668996fc14fe814a904 Mon Sep 17 00:00:00 2001
From: etreschenkov <ETreschenkov@mfd.ru>
Date: Fri, 10 Apr 2026 13:25:13 +0300
Subject: [PATCH] replace id -> orderID

---
 .../clearing/dflt/management/config/ValidationConfig.java  | 7 +++----
 .../messaging/domain/cud/order/OrderCompanyNewRequest.java | 3 +--
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/clearing-parent/default-management/src/main/java/ru/spcex/clearing/dflt/management/config/ValidationConfig.java b/clearing-parent/default-management/src/main/java/ru/spcex/clearing/dflt/management/config/ValidationConfig.java
index 4bb254233..fe4872282 100644
--- a/clearing-parent/default-management/src/main/java/ru/spcex/clearing/dflt/management/config/ValidationConfig.java
+++ b/clearing-parent/default-management/src/main/java/ru/spcex/clearing/dflt/management/config/ValidationConfig.java
@@ -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.ImdgProvider;
 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.LogPrefixId;
 import ru.spcex.platform.imdg.validation.rule.PresentById;
@@ -158,14 +157,14 @@ public class ValidationConfig {
         return req -> {
             ImdgValidationContext<OrderCompanyNewRequest> ctx = new ImdgValidationContext<>();
             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_Company, companyImdg);
             ctx.addImdg(IMDGDistributedNames.Map_TradingClearingRegistry, tcrImdg);
             var orderCurrencyPresent = PresentByPredicate
-                .builder(byId(orderCurrencyImdg.predicateBuilder(), req))
+                .builder(new IdEqualPredicate<>(orderCurrencyImdg.predicateBuilder(), OrderCompanyNewRequest::getOrderId))
                 .mapName(IMDGDistributedNames.Map_OrderCurrency)
-                .errorProvider(r -> recordNotFound(r.getId()))
+                .errorProvider(r -> recordNotFound(r.getOrderId()))
                 .store(OrderCurrencyValidationStored.OrderCurrency)
                 .build();
 
diff --git a/platform-parent/platform-messaging/src/main/java/ru/spcex/clearing/platform/messaging/domain/cud/order/OrderCompanyNewRequest.java b/platform-parent/platform-messaging/src/main/java/ru/spcex/clearing/platform/messaging/domain/cud/order/OrderCompanyNewRequest.java
index 99e1c09f8..9eea34508 100644
--- a/platform-parent/platform-messaging/src/main/java/ru/spcex/clearing/platform/messaging/domain/cud/order/OrderCompanyNewRequest.java
+++ b/platform-parent/platform-messaging/src/main/java/ru/spcex/clearing/platform/messaging/domain/cud/order/OrderCompanyNewRequest.java
@@ -1,9 +1,8 @@
 package ru.spcex.clearing.platform.messaging.domain.cud.order;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
-import ru.spcex.platform.classes.base.interfaces.WithId;
 
-public class OrderCompanyNewRequest implements WithId {
+public class OrderCompanyNewRequest {
     @JsonProperty
     private Long orderId;
     @JsonProperty