Merge pull request #96 from team-JMT/feat/search_group

그룹 검색 기능 일부 구현
team-JMT · Mar 15, 2024 · 48bb200 · 48bb200
2 parents 805958d + c188257
commit 48bb200
Show file tree

Hide file tree

Showing 14 changed files with 133 additions and 78 deletions.
diff --git a/data/src/main/java/org/gdsc/data/database/GroupPaging.kt b/data/src/main/java/org/gdsc/data/database/GroupPaging.kt
@@ -0,0 +1,8 @@
+package org.gdsc.data.database
+
+import org.gdsc.domain.model.GroupPreview
+
+data class GroupPaging(
+    val groupList: List<GroupPreview>,
+    val page: Page
+)
diff --git a/data/src/main/java/org/gdsc/data/datasource/GroupDataSource.kt b/data/src/main/java/org/gdsc/data/datasource/GroupDataSource.kt
@@ -1,10 +1,13 @@
 package org.gdsc.data.datasource
 
+import org.gdsc.domain.model.GroupPreview
 import org.gdsc.domain.model.response.Group
 
 
 interface GroupDataSource {
     suspend fun getMyGroups(): List<Group>
 
     suspend fun selectGroup(groupId: Int): String
+
+    suspend fun searchGroup(keyword: String, limitCount: Int): List<GroupPreview>
 }
diff --git a/data/src/main/java/org/gdsc/data/datasource/GroupDataSourceImpl.kt b/data/src/main/java/org/gdsc/data/datasource/GroupDataSourceImpl.kt
@@ -1,7 +1,10 @@
 package org.gdsc.data.datasource
 
 import android.util.Log
+import org.gdsc.data.database.GroupPaging
 import org.gdsc.data.network.GroupAPI
+import org.gdsc.domain.model.GroupPreview
+import org.gdsc.domain.model.request.GroupSearchRequest
 import org.gdsc.domain.model.response.Group
 import javax.inject.Inject
 
@@ -29,4 +32,8 @@ class GroupDataSourceImpl @Inject constructor(
         }
         return ""
     }
+
+    override suspend fun searchGroup(keyword: String, limitCount: Int): List<GroupPreview> {
+        return groupAPI.searchGroup(GroupSearchRequest(keyword)).data.groupList.take(limitCount)
+    }
 }
diff --git a/data/src/main/java/org/gdsc/data/network/GroupAPI.kt b/data/src/main/java/org/gdsc/data/network/GroupAPI.kt
@@ -1,7 +1,10 @@
 package org.gdsc.data.network
 
+import org.gdsc.data.database.GroupPaging
 import org.gdsc.data.model.Response
+import org.gdsc.domain.model.request.GroupSearchRequest
 import org.gdsc.domain.model.response.Group
+import retrofit2.http.Body
 import retrofit2.http.GET
 import retrofit2.http.POST
 import retrofit2.http.Path
@@ -16,4 +19,8 @@ interface GroupAPI {
         @Path("groupId") groupId: Int
     ): Response<String>
 
+    @POST("api/v1/group/search")
+    suspend fun searchGroup(
+        @Body groupSearchRequest: GroupSearchRequest
+    ): Response<GroupPaging>
 }
diff --git a/data/src/main/java/org/gdsc/data/repository/GroupRepositoryImpl.kt b/data/src/main/java/org/gdsc/data/repository/GroupRepositoryImpl.kt
@@ -1,6 +1,7 @@
 package org.gdsc.data.repository
 
 import org.gdsc.data.datasource.GroupDataSource
+import org.gdsc.domain.model.GroupPreview
 import org.gdsc.domain.model.response.Group
 import org.gdsc.domain.repository.GroupRepository
 import javax.inject.Inject
@@ -15,4 +16,8 @@ class GroupRepositoryImpl @Inject constructor(
     override suspend fun selectGroup(groupId: Int): String {
         return groupDataSource.selectGroup(groupId)
     }
+
+    override suspend fun searchGroup(keyword: String, limitCount: Int): List<GroupPreview> {
+        return groupDataSource.searchGroup(keyword, limitCount)
+    }
 }
diff --git a/domain/src/main/java/org/gdsc/domain/model/GroupPreview.kt b/domain/src/main/java/org/gdsc/domain/model/GroupPreview.kt
@@ -0,0 +1,9 @@
+package org.gdsc.domain.model
+
+data class GroupPreview(
+    val groupId: Int,
+    val groupIntroduce: String,
+    val groupName: String,
+    val memberCnt: Int,
+    val restaurantCnt: Int
+)
diff --git a/domain/src/main/java/org/gdsc/domain/model/request/GroupSearchRequest.kt b/domain/src/main/java/org/gdsc/domain/model/request/GroupSearchRequest.kt
@@ -0,0 +1,5 @@
+package org.gdsc.domain.model.request
+
+data class GroupSearchRequest(
+    val keyword: String
+)
diff --git a/domain/src/main/java/org/gdsc/domain/repository/GroupRepository.kt b/domain/src/main/java/org/gdsc/domain/repository/GroupRepository.kt
@@ -1,9 +1,12 @@
 package org.gdsc.domain.repository
 
+import org.gdsc.domain.model.GroupPreview
 import org.gdsc.domain.model.response.Group
 
 interface GroupRepository {
     suspend fun getMyGroups(): List<Group>
 
     suspend fun selectGroup(groupId: Int): String
+
+    suspend fun searchGroup(keyword: String, limitCount: Int): List<GroupPreview>
 }
diff --git a/domain/src/main/java/org/gdsc/domain/usecase/GetGroupBySearchWithLimitCountUseCase.kt b/domain/src/main/java/org/gdsc/domain/usecase/GetGroupBySearchWithLimitCountUseCase.kt
@@ -0,0 +1,10 @@
+package org.gdsc.domain.usecase
+
+import org.gdsc.domain.repository.GroupRepository
+import javax.inject.Inject
+
+class GetGroupBySearchWithLimitCountUseCase @Inject constructor(
+    private val groupRepository: GroupRepository
+) {
+    suspend operator fun invoke(keyword: String, limitCount: Int) = groupRepository.searchGroup(keyword, limitCount)
+}
diff --git a/presentation/src/main/java/org/gdsc/presentation/view/allsearch/AllSearchFragment.kt b/presentation/src/main/java/org/gdsc/presentation/view/allsearch/AllSearchFragment.kt
@@ -55,6 +55,8 @@ class AllSearchFragment : Fragment() {
                 binding.cgRecentSearch.removeAllViews()
                 keywordList.forEach {
                     if (it.isNotBlank()) {
+                        binding.tvRecentSearch.visibility = View.VISIBLE
+                        binding.tvDelete.visibility = View.VISIBLE
                         binding.cgRecentSearch.addView(
                             newChip(it,
                                 { keyword ->
@@ -64,6 +66,9 @@ class AllSearchFragment : Fragment() {
                                 navigateToResultPage()
                             }
                         )
+                    } else {
+                        binding.tvRecentSearch.visibility = View.GONE
+                        binding.tvDelete.visibility = View.GONE
                     }
                 }
             }

diff --git a/presentation/src/main/java/org/gdsc/presentation/view/allsearch/AllSearchViewModel.kt b/presentation/src/main/java/org/gdsc/presentation/view/allsearch/AllSearchViewModel.kt
@@ -13,8 +13,10 @@ import kotlinx.coroutines.launch
 import org.gdsc.domain.DrinkPossibility
 import org.gdsc.domain.FoodCategory
 import org.gdsc.domain.SortType
+import org.gdsc.domain.model.GroupPreview
 import org.gdsc.domain.model.Location
 import org.gdsc.domain.model.RegisteredRestaurant
+import org.gdsc.domain.usecase.GetGroupBySearchWithLimitCountUseCase
 import org.gdsc.domain.usecase.GetRestaurantBySearchUseCase
 import org.gdsc.domain.usecase.GetRestaurantBySearchWithLimitCountUseCase
 import org.gdsc.domain.usecase.user.DeleteSearchedKeywordUseCase
@@ -32,41 +34,12 @@ class AllSearchViewModel @Inject constructor(
     private val updateSearchedKeywordUseCase: UpdateSearchedKeywordUseCase,
     private val deleteSearchedKeywordUseCase: DeleteSearchedKeywordUseCase,
     private val initSearchedKeywordUseCase: InitSearchedKeywordUseCase,
-    private val getRestaurantBySearchWithLimitCountUseCase: GetRestaurantBySearchWithLimitCountUseCase
+    private val getRestaurantBySearchWithLimitCountUseCase: GetRestaurantBySearchWithLimitCountUseCase,
+    private val getGroupBySearchWithLimitCountUseCase: GetGroupBySearchWithLimitCountUseCase
 ) : ViewModel() {
 
     init {
 
-        viewModelScope.launch {
-            val location = locationManager.getCurrentLocation()
-
-            if (location == null) {
-                _searchedRestaurantPreviewState.value = emptyList()
-            } else {
-
-                val userLoc = Location(location.longitude.toString(), location.latitude.toString())
-
-                _searchedRestaurantPreviewState.value =
-                    getRestaurantBySearchWithLimitCountUseCase(searchKeyword.value, userLoc, 3)
-            }
-
-        }
-
-        viewModelScope.launch {
-            val location = locationManager.getCurrentLocation()
-
-            if (location == null) {
-                _searchedRestaurantState.value = PagingData.empty()
-            } else {
-                val userLoc = Location(location.longitude.toString(), location.latitude.toString())
-
-                getRestaurantBySearchUseCase(searchKeyword.value, userLoc).distinctUntilChanged()
-                    .collect {
-                        _searchedRestaurantState.value = it
-                    }
-            }
-        }
-
         viewModelScope.launch {
             val keywords = getSearchedKeywordsUseCase()
             if (keywords.isNotEmpty()) {
@@ -101,6 +74,12 @@ class AllSearchViewModel @Inject constructor(
     val searchedRestaurantPreviewState: StateFlow<List<RegisteredRestaurant>>
         get() = _searchedRestaurantPreviewState
 
+    private var _searchedGroupPreviewState =
+        MutableStateFlow<List<GroupPreview>>(emptyList())
+
+    val searchedGroupPreviewState: StateFlow<List<GroupPreview>>
+        get() = _searchedGroupPreviewState
+
 
     private var _searchedKeywordsState = MutableStateFlow<List<String>>(emptyList())
     val searchedKeywordsState: StateFlow<List<String>>
@@ -140,5 +119,46 @@ class AllSearchViewModel @Inject constructor(
         }
     }
 
+    fun searchRestaurantPreviewWithKeyword() {
+        viewModelScope.launch {
+            val location = locationManager.getCurrentLocation()
+
+            if (location == null) {
+                _searchedRestaurantPreviewState.value = emptyList()
+            } else {
+
+                val userLoc = Location(location.longitude.toString(), location.latitude.toString())
+
+                _searchedRestaurantPreviewState.value =
+                    getRestaurantBySearchWithLimitCountUseCase(searchKeyword.value, userLoc, 3)
+            }
+
+        }
+    }
+
+    fun searchRestaurantWithKeyword() {
+        viewModelScope.launch {
+            val location = locationManager.getCurrentLocation()
+
+            if (location == null) {
+                _searchedRestaurantState.value = PagingData.empty()
+            } else {
+                val userLoc = Location(location.longitude.toString(), location.latitude.toString())
+
+                getRestaurantBySearchUseCase(searchKeyword.value, userLoc).distinctUntilChanged()
+                    .collect {
+                        _searchedRestaurantState.value = it
+                    }
+            }
+        }
+    }
+
+    fun searchGroupPreviewWithKeyword() {
+        viewModelScope.launch {
+            val result = getGroupBySearchWithLimitCountUseCase(searchKeyword.value, 3)
+            _searchedGroupPreviewState.value = result
+        }
+    }
+
 
 }
diff --git a/presentation/src/main/java/org/gdsc/presentation/view/allsearch/SearchCategoryAllFragment.kt b/presentation/src/main/java/org/gdsc/presentation/view/allsearch/SearchCategoryAllFragment.kt
@@ -43,6 +43,9 @@ class SearchCategoryAllFragment(
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
 
+        viewModel.searchRestaurantPreviewWithKeyword()
+        viewModel.searchGroupPreviewWithKeyword()
+
         binding.restaurantRecyclerView.adapter = searchCategoryRestaurantPreviewAdapter
         binding.restaurantRecyclerView.layoutManager = LinearLayoutManager(requireContext())
 
@@ -68,44 +71,12 @@ class SearchCategoryAllFragment(
             }
         }
 
-        // Todo: Real APi
-        searchCategoryGroupPreviewAdapter.submitList(
-            listOf(
-                GroupInfo(
-                    "https://avatars.githubusercontent.com/u/58663494?v=4",
-                    1,
-                    "햄버거 먹으러 갈 사람 여기여기 모여라",
-                    "버거 대마왕",
-                    "https://avatars.githubusercontent.com/u/58663494?v=4",
-                    false,
-                    (0 .. 500).shuffled().first(),
-                    false,
-                    (0 .. 500).shuffled().first()
-                ),
-                GroupInfo(
-                    "https://avatars.githubusercontent.com/u/58663494?v=4",
-                    2,
-                    "햄버거 먹으러 갈 사람 여기여기 모여라",
-                    "버거 대마왕",
-                    "https://avatars.githubusercontent.com/u/58663494?v=4",
-                    false,
-                    (0 .. 500).shuffled().first(),
-                    false,
-                    (0 .. 500).shuffled().first()
-                ),
-                GroupInfo(
-                    "https://avatars.githubusercontent.com/u/58663494?v=4",
-                    3,
-                    "햄버거 먹으러 갈 사람 여기여기 모여라",
-                    "버거 대마왕",
-                    "https://avatars.githubusercontent.com/u/58663494?v=4",
-                    false,
-                    (0 .. 500).shuffled().first(),
-                    false,
-                    (0 .. 500).shuffled().first()
-                ),
-            )
-        )
+        repeatWhenUiStarted {
+            viewModel.searchedGroupPreviewState.collect {
+                searchCategoryGroupPreviewAdapter.submitList(it)
+            }
+        }
+
     }
 
     override fun onDestroyView() {

diff --git a/...on/src/main/java/org/gdsc/presentation/view/allsearch/SearchCategoryRestaurantFragment.kt b/...on/src/main/java/org/gdsc/presentation/view/allsearch/SearchCategoryRestaurantFragment.kt
@@ -42,13 +42,15 @@ class SearchCategoryRestaurantFragment(
         setSpinners()
 
         viewModel.setSearchKeyword(searchKeyword)
+        viewModel.searchRestaurantWithKeyword()
 
         binding.restaurantRecyclerView.adapter = searchCategoryRestaurantAdapter
         binding.restaurantRecyclerView.layoutManager = LinearLayoutManager(requireContext())
 
     }
 
     private fun observeState() {
+
         repeatWhenUiStarted {
             viewModel.searchedRestaurantState.collect {
                 searchCategoryRestaurantAdapter.submitData(it)

diff --git a/...in/java/org/gdsc/presentation/view/allsearch/adapter/SearchCategoryGroupPreviewAdapter.kt b/...in/java/org/gdsc/presentation/view/allsearch/adapter/SearchCategoryGroupPreviewAdapter.kt
@@ -6,27 +6,27 @@ import androidx.recyclerview.widget.DiffUtil
 import androidx.recyclerview.widget.ListAdapter
 import androidx.recyclerview.widget.RecyclerView
 import com.bumptech.glide.Glide
-import org.gdsc.domain.model.GroupInfo
+import org.gdsc.domain.model.GroupPreview
 import org.gdsc.presentation.R
 import org.gdsc.presentation.databinding.ItemSearchGroupBinding
 
 class SearchCategoryGroupPreviewAdapter
-    : ListAdapter<GroupInfo, SearchCategoryGroupPreviewAdapter.GroupWithSearchPreviewViewHolder>(
+    : ListAdapter<GroupPreview, SearchCategoryGroupPreviewAdapter.GroupWithSearchPreviewViewHolder>(
     diffCallback
 ) {
 
     companion object {
-        val diffCallback = object : DiffUtil.ItemCallback<GroupInfo>() {
+        val diffCallback = object : DiffUtil.ItemCallback<GroupPreview>() {
             override fun areItemsTheSame(
-                oldItem: GroupInfo,
-                newItem: GroupInfo
+                oldItem: GroupPreview,
+                newItem: GroupPreview
             ): Boolean {
                 return oldItem == newItem
             }
 
             override fun areContentsTheSame(
-                oldItem: GroupInfo,
-                newItem: GroupInfo
+                oldItem: GroupPreview,
+                newItem: GroupPreview
             ): Boolean {
                 return oldItem == newItem
             }
@@ -36,10 +36,10 @@ class SearchCategoryGroupPreviewAdapter
     class GroupWithSearchPreviewViewHolder(
         private val binding: ItemSearchGroupBinding,
     ): RecyclerView.ViewHolder(binding.root) {
-        fun bind(item: GroupInfo) {
+        fun bind(item: GroupPreview) {
             binding.run {
                 Glide.with(itemView.context)
-                    .load(item.groupProfileImageUrl)
+                    .load("https://picsum.photos/200")
                     .placeholder(R.drawable.base_profile_image)
                     .into(ivGroupImage)