feat: format error

2025-11-20 14:50:02 +09:00
parent 5c030869fd
commit 04678b6b6e
33 changed files with 1031 additions and 852 deletions
--- a/src/main/java/com/kamco/cd/kamcoback/config/api/ApiLogFilter.java
+++ b/src/main/java/com/kamco/cd/kamcoback/config/api/ApiLogFilter.java
@@ -4,22 +4,21 @@ import jakarta.servlet.FilterChain;
 import jakarta.servlet.ServletException;
 import jakarta.servlet.http.HttpServletRequest;
 import jakarta.servlet.http.HttpServletResponse;
+import java.io.IOException;
 import org.springframework.stereotype.Component;
 import org.springframework.web.filter.OncePerRequestFilter;
 import org.springframework.web.util.ContentCachingRequestWrapper;
 import org.springframework.web.util.ContentCachingResponseWrapper;

-import java.io.IOException;
-
@Component
 public class ApiLogFilter extends OncePerRequestFilter {
  @Override
-  protected void doFilterInternal(HttpServletRequest request, HttpServletResponse response, FilterChain filterChain) throws ServletException, IOException {
-    ContentCachingRequestWrapper wrappedRequest =
-      new ContentCachingRequestWrapper(request);
+  protected void doFilterInternal(
+      HttpServletRequest request, HttpServletResponse response, FilterChain filterChain)
+      throws ServletException, IOException {
+    ContentCachingRequestWrapper wrappedRequest = new ContentCachingRequestWrapper(request);

-    ContentCachingResponseWrapper wrappedResponse =
-      new ContentCachingResponseWrapper(response);
+    ContentCachingResponseWrapper wrappedResponse = new ContentCachingResponseWrapper(response);

    filterChain.doFilter(wrappedRequest, wrappedResponse);

--- a/src/main/java/com/kamco/cd/kamcoback/config/api/ApiLogFunction.java
+++ b/src/main/java/com/kamco/cd/kamcoback/config/api/ApiLogFunction.java
@@ -3,11 +3,10 @@ package com.kamco.cd.kamcoback.config.api;
 import com.kamco.cd.kamcoback.log.dto.EventStatus;
 import com.kamco.cd.kamcoback.log.dto.EventType;
 import jakarta.servlet.http.HttpServletRequest;
-import org.springframework.web.util.ContentCachingRequestWrapper;
-
 import java.io.UnsupportedEncodingException;
 import java.util.Map;
 import java.util.stream.Collectors;
+import org.springframework.web.util.ContentCachingRequestWrapper;

 public class ApiLogFunction {
  // 클라이언트 IP 추출
@@ -26,7 +25,7 @@ public class ApiLogFunction {
      }
    }
    String ip = request.getRemoteAddr();
-    if ("0:0:0:0:0:0:0:1".equals(ip)) {   //local 일 때
+    if ("0:0:0:0:0:0:0:1".equals(ip)) { // local 일 때
      ip = "127.0.0.1";
    }
    return ip;
@@ -45,9 +44,9 @@ public class ApiLogFunction {
    String method = request.getMethod().toUpperCase();
    String uri = request.getRequestURI().toLowerCase();

-    //URL 기반 DOWNLOAD/PRINT 분류
-    if(uri.contains("/download") || uri.contains("/export"))  return EventType.DOWNLOAD;
-    if(uri.contains("/print"))  return EventType.PRINT;
+    // URL 기반 DOWNLOAD/PRINT 분류
+    if (uri.contains("/download") || uri.contains("/export")) return EventType.DOWNLOAD;
+    if (uri.contains("/print")) return EventType.PRINT;

    // 일반 CRUD
    return switch (method) {
@@ -59,23 +58,25 @@ public class ApiLogFunction {
    };
  }

-  public static String getRequestBody(HttpServletRequest servletRequest, ContentCachingRequestWrapper contentWrapper) {
+  public static String getRequestBody(
+      HttpServletRequest servletRequest, ContentCachingRequestWrapper contentWrapper) {
    StringBuilder resultBody = new StringBuilder();
    // GET, form-urlencoded POST 파라미터
    Map<String, String[]> paramMap = servletRequest.getParameterMap();

-    String queryParams = paramMap.entrySet().stream()
-      .map(e -> e.getKey() + "=" + String.join(",", e.getValue()))
-      .collect(Collectors.joining("&"));
+    String queryParams =
+        paramMap.entrySet().stream()
+            .map(e -> e.getKey() + "=" + String.join(",", e.getValue()))
+            .collect(Collectors.joining("&"));

    resultBody.append(queryParams.isEmpty() ? "" : queryParams);

    // JSON Body
    if ("POST".equalsIgnoreCase(servletRequest.getMethod())
-      && servletRequest.getContentType() != null
-      && servletRequest.getContentType().contains("application/json")) {
+        && servletRequest.getContentType() != null
+        && servletRequest.getContentType().contains("application/json")) {
      try {
-        //json인 경우는 Wrapper를 통해 가져오기
+        // json인 경우는 Wrapper를 통해 가져오기
        resultBody.append(getBodyData(contentWrapper));

      } catch (Exception e) {
@@ -85,8 +86,8 @@ public class ApiLogFunction {

    // Multipart form-data
    if ("POST".equalsIgnoreCase(servletRequest.getMethod())
-      && servletRequest.getContentType() != null
-      && servletRequest.getContentType().startsWith("multipart/form-data")) {
+        && servletRequest.getContentType() != null
+        && servletRequest.getContentType().startsWith("multipart/form-data")) {
      resultBody.append("multipart/form-data request");
    }

@@ -104,8 +105,8 @@ public class ApiLogFunction {
    }
  }

-  //ApiResponse 의 Status가 2xx 범위이면 SUCCESS, 아니면 FAILED
-  public static EventStatus isSuccessFail(ApiResponseDto<?> apiResponse){
+  // ApiResponse 의 Status가 2xx 범위이면 SUCCESS, 아니면 FAILED
+  public static EventStatus isSuccessFail(ApiResponseDto<?> apiResponse) {
    return apiResponse.getHttpStatus().is2xxSuccessful() ? EventStatus.SUCCESS : EventStatus.FAILED;
  }
 }
--- a/src/main/java/com/kamco/cd/kamcoback/config/api/ApiResponseAdvice.java
+++ b/src/main/java/com/kamco/cd/kamcoback/config/api/ApiResponseAdvice.java
@@ -3,6 +3,7 @@ package com.kamco.cd.kamcoback.config.api;
 import com.kamco.cd.kamcoback.postgres.entity.AuditLogEntity;
 import com.kamco.cd.kamcoback.postgres.repository.log.AuditLogRepository;
 import jakarta.servlet.http.HttpServletRequest;
+import java.util.Optional;
 import org.springframework.core.MethodParameter;
 import org.springframework.http.MediaType;
 import org.springframework.http.converter.HttpMessageConverter;
@@ -13,8 +14,6 @@ import org.springframework.web.bind.annotation.RestControllerAdvice;
 import org.springframework.web.servlet.mvc.method.annotation.ResponseBodyAdvice;
 import org.springframework.web.util.ContentCachingRequestWrapper;

-import java.util.Optional;
-
 /**
 * ApiResponseDto의 내장된 HTTP 상태 코드를 실제 HTTP 응답에 적용하는 Advice
 *
@@ -53,16 +52,23 @@ public class ApiResponseAdvice implements ResponseBodyAdvice<Object> {
      response.setStatusCode(apiResponse.getHttpStatus());

      String ip = ApiLogFunction.getClientIp(servletRequest);
-      //TODO : userid 가 계정명인지, uid 인지 확인 후 로직 수정 필요함
-      Long userid = Long.valueOf(Optional.ofNullable(ApiLogFunction.getUserId(servletRequest)).orElse("1"));
+      // TODO : userid 가 계정명인지, uid 인지 확인 후 로직 수정 필요함
+      Long userid =
+          Long.valueOf(Optional.ofNullable(ApiLogFunction.getUserId(servletRequest)).orElse("1"));

-      //TODO: menuUid 를 동적으로 가져오게끔 해야함
-      AuditLogEntity log = new AuditLogEntity(userid, ApiLogFunction.getEventType(servletRequest),
-        ApiLogFunction.isSuccessFail(apiResponse), "MU_01_01", ip, servletRequest.getRequestURI(), ApiLogFunction.getRequestBody(servletRequest, contentWrapper),
-        apiResponse.getErrorLogUid()
-      );
+      // TODO: menuUid 를 동적으로 가져오게끔 해야함
+      AuditLogEntity log =
+          new AuditLogEntity(
+              userid,
+              ApiLogFunction.getEventType(servletRequest),
+              ApiLogFunction.isSuccessFail(apiResponse),
+              "MU_01_01",
+              ip,
+              servletRequest.getRequestURI(),
+              ApiLogFunction.getRequestBody(servletRequest, contentWrapper),
+              apiResponse.getErrorLogUid());

-      //tb_audit_log 테이블 저장
+      // tb_audit_log 테이블 저장
      auditLogRepository.save(log);
    }

--- a/src/main/java/com/kamco/cd/kamcoback/config/api/ApiResponseDto.java
+++ b/src/main/java/com/kamco/cd/kamcoback/config/api/ApiResponseDto.java
@@ -40,11 +40,14 @@ public class ApiResponseDto<T> {
  public ApiResponseDto(ApiResponseCode code, String message) {
    this.error = new Error(code.getId(), message);
  }
+
  public ApiResponseDto(ApiResponseCode code, String message, HttpStatus httpStatus) {
    this.error = new Error(code.getId(), message);
    this.httpStatus = httpStatus;
  }
-  public ApiResponseDto(ApiResponseCode code, String message, HttpStatus httpStatus, Long errorLogUid) {
+
+  public ApiResponseDto(
+      ApiResponseCode code, String message, HttpStatus httpStatus, Long errorLogUid) {
    this.error = new Error(code.getId(), message);
    this.httpStatus = httpStatus;
    this.errorLogUid = errorLogUid;
@@ -75,10 +78,14 @@ public class ApiResponseDto<T> {
  public static ApiResponseDto<String> createException(ApiResponseCode code, String message) {
    return new ApiResponseDto<>(code, message);
  }
-  public static ApiResponseDto<String> createException(ApiResponseCode code, String message, HttpStatus httpStatus) {
+
+  public static ApiResponseDto<String> createException(
+      ApiResponseCode code, String message, HttpStatus httpStatus) {
    return new ApiResponseDto<>(code, message, httpStatus);
  }
-  public static ApiResponseDto<String> createException(ApiResponseCode code, String message, HttpStatus httpStatus, Long errorLogUid) {
+
+  public static ApiResponseDto<String> createException(
+      ApiResponseCode code, String message, HttpStatus httpStatus, Long errorLogUid) {
    return new ApiResponseDto<>(code, message, httpStatus, errorLogUid);
  }