feat: 도서 검색 결과에 사용자 읽음 상태 표시 기능

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

@@ -25,8 +25,11 @@ class BookController(
 ) : BookControllerApi {
 
     @GetMapping("/search")
-    override fun searchBooks(@Valid @ModelAttribute request: BookSearchRequest): ResponseEntity<BookSearchResponse> {
-        val response = bookUseCase.searchBooks(request)
+    override fun searchBooks(
+        @AuthenticationPrincipal userId: UUID,
+        @Valid @ModelAttribute request: BookSearchRequest
+    ): ResponseEntity<BookSearchResponse> {
+        val response = bookUseCase.searchBooks(request, userId)
         return ResponseEntity.ok(response)
     }
 

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

@@ -28,7 +28,10 @@ import java.util.UUID
 @RequestMapping("/api/v1/books")
 interface BookControllerApi {
 
-    @Operation(summary = "도서 검색", description = "키워드를 사용하여 알라딘 도서 정보를 검색합니다.")
+    @Operation(
+        summary = "도서 검색", description = "알라딘 API를 통해 키워드로 도서를 검색합니다.  \n" +
+                " 유저의 도서 상태(읽음, 읽는 중 등)가 함께 표시됩니다.  "
+    )
     @ApiResponses(
         value = [
             ApiResponse(
@@ -44,7 +47,10 @@ interface BookControllerApi {
         ]
     )
     @GetMapping("/search")
-    fun searchBooks(@Valid @Parameter(description = "도서 검색 요청 객체") request: BookSearchRequest): ResponseEntity<BookSearchResponse>
+    fun searchBooks(
+        @AuthenticationPrincipal userId: UUID,
+        @Valid @Parameter(description = "도서 검색 요청 객체") request: BookSearchRequest
+    ): ResponseEntity<BookSearchResponse>
 
     @Operation(summary = "도서 상세 조회", description = "특정 도서의 상세 정보를 조회합니다.")
     @ApiResponses(

apis/src/main/kotlin/org/yapp/apis/book/dto/response/BookSearchResponse.kt

@@ -1,5 +1,6 @@
 package org.yapp.apis.book.dto.response
 
+import org.yapp.domain.userbook.BookStatus
 import org.yapp.infra.external.aladin.response.AladinSearchResponse
 import org.yapp.infra.external.aladin.response.BookItem
 
@@ -41,6 +42,7 @@ data class BookSearchResponse private constructor(
         val author: String?,
         val publisher: String?,
         val coverImageUrl: String?,
+        var userBookStatus: BookStatus
     ) {
         companion object {
             private val unknownTitle = "제목없음"
@@ -52,7 +54,8 @@ data class BookSearchResponse private constructor(
                     title = item.title ?: unknownTitle,
                     author = item.author,
                     publisher = item.publisher,
-                    coverImageUrl = item.cover
+                    coverImageUrl = item.cover,
+                    userBookStatus = BookStatus.BEFORE_READING
                 )
             }
         }

apis/src/main/kotlin/org/yapp/apis/book/dto/response/UserBookResponse.kt

@@ -2,6 +2,7 @@ package org.yapp.apis.book.dto.response
 
 import org.yapp.domain.userbook.BookStatus
 import org.yapp.domain.userbook.UserBook
+import org.yapp.domain.userbook.vo.UserBookVO
 import java.time.format.DateTimeFormatter
 import java.util.*
 
@@ -18,10 +19,9 @@ data class UserBookResponse private constructor(
     val updatedAt: String,
 ) {
 
+
     companion object {
-        fun from(
-            userBook: UserBook,
-        ): UserBookResponse {
+        fun from(userBook: UserBook): UserBookResponse {
             return UserBookResponse(
                 userBookId = userBook.id,
                 userId = userBook.userId,
@@ -35,5 +35,20 @@ data class UserBookResponse private constructor(
                 updatedAt = userBook.updatedAt.format(DateTimeFormatter.ISO_LOCAL_DATE_TIME),
             )
         }
+
+        fun from(vo: UserBookVO): UserBookResponse {
+            return UserBookResponse(
+                userBookId = vo.id,
+                userId = vo.userId,
+                bookIsbn = vo.bookIsbn,
+                bookTitle = vo.title,
+                bookAuthor = vo.author,
+                status = vo.status,
+                coverImageUrl = vo.coverImageUrl,
+                publisher = vo.publisher,
+                createdAt = vo.createdAt.format(DateTimeFormatter.ISO_LOCAL_DATE_TIME),
+                updatedAt = vo.updatedAt.format(DateTimeFormatter.ISO_LOCAL_DATE_TIME),
+            )
+        }
     }
 }

apis/src/main/kotlin/org/yapp/apis/book/service/BookManagementService.kt

@@ -4,6 +4,7 @@ import org.springframework.stereotype.Service
 import org.yapp.apis.book.dto.request.BookCreateRequest
 import org.yapp.domain.book.Book
 import org.yapp.domain.book.BookDomainService
+import java.util.UUID
 
 @Service
 class BookManagementService(

apis/src/main/kotlin/org/yapp/apis/book/service/UserBookService.kt

@@ -1,10 +1,12 @@
 package org.yapp.apis.book.service
 
 import org.springframework.stereotype.Service
+import org.yapp.apis.book.dto.response.UserBookResponse
 import org.yapp.domain.book.Book
 import org.yapp.domain.userbook.UserBookDomainService
 import org.yapp.domain.userbook.BookStatus
-import java.util.*
+import org.yapp.domain.userbook.vo.UserBookVO
+import java.util.UUID
 
 @Service
 class UserBookService(
@@ -15,4 +17,11 @@ class UserBookService(
 
     fun findAllUserBooks(userId: UUID) =
         userBookDomainService.findAllUserBooks(userId)
+
+    fun findAllByUserIdAndBookIsbnIn(userId: UUID, isbns: List<String>): List<UserBookResponse> {
+        return userBookDomainService
+            .findAllByUserIdAndBookIsbnIn(userId, isbns).map { UserBookResponse.from(it) }
+    }
+
 }
+

apis/src/main/kotlin/org/yapp/apis/book/usecase/BookUseCase.kt

@@ -26,8 +26,19 @@ class BookUseCase(
     private val bookQueryService: BookQueryService,
     private val bookManagementService: BookManagementService
 ) {
-    fun searchBooks(request: BookSearchRequest): BookSearchResponse {
-        return bookQueryService.searchBooks(request)
+    fun searchBooks(request: BookSearchRequest, userId: UUID): BookSearchResponse {
+        userAuthService.validateUserExists(userId)
+
+        val searchResponse = bookQueryService.searchBooks(request)
+        val isbns = searchResponse.books.map { it.isbn }
+        val userBooks = userBookService.findAllByUserIdAndBookIsbnIn(userId, isbns)
+        val statusMap = userBooks.associateBy({ it.bookIsbn }, { it.status })
+        searchResponse.books.forEach { bookSummary ->
+            statusMap[bookSummary.isbn]?.let { status ->
+                bookSummary.userBookStatus = status
+            }
+        }
+        return searchResponse
     }
 
     fun getBookDetail(bookDetailRequest: BookDetailRequest): BookDetailResponse {

domain/src/main/kotlin/org/yapp/domain/userbook/UserBookDomainService.kt

@@ -1,6 +1,7 @@
 package org.yapp.domain.userbook
 
 import org.yapp.domain.book.Book
+import org.yapp.domain.userbook.vo.UserBookVO
 import org.yapp.globalutils.annotation.DomainService
 import java.util.UUID
 
@@ -23,4 +24,12 @@ class UserBookDomainService(
     fun findAllUserBooks(userId: UUID): List<UserBook> {
         return userBookRepository.findAllByUserId(userId)
     }
+
+    fun findAllByUserIdAndBookIsbnIn(userId: UUID, isbns: List<String>): List<UserBookVO> {
+        if (isbns.isEmpty()) {
+            return emptyList()
+        }
+        return userBookRepository.findAllByUserIdAndBookIsbnIn(userId, isbns)
+            .map { UserBookVO.newInstance(it) }
+    }
 }

domain/src/main/kotlin/org/yapp/domain/userbook/UserBookRepository.kt

@@ -10,4 +10,7 @@ interface UserBookRepository {
     fun save(userBook: UserBook): UserBook
 
     fun findAllByUserId(userId: UUID): List<UserBook>
+
+    fun findAllByUserIdAndBookIsbnIn(userId: UUID, bookIsbns: List<String>): List<UserBook>
+
 }

domain/src/main/kotlin/org/yapp/domain/userbook/vo/UserBookVO.kt

@@ -0,0 +1,39 @@
+package org.yapp.domain.userbook.vo
+
+import org.yapp.domain.userbook.BookStatus
+import org.yapp.domain.userbook.UserBook
+import java.time.LocalDateTime
+import java.util.UUID
+
+data class UserBookVO private constructor(
+    val id: UUID,
+    val userId: UUID,
+    val bookIsbn: String,
+    val coverImageUrl: String,
+    val publisher: String,
+    val title: String,
+    val author: String,
+    val status: BookStatus,
+    val createdAt: LocalDateTime,
+    val updatedAt: LocalDateTime
+) {
+
+    companion object {
+        fun newInstance(
+            userBook: UserBook,
+        ): UserBookVO {
+            return UserBookVO(
+                id = userBook.id,
+                userId = userBook.userId,
+                bookIsbn = userBook.bookIsbn,
+                coverImageUrl = userBook.coverImageUrl,
+                publisher = userBook.publisher,
+                title = userBook.title,
+                author = userBook.author,
+                status = userBook.status,
+                createdAt = userBook.createdAt,
+                updatedAt = userBook.updatedAt
+            )
+        }
+    }
+}

gateway/src/main/kotlin/org/yapp/gateway/config/SecurityConfig.kt

@@ -7,6 +7,9 @@ import org.springframework.security.config.annotation.web.configuration.EnableWe
 import org.springframework.security.config.http.SessionCreationPolicy
 import org.springframework.security.web.SecurityFilterChain
 import org.springframework.security.web.authentication.UsernamePasswordAuthenticationFilter
+import org.springframework.web.cors.CorsConfiguration
+import org.springframework.web.cors.CorsConfigurationSource
+import org.springframework.web.cors.UrlBasedCorsConfigurationSource
 import org.yapp.gateway.filter.JwtAuthenticationFilter
 import org.yapp.gateway.jwt.JwtTokenProvider
 
@@ -28,6 +31,7 @@ class SecurityConfig(
     fun filterChain(http: HttpSecurity): SecurityFilterChain {
         http
             .csrf { it.disable() }
+            .cors { it.configurationSource(corsConfigurationSource()) }
             .formLogin { it.disable() }
             .httpBasic { it.disable() }
             .sessionManagement { it.sessionCreationPolicy(SessionCreationPolicy.STATELESS) }
@@ -44,4 +48,26 @@ class SecurityConfig(
 
         return http.build()
     }
+
+    @Bean
+    fun corsConfigurationSource(): CorsConfigurationSource {
+        val config = CorsConfiguration()
+        config.allowedOrigins = listOf(
+            "http://localhost:8080",
+            "http://localhost:3000",
+            "http://api.qweasdzxc.shop",
+            "https://api.qweasdzxc.shop",
+            "https://www.qweasdzxc.shop",
+            "https://qweasdzxc.shop"
+        )
+        config.allowedMethods = listOf("GET", "POST", "PUT", "DELETE", "OPTIONS", "PATCH")
+        config.allowedHeaders = listOf("*")
+        config.exposedHeaders = listOf("Authorization", "Content-Type")
+        config.allowCredentials = true
+        config.maxAge = 3600L
+
+        val source = UrlBasedCorsConfigurationSource()
+        source.registerCorsConfiguration("/**", config)
+        return source
+    }
 }

infra/src/main/kotlin/org/yapp/infra/user/repository/JpaUserBookRepository.kt

@@ -7,4 +7,6 @@ import java.util.*
 interface JpaUserBookRepository : JpaRepository<UserBookEntity, UUID> {
     fun findByUserIdAndBookIsbn(userId: UUID, bookIsbn: String): UserBookEntity?
     fun findAllByUserId(userId: UUID): List<UserBookEntity>
+    fun findAllByUserIdAndBookIsbnIn(userId: UUID, bookIsbnList: List<String>): List<UserBookEntity>
+
 }

infra/src/main/kotlin/org/yapp/infra/user/repository/impl/UserBookRepositoryImpl.kt

@@ -24,4 +24,12 @@ class UserBookRepositoryImpl(
     override fun findAllByUserId(userId: UUID): List<UserBook> {
         return jpaUserBookRepository.findAllByUserId(userId).map { it.toDomain() }
     }
+
+    override fun findAllByUserIdAndBookIsbnIn(
+        userId: UUID,
+        bookIsbns: List<String>
+    ): List<UserBook> {
+        return jpaUserBookRepository.findAllByUserIdAndBookIsbnIn(userId, bookIsbns)
+            .map { it.toDomain() }
+    }
 }