From 31de6ed6dc311815cba5dd64c4afbb36850d2b10 Mon Sep 17 00:00:00 2001 From: ialbert Date: Thu, 7 Aug 2025 18:33:26 +0300 Subject: [PATCH] http://jira.mfd.msk:8088/browse/CLS-894 ObligationAdmission <-> InclusionToPool --- .../CurrencySessionStateMachineConfig.java | 17 +++++++++-------- .../FinalSessionStateMachineConfig.java | 16 ++++++++-------- ...ntermediateMkrSessionStateMachineConfig.java | 16 ++++++++-------- ...imaryAuctionB0SessionStateMachineConfig.java | 16 ++++++++-------- ...imaryAuctionBnSessionStateMachineConfig.java | 16 ++++++++-------- ...imaryAuctionT0SessionStateMachineConfig.java | 16 ++++++++-------- ...ndaryAuctionT0SessionStateMachineConfig.java | 16 ++++++++-------- .../UnitedSessionStateMachineConfig.java | 16 ++++++++-------- 8 files changed, 65 insertions(+), 64 deletions(-) diff --git a/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/config/state_machine_2/specific/CurrencySessionStateMachineConfig.java b/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/config/state_machine_2/specific/CurrencySessionStateMachineConfig.java index e6c8c7220..97deaa189 100644 --- a/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/config/state_machine_2/specific/CurrencySessionStateMachineConfig.java +++ b/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/config/state_machine_2/specific/CurrencySessionStateMachineConfig.java @@ -173,12 +173,13 @@ public class CurrencySessionStateMachineConfig extends EnumStateMachineConfigure .action(reqAndOblAction) .and() .withExternal() - .source(TaskType.RequirementsAndObligationsCreate).target(TaskType.ObligationsAdmission) - .action(obligationAdmissionAction) + .source(TaskType.RequirementsAndObligationsCreate).target(TaskType.InclusionToPool) + .action(inclusionToPoolAction) .and() .withExternal() - .source(TaskType.InclusionToPool).target(TaskType.InspectionObligations) - .action(inspectionObligationsV2Action); + .source(TaskType.InclusionToPool) + .target(TaskType.ObligationsAdmission) + .action(obligationAdmissionAction); sourceObligationAdmission(transitions); sourcePseudoAfterOAPause(transitions); @@ -214,17 +215,17 @@ public class CurrencySessionStateMachineConfig extends EnumStateMachineConfigure .action(pauseWsAction) .and() .withExternal() - .source(TaskType.ObligationsAdmission).target(TaskType.InclusionToPool) + .source(TaskType.ObligationsAdmission).target(TaskType.InspectionObligations) .guard(invert(oblAdmGuard)) - .action(chain(obligationAdmissionContinueAction, inclusionToPoolAction)); + .action(chain(obligationAdmissionContinueAction, inspectionObligationsV2Action)); } private void sourcePseudoAfterOAPause(StateMachineTransitionConfigurer transitions) throws Exception { transitions //continue and repeat after ObligationAdmission .withExternal() - .source(TaskType.PSEUDO_waitAfterObligationAdmissionError).target(TaskType.InclusionToPool) - .action(chain(activeWsAction, obligationAdmissionContinueAction, inclusionToPoolAction)) + .source(TaskType.PSEUDO_waitAfterObligationAdmissionError).target(TaskType.InspectionObligations) + .action(chain(activeWsAction, obligationAdmissionContinueAction, inspectionObligationsV2Action)) .event(SsnEvent.CONTINUE); for (var taskType : List.of(TaskType.PSEUDO_waitAfterObligationAdmissionError, TaskType.PSEUDO_waitAfterObligationAdmissionRestore)) { transitions diff --git a/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/config/state_machine_2/specific/FinalSessionStateMachineConfig.java b/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/config/state_machine_2/specific/FinalSessionStateMachineConfig.java index 9b548b69a..3c3e87fad 100644 --- a/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/config/state_machine_2/specific/FinalSessionStateMachineConfig.java +++ b/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/config/state_machine_2/specific/FinalSessionStateMachineConfig.java @@ -191,13 +191,13 @@ public class FinalSessionStateMachineConfig .action(reqAndOblAction) .and() .withExternal() - .source(TaskType.RequirementsAndObligationsCreate).target(TaskType.ObligationsAdmission) - .action(obligationAdmissionAction) + .source(TaskType.RequirementsAndObligationsCreate).target(TaskType.InclusionToPool) + .action(inclusionToPoolAction) .and() .withExternal() - .source(TaskType.InclusionToPool).target(TaskType.InspectionObligationDepositReturn) + .source(TaskType.InclusionToPool).target(TaskType.ObligationsAdmission) //нужно сменить статус ручками, т.к. псевдо состояние - .action(inspOblDepositReturnAction); + .action(obligationAdmissionAction); sourceObligationAdmission(transitions); sourcePseudoAfterOAPause(transitions); @@ -218,9 +218,9 @@ public class FinalSessionStateMachineConfig .action(pauseWsAction) .and() .withExternal() - .source(TaskType.ObligationsAdmission).target(TaskType.InclusionToPool) + .source(TaskType.ObligationsAdmission).target(TaskType.InspectionObligationDepositReturn) .guard(invert(oblAdmGuard)) - .action(chain(obligationAdmissionContinueAction, inclusionToPoolAction)); + .action(chain(obligationAdmissionContinueAction, inspOblDepositReturnAction)); } private void sourceIODepositReturn(StateMachineTransitionConfigurer transitions) throws Exception { @@ -296,8 +296,8 @@ public class FinalSessionStateMachineConfig private void sourcePseudoAfterOAPause(StateMachineTransitionConfigurer transitions) throws Exception { transitions .withExternal() - .source(TaskType.PSEUDO_waitAfterObligationAdmissionError).target(TaskType.InclusionToPool) - .action(chain(activeWsAction, obligationAdmissionContinueAction, inclusionToPoolAction)) + .source(TaskType.PSEUDO_waitAfterObligationAdmissionError).target(TaskType.InspectionObligationDepositReturn) + .action(chain(activeWsAction, obligationAdmissionContinueAction, inspOblDepositReturnAction)) .event(SsnEvent.CONTINUE); for (var taskType : List.of(TaskType.PSEUDO_waitAfterObligationAdmissionError, TaskType.PSEUDO_waitAfterObligationAdmissionRestore)) { transitions diff --git a/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/config/state_machine_2/specific/IntermediateMkrSessionStateMachineConfig.java b/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/config/state_machine_2/specific/IntermediateMkrSessionStateMachineConfig.java index 5669c564f..7eef6a13e 100644 --- a/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/config/state_machine_2/specific/IntermediateMkrSessionStateMachineConfig.java +++ b/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/config/state_machine_2/specific/IntermediateMkrSessionStateMachineConfig.java @@ -180,12 +180,12 @@ public class IntermediateMkrSessionStateMachineConfig .action(reqAndOblAction) .and() .withExternal() - .source(TaskType.RequirementsAndObligationsCreate).target(TaskType.ObligationsAdmission) - .action(obligationAdmissionAction) + .source(TaskType.RequirementsAndObligationsCreate).target(TaskType.InclusionToPool) + .action(inclusionToPoolAction) .and() .withExternal() - .source(TaskType.InclusionToPool).target(TaskType.InspectionObligations) - .action(inspectionObligationsV2Action); + .source(TaskType.InclusionToPool).target(TaskType.ObligationsAdmission) + .action(obligationAdmissionAction); sourceObligationAdmission(transitions); sourcePseudoAfterOAPause(transitions); @@ -213,17 +213,17 @@ public class IntermediateMkrSessionStateMachineConfig .action(pauseWsAction) .and() .withExternal() - .source(TaskType.ObligationsAdmission).target(TaskType.InclusionToPool) + .source(TaskType.ObligationsAdmission).target(TaskType.InspectionObligations) .guard(invert(oblAdmGuard)) - .action(chain(obligationAdmissionContinueAction, inclusionToPoolAction)); + .action(chain(obligationAdmissionContinueAction, inspectionObligationsV2Action)); } private void sourcePseudoAfterOAPause(StateMachineTransitionConfigurer transitions) throws Exception { transitions //continue and repeat after ObligationAdmission .withExternal() - .source(TaskType.PSEUDO_waitAfterObligationAdmissionError).target(TaskType.InclusionToPool) - .action(chain(activeWsAction, obligationAdmissionContinueAction, inclusionToPoolAction)) + .source(TaskType.PSEUDO_waitAfterObligationAdmissionError).target(TaskType.InspectionObligations) + .action(chain(activeWsAction, obligationAdmissionContinueAction, inspectionObligationsV2Action)) .event(SsnEvent.CONTINUE); for (var taskType : List.of(TaskType.PSEUDO_waitAfterObligationAdmissionError, TaskType.PSEUDO_waitAfterObligationAdmissionRestore)) { transitions diff --git a/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/config/state_machine_2/specific/PrimaryAuctionB0SessionStateMachineConfig.java b/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/config/state_machine_2/specific/PrimaryAuctionB0SessionStateMachineConfig.java index 44dcc1a87..4779233b6 100644 --- a/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/config/state_machine_2/specific/PrimaryAuctionB0SessionStateMachineConfig.java +++ b/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/config/state_machine_2/specific/PrimaryAuctionB0SessionStateMachineConfig.java @@ -182,12 +182,12 @@ public class PrimaryAuctionB0SessionStateMachineConfig .action(reqAndOblAction) .and() .withExternal() - .source(TaskType.RequirementsAndObligationsCreate).target(TaskType.ObligationsAdmission) - .action(obligationAdmissionAction) + .source(TaskType.RequirementsAndObligationsCreate).target(TaskType.InclusionToPool) + .action(inclusionToPoolAction) .and() .withExternal() - .source(TaskType.InclusionToPool).target(TaskType.InspectionObligations) - .action(inspectionObligationsV2Action); + .source(TaskType.InclusionToPool).target(TaskType.ObligationsAdmission) + .action(obligationAdmissionAction); sourceObligationAdmission(transitions); sourcePseudoAfterOAPause(transitions); sourcePseudoAfterIOPause(transitions); @@ -207,9 +207,9 @@ public class PrimaryAuctionB0SessionStateMachineConfig .action(pauseWsAction) .and() .withExternal() - .source(TaskType.ObligationsAdmission).target(TaskType.InclusionToPool) + .source(TaskType.ObligationsAdmission).target(TaskType.InspectionObligations) .guard(invert(oblAdmGuard)) - .action(chain(obligationAdmissionContinueAction, inclusionToPoolAction)); + .action(chain(obligationAdmissionContinueAction, inspectionObligationsV2Action)); } private void sourceInspection(StateMachineTransitionConfigurer transitions) throws Exception { @@ -232,8 +232,8 @@ public class PrimaryAuctionB0SessionStateMachineConfig transitions //continue and repeat after ObligationAdmission .withExternal() - .source(TaskType.PSEUDO_waitAfterObligationAdmissionError).target(TaskType.InclusionToPool) - .action(chain(activeWsAction, obligationAdmissionContinueAction, inclusionToPoolAction)) + .source(TaskType.PSEUDO_waitAfterObligationAdmissionError).target(TaskType.InspectionObligations) + .action(chain(activeWsAction, obligationAdmissionContinueAction, inspectionObligationsV2Action)) .event(SsnEvent.CONTINUE); for (var taskType : List.of(TaskType.PSEUDO_waitAfterObligationAdmissionError, TaskType.PSEUDO_waitAfterObligationAdmissionRestore)) { transitions diff --git a/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/config/state_machine_2/specific/PrimaryAuctionBnSessionStateMachineConfig.java b/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/config/state_machine_2/specific/PrimaryAuctionBnSessionStateMachineConfig.java index 581b76a15..4e6013048 100644 --- a/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/config/state_machine_2/specific/PrimaryAuctionBnSessionStateMachineConfig.java +++ b/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/config/state_machine_2/specific/PrimaryAuctionBnSessionStateMachineConfig.java @@ -176,12 +176,12 @@ public class PrimaryAuctionBnSessionStateMachineConfig .action(reqAndOblAction) .and() .withExternal() - .source(TaskType.RequirementsAndObligationsCreate).target(TaskType.ObligationsAdmission) - .action(obligationAdmissionAction) + .source(TaskType.RequirementsAndObligationsCreate).target(TaskType.InclusionToPool) + .action(inclusionToPoolAction) .and() .withExternal() - .source(TaskType.InclusionToPool).target(TaskType.InspectionObligations) - .action(inspectionObligationsV2Action); + .source(TaskType.InclusionToPool).target(TaskType.ObligationsAdmission) + .action(obligationAdmissionAction); sourceObligationAdmission(transitions); sourcePseudoAfterOAPause(transitions); @@ -200,9 +200,9 @@ public class PrimaryAuctionBnSessionStateMachineConfig .action(pauseWsAction) .and() .withExternal() - .source(TaskType.ObligationsAdmission).target(TaskType.InclusionToPool) + .source(TaskType.ObligationsAdmission).target(TaskType.InspectionObligations) .guard(invert(oblAdmGuard)) - .action(chain(obligationAdmissionContinueAction, inclusionToPoolAction)); + .action(chain(obligationAdmissionContinueAction, inspectionObligationsV2Action)); } private void sourceInspection(StateMachineTransitionConfigurer transitions) throws Exception { @@ -224,8 +224,8 @@ public class PrimaryAuctionBnSessionStateMachineConfig transitions //continue and repeat after ObligationAdmission .withExternal() - .source(TaskType.PSEUDO_waitAfterObligationAdmissionError).target(TaskType.InclusionToPool) - .action(chain(activeWsAction, obligationAdmissionContinueAction, inclusionToPoolAction)) + .source(TaskType.PSEUDO_waitAfterObligationAdmissionError).target(TaskType.InspectionObligations) + .action(chain(activeWsAction, obligationAdmissionContinueAction, inspectionObligationsV2Action)) .event(SsnEvent.CONTINUE); for (var taskType : List.of(TaskType.PSEUDO_waitAfterObligationAdmissionError, TaskType.PSEUDO_waitAfterObligationAdmissionRestore)) { transitions diff --git a/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/config/state_machine_2/specific/PrimaryAuctionT0SessionStateMachineConfig.java b/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/config/state_machine_2/specific/PrimaryAuctionT0SessionStateMachineConfig.java index 5196d628c..e3a5f99a4 100644 --- a/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/config/state_machine_2/specific/PrimaryAuctionT0SessionStateMachineConfig.java +++ b/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/config/state_machine_2/specific/PrimaryAuctionT0SessionStateMachineConfig.java @@ -183,12 +183,12 @@ public class PrimaryAuctionT0SessionStateMachineConfig .action(reqAndOblAction) .and() .withExternal() - .source(TaskType.RequirementsAndObligationsCreate).target(TaskType.ObligationsAdmission) - .action(obligationAdmissionAction) + .source(TaskType.RequirementsAndObligationsCreate).target(TaskType.InclusionToPool) + .action(inclusionToPoolAction) .and() .withExternal() - .source(TaskType.InclusionToPool).target(TaskType.InspectionObligations) - .action(inspectionObligationsV2Action); + .source(TaskType.InclusionToPool).target(TaskType.ObligationsAdmission) + .action(obligationAdmissionAction); sourceObligationAdmission(transitions); sourcePseudoAfterOAPause(transitions); @@ -209,9 +209,9 @@ public class PrimaryAuctionT0SessionStateMachineConfig .action(pauseWsAction) .and() .withExternal() - .source(TaskType.ObligationsAdmission).target(TaskType.InclusionToPool) + .source(TaskType.ObligationsAdmission).target(TaskType.InspectionObligations) .guard(invert(oblAdmGuard)) - .action(chain(obligationAdmissionContinueAction, inclusionToPoolAction)); + .action(chain(obligationAdmissionContinueAction, inspectionObligationsV2Action)); } private void sourceInspection(StateMachineTransitionConfigurer transitions) throws Exception { @@ -233,8 +233,8 @@ public class PrimaryAuctionT0SessionStateMachineConfig transitions //continue and repeat after ObligationAdmission .withExternal() - .source(TaskType.PSEUDO_waitAfterObligationAdmissionError).target(TaskType.InclusionToPool) - .action(chain(activeWsAction, obligationAdmissionContinueAction, inclusionToPoolAction)) + .source(TaskType.PSEUDO_waitAfterObligationAdmissionError).target(TaskType.InspectionObligations) + .action(chain(activeWsAction, obligationAdmissionContinueAction, inspectionObligationsV2Action)) .event(SsnEvent.CONTINUE); for (var taskType : List.of(TaskType.PSEUDO_waitAfterObligationAdmissionError, TaskType.PSEUDO_waitAfterObligationAdmissionRestore)) { transitions diff --git a/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/config/state_machine_2/specific/SecondaryAuctionT0SessionStateMachineConfig.java b/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/config/state_machine_2/specific/SecondaryAuctionT0SessionStateMachineConfig.java index 3477df9ca..ebb199131 100644 --- a/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/config/state_machine_2/specific/SecondaryAuctionT0SessionStateMachineConfig.java +++ b/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/config/state_machine_2/specific/SecondaryAuctionT0SessionStateMachineConfig.java @@ -183,12 +183,12 @@ public class SecondaryAuctionT0SessionStateMachineConfig .action(reqAndOblAction) .and() .withExternal() - .source(TaskType.RequirementsAndObligationsCreate).target(TaskType.ObligationsAdmission) - .action(obligationAdmissionAction) + .source(TaskType.RequirementsAndObligationsCreate).target(TaskType.InclusionToPool) + .action(inclusionToPoolAction) .and() .withExternal() - .source(TaskType.InclusionToPool).target(TaskType.InspectionObligations) - .action(inspectionObligationsV2Action); + .source(TaskType.InclusionToPool).target(TaskType.ObligationsAdmission) + .action(obligationAdmissionAction); sourceObligationAdmission(transitions); sourcePseudoAfterOAPause(transitions); @@ -209,9 +209,9 @@ public class SecondaryAuctionT0SessionStateMachineConfig .action(pauseWsAction) .and() .withExternal() - .source(TaskType.ObligationsAdmission).target(TaskType.InclusionToPool) + .source(TaskType.ObligationsAdmission).target(TaskType.InspectionObligations) .guard(invert(oblAdmGuard)) - .action(chain(obligationAdmissionContinueAction, inclusionToPoolAction)); + .action(chain(obligationAdmissionContinueAction, inspectionObligationsV2Action)); } private void sourceInspection(StateMachineTransitionConfigurer transitions) throws Exception { @@ -233,8 +233,8 @@ public class SecondaryAuctionT0SessionStateMachineConfig transitions //continue and repeat after ObligationAdmission .withExternal() - .source(TaskType.PSEUDO_waitAfterObligationAdmissionError).target(TaskType.InclusionToPool) - .action(chain(activeWsAction, obligationAdmissionContinueAction, inclusionToPoolAction)) + .source(TaskType.PSEUDO_waitAfterObligationAdmissionError).target(TaskType.InspectionObligations) + .action(chain(activeWsAction, obligationAdmissionContinueAction, inspectionObligationsV2Action)) .event(SsnEvent.CONTINUE); for (var taskType : List.of(TaskType.PSEUDO_waitAfterObligationAdmissionError, TaskType.PSEUDO_waitAfterObligationAdmissionRestore)) { transitions.withExternal() diff --git a/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/config/state_machine_2/specific/UnitedSessionStateMachineConfig.java b/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/config/state_machine_2/specific/UnitedSessionStateMachineConfig.java index eebc8ec95..73a3c29a1 100644 --- a/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/config/state_machine_2/specific/UnitedSessionStateMachineConfig.java +++ b/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/config/state_machine_2/specific/UnitedSessionStateMachineConfig.java @@ -198,12 +198,12 @@ public class UnitedSessionStateMachineConfig .action(reqAndOblAction) .and() .withExternal() - .source(TaskType.RequirementsAndObligationsCreate).target(TaskType.ObligationsAdmission) - .action(obligationAdmissionAction) + .source(TaskType.RequirementsAndObligationsCreate).target(TaskType.InclusionToPool) + .action(inclusionToPoolAction) .and() .withExternal() - .source(TaskType.InclusionToPool).target(TaskType.InspectionObligations) - .action(inspectionObligationsV2Action); + .source(TaskType.InclusionToPool).target(TaskType.ObligationsAdmission) + .action(obligationAdmissionAction); sourceObligationAdmission(transitions); sourcePseudoAfterOAPause(transitions); sourcePseudoAfterIOPause(transitions); @@ -240,9 +240,9 @@ public class UnitedSessionStateMachineConfig .action(pauseWsAction) .and() .withExternal() - .source(TaskType.ObligationsAdmission).target(TaskType.InclusionToPool) + .source(TaskType.ObligationsAdmission).target(TaskType.InspectionObligations) .guard(invert(oblAdmGuard)) - .action(chain(obligationAdmissionContinueAction, inclusionToPoolAction)); + .action(chain(obligationAdmissionContinueAction, inspectionObligationsV2Action)); } private void sourceInspection(StateMachineTransitionConfigurer transitions) throws Exception { @@ -264,8 +264,8 @@ public class UnitedSessionStateMachineConfig transitions //continue and repeat after ObligationAdmission .withExternal() - .source(TaskType.PSEUDO_waitAfterObligationAdmissionError).target(TaskType.InclusionToPool) - .action(chain(activeWsAction, obligationAdmissionContinueAction, inclusionToPoolAction)) + .source(TaskType.PSEUDO_waitAfterObligationAdmissionError).target(TaskType.InspectionObligations) + .action(chain(activeWsAction, obligationAdmissionContinueAction, inspectionObligationsV2Action)) .event(SsnEvent.CONTINUE); for (var taskType : List.of(TaskType.PSEUDO_waitAfterObligationAdmissionError, TaskType.PSEUDO_waitAfterObligationAdmissionRestore)) { transitions