From 6567c3b02e6e775af9396d08e9825f96ac04e707 Mon Sep 17 00:00:00 2001 From: etreschenkov Date: Wed, 6 May 2026 15:57:37 +0300 Subject: [PATCH] http://jira.mfd.msk:8088/browse/CLS-995 --- .../OrderCurrencyByCompanyAndTcrAlreadyPresent.java | 4 +++- .../clearing/dflt/management/config/ValidationConfig.java | 6 ++++-- .../imdg/src/main/resources/application.properties | 2 +- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/clearing-parent/default-management/src/main/java/ru/spcex/clearing/dflt/management/component/validation/OrderCurrencyByCompanyAndTcrAlreadyPresent.java b/clearing-parent/default-management/src/main/java/ru/spcex/clearing/dflt/management/component/validation/OrderCurrencyByCompanyAndTcrAlreadyPresent.java index 6108f2a39..4d1988594 100644 --- a/clearing-parent/default-management/src/main/java/ru/spcex/clearing/dflt/management/component/validation/OrderCurrencyByCompanyAndTcrAlreadyPresent.java +++ b/clearing-parent/default-management/src/main/java/ru/spcex/clearing/dflt/management/component/validation/OrderCurrencyByCompanyAndTcrAlreadyPresent.java @@ -7,6 +7,7 @@ import ru.spcex.clearing.dflt.management.error.DefaultManagementErrors; import ru.spcex.clearing.imdg.IMDGDistributedNames; import ru.spcex.platform.classes.base.interfaces.WithCompanyId; import ru.spcex.platform.classes.base.interfaces.WithTcrId; +import ru.spcex.platform.enumeration.OrderStatus; import ru.spcex.platform.imdg.api.Imdg; import ru.spcex.platform.imdg.api.predicate.ImdgPredicateBuilder; import ru.spcex.platform.imdg.validation.ImdgValidationContext; @@ -29,7 +30,8 @@ public class OrderCurrencyByCompanyAndTcrAlreadyPresent orders = imdg.getCollectionObjectsByPredicate( pb.and( pb.equals("tradingClearingRegistryId", validatedObject.getTradingClearingRegistryId()), - pb.equals("companyId", validatedObject.getCompanyId()) + pb.equals("companyId", validatedObject.getCompanyId()), + pb.equals("status", OrderStatus.CREATED.getKey()) ) ); if (!orders.isEmpty()) { 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 0b0ac0a40..225b19024 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 @@ -463,7 +463,8 @@ public class ValidationConfig { pb.equals("type", OrderAffil.PLBL.getKey()), pb.equals("registryId", oc.getRegistryId()), pb.equals("companyId", oc.getCounterPartyId()), - pb.equals("counterPartyId", oc.getCompanyId()) + pb.equals("counterPartyId", oc.getCompanyId()), + pb.equals("status", OrderStatus.CREATED.getKey()) ); }) .mapName(IMDGDistributedNames.Map_OrderCurrency) @@ -509,7 +510,8 @@ public class ValidationConfig { pb.equals("type", OrderAffil.PLBL.getKey()), pb.equals("registryId", oc.getRegistryId()), pb.equals("companyId", oc.getCounterPartyId()), - pb.equals("counterPartyId", oc.getCompanyId()) + pb.equals("counterPartyId", oc.getCompanyId()), + pb.equals("status", OrderStatus.CREATED.getKey()) ); }) .mapName(IMDGDistributedNames.Map_OrderCurrency) diff --git a/clearing-parent/imdg/src/main/resources/application.properties b/clearing-parent/imdg/src/main/resources/application.properties index c9339fbcd..482aaf1f3 100644 --- a/clearing-parent/imdg/src/main/resources/application.properties +++ b/clearing-parent/imdg/src/main/resources/application.properties @@ -7,7 +7,7 @@ imdg.hazelcast.instance-name=instance imdg.hazelcast.db-sync-seconds=10 imdg.database.login=clearing imdg.database.password=Aa111111 -imdg.database.url=jdbc:postgresql://10.200.200.133:5432/clearing?currentSchema=clearing_prod +imdg.database.url=jdbc:postgresql://10.200.200.133:5432/clearing_stress_curr #imdg.database.url=jdbc:postgresql://10.200.200.133:5432/postgres?currentSchema=clearing_tester imdg.database.min-pool-size=10 imdg.database.max-pool-size=30 \ No newline at end of file