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

http://jira.mfd.msk:8088/browse/CLS-584

Browse source
This commit is contained in:
ialbert 2023-11-08 19:06:46 +03:00
parent e88eef031c
commit ec9586eef5
2 changed files with 2 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/service/validation/SessionTerminationValidationRule.java
View file

@ -26,7 +26,7 @@ public enum SessionTerminationValidationRule implements IValidationRule<ImdgVali
)); ));
if (session == null) { if (session == null) {
log.warn("Cannot stop session, failed to find workflowStatus 'ACTV'"); log.warn("Cannot stop session, failed to find workflowStatus 'ACTV'");
return of(ClearingError.RecordNotFound, "active session"); return of(ClearingError.RecordNotFound, "с активной клиринговой сессией для обнуления");
} }
context.storeObject(ValidationStored.SessionTerminate, session); context.storeObject(ValidationStored.SessionTerminate, session);
context.setValidatedObject(session); context.setValidatedObject(session);
@ -41,7 +41,7 @@ public enum SessionTerminationValidationRule implements IValidationRule<ImdgVali
if (status == null || status.ordinal() >= TaskType.FormingPaymentInstruction.ordinal()) { if (status == null || status.ordinal() >= TaskType.FormingPaymentInstruction.ordinal()) {
log.warn("Cannot stop session.id={}, unknown sessionStatus '{}'", log.warn("Cannot stop session.id={}, unknown sessionStatus '{}'",
session.getId(), session.getSessionStatus()); session.getId(), session.getSessionStatus());
return of(ClearingError.IncorrectValue, "sessionStatus"); return of(ClearingError.IncorrectValue, "статуса для обнуления клиринговой сессии");
} }
return empty(); return empty();
} }

1
clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/session/stage/SessionTerminator.java
View file

@ -72,7 +72,6 @@ public class SessionTerminator {
IValidator validator = validation.get(); IValidator validator = validation.get();
Optional<EnumMessage> err = validator.tillFirstError(); Optional<EnumMessage> err = validator.tillFirstError();
if (err.isPresent()) { if (err.isPresent()) {
//fixme - уточнить нужно ли
notification.sendNotification(ObjectType.session, msgs.resolve(err.get()), Priority.HIGH); notification.sendNotification(ObjectType.session, msgs.resolve(err.get()), Priority.HIGH);
return reqInfo.error(req.getId(), err.get()); return reqInfo.error(req.getId(), err.get());
} }