Merge pull request #135 from YAPP-Github/BOOK-250-fix/#134

fix: 도서 검색 DTO 변경사항에 따른 LastPage 로직 수정 및 빈 ISBN 대응 로직 추가

Author: seoyoon513

build-logic/src/main/kotlin/com/ninecraft/booket/convention/ApplicationConstants.kt

@@ -6,7 +6,7 @@ internal object ApplicationConstants {
     const val MIN_SDK = 28
     const val TARGET_SDK = 35
     const val COMPILE_SDK = 35
-    const val VERSION_CODE = 1
+    const val VERSION_CODE = 3
     const val VERSION_NAME = "1.0.0"
     const val JAVA_VERSION_INT = 17
     val javaVersion = JavaVersion.VERSION_17

core/data/impl/src/main/kotlin/com/ninecraft/booket/core/data/impl/mapper/ResponseToModel.kt

@@ -54,14 +54,14 @@ internal fun BookSearchResponse.toModel(): BookSearchModel {
     return BookSearchModel(
         version = version,
         title = title,
-        link = link,
         pubDate = pubDate,
         totalResults = totalResults,
         startIndex = startIndex,
         itemsPerPage = itemsPerPage,
         query = query,
         searchCategoryId = searchCategoryId,
         searchCategoryName = searchCategoryName,
+        lastPage = lastPage,
         books = books.map { it.toModel() },
     )
 }
@@ -73,7 +73,9 @@ internal fun BookSummary.toModel(): BookSummaryModel {
         author = author,
         publisher = publisher,
         coverImageUrl = coverImageUrl,
+        link = link,
         userBookStatus = userBookStatus,
+        key = "$title-$isbn13",
     )
 }
 

core/model/src/main/kotlin/com/ninecraft/booket/core/model/BookSearchModel.kt

@@ -6,14 +6,14 @@ import androidx.compose.runtime.Stable
 data class BookSearchModel(
     val version: String = "",
     val title: String = "",
-    val link: String = "",
     val pubDate: String = "",
     val totalResults: Int = 0,
     val startIndex: Int = 0,
     val itemsPerPage: Int = 0,
     val query: String = "",
     val searchCategoryId: Int = 0,
     val searchCategoryName: String = "",
+    val lastPage: Boolean = false,
     val books: List<BookSummaryModel> = emptyList(),
 )
 
@@ -24,5 +24,7 @@ data class BookSummaryModel(
     val author: String = "",
     val publisher: String = "",
     val coverImageUrl: String = "",
+    val link: String = "",
     val userBookStatus: String = "",
+    val key: String = "",
 )

core/network/src/main/kotlin/com/ninecraft/booket/core/network/response/BookSearchResponse.kt

@@ -9,8 +9,6 @@ data class BookSearchResponse(
     val version: String,
     @SerialName("title")
     val title: String,
-    @SerialName("link")
-    val link: String,
     @SerialName("pubDate")
     val pubDate: String,
     @SerialName("totalResults")
@@ -25,6 +23,8 @@ data class BookSearchResponse(
     val searchCategoryId: Int,
     @SerialName("searchCategoryName")
     val searchCategoryName: String,
+    @SerialName("lastPage")
+    val lastPage: Boolean,
     @SerialName("books")
     val books: List<BookSummary>,
 )
@@ -41,6 +41,8 @@ data class BookSummary(
     val publisher: String,
     @SerialName("coverImageUrl")
     val coverImageUrl: String,
+    @SerialName("link")
+    val link: String,
     @SerialName("userBookStatus")
     val userBookStatus: String,
 )

feature/search/src/main/kotlin/com/ninecraft/booket/feature/search/book/BookSearchPresenter.kt

@@ -40,7 +40,6 @@ class BookSearchPresenter @AssistedInject constructor(
     private val repository: BookRepository,
 ) : Presenter<BookSearchUiState> {
     companion object {
-        private const val PAGE_SIZE = 20
         private const val START_INDEX = 1
     }
 
@@ -80,7 +79,7 @@ class BookSearchPresenter @AssistedInject constructor(
                         }
 
                         currentStartIndex = startIndex
-                        isLastPage = result.books.size < PAGE_SIZE
+                        isLastPage = result.lastPage
 
                         if (startIndex == START_INDEX) {
                             uiState = UiState.Success
@@ -185,7 +184,12 @@ class BookSearchPresenter @AssistedInject constructor(
 
                 is BookSearchUiEvent.OnBookClick -> {
                     selectedBookIsbn = event.isbn13
-                    isBookRegisterBottomSheetVisible = true
+
+                    if (selectedBookIsbn.isEmpty()) {
+                        sideEffect = BookSearchSideEffect.ShowToast("isbn이 없는 도서는 등록할 수 없습니다")
+                    } else {
+                        isBookRegisterBottomSheetVisible = true
+                    }
                 }
 
                 is BookSearchUiEvent.OnBookRegisterBottomSheetDismiss -> {

feature/search/src/main/kotlin/com/ninecraft/booket/feature/search/book/BookSearchUi.kt

@@ -222,7 +222,7 @@ internal fun SearchContent(
                     ) {
                         items(
                             count = state.books.size,
-                            key = { index -> state.books[index].isbn13 },
+                            key = { index -> state.books[index].key },
                         ) { index ->
                             Column {
                                 BookItem(