Merge pull request #325 from Runnect/feature/fix-discover-course-scrap

[FIX] 코스 발견 / 스크랩 함수의 로직 수정
Runnect · Feb 15, 2024 · 2dbb194 · 2dbb194
2 parents 2df094d + 1a60a18
commit 2dbb194
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 28 deletions.
diff --git a/...rc/main/java/com/runnect/runnect/presentation/discover/adapter/DiscoverMarathonAdapter.kt b/...rc/main/java/com/runnect/runnect/presentation/discover/adapter/DiscoverMarathonAdapter.kt
@@ -92,11 +92,16 @@ class DiscoverMarathonAdapter(
     }
 
     fun updateMarathonCourseScrap(
-        targetIndex: Int,
+        publicCourseId: Int,
         scrap: Boolean
     ) {
-        currentList[targetIndex].scrap = scrap
-        notifyItemChanged(targetIndex)
+        currentList.forEachIndexed { index, course ->
+            if (course.id == publicCourseId) {
+                course.scrap = scrap
+                notifyItemChanged(index)
+                return
+            }
+        }
     }
 
     companion object {

diff --git a/...c/main/java/com/runnect/runnect/presentation/discover/adapter/DiscoverRecommendAdapter.kt b/...c/main/java/com/runnect/runnect/presentation/discover/adapter/DiscoverRecommendAdapter.kt
@@ -92,11 +92,16 @@ class DiscoverRecommendAdapter(
     }
 
     fun updateRecommendCourseScrap(
-        targetIndex: Int,
+        publicCourseId: Int,
         scrap: Boolean
     ) {
-        currentList[targetIndex].scrap = scrap
-        notifyItemChanged(targetIndex)
+        currentList.forEachIndexed { index, course ->
+            if (course.id == publicCourseId) {
+                course.scrap = scrap
+                notifyItemChanged(index)
+                return
+            }
+        }
     }
 
     fun addRecommendCourseNextPage(nextPageItems: List<DiscoverMultiViewItem.RecommendCourse>) {
@@ -105,7 +110,7 @@ class DiscoverRecommendAdapter(
         val newList = currentList.toMutableList()
         newList.addAll(nextPageItems)
 
-        submitList(newList) { // 비동기 작업이 끝나고 나서 호출되는 콜백 함수
+        submitList(newList) {
             Timber.d("after item count : $itemCount")
         }
     }

diff --git a/...a/com/runnect/runnect/presentation/discover/adapter/multiview/DiscoverMultiViewAdapter.kt b/...a/com/runnect/runnect/presentation/discover/adapter/multiview/DiscoverMultiViewAdapter.kt
@@ -113,27 +113,9 @@ class DiscoverMultiViewAdapter(
         publicCourseId: Int,
         scrap: Boolean
     ) {
-        val multiViewItems = marathonCourses + recommendCourses
-        val targetItem = multiViewItems.find { item ->
-            item.id == publicCourseId
-        } ?: return
-
-        when (targetItem) {
-            is MarathonCourse -> {
-                val targetIndex = marathonCourses.indexOf(targetItem)
-                multiViewHolderFactory.marathonCourseAdapter.updateMarathonCourseScrap(
-                    targetIndex = targetIndex,
-                    scrap = scrap
-                )
-            }
-
-            is RecommendCourse -> {
-                val targetIndex = recommendCourses.indexOf(targetItem)
-                multiViewHolderFactory.recommendCourseAdapter.updateRecommendCourseScrap(
-                    targetIndex = targetIndex,
-                    scrap = scrap
-                )
-            }
+        multiViewHolderFactory.apply {
+            marathonCourseAdapter.updateMarathonCourseScrap(publicCourseId, scrap)
+            recommendCourseAdapter.updateRecommendCourseScrap(publicCourseId, scrap)
         }
     }
 }