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

http://jira.mfd.msk:8088/browse/CLS-894 ObligationAdmission <-> InclusionToPool

Browse source
This commit is contained in:
ialbert 2025-08-07 13:00:41 +03:00
parent 9bf50ba57c
commit a1680e9fd5
1 changed files with 9 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -158,12 +158,13 @@ public class PaymSessionStateMachineConfig extends EnumStateMachineConfigurerAda
.action(reqAndOblAction) .action(reqAndOblAction)
.and() .and()
.withExternal() .withExternal()
.source(TaskType.RequirementsAndObligationsCreate).target(TaskType.ObligationsAdmission) .source(TaskType.RequirementsAndObligationsCreate).target(TaskType.InclusionToPool)
.action(obligationAdmissionAction) .action(inclusionToPoolAction)
.and() .and()
.withExternal() .withExternal()
.source(TaskType.InclusionToPool).target(TaskType.InspectionObligations) .source(TaskType.InclusionToPool)
.action(inspectionObligationsV2Action) .target(TaskType.ObligationsAdmission)
.action(obligationAdmissionAction)
.and() .and()
.withExternal() .withExternal()
.source(TaskType.FormingPaymentInstruction) .source(TaskType.FormingPaymentInstruction)
@ -191,9 +192,9 @@ public class PaymSessionStateMachineConfig extends EnumStateMachineConfigurerAda
.action(pauseWsAction) .action(pauseWsAction)
.and() .and()
.withExternal() .withExternal()
.source(TaskType.ObligationsAdmission).target(TaskType.InclusionToPool) .source(TaskType.ObligationsAdmission).target(TaskType.InspectionObligations)
.guard(invert(oblAdmGuard)) .guard(invert(oblAdmGuard))
.action(chain(obligationAdmissionContinueAction, inclusionToPoolAction)); .action(chain(obligationAdmissionContinueAction, inspectionObligationsV2Action));
} }
private void sourceInspection(StateMachineTransitionConfigurer<TaskType, SsnEvent> transitions) throws Exception { private void sourceInspection(StateMachineTransitionConfigurer<TaskType, SsnEvent> transitions) throws Exception {
@ -215,8 +216,8 @@ public class PaymSessionStateMachineConfig extends EnumStateMachineConfigurerAda
transitions transitions
//continue and repeat after ObligationAdmission //continue and repeat after ObligationAdmission
.withExternal() .withExternal()
.source(TaskType.PSEUDO_waitAfterObligationAdmissionError).target(TaskType.InclusionToPool) .source(TaskType.PSEUDO_waitAfterObligationAdmissionError).target(TaskType.InspectionObligations)
.action(chain(activeWsAction, obligationAdmissionContinueAction, inclusionToPoolAction)) .action(chain(activeWsAction, obligationAdmissionContinueAction, inspectionObligationsV2Action))
.event(SsnEvent.CONTINUE); .event(SsnEvent.CONTINUE);
for (var taskType : List.of(TaskType.PSEUDO_waitAfterObligationAdmissionError, TaskType.PSEUDO_waitAfterObligationAdmissionRestore)) { for (var taskType : List.of(TaskType.PSEUDO_waitAfterObligationAdmissionError, TaskType.PSEUDO_waitAfterObligationAdmissionRestore)) {
transitions transitions