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 c241a70..6485371 100644 --- a/src/main/java/ru/nbch/credit_tracker/facade/SignalFacade.java +++ b/src/main/java/ru/nbch/credit_tracker/facade/SignalFacade.java @@ -148,23 +148,23 @@ public class SignalFacade { ResponseEntity validateReruqredTags(MonitoringRequest request) { if (request.getUserId() == null) { - return getBadResponse(SignalError.ERROR_002); // + userId + return getBadResponse(SignalError.ERROR_002, "UserId"); } if (request.getPackageName() == null) { - return getBadResponse(SignalError.ERROR_002); // + packageName + return getBadResponse(SignalError.ERROR_002, "PackageName"); } if (request.getPassword() == null) { - return getBadResponse(SignalError.ERROR_002); // + password + return getBadResponse(SignalError.ERROR_002, "Password"); } if (request.getSubjects() == null) { - return getBadResponse(SignalError.ERROR_002); // + subjects + return getBadResponse(SignalError.ERROR_002, "Subjects"); } if (request.getSubjects().getSubject().isEmpty()) { - return getBadResponse(SignalError.ERROR_002); // subject + return getBadResponse(SignalError.ERROR_002, "Subject"); } return null; @@ -181,8 +181,12 @@ public class SignalFacade { file.getOriginalFilename() != null && file.getOriginalFilename().toLowerCase().endsWith(".zip"); } - private ResponseEntity getBadResponse(SignalError error) { - String errorPath = failureAnswerGenerator.generateFailureAnswer(error); + private ResponseEntity getBadResponse(SignalError error, String tag) { + String errorPath = failureAnswerGenerator.generateFailureAnswer(error, tag); return ResponseEntity.badRequest().body(new PathResource(errorPath)); } + + private ResponseEntity getBadResponse(SignalError error) { + return getBadResponse(error, null); + } } diff --git a/src/main/java/ru/nbch/credit_tracker/service/FailureAnswerGenerator.java b/src/main/java/ru/nbch/credit_tracker/service/FailureAnswerGenerator.java index f8873bd..4d07ac3 100644 --- a/src/main/java/ru/nbch/credit_tracker/service/FailureAnswerGenerator.java +++ b/src/main/java/ru/nbch/credit_tracker/service/FailureAnswerGenerator.java @@ -25,6 +25,10 @@ public class FailureAnswerGenerator { } public String generateFailureAnswer(SignalError error) { + return generateFailureAnswer(error, null); + } + + public String generateFailureAnswer(SignalError error, String tag) { try { File tempFolder = new File(ANSWER_PATH); if (!tempFolder.exists()) { @@ -33,7 +37,7 @@ public class FailureAnswerGenerator { String answerPath = ANSWER_PATH + File.separator + UUID.randomUUID() + File.separator + "error_reply.xml"; IXmlProcessor xmlProcessor = xmlUtilService.createJaxbProcessor(); - String errorMessage = xmlProcessor.asString(createErrorMessage(error), false); + String errorMessage = xmlProcessor.asString(createErrorMessage(error, tag), false); FileUtils.writeStringToFile(new File(answerPath), errorMessage, Charset.forName("windows-1251")); return answerPath; @@ -43,12 +47,15 @@ public class FailureAnswerGenerator { return null; } - // TODO think about common error class - private MonitoringError createErrorMessage(SignalError error) { + private MonitoringError createErrorMessage(SignalError error, String tag) { MonitoringError errorMessage = new MonitoringError(); errorMessage.setStatus("error"); errorMessage.setErrorCode(error.getCode()); - errorMessage.setErrorText(error.getMessage()); + if (tag != null) { + errorMessage.setErrorText(error.getMessage() + " " + tag); + } else { + errorMessage.setErrorText(error.getMessage()); + } return errorMessage; }