[BOOK-79] refactor: apis,global-utils validation 강화 (#15)

Author: minwoo1999

apis/src/main/kotlin/org/yapp/apis/book/controller/BookController.kt

@@ -3,6 +3,7 @@ package org.yapp.apis.book.controller
 import jakarta.validation.Valid
 import org.springframework.http.ResponseEntity
 import org.springframework.web.bind.annotation.GetMapping
+import org.springframework.web.bind.annotation.ModelAttribute
 import org.springframework.web.bind.annotation.RequestMapping
 import org.springframework.web.bind.annotation.RestController
 import org.yapp.apis.book.dto.request.BookDetailRequest
@@ -19,14 +20,14 @@ class BookController(
 ) : BookControllerApi {
 
     @GetMapping("/search")
-    override fun searchBooks(@Valid request: BookSearchRequest): ResponseEntity<BookSearchResponse> {
+    override fun searchBooks(@Valid @ModelAttribute request: BookSearchRequest): ResponseEntity<BookSearchResponse> {
         val response = bookUseCase.searchBooks(request)
         return ResponseEntity.ok(response)
     }
 
     @GetMapping("/detail")
     override fun getBookDetail(
-        @Valid request: BookDetailRequest
+        @Valid @ModelAttribute request: BookDetailRequest
     ): ResponseEntity<BookDetailResponse> {
         val response = bookUseCase.getBookDetail(request)
         return ResponseEntity.ok(response)

apis/src/main/kotlin/org/yapp/apis/book/dto/request/BookDetailRequest.kt

@@ -1,18 +1,23 @@
 package org.yapp.apis.book.dto.request
 
 import jakarta.validation.constraints.NotBlank
+import jakarta.validation.constraints.Pattern // Pattern 어노테이션 추가
+import org.yapp.globalutils.util.RegexUtils
 import org.yapp.infra.external.aladin.dto.AladinBookLookupRequest
 
 data class BookDetailRequest private constructor(
     @field:NotBlank(message = "아이템 ID는 필수입니다.")
+    @field:Pattern(
+        regexp = RegexUtils.NOT_BLANK_AND_NOT_NULL_STRING_PATTERN,
+        message = "아이템 ID는 유효한 ISBN 형식이 아닙니다."
+    )
     val itemId: String? = null,
     val itemIdType: String? = "ISBN",
     val optResult: List<String>? = null
 ) {
     fun toAladinRequest(): AladinBookLookupRequest {
-        require(!itemId.isNullOrBlank()) { "아이템 ID는 비어있을 수 없습니다." }
         return AladinBookLookupRequest.create(
-            itemId = this.itemId,
+            itemId = this.itemId!!,
             itemIdType = this.itemIdType ?: "ISBN",
             optResult = this.optResult
         )

apis/src/main/kotlin/org/yapp/apis/book/dto/request/BookSearchRequest.kt

@@ -1,11 +1,9 @@
 package org.yapp.apis.book.dto.request
 
-import jakarta.validation.constraints.NotBlank
 import org.yapp.infra.external.aladin.dto.AladinBookSearchRequest
 
 
 data class BookSearchRequest private constructor(
-    @field:NotBlank(message = "검색어는 필수입니다.")
     val query: String? = null,
     val queryType: String? = null,
     val searchTarget: String? = null,
@@ -16,11 +14,11 @@ data class BookSearchRequest private constructor(
     val categoryId: Int? = null
 ) {
 
+    fun validQuery(): String = query!!
     fun toAladinRequest(): AladinBookSearchRequest {
-        require(!query.isNullOrBlank()) { "검색어(query)는 필수입니다." }
 
         return AladinBookSearchRequest.create(
-            query = this.query,
+            query = this.validQuery(),
             queryType = this.queryType,
             searchTarget = this.searchTarget,
             maxResults = this.maxResults,

global-utils/src/main/kotlin/org/yapp/globalutils/util/RegexUtils.kt

@@ -1,12 +1,12 @@
 package org.yapp.globalutils.util
 
-
 object RegexUtils {
 
     val EMAIL_PATTERN = Regex("^[A-Za-z0-9+_.-]+@[A-Za-z0-9.-]+\\.[A-Za-z]{2,}$")
 
     val PROFILE_IMAGE_URL_PATTERN = Regex("^https?://[a-zA-Z0-9.-]+(/.*)?$")
 
+    const val NOT_BLANK_AND_NOT_NULL_STRING_PATTERN = "^(?!null$|NULL$|\\s*$).+" // Removed the old ISBN pattern
 
     fun isValidEmail(email: String): Boolean {
         return email.matches(EMAIL_PATTERN)