[Fix]: GlobalExceptionHandler

실수로 올렸습니다..

Author: dlawhd

src/main/java/com/backend/global/exception/GlobalExceptionHandler.java

@@ -1,87 +1,69 @@
 package com.backend.global.exception;
 
 import com.backend.global.response.RsData;
-import jakarta.validation.ConstraintViolationException;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
-import org.springframework.security.access.AccessDeniedException;
-import org.springframework.security.core.AuthenticationException;
-import org.springframework.web.bind.MethodArgumentNotValidException;
 import org.springframework.web.bind.annotation.ExceptionHandler;
 import org.springframework.web.bind.annotation.RestControllerAdvice;
-import org.springframework.web.server.ResponseStatusException;
-import org.springframework.http.converter.HttpMessageNotReadableException;
 
 import java.util.NoSuchElementException;
 
+import static org.springframework.http.HttpStatus.NOT_FOUND;
+
 @RestControllerAdvice
 public class GlobalExceptionHandler {
-
-    /** 커스텀 ServiceException: resultCode를 HTTP 코드로 사용 */
+    // ServiceException의 resultCode에 따라 동적으로 HTTP 상태 코드를 반환
     @ExceptionHandler(ServiceException.class)
     public ResponseEntity<RsData<Void>> handleServiceException(ServiceException e) {
         HttpStatus httpStatus;
         try {
-            httpStatus = HttpStatus.valueOf(Integer.parseInt(e.getResultCode()));
+            int resultCode = Integer.parseInt(e.getResultCode().split("-")[0]);
+            httpStatus = HttpStatus.valueOf(resultCode);
         } catch (NumberFormatException ex) {
             httpStatus = HttpStatus.BAD_REQUEST;
         }
 
-        String msg = e.getMessage();
-        if (msg != null && msg.startsWith(e.getResultCode() + ":")) {
-            msg = msg.substring(e.getResultCode().length() + 1);
+        String rawMessage = e.getMessage();
+        // 메시지에서 resultCode 접두사 제거
+        if (rawMessage != null && rawMessage.startsWith(e.getResultCode() + ":")) {
+            rawMessage = rawMessage.substring(e.getResultCode().length() + 1);
         }
-        return new ResponseEntity<>(new RsData<>(e.getResultCode(), msg), httpStatus);
-    }
 
-    /** 스프링의 명시적 상태 예외는 그대로 통과 */
-    @ExceptionHandler(ResponseStatusException.class)
-    public ResponseEntity<RsData<Void>> handleRse(ResponseStatusException e) {
-        HttpStatus status = HttpStatus.valueOf(e.getStatusCode().value());
-        return new ResponseEntity<>(new RsData<>(String.valueOf(status.value()), e.getReason()), status);
-    }
+        RsData<Void> rsData = new RsData<>(e.getResultCode(), rawMessage);
 
-    /** 검증 실패: 400 */
-    @ExceptionHandler({
-            IllegalArgumentException.class,            // 비즈니스/입력 검증
-            HttpMessageNotReadableException.class,    // JSON 파싱 에러
-            ConstraintViolationException.class        // @Validated on params
-    })
-    public ResponseEntity<RsData<Void>> handleBadRequest(Exception e) {
-        return new ResponseEntity<>(new RsData<>("400", e.getMessage()), HttpStatus.BAD_REQUEST);
+        return new ResponseEntity<>(rsData, httpStatus);
     }
-
-    /** @Valid body 바인딩 에러: 400 + 필드 메시지 */
-    @ExceptionHandler(MethodArgumentNotValidException.class)
-    public ResponseEntity<RsData<Void>> handleMethodArgumentNotValid(MethodArgumentNotValidException e) {
-        String msg = e.getBindingResult().getFieldErrors().stream()
-                .map(fe -> fe.getField() + ": " + fe.getDefaultMessage())
-                .findFirst()
-                .orElse("잘못된 요청입니다.");
-        return new ResponseEntity<>(new RsData<>("400", msg), HttpStatus.BAD_REQUEST);
-    }
-
-    /** 리소스 없음: 404 */
-    @ExceptionHandler({ NoSuchElementException.class, NullPointerException.class })
-    public ResponseEntity<RsData<Void>> handleNotFound(RuntimeException e) {
-        return new ResponseEntity<>(new RsData<>("404", e.getMessage() != null ? e.getMessage() : "Not Found"),
-                HttpStatus.NOT_FOUND);
-    }
-
-    /** 인증/인가: 401/403 */
-    @ExceptionHandler(AuthenticationException.class)
-    public ResponseEntity<RsData<Void>> handleAuth(AuthenticationException e) {
-        return new ResponseEntity<>(new RsData<>("401", "인증이 필요합니다."), HttpStatus.UNAUTHORIZED);
+    @ExceptionHandler(NoSuchElementException.class)
+    public ResponseEntity<RsData<Void>> handle(NoSuchElementException ex) {
+        // HTTP 404 Not Found 상태와 함께 에러 응답을 반환합니다.
+        return new ResponseEntity<>(
+                new RsData<>(
+                        "404-1",
+                        ex.getMessage()
+                ),
+                NOT_FOUND
+        );
     }
 
-    @ExceptionHandler(AccessDeniedException.class)
-    public ResponseEntity<RsData<Void>> handleAccess(AccessDeniedException e) {
-        return new ResponseEntity<>(new RsData<>("403", "접근 권한이 없습니다."), HttpStatus.FORBIDDEN);
+    @ExceptionHandler(IllegalArgumentException.class)
+    public ResponseEntity<RsData<Void>> handle(IllegalArgumentException ex) {
+        return new ResponseEntity<>(
+                new RsData<>(
+                        "400-1",
+                        ex.getMessage()
+                ),
+                HttpStatus.CONFLICT
+        );
     }
 
-    /** 그 외: 500 */
-    @ExceptionHandler(Exception.class)
-    public ResponseEntity<RsData<Void>> handleEtc(Exception e) {
-        return new ResponseEntity<>(new RsData<>("500", "서버 오류"), HttpStatus.INTERNAL_SERVER_ERROR);
+    @ExceptionHandler(NullPointerException.class)
+    public ResponseEntity<RsData<Void>> handle(NullPointerException ex) {
+        return new ResponseEntity<>(
+                new RsData<>(
+                        "404-1",
+                        "NullPointerException"
+                ),
+                NOT_FOUND
+        );
     }
 }