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 a6a4c9c55..62e0e9ef4 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 @@ -249,7 +249,7 @@ public class IntermediateMkrSessionStateMachineConfig .guard(new SdfSetGuard(sdfs)) .action(againRevise); - for (var event : EnumSet.of(SsnEvent.SDF_01, SsnEvent.SDF_57, SsnEvent.SDF_04)) { + for (var event : sdfs) { transitions .withInternal() .source(TaskType.PSEUDO_waitSdfAfterPaymentInstructions) diff --git a/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/config/state_machine_2/specific/ReturnDepositSessionStateMachineConfig.java b/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/config/state_machine_2/specific/ReturnDepositSessionStateMachineConfig.java index 401d10357..fca3e4ada 100644 --- a/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/config/state_machine_2/specific/ReturnDepositSessionStateMachineConfig.java +++ b/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/config/state_machine_2/specific/ReturnDepositSessionStateMachineConfig.java @@ -164,7 +164,7 @@ public class ReturnDepositSessionStateMachineConfig .target(TaskType.FinishingSession) .guard(new SdfSetGuard(sdfs)) .action(finishingSessionAction); - for (var event: EnumSet.of(SsnEvent.SDF_01, SsnEvent.SDF_57, SsnEvent.SDF_04)) { + for (var event: sdfs) { transitions .withInternal() .source(TaskType.PSEUDO_waitSdfAfterPaymentInstructions) diff --git a/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/session/state/guard/SdfUnitSetGuard.java b/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/session/state/guard/SdfUnitSetGuard.java index b92420c60..6337e8100 100644 --- a/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/session/state/guard/SdfUnitSetGuard.java +++ b/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/session/state/guard/SdfUnitSetGuard.java @@ -40,7 +40,7 @@ public class SdfUnitSetGuard implements Guard { .stream() .allMatch(was::apply); } else { - everySdfConditionMet = Stream.of(SsnEvent.SDF_04, SsnEvent.SDF_01, SsnEvent.SDF_57) + everySdfConditionMet = Stream.of(SsnEvent.SDF_04, SsnEvent.SDF_57) .allMatch(was::apply); } if (everySdfConditionMet) {