treshenkov/clearing
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix unit session

Browse source
This commit is contained in:
etreschenkov 2025-07-09 11:52:58 +03:00
parent 7acb56ec45
commit aa3c909770
2 changed files with 9 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.gitlab-ci.yml
View file

@ -17,7 +17,7 @@ preflight:
stage: preflight stage: preflight
script: script:
- pwd - 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: artifacts:
name: "$CI_COMMIT_REF_NAME" name: "$CI_COMMIT_REF_NAME"
expire_in: 1 day expire_in: 1 day

23
clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/config/state_machine_2/specific/UnitedSessionStateMachineConfig.java
View file

@ -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.PaymentsWereNotCreatedGuard;
import ru.spcex.clearing.session.state.guard.SdfGuard; import ru.spcex.clearing.session.state.guard.SdfGuard;
import ru.spcex.clearing.session.state.guard.SdfGuardExtractorAfterAgainRevise; 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.SdfGuardUtil;
import ru.spcex.clearing.session.state.guard.SdfUnitSetGuard; import ru.spcex.clearing.session.state.guard.SdfUnitSetGuard;
import ru.spcex.clearing.session.state.guard.StashedRegistriesPresentGuard; import ru.spcex.clearing.session.state.guard.StashedRegistriesPresentGuard;
@ -189,12 +188,6 @@ public class UnitedSessionStateMachineConfig
.source(TaskType.InspectionObligations).target(TaskType.FormingPaymentInstruction) .source(TaskType.InspectionObligations).target(TaskType.FormingPaymentInstruction)
.action(formingPaymentInstructionAssetsAction) .action(formingPaymentInstructionAssetsAction)
.and() .and()
.withExternal()
.source(TaskType.PSEUDO_waitSdfAfterPaymentInstructions)
.target(TaskType.AgainRevise)
.guard(new SdfGuard(SdfGuardExtractorAfterAssets.instance))
.action(againRevise)
.and()
.withExternal() .withExternal()
.source(TaskType.PSEUDO_waitSdfAfterAgainRevise) .source(TaskType.PSEUDO_waitSdfAfterAgainRevise)
.target(TaskType.AgainRevise) .target(TaskType.AgainRevise)
@ -237,16 +230,16 @@ public class UnitedSessionStateMachineConfig
transitions transitions
//если не создалось paymentInstruction'ов //если не создалось paymentInstruction'ов
.withExternal() .withExternal()
.source(TaskType.FormingPaymentInstruction) .source(TaskType.FormingPaymentInstruction)
.target(TaskType.AgainRevise) .target(TaskType.AgainRevise)
.guard(PaymentsWereNotCreatedGuard.instance) .guard(PaymentsWereNotCreatedGuard.instance)
.action(againRevise) .action(againRevise)
.and() .and()
//если создались paymentInstruction, переходим в режим ожидания //если создались paymentInstruction, переходим в режим ожидания
.withExternal() .withExternal()
.source(TaskType.FormingPaymentInstruction) .source(TaskType.FormingPaymentInstruction)
.target(TaskType.PSEUDO_waitSdfAfterPaymentInstructions) .target(TaskType.PSEUDO_waitSdfAfterPaymentInstructions)
.guard(PaymentsWereCreatedGuard.instance); .guard(PaymentsWereCreatedGuard.instance);
} }
private void sourceAgainRevise(StateMachineTransitionConfigurer<TaskType, SsnEvent> transitions) throws Exception { private void sourceAgainRevise(StateMachineTransitionConfigurer<TaskType, SsnEvent> transitions) throws Exception {