Merge pull request #53 from f-lab-edu/fix/error-code-base-interface

fix: ErrorCode 타입 불일치로 인한 컴파일 에러 수정

Author: gangsungu

module-api/src/test/java/com/whiskey/auth/controller/AuthControllerTest.java

@@ -3,9 +3,11 @@
 import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.post;
 import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.*;
 
+import com.whiskey.domain.auth.repository.RefreshTokenRepository;
 import com.whiskey.domain.member.Member;
 import com.whiskey.domain.member.enums.MemberStatus;
 import com.whiskey.domain.member.repository.MemberRepository;
+import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -26,11 +28,15 @@ public class AuthControllerTest {
     @Autowired
     MemberRepository memberRepository;
 
+    @Autowired
+    RefreshTokenRepository refreshTokenRepository;
+
     @Autowired
     PasswordEncoder passwordEncoder;
 
     @BeforeEach
     void setUp() {
+        refreshTokenRepository.deleteAll();
         memberRepository.deleteAll();
         memberRepository.save(
             Member.builder()
@@ -56,4 +62,10 @@ void login_success_return_jwt_token() throws Exception {
             .andExpect(jsonPath("$.data.tokenType").value("Bearer"))
             .andExpect(jsonPath("$.data.memberInfo.email").value("tester22@example.com"));
     }
+
+    @AfterEach
+    void clearDatabase() {
+        refreshTokenRepository.deleteAll();
+        memberRepository.deleteAll();
+    }
 }

module-common/src/main/java/com/whiskey/exception/ErrorCode.java

@@ -5,7 +5,7 @@
 
 @Getter
 @Deprecated
-public enum ErrorCode {
+public enum ErrorCode implements BaseErrorCode {
     VALIDATION_ERROR(HttpStatus.BAD_REQUEST, "유효성 검증에 실패했습니다."),
     INTERNAL_SERVER_ERROR(HttpStatus.INTERNAL_SERVER_ERROR, "서버에 문제가 발생했습니다. 잠시 후 다시 시도해주세요."),
     CONFLICT(HttpStatus.CONFLICT, "이미 처리된 요청입니다."),

module-common/src/main/java/com/whiskey/exception/GlobalExceptionHandler.java

@@ -17,7 +17,7 @@ public class GlobalExceptionHandler {
     @ExceptionHandler(Exception.class)
     public ResponseEntity<ApiResponse<Object>> handleCommonException(Exception exception) {
         log.error(exception.getMessage(), exception);
-        ErrorCode errorCode = ErrorCode.INTERNAL_SERVER_ERROR;
+        CommonErrorCode errorCode = CommonErrorCode.INTERNAL_SERVER_ERROR;
 
         ApiResponse<Object> response = new ApiResponse<>(
             false,
@@ -32,7 +32,7 @@ public ResponseEntity<ApiResponse<Object>> handleCommonException(Exception excep
     @ExceptionHandler(BusinessException.class)
     public ResponseEntity<ApiResponse<Object>> handleBusinessException(BusinessException exception) {
         log.warn("code={}, message={}", exception.getErrorCode(), exception.getMessage());
-        ErrorCode errorCode = exception.getErrorCode();
+        BaseErrorCode errorCode = exception.getErrorCode();
         HttpStatus status = errorCode.getHttpStatus();
         String message = exception.getMessage();
         Object data = exception.getData();
@@ -50,7 +50,6 @@ public ResponseEntity<ApiResponse<Object>> handleBusinessException(BusinessExcep
     @ExceptionHandler(MethodArgumentNotValidException.class)
     public ResponseEntity<ApiResponse<Object>> handleMethodArgumentNotValidException(MethodArgumentNotValidException exception) {
         log.warn("Validation 실패: {}", exception.getBindingResult().getFieldErrors());
-        ErrorCode errorCode = ErrorCode.VALIDATION_ERROR;
 
         // 필드별 에러 메시지 추가
         Map<String, String> errorMessage = new HashMap<>();
@@ -60,11 +59,11 @@ public ResponseEntity<ApiResponse<Object>> handleMethodArgumentNotValidException
 
         ApiResponse<Object> response = new ApiResponse<>(
             false,
-            errorCode.name(),
-            errorCode.getMessage(),
+            HttpStatus.BAD_REQUEST.name(),
+            "유효성 검증에 실패했습니다.",
             errorMessage
         );
 
-        return ResponseEntity.status(errorCode.getHttpStatus()).body(response);
+        return ResponseEntity.status(HttpStatus.BAD_REQUEST).body(response);
     }
 }