Merge pull request #252 from Step3-kakao-tech-campus/fix/#249

GlobalExceptionHandler에 누락된 커스텀 예외 처리 추가
Step3-kakao-tech-campus · Nov 9, 2023 · f4d0fc1 · f4d0fc1
2 parents 563997a + e0d53ce
commit f4d0fc1
Show file tree

Hide file tree

Showing 5 changed files with 35 additions and 10 deletions.
diff --git a/...ory/src/main/java/com/daggle/animory/common/exception/handler/GlobalExceptionHandler.java b/...ory/src/main/java/com/daggle/animory/common/exception/handler/GlobalExceptionHandler.java
@@ -11,9 +11,13 @@
 import com.daggle.animory.domain.pet.exception.InvalidPetMonthRangeException;
 import com.daggle.animory.domain.pet.exception.InvalidPetYearRangeException;
 import com.daggle.animory.domain.pet.exception.PetNotFoundException;
+import com.daggle.animory.domain.pet.exception.PetPermissionDeniedException;
 import com.daggle.animory.domain.shelter.exception.ShelterAlreadyExistException;
 import com.daggle.animory.domain.shelter.exception.ShelterNotFoundException;
 import com.daggle.animory.domain.shelter.exception.ShelterPermissionDeniedException;
+import com.daggle.animory.domain.shortform.exception.AlreadyLikedPetVideoException;
+import com.daggle.animory.domain.shortform.exception.NotLikedPetVideoException;
+import com.daggle.animory.domain.shortform.exception.ShortFormNotFoundException;
 import io.swagger.v3.oas.annotations.media.Content;
 import io.swagger.v3.oas.annotations.responses.ApiResponse;
 import lombok.RequiredArgsConstructor;
@@ -108,6 +112,18 @@ public ResponseEntity<Response<Void>> handleShelterAlreadyExistException(final E
                                                                                  HttpStatus.BAD_REQUEST));
     }
 
+    @ExceptionHandler({AlreadyLikedPetVideoException.class})
+    public ResponseEntity<Response<Void>> handleAlreadyLikedPetVideoException(final Exception e) {
+        return ResponseEntity.status(HttpStatus.BAD_REQUEST).body(Response.error(e.getMessage(),
+                HttpStatus.BAD_REQUEST));
+    }
+
+    @ExceptionHandler({NotLikedPetVideoException.class})
+    public ResponseEntity<Response<Void>> handleNotLikedPetVideoException(final Exception e) {
+        return ResponseEntity.status(HttpStatus.BAD_REQUEST).body(Response.error(e.getMessage(),
+                HttpStatus.BAD_REQUEST));
+    }
+
     // 401
     @ExceptionHandler({UnAuthorizedException.class})
     public ResponseEntity<Response<Void>> handleUnAuthorizedException(final Exception e) {
@@ -122,6 +138,11 @@ public ResponseEntity<Response<Void>> handleShelterPermissionDeniedException(fin
         return ResponseEntity.status(HttpStatus.FORBIDDEN).body(Response.error(e.getMessage(), HttpStatus.FORBIDDEN));
     }
 
+    @ExceptionHandler({PetPermissionDeniedException.class})
+    public ResponseEntity<Response<Void>> handlePetPermissionDeniedException(final Exception e) {
+        return ResponseEntity.status(HttpStatus.FORBIDDEN).body(Response.error(e.getMessage(), HttpStatus.FORBIDDEN));
+    }
+
     @ExceptionHandler({ForbiddenException.class})
     public ResponseEntity<Response<Void>> handleForbiddenExceptionn(final Exception e) {
         return ResponseEntity.status(HttpStatus.FORBIDDEN).body(Response.error(e.getMessage(), HttpStatus.FORBIDDEN));
@@ -137,6 +158,10 @@ public ResponseEntity<Response<Void>> handlePetNotFoundException(final Exception
     public ResponseEntity<Response<Void>> handleShelterNotFoundException(final Exception e) {
         return ResponseEntity.status(HttpStatus.NOT_FOUND).body(Response.error(e.getMessage(), HttpStatus.NOT_FOUND));
     }
+    @ExceptionHandler({ShortFormNotFoundException.class})
+    public ResponseEntity<Response<Void>> handleShortFormNotFoundException(final Exception e) {
+        return ResponseEntity.status(HttpStatus.NOT_FOUND).body(Response.error(e.getMessage(), HttpStatus.NOT_FOUND));
+    }
 
     @ExceptionHandler({MaxUploadSizeExceededException.class})
     public ResponseEntity<Response<Void>> handleMaxUploadSizeExceededException(final RuntimeException e) {

diff --git a/...tform/exception/AlreadyLikedPetVideo.java → ...eption/AlreadyLikedPetVideoException.java b/...tform/exception/AlreadyLikedPetVideo.java → ...eption/AlreadyLikedPetVideoException.java
@@ -1,6 +1,6 @@
 package com.daggle.animory.domain.shortform.exception;
 
-public class AlreadyLikedPetVideo extends RuntimeException {
+public class AlreadyLikedPetVideoException extends RuntimeException {
     @Override
     public String getMessage() {
         return ShortFormExceptionMessage.ALREADY_LIKED_PET_VIDEO.getMessage();

diff --git a/...shortform/exception/NotLikedPetVideo.java → .../exception/NotLikedPetVideoException.java b/...shortform/exception/NotLikedPetVideo.java → .../exception/NotLikedPetVideoException.java
@@ -1,6 +1,6 @@
 package com.daggle.animory.domain.shortform.exception;
 
-public class NotLikedPetVideo extends RuntimeException {
+public class NotLikedPetVideoException extends RuntimeException {
     @Override
     public String getMessage() {
         return ShortFormExceptionMessage.NOT_LIKED_PET_VIDEO.getMessage();

diff --git a/...hortform/exception/ShortFormNotFound.java → ...exception/ShortFormNotFoundException.java b/...hortform/exception/ShortFormNotFound.java → ...exception/ShortFormNotFoundException.java
@@ -1,6 +1,6 @@
 package com.daggle.animory.domain.shortform.exception;
 
-public class ShortFormNotFound extends RuntimeException {
+public class ShortFormNotFoundException extends RuntimeException {
     @Override
     public String getMessage() {
         return ShortFormExceptionMessage.SHORT_FORM_NOT_FOUND.getMessage();

diff --git a/animory/src/main/java/com/daggle/animory/domain/shortform/service/PetVideoLikeService.java b/animory/src/main/java/com/daggle/animory/domain/shortform/service/PetVideoLikeService.java
@@ -2,9 +2,9 @@
 
 import com.daggle.animory.domain.pet.entity.PetVideo;
 import com.daggle.animory.domain.shortform.entity.PetVideoLike;
-import com.daggle.animory.domain.shortform.exception.AlreadyLikedPetVideo;
-import com.daggle.animory.domain.shortform.exception.NotLikedPetVideo;
-import com.daggle.animory.domain.shortform.exception.ShortFormNotFound;
+import com.daggle.animory.domain.shortform.exception.AlreadyLikedPetVideoException;
+import com.daggle.animory.domain.shortform.exception.NotLikedPetVideoException;
+import com.daggle.animory.domain.shortform.exception.ShortFormNotFoundException;
 import com.daggle.animory.domain.shortform.repository.PetVideoJpaRepository;
 import com.daggle.animory.domain.shortform.repository.PetVideoLikeRepository;
 import lombok.RequiredArgsConstructor;
@@ -22,7 +22,7 @@ public void updatePetVideoLikeCount(final String IPAddress, final int petVideoId
         validatePetVideoLikeDuplication(IPAddress, petVideoId);
 
         final PetVideo petVideo = petVideoJpaRepository.findById(petVideoId)
-            .orElseThrow(ShortFormNotFound::new);
+            .orElseThrow(ShortFormNotFoundException::new);
 
         petVideo.updateLikeCount();
 
@@ -36,7 +36,7 @@ public void deletePetVideoLikeCount(final String ipAddress, final int petVideoId
         validatePetVideoLikeDelete(ipAddress, petVideoId);
 
         final PetVideo petVideo = petVideoJpaRepository.findById(petVideoId)
-            .orElseThrow(ShortFormNotFound::new);
+            .orElseThrow(ShortFormNotFoundException::new);
 
         petVideo.deleteLikeCount();
 
@@ -45,13 +45,13 @@ public void deletePetVideoLikeCount(final String ipAddress, final int petVideoId
 
     private void validatePetVideoLikeDuplication(final String IPAddress, final int petVideoId) {
         if (petVideoLikeRepository.existsByIpAddressAndPetVideoId(IPAddress, petVideoId)) {
-            throw new AlreadyLikedPetVideo();
+            throw new AlreadyLikedPetVideoException();
         }
     }
 
     private void validatePetVideoLikeDelete(final String IPAddress, final int petVideoId) {
         if (!petVideoLikeRepository.existsByIpAddressAndPetVideoId(IPAddress, petVideoId)) {
-            throw new NotLikedPetVideo();
+            throw new NotLikedPetVideoException();
         }
     }
 }