From f78d4394c3dde8173b259c33fda36f438644676d Mon Sep 17 00:00:00 2001
From: etreschenkov <ETreschenkov@mfd.ru>
Date: Mon, 23 Jun 2025 18:17:17 +0300
Subject: [PATCH] =?UTF-8?q?=D0=B3=D1=80=D1=83=D0=BF=D0=BF=D0=B8=D1=80?=
 =?UTF-8?q?=D0=BE=D0=B2=D0=BA=D0=B0=20registry=20=D1=81=20=D1=83=D1=87?=
 =?UTF-8?q?=D0=B5=D1=82=D0=BE=D0=BC=20market=20=D0=B8=20groupId=20=D0=B4?=
 =?UTF-8?q?=D0=BB=D1=8F=20=D1=88=D0=B0=D0=B3=D0=B0=204=20=D0=B0=D0=BA?=
 =?UTF-8?q?=D1=82=D0=B8=D0=B2=D0=BD=D0=BE=D0=B9=20=D1=81=D0=B5=D1=81=D1=81?=
 =?UTF-8?q?=D0=B8=D0=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../stage/impl/InclusionObligations.java        | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

diff --git a/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/session/stage/impl/InclusionObligations.java b/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/session/stage/impl/InclusionObligations.java
index 2f7665714..3202e89d4 100644
--- a/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/session/stage/impl/InclusionObligations.java
+++ b/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/session/stage/impl/InclusionObligations.java
@@ -18,12 +18,14 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.config.ConfigurableBeanFactory;
 import org.springframework.context.annotation.Scope;
 import org.springframework.stereotype.Service;
+import org.springframework.util.StringUtils;
 import ru.clearing.classes.statics.data.execution.ExecutionCommon;
 import ru.clearing.classes.statics.data.execution.ExecutionCurrency;
 import ru.clearing.classes.statics.data.execution.ExecutionDeposit;
 import ru.clearing.classes.statics.data.execution.ExecutionFond;
 import ru.clearing.classes.statics.data.misc.Session;
 import ru.clearing.classes.statics.data.registry.Registry;
+import ru.spcex.clearing.component.GroupRgsKey;
 import ru.spcex.clearing.imdg.IMDGDistributedNames;
 import ru.spcex.clearing.platform.messaging.service.sender.KafkaSender;
 import ru.spcex.clearing.session.stage.ISessionStage;
@@ -129,17 +131,17 @@ public class InclusionObligations implements ISessionStage {
         }
         log.info("Inclusion to pool with predicate: {}", registryPredicate.toString());
         Collection<Registry> obligations = registryImdg.getCollectionObjectsByPredicate(registryPredicate);
-        Map<Long, List<Registry>> registryByGroupId = obligations.stream()
+        Map<GroupRgsKey, List<Registry>> registryByGroupId = obligations.stream()
                 .filter(registry -> registry.getSettlementDate().isEqual(LocalDate.now()))
-                .collect(Collectors.groupingBy(Registry::getGroupId));
+                .collect(Collectors.groupingBy(registry -> new GroupRgsKey(registry.getGroupId(), registry.getMarket())));
 
         Optional<SessionType> ssnType = obtainSessionType(sessionId);
         Map<Long, Registry> rgsToUpdate = new HashMap<>();
         List<ExecutionCommon> execsToUpdate = new ArrayList<>();
         boolean loadExecs = !IEnumKey.contains(sessionType,
             SessionType.TRDT, SessionType.CURR, SessionType.UNIT, SessionType.IPOT);
-        for (Map.Entry<Long, List<Registry>> entrySet : registryByGroupId.entrySet()) {
-            log.debug("Processing set of registry with groupId: {}", entrySet.getKey());
+        for (Map.Entry<GroupRgsKey, List<Registry>> entrySet : registryByGroupId.entrySet()) {
+            log.debug("Processing set of registry with groupId/market: {}/{}", entrySet.getKey().groupId(), entrySet.getKey().market());
             String rgsSection = null;
             for (Registry registry : entrySet.getValue()) {
                 registry.setRegistryStatus(RegistryStatus.POOL.getKey());
@@ -164,7 +166,7 @@ public class InclusionObligations implements ISessionStage {
     }
 
     @SuppressWarnings("unchecked")
-    private <T extends ExecutionCommon> Collection<ExecutionCommon> updateExecutions(Long sessionId, Long rgsGroupId, String rgsSection) {
+    private <T extends ExecutionCommon> Collection<ExecutionCommon> updateExecutions(Long sessionId, GroupRgsKey groupRgsKey, String rgsSection) {
         Instant now = Instant.now();
         SessionType ssnTpe = obtainSessionType(sessionId).orElse(null);
         if (ssnTpe == null || sessionId == null) {
@@ -193,7 +195,10 @@ public class InclusionObligations implements ISessionStage {
             return Collections.emptyList();
         }
         ImdgPredicateBuilder pb = execImdg.predicateBuilder();
-        ImdgPredicate prdct = pb.equals("exchangeExecutionId", rgsGroupId);
+        ImdgPredicate prdct = pb.and(
+            pb.equals("exchangeExecutionId", groupRgsKey.groupId()),
+            StringUtils.hasText(groupRgsKey.market()) ? pb.equals("market", groupRgsKey.market()) : pb.alwaysTrue()
+        );
         Collection<T> execs = execImdg.getCollectionObjectsByPredicate(prdct);
         //Imdg<T> finalExecImdg = execImdg;
         execs.forEach(e -> {