Merge pull request #131 from ttakkeun/refac

[Refactor]apiPayLoad 리팩토링

src/main/java/ttakkeun/ttakkeun_server/apiPayLoad/ApiResponse.java

@@ -28,6 +28,7 @@ public static <T> ApiResponse<T> onSuccess(T result) {
         return new ApiResponse<>(true, SuccessStatus._OK.getCode(), SuccessStatus._OK.getMessage(), result);
     }
 
+    //특정 성공 상태 코드가 필요할 때
     public static <T> ApiResponse<T> of(BaseCode code, T result){
         return new ApiResponse<>(true, code.getReasonHttpStatus().getCode() , code.getReasonHttpStatus().getMessage(), result);
     }
@@ -38,8 +39,8 @@ public static ApiResponse<Void> onSuccess() {
     }
 
     // 실패한 경우
-    public static <T> ApiResponse<T> onFailure(String code, String message, T data) {
-        return new ApiResponse<>(false, code, message, data);
+    public static <T> ApiResponse<T> onFailure(String code, String message, T result) {
+        return new ApiResponse<>(false, code, message, result);
     }
 
     public static <T> ApiResponse<T> ofFailure(BaseErrorCode code, T result) {

src/main/java/ttakkeun/ttakkeun_server/apiPayLoad/code/ReasonDTO.java

@@ -14,5 +14,4 @@ public class ReasonDTO {
     private final String code;
     private final String message;
 
-    //public boolean getIsSuccess(){return isSuccess;}
 }

src/main/java/ttakkeun/ttakkeun_server/apiPayLoad/exception/ExceptionAdvice.java

@@ -27,6 +27,7 @@
 @RestControllerAdvice(annotations = {RestController.class})
 public class ExceptionAdvice extends ResponseEntityExceptionHandler{
 
+    //유효성 검사에서 제약 조건이 위반되었을 때 발생하는 예외
     @org.springframework.web.bind.annotation.ExceptionHandler
     public ResponseEntity<Object> validation(ConstraintViolationException e, WebRequest request) {
         String errorMessage = e.getConstraintViolations().stream()
@@ -37,6 +38,7 @@ public ResponseEntity<Object> validation(ConstraintViolationException e, WebRequ
         return handleExceptionInternalConstraint(e, ErrorStatus.valueOf(errorMessage), HttpHeaders.EMPTY,request);
     }
 
+    //메서드 인자가 유효하지 않을 때 발생
     @Override
     protected ResponseEntity<Object> handleMethodArgumentNotValid(
             MethodArgumentNotValidException e, HttpHeaders headers, HttpStatusCode status, WebRequest request) {
@@ -53,6 +55,7 @@ protected ResponseEntity<Object> handleMethodArgumentNotValid(
         return handleExceptionInternalArgs(e,HttpHeaders.EMPTY,ErrorStatus.valueOf("_BAD_REQUEST"),request,errors);
     }
 
+    //일반적인 예외 처리
     @org.springframework.web.bind.annotation.ExceptionHandler
     public ResponseEntity<Object> exception(Exception e, WebRequest request) {
         e.printStackTrace();
@@ -66,11 +69,11 @@ public ResponseEntity onThrowException(GeneralException generalException, HttpSe
         return handleExceptionInternal(generalException,errorReasonHttpStatus,null,request);
     }
 
+    //예외 처리 기본 로직
     private ResponseEntity<Object> handleExceptionInternal(Exception e, ErrorReasonDTO reason,
                                                            HttpHeaders headers, HttpServletRequest request) {
 
         ApiResponse<Object> body = ApiResponse.onFailure(reason.getCode(),reason.getMessage(),null);
-//        e.printStackTrace();
 
         WebRequest webRequest = new ServletWebRequest(request);
         return super.handleExceptionInternal(

src/main/java/ttakkeun/ttakkeun_server/apiPayLoad/ExceptionHandler.java → src/main/java/ttakkeun/ttakkeun_server/apiPayLoad/exception/ExceptionHandler.java

@@ -1,7 +1,6 @@
-package ttakkeun.ttakkeun_server.apiPayLoad;
+package ttakkeun.ttakkeun_server.apiPayLoad.exception;
 
 import ttakkeun.ttakkeun_server.apiPayLoad.code.BaseErrorCode;
-import ttakkeun.ttakkeun_server.apiPayLoad.exception.GeneralException;
 
 public class ExceptionHandler extends GeneralException {
     public ExceptionHandler(BaseErrorCode code) {

src/main/java/ttakkeun/ttakkeun_server/controller/OAuthController.java

@@ -10,7 +10,7 @@
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 import ttakkeun.ttakkeun_server.apiPayLoad.ApiResponse;
-import ttakkeun.ttakkeun_server.apiPayLoad.ExceptionHandler;
+import ttakkeun.ttakkeun_server.apiPayLoad.exception.ExceptionHandler;
 import ttakkeun.ttakkeun_server.dto.auth.LoginResponseDto;
 import ttakkeun.ttakkeun_server.dto.auth.apple.AppleLoginRequestDto;
 import ttakkeun.ttakkeun_server.dto.auth.apple.AppleSignUpRequestDto;

src/main/java/ttakkeun/ttakkeun_server/controller/PetController.java

@@ -8,7 +8,7 @@
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 import ttakkeun.ttakkeun_server.apiPayLoad.ApiResponse;
-import ttakkeun.ttakkeun_server.apiPayLoad.ExceptionHandler;
+import ttakkeun.ttakkeun_server.apiPayLoad.exception.ExceptionHandler;
 import ttakkeun.ttakkeun_server.converter.PetConverter;
 import ttakkeun.ttakkeun_server.dto.pet.PetRequestDTO;
 import ttakkeun.ttakkeun_server.dto.pet.PetResponseDTO;

src/main/java/ttakkeun/ttakkeun_server/dto/auth/apple/ApplePublicKeyResponse.java

@@ -1,7 +1,7 @@
 package ttakkeun.ttakkeun_server.dto.auth.apple;
 
 import lombok.Getter;
-import ttakkeun.ttakkeun_server.apiPayLoad.ExceptionHandler;
+import ttakkeun.ttakkeun_server.apiPayLoad.exception.ExceptionHandler;
 import ttakkeun.ttakkeun_server.apiPayLoad.code.status.ErrorStatus;
 
 import java.util.List;

src/main/java/ttakkeun/ttakkeun_server/service/JwtService.java

@@ -7,7 +7,6 @@
 import io.jsonwebtoken.io.Decoders;
 import io.jsonwebtoken.io.Encoders;
 import io.jsonwebtoken.security.Keys;
-import io.micrometer.common.util.StringUtils;
 import jakarta.servlet.http.HttpServletRequest;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
@@ -20,7 +19,7 @@
 import org.springframework.security.core.userdetails.UserDetails;
 import org.springframework.stereotype.Component;
 import org.springframework.stereotype.Service;
-import ttakkeun.ttakkeun_server.apiPayLoad.ExceptionHandler;
+import ttakkeun.ttakkeun_server.apiPayLoad.exception.ExceptionHandler;
 import ttakkeun.ttakkeun_server.apiPayLoad.code.status.ErrorStatus;
 import ttakkeun.ttakkeun_server.service.auth.UserDetailServiceImpl;
 //import ttakkeun.ttakkeun_server.jwt.JwtAuthenticationFilter;

src/main/java/ttakkeun/ttakkeun_server/service/PetService.java

@@ -2,17 +2,14 @@
 
 import com.amazonaws.AmazonServiceException;
 import com.amazonaws.services.s3.AmazonS3;
-import com.amazonaws.services.s3.AmazonS3Client;
 import com.amazonaws.services.s3.model.ObjectMetadata;
 import jakarta.transaction.Transactional;
 import lombok.RequiredArgsConstructor;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 import org.springframework.web.multipart.MultipartFile;
-import ttakkeun.ttakkeun_server.apiPayLoad.ExceptionHandler;
+import ttakkeun.ttakkeun_server.apiPayLoad.exception.ExceptionHandler;
 import ttakkeun.ttakkeun_server.apiPayLoad.code.status.ErrorStatus;
-import ttakkeun.ttakkeun_server.apiPayLoad.exception.handler.TempHandler;
 import ttakkeun.ttakkeun_server.converter.PetConverter;
 import ttakkeun.ttakkeun_server.dto.pet.PetRequestDTO;
 import ttakkeun.ttakkeun_server.dto.pet.PetResponseDTO;
@@ -134,10 +131,10 @@ public PetResponseDTO.EditResultDTO updateProfile(Pet pet, PetRequestDTO.AddDTO
 
     public PetResponseDTO.LoadResultDTO load(Long petId, Member member) {
         Pet pet = petRepository.findById(petId)
-                .orElseThrow(() -> new TempHandler(ErrorStatus.PET_ID_NOT_AVAILABLE));
+                .orElseThrow(() -> new ExceptionHandler(ErrorStatus.PET_ID_NOT_AVAILABLE));
 
         if (!pet.getMember().getMemberId().equals(member.getMemberId())) {
-            throw new TempHandler(ErrorStatus.PET_NOT_FOUND);
+            throw new ExceptionHandler(ErrorStatus.PET_NOT_FOUND);
         }
 
         return PetResponseDTO.LoadResultDTO.builder()

src/main/java/ttakkeun/ttakkeun_server/service/RecordService.java

@@ -9,7 +9,7 @@
 import org.springframework.data.domain.Sort;
 import org.springframework.stereotype.Service;
 import org.springframework.web.multipart.MultipartFile;
-import ttakkeun.ttakkeun_server.apiPayLoad.ExceptionHandler;
+import ttakkeun.ttakkeun_server.apiPayLoad.exception.ExceptionHandler;
 import ttakkeun.ttakkeun_server.dto.record.RecordListResponseDto;
 import ttakkeun.ttakkeun_server.dto.record.RecordRequestDTO;
 import ttakkeun.ttakkeun_server.dto.record.RecordResponseDTO;

src/main/java/ttakkeun/ttakkeun_server/service/S3ImageService.java

@@ -1,7 +1,6 @@
 package ttakkeun.ttakkeun_server.service;
 
 import com.amazonaws.services.s3.AmazonS3;
-import com.amazonaws.services.s3.model.CannedAccessControlList;
 import com.amazonaws.services.s3.model.ObjectMetadata;
 import com.amazonaws.services.s3.model.PutObjectRequest;
 import com.amazonaws.util.IOUtils;
@@ -10,8 +9,7 @@
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Component;
 import org.springframework.web.multipart.MultipartFile;
-import software.amazon.awssdk.services.s3.model.S3Exception;
-import ttakkeun.ttakkeun_server.apiPayLoad.ExceptionHandler;
+import ttakkeun.ttakkeun_server.apiPayLoad.exception.ExceptionHandler;
 
 import java.io.ByteArrayInputStream;
 import java.io.IOException;

src/main/java/ttakkeun/ttakkeun_server/service/TipService.java

@@ -8,7 +8,7 @@
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.multipart.MultipartFile;
-import ttakkeun.ttakkeun_server.apiPayLoad.ExceptionHandler;
+import ttakkeun.ttakkeun_server.apiPayLoad.exception.ExceptionHandler;
 import ttakkeun.ttakkeun_server.dto.tip.TipCreateRequestDTO;
 import ttakkeun.ttakkeun_server.dto.tip.TipResponseDTO;
 

src/main/java/ttakkeun/ttakkeun_server/service/TodoService.java

@@ -3,7 +3,7 @@
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
-import ttakkeun.ttakkeun_server.apiPayLoad.ExceptionHandler;
+import ttakkeun.ttakkeun_server.apiPayLoad.exception.ExceptionHandler;
 import ttakkeun.ttakkeun_server.dto.todo.*;
 import ttakkeun.ttakkeun_server.entity.Todo;
 import ttakkeun.ttakkeun_server.entity.Pet;

src/main/java/ttakkeun/ttakkeun_server/service/auth/OAuthService.java

@@ -6,7 +6,7 @@
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-import ttakkeun.ttakkeun_server.apiPayLoad.ExceptionHandler;
+import ttakkeun.ttakkeun_server.apiPayLoad.exception.ExceptionHandler;
 import ttakkeun.ttakkeun_server.dto.auth.LoginResponseDto;
 import ttakkeun.ttakkeun_server.dto.auth.apple.AppleAuthClient;
 import ttakkeun.ttakkeun_server.dto.auth.apple.AppleLoginRequestDto;

src/main/java/ttakkeun/ttakkeun_server/service/auth/UserDetailServiceImpl.java

@@ -6,7 +6,7 @@
 import org.springframework.security.core.userdetails.UserDetailsService;
 import org.springframework.security.core.userdetails.UsernameNotFoundException;
 import org.springframework.stereotype.Service;
-import ttakkeun.ttakkeun_server.apiPayLoad.ExceptionHandler;
+import ttakkeun.ttakkeun_server.apiPayLoad.exception.ExceptionHandler;
 import ttakkeun.ttakkeun_server.apiPayLoad.code.status.ErrorStatus;
 import ttakkeun.ttakkeun_server.repository.MemberRepository;