공통코드 삭제 API 커밋, 삭제일시 컬럼 추가, 에러로그에 userId 토큰으로 로직 변경

src/main/java/com/kamco/cd/kamcoback/config/GlobalExceptionHandler.java

@@ -1,5 +1,6 @@
 package com.kamco.cd.kamcoback.config;
 
+import com.kamco.cd.kamcoback.auth.CustomUserDetails;
 import com.kamco.cd.kamcoback.common.exception.CustomApiException;
 import com.kamco.cd.kamcoback.config.api.ApiLogFunction;
 import com.kamco.cd.kamcoback.config.api.ApiResponseDto;
@@ -23,6 +24,7 @@ import org.springframework.dao.DuplicateKeyException;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.http.converter.HttpMessageNotReadableException;
+import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
 import org.springframework.web.bind.MethodArgumentNotValidException;
 import org.springframework.web.bind.annotation.ExceptionHandler;
 import org.springframework.web.bind.annotation.ResponseStatus;
@@ -370,8 +372,23 @@ public class GlobalExceptionHandler {
       HttpStatus httpStatus,
       ErrorLogDto.LogErrorLevel logErrorLevel,
       StackTraceElement[] stackTrace) {
-    // TODO : 로그인 개발되면 이것도 연결해야 함
-    Long userid = Long.valueOf(Optional.ofNullable(ApiLogFunction.getUserId(request)).orElse("1"));
+
+    Long userid = null;
+
+    /**
+     * servletRequest.getUserPrincipal() instanceof UsernamePasswordAuthenticationToken auth
+     * 이 요청이 JWT 인증을 통과한 요청인가? 그리고 Spring Security Authentication 객체가 UsernamePasswordAuthenticationToken 타입인가? 체크
+     */
+    /**
+     * auth.getPrincipal() instanceof CustomUserDetails customUserDetails
+     * principal 안에 들어있는 객체가 내가 만든 CustomUserDetails 타입인가? 체크
+     */
+    if (request.getUserPrincipal() instanceof UsernamePasswordAuthenticationToken auth
+      && auth.getPrincipal() instanceof CustomUserDetails customUserDetails) {
+
+      // audit 에는 long 타입 user_id가 들어가지만 토큰 sub은 uuid여서 user_id 가져오기
+      userid = customUserDetails.getMember().getId();
+    }
 
     String stackTraceStr =
         Arrays.stream(stackTrace)

src/main/java/com/kamco/cd/kamcoback/config/api/ApiResponseDto.java

@@ -67,6 +67,14 @@ public class ApiResponseDto<T> {
     return new ApiResponseDto<>(data, HttpStatus.OK);
   }
 
+  public static <T> ApiResponseDto<ResponseObj> okObject(ResponseObj data) {
+    if (data.getFlag().equals(SuccFailCode.SUCCESS)) {
+      return new ApiResponseDto<>(data, HttpStatus.OK);
+    } else{
+      return new ApiResponseDto<>(data.getCode(), data.getMessage(), HttpStatus.OK);
+    }
+  }
+
   public static <T> ApiResponseDto<T> deleteOk(T data) {
     return new ApiResponseDto<>(data, HttpStatus.NO_CONTENT);
   }
@@ -106,6 +114,39 @@ public class ApiResponseDto<T> {
     }
   }
 
+  @Getter
+  public static class ResponseObj {
+
+    private final SuccFailCode flag;
+    private final ApiResponseCode code;
+    private final String message;
+
+    public ResponseObj(SuccFailCode flag, ApiResponseCode code, String message) {
+      this.flag = flag;
+      this.code = code;
+      this.message = message;
+    }
+  }
+
+  @Getter
+  @RequiredArgsConstructor
+  public enum SuccFailCode implements EnumType {
+    SUCCESS("성공"),
+    FAIL("실패");
+
+    private final String desc;
+
+    @Override
+    public String getId() {
+      return name();
+    }
+
+    @Override
+    public String getText() {
+      return desc;
+    }
+  }
+
   @Getter
   @RequiredArgsConstructor
   public enum ApiResponseCode implements EnumType {