Merge pull request #153 from YAPP-Github/BOOK-272-feature/#148

feat: 등록 도서 삭제 기능 구현

Author: easyhooon

core/common/src/main/kotlin/com/ninecraft/booket/core/common/constants/ErrorDialogSpec.kt

@@ -1,7 +1,9 @@
 package com.ninecraft.booket.core.common.constants
 
+import androidx.annotation.StringRes
+
 data class ErrorDialogSpec(
     val message: String,
-    val buttonLabelResId: Int,
+    @StringRes val buttonLabelResId: Int,
     val action: () -> Unit,
 )

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

@@ -17,7 +17,7 @@ interface BookRepository {
         start: Int,
     ): Result<BookSearchModel>
 
-    suspend fun removeBookRecentSearch(query: String)
+    suspend fun deleteBookRecentSearch(query: String)
 
     suspend fun getBookDetail(isbn13: String): Result<BookDetailModel>
 
@@ -38,9 +38,11 @@ interface BookRepository {
         size: Int,
     ): Result<LibraryModel>
 
-    suspend fun removeLibraryRecentSearch(query: String)
+    suspend fun deleteLibraryRecentSearch(query: String)
 
     suspend fun getHome(): Result<HomeModel>
 
     suspend fun getSeedsStats(userBookId: String): Result<SeedModel>
+
+    suspend fun deleteBook(userBookId: String): Result<Unit>
 }

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

@@ -30,8 +30,8 @@ internal class DefaultBookRepository @Inject constructor(
         result
     }
 
-    override suspend fun removeBookRecentSearch(query: String) {
-        bookRecentSearchDataSource.removeRecentSearch(query)
+    override suspend fun deleteBookRecentSearch(query: String) {
+        bookRecentSearchDataSource.deleteRecentSearch(query)
     }
 
     override suspend fun getBookDetail(isbn13: String) = runSuspendCatching {
@@ -53,8 +53,8 @@ internal class DefaultBookRepository @Inject constructor(
         result
     }
 
-    override suspend fun removeLibraryRecentSearch(query: String) {
-        libraryRecentSearchDataSource.removeRecentSearch(query)
+    override suspend fun deleteLibraryRecentSearch(query: String) {
+        libraryRecentSearchDataSource.deleteRecentSearch(query)
     }
 
     override suspend fun getHome() = runSuspendCatching {
@@ -64,4 +64,8 @@ internal class DefaultBookRepository @Inject constructor(
     override suspend fun getSeedsStats(userBookId: String) = runSuspendCatching {
         service.getSeedsStats(userBookId).toModel()
     }
+
+    override suspend fun deleteBook(userBookId: String) = runSuspendCatching {
+        service.deleteBook(userBookId)
+    }
 }

core/datastore/api/src/main/kotlin/com/ninecraft/booket/core/datastore/api/datasource/RecentSearchDataSource.kt

@@ -5,6 +5,6 @@ import kotlinx.coroutines.flow.Flow
 interface RecentSearchDataSource {
     val recentSearches: Flow<List<String>>
     suspend fun addRecentSearch(query: String)
-    suspend fun removeRecentSearch(query: String)
+    suspend fun deleteRecentSearch(query: String)
     suspend fun clearRecentSearches()
 }

core/datastore/impl/src/main/kotlin/com/ninecraft/booket/core/datastore/impl/datasource/DefaultBookRecentSearchDataSource.kt

@@ -67,7 +67,7 @@ class DefaultBookRecentSearchDataSource @Inject constructor(
     }
 
     @Suppress("TooGenericExceptionCaught")
-    override suspend fun removeRecentSearch(query: String) {
+    override suspend fun deleteRecentSearch(query: String) {
         dataStore.edit { prefs ->
             val currentSearches = prefs[BOOK_RECENT_SEARCHES]?.let { jsonString ->
                 try {

core/datastore/impl/src/main/kotlin/com/ninecraft/booket/core/datastore/impl/datasource/DefaultLibraryRecentSearchDataSource.kt

@@ -67,7 +67,7 @@ class DefaultLibraryRecentSearchDataSource @Inject constructor(
     }
 
     @Suppress("TooGenericExceptionCaught")
-    override suspend fun removeRecentSearch(query: String) {
+    override suspend fun deleteRecentSearch(query: String) {
         dataStore.edit { prefs ->
             val currentSearches = prefs[LIBRARY_RECENT_SEARCHES]?.let { jsonString ->
                 try {
@@ -76,7 +76,7 @@ class DefaultLibraryRecentSearchDataSource @Inject constructor(
                     Logger.e(e, "Failed to deserialize recent searches for removal")
                     mutableListOf()
                 } catch (e: Exception) {
-                    Logger.e(e, "Unexpected error while removing recent search")
+                    Logger.e(e, "Unexpected error while deleting recent search")
                     mutableListOf()
                 }
             } ?: mutableListOf()

core/network/src/main/kotlin/com/ninecraft/booket/core/network/TokenInterceptor.kt

@@ -7,7 +7,6 @@ import okhttp3.Response
 import javax.inject.Inject
 
 internal class TokenInterceptor @Inject constructor(
-    @Suppress("unused")
     private val tokenDataSource: TokenDataSource,
 ) : Interceptor {
 

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

@@ -80,6 +80,11 @@ interface ReedService {
         @Query("sort") sort: String = "CREATED_DATE_DESC",
     ): LibraryResponse
 
+    @DELETE("api/v1/books/my-library/{userBookId}")
+    suspend fun deleteBook(
+        @Path("userBookId") userBookId: String,
+    )
+
     // Reading-records endpoints (auth required)
     @POST("api/v1/reading-records/{userBookId}")
     suspend fun postRecord(

core/ui/src/main/kotlin/com/ninecraft/booket/core/ui/component/InfinityLazyColumn.kt

@@ -72,7 +72,7 @@ fun InfinityLazyColumn(
 @SuppressLint("ComposableNaming")
 @Composable
 private fun LazyListState.onLoadMore(
-    limitCount: Int = 6,
+    limitCount: Int = LIMIT_COUNT,
     loadOnBottom: Boolean = true,
     action: () -> Unit,
 ) {

feature/detail/src/main/kotlin/com/ninecraft/booket/feature/detail/book/BookDetailPresenter.kt

@@ -78,6 +78,8 @@ class BookDetailPresenter @AssistedInject constructor(
         var isRecordSortBottomSheetVisible by rememberRetained { mutableStateOf(false) }
         var isRecordMenuBottomSheetVisible by rememberRetained { mutableStateOf(false) }
         var isRecordDeleteDialogVisible by rememberRetained { mutableStateOf(false) }
+        var isDetailMenuBottomSheetVisible by rememberRetained { mutableStateOf(false) }
+        var isBookDeleteDialogVisible by rememberRetained { mutableStateOf(false) }
         var sideEffect by rememberRetained { mutableStateOf<BookDetailSideEffect?>(null) }
 
         @Suppress("TooGenericExceptionCaught")
@@ -212,6 +214,29 @@ class BookDetailPresenter @AssistedInject constructor(
             }
         }
 
+        fun deleteBook(userBookId: String, onSuccess: () -> Unit) {
+            scope.launch {
+                bookRepository.deleteBook(userBookId = userBookId)
+                    .onSuccess {
+                        onSuccess()
+                    }
+                    .onFailure { exception ->
+                        val handleErrorMessage = { message: String ->
+                            Logger.e(message)
+                            sideEffect = BookDetailSideEffect.ShowToast(message)
+                        }
+
+                        handleException(
+                            exception = exception,
+                            onError = handleErrorMessage,
+                            onLoginRequired = {
+                                navigator.resetRoot(LoginScreen)
+                            },
+                        )
+                    }
+            }
+        }
+
         LaunchedEffect(Unit) {
             initialLoad()
         }
@@ -297,7 +322,7 @@ class BookDetailPresenter @AssistedInject constructor(
                     isRecordDeleteDialogVisible = true
                 }
 
-                is BookDetailUiEvent.OnDelete -> {
+                is BookDetailUiEvent.OnDeleteRecord -> {
                     isRecordDeleteDialogVisible = false
                     deleteRecord(
                         readingRecordId = selectedRecordInfo.id,
@@ -313,6 +338,33 @@ class BookDetailPresenter @AssistedInject constructor(
                     navigator.goTo(RecordDetailScreen(event.recordId))
                 }
 
+                is BookDetailUiEvent.OnDetailMenuClick -> {
+                    isDetailMenuBottomSheetVisible = true
+                }
+
+                is BookDetailUiEvent.OnDetailMenuBottomSheetDismiss -> {
+                    isDetailMenuBottomSheetVisible = false
+                }
+
+                is BookDetailUiEvent.OnDeleteBookClick -> {
+                    isDetailMenuBottomSheetVisible = false
+                    isBookDeleteDialogVisible = true
+                }
+
+                is BookDetailUiEvent.OnDeleteDialogDismiss -> {
+                    isBookDeleteDialogVisible = false
+                }
+
+                is BookDetailUiEvent.OnDeleteBook -> {
+                    isBookDeleteDialogVisible = false
+                    deleteBook(
+                        userBookId = screen.userBookId,
+                        onSuccess = {
+                            navigator.pop()
+                        },
+                    )
+                }
+
                 is BookDetailUiEvent.OnLoadMore -> {
                     if (uiState != UiState.Loading && footerState !is FooterState.Loading && !isLastPage) {
                         loadMoreReadingRecords(startIndex = currentStartIndex + 1)
@@ -342,6 +394,8 @@ class BookDetailPresenter @AssistedInject constructor(
             selectedRecordInfo = selectedRecordInfo,
             isRecordMenuBottomSheetVisible = isRecordMenuBottomSheetVisible,
             isRecordDeleteDialogVisible = isRecordDeleteDialogVisible,
+            isDetailMenuBottomSheetVisible = isDetailMenuBottomSheetVisible,
+            isBookDeleteDialogVisible = isBookDeleteDialogVisible,
             sideEffect = sideEffect,
             eventSink = ::handleEvent,
         )