[FIX] 서버 통신에 성공한 경우에만 스크랩 갱신시키도록 변경

app/src/main/java/com/runnect/runnect/data/dto/response/ResponseGetMyScrapCourse.kt

@@ -1,55 +1,55 @@
 package com.runnect.runnect.data.dto.response
 
-
+import com.runnect.runnect.domain.entity.MyScrapCourse
 import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable
 
 @Serializable
 data class ResponseGetMyScrapCourse(
-    @SerialName("data")
-    val data: Data,
-    @SerialName("message")
-    val message: String,
-    @SerialName("status")
-    val status: Int,
-    @SerialName("success")
-    val success: Boolean,
+    @SerialName("user")
+    val user: User,
+    @SerialName("scraps")
+    val scraps: List<Scrap>,
 ) {
     @Serializable
-    data class Data(
-        @SerialName("Scraps")
-        val scraps: List<Scrap>,
-        @SerialName("user")
-        val user: User,
+    data class User(
+        @SerialName("userId")
+        val id: Int,
+    )
+
+    @Serializable
+    data class Scrap(
+        @SerialName("courseId")
+        val courseId: Int,
+        @SerialName("departure")
+        val departure: Departure,
+        @SerialName("id")
+        val id: Int,
+        @SerialName("image")
+        val image: String,
+        @SerialName("publicCourseId")
+        val publicCourseId: Int,
+        @SerialName("title")
+        val title: String,
     ) {
         @Serializable
-        data class Scrap(
-            @SerialName("courseId")
-            val courseId: Int,
-            @SerialName("departure")
-            val departure: Departure,
-            @SerialName("id")
-            val id: Int,
-            @SerialName("image")
-            val image: String,
-            @SerialName("publicCourseId")
-            val publicCourseId: Int,
-            @SerialName("title")
-            val title: String,
-        ) {
-            @Serializable
-            data class Departure(
-                @SerialName("city")
-                val city: String,
-                @SerialName("region")
-                val region: String,
-            )
-        }
+        data class Departure(
+            @SerialName("city")
+            val city: String,
+            @SerialName("region")
+            val region: String,
+        )
+    }
 
-        @Serializable
-        data class User(
-            @SerialName("id")
-            val id: Int,
+    fun toMyScrapCourses(): List<MyScrapCourse> = scraps.map { course ->
+        MyScrapCourse(
+            courseId = course.courseId,
+            id = course.id,
+            publicCourseId = course.publicCourseId,
+            image = course.image,
+            city = course.departure.city,
+            region = course.departure.region,
+            title = course.title
         )
     }
 }

app/src/main/java/com/runnect/runnect/data/repository/StorageRepositoryImpl.kt

@@ -1,8 +1,7 @@
 package com.runnect.runnect.data.repository
 
-import com.runnect.runnect.data.dto.MyScrapCourse
 import com.runnect.runnect.data.dto.request.RequestPutMyDrawCourse
-import com.runnect.runnect.data.dto.response.ResponseGetMyScrapCourse
+import com.runnect.runnect.domain.entity.MyScrapCourse
 import com.runnect.runnect.data.dto.response.ResponsePutMyDrawCourse
 import com.runnect.runnect.data.dto.response.toMyDrawCourse
 import com.runnect.runnect.data.source.remote.RemoteStorageDataSource
@@ -21,24 +20,8 @@ class StorageRepositoryImpl @Inject constructor(private val remoteStorageDataSou
         return remoteStorageDataSource.deleteMyDrawCourse(deleteCourseList = deleteCourseList)
     }
 
-    override suspend fun getMyScrapCourse(): MutableList<MyScrapCourse> {
-        return changeMyScrapData(
-            data = remoteStorageDataSource.getMyScrapCourse().body()!!.data.scraps
-        ).toMutableList()
-    }
-
-    private fun changeMyScrapData(data: List<ResponseGetMyScrapCourse.Data.Scrap>): List<MyScrapCourse> {
-        val changedData = data.map {
-            MyScrapCourse(
-                courseId = it.courseId,
-                id = it.id,
-                publicCourseId = it.publicCourseId,
-                image = it.image,
-                city = it.departure.city,
-                region = it.departure.region,
-                title = it.title
-            )
+    override suspend fun getMyScrapCourse(): Result<List<MyScrapCourse>?> =
+        runCatching {
+            remoteStorageDataSource.getMyScrapCourse().data?.toMyScrapCourses()
         }
-        return changedData
-    }
 }

app/src/main/java/com/runnect/runnect/data/service/CourseService.kt

@@ -5,7 +5,20 @@ import com.runnect.runnect.data.dto.request.RequestPostCourseScrap
 import com.runnect.runnect.data.dto.request.RequestPostPublicCourse
 import com.runnect.runnect.data.dto.request.RequestPostRunningHistory
 import com.runnect.runnect.data.dto.request.RequestPutMyDrawCourse
-import com.runnect.runnect.data.dto.response.*
+import com.runnect.runnect.data.dto.response.ResponseGetCourseDetail
+import com.runnect.runnect.data.dto.response.ResponseGetDiscoverMarathon
+import com.runnect.runnect.data.dto.response.ResponseGetDiscoverPick
+import com.runnect.runnect.data.dto.response.ResponseGetDiscoverRecommend
+import com.runnect.runnect.data.dto.response.ResponseGetDiscoverSearch
+import com.runnect.runnect.data.dto.response.ResponseGetMyDrawCourse
+import com.runnect.runnect.data.dto.response.ResponseGetMyDrawDetail
+import com.runnect.runnect.data.dto.response.ResponseGetMyScrapCourse
+import com.runnect.runnect.data.dto.response.ResponsePatchPublicCourse
+import com.runnect.runnect.data.dto.response.ResponsePostDiscoverUpload
+import com.runnect.runnect.data.dto.response.ResponsePostMyDrawCourse
+import com.runnect.runnect.data.dto.response.ResponsePostMyHistory
+import com.runnect.runnect.data.dto.response.ResponsePostScrap
+import com.runnect.runnect.data.dto.response.ResponsePutMyDrawCourse
 import com.runnect.runnect.data.dto.response.base.BaseResponse
 import okhttp3.MultipartBody
 import okhttp3.RequestBody
@@ -38,8 +51,7 @@ interface CourseService {
     ): BaseResponse<ResponseGetCourseDetail>
 
     @GET("/api/course/private/user")
-    suspend fun getMyCourseLoad(
-    ): ResponseGetDiscoverPick
+    suspend fun getMyCourseLoad(): ResponseGetDiscoverPick
 
     @POST("/api/public-course")
     suspend fun postUploadMyCourse(
@@ -61,13 +73,11 @@ interface CourseService {
 
     //보관함 내가 그린 코스 가져오기
     @GET("/api/course/user")
-    suspend fun getCourseList(
-    ): BaseResponse<ResponseGetMyDrawCourse>
+    suspend fun getDrawCourseList(): BaseResponse<ResponseGetMyDrawCourse>
 
     //보관함 스크랩 코스 가져오기
     @GET("/api/scrap/user")
-    suspend fun getScrapList(
-    ): Response<ResponseGetMyScrapCourse>
+    suspend fun getScrapCourseList(): BaseResponse<ResponseGetMyScrapCourse>
 
     //내가 그린 코스 Detail 가져오기
     @GET("/api/course/detail/{courseId}")

app/src/main/java/com/runnect/runnect/data/source/remote/RemoteStorageDataSource.kt

@@ -11,11 +11,11 @@ import javax.inject.Inject
 
 class RemoteStorageDataSource @Inject constructor(private val courseService: CourseService) {
     suspend fun getMyDrawCourse(): BaseResponse<ResponseGetMyDrawCourse> =
-        courseService.getCourseList()
+        courseService.getDrawCourseList()
 
     suspend fun deleteMyDrawCourse(deleteCourseList: RequestPutMyDrawCourse): Response<ResponsePutMyDrawCourse> =
         courseService.deleteMyDrawCourse(deleteCourseList)
 
-    suspend fun getMyScrapCourse(): Response<ResponseGetMyScrapCourse> =
-        courseService.getScrapList()
+    suspend fun getMyScrapCourse(): BaseResponse<ResponseGetMyScrapCourse> =
+        courseService.getScrapCourseList()
 }

app/src/main/java/com/runnect/runnect/data/dto/MyScrapCourse.kt → app/src/main/java/com/runnect/runnect/domain/entity/MyScrapCourse.kt

@@ -1,13 +1,13 @@
-package com.runnect.runnect.data.dto
+package com.runnect.runnect.domain.entity
 
 
 import android.os.Parcelable
 import kotlinx.android.parcel.Parcelize
 
 @Parcelize
 data class MyScrapCourse(
-    val courseId: Int?,
-    val id: Int?,
+    val courseId: Int,
+    val id: Int,
     val publicCourseId: Int,
     val image: String?,
     val city: String,

app/src/main/java/com/runnect/runnect/domain/repository/StorageRepository.kt

@@ -1,6 +1,6 @@
 package com.runnect.runnect.domain.repository
 
-import com.runnect.runnect.data.dto.MyScrapCourse
+import com.runnect.runnect.domain.entity.MyScrapCourse
 import com.runnect.runnect.data.dto.request.RequestPutMyDrawCourse
 import com.runnect.runnect.data.dto.response.ResponsePutMyDrawCourse
 import com.runnect.runnect.domain.entity.MyDrawCourse
@@ -9,5 +9,5 @@ import retrofit2.Response
 interface StorageRepository {
     suspend fun getMyDrawCourse(): Result<List<MyDrawCourse>?>
     suspend fun deleteMyDrawCourse(deleteCourseList: RequestPutMyDrawCourse) : Response<ResponsePutMyDrawCourse>
-    suspend fun getMyScrapCourse(): MutableList<MyScrapCourse>?
+    suspend fun getMyScrapCourse(): Result<List<MyScrapCourse>?>
 }

app/src/main/java/com/runnect/runnect/presentation/MainActivity.kt

@@ -153,7 +153,7 @@ class MainActivity : BindingActivity<ActivityMainBinding>(R.layout.activity_main
         }
 
         fun updateStorageScrapScreen() {
-            storageScrapFragment?.getCourse()
+            storageScrapFragment?.getMyScrapCourses()
         }
     }
 }

app/src/main/java/com/runnect/runnect/presentation/detail/CourseDetailActivity.kt

@@ -359,8 +359,7 @@ class CourseDetailActivity :
                 return@setOnClickListener
             }
 
-            it.isSelected = !it.isSelected
-            viewModel.postCourseScrap(publicCourseId, it.isSelected)
+            viewModel.postCourseScrap(publicCourseId, !it.isSelected)
         }
     }
 
@@ -581,8 +580,18 @@ class CourseDetailActivity :
 
     private fun setupCourseScrapStateObserver() {
         viewModel.courseScrapState.observe(this) { state ->
-            if (state is UiStateV2.Failure) {
-                showSnackbar(binding.root, state.msg)
+            when (state) {
+                is UiStateV2.Success -> {
+                    val response = state.data ?: return@observe
+                    binding.tvCourseDetailScrapCount.text = response.scrapCount.toString()
+                    binding.ivCourseDetailScrap.isSelected = response.scrapTF
+                }
+
+                is UiStateV2.Failure -> {
+                    showSnackbar(binding.root, state.msg)
+                }
+
+                else -> {}
             }
         }
     }

app/src/main/java/com/runnect/runnect/presentation/detail/CourseDetailViewModel.kt

@@ -26,19 +26,19 @@ class CourseDetailViewModel @Inject constructor(
     private val courseRepository: CourseRepository, private val userRepository: UserRepository
 ) : ViewModel() {
     // 서버통신 코드
-    private var _courseGetState = MutableLiveData<UiStateV2<CourseDetail?>>()
+    private val _courseGetState = MutableLiveData<UiStateV2<CourseDetail?>>()
     val courseGetState: LiveData<UiStateV2<CourseDetail?>>
         get() = _courseGetState
 
-    private var _coursePatchState = MutableLiveData<UiStateV2<EditableCourseDetail?>>()
+    private val _coursePatchState = MutableLiveData<UiStateV2<EditableCourseDetail?>>()
     val coursePatchState: LiveData<UiStateV2<EditableCourseDetail?>>
         get() = _coursePatchState
 
-    private var _courseDeleteState = MutableLiveData<UiStateV2<ResponseDeleteUploadCourse?>>()
+    private val _courseDeleteState = MutableLiveData<UiStateV2<ResponseDeleteUploadCourse?>>()
     val courseDeleteState: LiveData<UiStateV2<ResponseDeleteUploadCourse?>>
         get() = _courseDeleteState
 
-    private var _courseScrapState = MutableLiveData<UiStateV2<ResponsePostScrap?>>()
+    private val _courseScrapState = MutableLiveData<UiStateV2<ResponsePostScrap?>>()
     val courseScrapState: LiveData<UiStateV2<ResponsePostScrap?>>
         get() = _courseScrapState
 

app/src/main/java/com/runnect/runnect/presentation/discover/DiscoverFragment.kt

@@ -432,12 +432,24 @@ class DiscoverFragment : BindingFragment<FragmentDiscoverBinding>(R.layout.fragm
 
     private fun setupCourseScrapStateObserver() {
         viewModel.courseScrapState.observe(viewLifecycleOwner) { state ->
-            if (state is UiStateV2.Failure) {
-                context?.showSnackbar(
-                    anchorView = binding.root,
-                    message = state.msg,
-                    gravity = Gravity.TOP
-                )
+            when (state) {
+                is UiStateV2.Success -> {
+                    val response = state.data ?: return@observe
+                    multiViewAdapter.updateCourseScrap(
+                        publicCourseId = response.publicCourseId.toInt(),
+                        scrap = response.scrapTF
+                    )
+                }
+
+                is UiStateV2.Failure -> {
+                    context?.showSnackbar(
+                        anchorView = binding.root,
+                        message = state.msg,
+                        gravity = Gravity.TOP
+                    )
+                }
+
+                else -> {}
             }
         }
     }

app/src/main/java/com/runnect/runnect/presentation/discover/adapter/DiscoverMarathonAdapter.kt

@@ -91,6 +91,14 @@ class DiscoverMarathonAdapter(
         }
     }
 
+    fun updateMarathonCourseScrap(
+        targetIndex: Int,
+        scrap: Boolean
+    ) {
+        currentList[targetIndex].scrap = scrap
+        notifyItemChanged(targetIndex)
+    }
+
     companion object {
         private val diffUtil = ItemDiffCallback<DiscoverMultiViewItem.MarathonCourse>(
             onItemsTheSame = { old, new -> old.id == new.id },

app/src/main/java/com/runnect/runnect/presentation/discover/adapter/DiscoverRecommendAdapter.kt

@@ -63,8 +63,7 @@ class DiscoverRecommendAdapter(
                     return@setOnClickListener
                 }
 
-                view.isSelected = !view.isSelected
-                onHeartButtonClick.invoke(course.id, view.isSelected)
+                onHeartButtonClick.invoke(course.id, !view.isSelected)
             }
         }
 
@@ -92,6 +91,14 @@ class DiscoverRecommendAdapter(
         }
     }
 
+    fun updateRecommendCourseScrap(
+        targetIndex: Int,
+        scrap: Boolean
+    ) {
+        currentList[targetIndex].scrap = scrap
+        notifyItemChanged(targetIndex)
+    }
+
     fun addRecommendCourseNextPage(nextPageItems: List<DiscoverMultiViewItem.RecommendCourse>) {
         Timber.d("before item count : $itemCount")