http://jira.mfd.msk:8088/browse/BKI-3236 Changed return error typy for /all_packages
This commit is contained in:
parent
9253dd3f19
commit
d963533a87
4 changed files with 30 additions and 3 deletions
|
|
@ -74,6 +74,7 @@ public class GlobalExceptionHandler {
|
||||||
switch (ex.getErrorFormat()) {
|
switch (ex.getErrorFormat()) {
|
||||||
case MonitoringError -> commonError = new MonitoringError();
|
case MonitoringError -> commonError = new MonitoringError();
|
||||||
case MonitoringActivePackagesError -> commonError = new MonitoringActivePackagesError();
|
case MonitoringActivePackagesError -> commonError = new MonitoringActivePackagesError();
|
||||||
|
case MonitoringAllPackagesError -> commonError = new MonitoringAllPackagesError();
|
||||||
case MonitoringDownloadError -> commonError = new MonitoringDownloadError();
|
case MonitoringDownloadError -> commonError = new MonitoringDownloadError();
|
||||||
case MonitoringReportListError -> commonError = new MonitoringReportListError();
|
case MonitoringReportListError -> commonError = new MonitoringReportListError();
|
||||||
case MonitoringPackageDeleteError -> commonError = new MonitoringPackageDeleteError();
|
case MonitoringPackageDeleteError -> commonError = new MonitoringPackageDeleteError();
|
||||||
|
|
|
||||||
|
|
@ -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;
|
||||||
|
|
||||||
|
}
|
||||||
|
|
@ -2,6 +2,7 @@ package ru.nbch.credit_tracker.enums;
|
||||||
|
|
||||||
public enum XmlErrorFormat {
|
public enum XmlErrorFormat {
|
||||||
MonitoringActivePackagesError,
|
MonitoringActivePackagesError,
|
||||||
|
MonitoringAllPackagesError,
|
||||||
MonitoringDownloadError,
|
MonitoringDownloadError,
|
||||||
MonitoringError,
|
MonitoringError,
|
||||||
MonitoringPackageDeleteError,
|
MonitoringPackageDeleteError,
|
||||||
|
|
|
||||||
|
|
@ -299,7 +299,7 @@ public class SignalFacade {
|
||||||
try {
|
try {
|
||||||
AuthorizationService.AuthResult authResult = authorizationService.findAuthInfo(allPackagesRequest.getUserId(), allPackagesRequest.getPassword());
|
AuthorizationService.AuthResult authResult = authorizationService.findAuthInfo(allPackagesRequest.getUserId(), allPackagesRequest.getPassword());
|
||||||
if (!authResult.isSuccess()) {
|
if (!authResult.isSuccess()) {
|
||||||
throw clientExcp(authResult.getError(), XmlErrorFormat.MonitoringActivePackagesError);
|
throw clientExcp(authResult.getError(), XmlErrorFormat.MonitoringAllPackagesError);
|
||||||
}
|
}
|
||||||
List<UserPackage> activePackages = signalService.findAllPackages(allPackagesRequest.getUserId());
|
List<UserPackage> activePackages = signalService.findAllPackages(allPackagesRequest.getUserId());
|
||||||
|
|
||||||
|
|
@ -321,13 +321,13 @@ public class SignalFacade {
|
||||||
response.setPackages(packages);
|
response.setPackages(packages);
|
||||||
return ResponseEntity.ok(response);
|
return ResponseEntity.ok(response);
|
||||||
} else {
|
} else {
|
||||||
throw clientExcp(SignalError.ERROR_019, XmlErrorFormat.MonitoringActivePackagesError);
|
throw clientExcp(SignalError.ERROR_019, XmlErrorFormat.MonitoringAllPackagesError);
|
||||||
}
|
}
|
||||||
} catch (Exception e) {
|
} catch (Exception e) {
|
||||||
if (e instanceof SignalClientException) {
|
if (e instanceof SignalClientException) {
|
||||||
throw (SignalClientException) e;
|
throw (SignalClientException) e;
|
||||||
}
|
}
|
||||||
throw serverExcp(SignalError.ERROR_013, XmlErrorFormat.MonitoringActivePackagesError, e);
|
throw serverExcp(SignalError.ERROR_013, XmlErrorFormat.MonitoringAllPackagesError, e);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Add table
Reference in a new issue