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

sessions fix

Browse source
This commit is contained in:
ialbert 2023-09-07 20:19:10 +03:00
parent 99e98f6a28
commit 285f9b5188
4 changed files with 48 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/session/stage/PrimaryAuctionBnSession.java
View file

@ -128,15 +128,17 @@ public class PrimaryAuctionBnSession extends AbstractSession implements Initiali
if (firstReviseMonitor != null && isMonitorPassed(firstReviseMonitor, req.getRequestPayload())) { if (firstReviseMonitor != null && isMonitorPassed(firstReviseMonitor, req.getRequestPayload())) {
firstReviseMonitor = null; firstReviseMonitor = null;
firstPart(); firstPart();
return;
} }
if (afterPaymentsSdf4And13Monitor != null && isMonitorPassed(afterPaymentsSdf4And13Monitor, req.getRequestPayload())) { if (afterPaymentsSdf4And13Monitor != null && isMonitorPassed(afterPaymentsSdf4And13Monitor, req.getRequestPayload())) {
afterPaymentsSdf4And13Monitor = null; afterPaymentsSdf4And13Monitor = null;
sendSdf56();
}
if (afterPaymentsReviseMonitor != null && isMonitorPassed(afterPaymentsReviseMonitor, req.getRequestPayload())) {
afterPaymentsReviseMonitor = null;
finishPart(); finishPart();
return;
} }
//if (afterPaymentsReviseMonitor != null && isMonitorPassed(afterPaymentsReviseMonitor, req.getRequestPayload())) {
// afterPaymentsReviseMonitor = null;
// finishPart();
//}
} catch (StageException e) { } catch (StageException e) {
//already logged //already logged
} }
@ -189,11 +191,13 @@ public class PrimaryAuctionBnSession extends AbstractSession implements Initiali
paymentResult = runStage(TaskType.FormingPaymentInstruction, payload, formingPaymentInstruction); paymentResult = runStage(TaskType.FormingPaymentInstruction, payload, formingPaymentInstruction);
} }
if (paymentResult.getStageResult().isEmpty()) { if (paymentResult.getStageResult().isEmpty()) {
log.info("no payment instructions were created, sending SDF56"); log.info("no payment instructions were created");
sendSdf56(); finishPart();
} else { } else {
log.info("created {} PaymentInstructions, waiting for SDF04/SDF13", paymentResult.getStageResult().size()); this.afterPaymentsSdf4And13Monitor = SessionMonitorFactory.waitStep7(section());
this.afterPaymentsSdf4And13Monitor = SessionMonitorFactory.paymentsWereCreated(section()); log.info("created {} PaymentInstructions, waiting for {}",
paymentResult.getStageResult().size(),
this.afterPaymentsSdf4And13Monitor.allConditions());
} }
} catch (StageException e) { } catch (StageException e) {
//already logged //already logged

20
clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/session/stage/PrimaryAuctionT0Session.java
View file

@ -128,15 +128,17 @@ public class PrimaryAuctionT0Session extends AbstractSession implements Initiali
if (firstReviseMonitor != null && isMonitorPassed(firstReviseMonitor, req.getRequestPayload())) { if (firstReviseMonitor != null && isMonitorPassed(firstReviseMonitor, req.getRequestPayload())) {
firstReviseMonitor = null; firstReviseMonitor = null;
firstPart(); firstPart();
return;
} }
if (afterPaymentsSdf4And13Monitor != null && isMonitorPassed(afterPaymentsSdf4And13Monitor, req.getRequestPayload())) { if (afterPaymentsSdf4And13Monitor != null && isMonitorPassed(afterPaymentsSdf4And13Monitor, req.getRequestPayload())) {
afterPaymentsSdf4And13Monitor = null; afterPaymentsSdf4And13Monitor = null;
sendSdf56();
}
if (afterPaymentsReviseMonitor != null && isMonitorPassed(afterPaymentsReviseMonitor, req.getRequestPayload())) {
afterPaymentsReviseMonitor = null;
finishPart(); finishPart();
return;
} }
//if (afterPaymentsReviseMonitor != null && isMonitorPassed(afterPaymentsReviseMonitor, req.getRequestPayload())) {
// afterPaymentsReviseMonitor = null;
// finishPart();
//}
} catch (StageException e) { } catch (StageException e) {
//already logged //already logged
} }
@ -188,11 +190,13 @@ public class PrimaryAuctionT0Session extends AbstractSession implements Initiali
paymentResult = runStage(TaskType.FormingPaymentInstruction, payload, formingPaymentInstruction); paymentResult = runStage(TaskType.FormingPaymentInstruction, payload, formingPaymentInstruction);
} }
if (paymentResult.getStageResult().isEmpty()) { if (paymentResult.getStageResult().isEmpty()) {
log.info("no payment instructions were created, sending SDF56"); log.info("no payment instructions were created");
sendSdf56(); finishPart();
} else { } else {
log.info("created {} PaymentInstructions, waiting for SDF04/SDF13", paymentResult.getStageResult().size()); this.afterPaymentsSdf4And13Monitor = SessionMonitorFactory.waitStep7(section());
this.afterPaymentsSdf4And13Monitor = SessionMonitorFactory.paymentsWereCreated(section()); log.info("created {} PaymentInstructions, waiting for {}",
paymentResult.getStageResult().size(),
this.afterPaymentsSdf4And13Monitor.allConditions());
} }
} catch (StageException e) { } catch (StageException e) {
//already logged //already logged

20
clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/session/stage/ReturnDepositSession.java
View file

@ -119,15 +119,17 @@ public class ReturnDepositSession extends AbstractSession implements Initializin
if (firstReviseMonitor != null && isMonitorPassed(firstReviseMonitor, req.getRequestPayload())) { if (firstReviseMonitor != null && isMonitorPassed(firstReviseMonitor, req.getRequestPayload())) {
firstReviseMonitor = null; firstReviseMonitor = null;
firstPart(); firstPart();
return;
} }
if (afterPaymentsSdf4Monitor != null && isMonitorPassed(afterPaymentsSdf4Monitor, req.getRequestPayload())) { if (afterPaymentsSdf4Monitor != null && isMonitorPassed(afterPaymentsSdf4Monitor, req.getRequestPayload())) {
afterPaymentsSdf4Monitor = null; afterPaymentsSdf4Monitor = null;
sendSdf56();
}
if (afterPaymentsReviseMonitor != null && isMonitorPassed(afterPaymentsReviseMonitor, req.getRequestPayload())) {
afterPaymentsReviseMonitor = null;
finishPart(); finishPart();
return;
} }
//if (afterPaymentsReviseMonitor != null && isMonitorPassed(afterPaymentsReviseMonitor, req.getRequestPayload())) {
// afterPaymentsReviseMonitor = null;
// finishPart();
//}
} catch (StageException e) { } catch (StageException e) {
//already logged //already logged
} }
@ -167,11 +169,13 @@ public class ReturnDepositSession extends AbstractSession implements Initializin
paymentResult = runStage(TaskType.FormingPaymentInstruction, payload, formingPaymentInstruction); paymentResult = runStage(TaskType.FormingPaymentInstruction, payload, formingPaymentInstruction);
} }
if (paymentResult == null || paymentResult.getStageResult().isEmpty()) { if (paymentResult == null || paymentResult.getStageResult().isEmpty()) {
log.info("no payment instructions were created, sending SDF56"); log.info("no payment instructions were created");
sendSdf56(); finishPart();
} else { } else {
log.info("created {} PaymentInstructions, waiting for SDF04", paymentResult.getStageResult().size()); this.afterPaymentsSdf4Monitor = SessionMonitorFactory.waitStep7(section());
this.afterPaymentsSdf4Monitor = SessionMonitorFactory.paymentsWereCreated(section()); log.info("created {} PaymentInstructions, waiting for {}",
paymentResult.getStageResult().size(),
this.afterPaymentsSdf4Monitor.allConditions());
} }
} catch (StageException e) { } catch (StageException e) {
//already logged //already logged

20
clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/session/stage/SecondaryAuctionT0Session.java
View file

@ -122,15 +122,17 @@ public class SecondaryAuctionT0Session extends AbstractSession implements Initia
if (firstReviseMonitor != null && isMonitorPassed(firstReviseMonitor, req.getRequestPayload())) { if (firstReviseMonitor != null && isMonitorPassed(firstReviseMonitor, req.getRequestPayload())) {
firstReviseMonitor = null; firstReviseMonitor = null;
firstPart(); firstPart();
return;
} }
if (afterPaymentsSdf4And13Monitor != null && isMonitorPassed(afterPaymentsSdf4And13Monitor, req.getRequestPayload())) { if (afterPaymentsSdf4And13Monitor != null && isMonitorPassed(afterPaymentsSdf4And13Monitor, req.getRequestPayload())) {
afterPaymentsSdf4And13Monitor = null; afterPaymentsSdf4And13Monitor = null;
sendSdf56();
}
if (afterPaymentsReviseMonitor != null && isMonitorPassed(afterPaymentsReviseMonitor, req.getRequestPayload())) {
afterPaymentsReviseMonitor = null;
finishPart(); finishPart();
return;
} }
//if (afterPaymentsReviseMonitor != null && isMonitorPassed(afterPaymentsReviseMonitor, req.getRequestPayload())) {
// afterPaymentsReviseMonitor = null;
// finishPart();
//}
} catch (StageException e) { } catch (StageException e) {
//already logged //already logged
} }
@ -183,11 +185,13 @@ public class SecondaryAuctionT0Session extends AbstractSession implements Initia
} }
if (paymentResult.getStageResult().getPaymentInstructions().isEmpty()) { if (paymentResult.getStageResult().getPaymentInstructions().isEmpty()) {
log.info("no payment instructions were created, sending SDF56"); log.info("no payment instructions were created");
sendSdf56(); finishPart();
} else { } else {
log.info("created {} PaymentInstructions, waiting for SDF04/SDF13", paymentResult.getStageResult().getPaymentInstructions().size()); this.afterPaymentsSdf4And13Monitor = SessionMonitorFactory.waitStep7(section());
this.afterPaymentsSdf4And13Monitor = SessionMonitorFactory.paymentsWereCreated(section()); log.info("created {} PaymentInstructions, waiting for {}",
paymentResult.getStageResult().getPaymentInstructions().size(),
this.afterPaymentsSdf4And13Monitor.allConditions());
} }
} catch (StageException e) { } catch (StageException e) {
//already logged //already logged