diff --git a/backend/src/main/java/com/nttdata/calender/errorhandling/GlobalExceptionHandler.java b/backend/src/main/java/com/nttdata/calender/errorhandling/GlobalExceptionHandler.java index bbf85ca..23d54e7 100644 --- a/backend/src/main/java/com/nttdata/calender/errorhandling/GlobalExceptionHandler.java +++ b/backend/src/main/java/com/nttdata/calender/errorhandling/GlobalExceptionHandler.java @@ -29,7 +29,9 @@ public class GlobalExceptionHandler { @ExceptionHandler(ARException.class) public ResponseEntity handleARException(ARException e, HttpServletRequest request) { var errorMessage = "Remedy server error: " + e.getMessage(); - return entityResponse(errorMessage, errorMessage, e, HttpStatus.INTERNAL_SERVER_ERROR); + + var userMessage = errorMessage.split(";")[1]; + return entityResponse(userMessage, errorMessage, e, HttpStatus.INTERNAL_SERVER_ERROR); } /** @@ -71,6 +73,11 @@ public class GlobalExceptionHandler { HttpStatus status) { var errorResponse = new ErrorResponse(userMessage, e.getClass().getSimpleName()); errorLogger.error(errorMessage, e); + + System.out.println("userMessage: " + userMessage); + System.out.println("errorMessage: " + errorMessage); + System.out.println("e: "+ e); + return new ResponseEntity<>(errorResponse, status); } } diff --git a/frontend/src/app/state-dialog/state-dialog.component.ts b/frontend/src/app/state-dialog/state-dialog.component.ts index 7035970..7a996c2 100644 --- a/frontend/src/app/state-dialog/state-dialog.component.ts +++ b/frontend/src/app/state-dialog/state-dialog.component.ts @@ -96,7 +96,7 @@ export class StateDialogComponent implements OnInit { this.progress = (counter/this.data.changes.length)*100; } if(res.status == 500){ - this._snackBar.open(this.languageService.lMap.get('stateDialogSnackBarMessageFailiure') + ': ' + res.error.message + ' ChangeNr: '+change.changeNr, this.languageService.lMap.get('stateDialogSnackBarActionFailiure'), { + this._snackBar.open(this.languageService.lMap.get('stateDialogSnackBarMessageFailiure') + ': ' + res.error.message, this.languageService.lMap.get('stateDialogSnackBarActionFailiure'), { horizontalPosition: this.horizontalPosition, verticalPosition: this.verticalPosition, panelClass: ['red-snackbar'],