From aa3c90977079fd28f974b02ff7c20e68fa486798 Mon Sep 17 00:00:00 2001
From: etreschenkov <ETreschenkov@mfd.ru>
Date: Wed, 9 Jul 2025 11:52:58 +0300
Subject: [PATCH] fix unit session

---
 .gitlab-ci.yml                                |  2 +-
 .../UnitedSessionStateMachineConfig.java      | 23 +++++++------------
 2 files changed, 9 insertions(+), 16 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index fa7a21635..4687ced73 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -17,7 +17,7 @@ preflight:
   stage: preflight
   script:
     - pwd
-    - git clone -b only_unit "http://gitlab-ci-token:$ACCESS_TOKEN@git.mfd.msk/mfd/clearing_test.git"
+    - git clone -b only_9.0_unit "http://gitlab-ci-token:$ACCESS_TOKEN@git.mfd.msk/mfd/clearing_test.git"
   artifacts:
     name: "$CI_COMMIT_REF_NAME"
     expire_in: 1 day
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 248cf7fca..e6b7bab93 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
@@ -40,7 +40,6 @@ import ru.spcex.clearing.session.state.guard.PaymentsWereCreatedGuard;
 import ru.spcex.clearing.session.state.guard.PaymentsWereNotCreatedGuard;
 import ru.spcex.clearing.session.state.guard.SdfGuard;
 import ru.spcex.clearing.session.state.guard.SdfGuardExtractorAfterAgainRevise;
-import ru.spcex.clearing.session.state.guard.SdfGuardExtractorAfterAssets;
 import ru.spcex.clearing.session.state.guard.SdfGuardUtil;
 import ru.spcex.clearing.session.state.guard.SdfUnitSetGuard;
 import ru.spcex.clearing.session.state.guard.StashedRegistriesPresentGuard;
@@ -189,12 +188,6 @@ public class UnitedSessionStateMachineConfig
                 .source(TaskType.InspectionObligations).target(TaskType.FormingPaymentInstruction)
                 .action(formingPaymentInstructionAssetsAction)
                 .and()
-            .withExternal()
-                .source(TaskType.PSEUDO_waitSdfAfterPaymentInstructions)
-                .target(TaskType.AgainRevise)
-                .guard(new SdfGuard(SdfGuardExtractorAfterAssets.instance))
-                .action(againRevise)
-                .and()
             .withExternal()
                 .source(TaskType.PSEUDO_waitSdfAfterAgainRevise)
                 .target(TaskType.AgainRevise)
@@ -237,16 +230,16 @@ public class UnitedSessionStateMachineConfig
         transitions
             //если не создалось paymentInstruction'ов
             .withExternal()
-            .source(TaskType.FormingPaymentInstruction)
-            .target(TaskType.AgainRevise)
-            .guard(PaymentsWereNotCreatedGuard.instance)
-            .action(againRevise)
-            .and()
+                .source(TaskType.FormingPaymentInstruction)
+                .target(TaskType.AgainRevise)
+                .guard(PaymentsWereNotCreatedGuard.instance)
+                .action(againRevise)
+                .and()
             //если создались paymentInstruction, переходим в режим ожидания
             .withExternal()
-            .source(TaskType.FormingPaymentInstruction)
-            .target(TaskType.PSEUDO_waitSdfAfterPaymentInstructions)
-            .guard(PaymentsWereCreatedGuard.instance);
+                .source(TaskType.FormingPaymentInstruction)
+                .target(TaskType.PSEUDO_waitSdfAfterPaymentInstructions)
+                .guard(PaymentsWereCreatedGuard.instance);
     }
 
     private void sourceAgainRevise(StateMachineTransitionConfigurer<TaskType, SsnEvent> transitions) throws Exception {