Merge pull request #42 from Nook-Book/develop

[FIX] ErrorResponse 관련 에러 수정 및 oauth2 설정 파일 구조 변경에 따른 수정

src/main/java/com/nookbook/domain/auth/application/IdTokenVerifier.java

@@ -25,9 +25,9 @@
 @RequiredArgsConstructor
 public class IdTokenVerifier {
 
-    @Value("${app.auth.kakao.userInfoUri}")
+    @Value("${spring.security.oauth2.client.provider.kakao.user-info-uri}")
     private String kakaoUserInfoUri;
-    @Value("${app.auth.tokenSecret}")
+    @Value("${app.auth.token-secret}")
     private String jwtSecret;
 
     private static final Logger logger = LoggerFactory.getLogger(IdTokenVerifier.class);

src/main/java/com/nookbook/global/config/security/util/JwtTokenUtil.java

@@ -18,13 +18,13 @@
 @Component
 public class JwtTokenUtil {
 
-    @Value("${app.auth.tokenSecret}")
+    @Value("${app.auth.token-secret}")
     private String jwtSecret; // Base64로 인코딩된 Secret Key
 
-    @Value("${app.auth.tokenExpirationMsec}")
+    @Value("${app.auth.access-token-expiration-msec}")
     private long jwtExpirationInMs;
 
-    @Value("${app.auth.refreshTokenExpirationMsec}")
+    @Value("${app.auth.refresh-token-expiration-msec}")
     private long jwtRefreshExpirationInMs;
 
     private SecretKey getSigningKey() {

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

@@ -14,30 +14,21 @@ public class GlobalExceptionHandler {
     public ResponseEntity<ErrorResponse> handleDefaultException(DefaultException ex) {
         ErrorCode errorCode = ex.getErrorCode();
         ErrorResponse errorResponse = ErrorResponse.builder()
-                .code(errorCode.getCode())
-                .status(errorCode.getStatus())
-                .message(errorCode.getMessage())
-                .build();
+                .code(errorCode).build();
         return new ResponseEntity<>(errorResponse, HttpStatus.valueOf(errorCode.getStatus()));
     }
 
     @ExceptionHandler(NotFoundException.class)
     public ResponseEntity<ErrorResponse> handleNotFoundException(NotFoundException ex) {
         ErrorResponse errorResponse = ErrorResponse.builder()
-                .code("NOT_FOUND")
-                .status(404)
-                .message(ex.getMessage())
-                .build();
+                .code(ErrorCode.NOT_FOUND).build();
         return new ResponseEntity<>(errorResponse, HttpStatus.NOT_FOUND);
     }
 
     @ExceptionHandler(DuplicateException.class)
     public ResponseEntity<ErrorResponse> handleDuplicateException(DuplicateException ex) {
         ErrorResponse errorResponse = ErrorResponse.builder()
-                .code("DUPLICATE_ERROR")
-                .status(409)
-                .message(ex.getMessage())
-                .build();
+                .code(ErrorCode.DUPLICATE_ERROR).build();
         return new ResponseEntity<>(errorResponse, HttpStatus.CONFLICT);
     }
 }

src/main/java/com/nookbook/global/payload/ErrorCode.java

@@ -11,7 +11,9 @@ public enum ErrorCode {
     INVALID_OPTIONAL_ISPRESENT(400, "E004", "해당 값이 존재하지 않습니다."),
     INVALID_CHECK(400, "E005", "해당 값이 유효하지 않습니다."),
     INVALID_AUTHENTICATION(400, "E006", "잘못된 인증입니다."),
-    INVALID_TOKEN(400, "E007", "잘못된 토큰입니다.");
+    INVALID_TOKEN(400, "E007", "잘못된 토큰입니다."),
+    NOT_FOUND(404, "E008", "해당 데이터를 찾을 수 없습니다."),
+    DUPLICATE_ERROR(409, "E009", "중복된 데이터가 존재합니다.");
 
     private final String code;
     private final String message;

src/main/java/com/nookbook/global/payload/ErrorResponse.java

@@ -1,30 +1,36 @@
 package com.nookbook.global.payload;
 
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import lombok.Builder;
-import lombok.Getter;
-import lombok.Setter;
-import org.springframework.validation.FieldError;
+import lombok.*;
 
-import java.time.LocalDateTime;
-import java.util.ArrayList;
-import java.util.List;
 
 @Getter
-@Setter
+@NoArgsConstructor(access = AccessLevel.PROTECTED)
 public class ErrorResponse {
+
+
     private String message;
+    private int status;
     private String code;
+
+
+    @Builder
     private ErrorResponse(final ErrorCode code) {
+        this.status = code.getStatus();
         this.message = code.getMessage();
         this.code = code.getCode();
     }
-    public ErrorResponse(final ErrorCode code, final String message) {
+
+    private ErrorResponse(final ErrorCode code, final String message) {
+        this.status = code.getStatus();
         this.message = message;
         this.code = code.getCode();
 
     }
+
+    public static ErrorResponse of(final ErrorCode code) {
+        return new ErrorResponse(code);
+    }
+
     public static ErrorResponse of(final ErrorCode code, final String message) {
         return new ErrorResponse(code, message);