Merge pull request #35 from HIFI-Team/dev

🚀 feat(exception): 전역 예외 처리 추가 #23

src/main/java/Backend/HIFI/auth/AuthController.java

@@ -32,22 +32,22 @@ public class AuthController {
     /** 로그인 요청 */
     @ApiOperation(value = "로그인 요청")
     @PostMapping(value = "/login")
-    public ResponseEntity<TokenResponseDto> postLoginForm(@RequestBody UserRequestDto userRequestDto) {
+    public TokenResponseDto postLoginForm(@RequestBody UserRequestDto userRequestDto) {
         final TokenResponseDto tokenResponseDto = authService.login(userRequestDto);
         log.info("api = 로그인 요청, req = {}", userRequestDto);
-        return ResponseEntity.ok(tokenResponseDto);
+        return tokenResponseDto;
     }
 
     /** 회원가입을 요청 */
     @ApiOperation(value = "회원가입 요청")
     @PostMapping(value = "/join")
-    public ResponseEntity<UserResponseDto> postJoin(@RequestBody UserRequestDto userRequestDto) {
+    public UserResponseDto postJoin(@RequestBody UserRequestDto userRequestDto) {
         final UserResponseDto userResponseDto = authService.join(userRequestDto);
         log.info("api = 회원가입 요청, req = {}", userRequestDto);
-        return ResponseEntity.ok(userResponseDto);
+        return userResponseDto;
     }
 
-    /** 유저를 로그아운 시킵니다, 엑세스 토큰 쿠키 삭제 */
+    /** 유저를 로그아웃  시킵니다 */
     @ApiOperation(value = "로그아웃 요청")
     @PostMapping("/logout")
     public String postLogout(HttpServletResponse response) {

src/main/java/Backend/HIFI/auth/AuthServiceImpl.java

@@ -39,7 +39,7 @@ public class AuthServiceImpl implements AuthService{
     @Transactional
     public UserResponseDto join(UserRequestDto userRequestDto) {
         if (userRepository.existsByEmail(userRequestDto.getEmail())) {
-            throw new RuntimeException("이미 가입된 유저입니다");
+            throw new BadRequestException("이미 가입된 유저입니다");
         }
 
         User user = userRequestDto.toUser(passwordEncoder);

src/main/java/Backend/HIFI/common/aop/ExceptionAdvice.java

@@ -0,0 +1,43 @@
+package Backend.HIFI.common.aop;
+
+import Backend.HIFI.common.entity.ErrorResponse;
+import Backend.HIFI.common.exception.*;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.ExceptionHandler;
+import org.springframework.web.bind.annotation.ResponseStatus;
+import org.springframework.web.bind.annotation.RestControllerAdvice;
+import org.springframework.web.servlet.mvc.method.annotation.ResponseEntityExceptionHandler;
+
+@Slf4j
+@RestControllerAdvice
+public class ExceptionAdvice {
+
+    @ExceptionHandler
+    @ResponseStatus(HttpStatus.BAD_REQUEST)
+    protected ErrorResponse handleBadRequestException(BadRequestException e) {
+        log.error("BadRequestException : {}", e);
+        return new ErrorResponse(e);
+    }
+
+    @ExceptionHandler
+    @ResponseStatus(HttpStatus.UNAUTHORIZED)
+    protected ErrorResponse handleUnauthorizedException(UnauthorizedException e) {
+        log.error("UnauthorizedException : {}", e);
+        return new ErrorResponse(e);
+    }
+
+    @ExceptionHandler
+    @ResponseStatus(HttpStatus.NOT_FOUND)
+    protected ErrorResponse handleNotFoundExceptionException(NotFoundException e) {
+        log.error("NotFoundException : {}", e);
+        return new ErrorResponse(e);
+    }
+
+    @ExceptionHandler
+    protected ErrorResponse handleAllException(Exception e) {
+        log.error("Exception : {}", e);
+        return new ErrorResponse(BaseException.toBaseException(e));
+    }
+}

src/main/java/Backend/HIFI/common/aop/ResponseAdvice.java

@@ -0,0 +1,36 @@
+package Backend.HIFI.common.aop;
+
+import Backend.HIFI.common.entity.ErrorResponse;
+import Backend.HIFI.common.utils.ResponseUtil;
+import org.springframework.core.MethodParameter;
+import org.springframework.http.MediaType;
+import org.springframework.http.converter.HttpMessageConverter;
+import org.springframework.http.server.ServerHttpRequest;
+import org.springframework.http.server.ServerHttpResponse;
+import org.springframework.web.bind.annotation.RestControllerAdvice;
+import org.springframework.web.servlet.mvc.method.annotation.ResponseBodyAdvice;
+
+@RestControllerAdvice
+public class ResponseAdvice implements ResponseBodyAdvice<Object> {
+
+    @Override
+    public boolean supports(
+            MethodParameter returnType,
+            Class<? extends HttpMessageConverter<?>> converterType)
+    {
+        return true;
+    }
+
+    @Override
+    public Object beforeBodyWrite(
+            Object body,
+            MethodParameter returnType,
+            MediaType selectedContentType,
+            Class<? extends HttpMessageConverter<?>> selectedConverterType,
+            ServerHttpRequest request, ServerHttpResponse response)
+    {
+        if (body instanceof ErrorResponse)
+            return ResponseUtil.onError((ErrorResponse) body);
+        return ResponseUtil.onSuccess(body);
+    }
+}

src/main/java/Backend/HIFI/common/entity/BasicResponse.java

@@ -0,0 +1,12 @@
+package Backend.HIFI.common.entity;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+@AllArgsConstructor
+@Getter
+public class BasicResponse<T> {
+    private boolean success;
+    private T response;
+    private ErrorResponse errorResponse;
+}

src/main/java/Backend/HIFI/common/entity/ErrorResponse.java

@@ -0,0 +1,33 @@
+package Backend.HIFI.common.entity;
+
+import Backend.HIFI.common.exception.BaseException;
+import lombok.Getter;
+
+import java.time.LocalDateTime;
+
+@Getter
+public class ErrorResponse {
+    private final LocalDateTime timestamp = LocalDateTime.now();
+    private final int status;
+    private final String error;
+//    private final String code;
+    private final String message;
+
+    public ErrorResponse(BaseException e) {
+        this.status = e.getHttpStatusCode().value();
+        this.error = e.getHttpStatusCode().name();
+        this.message = e.getMessage();
+    }
+
+//    public static ResponseEntity<ErrorResponse> toResponseEntity(BaseException e) {
+//        return ResponseEntity
+//                .status(e.getHttpStatusCode())
+//                .body(ErrorResponse.builder()
+//                        .status(e.getHttpStatusCode().value())
+//                        .error(e.getHttpStatusCode().name())
+////                        .code(errorCode.name())
+//                        .message(e.getMessage())
+//                        .build()
+//                );
+//    }
+}

src/main/java/Backend/HIFI/common/exception/BaseException.java

@@ -1,9 +1,7 @@
 package Backend.HIFI.common.exception;
 
-import lombok.AllArgsConstructor;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
-import lombok.RequiredArgsConstructor;
 import org.springframework.http.HttpStatus;
 
 /** Http Status 를 담은 에러 응답을 반환하기 위한

src/main/java/Backend/HIFI/common/utils/ResponseUtil.java

@@ -0,0 +1,13 @@
+package Backend.HIFI.common.utils;
+
+import Backend.HIFI.common.entity.ErrorResponse;
+import Backend.HIFI.common.entity.BasicResponse;
+
+public class ResponseUtil {
+    public static <T>BasicResponse<T> onSuccess(T response) {
+        return new BasicResponse<>(true, response, null);
+    }
+    public static BasicResponse<?> onError(ErrorResponse ex) {
+        return new BasicResponse<>(false, null, ex);
+    }
+}