Merge pull request #102 from Project-BookLog/fix/101/search

Fix/101/search

Author: millkk04

booklog/src/main/java/com/example/booklog/domain/search/controller/SearchController.java

@@ -53,7 +53,7 @@ public class SearchController {
      */
     @GetMapping("/books")
     public BookSearchResponse searchBooks(
-            @RequestParam String query,
+            @RequestParam(required = false) String query,
             @RequestParam(defaultValue = "1") int page,
             @RequestParam(defaultValue = "10") int size,
             @RequestParam(defaultValue = "latest") String sort
@@ -73,7 +73,7 @@ public BookSearchResponse searchBooks(
      */
     @GetMapping("/authors")
     public AuthorSearchResponse searchAuthors(
-            @RequestParam String query,
+            @RequestParam(required = false) String query,
             @RequestParam(defaultValue = "1") int page,
             @RequestParam(defaultValue = "10") int size
     ) {
@@ -175,7 +175,7 @@ public RecommendationSearchResponse getRecommendations() {
      */
     @GetMapping
     public ResponseEntity<IntegratedSearchResponse> search(
-            @RequestParam String query,
+            @RequestParam(required = false) String query,
             @RequestParam(defaultValue = "latest") String sort
     ) {
         IntegratedSearchResponse response = integratedSearchService.search(query, sort);

booklog/src/main/java/com/example/booklog/domain/search/service/BookSearchService.java

@@ -6,6 +6,8 @@
 import com.example.booklog.domain.library.books.repository.BooksRepository;
 import com.example.booklog.domain.library.books.service.BookImportService;
 import com.example.booklog.domain.search.dto.BookSortType;
+import com.example.booklog.global.common.apiPayload.code.status.ErrorStatus;
+import com.example.booklog.global.common.apiPayload.exception.GeneralException;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.data.domain.Page;
@@ -56,9 +58,7 @@ public BookSearchResponse searchBooks(String query, int page, int size, BookSort
                  query, page, size, sortType.getValue());
 
         // 입력 검증
-        if (query == null || query.trim().isEmpty()) {
-            return new BookSearchResponse(page, size, true, 0, List.of());
-        }
+        validateSearchInput(query, page, size);
 
         // 정렬 기준 생성
         Sort sort = createSort(sortType);
@@ -157,5 +157,27 @@ private BookSearchItemResponse convertToSearchItem(Books book) {
                 book.getPublishedDate()
         );
     }
-}
 
+    /**
+     * 검색 입력값 검증
+     *
+     * @throws GeneralException 검색어가 유효하지 않은 경우
+     */
+    private void validateSearchInput(String query, int page, int size) {
+        if (query == null || query.trim().isEmpty()) {
+            throw new GeneralException(ErrorStatus.SEARCH_KEYWORD_REQUIRED);
+        }
+
+        if (query.trim().length() > 100) {
+            throw new GeneralException(ErrorStatus.SEARCH_KEYWORD_TOO_LONG);
+        }
+
+        if (page < 1) {
+            throw new GeneralException(ErrorStatus.PAGE_NUMBER_INVALID);
+        }
+
+        if (size < 1 || size > 100) {
+            throw new GeneralException(ErrorStatus.PAGE_SIZE_INVALID);
+        }
+    }
+}

booklog/src/main/java/com/example/booklog/global/common/apiPayload/ApiResponse.java

@@ -2,6 +2,7 @@
 
 import com.example.booklog.global.auth.exception.AuthErrorCode;
 import com.example.booklog.global.auth.exception.AuthSuccessCode;
+import com.example.booklog.global.common.apiPayload.code.BaseErrorCode;
 import com.example.booklog.global.common.apiPayload.code.generalStatus.GeneralErrorCode;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import io.swagger.v3.oas.annotations.media.Schema;
@@ -59,4 +60,14 @@ public static <T> ApiResponse<T> onFailure(GeneralErrorCode errorCode, T data) {
     public static <T> ApiResponse<T> onFailure(GeneralErrorCode errorCode) {
         return new ApiResponse<>(false, errorCode.getCode(), errorCode.getMessage(), null);
     }
+
+    // 실패 응답 (BaseErrorCode 사용 - ErrorStatus 등)
+    public static <T> ApiResponse<T> onFailure(BaseErrorCode errorCode, T data) {
+        return new ApiResponse<>(false, errorCode.getCode(), errorCode.getMessage(), data);
+    }
+
+    // 실패 응답 (BaseErrorCode 사용, 데이터 없이)
+    public static <T> ApiResponse<T> onFailure(BaseErrorCode errorCode) {
+        return new ApiResponse<>(false, errorCode.getCode(), errorCode.getMessage(), null);
+    }
 }

booklog/src/main/java/com/example/booklog/global/common/apiPayload/handler/GlobalExceptionHandler.java

@@ -3,7 +3,9 @@
 import com.example.booklog.global.auth.exception.AuthErrorCode;
 import com.example.booklog.global.auth.exception.AuthException;
 import com.example.booklog.global.common.apiPayload.ApiResponse;
+import com.example.booklog.global.common.apiPayload.code.BaseErrorCode;
 import com.example.booklog.global.common.apiPayload.code.generalStatus.GeneralErrorCode;
+import com.example.booklog.global.common.apiPayload.exception.GeneralException;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
@@ -19,6 +21,22 @@
 @RestControllerAdvice
 public class GlobalExceptionHandler {
 
+    /**
+     * GeneralException 처리 (프로젝트 공통 예외)
+     */
+    @ExceptionHandler(GeneralException.class)
+    public ResponseEntity<ApiResponse<Void>> handleGeneralException(GeneralException e) {
+        log.error("GeneralException: {}", e.getCode().getMessage(), e);
+        BaseErrorCode errorCode = e.getCode();
+
+        ApiResponse<Void> response = ApiResponse.onFailure(errorCode);
+
+        // ErrorCode의 HttpStatus 사용
+        HttpStatus status = errorCode.getHttpStatus();
+
+        return ResponseEntity.status(status).body(response);
+    }
+
     /**
      * AuthException 처리
      */