Merge pull request #24 from Coffee-ing/feat-filter-api-connection

jihyunniiii · web-flow · commit 2ebe180c250a · 2023-11-11T15:47:40.000+09:00
[feat] 검색, 정렬, 필터링 api 연동
diff --git a/app/src/main/java/com/coffeeing/client/data/datasource/remote/MainDataSource.kt b/app/src/main/java/com/coffeeing/client/data/datasource/remote/MainDataSource.kt
@@ -28,4 +28,16 @@ class MainDataSource @Inject constructor(
     suspend fun postRegistration(
         postId: Int
     ): ResponseRegistration = mainService.postRegistration(postId)
+
+    suspend fun getSearch(
+        keyword: String
+    ): ResponseHomeList = mainService.getSearch(keyword)
+
+    suspend fun getSort(
+        sort: String
+    ): ResponseHomeList = mainService.getSort(sort)
+
+    suspend fun getFilter(
+        tag: String
+    ): ResponseHomeList = mainService.getFilter(tag)
 }
diff --git a/app/src/main/java/com/coffeeing/client/data/repository/MainRepositoryImpl.kt b/app/src/main/java/com/coffeeing/client/data/repository/MainRepositoryImpl.kt
@@ -36,4 +36,16 @@ class MainRepositoryImpl @Inject constructor(
     override suspend fun postRegistration(postId: Int): Result<Registration> = runCatching {
         mainDataSource.postRegistration(postId).toRegistration()
     }
+
+    override suspend fun getSearch(keyword: String): Result<List<HomeCoffeeing>> = runCatching {
+        mainDataSource.getSearch(keyword).toHomeList()
+    }
+
+    override suspend fun getSort(sort: String): Result<List<HomeCoffeeing>> = runCatching {
+        mainDataSource.getSort(sort).toHomeList()
+    }
+
+    override suspend fun getFilter(tag: String): Result<List<HomeCoffeeing>> = runCatching {
+        mainDataSource.getFilter(tag).toHomeList()
+    }
 }
diff --git a/app/src/main/java/com/coffeeing/client/data/service/MainService.kt b/app/src/main/java/com/coffeeing/client/data/service/MainService.kt
@@ -10,6 +10,7 @@ import retrofit2.http.Body
 import retrofit2.http.GET
 import retrofit2.http.POST
 import retrofit2.http.Path
+import retrofit2.http.Query
 
 interface MainService {
     @GET("list")
@@ -35,4 +36,19 @@ interface MainService {
     suspend fun postRegistration(
         @Path("post_id") postId: Int
     ): ResponseRegistration
+
+    @GET("search")
+    suspend fun getSearch(
+        @Query("keyword") keyword: String
+    ): ResponseHomeList
+
+    @GET("sort")
+    suspend fun getSort(
+        @Query("sort") sort: String
+    ): ResponseHomeList
+
+    @GET("filter")
+    suspend fun getFilter(
+        @Query("tag") tag: String
+    ): ResponseHomeList
 }
diff --git a/app/src/main/java/com/coffeeing/client/domain/repository/MainRepository.kt b/app/src/main/java/com/coffeeing/client/domain/repository/MainRepository.kt
@@ -23,4 +23,16 @@ interface MainRepository {
     suspend fun postRegistration(
         postId: Int
     ): Result<Registration>
+
+    suspend fun getSearch(
+        keyword: String
+    ): Result<List<HomeCoffeeing>>
+
+    suspend fun getSort(
+        sort: String
+    ): Result<List<HomeCoffeeing>>
+
+    suspend fun getFilter(
+        tag: String
+    ): Result<List<HomeCoffeeing>>
 }
diff --git a/app/src/main/java/com/coffeeing/client/presentation/home/HomeActivity.kt b/app/src/main/java/com/coffeeing/client/presentation/home/HomeActivity.kt
@@ -62,19 +62,33 @@ class HomeActivity : BindingActivity<ActivityHomeBinding>(R.layout.activity_home
         binding.ivHomeMyPage.setOnClickListener {
             moveToMypage()
         }
+
+        binding.ivHomeSearch.setOnClickListener {
+            viewModel.getSearch(binding.etHomeSearch.text.toString())
+        }
+
+        binding.cgHomeCoffeeingTypeFilter.setOnCheckedChangeListener { _, checkedId ->
+            when (binding.cgHomeCoffeeingTypeFilter.checkedChipId) {
+                R.id.chip_home_coffeeing_original -> viewModel.setFilterType("original")
+                R.id.chip_home_coffeeing_friend -> viewModel.setFilterType("friend")
+                R.id.chip_home_coffeeing_tour -> viewModel.setFilterType("tour")
+                R.id.chip_home_coffeeing_worker -> viewModel.setFilterType("worker")
+                R.id.chip_home_coffeeing_beginner -> viewModel.setFilterType("beginner")
+                else -> viewModel.setFilterType("original")
+            }
+        }
     }
 
     private fun addObservers() {
         viewModel.homeSort.observe(this) { homeSortType ->
             binding.tvHomeSort.text =
-                viewModel.homeSort.value?.sortType ?: HomeSortType.RECENT.sortType
+                viewModel.homeSort.value?.sortType ?: "최신순"
         }
     }
 
     private fun collectData() {
         viewModel.homeList.flowWithLifecycle(lifecycle).onEach {
             homeCoffeeingAdapter.submitList(viewModel.homeList.value)
-            viewModel.getHomeList()
 
             if (viewModel.homeList.value.isNullOrEmpty()) {
                 binding.rvHomeCoffeeing.visibility = View.INVISIBLE
@@ -88,13 +102,24 @@ class HomeActivity : BindingActivity<ActivityHomeBinding>(R.layout.activity_home
         viewModel.likeState.flowWithLifecycle(lifecycle).onEach {
             viewModel.getHomeList()
         }.launchIn(lifecycleScope)
+
+        viewModel.filterType.flowWithLifecycle(lifecycle).onEach {
+            viewModel.filterType.value?.let { tag ->
+                viewModel.getFilter(tag)
+            }
+        }.launchIn(lifecycleScope)
     }
 
     private fun showHomeSortDialog() {
         viewModel.homeSort.value?.let {
             HomeSortBottomSheetDialog(
                 currentSortType = it,
-                sort = { sortType -> viewModel.setHomeSort(sortType) }
+                sort = { sortType -> viewModel.setHomeSort(sortType) },
+                onDialogClosed = {
+                    viewModel.getSort(
+                        viewModel.homeSort.value?.sortType ?: "최신순"
+                    )
+                }
             ).show(supportFragmentManager, HOME_SORT_DIALOG)
         }
     }
diff --git a/app/src/main/java/com/coffeeing/client/presentation/home/HomeSortBottomSheetDialog.kt b/app/src/main/java/com/coffeeing/client/presentation/home/HomeSortBottomSheetDialog.kt
@@ -1,5 +1,6 @@
 package com.coffeeing.client.presentation.home
 
+import android.content.DialogInterface
 import android.os.Bundle
 import android.view.View
 import com.coffeeing.client.R
@@ -9,7 +10,8 @@ import com.coffeeing.client.util.binding.BindingBottomSheetDialogFragment
 
 class HomeSortBottomSheetDialog(
     private val currentSortType: HomeSortType,
-    private val sort: (HomeSortType) -> Unit
+    private val sort: (HomeSortType) -> Unit,
+    private val onDialogClosed: () -> Unit
 ) : BindingBottomSheetDialogFragment<DialogBottomHomeSortBinding>(R.layout.dialog_bottom_home_sort) {
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
@@ -19,6 +21,11 @@ class HomeSortBottomSheetDialog(
         addListeners()
     }
 
+    override fun onDismiss(dialog: DialogInterface) {
+        super.onDismiss(dialog)
+        onDialogClosed.invoke()
+    }
+
     private fun initLayout() {
         with(binding) {
             tvHomeSortDeadline.isSelected = currentSortType == HomeSortType.RECENT
diff --git a/app/src/main/java/com/coffeeing/client/presentation/home/HomeViewModel.kt b/app/src/main/java/com/coffeeing/client/presentation/home/HomeViewModel.kt
@@ -24,6 +24,8 @@ class HomeViewModel @Inject constructor(
     val homeList get() = _homeList.asStateFlow()
     private val _likeState = MutableStateFlow<Like?>(null)
     val likeState get() = _likeState.asStateFlow()
+    private val _filterType = MutableStateFlow<String?>(null)
+    val filterType get() = _filterType.asStateFlow()
 
     fun setHomeSort(homeSortType: HomeSortType) {
         _homeSort.value = homeSortType
@@ -41,6 +43,42 @@ class HomeViewModel @Inject constructor(
         }
     }
 
+    fun getSearch(keyword: String) {
+        viewModelScope.launch {
+            mainRepository.getSearch(keyword)
+                .onSuccess {
+                    _homeList.value = it
+                }
+                .onFailure { exception ->
+                    Timber.e(exception.message)
+                }
+        }
+    }
+
+    fun getSort(sort: String) {
+        viewModelScope.launch {
+            mainRepository.getSort(sort)
+                .onSuccess {
+                    _homeList.value = it
+                }
+                .onFailure { exception ->
+                    Timber.e(exception.message)
+                }
+        }
+    }
+
+    fun getFilter(tag: String) {
+        viewModelScope.launch {
+            mainRepository.getFilter(tag)
+                .onSuccess {
+                    _homeList.value = it
+                }
+                .onFailure { exception ->
+                    Timber.e(exception.message)
+                }
+        }
+    }
+
     fun postLike(postId: Int) {
         viewModelScope.launch {
             mainRepository.postLike(postId)
@@ -52,4 +90,8 @@ class HomeViewModel @Inject constructor(
                 }
         }
     }
+
+    fun setFilterType(tag: String) {
+        _filterType.value = tag
+    }
 }
diff --git a/app/src/main/java/com/coffeeing/client/presentation/type/HomeSortType.kt b/app/src/main/java/com/coffeeing/client/presentation/type/HomeSortType.kt
@@ -3,5 +3,5 @@ package com.coffeeing.client.presentation.type
 enum class HomeSortType(val sortType: String) {
     RECENT("최신순"),
     POPULARITY("인기순"),
-    DEADLINE("마감임박 순")
+    DEADLINE("마감임박순")
 }
diff --git a/app/src/main/res/layout/activity_home.xml b/app/src/main/res/layout/activity_home.xml
@@ -4,6 +4,7 @@
     xmlns:tools="http://schemas.android.com/tools">
 
     <data>
+
         <variable
             name="viewModel"
             type="com.coffeeing.client.presentation.home.HomeViewModel" />
@@ -66,9 +67,10 @@
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintStart_toStartOf="@+id/horizontalScrollView"
                 app:singleLine="true"
-                app:singleSelection="false">
+                app:singleSelection="true">
 
                 <com.google.android.material.chip.Chip
+                    android:id="@+id/chip_home_coffeeing_original"
                     style="@style/Style.Material3.Chip.Coffeeing.Type"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
@@ -77,6 +79,7 @@
                     android:textSize="7dp" />
 
                 <com.google.android.material.chip.Chip
+                    android:id="@+id/chip_home_coffeeing_friend"
                     style="@style/Style.Material3.Chip.Coffeeing.Type"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
@@ -85,6 +88,7 @@
                     android:textSize="7dp" />
 
                 <com.google.android.material.chip.Chip
+                    android:id="@+id/chip_home_coffeeing_tour"
                     style="@style/Style.Material3.Chip.Coffeeing.Type"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
@@ -93,6 +97,7 @@
                     android:textSize="7dp" />
 
                 <com.google.android.material.chip.Chip
+                    android:id="@+id/chip_home_coffeeing_worker"
                     style="@style/Style.Material3.Chip.Coffeeing.Type"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
@@ -101,6 +106,7 @@
                     android:textSize="7dp" />
 
                 <com.google.android.material.chip.Chip
+                    android:id="@+id/chip_home_coffeeing_beginner"
                     style="@style/Style.Material3.Chip.Coffeeing.Type"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"

Original file line number	Diff line number	Diff line change
`@@ -3,5 +3,5 @@ package com.coffeeing.client.presentation.type`
`3`	`3`	`enum class HomeSortType(val sortType: String) {`
`4`	`4`	`RECENT("최신순"),`
`5`	`5`	`POPULARITY("인기순"),`
`6`		`- DEADLINE("마감임박 순")`
	`6`	`+ DEADLINE("마감임박순")`
`7`	`7`	`}`