Merge pull request #144 from WE-ARE-RACCOONS/develop

RAC-304 deploy : 운영 서버 적용
WE-ARE-RACCOONS · Mar 2, 2024 · 3eae0a1 · 3eae0a1
2 parents 76efa0b + 7625c28
commit 3eae0a1
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 12 deletions.
diff --git a/src/main/java/com/postgraduate/global/config/security/jwt/util/JwtUtils.java b/src/main/java/com/postgraduate/global/config/security/jwt/util/JwtUtils.java
@@ -155,10 +155,10 @@ private void jwtExceptionHandler(HttpStatus status, HttpServletResponse response
         response.setStatus(status.value());
         response.setContentType(CONTENT_TYPE);
         response.setCharacterEncoding(CHARACTER_ENCODING);
-        log.error("errorCode {}, errorMessage {}", ex.getErrorCode(), ex.getMessage());
+        log.error("errorCode {}, errorMessage {}", ex.getCode(), ex.getMessage());
         try {
             logService.save(new LogRequest(env, JwtFilter.class.getSimpleName(), ex.getMessage()));
-            String json = new ObjectMapper().writeValueAsString(ResponseDto.create(ex.getErrorCode(), ex.getMessage()));
+            String json = new ObjectMapper().writeValueAsString(ResponseDto.create(ex.getCode(), ex.getMessage()));
             response.getWriter().write(json);
         } catch (Exception e) {
             log.error(e.getMessage());

diff --git a/src/main/java/com/postgraduate/global/dto/ErrorResponse.java b/src/main/java/com/postgraduate/global/dto/ErrorResponse.java
@@ -7,11 +7,11 @@
 @Getter
 @RequiredArgsConstructor
 public class ErrorResponse {
-    private String errorCode;
+    private String code;
     private String message;
 
-    public ErrorResponse(String errorCode, String message) {
-        this.errorCode = errorCode;
+    public ErrorResponse(String code, String message) {
+        this.code = code;
         this.message = message;
     }
 }
diff --git a/src/main/java/com/postgraduate/global/exception/ApplicationException.java b/src/main/java/com/postgraduate/global/exception/ApplicationException.java
@@ -4,10 +4,10 @@
 
 @Getter
 public abstract class ApplicationException extends RuntimeException{
-    private final String errorCode;
+    private final String code;
 
-    protected ApplicationException(String message, String errorCode) {
+    protected ApplicationException(String message, String code) {
         super(message);
-        this.errorCode = errorCode;
+        this.code = code;
     }
 }
diff --git a/src/main/java/com/postgraduate/global/exception/GlobalExceptionHandler.java b/src/main/java/com/postgraduate/global/exception/GlobalExceptionHandler.java
@@ -26,11 +26,11 @@ public class GlobalExceptionHandler {
 
     @ExceptionHandler(ApplicationException.class)
     public ResponseDto<ErrorResponse> handleApplicationException(ApplicationException ex) {
-        return ResponseDto.create(ex.getErrorCode(), ex.getMessage());
+        return ResponseDto.create(ex.getCode(), ex.getMessage());
     }
 
     @ExceptionHandler(MethodArgumentNotValidException.class)
-    public ResponseDto<ErrorResponse> handleArgumentValidException(MethodArgumentNotValidException ex) throws IOException {
+    public ResponseDto<ErrorResponse> handleArgumentValidException(MethodArgumentNotValidException ex) {
         logService.save(new LogRequest(env, "@Valid", ex.getBindingResult().getAllErrors().get(0).getDefaultMessage()));
         log.error(LOG_FORMAT, "@Valid Error", "MethodArgumentNotValidException");
         return ResponseDto.create(ErrorCode.VALID_BLANK.getCode(), ex.getBindingResult().getAllErrors().get(0).getDefaultMessage());

diff --git a/src/main/java/com/postgraduate/global/logging/aop/LogAspect.java b/src/main/java/com/postgraduate/global/logging/aop/LogAspect.java
@@ -50,7 +50,7 @@ private Object getObject(ProceedingJoinPoint joinPoint) throws Throwable {
             return result;
         }catch (ApplicationException e) {
             if (traceStatus != null) {
-                log.error("ErrorCode {} errorMessage {}",e.getErrorCode(), e.getMessage());
+                log.error("ErrorCode {} errorMessage {}",e.getCode(), e.getMessage());
                 log.error("{}", e.getStackTrace());
                 logService.save(new LogRequest(env, traceStatus.threadId(), traceStatus.methodName(), e.getMessage()));
             }

diff --git a/src/main/java/com/postgraduate/global/logging/aop/LogTrace.java b/src/main/java/com/postgraduate/global/logging/aop/LogTrace.java
@@ -30,7 +30,7 @@ public Integer end(TraceStatus traceStatus) { // 걸린 시간 로그 처리 및
 
     public void exception(ApplicationException e, TraceStatus traceStatus) {
         log.error("class : {}, trace : {}", traceStatus.methodName(), e.getStackTrace());
-        log.error(LOG_FORMAT, traceStatus.threadId(), e.getErrorCode(), e.getMessage());
+        log.error(LOG_FORMAT, traceStatus.threadId(), e.getCode(), e.getMessage());
         removeMdcContext();
     }