From 764f3f82d9a6fb76a83964418f38727a50ec8063 Mon Sep 17 00:00:00 2001 From: ialbert Date: Tue, 1 Jul 2025 12:52:50 +0300 Subject: [PATCH] PSEUDO tasks rename --- .../FinalSessionStateMachineConfig.java | 16 +++++++-------- ...ermediateMkrSessionStateMachineConfig.java | 20 +++++++++---------- .../clearing/session/stage/TaskType.java | 6 +++--- .../config/TestStateMachineConfig.java | 16 +++++++-------- 4 files changed, 29 insertions(+), 29 deletions(-) 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 d81e26812..0c586be53 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 @@ -154,8 +154,8 @@ public class FinalSessionStateMachineConfig TaskType.FormingPaymentInstruction, TaskType.FinishingSession, TaskType.EndStageNotification, - TaskType.PSEUDO_waitingForSdf, - TaskType.PSEUDO_waitingForObligationAdmission + TaskType.PSEUDO_waitSdfAfterPaymentInstructions, + TaskType.PSEUDO_waitAfterObligationAdmissionError ))) .end(TaskType.EndStageNotification); } @@ -183,16 +183,16 @@ public class FinalSessionStateMachineConfig .and() .withExternal() .source(TaskType.ObligationsAdmission) - .target(TaskType.PSEUDO_waitingForObligationAdmission) + .target(TaskType.PSEUDO_waitAfterObligationAdmissionError) .guard(oblAdmGuard) .and() .withExternal() - .source(TaskType.PSEUDO_waitingForObligationAdmission).target(TaskType.InclusionToPool) + .source(TaskType.PSEUDO_waitAfterObligationAdmissionError).target(TaskType.InclusionToPool) .action(chain(obligationAdmissionContinueAction, inclusionToPoolAction)) .event(SsnEvent.CONTINUE) .and() .withExternal() - .source(TaskType.PSEUDO_waitingForObligationAdmission).target(TaskType.ObligationsAdmission) + .source(TaskType.PSEUDO_waitAfterObligationAdmissionError).target(TaskType.ObligationsAdmission) .action(StateMachineUtil.chain(discardOblAdmStash, obligationAdmissionAction)) .event(SsnEvent.REPEAT) .and() @@ -221,11 +221,11 @@ public class FinalSessionStateMachineConfig //если создались paymentInstruction, переходим в режим ожидания .withExternal() .source(TaskType.FormingPaymentInstruction) - .target(TaskType.PSEUDO_waitingForSdf) + .target(TaskType.PSEUDO_waitSdfAfterPaymentInstructions) .guard(PaymentsWereCreatedGuard.instance) .and() .withExternal() - .source(TaskType.PSEUDO_waitingForSdf) + .source(TaskType.PSEUDO_waitSdfAfterPaymentInstructions) .target(TaskType.FinishingSession) .guard(new SdfGuard(SdfGuardExtractorAfterAssets.instance)) .action(finishingSessionAction) @@ -237,7 +237,7 @@ public class FinalSessionStateMachineConfig for (var event: EnumSet.of(SsnEvent.SDF_01, SsnEvent.SDF_57, SsnEvent.SDF_04)) { transitions .withInternal() - .source(TaskType.PSEUDO_waitingForSdf) + .source(TaskType.PSEUDO_waitSdfAfterPaymentInstructions) .event(event) .action(SdfReceivedAction.instance); } 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 59b14ed59..b12a48a8f 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 @@ -150,8 +150,8 @@ public class IntermediateMkrSessionStateMachineConfig TaskType.FormingPaymentInstruction, TaskType.FinishingSession, TaskType.EndStageNotification, - TaskType.PSEUDO_waitingForSdf, - TaskType.PSEUDO_waitingForObligationAdmission + TaskType.PSEUDO_waitSdfAfterPaymentInstructions, + TaskType.PSEUDO_waitAfterObligationAdmissionError ))) .end(TaskType.EndStageNotification); } @@ -179,16 +179,16 @@ public class IntermediateMkrSessionStateMachineConfig .and() .withExternal() .source(TaskType.ObligationsAdmission) - .target(TaskType.PSEUDO_waitingForObligationAdmission) + .target(TaskType.PSEUDO_waitAfterObligationAdmissionError) .guard(oblAdmGuard) .and() .withExternal() - .source(TaskType.PSEUDO_waitingForObligationAdmission).target(TaskType.InclusionToPool) + .source(TaskType.PSEUDO_waitAfterObligationAdmissionError).target(TaskType.InclusionToPool) .action(chain(obligationAdmissionContinueAction, inclusionToPoolAction)) .event(SsnEvent.CONTINUE) .and() .withExternal() - .source(TaskType.PSEUDO_waitingForObligationAdmission).target(TaskType.ObligationsAdmission) + .source(TaskType.PSEUDO_waitAfterObligationAdmissionError).target(TaskType.ObligationsAdmission) .action(StateMachineUtil.chain(discardOblAdmStash, obligationAdmissionAction)) .event(SsnEvent.REPEAT) .and() @@ -215,11 +215,11 @@ public class IntermediateMkrSessionStateMachineConfig //если создались paymentInstruction, переходим в режим ожидания .withExternal() .source(TaskType.FormingPaymentInstruction) - .target(TaskType.PSEUDO_waitingForSdf) + .target(TaskType.PSEUDO_waitSdfAfterPaymentInstructions) .guard(PaymentsWereCreatedGuard.instance) .and() .withExternal() - .source(TaskType.PSEUDO_waitingForSdf) + .source(TaskType.PSEUDO_waitSdfAfterPaymentInstructions) .target(TaskType.AgainRevise) .guard(new SdfGuard(SdfGuardExtractorAfterAssets.instance)) .action(againRevise) @@ -232,11 +232,11 @@ public class IntermediateMkrSessionStateMachineConfig .and() .withExternal() .source(TaskType.AgainRevise) - .target(TaskType.PSEUDO_waitingForSdfAfterAgainRevise) + .target(TaskType.PSEUDO_waitSdfAfterAgainRevise) .guard(invert(reviseSuccessGuard)) .and() .withExternal() - .source(TaskType.PSEUDO_waitingForSdfAfterAgainRevise) + .source(TaskType.PSEUDO_waitSdfAfterAgainRevise) .target(TaskType.AgainRevise) .guard(new SdfGuard(SdfGuardExtractorAfterAgainRevise.instance)) .action(againRevise) @@ -248,7 +248,7 @@ public class IntermediateMkrSessionStateMachineConfig for (var event: EnumSet.of(SsnEvent.SDF_01, SsnEvent.SDF_57, SsnEvent.SDF_04)) { transitions .withInternal() - .source(TaskType.PSEUDO_waitingForSdf) + .source(TaskType.PSEUDO_waitSdfAfterPaymentInstructions) .event(event) .action(SdfReceivedAction.instance); } diff --git a/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/session/stage/TaskType.java b/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/session/stage/TaskType.java index 1756cf1e0..d0bd81459 100644 --- a/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/session/stage/TaskType.java +++ b/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/session/stage/TaskType.java @@ -56,9 +56,9 @@ public enum TaskType implements IEnumKey { * Step 11 */ EndStageNotification("CL11"), - PSEUDO_waitingForSdf("PSEUDO_waitingForSdf"), - PSEUDO_waitingForSdfAfterAgainRevise("PSEUDO_waitingForSdfAfterAgainRevise"), - PSEUDO_waitingForObligationAdmission("PSEUDO_waitingForObligationAdmission"), + PSEUDO_waitSdfAfterPaymentInstructions("PSEUDO_waitSdfAfterPaymentInstructions"), + PSEUDO_waitSdfAfterAgainRevise("PSEUDO_waitSdfAfterAgainRevise"), + PSEUDO_waitAfterObligationAdmissionError("PSEUDO_waitAfterObligationAdmissionError"), ; private String key; diff --git a/clearing-parent/clearing-service/src/test/java/ru/spcex/clearing/session/teststate/config/TestStateMachineConfig.java b/clearing-parent/clearing-service/src/test/java/ru/spcex/clearing/session/teststate/config/TestStateMachineConfig.java index 8664a4282..ce9f02fdc 100644 --- a/clearing-parent/clearing-service/src/test/java/ru/spcex/clearing/session/teststate/config/TestStateMachineConfig.java +++ b/clearing-parent/clearing-service/src/test/java/ru/spcex/clearing/session/teststate/config/TestStateMachineConfig.java @@ -56,8 +56,8 @@ public class TestStateMachineConfig extends EnumStateMachineConfigurerAdapter true) .and() .withExternal() - .source(TaskType.PSEUDO_waitingForObligationAdmission).target(TaskType.InclusionToPool) + .source(TaskType.PSEUDO_waitAfterObligationAdmissionError).target(TaskType.InclusionToPool) .action(chain(ctx -> log.info("obligationAdmissionContinueAction"), ctx -> log.info("inclusionToPoolAction"))) .event(SsnEvent.CONTINUE) .and() .withExternal() - .source(TaskType.PSEUDO_waitingForObligationAdmission).target(TaskType.ObligationsAdmission) + .source(TaskType.PSEUDO_waitAfterObligationAdmissionError).target(TaskType.ObligationsAdmission) .action(chain(act("discardOblAdmStash"), act("obligationAdmissionAction"))) .event(SsnEvent.REPEAT) .and() @@ -123,11 +123,11 @@ public class TestStateMachineConfig extends EnumStateMachineConfigurerAdapter