feat: 독서 기록,수정,공유 관련 UI 변경사항 반영 및 API 버저닝 적용

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

@@ -0,0 +1,7 @@
+package com.ninecraft.booket.core.data.api.repository
+
+import com.ninecraft.booket.core.model.EmotionGroupsModel
+
+interface EmotionRepository {
+    suspend fun getEmotions(): Result<EmotionGroupsModel>
+}

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

@@ -1,37 +1,37 @@
 package com.ninecraft.booket.core.data.api.repository
 
-import com.ninecraft.booket.core.model.ReadingRecordModel
-import com.ninecraft.booket.core.model.RecordRegisterModel
+import com.ninecraft.booket.core.model.ReadingRecordModelV2
 import com.ninecraft.booket.core.model.ReadingRecordsModel
-import com.ninecraft.booket.core.model.RecordDetailModel
 
 interface RecordRepository {
     suspend fun postRecord(
         userBookId: String,
-        pageNumber: Int,
+        pageNumber: Int?,
         quote: String,
-        emotionTags: List<String>,
         review: String,
-    ): Result<RecordRegisterModel>
+        primaryEmotion: String,
+        detailEmotionTagIds: List<String>,
+    ): Result<ReadingRecordModelV2>
 
     suspend fun getReadingRecords(
         userBookId: String,
         sort: String,
         page: Int,
         size: Int,
-    ): Result<ReadingRecordsModel>
+    ): Result<ReadingRecordsModel> // TODO: V2로 변경 필요
 
     suspend fun getRecordDetail(
         readingRecordId: String,
-    ): Result<RecordDetailModel>
+    ): Result<ReadingRecordModelV2>
 
     suspend fun editRecord(
         readingRecordId: String,
-        pageNumber: Int,
+        pageNumber: Int?,
         quote: String,
-        emotionTags: List<String>,
         review: String,
-    ): Result<ReadingRecordModel>
+        primaryEmotion: String,
+        detailEmotionTagIds: List<String>,
+    ): Result<ReadingRecordModelV2>
 
     suspend fun deleteRecord(
         readingRecordId: String,

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

@@ -2,11 +2,13 @@ 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.EmotionRepository
 import com.ninecraft.booket.core.data.api.repository.RecordRepository
 import com.ninecraft.booket.core.data.api.repository.RemoteConfigRepository
 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.DefaultEmotionRepository
 import com.ninecraft.booket.core.data.impl.repository.DefaultRecordRepository
 import com.ninecraft.booket.core.data.impl.repository.DefaultRemoteConfigRepository
 import com.ninecraft.booket.core.data.impl.repository.DefaultUserRepository
@@ -23,6 +25,9 @@ interface DataGraph {
     @Binds
     val DefaultBookRepository.bind: BookRepository
 
+    @Binds
+    val DefaultEmotionRepository.bind: EmotionRepository
+
     @Binds
     val DefaultRecordRepository.bind: RecordRepository
 

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

@@ -1,22 +1,26 @@
 package com.ninecraft.booket.core.data.impl.mapper
 
 import com.ninecraft.booket.core.common.extensions.decodeHtmlEntities
-import com.ninecraft.booket.core.common.extensions.toFormattedDate
 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.DetailEmotionModel
 import com.ninecraft.booket.core.model.Emotion
+import com.ninecraft.booket.core.model.EmotionCode
+import com.ninecraft.booket.core.model.EmotionGroupModel
+import com.ninecraft.booket.core.model.EmotionGroupsModel
 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.PrimaryEmotionModel
 import com.ninecraft.booket.core.model.ReadingRecordModel
+import com.ninecraft.booket.core.model.ReadingRecordModelV2
 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.TermsAgreementModel
@@ -26,17 +30,21 @@ 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.DetailEmotion
+import com.ninecraft.booket.core.network.response.EmotionGroup
+import com.ninecraft.booket.core.network.response.EmotionGroupsResponse
 import com.ninecraft.booket.core.network.response.GuestBookSearchResponse
 import com.ninecraft.booket.core.network.response.GuestBookSummary
 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.PrimaryEmotion
 import com.ninecraft.booket.core.network.response.ReadingRecord
+import com.ninecraft.booket.core.network.response.ReadingRecordV2
 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.TermsAgreementResponse
@@ -187,6 +195,28 @@ internal fun PageInfo.toModel(): PageInfoModel {
     )
 }
 
+internal fun EmotionGroupsResponse.toModel(): EmotionGroupsModel {
+    return EmotionGroupsModel(
+        emotions = emotions.map { it.toModel() },
+    )
+}
+
+internal fun EmotionGroup.toModel(): EmotionGroupModel {
+    val code = EmotionCode.fromCode(code) ?: EmotionCode.OTHER
+    return EmotionGroupModel(
+        code = code,
+        displayName = displayName,
+        detailEmotions = detailEmotions.map { it.toModel() },
+    )
+}
+
+internal fun DetailEmotion.toModel(): DetailEmotionModel {
+    return DetailEmotionModel(
+        id = id,
+        name = name,
+    )
+}
+
 internal fun RecordRegisterResponse.toModel(): RecordRegisterModel {
     return RecordRegisterModel(
         id = id,
@@ -220,27 +250,36 @@ internal fun ReadingRecord.toModel(): ReadingRecordModel {
         emotionTags = emotionTags,
         createdAt = createdAt,
         updatedAt = updatedAt,
-        bookTitle = bookTitle,
-        bookPublisher = bookPublisher,
-        bookCoverImageUrl = bookCoverImageUrl,
-        author = author,
+        bookTitle = bookTitle ?: "",
+        bookPublisher = bookPublisher ?: "",
+        bookCoverImageUrl = bookCoverImageUrl ?: "",
+        author = author ?: "",
     )
 }
 
-internal fun RecordDetailResponse.toModel(): RecordDetailModel {
-    return RecordDetailModel(
+internal fun ReadingRecordV2.toModel(): ReadingRecordModelV2 {
+    return ReadingRecordModelV2(
         id = id,
         userBookId = userBookId,
         pageNumber = pageNumber,
         quote = quote,
         review = review ?: "",
-        emotionTags = emotionTags,
-        createdAt = createdAt.toFormattedDate(),
-        updatedAt = updatedAt.toFormattedDate(),
-        bookTitle = bookTitle,
-        bookPublisher = bookPublisher,
-        bookCoverImageUrl = bookCoverImageUrl,
-        author = author,
+        primaryEmotion = primaryEmotion.toModel(),
+        detailEmotions = detailEmotions.map { it.toModel() },
+        createdAt = createdAt,
+        updatedAt = updatedAt,
+        bookTitle = bookTitle ?: "",
+        bookPublisher = bookPublisher ?: "",
+        bookCoverImageUrl = bookCoverImageUrl ?: "",
+        author = author ?: "",
+    )
+}
+
+internal fun PrimaryEmotion.toModel(): PrimaryEmotionModel {
+    val code = EmotionCode.fromCode(code) ?: EmotionCode.OTHER
+    return PrimaryEmotionModel(
+        code = code,
+        displayName = displayName,
     )
 }
 

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

@@ -0,0 +1,20 @@
+package com.ninecraft.booket.core.data.impl.repository
+
+import com.ninecraft.booket.core.common.utils.runSuspendCatching
+import com.ninecraft.booket.core.data.api.repository.EmotionRepository
+import com.ninecraft.booket.core.data.impl.mapper.toModel
+import com.ninecraft.booket.core.di.DataScope
+import com.ninecraft.booket.core.model.EmotionGroupsModel
+import com.ninecraft.booket.core.network.service.ReedService
+import dev.zacsweers.metro.Inject
+import dev.zacsweers.metro.SingleIn
+
+@SingleIn(DataScope::class)
+@Inject
+class DefaultEmotionRepository(
+    private val service: ReedService,
+) : EmotionRepository {
+    override suspend fun getEmotions(): Result<EmotionGroupsModel> = runSuspendCatching {
+        service.getEmotions().toModel()
+    }
+}

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

@@ -3,11 +3,10 @@ package com.ninecraft.booket.core.data.impl.repository
 import com.ninecraft.booket.core.common.utils.runSuspendCatching
 import com.ninecraft.booket.core.data.api.repository.RecordRepository
 import com.ninecraft.booket.core.data.impl.mapper.toModel
-import com.ninecraft.booket.core.model.ReadingRecordModel
+import com.ninecraft.booket.core.di.DataScope
 import com.ninecraft.booket.core.network.request.RecordRegisterRequest
 import com.ninecraft.booket.core.network.service.ReedService
 import dev.zacsweers.metro.Inject
-import com.ninecraft.booket.core.di.DataScope
 import dev.zacsweers.metro.SingleIn
 
 @SingleIn(DataScope::class)
@@ -17,12 +16,13 @@ class DefaultRecordRepository(
 ) : RecordRepository {
     override suspend fun postRecord(
         userBookId: String,
-        pageNumber: Int,
+        pageNumber: Int?,
         quote: String,
-        emotionTags: List<String>,
         review: String,
+        primaryEmotion: String,
+        detailEmotionTagIds: List<String>,
     ) = runSuspendCatching {
-        service.postRecord(userBookId, RecordRegisterRequest(pageNumber, quote, emotionTags, review)).toModel()
+        service.postRecord(userBookId, RecordRegisterRequest(pageNumber, quote, review, primaryEmotion, detailEmotionTagIds)).toModel()
     }
 
     override suspend fun getReadingRecords(
@@ -40,12 +40,13 @@ class DefaultRecordRepository(
 
     override suspend fun editRecord(
         readingRecordId: String,
-        pageNumber: Int,
+        pageNumber: Int?,
         quote: String,
-        emotionTags: List<String>,
         review: String,
-    ): Result<ReadingRecordModel> = runSuspendCatching {
-        service.editRecord(readingRecordId, RecordRegisterRequest(pageNumber, quote, emotionTags, review)).toModel()
+        primaryEmotion: String,
+        detailEmotionTagIds: List<String>,
+    ) = runSuspendCatching {
+        service.editRecord(readingRecordId, RecordRegisterRequest(pageNumber, quote, review, primaryEmotion, detailEmotionTagIds)).toModel()
     }
 
     override suspend fun deleteRecord(readingRecordId: String): Result<Unit> = runSuspendCatching {

core/designsystem/src/main/kotlin/com/ninecraft/booket/core/designsystem/Emotion.kt

@@ -17,6 +17,7 @@ import com.ninecraft.booket.core.designsystem.theme.WarmthBgColor
 import com.ninecraft.booket.core.designsystem.theme.WarmthTextColor
 import com.ninecraft.booket.core.designsystem.theme.Yellow300
 import com.ninecraft.booket.core.model.Emotion
+import com.ninecraft.booket.core.model.EmotionCode
 
 val Emotion.bgColor: Color
     get() = when (this) {
@@ -36,15 +37,6 @@ val Emotion.textColor: Color
         Emotion.ETC -> EtcTextColor
     }
 
-val Emotion.graphicRes: Int
-    get() = when (this) {
-        Emotion.WARM -> R.drawable.img_emotion_warmth
-        Emotion.JOY -> R.drawable.img_emotion_joy
-        Emotion.SAD -> R.drawable.img_emotion_sadness
-        Emotion.INSIGHT -> R.drawable.img_emotion_insight
-        Emotion.ETC -> R.drawable.img_emotion_warmth
-    }
-
 val Emotion.ratioBarColor: Color
     get() = when (this) {
         Emotion.WARM -> Yellow300
@@ -54,20 +46,29 @@ val Emotion.ratioBarColor: Color
         Emotion.ETC -> Neutral300
     }
 
-val Emotion.graphicResV2: Int?
+val EmotionCode.graphicRes: Int
+    get() = when (this) {
+        EmotionCode.WARMTH -> R.drawable.img_warmth
+        EmotionCode.JOY -> R.drawable.img_joy
+        EmotionCode.SADNESS -> R.drawable.img_sadness
+        EmotionCode.INSIGHT -> R.drawable.img_insight
+        EmotionCode.OTHER -> R.drawable.img_other
+    }
+
+val EmotionCode.categoryGraphicRes: Int?
     get() = when (this) {
-        Emotion.WARM -> R.drawable.img_category_warm
-        Emotion.JOY -> R.drawable.img_category_joy
-        Emotion.SAD -> R.drawable.img_category_sad
-        Emotion.INSIGHT -> R.drawable.img_category_insight
-        Emotion.ETC -> null
+        EmotionCode.WARMTH -> R.drawable.img_category_warmth
+        EmotionCode.JOY -> R.drawable.img_category_joy
+        EmotionCode.SADNESS -> R.drawable.img_category_sadness
+        EmotionCode.INSIGHT -> R.drawable.img_category_insight
+        EmotionCode.OTHER -> null
     }
 
-val Emotion.descriptionRes: Int
+val EmotionCode.descriptionRes: Int
     get() = when (this) {
-        Emotion.WARM -> R.string.emotion_warm_description
-        Emotion.JOY -> R.string.emotion_joy_description
-        Emotion.SAD -> R.string.emotion_sad_description
-        Emotion.INSIGHT -> R.string.emotion_insight_description
-        Emotion.ETC -> R.string.emotion_etc_description
+        EmotionCode.WARMTH -> R.string.emotion_warm_description
+        EmotionCode.JOY -> R.string.emotion_joy_description
+        EmotionCode.SADNESS -> R.string.emotion_sad_description
+        EmotionCode.INSIGHT -> R.string.emotion_insight_description
+        EmotionCode.OTHER -> R.string.emotion_other_description
     }

core/designsystem/src/main/kotlin/com/ninecraft/booket/core/designsystem/RecordStep.kt

@@ -3,7 +3,6 @@ package com.ninecraft.booket.core.designsystem
 enum class RecordStep {
     QUOTE,
     EMOTION,
-    IMPRESSION,
     ;
 
     val value: Int get() = ordinal

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

@@ -23,7 +23,7 @@ fun RecordProgressBar(
         modifier = modifier.fillMaxWidth(),
         horizontalArrangement = Arrangement.spacedBy(ReedTheme.spacing.spacing1),
     ) {
-        repeat(3) { index ->
+        repeat(2) { index ->
             val bgColor = if (index <= currentStep.ordinal) ReedTheme.colors.bgPrimary else ReedTheme.colors.bgDisabled
 
             Box(

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

@@ -8,5 +8,5 @@
     <string name="emotion_joy_description">흥미롭고 유쾌한 순간</string>
     <string name="emotion_sad_description">눈물이 고인 순간</string>
     <string name="emotion_insight_description">생각이 깊어지는 순간</string>
-    <string name="emotion_etc_description">네 가지 감정으로 표현하기 어려울 때</string>
+    <string name="emotion_other_description">네 가지 감정으로 표현하기 어려울 때</string>
 </resources>