Merge pull request #63 from YAPP-Github/BOOK-144-feature/#49

feat: 내서재 화면 UI 구현

Author: seoyoon513

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

@@ -3,6 +3,7 @@ package com.ninecraft.booket.core.data.api.repository
 import com.ninecraft.booket.core.model.BookDetailModel
 import com.ninecraft.booket.core.model.BookSearchModel
 import com.ninecraft.booket.core.model.BookUpsertModel
+import com.ninecraft.booket.core.model.LibraryModel
 
 interface BookRepository {
     suspend fun searchBook(
@@ -16,4 +17,6 @@ interface BookRepository {
         bookIsbn: String,
         bookStatus: String,
     ): Result<BookUpsertModel>
+
+    suspend fun getLibrary(): Result<LibraryModel>
 }

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

@@ -5,11 +5,13 @@ 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.LibraryModel
 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.LibraryResponse
 import com.ninecraft.booket.core.network.response.UserProfileResponse
 
 internal fun UserProfileResponse.toModel(): UserProfileModel {
@@ -84,3 +86,18 @@ internal fun BookUpsertResponse.toModel(): BookUpsertModel {
         updatedAt = updatedAt,
     )
 }
+
+internal fun LibraryResponse.toModel(): LibraryModel {
+    return LibraryModel(
+        userBookId = userBookId,
+        userId = userId,
+        bookIsbn = bookIsbn,
+        bookTitle = bookTitle,
+        bookAuthor = bookAuthor,
+        status = status,
+        coverImageUrl = coverImageUrl,
+        publisher = publisher,
+        createdAt = createdAt,
+        updatedAt = updatedAt,
+    )
+}

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

@@ -27,4 +27,8 @@ internal class DefaultBookRepository @Inject constructor(
     override suspend fun upsertBook(bookIsbn: String, bookStatus: String) = runSuspendCatching {
         service.upsertBook(BookUpsertRequest(bookIsbn, bookStatus)).toModel()
     }
+
+    override suspend fun getLibrary() = runSuspendCatching {
+        service.getLibrary().toModel()
+    }
 }

core/designsystem/src/main/kotlin/com/ninecraft/booket/core/designsystem/component/appbar/ReedTopAppBar.kt

@@ -5,9 +5,9 @@ import androidx.compose.foundation.background
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.Spacer
-import androidx.compose.foundation.layout.fillMaxHeight
 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.material3.Icon
 import androidx.compose.material3.IconButton
@@ -37,25 +37,23 @@ fun ReedTopAppBar(
     Row(
         modifier = modifier
             .fillMaxWidth()
-            .height(56.dp)
-            .background(color = White),
+            .height(60.dp)
+            .background(color = White)
+            .padding(horizontal = ReedTheme.spacing.spacing2),
         horizontalArrangement = Arrangement.Start,
         verticalAlignment = Alignment.CenterVertically,
     ) {
         if (startIconRes != null) {
             IconButton(
                 onClick = { startIconOnClick() },
-                modifier = Modifier
-                    .fillMaxHeight()
-                    .width(72.dp),
             ) {
                 Icon(
                     painter = painterResource(id = startIconRes),
                     contentDescription = startIconDescription,
                 )
             }
         } else {
-            Spacer(modifier = Modifier.width(72.dp))
+            Spacer(modifier = Modifier.width(ReedTheme.spacing.spacing12))
         }
 
         Text(
@@ -68,17 +66,14 @@ fun ReedTopAppBar(
         if (endIconRes != null) {
             IconButton(
                 onClick = { endIconOnClick() },
-                modifier = Modifier
-                    .fillMaxHeight()
-                    .width(72.dp),
             ) {
                 Icon(
                     painter = painterResource(id = endIconRes),
                     contentDescription = endIconDescription,
                 )
             }
         } else {
-            Spacer(modifier = Modifier.width(72.dp))
+            Spacer(modifier = Modifier.width(ReedTheme.spacing.spacing12))
         }
     }
 }

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

@@ -0,0 +1,17 @@
+package com.ninecraft.booket.core.model
+
+import androidx.compose.runtime.Stable
+
+@Stable
+data class LibraryModel(
+    val userBookId: String = "",
+    val userId: String = "",
+    val bookIsbn: String = "",
+    val bookTitle: String = "",
+    val bookAuthor: String = "",
+    val status: String = "",
+    val coverImageUrl: String = "",
+    val publisher: String = "",
+    val createdAt: String = "",
+    val updatedAt: String = "",
+)

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

@@ -0,0 +1,28 @@
+package com.ninecraft.booket.core.network.response
+
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
+
+@Serializable
+data class LibraryResponse(
+    @SerialName("userBookId")
+    val userBookId: String,
+    @SerialName("userId")
+    val userId: String,
+    @SerialName("bookIsbn")
+    val bookIsbn: String,
+    @SerialName("bookTitle")
+    val bookTitle: String,
+    @SerialName("bookAuthor")
+    val bookAuthor: String,
+    @SerialName("status")
+    val status: String,
+    @SerialName("coverImageUrl")
+    val coverImageUrl: String,
+    @SerialName("publisher")
+    val publisher: String,
+    @SerialName("createdAt")
+    val createdAt: String,
+    @SerialName("updatedAt")
+    val updatedAt: String,
+)

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

@@ -6,6 +6,7 @@ import com.ninecraft.booket.core.network.request.RefreshTokenRequest
 import com.ninecraft.booket.core.network.response.BookDetailResponse
 import com.ninecraft.booket.core.network.response.BookSearchResponse
 import com.ninecraft.booket.core.network.response.BookUpsertResponse
+import com.ninecraft.booket.core.network.response.LibraryResponse
 import com.ninecraft.booket.core.network.response.LoginResponse
 import com.ninecraft.booket.core.network.response.RefreshTokenResponse
 import com.ninecraft.booket.core.network.response.UserProfileResponse
@@ -52,4 +53,7 @@ interface ReedService {
 
     @PUT("api/v1/books/upsert")
     suspend fun upsertBook(@Body bookUpsertRequest: BookUpsertRequest): BookUpsertResponse
+
+    @GET("api/v1/books/my-library")
+    suspend fun getLibrary(): LibraryResponse
 }

feature/library/src/main/kotlin/com/ninecraft/booket/feature/library/LibraryPresenter.kt

@@ -3,15 +3,9 @@ package com.ninecraft.booket.feature.library
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateOf
-import androidx.compose.runtime.rememberCoroutineScope
 import androidx.compose.runtime.setValue
-import com.ninecraft.booket.core.common.utils.handleException
-import com.ninecraft.booket.core.data.api.repository.UserRepository
 import com.ninecraft.booket.feature.screens.LibraryScreen
-import com.ninecraft.booket.feature.screens.LoginScreen
 import com.ninecraft.booket.feature.screens.SettingsScreen
-import com.orhanobut.logger.Logger
-import com.skydoves.compose.effects.RememberedEffect
 import com.slack.circuit.codegen.annotations.CircuitInject
 import com.slack.circuit.retained.rememberRetained
 import com.slack.circuit.runtime.Navigator
@@ -20,52 +14,42 @@ import dagger.assisted.Assisted
 import dagger.assisted.AssistedFactory
 import dagger.assisted.AssistedInject
 import dagger.hilt.android.components.ActivityRetainedComponent
-import kotlinx.coroutines.launch
+import kotlinx.collections.immutable.persistentListOf
+import kotlinx.collections.immutable.toPersistentList
 
 class LibraryPresenter @AssistedInject constructor(
     @Assisted private val navigator: Navigator,
-    private val userRepository: UserRepository,
 ) : Presenter<LibraryUiState> {
 
     @Composable
     override fun present(): LibraryUiState {
-        val scope = rememberCoroutineScope()
         var isLoading by rememberRetained { mutableStateOf(false) }
         var sideEffect by rememberRetained { mutableStateOf<LibrarySideEffect?>(null) }
-        var nickname by rememberRetained { mutableStateOf("") }
-        var email by rememberRetained { mutableStateOf("") }
-
-        fun getUserProfile() {
-            scope.launch {
-                try {
-                    isLoading = true
-                    userRepository.getUserProfile()
-                        .onSuccess { user ->
-                            nickname = user.nickname
-                            email = user.email
-                        }
-                        .onFailure { exception ->
-                            val handleErrorMessage = { message: String ->
-                                Logger.e(message)
-                                sideEffect = LibrarySideEffect.ShowToast(message)
-                            }
-
-                            handleException(
-                                exception = exception,
-                                onError = handleErrorMessage,
-                                onLoginRequired = {
-                                    navigator.resetRoot(LoginScreen)
-                                },
-                            )
-                        }
-                } finally {
-                    isLoading = false
-                }
-            }
-        }
-
-        RememberedEffect(Unit) {
-            getUserProfile()
+        var chipElements by rememberRetained {
+            mutableStateOf(
+                persistentListOf(
+                    FilterChipState(
+                        title = BookStatus.TOTAL,
+                        count = 10,
+                        isSelected = true,
+                    ),
+                    FilterChipState(
+                        title = BookStatus.BEFORE_READING,
+                        count = 15,
+                        isSelected = false,
+                    ),
+                    FilterChipState(
+                        title = BookStatus.READING,
+                        count = 2,
+                        isSelected = false,
+                    ),
+                    FilterChipState(
+                        title = BookStatus.COMPLETED,
+                        count = 5,
+                        isSelected = false,
+                    ),
+                ),
+            )
         }
 
         fun handleEvent(event: LibraryUiEvent) {
@@ -77,13 +61,23 @@ class LibraryPresenter @AssistedInject constructor(
                 is LibraryUiEvent.OnSettingsClick -> {
                     navigator.goTo(SettingsScreen)
                 }
+
+                is LibraryUiEvent.OnFilterClick -> {
+                    chipElements = chipElements.map {
+                        if (it.title == event.bookStatus) {
+                            it.copy(isSelected = true)
+                        } else {
+                            it.copy(isSelected = false)
+                        }
+                    }.toPersistentList()
+                    // TODO: 필터에 해당하는 도서 목록을 불러오는 로직이 들어가야 함
+                }
             }
         }
 
         return LibraryUiState(
             isLoading = isLoading,
-            nickname = nickname,
-            email = email,
+            filterElements = chipElements,
             sideEffect = sideEffect,
             eventSink = ::handleEvent,
         )