diff --git a/src/main/java/ru/nbch/credit_tracker/config/rest/GlobalExceptionHandler.java b/src/main/java/ru/nbch/credit_tracker/config/rest/GlobalExceptionHandler.java index edbbabb..68968d5 100644 --- a/src/main/java/ru/nbch/credit_tracker/config/rest/GlobalExceptionHandler.java +++ b/src/main/java/ru/nbch/credit_tracker/config/rest/GlobalExceptionHandler.java @@ -74,6 +74,7 @@ public class GlobalExceptionHandler { switch (ex.getErrorFormat()) { case MonitoringError -> commonError = new MonitoringError(); case MonitoringActivePackagesError -> commonError = new MonitoringActivePackagesError(); + case MonitoringAllPackagesError -> commonError = new MonitoringAllPackagesError(); case MonitoringDownloadError -> commonError = new MonitoringDownloadError(); case MonitoringReportListError -> commonError = new MonitoringReportListError(); case MonitoringPackageDeleteError -> commonError = new MonitoringPackageDeleteError(); diff --git a/src/main/java/ru/nbch/credit_tracker/entities/user_response/errors/MonitoringAllPackagesError.java b/src/main/java/ru/nbch/credit_tracker/entities/user_response/errors/MonitoringAllPackagesError.java new file mode 100644 index 0000000..1a339e6 --- /dev/null +++ b/src/main/java/ru/nbch/credit_tracker/entities/user_response/errors/MonitoringAllPackagesError.java @@ -0,0 +1,25 @@ +package ru.nbch.credit_tracker.entities.user_response.errors; + +import jakarta.xml.bind.annotation.*; +import lombok.Getter; +import lombok.Setter; + +@Getter +@Setter +@XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "MonitoringAllPackagesResponse", propOrder = { + "status", + "errorCode", + "errorText" +}) +@XmlRootElement(name = "MonitoringAllPackagesResponse") +public class MonitoringAllPackagesError implements CommonError { + + @XmlElement(name = "Status", required = true) + protected String status; + @XmlElement(name = "Code",required = true) + protected String errorCode; + @XmlElement(name = "Message",required = true) + protected String errorText; + +} diff --git a/src/main/java/ru/nbch/credit_tracker/enums/XmlErrorFormat.java b/src/main/java/ru/nbch/credit_tracker/enums/XmlErrorFormat.java index 45498ea..c6e3783 100644 --- a/src/main/java/ru/nbch/credit_tracker/enums/XmlErrorFormat.java +++ b/src/main/java/ru/nbch/credit_tracker/enums/XmlErrorFormat.java @@ -2,6 +2,7 @@ package ru.nbch.credit_tracker.enums; public enum XmlErrorFormat { MonitoringActivePackagesError, + MonitoringAllPackagesError, MonitoringDownloadError, MonitoringError, MonitoringPackageDeleteError, diff --git a/src/main/java/ru/nbch/credit_tracker/facade/SignalFacade.java b/src/main/java/ru/nbch/credit_tracker/facade/SignalFacade.java index d569b2b..bbbe855 100644 --- a/src/main/java/ru/nbch/credit_tracker/facade/SignalFacade.java +++ b/src/main/java/ru/nbch/credit_tracker/facade/SignalFacade.java @@ -299,7 +299,7 @@ public class SignalFacade { try { AuthorizationService.AuthResult authResult = authorizationService.findAuthInfo(allPackagesRequest.getUserId(), allPackagesRequest.getPassword()); if (!authResult.isSuccess()) { - throw clientExcp(authResult.getError(), XmlErrorFormat.MonitoringActivePackagesError); + throw clientExcp(authResult.getError(), XmlErrorFormat.MonitoringAllPackagesError); } List activePackages = signalService.findAllPackages(allPackagesRequest.getUserId()); @@ -321,13 +321,13 @@ public class SignalFacade { response.setPackages(packages); return ResponseEntity.ok(response); } else { - throw clientExcp(SignalError.ERROR_019, XmlErrorFormat.MonitoringActivePackagesError); + throw clientExcp(SignalError.ERROR_019, XmlErrorFormat.MonitoringAllPackagesError); } } catch (Exception e) { if (e instanceof SignalClientException) { throw (SignalClientException) e; } - throw serverExcp(SignalError.ERROR_013, XmlErrorFormat.MonitoringActivePackagesError, e); + throw serverExcp(SignalError.ERROR_013, XmlErrorFormat.MonitoringAllPackagesError, e); } }