[FEAT] 코스 발견 / 추천 코스 정렬 기능

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

@@ -33,11 +33,11 @@ class CourseRepositoryImpl @Inject constructor(private val remoteCourseDataSourc
 
     override suspend fun getRecommendCourse(
         pageNo: String,
-        ordering: String
+        sort: String
     ): Result<RecommendCoursePagingData?> = runCatching {
         val response = remoteCourseDataSource.getRecommendCourse(
             pageNo = pageNo,
-            ordering = ordering
+            sort = sort
         ).data
 
         response?.let {

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

@@ -19,7 +19,7 @@ interface CourseService {
     @GET("/api/public-course")
     suspend fun getRecommendCourse(
         @Query("pageNo") pageNo: String,
-        @Query("ordering") ordering: String
+        @Query("sort") sort: String
     ): BaseResponse<ResponseGetDiscoverRecommend>
 
     @POST("/api/scrap")

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

@@ -24,9 +24,9 @@ class RemoteCourseDataSource @Inject constructor(
 
     suspend fun getRecommendCourse(
         pageNo: String,
-        ordering: String
+        sort: String
     ): BaseResponse<ResponseGetDiscoverRecommend> =
-        courseService.getRecommendCourse(pageNo = pageNo, ordering = ordering)
+        courseService.getRecommendCourse(pageNo = pageNo, sort = sort)
 
     suspend fun postCourseScrap(requestPostCourseScrap: RequestPostCourseScrap): BaseResponse<ResponsePostScrap> =
         courseService.postCourseScrap(requestPostCourseScrap)

app/src/main/java/com/runnect/runnect/domain/entity/DiscoverMultiViewItem.kt

@@ -1,6 +1,10 @@
 package com.runnect.runnect.domain.entity
 
+import com.runnect.runnect.presentation.discover.adapter.multiview.DiscoverMultiViewType
+import com.runnect.runnect.presentation.discover.adapter.multiview.DiscoverMultiViewType.*
+
 sealed class DiscoverMultiViewItem(
+    private val viewType: DiscoverMultiViewType,
     open val id: Int
 ) {
     data class MarathonCourse(
@@ -10,7 +14,13 @@ sealed class DiscoverMultiViewItem(
         val image: String,
         var scrap: Boolean,
         val departure: String,
-    ) : DiscoverMultiViewItem(id)
+    ) : DiscoverMultiViewItem(MARATHON, id)
+
+    data class RecommendHeader(
+        override val id: Int,
+        val title: String,
+        val subtitle: String
+    ): DiscoverMultiViewItem(RECOMMEND_HEADER, id)
 
     data class RecommendCourse(
         override val id: Int,
@@ -19,5 +29,7 @@ sealed class DiscoverMultiViewItem(
         val image: String,
         var scrap: Boolean,
         val departure: String,
-    ) : DiscoverMultiViewItem(id)
+    ) : DiscoverMultiViewItem(RECOMMEND_COURSE, id)
+
+    fun getMultiViewType() = viewType
 }

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

@@ -26,7 +26,7 @@ interface CourseRepository {
 
     suspend fun getRecommendCourse(
         pageNo: String,
-        ordering: String
+        sort: String
     ): Result<RecommendCoursePagingData?>
 
     suspend fun getCourseSearch(keyword: String): Result<List<DiscoverSearchCourse>?>

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

@@ -149,7 +149,7 @@ class MainActivity : BindingActivity<ActivityMainBinding>(R.layout.activity_main
         var storageScrapFragment: StorageScrapFragment? = null
 
         fun updateCourseDiscoverScreen() {
-            discoverFragment?.getRecommendCourses(pageNo = 1)
+            discoverFragment?.getRecommendCourses()
         }
 
         fun updateStorageScrapScreen() {

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

@@ -17,13 +17,15 @@ import com.runnect.runnect.R
 import com.runnect.runnect.binding.BindingFragment
 import com.runnect.runnect.databinding.FragmentDiscoverBinding
 import com.runnect.runnect.domain.entity.DiscoverBanner
+import com.runnect.runnect.domain.entity.DiscoverMultiViewItem
 import com.runnect.runnect.presentation.discover.model.EditableDiscoverCourse
 import com.runnect.runnect.presentation.MainActivity
 import com.runnect.runnect.presentation.MainActivity.Companion.isVisitorMode
 import com.runnect.runnect.presentation.detail.CourseDetailActivity
 import com.runnect.runnect.presentation.detail.CourseDetailRootScreen
 import com.runnect.runnect.presentation.discover.adapter.BannerAdapter
 import com.runnect.runnect.presentation.discover.adapter.multiview.DiscoverMultiViewAdapter
+import com.runnect.runnect.presentation.discover.adapter.multiview.DiscoverMultiViewType
 import com.runnect.runnect.presentation.discover.pick.DiscoverPickActivity
 import com.runnect.runnect.presentation.discover.search.DiscoverSearchActivity
 import com.runnect.runnect.presentation.state.UiStateV2
@@ -60,6 +62,7 @@ class DiscoverFragment : BindingFragment<FragmentDiscoverBinding>(R.layout.fragm
                 val updatedCourse: EditableDiscoverCourse =
                     result.data?.getCompatibleParcelableExtra(EXTRA_EDITABLE_DISCOVER_COURSE)
                         ?: return@registerForActivityResult
+
                 multiViewAdapter.updateCourseItem(
                     publicCourseId = viewModel.clickedCourseId,
                     updatedCourse = updatedCourse
@@ -96,7 +99,6 @@ class DiscoverFragment : BindingFragment<FragmentDiscoverBinding>(R.layout.fragm
             ViewPager2.OnPageChangeCallback() {
             override fun onPageSelected(position: Int) {
                 super.onPageSelected(position)
-                Timber.d("viewpager position: $position")
                 updateBannerPosition(position)
                 updateBannerIndicatorPosition()
             }
@@ -155,18 +157,16 @@ class DiscoverFragment : BindingFragment<FragmentDiscoverBinding>(R.layout.fragm
     }
 
     private fun checkNextPageLoadingCondition(recyclerView: RecyclerView) {
-        if (!recyclerView.canScrollVertically(SCROLL_DIRECTION)) {
+        if (isCourseLoadingCompleted() && !recyclerView.canScrollVertically(SCROLL_DIRECTION)) {
             Timber.d("스크롤이 끝에 도달했어요!")
-
-            if (viewModel.isNextPageLoading()) {
-                Timber.d("다음 페이지 로딩 중입니다.")
-                return
-            }
-
+            if (viewModel.isNextPageLoading()) return
             viewModel.getRecommendCourseNextPage()
         }
     }
 
+    private fun isCourseLoadingCompleted() = ::multiViewAdapter.isInitialized &&
+            multiViewAdapter.itemCount >= DiscoverMultiViewType.values().size
+
     private fun showCircleUploadButton() {
         binding.fabDiscoverUploadText.isVisible = false
         binding.fabDiscoverUpload.isVisible = true
@@ -186,7 +186,6 @@ class DiscoverFragment : BindingFragment<FragmentDiscoverBinding>(R.layout.fragm
 
     private fun initRefreshLayoutListener() {
         binding.refreshLayout.setOnRefreshListener {
-            viewModel.resetMultiViewItems()
             viewModel.refreshCurrentCourses()
             binding.refreshLayout.isRefreshing = false
         }
@@ -230,7 +229,7 @@ class DiscoverFragment : BindingFragment<FragmentDiscoverBinding>(R.layout.fragm
     private fun addObserver() {
         setupBannerGetStateObserver()
         setupMarathonCourseGetStateObserver()
-        setupRecommendCourseGetStateObserver()
+        setupRecommendCourseSortStateObserver()
         setupRecommendCourseNextPageStateObserver()
         setupCourseScrapStateObserver()
     }
@@ -292,35 +291,19 @@ class DiscoverFragment : BindingFragment<FragmentDiscoverBinding>(R.layout.fragm
     }
 
     private fun setupMarathonCourseGetStateObserver() {
-        viewModel.marathonCourseState.observe(viewLifecycleOwner) { state ->
+        viewModel.marathonCourseGetState.observe(viewLifecycleOwner) { state ->
             when (state) {
                 is UiStateV2.Loading -> showLoadingProgressBar()
 
-                is UiStateV2.Failure -> {
+                is UiStateV2.Success -> {
                     dismissLoadingProgressBar()
-                    context?.showSnackbar(
-                        anchorView = binding.root,
-                        message = state.msg,
-                        gravity = Gravity.TOP
-                    )
-                }
-
-                else -> {}
-            }
-        }
-    }
 
-    private fun setupRecommendCourseGetStateObserver() {
-        viewModel.recommendCourseState.observe(viewLifecycleOwner) { state ->
-            when (state) {
-                is UiStateV2.Loading -> showLoadingProgressBar()
+                    // 외부 리사이클러뷰 어댑터 초기화
+                    initMultiViewAdapter(createMultiViewItems(state.data))
+                    initMultiRecyclerView()
 
-                is UiStateV2.Success -> {
-                    if (viewModel.checkCourseLoadState()) {
-                        dismissLoadingProgressBar()
-                        initMultiViewAdapter()
-                        initMultiRecyclerView()
-                    }
+                    // 어댑터에 추천 코스 목록 추가
+                    setupRecommendCourseGetStateObserver()
                 }
 
                 is UiStateV2.Failure -> {
@@ -337,6 +320,20 @@ class DiscoverFragment : BindingFragment<FragmentDiscoverBinding>(R.layout.fragm
         }
     }
 
+    private fun createMultiViewItems(courses: List<DiscoverMultiViewItem>) =
+        mutableListOf<List<DiscoverMultiViewItem>>().apply {
+            add(courses)
+            add(
+                listOf(
+                    DiscoverMultiViewItem.RecommendHeader(
+                        id = RECOMMEND_HEADER_INDEX,
+                        title = getString(R.string.discover_recommend_header_title),
+                        subtitle = getString(R.string.discover_recommend_header_subtitle)
+                    )
+                )
+            )
+        }
+
     private fun showLoadingProgressBar() {
         binding.rvDiscoverMultiView.isVisible = false
         binding.pbDiscoverLoading.isVisible = true
@@ -347,18 +344,25 @@ class DiscoverFragment : BindingFragment<FragmentDiscoverBinding>(R.layout.fragm
         binding.pbDiscoverLoading.isVisible = false
     }
 
-    private fun initMultiViewAdapter() {
+    private fun initMultiViewAdapter(multiViewItems: List<List<DiscoverMultiViewItem>>) {
         multiViewAdapter = DiscoverMultiViewAdapter(
-            multiViewItems = viewModel.multiViewItems,
+            multiViewItems = multiViewItems,
             onHeartButtonClick = { courseId, scrap ->
-                viewModel.postCourseScrap(courseId, scrap)
+                viewModel.postCourseScrap(
+                    id = courseId,
+                    scrapTF = scrap
+                )
             },
             onCourseItemClick = { courseId ->
-                navigateToDetailScreen(courseId)
-                viewModel.saveClickedCourseId(courseId)
+                navigateToDetailScreen(publicCourseId = courseId)
+                viewModel.saveClickedCourseId(id = courseId)
             },
             handleVisitorMode = {
                 context?.let { showCourseScrapWarningToast(it) }
+            },
+            onSortButtonClick = { criteria ->
+                Timber.d("정렬 기준: $criteria")
+                viewModel.sortRecommendCourses(criteria = criteria)
             }
         )
     }
@@ -387,12 +391,53 @@ class DiscoverFragment : BindingFragment<FragmentDiscoverBinding>(R.layout.fragm
         ).show()
     }
 
+    private fun setupRecommendCourseGetStateObserver() {
+        viewModel.recommendCourseGetState.observe(viewLifecycleOwner) { state ->
+            when (state) {
+                is UiStateV2.Success -> {
+                    multiViewAdapter.addMultiViewItem(state.data)
+                    viewModel.initRecommendCourseGetState()
+                }
+
+                is UiStateV2.Failure -> {
+                    context?.showSnackbar(
+                        anchorView = binding.root,
+                        message = state.msg,
+                        gravity = Gravity.TOP
+                    )
+                }
+
+                else -> {}
+            }
+        }
+    }
+
+    private fun setupRecommendCourseSortStateObserver() {
+        viewModel.recommendCourseSortState.observe(viewLifecycleOwner) { state ->
+            when (state) {
+                is UiStateV2.Success -> {
+                    // 추천 코스 목록 전체 갱신
+                    multiViewAdapter.updateRecommendCourseBySorting(state.data)
+                }
+
+                is UiStateV2.Failure -> {
+                    context?.showSnackbar(
+                        anchorView = binding.root,
+                        message = state.msg,
+                        gravity = Gravity.TOP
+                    )
+                }
+
+                else -> {}
+            }
+        }
+    }
+
     private fun setupRecommendCourseNextPageStateObserver() {
-        viewModel.nextPageState.observe(viewLifecycleOwner) { state ->
+        viewModel.recommendCourseNextPageState.observe(viewLifecycleOwner) { state ->
             when (state) {
                 is UiStateV2.Success -> {
-                    val nextPageCourses = state.data
-                    multiViewAdapter.addRecommendCourseNextPage(nextPageCourses)
+                    multiViewAdapter.addRecommendCourseNextPage(state.data)
                 }
 
                 is UiStateV2.Failure -> {
@@ -449,8 +494,8 @@ class DiscoverFragment : BindingFragment<FragmentDiscoverBinding>(R.layout.fragm
         return layoutManager.findFirstCompletelyVisibleItemPosition() > 0
     }
 
-    fun getRecommendCourses(pageNo: Int) {
-        viewModel.getRecommendCourse(pageNo = pageNo, ordering = "date")
+    fun getRecommendCourses() {
+        viewModel.getRecommendCourses()
     }
 
     override fun onAttach(context: Context) {
@@ -469,6 +514,7 @@ class DiscoverFragment : BindingFragment<FragmentDiscoverBinding>(R.layout.fragm
         private const val BANNER_SCROLL_DELAY_TIME = 5000L
         private const val CENTER_POS_OF_INFINITE_BANNERS = Int.MAX_VALUE / 2
         private const val SCROLL_DIRECTION = 1
+        private const val RECOMMEND_HEADER_INDEX = -1
         private const val EXTRA_PUBLIC_COURSE_ID = "publicCourseId"
         private const val EXTRA_ROOT_SCREEN = "rootScreen"
         const val EXTRA_EDITABLE_DISCOVER_COURSE = "editable_discover_course"