CurrencySessionStateMachineConfig refactor

clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/config/state_machine_2/specific/CurrencySessionStateMachineConfig.java

@@ -42,7 +42,6 @@ import ru.spcex.clearing.session.state.guard.SdfGuardExtractorAfterAgainRevise;
 import ru.spcex.clearing.session.state.guard.SdfGuardExtractorAfterAssets;
 import ru.spcex.clearing.session.state.guard.StashedRegistriesPresentGuard;
 import ru.spcex.clearing.session.state.listener.MachineMonitoringListener;
-import ru.spcex.clearing.util.StateMachineUtil;
 import static ru.spcex.clearing.util.StateMachineUtil.*;
 import ru.spcex.platform.classes.base.interfaces.ExecutionType;
 import ru.spcex.platform.enumeration.Section;
@@ -168,26 +167,6 @@ public class CurrencySessionStateMachineConfig extends EnumStateMachineConfigure
                 .action(obligationAdmissionAction)
                 .and()
             .withExternal()
-            .source(TaskType.ObligationsAdmission)
-            .target(TaskType.PSEUDO_waitAfterObligationAdmissionError)
-            .guard(oblAdmGuard)
-            .and()
-            .withExternal()
-            .source(TaskType.PSEUDO_waitAfterObligationAdmissionError).target(TaskType.InclusionToPool)
-            .action(chain(obligationAdmissionContinueAction, inclusionToPoolAction))
-            .event(SsnEvent.CONTINUE)
-            .and()
-            .withExternal()
-            .source(TaskType.PSEUDO_waitAfterObligationAdmissionError).target(TaskType.ObligationsAdmission)
-            .action(StateMachineUtil.chain(discardOblAdmStash, obligationAdmissionAction))
-            .event(SsnEvent.REPEAT)
-            .and()
-            .withExternal()
-            .source(TaskType.ObligationsAdmission).target(TaskType.InclusionToPool)
-            .guard(invert(oblAdmGuard))
-            .action(chain(obligationAdmissionContinueAction, inclusionToPoolAction))
-            .and()
-            .withExternal()
                 .source(TaskType.InclusionToPool).target(TaskType.InspectionObligations)
                 .action(inspectionObligationsV2Action)
                 .and()
@@ -195,19 +174,6 @@ public class CurrencySessionStateMachineConfig extends EnumStateMachineConfigure
                 .source(TaskType.InspectionObligations).target(TaskType.FormingPaymentInstruction)
                 .action(formingPaymentInstructionAssetsAction)
                 .and()
-            //если не создалось paymentInstruction'ов
-            .withExternal()
-            .source(TaskType.FormingPaymentInstruction)
-            .target(TaskType.AgainRevise)
-            .guard(PaymentsWereNotCreatedGuard.instance)
-            .action(againRevise)
-            .and()
-            //если создались paymentInstruction, переходим в режим ожидания
-            .withExternal()
-            .source(TaskType.FormingPaymentInstruction)
-            .target(TaskType.PSEUDO_waitSdfAfterPaymentInstructions)
-            .guard(PaymentsWereCreatedGuard.instance)
-            .and()
             .withExternal()
                 .source(TaskType.PSEUDO_waitSdfAfterPaymentInstructions)
                 .target(TaskType.AgainRevise)
@@ -215,17 +181,6 @@ public class CurrencySessionStateMachineConfig extends EnumStateMachineConfigure
                 .action(againRevise)
                 .and()
             .withExternal()
-            .source(TaskType.AgainRevise)
-            .target(TaskType.FinishingSession)
-            .action(finishingSessionAction)
-            .guard(reviseSuccessGuard)
-            .and()
-            .withExternal()
-            .source(TaskType.AgainRevise)
-            .target(TaskType.PSEUDO_waitSdfAfterAgainRevise)
-            .guard(invert(reviseSuccessGuard))
-            .and()
-            .withExternal()
                 .source(TaskType.PSEUDO_waitSdfAfterAgainRevise)
                 .target(TaskType.AgainRevise)
                 .guard(new SdfGuard(SdfGuardExtractorAfterAgainRevise.instance))
@@ -235,6 +190,66 @@ public class CurrencySessionStateMachineConfig extends EnumStateMachineConfigure
                 .source(TaskType.FinishingSession)
                 .target(TaskType.EndStageNotification)
                 .action(endStageNotificationAction);
+        sourceObligationAdmission(transitions);
+        sourcePseudoAfterOAError(transitions);
+        sourceFormingPaymentInstruction(transitions);
+        sourceAgainRevise(transitions);
+    }
+
+    private void sourceObligationAdmission(StateMachineTransitionConfigurer<TaskType, SsnEvent> transitions) throws Exception {
+        transitions
+            .withExternal()
+                .source(TaskType.ObligationsAdmission)
+                .target(TaskType.PSEUDO_waitAfterObligationAdmissionError)
+                .guard(oblAdmGuard)
+                .and()
+            .withExternal()
+                .source(TaskType.ObligationsAdmission).target(TaskType.InclusionToPool)
+                .guard(invert(oblAdmGuard))
+                .action(chain(obligationAdmissionContinueAction, inclusionToPoolAction));
+    }
+
+    private void sourcePseudoAfterOAError(StateMachineTransitionConfigurer<TaskType, SsnEvent> transitions) throws Exception {
+        transitions
+            .withExternal()
+                .source(TaskType.PSEUDO_waitAfterObligationAdmissionError).target(TaskType.InclusionToPool)
+                .action(chain(obligationAdmissionContinueAction, inclusionToPoolAction))
+                .event(SsnEvent.CONTINUE)
+                .and()
+            .withExternal()
+                .source(TaskType.PSEUDO_waitAfterObligationAdmissionError).target(TaskType.ObligationsAdmission)
+                .action(chain(discardOblAdmStash, obligationAdmissionAction))
+                .event(SsnEvent.REPEAT);
+    }
+
+    private void sourceFormingPaymentInstruction(StateMachineTransitionConfigurer<TaskType, SsnEvent> transitions) throws Exception {
+        transitions
+            //если не создалось paymentInstruction'ов
+            .withExternal()
+                .source(TaskType.FormingPaymentInstruction)
+                .target(TaskType.AgainRevise)
+                .guard(PaymentsWereNotCreatedGuard.instance)
+                .action(againRevise)
+                .and()
+            //если создались paymentInstruction, переходим в режим ожидания
+            .withExternal()
+                .source(TaskType.FormingPaymentInstruction)
+                .target(TaskType.PSEUDO_waitSdfAfterPaymentInstructions)
+                .guard(PaymentsWereCreatedGuard.instance);
+    }
+
+    private void sourceAgainRevise(StateMachineTransitionConfigurer<TaskType, SsnEvent> transitions) throws Exception {
+        transitions
+            .withExternal()
+                .source(TaskType.AgainRevise)
+                .target(TaskType.FinishingSession)
+                .action(finishingSessionAction)
+                .guard(reviseSuccessGuard)
+                .and()
+            .withExternal()
+                .source(TaskType.AgainRevise)
+                .target(TaskType.PSEUDO_waitSdfAfterAgainRevise)
+                .guard(invert(reviseSuccessGuard));
     }
 
     @Override