diff --git a/src/main/java/ru/nbch/credit_tracker/component/comparator/DeletePackageStatusComparator.java b/src/main/java/ru/nbch/credit_tracker/component/comparator/DeletePackageStatusComparator.java index 8c2c469..8c09ebb 100644 --- a/src/main/java/ru/nbch/credit_tracker/component/comparator/DeletePackageStatusComparator.java +++ b/src/main/java/ru/nbch/credit_tracker/component/comparator/DeletePackageStatusComparator.java @@ -15,7 +15,7 @@ public class DeletePackageStatusComparator { try { Status status = Status.valueOf(str); return switch (status) { - case ON_MONITORING -> 1; + case ON_MONITORING, PROCESSING_REPEATED -> 1; case DELETED -> 0; default -> -1; }; diff --git a/src/main/java/ru/nbch/credit_tracker/facade/SignalFacadeV3.java b/src/main/java/ru/nbch/credit_tracker/facade/SignalFacadeV3.java index 60ffb8c..9954269 100644 --- a/src/main/java/ru/nbch/credit_tracker/facade/SignalFacadeV3.java +++ b/src/main/java/ru/nbch/credit_tracker/facade/SignalFacadeV3.java @@ -6,6 +6,7 @@ import java.nio.file.Files; import java.nio.file.Path; import java.nio.file.StandardCopyOption; import java.time.LocalDateTime; +import java.util.Arrays; import java.util.List; import java.util.concurrent.ExecutorService; import javax.xml.stream.XMLStreamException; @@ -232,7 +233,7 @@ public class SignalFacadeV3 { -> clientExcp(SignalError.ERROR_016, XmlErrorFormat.MonitoringPackageDeleteError, packageName)); Status status = EnumUtil.getEnum(Status.class, packageToDelete.getStatus()); - if (!Status.ON_MONITORING.equals(status)) { + if (!Arrays.asList(Status.ON_MONITORING, Status.PROCESSING_REPEATED).contains(status)) { throw clientExcp(deleteStatusError(status), XmlErrorFormat.MonitoringPackageDeleteError, packageName); } @@ -256,7 +257,7 @@ public class SignalFacadeV3 { private SignalError deleteStatusError(Status status) { if (status == null) return SignalError.ERROR_017; return switch (status) { - case PROCESSING, ACCEPTED -> SignalError.ERROR_016; + case PROCESSING, ACCEPTED -> SignalError.ERROR_023; case REJECTED, ERROR -> SignalError.ERROR_024; case DELETED -> SignalError.ERROR_025; case PROCESSING_REPEATED -> SignalError.ERROR_026;