[fix] @Valid 예외 핸들러 추가 (#21)

NadoYagsa · Aug 29, 2022 · 24e325a · 24e325a
1 parent 5da7993
commit 24e325a
Show file tree

Hide file tree

Showing 3 changed files with 28 additions and 3 deletions.
diff --git a/src/main/java/com/nadoyagsa/pillaroid/common/controller/ResponseEntityExceptionHandler.java b/src/main/java/com/nadoyagsa/pillaroid/common/controller/ResponseEntityExceptionHandler.java
@@ -1,9 +1,12 @@
 package com.nadoyagsa.pillaroid.common.controller;
 
 import java.io.IOException;
+import java.time.format.DateTimeParseException;
 
+import com.fasterxml.jackson.core.JsonProcessingException;
 import com.nadoyagsa.pillaroid.common.exception.InternalServerException;
 import org.springframework.http.HttpStatus;
+import org.springframework.web.bind.MethodArgumentNotValidException;
 import org.springframework.web.bind.annotation.ExceptionHandler;
 import org.springframework.web.bind.annotation.ResponseStatus;
 import org.springframework.web.bind.annotation.RestController;
@@ -54,4 +57,20 @@ protected ApiResponse methodArgumentTypeMismatchError(MethodArgumentTypeMismatch
 		log.error(ex.getMessage());
 		return ApiResponse.error(ErrorCode.BAD_PARAMETER_TYPE);
 	}
+
+	// 유효성 검사 실패 시
+	@ResponseStatus(value = HttpStatus.BAD_REQUEST)
+	@ExceptionHandler(value = {MethodArgumentNotValidException.class})
+	protected ApiResponse methodArgumetNotValidException(MethodArgumentNotValidException ex) {
+		log.error(ex.getMessage());
+		return ApiResponse.error(ErrorCode.BAD_PARAMETER, ex.getBindingResult().getAllErrors().get(0).getDefaultMessage());
+	}
+
+	// JSON 직렬화, 역직렬화 실패 (ex. 타입 변환 실패)
+	@ResponseStatus(value = HttpStatus.BAD_REQUEST)
+	@ExceptionHandler(value = {JsonProcessingException.class})
+	protected ApiResponse jsonProcessingException(JsonProcessingException ex) {
+		log.error(ex.getMessage());
+		return ApiResponse.error(ErrorCode.BAD_PARAMETER);
+	}
 }
diff --git a/src/main/java/com/nadoyagsa/pillaroid/common/dto/ApiResponse.java b/src/main/java/com/nadoyagsa/pillaroid/common/dto/ApiResponse.java
@@ -30,4 +30,10 @@ public static <T> ApiResponse<T> success(T data) {
 	public static <T> ApiResponse<T> error(ErrorCode errorCode) {
 		return new ApiResponse<>(errorCode.getErrorIdx(), errorCode.getErrorStatus(), errorCode.getDetail(), null);
 	}
+
+	// 상세 오류 메시지를 포함
+	public static <T> ApiResponse<T> error(ErrorCode errorCode, String causeMessage) {
+		String message = String.format("%s(%s)", errorCode.getDetail(), causeMessage);
+		return new ApiResponse<>(errorCode.getErrorIdx(), errorCode.getErrorStatus(), message, null);
+	}
 }
diff --git a/src/main/java/com/nadoyagsa/pillaroid/dto/AlarmTimeDto.java b/src/main/java/com/nadoyagsa/pillaroid/dto/AlarmTimeDto.java
@@ -13,11 +13,11 @@
 @Getter
 @Builder
 public class AlarmTimeDto {
-	@NotNull
+	@NotNull(message = "morning 필수")
 	private LocalTime morning;
-	@NotNull
+	@NotNull(message = "lunch 필수")
 	private LocalTime lunch;
-	@NotNull
+	@NotNull(message = "dinner 필수")
 	private LocalTime dinner;
 
 	public AlarmTime toEntity(User user) {