feat: BusinessException 예외처리 등록

src/main/java/com/eodya/api/bookmark/controller/BookMarkController.java → src/main/java/com/eodya/api/bookmark/controller/BookmarkController.java

@@ -13,7 +13,7 @@
 @RestController
 @RequiredArgsConstructor
 @RequestMapping("/api/v1/bookmark")
-public class BookMarkController {
+public class BookmarkController {
 
     private final BookmarkService bookmarkService;
 

src/main/java/com/eodya/api/bookmark/domain/Bookmark.java

@@ -1,6 +1,6 @@
 package com.eodya.api.bookmark.domain;
 
-import com.eodya.api.bookmark.util.BookMarkStatusConverter;
+import com.eodya.api.bookmark.util.BookmarkStatusConverter;
 import com.eodya.api.common.entity.BaseEntity;
 import com.eodya.api.place.domain.Place;
 import com.eodya.api.users.domain.User;
@@ -11,23 +11,23 @@
 import lombok.Getter;
 import lombok.NoArgsConstructor;
 
-import static com.eodya.api.bookmark.domain.BookMarkStatus.*;
+import static com.eodya.api.bookmark.domain.BookmarkStatus.*;
 
 @Getter
 @Entity
 @Table(name = "bookmark")
 @NoArgsConstructor(access = AccessLevel.PROTECTED)
-public class BookMark extends BaseEntity {
+public class Bookmark extends BaseEntity {
 
     @Id
     @GeneratedValue(strategy = GenerationType.IDENTITY)
     @Column(name = "bookmark_id")
     private Long id;
 
     @NotNull
-    @Convert(converter = BookMarkStatusConverter.class)
+    @Convert(converter = BookmarkStatusConverter.class)
     @Column(length = 20)
-    private BookMarkStatus status = FALSE;
+    private BookmarkStatus status = FALSE;
 
     @ManyToOne(fetch = FetchType.LAZY)
     @JoinColumn(name = "user_id")
@@ -39,12 +39,12 @@ public class BookMark extends BaseEntity {
 
     public void setUser(User user) {
         this.user = user;
-        this.user.getBookMarks().add(this);
+        this.user.getBookmarks().add(this);
     }
 
     @Builder
-    private BookMark(
-            BookMarkStatus status,
+    private Bookmark(
+            BookmarkStatus status,
             User user,
             Place place
     ) {

src/main/java/com/eodya/api/bookmark/domain/BookMarkStatus.java → src/main/java/com/eodya/api/bookmark/domain/BookmarkStatus.java

@@ -1,22 +1,22 @@
 package com.eodya.api.bookmark.domain;
 
-import com.eodya.api.bookmark.exception.BookMarkException;
+import com.eodya.api.bookmark.exception.BookmarkException;
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonValue;
 import lombok.Getter;
 import lombok.RequiredArgsConstructor;
 
-import java.util.Arrays;
 import java.util.Collections;
 import java.util.Map;
 import java.util.function.Function;
 import java.util.stream.Collectors;
+import java.util.stream.Stream;
 
-import static com.eodya.api.bookmark.exception.BookMarkExceptionCode.*;
+import static com.eodya.api.bookmark.exception.BookmarkExceptionCode.*;
 
 @Getter
 @RequiredArgsConstructor
-public enum BookMarkStatus {
+public enum BookmarkStatus {
 
     TRUE("생성"),
     FALSE("삭제"),
@@ -26,14 +26,14 @@ public enum BookMarkStatus {
     private final String description;
 
     @JsonCreator
-    public static BookMarkStatus from(String description) throws BookMarkException {
+    public static BookmarkStatus from(String description) throws BookmarkException {
         if (statusMap.containsKey(description)) {
             return statusMap.get(description);
         }
-        throw new BookMarkException(BOOKMARK_STATUS_NOT_FOUND, description);
+        throw new BookmarkException(BOOKMARK_STATUS_NOT_FOUND, description);
     }
 
-    private static final Map<String, BookMarkStatus> statusMap =
-            Collections.unmodifiableMap(Arrays.stream(values())
-                    .collect(Collectors.toMap(BookMarkStatus::getDescription, Function.identity())));
+    private static final Map<String, BookmarkStatus> statusMap =
+            Collections.unmodifiableMap(Stream.of(values())
+                    .collect(Collectors.toMap(BookmarkStatus::getDescription, Function.identity())));
 }

src/main/java/com/eodya/api/bookmark/dto/request/BookMarkChangeStatusRequest.java

@@ -1,6 +1,6 @@
 package com.eodya.api.bookmark.dto.request;
 
-import com.eodya.api.bookmark.domain.BookMarkStatus;
+import com.eodya.api.bookmark.domain.BookmarkStatus;
 import lombok.*;
 
 @Getter
@@ -9,5 +9,5 @@
 @AllArgsConstructor(access = AccessLevel.PRIVATE)
 public class BookMarkChangeStatusRequest {
 
-    private BookMarkStatus status;
+    private BookmarkStatus status;
 }

src/main/java/com/eodya/api/bookmark/exception/BookMarkException.java → src/main/java/com/eodya/api/bookmark/exception/BookmarkException.java

@@ -3,9 +3,9 @@
 import com.eodya.api.common.exception.BusinessException;
 import com.eodya.api.common.exception.ExceptionCode;
 
-public class BookMarkException extends BusinessException {
+public class BookmarkException extends BusinessException {
 
-    public BookMarkException(ExceptionCode exceptionCode, Object... rejectedValues) {
+    public BookmarkException(ExceptionCode exceptionCode, Object... rejectedValues) {
         super(exceptionCode, rejectedValues);
     }
 }

src/main/java/com/eodya/api/bookmark/exception/BookMarkExceptionCode.java → src/main/java/com/eodya/api/bookmark/exception/BookmarkExceptionCode.java

@@ -7,7 +7,7 @@
 
 @Getter
 @RequiredArgsConstructor
-public enum BookMarkExceptionCode implements ExceptionCode {
+public enum BookmarkExceptionCode implements ExceptionCode {
 
     BOOKMARK_STATUS_NOT_FOUND(HttpStatus.NOT_FOUND, "BOO-001", "북마크 상태를 찾을 수 없음"),
     ;

src/main/java/com/eodya/api/bookmark/repository/BookmarkRepository.java

@@ -0,0 +1,14 @@
+package com.eodya.api.bookmark.repository;
+
+import com.eodya.api.bookmark.domain.Bookmark;
+import com.eodya.api.bookmark.exception.BookmarkException;
+import org.springframework.data.jpa.repository.JpaRepository;
+
+import static com.eodya.api.bookmark.exception.BookmarkExceptionCode.*;
+
+public interface BookmarkRepository extends JpaRepository<Bookmark, Long> {
+
+    default Bookmark getBookMarkById(Long bookMarkId) {
+        return findById(bookMarkId).orElseThrow(() -> new BookmarkException(BOOKMARK_STATUS_NOT_FOUND, bookMarkId));
+    }
+}

src/main/java/com/eodya/api/bookmark/service/BookmarkService.java

@@ -1,21 +1,21 @@
 package com.eodya.api.bookmark.service;
 
-import com.eodya.api.bookmark.domain.BookMark;
+import com.eodya.api.bookmark.domain.Bookmark;
 import com.eodya.api.bookmark.dto.request.BookMarkChangeStatusRequest;
-import com.eodya.api.bookmark.repository.BookMarkRepository;
+import com.eodya.api.bookmark.repository.BookmarkRepository;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
 
 @Service
 @RequiredArgsConstructor
 public class BookmarkService {
 
-    private final BookMarkRepository bookmarkRepository;
+    private final BookmarkRepository bookmarkRepository;
 
     public void updateBookmarkStatus(
             Long placeId,
             BookMarkChangeStatusRequest changeStatusRequest
     ) {
-        BookMark bookMark = bookmarkRepository.getBookMarkById(placeId);
+        Bookmark bookMark = bookmarkRepository.getBookMarkById(placeId);
     }
 }

src/main/java/com/eodya/api/bookmark/util/BookmarkStatusConverter.java

@@ -0,0 +1,19 @@
+package com.eodya.api.bookmark.util;
+
+import com.eodya.api.bookmark.domain.BookmarkStatus;
+import jakarta.persistence.AttributeConverter;
+import jakarta.persistence.Converter;
+
+@Converter
+public class BookmarkStatusConverter implements AttributeConverter<BookmarkStatus, String> {
+
+    @Override
+    public String convertToDatabaseColumn(BookmarkStatus bookMarkStatus) {
+        return bookMarkStatus.getDescription();
+    }
+
+    @Override
+    public BookmarkStatus convertToEntityAttribute(String status) {
+        return BookmarkStatus.from(status);
+    }
+}

src/main/java/com/eodya/api/common/exception/BusinessException.java

@@ -3,7 +3,7 @@
 import lombok.Getter;
 
 @Getter
-public class BusinessException extends RuntimeException {
+public abstract class BusinessException extends RuntimeException {
 
     private final ExceptionCode exceptionCode;
     private final Object[] rejectedValues;

src/main/java/com/eodya/api/common/exception/GlobalExceptionHandler.java

@@ -1,6 +1,7 @@
 package com.eodya.api.common.exception;
 
 import com.eodya.api.common.dto.ExceptionResponse;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.HttpRequestMethodNotSupportedException;
 import org.springframework.web.bind.MethodArgumentNotValidException;
@@ -33,7 +34,16 @@ public ResponseEntity<ExceptionResponse> handleHttpRequestMethodNotSupportedExce
 
     @ExceptionHandler(Exception.class)
     public ResponseEntity<ExceptionResponse> handleException(Exception e) {
+
         return ResponseEntity.status(COMMON_INTERNAL_SERVER_ERROR.getStatus())
                 .body(ExceptionResponse.from(COMMON_INTERNAL_SERVER_ERROR.getCode()));
     }
+
+    @ExceptionHandler(BusinessException.class)
+    public ResponseEntity<ExceptionResponse> handleBusinessException(BusinessException e) {
+        ExceptionCode exceptionCode = e.getExceptionCode();
+
+        return ResponseEntity.status(exceptionCode.getStatus())
+                .body(ExceptionResponse.from(exceptionCode.getCode()));
+    }
 }

src/main/java/com/eodya/api/recommendation/domain/RecommendationStatus.java

@@ -11,6 +11,7 @@
 import java.util.Map;
 import java.util.function.Function;
 import java.util.stream.Collectors;
+import java.util.stream.Stream;
 
 import static com.eodya.api.recommendation.exception.RecommendationExceptionCode.*;
 
@@ -34,6 +35,6 @@ public static RecommendationStatus from(String description) throws Recommendatio
     }
 
     private static final Map<String, RecommendationStatus> statusMap =
-            Collections.unmodifiableMap(Arrays.stream(values())
+            Collections.unmodifiableMap(Stream.of(values())
                     .collect(Collectors.toMap(RecommendationStatus::getDescription, Function.identity())));
 }

src/main/java/com/eodya/api/users/domain/User.java

@@ -1,6 +1,6 @@
 package com.eodya.api.users.domain;
 
-import com.eodya.api.bookmark.domain.BookMark;
+import com.eodya.api.bookmark.domain.Bookmark;
 import com.eodya.api.common.entity.BaseEntity;
 import com.eodya.api.recommendation.domain.Recommendation;
 import com.eodya.api.review.domain.Review;
@@ -55,7 +55,7 @@ public class User extends BaseEntity {
     private List<Review> reviews = new ArrayList<>();
 
     @OneToMany(mappedBy = "user")
-    private List<BookMark> bookMarks = new ArrayList<>();
+    private List<Bookmark> bookmarks = new ArrayList<>();
 
     @OneToMany(mappedBy = "user")
     private List<Recommendation> recommendations = new ArrayList<>();

src/test/java/com/eodya/api/domain/UserTest.java

@@ -34,7 +34,7 @@ void createUser_bookmark_review_recommend_size_test() {
         User user = UserFixture.userBuild(userName, OAuthId, OAuthProvider);
 
         //when & then
-        assertEquals(user.getBookMarks().size(), 0);
+        assertEquals(user.getBookmarks().size(), 0);
         assertEquals(user.getRecommendations().size(), 0);
         assertEquals(user.getRecommendations().size(), 0);
     }