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

http://jira.mfd.msk:8088/browse/BKI-3241 [10; 11]

Browse source
This commit is contained in:
etreschenkov 2026-01-13 15:57:27 +03:00
parent e8268be5aa
commit fe87213cf8
2 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/main/java/ru/nbch/credit_tracker/component/comparator/DeletePackageStatusComparator.java
View file

@ -15,7 +15,7 @@ public class DeletePackageStatusComparator {
try { try {
Status status = Status.valueOf(str); Status status = Status.valueOf(str);
return switch (status) { return switch (status) {
case ON_MONITORING -> 1; case ON_MONITORING, PROCESSING_REPEATED -> 1;
case DELETED -> 0; case DELETED -> 0;
default -> -1; default -> -1;
}; };

5
src/main/java/ru/nbch/credit_tracker/facade/SignalFacadeV3.java
View file

@ -6,6 +6,7 @@ import java.nio.file.Files;
import java.nio.file.Path; import java.nio.file.Path;
import java.nio.file.StandardCopyOption; import java.nio.file.StandardCopyOption;
import java.time.LocalDateTime; import java.time.LocalDateTime;
import java.util.Arrays;
import java.util.List; import java.util.List;
import java.util.concurrent.ExecutorService; import java.util.concurrent.ExecutorService;
import javax.xml.stream.XMLStreamException; import javax.xml.stream.XMLStreamException;
@ -232,7 +233,7 @@ public class SignalFacadeV3 {
-> clientExcp(SignalError.ERROR_016, XmlErrorFormat.MonitoringPackageDeleteError, packageName)); -> clientExcp(SignalError.ERROR_016, XmlErrorFormat.MonitoringPackageDeleteError, packageName));
Status status = EnumUtil.getEnum(Status.class, packageToDelete.getStatus()); 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); throw clientExcp(deleteStatusError(status), XmlErrorFormat.MonitoringPackageDeleteError, packageName);
} }
@ -256,7 +257,7 @@ public class SignalFacadeV3 {
private SignalError deleteStatusError(Status status) { private SignalError deleteStatusError(Status status) {
if (status == null) return SignalError.ERROR_017; if (status == null) return SignalError.ERROR_017;
return switch (status) { return switch (status) {
case PROCESSING, ACCEPTED -> SignalError.ERROR_016; case PROCESSING, ACCEPTED -> SignalError.ERROR_023;
case REJECTED, ERROR -> SignalError.ERROR_024; case REJECTED, ERROR -> SignalError.ERROR_024;
case DELETED -> SignalError.ERROR_025; case DELETED -> SignalError.ERROR_025;
case PROCESSING_REPEATED -> SignalError.ERROR_026; case PROCESSING_REPEATED -> SignalError.ERROR_026;