feat: display correct role for each space member in the list

Author: joragua

owncloudApp/src/main/java/com/owncloud/android/presentation/spaces/members/SpaceMembersAdapter.kt

@@ -26,6 +26,7 @@ import android.view.ViewGroup
 import androidx.recyclerview.widget.RecyclerView
 import com.owncloud.android.R
 import com.owncloud.android.databinding.MemberItemBinding
+import com.owncloud.android.domain.roles.model.OCRole
 import com.owncloud.android.domain.spaces.model.SpaceMember
 import com.owncloud.android.domain.spaces.model.SpaceMembers
 import com.owncloud.android.utils.DisplayUtils
@@ -64,9 +65,9 @@ class SpaceMembersAdapter: RecyclerView.Adapter<SpaceMembersAdapter.SpaceMembers
 
     override fun getItemCount(): Int = members.size
 
-    fun setSpaceMembers(spaceMembers: SpaceMembers) {
-        this.rolesMap = spaceMembers.roles.associate { it.id to it.displayName }
-        this.members = spaceMembers.members.sortedByDescending { member -> spaceMembers.roles.indexOfFirst { it.id in member.roles } }
+    fun setSpaceMembers(spaceMembers: SpaceMembers, roles: List<OCRole>) {
+        this.rolesMap = roles.associate { it.id to it.displayName }
+        this.members = spaceMembers.members.sortedByDescending { member -> roles.indexOfFirst { it.id in member.roles } }
         notifyDataSetChanged()
     }
 

owncloudApp/src/main/java/com/owncloud/android/presentation/spaces/members/SpaceMembersFragment.kt

@@ -29,6 +29,7 @@ import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.RecyclerView
 import com.owncloud.android.R
 import com.owncloud.android.databinding.MembersFragmentBinding
+import com.owncloud.android.domain.roles.model.OCRole
 import com.owncloud.android.domain.spaces.model.OCSpace
 import com.owncloud.android.extensions.collectLatestLifecycleFlow
 import com.owncloud.android.presentation.common.UIResult
@@ -49,6 +50,7 @@ class SpaceMembersFragment : Fragment() {
 
     private lateinit var spaceMembersAdapter: SpaceMembersAdapter
     private lateinit var recyclerView: RecyclerView
+    private lateinit var roles: List<OCRole>
 
     override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View {
         _binding = MembersFragmentBinding.inflate(inflater, container, false)
@@ -68,7 +70,22 @@ class SpaceMembersFragment : Fragment() {
             event?.let {
                 when (val uiResult = event.peekContent()) {
                     is UIResult.Success -> {
-                        uiResult.data?.let { spaceMembersAdapter.setSpaceMembers(it) }
+                        uiResult.data?.let { spaceMembersAdapter.setSpaceMembers(it, roles) }
+                    }
+                    is UIResult.Loading -> { }
+                    is UIResult.Error -> { }
+                }
+            }
+        }
+
+        collectLatestLifecycleFlow(spaceMembersViewModel.roles) { event ->
+            event?.let {
+                when (val uiResult = event.peekContent()) {
+                    is UIResult.Success -> {
+                        uiResult.data?.let {
+                            roles = it
+                            spaceMembersViewModel.getSpaceMembers()
+                        }
                     }
                     is UIResult.Loading -> { }
                     is UIResult.Error -> { }

owncloudApp/src/main/java/com/owncloud/android/presentation/spaces/members/SpaceMembersViewModel.kt

@@ -21,9 +21,11 @@
 package com.owncloud.android.presentation.spaces.members
 
 import androidx.lifecycle.ViewModel
+import com.owncloud.android.domain.roles.model.OCRole
 import com.owncloud.android.domain.spaces.model.OCSpace
 import com.owncloud.android.domain.spaces.model.SpaceMembers
 import com.owncloud.android.domain.spaces.usecases.GetSpaceMembersUseCase
+import com.owncloud.android.domain.roles.usecases.GetRolesAsyncUseCase
 import com.owncloud.android.domain.utils.Event
 import com.owncloud.android.extensions.ViewModelExt.runUseCaseWithResult
 import com.owncloud.android.presentation.common.UIResult
@@ -32,24 +34,37 @@ import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.StateFlow
 
 class SpaceMembersViewModel(
+    private val getRolesAsyncUseCase: GetRolesAsyncUseCase,
     private val getSpaceMembersUseCase: GetSpaceMembersUseCase,
     private val accountName: String,
     private val space: OCSpace,
     private val coroutineDispatcherProvider: CoroutinesDispatcherProvider
 ): ViewModel() {
 
+    private val _roles = MutableStateFlow<Event<UIResult<List<OCRole>>>?>(null)
+    val roles: StateFlow<Event<UIResult<List<OCRole>>>?> = _roles
+
     private val _spaceMembers = MutableStateFlow<Event<UIResult<SpaceMembers>>?>(null)
     val spaceMembers: StateFlow<Event<UIResult<SpaceMembers>>?> = _spaceMembers
 
     init {
         runUseCaseWithResult(
             coroutineDispatcher = coroutineDispatcherProvider.io,
-            flow = _spaceMembers,
-            useCase = getSpaceMembersUseCase,
-            useCaseParams = GetSpaceMembersUseCase.Params(accountName = accountName, spaceId = space.id),
+            flow = _roles,
+            useCase = getRolesAsyncUseCase,
+            useCaseParams = GetRolesAsyncUseCase.Params(accountName = accountName),
             showLoading = false,
             requiresConnection = true
         )
     }
 
+    fun getSpaceMembers() = runUseCaseWithResult(
+        coroutineDispatcher = coroutineDispatcherProvider.io,
+        flow = _spaceMembers,
+        useCase = getSpaceMembersUseCase,
+        useCaseParams = GetSpaceMembersUseCase.Params(accountName = accountName, spaceId = space.id),
+        showLoading = false,
+        requiresConnection = true
+    )
+
 }