Merge pull request #104 from YAPP-Github/BOOK-212-feature/#98

feat: 도서 상세화면 API 연동

Author: easyhooon

app/build.gradle.kts

@@ -86,6 +86,7 @@ dependencies {
         projects.feature.screens,
         projects.feature.search,
         projects.feature.settings,
+        projects.feature.splash,
         projects.feature.webview,
 
         libs.androidx.activity.compose,

core/common/src/main/kotlin/com/ninecraft/booket/core/common/extensions/Emotion.kt

@@ -7,16 +7,16 @@ fun Emotion.toTextColor(): Color {
     return when (this) {
         Emotion.WARM -> Color(0xFFE3931B)
         Emotion.JOY -> Color(0xFFEE6B33)
-        Emotion.TENSION -> Color(0xFF9A55E4)
-        Emotion.SADNESS -> Color(0xFF2872E9)
+        Emotion.SAD -> Color(0xFF9A55E4)
+        Emotion.INSIGHT -> Color(0xFF2872E9)
     }
 }
 
 fun Emotion.toBackgroundColor(): Color {
     return when (this) {
         Emotion.WARM -> Color(0xFFFFF5D3)
         Emotion.JOY -> Color(0xFFFFEBE3)
-        Emotion.TENSION -> Color(0xFFF3E8FF)
-        Emotion.SADNESS -> Color(0xFFE1ECFF)
+        Emotion.SAD -> Color(0xFFF3E8FF)
+        Emotion.INSIGHT -> Color(0xFFE1ECFF)
     }
 }

core/common/src/main/kotlin/com/ninecraft/booket/core/common/extensions/String.kt

@@ -17,6 +17,11 @@ fun String.decodeHtmlEntities(): String {
         .replace(" ", " ")
 }
 
+fun String.formatPublishYear(): String {
+    val year = this.substringBefore("-")
+    return "${year}년"
+}
+
 fun String.toFormattedDate(): String {
     return try {
         val inputFormatter = DateTimeFormatter.ofPattern("yyyy-MM-dd'T'HH:mm:ss.SSSSSS")

core/common/src/main/kotlin/com/ninecraft/booket/core/common/util/EmotionAnalyzer.kt

@@ -8,17 +8,20 @@ data class EmotionAnalysisResult(
 )
 
 enum class EmotionDisplayType {
+    NONE, // 모든 감정의 count가 0
     SINGLE, // 1개 감정이 1위
     DUAL, // 2개 감정이 공동 1위
     BALANCED, // 3개 이상 감정이 공동 1위
 }
 
 fun analyzeEmotions(emotions: List<EmotionModel>): EmotionAnalysisResult {
-    if (emotions.isEmpty()) {
-        return EmotionAnalysisResult(emptyList(), EmotionDisplayType.BALANCED)
+    val maxCount = emotions.maxOf { it.count }
+
+    // 모든 감정의 count가 0인 경우
+    if (maxCount == 0) {
+        return EmotionAnalysisResult(emptyList(), EmotionDisplayType.NONE)
     }
 
-    val maxCount = emotions.maxOf { it.count }
     val topEmotions = emotions.filter { it.count == maxCount }
 
     val displayType = when (topEmotions.size) {

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

@@ -3,8 +3,10 @@ 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 kotlinx.coroutines.flow.Flow
+import com.ninecraft.booket.core.model.HomeModel
 import com.ninecraft.booket.core.model.LibraryModel
+import com.ninecraft.booket.core.model.SeedModel
+import kotlinx.coroutines.flow.Flow
 
 interface BookRepository {
     val bookRecentSearches: Flow<List<String>>
@@ -17,10 +19,10 @@ interface BookRepository {
 
     suspend fun removeBookRecentSearch(query: String)
 
-    suspend fun getBookDetail(itemId: String): Result<BookDetailModel>
+    suspend fun getBookDetail(isbn13: String): Result<BookDetailModel>
 
     suspend fun upsertBook(
-        bookIsbn: String,
+        isbn13: String,
         bookStatus: String,
     ): Result<BookUpsertModel>
 
@@ -37,4 +39,8 @@ interface BookRepository {
     ): Result<LibraryModel>
 
     suspend fun removeLibraryRecentSearch(query: String)
+
+    suspend fun getHome(): Result<HomeModel>
+
+    suspend fun getSeedsStats(userBookId: String): Result<SeedModel>
 }

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

@@ -1,7 +1,8 @@
 package com.ninecraft.booket.core.data.api.repository
 
-import com.ninecraft.booket.core.model.RecordDetailModel
 import com.ninecraft.booket.core.model.RecordRegisterModel
+import com.ninecraft.booket.core.model.ReadingRecordsModel
+import com.ninecraft.booket.core.model.RecordDetailModel
 
 interface RecordRepository {
     suspend fun postRecord(
@@ -12,6 +13,13 @@ interface RecordRepository {
         review: String,
     ): Result<RecordRegisterModel>
 
+    suspend fun getReadingRecords(
+        userBookId: String,
+        sort: String,
+        page: Int,
+        size: Int,
+    ): Result<ReadingRecordsModel>
+
     suspend fun getRecordDetail(
         readingRecordId: String,
     ): Result<RecordDetailModel>

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

@@ -2,12 +2,10 @@ package com.ninecraft.booket.core.data.impl.di
 
 import com.ninecraft.booket.core.data.api.repository.AuthRepository
 import com.ninecraft.booket.core.data.api.repository.BookRepository
-import com.ninecraft.booket.core.data.api.repository.HomeRepository
 import com.ninecraft.booket.core.data.api.repository.RecordRepository
 import com.ninecraft.booket.core.data.api.repository.UserRepository
 import com.ninecraft.booket.core.data.impl.repository.DefaultAuthRepository
 import com.ninecraft.booket.core.data.impl.repository.DefaultBookRepository
-import com.ninecraft.booket.core.data.impl.repository.DefaultHomeRepository
 import com.ninecraft.booket.core.data.impl.repository.DefaultRecordRepository
 import com.ninecraft.booket.core.data.impl.repository.DefaultUserRepository
 import dagger.Binds
@@ -35,8 +33,4 @@ internal abstract class RepositoryModule {
     @Binds
     @Singleton
     abstract fun bindRecordRepository(defaultRecordRepository: DefaultRecordRepository): RecordRepository
-
-    @Binds
-    @Singleton
-    abstract fun bindHomeRepository(defaultHomeRepository: DefaultHomeRepository): HomeRepository
 }

core/data/impl/src/main/kotlin/com/ninecraft/booket/core/data/impl/di/RepositoryModule.kt

@@ -6,27 +6,36 @@ 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.Emotion
+import com.ninecraft.booket.core.model.EmotionModel
 import com.ninecraft.booket.core.model.HomeModel
 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.ReadingRecordModel
+import com.ninecraft.booket.core.model.ReadingRecordsModel
 import com.ninecraft.booket.core.model.RecentBookModel
 import com.ninecraft.booket.core.model.RecordDetailModel
 import com.ninecraft.booket.core.model.RecordRegisterModel
+import com.ninecraft.booket.core.model.SeedModel
 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.Category
 import com.ninecraft.booket.core.network.response.HomeResponse
 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.ReadingRecord
+import com.ninecraft.booket.core.network.response.ReadingRecordsResponse
 import com.ninecraft.booket.core.network.response.RecentBook
 import com.ninecraft.booket.core.network.response.RecordDetailResponse
 import com.ninecraft.booket.core.network.response.RecordRegisterResponse
+import com.ninecraft.booket.core.network.response.SeedResponse
 import com.ninecraft.booket.core.network.response.UserProfileResponse
 
 internal fun UserProfileResponse.toModel(): UserProfileModel {
@@ -74,33 +83,29 @@ internal fun BookDetailResponse.toModel(): BookDetailModel {
         author = author,
         pubDate = pubDate,
         description = description,
-        isbn = isbn,
         isbn13 = isbn13,
-        itemId = itemId,
-        priceSales = priceSales,
-        priceStandard = priceStandard,
         mallType = mallType,
-        stockStatus = stockStatus,
-        mileage = mileage,
-        cover = cover,
-        categoryId = categoryId,
+        coverImageUrl = coverImageUrl,
         categoryName = categoryName,
         publisher = publisher,
+        totalPage = totalPage,
+        userBookStatus = userBookStatus,
     )
 }
 
 internal fun BookUpsertResponse.toModel(): BookUpsertModel {
     return BookUpsertModel(
         userBookId = userBookId,
         userId = userId,
-        bookIsbn = bookIsbn,
+        isbn13 = isbn13,
         bookTitle = bookTitle,
         bookAuthor = bookAuthor,
         status = status,
         coverImageUrl = coverImageUrl,
         publisher = publisher,
         createdAt = createdAt,
         updatedAt = updatedAt,
+        recordCount = recordCount,
     )
 }
 
@@ -125,15 +130,15 @@ internal fun LibraryBookSummary.toModel(): LibraryBookSummaryModel {
     return LibraryBookSummaryModel(
         userBookId = userBookId,
         userId = userId,
-        bookIsbn = bookIsbn,
+        isbn13 = isbn13,
         bookTitle = bookTitle,
         bookAuthor = bookAuthor,
         status = status,
-        recordCount = recordCount,
         coverImageUrl = coverImageUrl,
         publisher = publisher,
         createdAt = createdAt,
         updatedAt = updatedAt,
+        recordCount = recordCount,
     )
 }
 
@@ -159,6 +164,29 @@ internal fun RecordRegisterResponse.toModel(): RecordRegisterModel {
     )
 }
 
+internal fun ReadingRecordsResponse.toModel(): ReadingRecordsModel {
+    return ReadingRecordsModel(
+        content = content.map { it.toModel() },
+        page = page.toModel(),
+    )
+}
+
+internal fun ReadingRecord.toModel(): ReadingRecordModel {
+    return ReadingRecordModel(
+        id = id,
+        userBookId = userBookId,
+        pageNumber = pageNumber,
+        quote = quote,
+        review = review,
+        emotionTags = emotionTags,
+        createdAt = createdAt,
+        updatedAt = updatedAt,
+        bookTitle = bookTitle,
+        bookPublisher = bookPublisher,
+        bookCoverImageUrl = bookCoverImageUrl,
+    )
+}
+
 internal fun RecordDetailResponse.toModel(): RecordDetailModel {
     return RecordDetailModel(
         id = id,
@@ -185,6 +213,7 @@ internal fun HomeResponse.toModel(): HomeModel {
 internal fun RecentBook.toModel(): RecentBookModel {
     return RecentBookModel(
         userBookId = userBookId,
+        isbn13 = isbn13,
         title = title,
         author = author,
         publisher = publisher,
@@ -193,3 +222,17 @@ internal fun RecentBook.toModel(): RecentBookModel {
         recordCount = recordCount,
     )
 }
+
+internal fun SeedResponse.toModel(): SeedModel {
+    return SeedModel(
+        categories = categories.mapNotNull { it.toEmotionModel() },
+    )
+}
+
+internal fun Category.toEmotionModel(): EmotionModel? {
+    val emotion = Emotion.fromDisplayName(name) ?: return null
+    return EmotionModel(
+        name = emotion,
+        count = count,
+    )
+}

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

@@ -34,12 +34,12 @@ internal class DefaultBookRepository @Inject constructor(
         bookRecentSearchDataSource.removeRecentSearch(query)
     }
 
-    override suspend fun getBookDetail(itemId: String) = runSuspendCatching {
-        service.getBookDetail(itemId).toModel()
+    override suspend fun getBookDetail(isbn13: String) = runSuspendCatching {
+        service.getBookDetail(isbn13).toModel()
     }
 
-    override suspend fun upsertBook(bookIsbn: String, bookStatus: String) = runSuspendCatching {
-        service.upsertBook(BookUpsertRequest(bookIsbn, bookStatus)).toModel()
+    override suspend fun upsertBook(isbn13: String, bookStatus: String) = runSuspendCatching {
+        service.upsertBook(BookUpsertRequest(isbn13, bookStatus)).toModel()
     }
 
     override suspend fun filterLibraryBooks(status: String?, page: Int, size: Int) = runSuspendCatching {
@@ -56,4 +56,12 @@ internal class DefaultBookRepository @Inject constructor(
     override suspend fun removeLibraryRecentSearch(query: String) {
         libraryRecentSearchDataSource.removeRecentSearch(query)
     }
+
+    override suspend fun getHome() = runSuspendCatching {
+        service.getHome().toModel()
+    }
+
+    override suspend fun getSeedsStats(userBookId: String) = runSuspendCatching {
+        service.getSeedsStats(userBookId).toModel()
+    }
 }