Merge pull request #119 from YAPP-Github/refactor/#117-bookmark-naming

[refactor] #117 scrap -> bookmark 리네이밍

Author: ikseong00

core/data-api/src/main/java/com/neki/android/core/dataapi/repository/PoseRepository.kt

@@ -13,7 +13,7 @@ interface PoseRepository {
         sortOrder: SortOrder = SortOrder.DESC,
     ): Flow<PagingData<Pose>>
 
-    fun getScrappedPosesFlow(
+    fun getBookmarkedPosesFlow(
         sortOrder: SortOrder = SortOrder.DESC,
     ): Flow<PagingData<Pose>>
 
@@ -30,5 +30,5 @@ interface PoseRepository {
         poseSize: Int,
     ): Result<List<Pose>>
 
-    suspend fun updateScrap(poseId: Long, scrap: Boolean): Result<Unit>
+    suspend fun updateBookmark(poseId: Long, bookmark: Boolean): Result<Unit>
 }

…ore/data/paging/ScrapPosePagingSource.kt …/data/paging/BookmarkPosePagingSource.ktcore/data/src/main/java/com/neki/android/core/data/paging/ScrapPosePagingSource.kt renamed to core/data/src/main/java/com/neki/android/core/data/paging/BookmarkPosePagingSource.kt core/data/src/main/java/com/neki/android/core/data/paging/ScrapPosePagingSource.kt renamed to core/data/src/main/java/com/neki/android/core/data/paging/BookmarkPosePagingSource.kt

@@ -6,15 +6,15 @@ import com.neki.android.core.data.remote.api.PoseService
 import com.neki.android.core.model.Pose
 import com.neki.android.core.model.SortOrder
 
-class ScrapPosePagingSource(
+class BookmarkPosePagingSource(
     private val poseService: PoseService,
     private val sortOrder: SortOrder,
 ) : PagingSource<Int, Pose>() {
 
     override suspend fun load(params: LoadParams<Int>): LoadResult<Int, Pose> {
         return try {
             val page = params.key ?: 0
-            val poses = poseService.getScrappedPoses(
+            val poses = poseService.getBookmarkedPoses(
                 page = page,
                 size = params.loadSize,
                 sortOrder = sortOrder.name,

core/data/src/main/java/com/neki/android/core/data/remote/api/PoseService.kt

@@ -1,6 +1,6 @@
 package com.neki.android.core.data.remote.api
 
-import com.neki.android.core.data.remote.model.request.UpdateScrapRequest
+import com.neki.android.core.data.remote.model.request.UpdateBookmarkRequest
 import com.neki.android.core.data.remote.model.response.BasicNullableResponse
 import com.neki.android.core.data.remote.model.response.BasicResponse
 import com.neki.android.core.data.remote.model.response.PoseDetailResponse
@@ -44,8 +44,8 @@ class PoseService @Inject constructor(
         }.body()
     }
 
-    // 스크랩된 포즈 목록 조회
-    suspend fun getScrappedPoses(
+    // 북마크된 포즈 목록 조회
+    suspend fun getBookmarkedPoses(
         page: Int = 0,
         size: Int = 20,
         sortOrder: String = "DESC",
@@ -57,10 +57,10 @@ class PoseService @Inject constructor(
         }.body()
     }
 
-    // 스크랩 업데이트
-    suspend fun updateScrap(poseId: Long, scrap: Boolean): BasicNullableResponse<Unit> {
+    // 북마크 업데이트
+    suspend fun updateBookmark(poseId: Long, bookmark: Boolean): BasicNullableResponse<Unit> {
         return client.patch("/api/poses/$poseId/scrap") {
-            setBody(UpdateScrapRequest(scrap))
+            setBody(UpdateBookmarkRequest(bookmark))
         }.body()
     }
 }

core/data/src/main/java/com/neki/android/core/data/remote/model/request/UpdateScrapRequest.kt

@@ -4,6 +4,6 @@ import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable
 
 @Serializable
-data class UpdateScrapRequest(
-    @SerialName("scrap") val scrap: Boolean,
+data class UpdateBookmarkRequest(
+    @SerialName("scrap") val bookmark: Boolean,
 )

core/data/src/main/java/com/neki/android/core/data/remote/model/response/PoseDetailResponse.kt

@@ -10,13 +10,13 @@ data class PoseDetailResponse(
     @SerialName("poseId") val poseId: Long,
     @SerialName("headCount") val headCount: String,
     @SerialName("imageUrl") val imageUrl: String,
-    @SerialName("scrap") val scrap: Boolean,
+    @SerialName("scrap") val bookmark: Boolean,
     @SerialName("contentType") val contentType: String,
     @SerialName("createdAt") val createdAt: String,
 ) {
     internal fun toModel() = Pose(
         id = poseId,
-        isScrapped = scrap,
+        isBookmarked = bookmark,
         poseImageUrl = imageUrl,
         peopleCount = PeopleCount.entries.find { it.name == headCount }?.value ?: 1,
     )

core/data/src/main/java/com/neki/android/core/data/remote/model/response/PoseResponse.kt

@@ -15,15 +15,15 @@ data class PoseResponse(
         @SerialName("poseId") val poseId: Long,
         @SerialName("headCount") val headCount: String,
         @SerialName("imageUrl") val imageUrl: String,
-        @SerialName("scrap") val scrap: Boolean,
+        @SerialName("scrap") val bookmark: Boolean,
         @SerialName("contentType") val contentType: String,
         @SerialName("createdAt") val createdAt: String,
     ) {
         internal fun toModel() = Pose(
             id = poseId,
             poseImageUrl = imageUrl,
             peopleCount = PeopleCount.entries.find { it.name == headCount }?.value ?: 1,
-            isScrapped = scrap,
+            isBookmarked = bookmark,
         )
     }
 

core/data/src/main/java/com/neki/android/core/data/repository/impl/PoseRepositoryImpl.kt

@@ -6,7 +6,7 @@ import androidx.paging.PagingData
 import com.neki.android.core.common.exception.ApiErrorCode.NO_MORE_RANDOM_POSE
 import com.neki.android.core.common.exception.NoMorePoseException
 import com.neki.android.core.data.paging.PosePagingSource
-import com.neki.android.core.data.paging.ScrapPosePagingSource
+import com.neki.android.core.data.paging.BookmarkPosePagingSource
 import com.neki.android.core.data.remote.api.PoseService
 import com.neki.android.core.data.util.runSuspendCatching
 import com.neki.android.core.dataapi.repository.PoseRepository
@@ -45,7 +45,7 @@ class PoseRepositoryImpl @Inject constructor(
         ).flow
     }
 
-    override fun getScrappedPosesFlow(
+    override fun getBookmarkedPosesFlow(
         sortOrder: SortOrder,
     ): Flow<PagingData<Pose>> {
         return Pager(
@@ -56,7 +56,7 @@ class PoseRepositoryImpl @Inject constructor(
                 enablePlaceholders = false,
             ),
             pagingSourceFactory = {
-                ScrapPosePagingSource(
+                BookmarkPosePagingSource(
                     poseService = poseService,
                     sortOrder = sortOrder,
                 )
@@ -115,7 +115,7 @@ class PoseRepositoryImpl @Inject constructor(
         return@runSuspendCatching result
     }
 
-    override suspend fun updateScrap(poseId: Long, scrap: Boolean): Result<Unit> = runSuspendCatching {
-        poseService.updateScrap(poseId, scrap)
+    override suspend fun updateBookmark(poseId: Long, bookmark: Boolean): Result<Unit> = runSuspendCatching {
+        poseService.updateBookmark(poseId, bookmark)
     }
 }

core/designsystem/src/main/java/com/neki/android/core/designsystem/actionbar/NekiActionBar.kt

@@ -123,7 +123,7 @@ private fun NekiEndActionBarPreview() {
                 onClick = {},
             ) {
                 Icon(
-                    imageVector = ImageVector.vectorResource(R.drawable.icon_scrap_stroked),
+                    imageVector = ImageVector.vectorResource(R.drawable.icon_bookmark_stroked),
                     contentDescription = null,
                     tint = NekiTheme.colorScheme.gray500,
                 )
@@ -156,7 +156,7 @@ private fun NekiBothSidesActionBarPreview() {
                     onClick = {},
                 ) {
                     Icon(
-                        imageVector = ImageVector.vectorResource(R.drawable.icon_scrap_stroked),
+                        imageVector = ImageVector.vectorResource(R.drawable.icon_bookmark_stroked),
                         contentDescription = null,
                         tint = NekiTheme.colorScheme.gray500,
                     )