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

pause after step 5

Browse source
This commit is contained in:
etreschenkov 2025-07-14 13:39:25 +03:00
parent 3eff12f684
commit 60d84bc281
10 changed files with 69 additions and 85 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

@ -126,7 +126,6 @@ public class CurrencySessionStateMachineConfig extends EnumStateMachineConfigure
dealsPrepareAction.addExecutionCurrencyCondition(execFondPb.regex("settlementCode", "^T0.*$")); dealsPrepareAction.addExecutionCurrencyCondition(execFondPb.regex("settlementCode", "^T0.*$"));
dealsPrepareAction.addExecutionCurrencyCondition(execFondPb.in("market", marketCodes.get().toArray(new String[0]))); dealsPrepareAction.addExecutionCurrencyCondition(execFondPb.in("market", marketCodes.get().toArray(new String[0])));
this.obligationAdmissionContinueAction.setDataEnum(DataEnum.obligationAdmissionStashedRgs); this.obligationAdmissionContinueAction.setDataEnum(DataEnum.obligationAdmissionStashedRgs);
this.saveRegistriesAfterInspectionAndContinueAction.setDataEnum(DataEnum.inspectionObligationStashedRgs);
} }
@Override @Override
@ -178,10 +177,6 @@ public class CurrencySessionStateMachineConfig extends EnumStateMachineConfigure
.source(TaskType.InclusionToPool).target(TaskType.InspectionObligations) .source(TaskType.InclusionToPool).target(TaskType.InspectionObligations)
.action(inspectionObligationsV2Action) .action(inspectionObligationsV2Action)
.and() .and()
.withExternal()
.source(TaskType.InspectionObligations).target(TaskType.FormingPaymentInstruction)
.action(formingPaymentInstructionAssetsAction)
.and()
.withExternal() .withExternal()
.source(TaskType.PSEUDO_waitSdfAfterAgainRevise) .source(TaskType.PSEUDO_waitSdfAfterAgainRevise)
.target(TaskType.AgainRevise) .target(TaskType.AgainRevise)
@ -189,7 +184,8 @@ public class CurrencySessionStateMachineConfig extends EnumStateMachineConfigure
.action(againRevise); .action(againRevise);
sourceObligationAdmission(transitions); sourceObligationAdmission(transitions);
sourcePseudoWaitAfterError(transitions); sourcePseudoAfterOAError(transitions);
sourcePseudoAfterIOError(transitions);
sourceFormingPaymentInstruction(transitions); sourceFormingPaymentInstruction(transitions);
sourcePseudoWaitSdfAfterPaymentInstructions(transitions); sourcePseudoWaitSdfAfterPaymentInstructions(transitions);
sourceAgainRevise(transitions); sourceAgainRevise(transitions);
@ -225,7 +221,7 @@ public class CurrencySessionStateMachineConfig extends EnumStateMachineConfigure
.action(chain(obligationAdmissionContinueAction, inclusionToPoolAction)); .action(chain(obligationAdmissionContinueAction, inclusionToPoolAction));
} }
private void sourcePseudoWaitAfterError(StateMachineTransitionConfigurer<TaskType, SsnEvent> transitions) throws Exception { private void sourcePseudoAfterOAError(StateMachineTransitionConfigurer<TaskType, SsnEvent> transitions) throws Exception {
transitions transitions
//continue and repeat after ObligationAdmission //continue and repeat after ObligationAdmission
.withExternal() .withExternal()
@ -236,8 +232,11 @@ public class CurrencySessionStateMachineConfig extends EnumStateMachineConfigure
.withExternal() .withExternal()
.source(TaskType.PSEUDO_waitAfterObligationAdmissionError).target(TaskType.ObligationsAdmission) .source(TaskType.PSEUDO_waitAfterObligationAdmissionError).target(TaskType.ObligationsAdmission)
.action(chain(activeWsAction, discardOblAdmStash, obligationAdmissionAction)) .action(chain(activeWsAction, discardOblAdmStash, obligationAdmissionAction))
.event(SsnEvent.REPEAT) .event(SsnEvent.REPEAT);
.and() }
private void sourcePseudoAfterIOError(StateMachineTransitionConfigurer<TaskType, SsnEvent> transitions) throws Exception {
transitions
//continue and repeat after InspectionObligations //continue and repeat after InspectionObligations
.withExternal() .withExternal()
.source(TaskType.PSEUDO_waitAfterInspectionError).target(TaskType.FormingPaymentInstruction) .source(TaskType.PSEUDO_waitAfterInspectionError).target(TaskType.FormingPaymentInstruction)

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

@ -137,7 +137,6 @@ public class IntermediateMkrSessionStateMachineConfig
) )
); );
this.obligationAdmissionContinueAction.setDataEnum(DataEnum.obligationAdmissionStashedRgs); this.obligationAdmissionContinueAction.setDataEnum(DataEnum.obligationAdmissionStashedRgs);
this.saveRegistriesAfterInspectionAndContinueAction.setDataEnum(DataEnum.inspectionObligationStashedRgs);
} }
@Override @Override
@ -191,10 +190,6 @@ public class IntermediateMkrSessionStateMachineConfig
.source(TaskType.InclusionToPool).target(TaskType.InspectionObligations) .source(TaskType.InclusionToPool).target(TaskType.InspectionObligations)
.action(inspectionObligationsV2Action) .action(inspectionObligationsV2Action)
.and() .and()
.withExternal()
.source(TaskType.InspectionObligations).target(TaskType.FormingPaymentInstruction)
.action(formingPaymentInstructionAssetsAction)
.and()
.withExternal() .withExternal()
.source(TaskType.PSEUDO_waitSdfAfterAgainRevise) .source(TaskType.PSEUDO_waitSdfAfterAgainRevise)
.target(TaskType.AgainRevise) .target(TaskType.AgainRevise)
@ -202,7 +197,8 @@ public class IntermediateMkrSessionStateMachineConfig
.action(againRevise); .action(againRevise);
sourceObligationAdmission(transitions); sourceObligationAdmission(transitions);
sourcePseudoWaitAfterError(transitions); sourcePseudoAfterOAError(transitions);
sourcePseudoAfterIOError(transitions);
sourceFormingPaymentInstructions(transitions); sourceFormingPaymentInstructions(transitions);
sourcePseudoWaitSdfAfterPaymentInstructions(transitions); sourcePseudoWaitSdfAfterPaymentInstructions(transitions);
sourceAgainRevise(transitions); sourceAgainRevise(transitions);
@ -238,7 +234,7 @@ public class IntermediateMkrSessionStateMachineConfig
.action(chain(obligationAdmissionContinueAction, inclusionToPoolAction)); .action(chain(obligationAdmissionContinueAction, inclusionToPoolAction));
} }
private void sourcePseudoWaitAfterError(StateMachineTransitionConfigurer<TaskType, SsnEvent> transitions) throws Exception { private void sourcePseudoAfterOAError(StateMachineTransitionConfigurer<TaskType, SsnEvent> transitions) throws Exception {
transitions transitions
//continue and repeat after ObligationAdmission //continue and repeat after ObligationAdmission
.withExternal() .withExternal()
@ -249,8 +245,11 @@ public class IntermediateMkrSessionStateMachineConfig
.withExternal() .withExternal()
.source(TaskType.PSEUDO_waitAfterObligationAdmissionError).target(TaskType.ObligationsAdmission) .source(TaskType.PSEUDO_waitAfterObligationAdmissionError).target(TaskType.ObligationsAdmission)
.action(chain(activeWsAction, discardOblAdmStash, obligationAdmissionAction)) .action(chain(activeWsAction, discardOblAdmStash, obligationAdmissionAction))
.event(SsnEvent.REPEAT) .event(SsnEvent.REPEAT);
.and() }
private void sourcePseudoAfterIOError(StateMachineTransitionConfigurer<TaskType, SsnEvent> transitions) throws Exception {
transitions
//continue and repeat after InspectionObligations //continue and repeat after InspectionObligations
.withExternal() .withExternal()
.source(TaskType.PSEUDO_waitAfterInspectionError).target(TaskType.FormingPaymentInstruction) .source(TaskType.PSEUDO_waitAfterInspectionError).target(TaskType.FormingPaymentInstruction)

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

@ -113,7 +113,6 @@ public class PaymSessionStateMachineConfig extends EnumStateMachineConfigurerAda
dealsPrepareAction.addExecutionCurrencyCondition(execFondPb.in("market", marketCodes.get().toArray(new String[0]))); dealsPrepareAction.addExecutionCurrencyCondition(execFondPb.in("market", marketCodes.get().toArray(new String[0])));
this.obligationAdmissionContinueAction.setDataEnum(DataEnum.obligationAdmissionStashedRgs); this.obligationAdmissionContinueAction.setDataEnum(DataEnum.obligationAdmissionStashedRgs);
this.formingPaymentInstructionAssetsAction.setDisableCompanyCondition(true); this.formingPaymentInstructionAssetsAction.setDisableCompanyCondition(true);
this.saveRegistriesAfterInspectionAndContinueAction.setDataEnum(DataEnum.inspectionObligationStashedRgs);
} }
@Override @Override
@ -160,10 +159,6 @@ public class PaymSessionStateMachineConfig extends EnumStateMachineConfigurerAda
.source(TaskType.InclusionToPool).target(TaskType.InspectionObligations) .source(TaskType.InclusionToPool).target(TaskType.InspectionObligations)
.action(inspectionObligationsV2Action) .action(inspectionObligationsV2Action)
.and() .and()
.withExternal()
.source(TaskType.InspectionObligations).target(TaskType.FormingPaymentInstruction)
.action(formingPaymentInstructionAssetsAction)
.and()
.withExternal() .withExternal()
.source(TaskType.FormingPaymentInstruction) .source(TaskType.FormingPaymentInstruction)
.target(TaskType.AgainRevise) .target(TaskType.AgainRevise)
@ -176,7 +171,8 @@ public class PaymSessionStateMachineConfig extends EnumStateMachineConfigurerAda
.guard(reviseSuccessGuard); .guard(reviseSuccessGuard);
sourceObligationAdmission(transitions); sourceObligationAdmission(transitions);
sourcePseudoWaitAfterError(transitions); sourcePseudoAfterOAError(transitions);
sourcePseudoAfterIOError(transitions);
sourceInspection(transitions); sourceInspection(transitions);
} }
@ -209,7 +205,7 @@ public class PaymSessionStateMachineConfig extends EnumStateMachineConfigurerAda
.action(formingPaymentInstructionAssetsAction); .action(formingPaymentInstructionAssetsAction);
} }
private void sourcePseudoWaitAfterError(StateMachineTransitionConfigurer<TaskType, SsnEvent> transitions) throws Exception { private void sourcePseudoAfterOAError(StateMachineTransitionConfigurer<TaskType, SsnEvent> transitions) throws Exception {
transitions transitions
//continue and repeat after ObligationAdmission //continue and repeat after ObligationAdmission
.withExternal() .withExternal()
@ -220,8 +216,11 @@ public class PaymSessionStateMachineConfig extends EnumStateMachineConfigurerAda
.withExternal() .withExternal()
.source(TaskType.PSEUDO_waitAfterObligationAdmissionError).target(TaskType.ObligationsAdmission) .source(TaskType.PSEUDO_waitAfterObligationAdmissionError).target(TaskType.ObligationsAdmission)
.action(chain(activeWsAction, discardOblAdmStash, obligationAdmissionAction)) .action(chain(activeWsAction, discardOblAdmStash, obligationAdmissionAction))
.event(SsnEvent.REPEAT) .event(SsnEvent.REPEAT);
.and() }
private void sourcePseudoAfterIOError(StateMachineTransitionConfigurer<TaskType, SsnEvent> transitions) throws Exception {
transitions
//continue and repeat after InspectionObligations //continue and repeat after InspectionObligations
.withExternal() .withExternal()
.source(TaskType.PSEUDO_waitAfterInspectionError).target(TaskType.FormingPaymentInstruction) .source(TaskType.PSEUDO_waitAfterInspectionError).target(TaskType.FormingPaymentInstruction)

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

@ -133,7 +133,6 @@ public class PrimaryAuctionB0SessionStateMachineConfig
dealsPrepareAction.addExecutionFondCondition(execFondPb.equals("settlementCode", "B0")); dealsPrepareAction.addExecutionFondCondition(execFondPb.equals("settlementCode", "B0"));
dealsPrepareAction.addExecutionFondCondition(execFondPb.in("market", marketCodes.get().toArray(new String[0]))); dealsPrepareAction.addExecutionFondCondition(execFondPb.in("market", marketCodes.get().toArray(new String[0])));
this.obligationAdmissionContinueAction.setDataEnum(DataEnum.obligationAdmissionStashedRgs); this.obligationAdmissionContinueAction.setDataEnum(DataEnum.obligationAdmissionStashedRgs);
this.saveRegistriesAfterInspectionAndContinueAction.setDataEnum(DataEnum.inspectionObligationStashedRgs);
} }
@Override @Override
@ -187,17 +186,14 @@ public class PrimaryAuctionB0SessionStateMachineConfig
.source(TaskType.InclusionToPool).target(TaskType.InspectionObligations) .source(TaskType.InclusionToPool).target(TaskType.InspectionObligations)
.action(inspectionObligationsV2Action) .action(inspectionObligationsV2Action)
.and() .and()
.withExternal()
.source(TaskType.InspectionObligations).target(TaskType.FormingPaymentInstruction)
.action(formingPaymentInstructionSecuritiesAction)
.and()
.withExternal() .withExternal()
.source(TaskType.PSEUDO_waitSdfAfterAgainRevise) .source(TaskType.PSEUDO_waitSdfAfterAgainRevise)
.target(TaskType.AgainRevise) .target(TaskType.AgainRevise)
.guard(new SdfGuard(SdfGuardExtractorAfterAgainRevise.instance)) .guard(new SdfGuard(SdfGuardExtractorAfterAgainRevise.instance))
.action(againRevise); .action(againRevise);
sourceObligationAdmission(transitions); sourceObligationAdmission(transitions);
sourcePseudoWaitAfterError(transitions); sourcePseudoAfterOAError(transitions);
sourcePseudoAfterIOError(transitions);
sourceFormingPaymentInstruction(transitions); sourceFormingPaymentInstruction(transitions);
sourcePseudoWaitSdfAfterPaymentInstructions(transitions); sourcePseudoWaitSdfAfterPaymentInstructions(transitions);
sourceAgainRevise(transitions); sourceAgainRevise(transitions);
@ -234,7 +230,7 @@ public class PrimaryAuctionB0SessionStateMachineConfig
} }
private void sourcePseudoWaitAfterError(StateMachineTransitionConfigurer<TaskType, SsnEvent> transitions) throws Exception { private void sourcePseudoAfterOAError(StateMachineTransitionConfigurer<TaskType, SsnEvent> transitions) throws Exception {
transitions transitions
//continue and repeat after ObligationAdmission //continue and repeat after ObligationAdmission
.withExternal() .withExternal()
@ -245,8 +241,11 @@ public class PrimaryAuctionB0SessionStateMachineConfig
.withExternal() .withExternal()
.source(TaskType.PSEUDO_waitAfterObligationAdmissionError).target(TaskType.ObligationsAdmission) .source(TaskType.PSEUDO_waitAfterObligationAdmissionError).target(TaskType.ObligationsAdmission)
.action(chain(activeWsAction, discardOblAdmStash, obligationAdmissionAction)) .action(chain(activeWsAction, discardOblAdmStash, obligationAdmissionAction))
.event(SsnEvent.REPEAT) .event(SsnEvent.REPEAT);
.and() }
private void sourcePseudoAfterIOError(StateMachineTransitionConfigurer<TaskType, SsnEvent> transitions) throws Exception {
transitions
//continue and repeat after InspectionObligations //continue and repeat after InspectionObligations
.withExternal() .withExternal()
.source(TaskType.PSEUDO_waitAfterInspectionError).target(TaskType.FormingPaymentInstruction) .source(TaskType.PSEUDO_waitAfterInspectionError).target(TaskType.FormingPaymentInstruction)

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

@ -128,7 +128,6 @@ public class PrimaryAuctionBnSessionStateMachineConfig
dealsPrepareAction.addExecutionFondCondition(execFondPb.regex("settlementCode", "^B\\d{2}$")); dealsPrepareAction.addExecutionFondCondition(execFondPb.regex("settlementCode", "^B\\d{2}$"));
dealsPrepareAction.addExecutionFondCondition(execFondPb.in("market", marketCodes.get().toArray(new String[0]))); dealsPrepareAction.addExecutionFondCondition(execFondPb.in("market", marketCodes.get().toArray(new String[0])));
this.obligationAdmissionContinueAction.setDataEnum(DataEnum.obligationAdmissionStashedRgs); this.obligationAdmissionContinueAction.setDataEnum(DataEnum.obligationAdmissionStashedRgs);
this.saveRegistriesAfterInspectionAndContinueAction.setDataEnum(DataEnum.inspectionObligationStashedRgs);
} }
@Override @Override
@ -178,14 +177,11 @@ public class PrimaryAuctionBnSessionStateMachineConfig
.and() .and()
.withExternal() .withExternal()
.source(TaskType.InclusionToPool).target(TaskType.InspectionObligations) .source(TaskType.InclusionToPool).target(TaskType.InspectionObligations)
.action(inspectionObligationsV2Action) .action(inspectionObligationsV2Action);
.and()
.withExternal()
.source(TaskType.InspectionObligations).target(TaskType.FormingPaymentInstruction)
.action(formingPaymentInstructionSecuritiesAction);
sourceObligationAdmission(transitions); sourceObligationAdmission(transitions);
sourcePseudoWaitAfterError(transitions); sourcePseudoAfterOAError(transitions);
sourcePseudoAfterIOError(transitions);
sourceFormingPaymentInstruction(transitions); sourceFormingPaymentInstruction(transitions);
sourcePseudoWaitSdfAfterPaymentInstructions(transitions); sourcePseudoWaitSdfAfterPaymentInstructions(transitions);
sourceInspection(transitions); sourceInspection(transitions);
@ -220,7 +216,7 @@ public class PrimaryAuctionBnSessionStateMachineConfig
.action(formingPaymentInstructionSecuritiesAction); .action(formingPaymentInstructionSecuritiesAction);
} }
private void sourcePseudoWaitAfterError(StateMachineTransitionConfigurer<TaskType, SsnEvent> transitions) throws Exception { private void sourcePseudoAfterOAError(StateMachineTransitionConfigurer<TaskType, SsnEvent> transitions) throws Exception {
transitions transitions
//continue and repeat after ObligationAdmission //continue and repeat after ObligationAdmission
.withExternal() .withExternal()
@ -231,8 +227,11 @@ public class PrimaryAuctionBnSessionStateMachineConfig
.withExternal() .withExternal()
.source(TaskType.PSEUDO_waitAfterObligationAdmissionError).target(TaskType.ObligationsAdmission) .source(TaskType.PSEUDO_waitAfterObligationAdmissionError).target(TaskType.ObligationsAdmission)
.action(chain(activeWsAction, discardOblAdmStash, obligationAdmissionAction)) .action(chain(activeWsAction, discardOblAdmStash, obligationAdmissionAction))
.event(SsnEvent.REPEAT) .event(SsnEvent.REPEAT);
.and() }
private void sourcePseudoAfterIOError(StateMachineTransitionConfigurer<TaskType, SsnEvent> transitions) throws Exception {
transitions
//continue and repeat after InspectionObligations //continue and repeat after InspectionObligations
.withExternal() .withExternal()
.source(TaskType.PSEUDO_waitAfterInspectionError).target(TaskType.FormingPaymentInstruction) .source(TaskType.PSEUDO_waitAfterInspectionError).target(TaskType.FormingPaymentInstruction)

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

@ -134,7 +134,6 @@ public class PrimaryAuctionT0SessionStateMachineConfig
dealsPrepareAction.addExecutionFondCondition(execFondPb.regex("settlementCode", "^T0.*$")); dealsPrepareAction.addExecutionFondCondition(execFondPb.regex("settlementCode", "^T0.*$"));
dealsPrepareAction.addExecutionFondCondition(execFondPb.in("market", marketCodes.get().toArray(new String[0]))); dealsPrepareAction.addExecutionFondCondition(execFondPb.in("market", marketCodes.get().toArray(new String[0])));
this.obligationAdmissionContinueAction.setDataEnum(DataEnum.obligationAdmissionStashedRgs); this.obligationAdmissionContinueAction.setDataEnum(DataEnum.obligationAdmissionStashedRgs);
this.saveRegistriesAfterInspectionAndContinueAction.setDataEnum(DataEnum.inspectionObligationStashedRgs);
} }
@Override @Override
@ -188,10 +187,6 @@ public class PrimaryAuctionT0SessionStateMachineConfig
.source(TaskType.InclusionToPool).target(TaskType.InspectionObligations) .source(TaskType.InclusionToPool).target(TaskType.InspectionObligations)
.action(inspectionObligationsV2Action) .action(inspectionObligationsV2Action)
.and() .and()
.withExternal()
.source(TaskType.InspectionObligations).target(TaskType.FormingPaymentInstruction)
.action(formingPaymentInstructionSecuritiesAction)
.and()
.withExternal() .withExternal()
.source(TaskType.PSEUDO_waitSdfAfterAgainRevise) .source(TaskType.PSEUDO_waitSdfAfterAgainRevise)
.target(TaskType.AgainRevise) .target(TaskType.AgainRevise)
@ -199,7 +194,8 @@ public class PrimaryAuctionT0SessionStateMachineConfig
.action(againRevise); .action(againRevise);
sourceObligationAdmission(transitions); sourceObligationAdmission(transitions);
sourcePseudoWaitAfterError(transitions); sourcePseudoAfterOAError(transitions);
sourcePseudoAfterIOError(transitions);
sourceFormingPaymentInstruction(transitions); sourceFormingPaymentInstruction(transitions);
sourcePseudoWaitSdfAfterPaymentInstructions(transitions); sourcePseudoWaitSdfAfterPaymentInstructions(transitions);
sourceAgainRevise(transitions); sourceAgainRevise(transitions);
@ -235,7 +231,7 @@ public class PrimaryAuctionT0SessionStateMachineConfig
.action(formingPaymentInstructionSecuritiesAction); .action(formingPaymentInstructionSecuritiesAction);
} }
private void sourcePseudoWaitAfterError(StateMachineTransitionConfigurer<TaskType, SsnEvent> transitions) throws Exception { private void sourcePseudoAfterOAError(StateMachineTransitionConfigurer<TaskType, SsnEvent> transitions) throws Exception {
transitions transitions
//continue and repeat after ObligationAdmission //continue and repeat after ObligationAdmission
.withExternal() .withExternal()
@ -246,8 +242,11 @@ public class PrimaryAuctionT0SessionStateMachineConfig
.withExternal() .withExternal()
.source(TaskType.PSEUDO_waitAfterObligationAdmissionError).target(TaskType.ObligationsAdmission) .source(TaskType.PSEUDO_waitAfterObligationAdmissionError).target(TaskType.ObligationsAdmission)
.action(chain(activeWsAction, discardOblAdmStash, obligationAdmissionAction)) .action(chain(activeWsAction, discardOblAdmStash, obligationAdmissionAction))
.event(SsnEvent.REPEAT) .event(SsnEvent.REPEAT);
.and() }
private void sourcePseudoAfterIOError(StateMachineTransitionConfigurer<TaskType, SsnEvent> transitions) throws Exception {
transitions
//continue and repeat after InspectionObligations //continue and repeat after InspectionObligations
.withExternal() .withExternal()
.source(TaskType.PSEUDO_waitAfterInspectionError).target(TaskType.FormingPaymentInstruction) .source(TaskType.PSEUDO_waitAfterInspectionError).target(TaskType.FormingPaymentInstruction)

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

@ -109,7 +109,6 @@ public class ReturnDepositSessionStateMachineConfig
rgsPb.less("valueDate", LocalDate.now()) rgsPb.less("valueDate", LocalDate.now())
) )
); );
this.saveRegistriesAfterInspectionAndContinueAction.setDataEnum(DataEnum.inspectionObligationStashedRgs);
} }
@Override @Override
@ -149,15 +148,12 @@ public class ReturnDepositSessionStateMachineConfig
.withExternal() .withExternal()
.source(TaskType.InclusionToPool).target(TaskType.InspectionObligations) .source(TaskType.InclusionToPool).target(TaskType.InspectionObligations)
.action(inspectionObligationsDepositReturnAction) .action(inspectionObligationsDepositReturnAction)
.and() .and();
.withExternal()
.source(TaskType.InspectionObligations).target(TaskType.FormingPaymentInstruction)
.action(formingPaymentInstructionDepositReturnAction);
sourceFormingPaymentInstruction(transitions); sourceFormingPaymentInstruction(transitions);
sourcePseudoWaitSdfAfterPaymentInstructions(transitions); sourcePseudoWaitSdfAfterPaymentInstructions(transitions);
sourceInspection(transitions); sourceInspection(transitions);
sourcePseudoWaitAfterError(transitions); sourcePseudoAfterIOError(transitions);
} }
private void sourceInspection(StateMachineTransitionConfigurer<TaskType, SsnEvent> transitions) throws Exception { private void sourceInspection(StateMachineTransitionConfigurer<TaskType, SsnEvent> transitions) throws Exception {
@ -208,7 +204,7 @@ public class ReturnDepositSessionStateMachineConfig
} }
} }
private void sourcePseudoWaitAfterError(StateMachineTransitionConfigurer<TaskType, SsnEvent> transitions) throws Exception { private void sourcePseudoAfterIOError(StateMachineTransitionConfigurer<TaskType, SsnEvent> transitions) throws Exception {
transitions transitions
//continue and repeat after InspectionObligations //continue and repeat after InspectionObligations
.withExternal() .withExternal()

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

@ -134,7 +134,6 @@ public class SecondaryAuctionT0SessionStateMachineConfig
dealsPrepareAction.addExecutionFondCondition(execFondPb.regex("settlementCode", "^T0.*$")); dealsPrepareAction.addExecutionFondCondition(execFondPb.regex("settlementCode", "^T0.*$"));
dealsPrepareAction.addExecutionFondCondition(execFondPb.in("market", marketCodes.get().toArray(new String[0]))); dealsPrepareAction.addExecutionFondCondition(execFondPb.in("market", marketCodes.get().toArray(new String[0])));
this.obligationAdmissionContinueAction.setDataEnum(DataEnum.obligationAdmissionStashedRgs); this.obligationAdmissionContinueAction.setDataEnum(DataEnum.obligationAdmissionStashedRgs);
this.saveRegistriesAfterInspectionAndContinueAction.setDataEnum(DataEnum.inspectionObligationStashedRgs);
} }
@Override @Override
@ -188,10 +187,6 @@ public class SecondaryAuctionT0SessionStateMachineConfig
.source(TaskType.InclusionToPool).target(TaskType.InspectionObligations) .source(TaskType.InclusionToPool).target(TaskType.InspectionObligations)
.action(inspectionObligationsV2Action) .action(inspectionObligationsV2Action)
.and() .and()
.withExternal()
.source(TaskType.InspectionObligations).target(TaskType.FormingPaymentInstruction)
.action(formingPaymentInstructionAssetsAction)
.and()
.withExternal() .withExternal()
.source(TaskType.PSEUDO_waitSdfAfterAgainRevise) .source(TaskType.PSEUDO_waitSdfAfterAgainRevise)
.target(TaskType.AgainRevise) .target(TaskType.AgainRevise)
@ -199,7 +194,8 @@ public class SecondaryAuctionT0SessionStateMachineConfig
.action(againRevise); .action(againRevise);
sourceObligationAdmission(transitions); sourceObligationAdmission(transitions);
sourcePseudoWaitAfterError(transitions); sourcePseudoAfterOAError(transitions);
sourcePseudoAfterIOError(transitions);
sourceFormingPaymentInstruction(transitions); sourceFormingPaymentInstruction(transitions);
sourcePseudoWaitSdfAfterPaymentInstructions(transitions); sourcePseudoWaitSdfAfterPaymentInstructions(transitions);
sourceAgainRevise(transitions); sourceAgainRevise(transitions);
@ -235,7 +231,7 @@ public class SecondaryAuctionT0SessionStateMachineConfig
.action(formingPaymentInstructionAssetsAction); .action(formingPaymentInstructionAssetsAction);
} }
private void sourcePseudoWaitAfterError(StateMachineTransitionConfigurer<TaskType, SsnEvent> transitions) throws Exception { private void sourcePseudoAfterOAError(StateMachineTransitionConfigurer<TaskType, SsnEvent> transitions) throws Exception {
transitions transitions
//continue and repeat after ObligationAdmission //continue and repeat after ObligationAdmission
.withExternal() .withExternal()
@ -246,8 +242,11 @@ public class SecondaryAuctionT0SessionStateMachineConfig
.withExternal() .withExternal()
.source(TaskType.PSEUDO_waitAfterObligationAdmissionError).target(TaskType.ObligationsAdmission) .source(TaskType.PSEUDO_waitAfterObligationAdmissionError).target(TaskType.ObligationsAdmission)
.action(chain(activeWsAction, discardOblAdmStash, obligationAdmissionAction)) .action(chain(activeWsAction, discardOblAdmStash, obligationAdmissionAction))
.event(SsnEvent.REPEAT) .event(SsnEvent.REPEAT);
.and() }
private void sourcePseudoAfterIOError(StateMachineTransitionConfigurer<TaskType, SsnEvent> transitions) throws Exception {
transitions
//continue and repeat after InspectionObligations //continue and repeat after InspectionObligations
.withExternal() .withExternal()
.source(TaskType.PSEUDO_waitAfterInspectionError).target(TaskType.FormingPaymentInstruction) .source(TaskType.PSEUDO_waitAfterInspectionError).target(TaskType.FormingPaymentInstruction)

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

@ -144,7 +144,6 @@ public class UnitedSessionStateMachineConfig
this.finishingSessionAction.setPr("1"); this.finishingSessionAction.setPr("1");
this.obligationAdmissionContinueAction.setDataEnum(DataEnum.obligationAdmissionStashedRgs); this.obligationAdmissionContinueAction.setDataEnum(DataEnum.obligationAdmissionStashedRgs);
this.saveRegistriesAfterInspectionAndContinueAction.setDataEnum(DataEnum.inspectionObligationStashedRgs);
} }
} }
@ -202,17 +201,14 @@ public class UnitedSessionStateMachineConfig
.source(TaskType.InclusionToPool).target(TaskType.InspectionObligations) .source(TaskType.InclusionToPool).target(TaskType.InspectionObligations)
.action(inspectionObligationsV2Action) .action(inspectionObligationsV2Action)
.and() .and()
.withExternal()
.source(TaskType.InspectionObligations).target(TaskType.FormingPaymentInstruction)
.action(formingPaymentInstructionAssetsAction)
.and()
.withExternal() .withExternal()
.source(TaskType.PSEUDO_waitSdfAfterAgainRevise) .source(TaskType.PSEUDO_waitSdfAfterAgainRevise)
.target(TaskType.AgainRevise) .target(TaskType.AgainRevise)
.guard(new SdfGuard(SdfGuardExtractorAfterAgainRevise.instance)) .guard(new SdfGuard(SdfGuardExtractorAfterAgainRevise.instance))
.action(againRevise); .action(againRevise);
sourceObligationAdmission(transitions); sourceObligationAdmission(transitions);
sourcePseudoWaitAfterError(transitions); sourcePseudoAfterOAError(transitions);
sourcePseudoAfterIOError(transitions);
sourceFormingPaymentInstruction(transitions); sourceFormingPaymentInstruction(transitions);
sourceAgainRevise(transitions); sourceAgainRevise(transitions);
sourcePseudoWaitSdfAfterPaymentInstructions(transitions); sourcePseudoWaitSdfAfterPaymentInstructions(transitions);
@ -248,7 +244,7 @@ public class UnitedSessionStateMachineConfig
.action(formingPaymentInstructionAssetsAction); .action(formingPaymentInstructionAssetsAction);
} }
private void sourcePseudoWaitAfterError(StateMachineTransitionConfigurer<TaskType, SsnEvent> transitions) throws Exception { private void sourcePseudoAfterOAError(StateMachineTransitionConfigurer<TaskType, SsnEvent> transitions) throws Exception {
transitions transitions
//continue and repeat after ObligationAdmission //continue and repeat after ObligationAdmission
.withExternal() .withExternal()
@ -259,8 +255,11 @@ public class UnitedSessionStateMachineConfig
.withExternal() .withExternal()
.source(TaskType.PSEUDO_waitAfterObligationAdmissionError).target(TaskType.ObligationsAdmission) .source(TaskType.PSEUDO_waitAfterObligationAdmissionError).target(TaskType.ObligationsAdmission)
.action(chain(activeWsAction, discardOblAdmStash, obligationAdmissionAction)) .action(chain(activeWsAction, discardOblAdmStash, obligationAdmissionAction))
.event(SsnEvent.REPEAT) .event(SsnEvent.REPEAT);
.and() }
private void sourcePseudoAfterIOError(StateMachineTransitionConfigurer<TaskType, SsnEvent> transitions) throws Exception {
transitions
//continue and repeat after InspectionObligations //continue and repeat after InspectionObligations
.withExternal() .withExternal()
.source(TaskType.PSEUDO_waitAfterInspectionError).target(TaskType.FormingPaymentInstruction) .source(TaskType.PSEUDO_waitAfterInspectionError).target(TaskType.FormingPaymentInstruction)

6
clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/session/state/action/SaveRegistriesAfterInspectionAndContinueAction.java
View file

@ -22,7 +22,7 @@ import ru.spcex.platform.imdg.api.ImdgProvider;
public class SaveRegistriesAfterInspectionAndContinueAction extends AbstractSessionActionForOkErrorHandling { public class SaveRegistriesAfterInspectionAndContinueAction extends AbstractSessionActionForOkErrorHandling {
private final Logger log = LoggerFactory.getLogger(getClass()); private final Logger log = LoggerFactory.getLogger(getClass());
private final Imdg<Registry> registryImdg; private final Imdg<Registry> registryImdg;
private DataEnum dataEnum; private final DataEnum dataEnum = DataEnum.inspectionObligationStashedRgs;
private final PlanBalanceCalc planBalanceCalc; private final PlanBalanceCalc planBalanceCalc;
@Autowired @Autowired
@ -32,10 +32,6 @@ public class SaveRegistriesAfterInspectionAndContinueAction extends AbstractSess
this.planBalanceCalc = planBalanceCalc; this.planBalanceCalc = planBalanceCalc;
} }
public void setDataEnum(DataEnum dataEnum) {
this.dataEnum = dataEnum;
}
@Override @Override
protected void actualExecute(StateContext<TaskType, SsnEvent> ctx) { protected void actualExecute(StateContext<TaskType, SsnEvent> ctx) {
@SuppressWarnings("unchecked") @SuppressWarnings("unchecked")