diff --git a/src/main/java/com/interplug/qcast/batch/system/AdminUserConfiguration.java b/src/main/java/com/interplug/qcast/batch/system/AdminUserConfiguration.java index 15d71ffd..d071c82f 100644 --- a/src/main/java/com/interplug/qcast/batch/system/AdminUserConfiguration.java +++ b/src/main/java/com/interplug/qcast/batch/system/AdminUserConfiguration.java @@ -71,7 +71,12 @@ public class AdminUserConfiguration implements JobExecutionListener { @Bean public ItemProcessor adminUserProcessor() { - return item -> item; + return item -> { + if (item.getCategory() != null && item.getCategory().length() > 20) { + item.setCategory(item.getCategory().substring(0, 20)); + } + return item; + }; } @Bean diff --git a/src/main/java/com/interplug/qcast/config/Exception/GlobalExceptionHandler.java b/src/main/java/com/interplug/qcast/config/Exception/GlobalExceptionHandler.java index 3d556324..85f85bfb 100644 --- a/src/main/java/com/interplug/qcast/config/Exception/GlobalExceptionHandler.java +++ b/src/main/java/com/interplug/qcast/config/Exception/GlobalExceptionHandler.java @@ -1,6 +1,7 @@ package com.interplug.qcast.config.Exception; import lombok.extern.slf4j.Slf4j; +import org.springframework.http.MediaType; import org.springframework.http.ResponseEntity; import org.springframework.web.HttpRequestMethodNotSupportedException; import org.springframework.web.bind.annotation.ExceptionHandler; @@ -12,6 +13,7 @@ public class GlobalExceptionHandler { @ExceptionHandler(HttpRequestMethodNotSupportedException.class) protected ResponseEntity handle(HttpRequestMethodNotSupportedException e) { return ResponseEntity.badRequest() + .contentType(MediaType.APPLICATION_JSON) .body(ErrorResponse.of(ErrorCode.METHOD_NOT_ALLOWED.getMessage())); } @@ -19,6 +21,7 @@ public class GlobalExceptionHandler { protected ResponseEntity handle(BaseException e) { final ErrorCode errorCode = e.getErrorCode(); return ResponseEntity.status(errorCode.getStatus()) + .contentType(MediaType.APPLICATION_JSON) .body(ErrorResponse.of(errorCode.getMessage())); } @@ -27,14 +30,18 @@ public class GlobalExceptionHandler { final ErrorCode errorCode = e.getErrorCode(); if (e.getMessage() == null) { return ResponseEntity.status(errorCode.getStatus()) + .contentType(MediaType.APPLICATION_JSON) .body(ErrorResponse.of(errorCode.getMessage())); } - return ResponseEntity.status(errorCode.getStatus()).body(ErrorResponse.of(e.getMessage())); + return ResponseEntity.status(errorCode.getStatus()) + .contentType(MediaType.APPLICATION_JSON) + .body(ErrorResponse.of(e.getMessage())); } @ExceptionHandler(Exception.class) protected ResponseEntity handle(Exception e) { return ResponseEntity.internalServerError() + .contentType(MediaType.APPLICATION_JSON) .body(ErrorResponse.of(ErrorCode.INTERNAL_SERVER_ERROR.getMessage())); } }