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

http://jira.mfd.msk:8088/browse/CLS-886 нотификейшен на 3м шаге сессий: писать все ошибки по регистру

Browse source
This commit is contained in:
ialbert 2025-07-22 16:33:09 +03:00
parent 38cfc12fbc
commit 56dabbd28f
2 changed files with 18 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -7,7 +7,6 @@ import java.util.HashMap;
import java.util.HashSet; import java.util.HashSet;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.Optional;
import java.util.Set; import java.util.Set;
import java.util.stream.Collectors; import java.util.stream.Collectors;
import org.slf4j.Logger; import org.slf4j.Logger;
@ -88,10 +87,10 @@ public class ObligationAdmissionAction extends AbstractSessionActionForOkErrorHa
List<Registry> rgsGroup = grpEntry.getValue(); List<Registry> rgsGroup = grpEntry.getValue();
for (Registry rgs : rgsGroup) { for (Registry rgs : rgsGroup) {
IValidator validator = valFor(rgs); IValidator validator = valFor(rgs);
Optional<EnumMessage> error = validator.tillFirstError(); Collection<EnumMessage> errors = validator.validateAll();
error.ifPresent(e -> { errors.forEach(e -> {
groupErrors.add(e); groupErrors.add(e);
errs.add(new RgsErr(rgs, messageResolver.resolve(e))); errs.add(new RgsErr(rgs, messageResolver.resolve(e), e.getSubject()));
}); });
} }
if (!groupErrors.isEmpty()) { if (!groupErrors.isEmpty()) {

16
clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/session/state/model/RgsErr.java
View file

@ -2,16 +2,24 @@ package ru.spcex.clearing.session.state.model;
import java.util.Objects; import java.util.Objects;
import ru.clearing.classes.statics.data.registry.Registry; import ru.clearing.classes.statics.data.registry.Registry;
import ru.spcex.platform.utils.enumeration.IEnumId;
public class RgsErr { public class RgsErr {
private Registry rgs; private Registry rgs;
private String err; private String err;
private IEnumId subj;
public RgsErr(Registry rgs, String err) { public RgsErr(Registry rgs, String err) {
this.rgs = rgs; this.rgs = rgs;
this.err = err; this.err = err;
} }
public RgsErr(Registry rgs, String err, IEnumId subj) {
this.rgs = rgs;
this.err = err;
this.subj = subj;
}
public Registry getRgs() { public Registry getRgs() {
return rgs; return rgs;
} }
@ -40,7 +48,13 @@ public class RgsErr {
public boolean equals(Object o) { public boolean equals(Object o) {
if (this == o) return true; if (this == o) return true;
if (!(o instanceof RgsErr other)) return false; if (!(o instanceof RgsErr other)) return false;
boolean meaningEqual;
if (subj != null && other.subj != null) {
meaningEqual = subj.equals(other.subj);
} else {
meaningEqual = Objects.equals(err, other.err);
}
return rgs.getTradingClearingRegistryId().equals(other.rgs.getTradingClearingRegistryId()) return rgs.getTradingClearingRegistryId().equals(other.rgs.getTradingClearingRegistryId())
&& Objects.equals(err, other.err); && meaningEqual;
} }
} }