Merge pull request #55 from YAPP-Github/BOOK-145-feature/#50

feat: 도서 등록 플로우 구현

Author: easyhooon

core/common/build.gradle.kts

@@ -14,6 +14,7 @@ android {
 dependencies {
     implementations(
         projects.core.model,
+        projects.core.network,
 
         libs.logger,
     )

core/common/src/main/kotlin/com/ninecraft/booket/core/common/utils/HandleException.kt

@@ -1,36 +1,77 @@
 package com.ninecraft.booket.core.common.utils
 
+import com.ninecraft.booket.core.network.response.ErrorResponse
 import com.orhanobut.logger.Logger
+import kotlinx.serialization.SerializationException
+import kotlinx.serialization.json.Json
 import retrofit2.HttpException
+import java.io.IOException
 import java.net.ConnectException
 import java.net.SocketTimeoutException
 import java.net.UnknownHostException
 
 fun handleException(
     exception: Throwable,
+    onError: (String) -> Unit,
     onLoginRequired: () -> Unit,
-    onServerError: (String) -> Unit,
-    onNetworkError: (String) -> Unit,
 ) {
     when {
         exception is HttpException && exception.code() == 401 -> {
             onLoginRequired()
         }
 
-        exception is HttpException && exception.code() in 500..599 -> {
-            onServerError("서버 오류가 발생했습니다.")
+        exception is HttpException -> {
+            val serverMessage = exception.parseErrorMessage()
+            val message = serverMessage ?: getHttpErrorMessage(exception.code())
+            Logger.e("HTTP ${exception.code()}: $message")
+            onError(message)
         }
 
-        exception is UnknownHostException || exception is ConnectException -> {
-            onNetworkError("네트워크 연결을 확인해주세요.")
-        }
-
-        exception is SocketTimeoutException -> {
-            onServerError("서버 응답 시간이 초과되었습니다.")
+        exception.isNetworkError() -> {
+            onError("네트워크 연결을 확인해주세요.")
         }
 
         else -> {
-            Logger.e(exception.message ?: "알 수 없는 오류가 발생했습니다.")
+            val errorMessage = exception.message ?: "알 수 없는 오류가 발생했습니다"
+            Logger.e(errorMessage)
+            onError(errorMessage)
         }
     }
 }
+
+@Suppress("TooGenericExceptionCaught")
+private fun HttpException.parseErrorMessage(): String? {
+    return try {
+        val errorBody = response()?.errorBody()?.string()
+        if (errorBody.isNullOrBlank()) return null
+        Json.decodeFromString<ErrorResponse>(errorBody).getErrorMessage()
+    } catch (e: SerializationException) {
+        Logger.e("JSON parsing failed: ${e.message}")
+        null
+    } catch (e: IOException) {
+        Logger.e("Failed to read error body: ${e.message}")
+        null
+    } catch (e: Exception) {
+        Logger.e("Unexpected error parsing response: ${e.message}")
+        null
+    }
+}
+
+private fun getHttpErrorMessage(statusCode: Int): String {
+    return when (statusCode) {
+        400 -> "요청이 올바르지 않습니다"
+        403 -> "접근 권한이 없습니다"
+        404 -> "존재하지 않는 데이터입니다"
+        429 -> "요청이 너무 많습니다. 잠시 후 다시 시도해주세요"
+        in 400..499 -> "요청 처리 중 오류가 발생했습니다"
+        in 500..599 -> "서버 오류가 발생했습니다"
+        else -> "알 수 없는 오류가 발생했습니다"
+    }
+}
+
+private fun Throwable.isNetworkError(): Boolean {
+    return this is UnknownHostException ||
+        this is ConnectException ||
+        this is SocketTimeoutException ||
+        this is IOException
+}

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

@@ -2,6 +2,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
 
 interface BookRepository {
     suspend fun searchBook(
@@ -10,4 +11,9 @@ interface BookRepository {
     ): Result<BookSearchModel>
 
     suspend fun getBookDetail(itemId: String): Result<BookDetailModel>
+
+    suspend fun upsertBook(
+        bookIsbn: String,
+        bookStatus: String,
+    ): Result<BookUpsertModel>
 }

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

@@ -4,10 +4,12 @@ import com.ninecraft.booket.core.common.extensions.decodeHtmlEntities
 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.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.UserProfileResponse
 
 internal fun UserProfileResponse.toModel(): UserProfileModel {
@@ -67,3 +69,18 @@ internal fun BookDetailResponse.toModel(): BookDetailModel {
         publisher = publisher,
     )
 }
+
+internal fun BookUpsertResponse.toModel(): BookUpsertModel {
+    return BookUpsertModel(
+        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/DefaultAuthRepository.kt

@@ -4,19 +4,17 @@ import com.ninecraft.booket.core.common.utils.runSuspendCatching
 import com.ninecraft.booket.core.data.api.repository.AuthRepository
 import com.ninecraft.booket.core.datastore.api.datasource.TokenPreferencesDataSource
 import com.ninecraft.booket.core.network.request.LoginRequest
-import com.ninecraft.booket.core.network.service.AuthService
-import com.ninecraft.booket.core.network.service.NoAuthService
+import com.ninecraft.booket.core.network.service.ReedService
 import javax.inject.Inject
 
 private const val KAKAO_PROVIDER_TYPE = "KAKAO"
 
 internal class DefaultAuthRepository @Inject constructor(
-    private val noAuthService: NoAuthService,
-    private val authService: AuthService,
+    private val service: ReedService,
     private val tokenDatasource: TokenPreferencesDataSource,
 ) : AuthRepository {
     override suspend fun login(accessToken: String) = runSuspendCatching {
-        val response = noAuthService.login(
+        val response = service.login(
             LoginRequest(
                 providerType = KAKAO_PROVIDER_TYPE,
                 oauthToken = accessToken,
@@ -26,7 +24,7 @@ internal class DefaultAuthRepository @Inject constructor(
     }
 
     override suspend fun logout() = runSuspendCatching {
-        authService.logout()
+        service.logout()
         clearTokens()
     }
 

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

@@ -3,11 +3,12 @@ package com.ninecraft.booket.core.data.impl.repository
 import com.ninecraft.booket.core.common.utils.runSuspendCatching
 import com.ninecraft.booket.core.data.api.repository.BookRepository
 import com.ninecraft.booket.core.data.impl.mapper.toModel
-import com.ninecraft.booket.core.network.service.NoAuthService
+import com.ninecraft.booket.core.network.request.BookUpsertRequest
+import com.ninecraft.booket.core.network.service.ReedService
 import javax.inject.Inject
 
 internal class DefaultBookRepository @Inject constructor(
-    private val service: NoAuthService,
+    private val service: ReedService,
 ) : BookRepository {
     override suspend fun searchBook(
         query: String,
@@ -22,4 +23,8 @@ internal class DefaultBookRepository @Inject constructor(
     override suspend fun getBookDetail(itemId: String) = runSuspendCatching {
         service.getBookDetail(itemId).toModel()
     }
+
+    override suspend fun upsertBook(bookIsbn: String, bookStatus: String) = runSuspendCatching {
+        service.upsertBook(BookUpsertRequest(bookIsbn, bookStatus)).toModel()
+    }
 }

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

@@ -3,13 +3,13 @@ package com.ninecraft.booket.core.data.impl.repository
 import com.ninecraft.booket.core.common.utils.runSuspendCatching
 import com.ninecraft.booket.core.data.api.repository.UserRepository
 import com.ninecraft.booket.core.data.impl.mapper.toModel
-import com.ninecraft.booket.core.network.service.AuthService
+import com.ninecraft.booket.core.network.service.ReedService
 import javax.inject.Inject
 
 internal class DefaultUserRepository @Inject constructor(
-    private val authService: AuthService,
+    private val service: ReedService,
 ) : UserRepository {
     override suspend fun getUserProfile() = runSuspendCatching {
-        authService.getUserProfile().toModel()
+        service.getUserProfile().toModel()
     }
 }

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

@@ -4,6 +4,7 @@ import androidx.annotation.StringRes
 import androidx.compose.foundation.BorderStroke
 import androidx.compose.foundation.background
 import androidx.compose.foundation.border
+import androidx.compose.foundation.clickable
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.Spacer
@@ -47,6 +48,7 @@ fun ReedTextField(
     queryState: TextFieldState,
     @StringRes queryHintRes: Int,
     onSearch: (String) -> Unit,
+    onClear: () -> Unit,
     modifier: Modifier = Modifier,
     backgroundColor: Color = ReedTheme.colors.baseSecondary,
     textColor: Color = ReedTheme.colors.contentPrimary,
@@ -58,7 +60,9 @@ fun ReedTextField(
     CompositionLocalProvider(LocalTextSelectionColors provides reedTextSelectionColors) {
         BasicTextField(
             state = queryState,
-            modifier = Modifier.fillMaxWidth(),
+            modifier = Modifier
+                .fillMaxWidth()
+                .height(50.dp),
             textStyle = ReedTheme.typography.body2Medium.copy(color = textColor),
             keyboardOptions = KeyboardOptions(
                 keyboardType = KeyboardType.Text,
@@ -81,7 +85,7 @@ fun ReedTextField(
                     verticalAlignment = Alignment.CenterVertically,
                 ) {
                     Spacer(modifier = Modifier.width(ReedTheme.spacing.spacing4))
-                    Box {
+                    Box(modifier = Modifier.weight(1f)) {
                         if (queryState.text.isEmpty()) {
                             Text(
                                 text = stringResource(id = queryHintRes),
@@ -91,10 +95,25 @@ fun ReedTextField(
                         }
                         innerTextField()
                     }
-                    Spacer(modifier = Modifier.weight(1f))
+                    Spacer(modifier = Modifier.width(ReedTheme.spacing.spacing2))
+                    if (queryState.text.toString().isNotEmpty()) {
+                        Icon(
+                            imageVector = ImageVector.vectorResource(R.drawable.ic_x_circle),
+                            contentDescription = "Clear Icon",
+                            modifier = Modifier.clickable {
+                                onClear()
+                            },
+                            tint = Color.Unspecified,
+                        )
+                    }
+                    Spacer(modifier = Modifier.width(ReedTheme.spacing.spacing2))
                     Icon(
                         imageVector = ImageVector.vectorResource(R.drawable.ic_search),
                         contentDescription = "Search Icon",
+                        modifier = Modifier.clickable {
+                            onSearch(queryState.text.toString())
+                            keyboardController?.hide()
+                        },
                         tint = ReedTheme.colors.contentBrand,
                     )
                     Spacer(modifier = Modifier.width(ReedTheme.spacing.spacing4))
@@ -112,6 +131,7 @@ private fun ReedTextFieldPreview() {
             queryState = TextFieldState("검색"),
             queryHintRes = R.string.search_book_hint,
             onSearch = {},
+            onClear = {},
             modifier = Modifier
                 .height(46.dp)
                 .fillMaxWidth()

core/designsystem/src/main/kotlin/com/ninecraft/booket/core/designsystem/component/bottomsheet/ReedBottomSheet.kt

@@ -10,8 +10,8 @@ import androidx.compose.material3.SheetValue
 import androidx.compose.material3.rememberModalBottomSheetState
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
-import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
+import com.ninecraft.booket.core.designsystem.ComponentPreview
 import com.ninecraft.booket.core.designsystem.component.button.ReedButton
 import com.ninecraft.booket.core.designsystem.component.button.ReedButtonColorStyle
 import com.ninecraft.booket.core.designsystem.component.button.largeButtonStyle
@@ -40,7 +40,7 @@ fun ReedBottomSheet(
 }
 
 @OptIn(ExperimentalMaterial3Api::class)
-@Preview(showBackground = true)
+@ComponentPreview
 @Composable
 private fun ReedBottomSheetPreview() {
     val sheetState = SheetState(

core/designsystem/src/main/kotlin/com/ninecraft/booket/core/designsystem/component/button/ReedButton.kt

@@ -24,10 +24,10 @@ import androidx.compose.runtime.getValue
 import androidx.compose.runtime.remember
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.graphicsLayer
-import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
 import com.ninecraft.booket.core.common.utils.MultipleEventsCutter
 import com.ninecraft.booket.core.common.utils.get
+import com.ninecraft.booket.core.designsystem.ComponentPreview
 
 @Composable
 fun ReedButton(
@@ -97,7 +97,7 @@ fun ReedButton(
     }
 }
 
-@Preview(showBackground = true)
+@ComponentPreview
 @Composable
 private fun ReedLargeButtonPreview() {
     Column(
@@ -271,7 +271,7 @@ private fun ReedLargeButtonPreview() {
     }
 }
 
-@Preview(showBackground = true)
+@ComponentPreview
 @Composable
 private fun ReedMediumButtonPreview() {
     Column(
@@ -445,7 +445,7 @@ private fun ReedMediumButtonPreview() {
     }
 }
 
-@Preview(showBackground = true)
+@ComponentPreview
 @Composable
 private fun ReedSmallButtonPreview() {
     Column(
@@ -619,7 +619,7 @@ private fun ReedSmallButtonPreview() {
     }
 }
 
-@Preview(showBackground = true)
+@ComponentPreview
 @Composable
 private fun ReedButtonDisabledPreview() {
     Column(