Merge pull request #65 from YAPP-Github/BOOK-161-feature/#64

feat: 내서재 동적 검색 API 연동 및 임시 도서 상세 화면 구현

Author: seoyoon513

app/build.gradle.kts

@@ -55,6 +55,7 @@ dependencies {
         projects.feature.search,
         projects.feature.settings,
         projects.feature.webview,
+        projects.feature.detail,
 
         libs.androidx.activity.compose,
         libs.androidx.startup,

core/data/api/src/main/kotlin/com/ninecraft/booket/core/data/api/repository/BookRepository.kt

@@ -23,5 +23,9 @@ interface BookRepository {
         bookStatus: String,
     ): Result<BookUpsertModel>
 
-    suspend fun getLibrary(): Result<LibraryModel>
+    suspend fun getLibrary(
+        status: String?,
+        page: Int,
+        size: Int,
+    ): Result<LibraryModel>
 }

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

@@ -5,13 +5,19 @@ import com.ninecraft.booket.core.model.BookDetailModel
 import com.ninecraft.booket.core.model.BookSearchModel
 import com.ninecraft.booket.core.model.BookSummaryModel
 import com.ninecraft.booket.core.model.BookUpsertModel
+import com.ninecraft.booket.core.model.LibraryBookSummaryModel
+import com.ninecraft.booket.core.model.LibraryBooksModel
 import com.ninecraft.booket.core.model.LibraryModel
+import com.ninecraft.booket.core.model.PageInfoModel
 import com.ninecraft.booket.core.model.UserProfileModel
 import com.ninecraft.booket.core.network.response.BookDetailResponse
 import com.ninecraft.booket.core.network.response.BookSearchResponse
 import com.ninecraft.booket.core.network.response.BookSummary
 import com.ninecraft.booket.core.network.response.BookUpsertResponse
+import com.ninecraft.booket.core.network.response.LibraryBookSummary
+import com.ninecraft.booket.core.network.response.LibraryBooks
 import com.ninecraft.booket.core.network.response.LibraryResponse
+import com.ninecraft.booket.core.network.response.PageInfo
 import com.ninecraft.booket.core.network.response.UserProfileResponse
 
 internal fun UserProfileResponse.toModel(): UserProfileModel {
@@ -89,15 +95,42 @@ internal fun BookUpsertResponse.toModel(): BookUpsertModel {
 
 internal fun LibraryResponse.toModel(): LibraryModel {
     return LibraryModel(
+        books = books.toModel(),
+        totalCount = totalCount,
+        beforeReadingCount = beforeReadingCount,
+        readingCount = readingCount,
+        completedCount = completedCount,
+    )
+}
+
+internal fun LibraryBooks.toModel(): LibraryBooksModel {
+    return LibraryBooksModel(
+        content = content.map { it.toModel() },
+        page = page.toModel(),
+    )
+}
+
+internal fun LibraryBookSummary.toModel(): LibraryBookSummaryModel {
+    return LibraryBookSummaryModel(
         userBookId = userBookId,
         userId = userId,
         bookIsbn = bookIsbn,
         bookTitle = bookTitle,
         bookAuthor = bookAuthor,
         status = status,
+        recordCount = recordCount,
         coverImageUrl = coverImageUrl,
         publisher = publisher,
         createdAt = createdAt,
         updatedAt = updatedAt,
     )
 }
+
+internal fun PageInfo.toModel(): PageInfoModel {
+    return PageInfoModel(
+        size = size,
+        number = number,
+        totalElements = totalElements,
+        totalPages = totalPages,
+    )
+}

core/data/impl/src/main/kotlin/com/ninecraft/booket/core/data/impl/repository/DefaultBookRepository.kt

@@ -39,7 +39,7 @@ internal class DefaultBookRepository @Inject constructor(
         service.upsertBook(BookUpsertRequest(bookIsbn, bookStatus)).toModel()
     }
 
-    override suspend fun getLibrary() = runSuspendCatching {
-        service.getLibrary().toModel()
+    override suspend fun getLibrary(status: String?, page: Int, size: Int) = runSuspendCatching {
+        service.getLibrary(status, page, size).toModel()
     }
 }

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

@@ -4,14 +4,38 @@ import androidx.compose.runtime.Stable
 
 @Stable
 data class LibraryModel(
+    val books: LibraryBooksModel = LibraryBooksModel(),
+    val totalCount: Int = 0,
+    val beforeReadingCount: Int = 0,
+    val readingCount: Int = 0,
+    val completedCount: Int = 0,
+)
+
+@Stable
+data class LibraryBooksModel(
+    val content: List<LibraryBookSummaryModel> = emptyList(),
+    val page: PageInfoModel = PageInfoModel(),
+)
+
+@Stable
+data class LibraryBookSummaryModel(
     val userBookId: String = "",
     val userId: String = "",
     val bookIsbn: String = "",
     val bookTitle: String = "",
     val bookAuthor: String = "",
     val status: String = "",
+    val recordCount: Int = 0,
     val coverImageUrl: String = "",
     val publisher: String = "",
     val createdAt: String = "",
     val updatedAt: String = "",
 )
+
+@Stable
+data class PageInfoModel(
+    val size: Int = 0,
+    val number: Int = 0,
+    val totalElements: Int = 0,
+    val totalPages: Int = 0,
+)

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

@@ -5,6 +5,28 @@ import kotlinx.serialization.Serializable
 
 @Serializable
 data class LibraryResponse(
+    @SerialName("books")
+    val books: LibraryBooks,
+    @SerialName("totalCount")
+    val totalCount: Int = 0,
+    @SerialName("beforeReadingCount")
+    val beforeReadingCount: Int,
+    @SerialName("readingCount")
+    val readingCount: Int,
+    @SerialName("completedCount")
+    val completedCount: Int,
+)
+
+@Serializable
+data class LibraryBooks(
+    @SerialName("content")
+    val content: List<LibraryBookSummary>,
+    @SerialName("page")
+    val page: PageInfo,
+)
+
+@Serializable
+data class LibraryBookSummary(
     @SerialName("userBookId")
     val userBookId: String,
     @SerialName("userId")
@@ -17,6 +39,8 @@ data class LibraryResponse(
     val bookAuthor: String,
     @SerialName("status")
     val status: String,
+    @SerialName("recordCount")
+    val recordCount: Int = 0,
     @SerialName("coverImageUrl")
     val coverImageUrl: String,
     @SerialName("publisher")
@@ -26,3 +50,15 @@ data class LibraryResponse(
     @SerialName("updatedAt")
     val updatedAt: String,
 )
+
+@Serializable
+data class PageInfo(
+    @SerialName("size")
+    val size: Int,
+    @SerialName("number")
+    val number: Int,
+    @SerialName("totalElements")
+    val totalElements: Int,
+    @SerialName("totalPages")
+    val totalPages: Int,
+)

core/network/src/main/kotlin/com/ninecraft/booket/core/network/service/ReedService.kt

@@ -55,5 +55,10 @@ interface ReedService {
     suspend fun upsertBook(@Body bookUpsertRequest: BookUpsertRequest): BookUpsertResponse
 
     @GET("api/v1/books/my-library")
-    suspend fun getLibrary(): LibraryResponse
+    suspend fun getLibrary(
+        @Query("status") status: String? = null,
+        @Query("page") page: Int,
+        @Query("size") size: Int,
+        @Query("sort") sort: String = "date_desc",
+    ): LibraryResponse
 }

…e/search/component/InfiniteLazyColumn.kt …/core/ui/component/InfinityLazyColumn.ktfeature/search/src/main/kotlin/com/ninecraft/booket/feature/search/component/InfiniteLazyColumn.kt renamed to core/ui/src/main/kotlin/com/ninecraft/booket/core/ui/component/InfinityLazyColumn.kt feature/search/src/main/kotlin/com/ninecraft/booket/feature/search/component/InfiniteLazyColumn.kt renamed to core/ui/src/main/kotlin/com/ninecraft/booket/core/ui/component/InfinityLazyColumn.kt

@@ -1,17 +1,25 @@
-package com.ninecraft.booket.feature.search.component
+package com.ninecraft.booket.core.ui.component
 
 import android.annotation.SuppressLint
+import androidx.compose.foundation.background
 import androidx.compose.foundation.gestures.FlingBehavior
 import androidx.compose.foundation.gestures.ScrollableDefaults
 import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.PaddingValues
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.Spacer
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.height
 import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.width
 import androidx.compose.foundation.lazy.LazyColumn
 import androidx.compose.foundation.lazy.LazyListScope
 import androidx.compose.foundation.lazy.LazyListState
 import androidx.compose.foundation.lazy.items
 import androidx.compose.foundation.lazy.rememberLazyListState
+import androidx.compose.foundation.shape.RoundedCornerShape
 import androidx.compose.material3.Surface
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
@@ -27,13 +35,12 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
 import com.ninecraft.booket.core.designsystem.theme.ReedTheme
-import com.ninecraft.booket.core.model.BookSummaryModel
 
 // 기기에서 평균적으로 한 화면에 보이는 아이템 개수
 private const val LIMIT_COUNT = 6
 
 @Composable
-internal fun InfinityLazyColumn(
+fun InfinityLazyColumn(
     modifier: Modifier = Modifier,
     state: LazyListState = rememberLazyListState(),
     contentPadding: PaddingValues = PaddingValues(0.dp),
@@ -117,16 +124,39 @@ private fun InfinityLazyColumnPreview() {
                     verticalArrangement = Arrangement.spacedBy(8.dp),
                     content = {
                         items(contents, key = { it }) {
-                            BookItem(
-                                book = BookSummaryModel(
-                                    title = "여름은 오래 그곳에 남아",
-                                    author = "마쓰이에 마사시",
-                                    publisher = "비채",
-                                    coverImageUrl = "https://example.com/sample-book-cover.jpg",
-                                    isbn = "978-89-7337-932-5",
-                                ),
-                                onBookClick = {},
-                            )
+                            Row(
+                                modifier = Modifier
+                                    .fillMaxWidth()
+                                    .padding(
+                                        horizontal = ReedTheme.spacing.spacing5,
+                                        vertical = ReedTheme.spacing.spacing4,
+                                    ),
+                                verticalAlignment = Alignment.CenterVertically,
+                            ) {
+                                Box(
+                                    modifier = Modifier
+                                        .width(68.dp)
+                                        .height(100.dp)
+                                        .background(
+                                            color = ReedTheme.colors.contentTertiary,
+                                            shape = RoundedCornerShape(ReedTheme.radius.sm),
+                                        ),
+                                )
+                                Spacer(Modifier.width(ReedTheme.spacing.spacing4))
+                                Column {
+                                    Text(
+                                        text = "Title",
+                                        color = ReedTheme.colors.contentPrimary,
+                                        style = ReedTheme.typography.body1SemiBold,
+                                    )
+                                    Spacer(Modifier.height(ReedTheme.spacing.spacing1))
+                                    Text(
+                                        text = "Description",
+                                        color = ReedTheme.colors.contentTertiary,
+                                        style = ReedTheme.typography.label1Medium,
+                                    )
+                                }
+                            }
                         }
                     },
                 )

…ture/search/component/LoadStateFooter.kt …ket/core/ui/component/LoadStateFooter.ktfeature/search/src/main/kotlin/com/ninecraft/booket/feature/search/component/LoadStateFooter.kt renamed to core/ui/src/main/kotlin/com/ninecraft/booket/core/ui/component/LoadStateFooter.kt feature/search/src/main/kotlin/com/ninecraft/booket/feature/search/component/LoadStateFooter.kt renamed to core/ui/src/main/kotlin/com/ninecraft/booket/core/ui/component/LoadStateFooter.kt

@@ -1,4 +1,4 @@
-package com.ninecraft.booket.feature.search.component
+package com.ninecraft.booket.core.ui.component
 
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Box
@@ -15,11 +15,10 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.unit.dp
 import com.ninecraft.booket.core.designsystem.theme.ReedTheme
-import com.ninecraft.booket.feature.search.FooterState
-import com.ninecraft.booket.feature.search.R
+import com.ninecraft.booket.core.ui.R
 
 @Composable
-internal fun LoadStateFooter(
+fun LoadStateFooter(
     footerState: FooterState,
     onRetryClick: () -> Unit,
     modifier: Modifier = Modifier,
@@ -56,7 +55,7 @@ internal fun LoadStateFooter(
 
             is FooterState.End -> {
                 Text(
-                    text = stringResource(R.string.no_more_results),
+                    text = stringResource(R.string.no_more_result),
                     color = ReedTheme.colors.contentSecondary,
                     style = ReedTheme.typography.body2Regular,
                 )
@@ -68,3 +67,10 @@ internal fun LoadStateFooter(
         }
     }
 }
+
+sealed interface FooterState {
+    data object Idle : FooterState
+    data object Loading : FooterState
+    data object End : FooterState
+    data class Error(val message: String) : FooterState
+}

core/ui/src/main/res/values/strings.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="no_more_result">더 이상 결과가 없습니다</string>
+    <string name="retry">다시 시도</string>
+</resources>