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 18:33:26 +03:00
parent fc77ea4247
commit 31de6ed6dc
8 changed files with 65 additions and 64 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/CurrencySessionStateMachineConfig.java
View file

@ -173,12 +173,13 @@ public class CurrencySessionStateMachineConfig extends EnumStateMachineConfigure
.action(reqAndOblAction)
.and()
.withExternal()
.source(TaskType.RequirementsAndObligationsCreate).target(TaskType.ObligationsAdmission)
.action(obligationAdmissionAction)
.source(TaskType.RequirementsAndObligationsCreate).target(TaskType.InclusionToPool)
.action(inclusionToPoolAction)
.and()
.withExternal()
.source(TaskType.InclusionToPool).target(TaskType.InspectionObligations)
.action(inspectionObligationsV2Action);
.source(TaskType.InclusionToPool)
.target(TaskType.ObligationsAdmission)
.action(obligationAdmissionAction);
sourceObligationAdmission(transitions);
sourcePseudoAfterOAPause(transitions);
@ -214,17 +215,17 @@ public class CurrencySessionStateMachineConfig extends EnumStateMachineConfigure
.action(pauseWsAction)
.and()
.withExternal()
.source(TaskType.ObligationsAdmission).target(TaskType.InclusionToPool)
.source(TaskType.ObligationsAdmission).target(TaskType.InspectionObligations)
.guard(invert(oblAdmGuard))
.action(chain(obligationAdmissionContinueAction, inclusionToPoolAction));
.action(chain(obligationAdmissionContinueAction, inspectionObligationsV2Action));
}
private void sourcePseudoAfterOAPause(StateMachineTransitionConfigurer<TaskType, SsnEvent> transitions) throws Exception {
transitions
//continue and repeat after ObligationAdmission
.withExternal()
.source(TaskType.PSEUDO_waitAfterObligationAdmissionError).target(TaskType.InclusionToPool)
.action(chain(activeWsAction, obligationAdmissionContinueAction, inclusionToPoolAction))
.source(TaskType.PSEUDO_waitAfterObligationAdmissionError).target(TaskType.InspectionObligations)
.action(chain(activeWsAction, obligationAdmissionContinueAction, inspectionObligationsV2Action))
.event(SsnEvent.CONTINUE);
for (var taskType : List.of(TaskType.PSEUDO_waitAfterObligationAdmissionError, TaskType.PSEUDO_waitAfterObligationAdmissionRestore)) {
transitions

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

@ -191,13 +191,13 @@ public class FinalSessionStateMachineConfig
.action(reqAndOblAction)
.and()
.withExternal()
.source(TaskType.RequirementsAndObligationsCreate).target(TaskType.ObligationsAdmission)
.action(obligationAdmissionAction)
.source(TaskType.RequirementsAndObligationsCreate).target(TaskType.InclusionToPool)
.action(inclusionToPoolAction)
.and()
.withExternal()
.source(TaskType.InclusionToPool).target(TaskType.InspectionObligationDepositReturn)
.source(TaskType.InclusionToPool).target(TaskType.ObligationsAdmission)
//нужно сменить статус ручками, т.к. псевдо состояние
.action(inspOblDepositReturnAction);
.action(obligationAdmissionAction);
sourceObligationAdmission(transitions);
sourcePseudoAfterOAPause(transitions);
@ -218,9 +218,9 @@ public class FinalSessionStateMachineConfig
.action(pauseWsAction)
.and()
.withExternal()
.source(TaskType.ObligationsAdmission).target(TaskType.InclusionToPool)
.source(TaskType.ObligationsAdmission).target(TaskType.InspectionObligationDepositReturn)
.guard(invert(oblAdmGuard))
.action(chain(obligationAdmissionContinueAction, inclusionToPoolAction));
.action(chain(obligationAdmissionContinueAction, inspOblDepositReturnAction));
}
private void sourceIODepositReturn(StateMachineTransitionConfigurer<TaskType, SsnEvent> transitions) throws Exception {
@ -296,8 +296,8 @@ public class FinalSessionStateMachineConfig
private void sourcePseudoAfterOAPause(StateMachineTransitionConfigurer<TaskType, SsnEvent> transitions) throws Exception {
transitions
.withExternal()
.source(TaskType.PSEUDO_waitAfterObligationAdmissionError).target(TaskType.InclusionToPool)
.action(chain(activeWsAction, obligationAdmissionContinueAction, inclusionToPoolAction))
.source(TaskType.PSEUDO_waitAfterObligationAdmissionError).target(TaskType.InspectionObligationDepositReturn)
.action(chain(activeWsAction, obligationAdmissionContinueAction, inspOblDepositReturnAction))
.event(SsnEvent.CONTINUE);
for (var taskType : List.of(TaskType.PSEUDO_waitAfterObligationAdmissionError, TaskType.PSEUDO_waitAfterObligationAdmissionRestore)) {
transitions

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

@ -180,12 +180,12 @@ public class IntermediateMkrSessionStateMachineConfig
.action(reqAndOblAction)
.and()
.withExternal()
.source(TaskType.RequirementsAndObligationsCreate).target(TaskType.ObligationsAdmission)
.action(obligationAdmissionAction)
.source(TaskType.RequirementsAndObligationsCreate).target(TaskType.InclusionToPool)
.action(inclusionToPoolAction)
.and()
.withExternal()
.source(TaskType.InclusionToPool).target(TaskType.InspectionObligations)
.action(inspectionObligationsV2Action);
.source(TaskType.InclusionToPool).target(TaskType.ObligationsAdmission)
.action(obligationAdmissionAction);
sourceObligationAdmission(transitions);
sourcePseudoAfterOAPause(transitions);
@ -213,17 +213,17 @@ public class IntermediateMkrSessionStateMachineConfig
.action(pauseWsAction)
.and()
.withExternal()
.source(TaskType.ObligationsAdmission).target(TaskType.InclusionToPool)
.source(TaskType.ObligationsAdmission).target(TaskType.InspectionObligations)
.guard(invert(oblAdmGuard))
.action(chain(obligationAdmissionContinueAction, inclusionToPoolAction));
.action(chain(obligationAdmissionContinueAction, inspectionObligationsV2Action));
}
private void sourcePseudoAfterOAPause(StateMachineTransitionConfigurer<TaskType, SsnEvent> transitions) throws Exception {
transitions
//continue and repeat after ObligationAdmission
.withExternal()
.source(TaskType.PSEUDO_waitAfterObligationAdmissionError).target(TaskType.InclusionToPool)
.action(chain(activeWsAction, obligationAdmissionContinueAction, inclusionToPoolAction))
.source(TaskType.PSEUDO_waitAfterObligationAdmissionError).target(TaskType.InspectionObligations)
.action(chain(activeWsAction, obligationAdmissionContinueAction, inspectionObligationsV2Action))
.event(SsnEvent.CONTINUE);
for (var taskType : List.of(TaskType.PSEUDO_waitAfterObligationAdmissionError, TaskType.PSEUDO_waitAfterObligationAdmissionRestore)) {
transitions

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

@ -182,12 +182,12 @@ public class PrimaryAuctionB0SessionStateMachineConfig
.action(reqAndOblAction)
.and()
.withExternal()
.source(TaskType.RequirementsAndObligationsCreate).target(TaskType.ObligationsAdmission)
.action(obligationAdmissionAction)
.source(TaskType.RequirementsAndObligationsCreate).target(TaskType.InclusionToPool)
.action(inclusionToPoolAction)
.and()
.withExternal()
.source(TaskType.InclusionToPool).target(TaskType.InspectionObligations)
.action(inspectionObligationsV2Action);
.source(TaskType.InclusionToPool).target(TaskType.ObligationsAdmission)
.action(obligationAdmissionAction);
sourceObligationAdmission(transitions);
sourcePseudoAfterOAPause(transitions);
sourcePseudoAfterIOPause(transitions);
@ -207,9 +207,9 @@ public class PrimaryAuctionB0SessionStateMachineConfig
.action(pauseWsAction)
.and()
.withExternal()
.source(TaskType.ObligationsAdmission).target(TaskType.InclusionToPool)
.source(TaskType.ObligationsAdmission).target(TaskType.InspectionObligations)
.guard(invert(oblAdmGuard))
.action(chain(obligationAdmissionContinueAction, inclusionToPoolAction));
.action(chain(obligationAdmissionContinueAction, inspectionObligationsV2Action));
}
private void sourceInspection(StateMachineTransitionConfigurer<TaskType, SsnEvent> transitions) throws Exception {
@ -232,8 +232,8 @@ public class PrimaryAuctionB0SessionStateMachineConfig
transitions
//continue and repeat after ObligationAdmission
.withExternal()
.source(TaskType.PSEUDO_waitAfterObligationAdmissionError).target(TaskType.InclusionToPool)
.action(chain(activeWsAction, obligationAdmissionContinueAction, inclusionToPoolAction))
.source(TaskType.PSEUDO_waitAfterObligationAdmissionError).target(TaskType.InspectionObligations)
.action(chain(activeWsAction, obligationAdmissionContinueAction, inspectionObligationsV2Action))
.event(SsnEvent.CONTINUE);
for (var taskType : List.of(TaskType.PSEUDO_waitAfterObligationAdmissionError, TaskType.PSEUDO_waitAfterObligationAdmissionRestore)) {
transitions

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

@ -176,12 +176,12 @@ public class PrimaryAuctionBnSessionStateMachineConfig
.action(reqAndOblAction)
.and()
.withExternal()
.source(TaskType.RequirementsAndObligationsCreate).target(TaskType.ObligationsAdmission)
.action(obligationAdmissionAction)
.source(TaskType.RequirementsAndObligationsCreate).target(TaskType.InclusionToPool)
.action(inclusionToPoolAction)
.and()
.withExternal()
.source(TaskType.InclusionToPool).target(TaskType.InspectionObligations)
.action(inspectionObligationsV2Action);
.source(TaskType.InclusionToPool).target(TaskType.ObligationsAdmission)
.action(obligationAdmissionAction);
sourceObligationAdmission(transitions);
sourcePseudoAfterOAPause(transitions);
@ -200,9 +200,9 @@ public class PrimaryAuctionBnSessionStateMachineConfig
.action(pauseWsAction)
.and()
.withExternal()
.source(TaskType.ObligationsAdmission).target(TaskType.InclusionToPool)
.source(TaskType.ObligationsAdmission).target(TaskType.InspectionObligations)
.guard(invert(oblAdmGuard))
.action(chain(obligationAdmissionContinueAction, inclusionToPoolAction));
.action(chain(obligationAdmissionContinueAction, inspectionObligationsV2Action));
}
private void sourceInspection(StateMachineTransitionConfigurer<TaskType, SsnEvent> transitions) throws Exception {
@ -224,8 +224,8 @@ public class PrimaryAuctionBnSessionStateMachineConfig
transitions
//continue and repeat after ObligationAdmission
.withExternal()
.source(TaskType.PSEUDO_waitAfterObligationAdmissionError).target(TaskType.InclusionToPool)
.action(chain(activeWsAction, obligationAdmissionContinueAction, inclusionToPoolAction))
.source(TaskType.PSEUDO_waitAfterObligationAdmissionError).target(TaskType.InspectionObligations)
.action(chain(activeWsAction, obligationAdmissionContinueAction, inspectionObligationsV2Action))
.event(SsnEvent.CONTINUE);
for (var taskType : List.of(TaskType.PSEUDO_waitAfterObligationAdmissionError, TaskType.PSEUDO_waitAfterObligationAdmissionRestore)) {
transitions

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

@ -183,12 +183,12 @@ public class PrimaryAuctionT0SessionStateMachineConfig
.action(reqAndOblAction)
.and()
.withExternal()
.source(TaskType.RequirementsAndObligationsCreate).target(TaskType.ObligationsAdmission)
.action(obligationAdmissionAction)
.source(TaskType.RequirementsAndObligationsCreate).target(TaskType.InclusionToPool)
.action(inclusionToPoolAction)
.and()
.withExternal()
.source(TaskType.InclusionToPool).target(TaskType.InspectionObligations)
.action(inspectionObligationsV2Action);
.source(TaskType.InclusionToPool).target(TaskType.ObligationsAdmission)
.action(obligationAdmissionAction);
sourceObligationAdmission(transitions);
sourcePseudoAfterOAPause(transitions);
@ -209,9 +209,9 @@ public class PrimaryAuctionT0SessionStateMachineConfig
.action(pauseWsAction)
.and()
.withExternal()
.source(TaskType.ObligationsAdmission).target(TaskType.InclusionToPool)
.source(TaskType.ObligationsAdmission).target(TaskType.InspectionObligations)
.guard(invert(oblAdmGuard))
.action(chain(obligationAdmissionContinueAction, inclusionToPoolAction));
.action(chain(obligationAdmissionContinueAction, inspectionObligationsV2Action));
}
private void sourceInspection(StateMachineTransitionConfigurer<TaskType, SsnEvent> transitions) throws Exception {
@ -233,8 +233,8 @@ public class PrimaryAuctionT0SessionStateMachineConfig
transitions
//continue and repeat after ObligationAdmission
.withExternal()
.source(TaskType.PSEUDO_waitAfterObligationAdmissionError).target(TaskType.InclusionToPool)
.action(chain(activeWsAction, obligationAdmissionContinueAction, inclusionToPoolAction))
.source(TaskType.PSEUDO_waitAfterObligationAdmissionError).target(TaskType.InspectionObligations)
.action(chain(activeWsAction, obligationAdmissionContinueAction, inspectionObligationsV2Action))
.event(SsnEvent.CONTINUE);
for (var taskType : List.of(TaskType.PSEUDO_waitAfterObligationAdmissionError, TaskType.PSEUDO_waitAfterObligationAdmissionRestore)) {
transitions

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

@ -183,12 +183,12 @@ public class SecondaryAuctionT0SessionStateMachineConfig
.action(reqAndOblAction)
.and()
.withExternal()
.source(TaskType.RequirementsAndObligationsCreate).target(TaskType.ObligationsAdmission)
.action(obligationAdmissionAction)
.source(TaskType.RequirementsAndObligationsCreate).target(TaskType.InclusionToPool)
.action(inclusionToPoolAction)
.and()
.withExternal()
.source(TaskType.InclusionToPool).target(TaskType.InspectionObligations)
.action(inspectionObligationsV2Action);
.source(TaskType.InclusionToPool).target(TaskType.ObligationsAdmission)
.action(obligationAdmissionAction);
sourceObligationAdmission(transitions);
sourcePseudoAfterOAPause(transitions);
@ -209,9 +209,9 @@ public class SecondaryAuctionT0SessionStateMachineConfig
.action(pauseWsAction)
.and()
.withExternal()
.source(TaskType.ObligationsAdmission).target(TaskType.InclusionToPool)
.source(TaskType.ObligationsAdmission).target(TaskType.InspectionObligations)
.guard(invert(oblAdmGuard))
.action(chain(obligationAdmissionContinueAction, inclusionToPoolAction));
.action(chain(obligationAdmissionContinueAction, inspectionObligationsV2Action));
}
private void sourceInspection(StateMachineTransitionConfigurer<TaskType, SsnEvent> transitions) throws Exception {
@ -233,8 +233,8 @@ public class SecondaryAuctionT0SessionStateMachineConfig
transitions
//continue and repeat after ObligationAdmission
.withExternal()
.source(TaskType.PSEUDO_waitAfterObligationAdmissionError).target(TaskType.InclusionToPool)
.action(chain(activeWsAction, obligationAdmissionContinueAction, inclusionToPoolAction))
.source(TaskType.PSEUDO_waitAfterObligationAdmissionError).target(TaskType.InspectionObligations)
.action(chain(activeWsAction, obligationAdmissionContinueAction, inspectionObligationsV2Action))
.event(SsnEvent.CONTINUE);
for (var taskType : List.of(TaskType.PSEUDO_waitAfterObligationAdmissionError, TaskType.PSEUDO_waitAfterObligationAdmissionRestore)) {
transitions.withExternal()

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

@ -198,12 +198,12 @@ public class UnitedSessionStateMachineConfig
.action(reqAndOblAction)
.and()
.withExternal()
.source(TaskType.RequirementsAndObligationsCreate).target(TaskType.ObligationsAdmission)
.action(obligationAdmissionAction)
.source(TaskType.RequirementsAndObligationsCreate).target(TaskType.InclusionToPool)
.action(inclusionToPoolAction)
.and()
.withExternal()
.source(TaskType.InclusionToPool).target(TaskType.InspectionObligations)
.action(inspectionObligationsV2Action);
.source(TaskType.InclusionToPool).target(TaskType.ObligationsAdmission)
.action(obligationAdmissionAction);
sourceObligationAdmission(transitions);
sourcePseudoAfterOAPause(transitions);
sourcePseudoAfterIOPause(transitions);
@ -240,9 +240,9 @@ public class UnitedSessionStateMachineConfig
.action(pauseWsAction)
.and()
.withExternal()
.source(TaskType.ObligationsAdmission).target(TaskType.InclusionToPool)
.source(TaskType.ObligationsAdmission).target(TaskType.InspectionObligations)
.guard(invert(oblAdmGuard))
.action(chain(obligationAdmissionContinueAction, inclusionToPoolAction));
.action(chain(obligationAdmissionContinueAction, inspectionObligationsV2Action));
}
private void sourceInspection(StateMachineTransitionConfigurer<TaskType, SsnEvent> transitions) throws Exception {
@ -264,8 +264,8 @@ public class UnitedSessionStateMachineConfig
transitions
//continue and repeat after ObligationAdmission
.withExternal()
.source(TaskType.PSEUDO_waitAfterObligationAdmissionError).target(TaskType.InclusionToPool)
.action(chain(activeWsAction, obligationAdmissionContinueAction, inclusionToPoolAction))
.source(TaskType.PSEUDO_waitAfterObligationAdmissionError).target(TaskType.InspectionObligations)
.action(chain(activeWsAction, obligationAdmissionContinueAction, inspectionObligationsV2Action))
.event(SsnEvent.CONTINUE);
for (var taskType : List.of(TaskType.PSEUDO_waitAfterObligationAdmissionError, TaskType.PSEUDO_waitAfterObligationAdmissionRestore)) {
transitions