From b8cffb8f6aad549fad2c81f1243c47d8f1d7eb9a Mon Sep 17 00:00:00 2001 From: ialbert Date: Wed, 28 Jun 2023 11:41:26 +0300 Subject: [PATCH] =?UTF-8?q?=D0=BE=D0=B1=D0=BD=D0=BE=D0=B2=D0=BB=D1=8F?= =?UTF-8?q?=D0=B5=D0=BC=20sessionId=20=D1=80=D0=B5=D0=B3=D0=B8=D1=81=D1=82?= =?UTF-8?q?=D1=80=D0=BE=D0=B2=20=D0=BF=D1=80=D0=B8=20=D0=B2=D0=BA=D0=BB?= =?UTF-8?q?=D1=8E=D1=87=D0=B5=D0=BD=D0=B8=D0=B8=20=D0=B2=20=D1=81=D0=B5?= =?UTF-8?q?=D1=81=D1=81=D0=B8=D0=BE=D0=BD=D0=BD=D1=8B=D0=B9=20=D0=BF=D1=83?= =?UTF-8?q?=D0=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ru/spcex/clearing/config/session/StateBnConfig.java | 2 ++ .../ru/spcex/clearing/session/stage/FinalMkrSession.java | 1 + .../clearing/session/stage/IntermediateMkrSession.java | 1 + .../clearing/session/stage/PrimaryAuctionB0Session.java | 1 + .../clearing/session/stage/PrimaryAuctionBnSession.java | 1 + .../clearing/session/stage/PrimaryAuctionT0Session.java | 1 + .../clearing/session/stage/ReturnDepositSession.java | 1 + .../session/stage/SecondaryAuctionT0Session.java | 1 + .../session/stage/impl/InclusionObligations.java | 5 +++-- .../session/stage/task/InclusionToPoolPayload.java | 9 +++++++++ 10 files changed, 21 insertions(+), 2 deletions(-) diff --git a/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/config/session/StateBnConfig.java b/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/config/session/StateBnConfig.java index 2f337e091..e8adad924 100644 --- a/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/config/session/StateBnConfig.java +++ b/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/config/session/StateBnConfig.java @@ -98,7 +98,9 @@ public class StateBnConfig extends EnumStateMachineConfigurerAdapter { InclusionToPoolPayload payload = new InclusionToPoolPayload(); Session session = extendedState.get(StageDataEnum.session.name(), Session.class); + Long sessionId = extendedState.get(StageDataEnum.sessionId.name(), Long.class); payload.setSessionType(session.getSessionType()); + payload.setSessionId(sessionId); return payload; }); diff --git a/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/session/stage/FinalMkrSession.java b/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/session/stage/FinalMkrSession.java index c6a9f6fcb..f48985b07 100644 --- a/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/session/stage/FinalMkrSession.java +++ b/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/session/stage/FinalMkrSession.java @@ -163,6 +163,7 @@ public class FinalMkrSession extends AbstractSession implements InitializingBean { InclusionToPoolPayload inclusionToPoolPayload = new InclusionToPoolPayload(); inclusionToPoolPayload.setSessionType(currSession.getSessionType()); + inclusionToPoolPayload.setSessionId(currSession.getId()); runStage(TaskType.InclusionToPool, inclusionToPoolPayload, inclusionObligations); } //stage 5 diff --git a/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/session/stage/IntermediateMkrSession.java b/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/session/stage/IntermediateMkrSession.java index 960039fea..a849f072c 100644 --- a/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/session/stage/IntermediateMkrSession.java +++ b/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/session/stage/IntermediateMkrSession.java @@ -148,6 +148,7 @@ public class IntermediateMkrSession extends AbstractSession implements Initializ { InclusionToPoolPayload inclusionToPoolPayload = new InclusionToPoolPayload(); inclusionToPoolPayload.setSessionType(currSession.getSessionType()); + inclusionToPoolPayload.setSessionId(currSession.getId()); runStage(TaskType.InclusionToPool, inclusionToPoolPayload, inclusionObligations); } //stage 5 diff --git a/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/session/stage/PrimaryAuctionB0Session.java b/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/session/stage/PrimaryAuctionB0Session.java index a83451bb8..7cd20d00e 100644 --- a/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/session/stage/PrimaryAuctionB0Session.java +++ b/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/session/stage/PrimaryAuctionB0Session.java @@ -136,6 +136,7 @@ public class PrimaryAuctionB0Session extends AbstractSession implements Initiali { InclusionToPoolPayload inclusionToPoolPayload = new InclusionToPoolPayload(); inclusionToPoolPayload.setSessionType(currSession.getSessionType()); + inclusionToPoolPayload.setSessionId(currSession.getId()); runStage(TaskType.InclusionToPool, inclusionToPoolPayload, inclusionObligations); } //stage 5 diff --git a/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/session/stage/PrimaryAuctionBnSession.java b/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/session/stage/PrimaryAuctionBnSession.java index 523b4fa06..bbb266ff3 100644 --- a/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/session/stage/PrimaryAuctionBnSession.java +++ b/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/session/stage/PrimaryAuctionBnSession.java @@ -136,6 +136,7 @@ public class PrimaryAuctionBnSession extends AbstractSession implements Initiali { InclusionToPoolPayload inclusionToPoolPayload = new InclusionToPoolPayload(); inclusionToPoolPayload.setSessionType(currSession.getSessionType()); + inclusionToPoolPayload.setSessionId(currSession.getId()); runStage(TaskType.InclusionToPool, inclusionToPoolPayload, inclusionObligations); } //stage 5 diff --git a/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/session/stage/PrimaryAuctionT0Session.java b/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/session/stage/PrimaryAuctionT0Session.java index 723410ef1..b0cd84a8a 100644 --- a/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/session/stage/PrimaryAuctionT0Session.java +++ b/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/session/stage/PrimaryAuctionT0Session.java @@ -135,6 +135,7 @@ public class PrimaryAuctionT0Session extends AbstractSession implements Initiali { InclusionToPoolPayload inclusionToPoolPayload = new InclusionToPoolPayload(); inclusionToPoolPayload.setSessionType(currSession.getSessionType()); + inclusionToPoolPayload.setSessionId(currSession.getId()); runStage(TaskType.InclusionToPool, inclusionToPoolPayload, inclusionObligations); } //stage 5 diff --git a/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/session/stage/ReturnDepositSession.java b/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/session/stage/ReturnDepositSession.java index 8a0c4a7e6..52804cc64 100644 --- a/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/session/stage/ReturnDepositSession.java +++ b/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/session/stage/ReturnDepositSession.java @@ -123,6 +123,7 @@ public class ReturnDepositSession extends AbstractSession implements Initializin //stage 4 { InclusionToPoolPayload inclusionToPoolPayload = new InclusionToPoolPayload(); + inclusionToPoolPayload.setSessionId(currSession.getId()); runStage(TaskType.InclusionToPool, inclusionToPoolPayload, inclusionObligations); } //stage 5 diff --git a/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/session/stage/SecondaryAuctionT0Session.java b/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/session/stage/SecondaryAuctionT0Session.java index e5df3e797..e76040d5e 100644 --- a/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/session/stage/SecondaryAuctionT0Session.java +++ b/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/session/stage/SecondaryAuctionT0Session.java @@ -136,6 +136,7 @@ public class SecondaryAuctionT0Session extends AbstractSession implements Initia { InclusionToPoolPayload inclusionToPoolPayload = new InclusionToPoolPayload(); inclusionToPoolPayload.setSessionType(currSession.getSessionType()); + inclusionToPoolPayload.setSessionId(currSession.getId()); runStage(TaskType.InclusionToPool, inclusionToPoolPayload, inclusionObligations); } //stage 5 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 038d5bc90..b7aa1c870 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 @@ -65,7 +65,7 @@ public class InclusionObligations implements ISessionStage { InclusionToPoolPayload payload = (InclusionToPoolPayload) task.getData(); switch (task.getTaskType()) { case InclusionToPool -> { - return inclusionToPool(payload.getSessionType(), payload.getCounterPartyId()); + return inclusionToPool(payload.getSessionId(), payload.getSessionType(), payload.getCounterPartyId()); } default -> { throw new IllegalStateException("Unknown task type: " + task.getTaskType()); @@ -74,7 +74,7 @@ public class InclusionObligations implements ISessionStage { } - private StageResult inclusionToPool(String sessionType, Long counterPartyId) { + private StageResult inclusionToPool(Long sessionId, String sessionType, Long counterPartyId) { String sqlCondition = String.format("registryDesignation in ('%s', '%s') and " + "registryInstrumentType in ('%s', '%s') and " + "registryUnit = '%s'", @@ -109,6 +109,7 @@ public class InclusionObligations implements ISessionStage { log.debug("Processing set of registry with groupId: {}", entrySet.getKey()); for (Registry registry : entrySet.getValue()) { registry.setRegistryStatus("POOL"); + registry.setSessionId(sessionId); registryImdg.update(registry); } } diff --git a/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/session/stage/task/InclusionToPoolPayload.java b/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/session/stage/task/InclusionToPoolPayload.java index 41bba14c6..96eb3c39f 100644 --- a/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/session/stage/task/InclusionToPoolPayload.java +++ b/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/session/stage/task/InclusionToPoolPayload.java @@ -3,6 +3,7 @@ package ru.spcex.clearing.session.stage.task; public class InclusionToPoolPayload { private String sessionType; private Long counterPartyId; + private Long sessionId; public String getSessionType() { return sessionType; @@ -19,4 +20,12 @@ public class InclusionToPoolPayload { public void setCounterPartyId(Long counterPartyId) { this.counterPartyId = counterPartyId; } + + public Long getSessionId() { + return sessionId; + } + + public void setSessionId(Long sessionId) { + this.sessionId = sessionId; + } }