Migrate feed members batch update to a state event (#136)

Author: gpunto

stream-feeds-android-client/src/main/kotlin/io/getstream/feeds/android/client/internal/state/FeedImpl.kt

@@ -357,7 +357,11 @@ internal class FeedImpl(
     ): Result<ModelUpdates<FeedMemberData>> {
         return feedsRepository
             .updateFeedMembers(feedGroupId = group, feedId = id, request = request)
-            .onSuccess { updates -> memberList.mutableState.onMembersUpdated(updates) }
+            .onSuccess { updates ->
+                subscriptionManager.onEvent(
+                    StateUpdateEvent.FeedMemberBatchUpdate(fid.rawValue, updates)
+                )
+            }
     }
 
     override suspend fun acceptFeedMember(): Result<FeedMemberData> {

stream-feeds-android-client/src/main/kotlin/io/getstream/feeds/android/client/internal/state/MemberListStateImpl.kt

@@ -82,12 +82,13 @@ internal class MemberListStateImpl(override val query: MembersQuery) : MemberLis
     override fun onMembersUpdated(updates: ModelUpdates<FeedMemberData>) {
         // Create a map for efficient lookups of updated members
         val updatesMap = updates.updated.associateBy(FeedMemberData::id)
+        val removedIdSet = updates.removedIds.toSet()
 
         _members.update { current ->
             current
                 .mapNotNullTo(mutableListOf()) { member ->
                     // Apply updates and filter out removed members in a single pass
-                    if (member.id in updates.removedIds) {
+                    if (member.id in removedIdSet) {
                         null
                     } else {
                         updatesMap[member.id] ?: member

stream-feeds-android-client/src/main/kotlin/io/getstream/feeds/android/client/internal/state/event/StateUpdateEvent.kt

@@ -25,6 +25,7 @@ import io.getstream.feeds.android.client.api.model.FeedData
 import io.getstream.feeds.android.client.api.model.FeedMemberData
 import io.getstream.feeds.android.client.api.model.FeedsReactionData
 import io.getstream.feeds.android.client.api.model.FollowData
+import io.getstream.feeds.android.client.api.model.ModelUpdates
 import io.getstream.feeds.android.client.api.model.PollData
 import io.getstream.feeds.android.client.api.model.PollVoteData
 import io.getstream.feeds.android.client.api.model.toModel
@@ -144,6 +145,9 @@ internal sealed interface StateUpdateEvent {
 
     data class FeedMemberUpdated(val fid: String, val member: FeedMemberData) : StateUpdateEvent
 
+    data class FeedMemberBatchUpdate(val fid: String, val updates: ModelUpdates<FeedMemberData>) :
+        StateUpdateEvent
+
     data class FollowAdded(val follow: FollowData) : StateUpdateEvent
 
     data class FollowDeleted(val follow: FollowData) : StateUpdateEvent

stream-feeds-android-client/src/main/kotlin/io/getstream/feeds/android/client/internal/state/event/handler/MemberListEventHandler.kt

@@ -16,6 +16,8 @@
 package io.getstream.feeds.android.client.internal.state.event.handler
 
 import io.getstream.feeds.android.client.api.model.FeedId
+import io.getstream.feeds.android.client.api.model.FeedMemberData
+import io.getstream.feeds.android.client.api.model.ModelUpdates
 import io.getstream.feeds.android.client.api.state.query.MembersFilter
 import io.getstream.feeds.android.client.internal.state.MemberListStateUpdates
 import io.getstream.feeds.android.client.internal.state.event.StateUpdateEvent
@@ -52,6 +54,20 @@ internal class MemberListEventHandler(
                 }
             }
 
+            is StateUpdateEvent.FeedMemberBatchUpdate -> {
+                if (event.fid != fid.rawValue) return
+
+                val added = event.updates.added.filter { it matches filter }
+                // We remove elements that used to match the filter but no longer do
+                val (updated, removed) = event.updates.updated.partition { it matches filter }
+                val removedIds = event.updates.removedIds.toMutableList()
+                removed.mapTo(removedIds, FeedMemberData::id)
+
+                state.onMembersUpdated(
+                    ModelUpdates(added = added, updated = updated, removedIds = removedIds)
+                )
+            }
+
             else -> {}
         }
     }

stream-feeds-android-client/src/test/kotlin/io/getstream/feeds/android/client/internal/state/FeedImplTest.kt

@@ -567,12 +567,17 @@ internal class FeedImplTest {
         val request =
             UpdateFeedMembersRequest(
                 operation = UpdateFeedMembersRequest.Operation.Upsert,
-                members = listOf(FeedMemberRequest(userId = "user1", role = "member")),
+                members =
+                    listOf(
+                        FeedMemberRequest(userId = "user1", role = "member"),
+                        FeedMemberRequest(userId = "user2", role = "admin"),
+                        FeedMemberRequest(userId = "user3"),
+                    ),
             )
         val memberUpdates =
             ModelUpdates(
-                added = emptyList(),
-                removedIds = emptyList(),
+                added = listOf(feedMemberData("user2", role = "admin")),
+                removedIds = listOf("user3"),
                 updated = listOf(feedMemberData("user1", role = "member")),
             )
 
@@ -584,8 +589,13 @@ internal class FeedImplTest {
 
         val result = feed.updateFeedMembers(request)
 
+        val expected =
+            listOf(
+                feedMemberData(userId = "user1", role = "member"),
+                feedMemberData(userId = "user2", role = "admin"),
+            )
         assertEquals(memberUpdates, result.getOrNull())
-        assertEquals(memberUpdates.updated, feed.state.members.value)
+        assertEquals(expected, feed.state.members.value)
     }
 
     @Test

stream-feeds-android-client/src/test/kotlin/io/getstream/feeds/android/client/internal/state/event/handler/MemberListEventHandlerTest.kt

@@ -17,10 +17,12 @@ package io.getstream.feeds.android.client.internal.state.event.handler
 
 import io.getstream.android.core.api.filter.equal
 import io.getstream.feeds.android.client.api.model.FeedId
+import io.getstream.feeds.android.client.api.model.ModelUpdates
 import io.getstream.feeds.android.client.api.state.query.MembersFilterField
 import io.getstream.feeds.android.client.internal.state.MemberListStateUpdates
 import io.getstream.feeds.android.client.internal.state.event.StateUpdateEvent
 import io.getstream.feeds.android.client.internal.state.event.StateUpdateEvent.FeedMemberAdded
+import io.getstream.feeds.android.client.internal.state.event.StateUpdateEvent.FeedMemberBatchUpdate
 import io.getstream.feeds.android.client.internal.state.event.StateUpdateEvent.FeedMemberRemoved
 import io.getstream.feeds.android.client.internal.state.event.StateUpdateEvent.FeedMemberUpdated
 import io.getstream.feeds.android.client.internal.test.TestData.feedMemberData
@@ -39,7 +41,7 @@ internal class MemberListEventHandlerTest(
     override val handler = MemberListEventHandler(FeedId(fid), testFilter, state)
 
     companion object {
-        private val fid = "user:feed-1"
+        private const val fid = "user:feed-1"
         private const val differentFeedId = "user:different-feed"
         private val testFilter = MembersFilterField.role.equal("admin")
         private val matchingMember = feedMemberData(role = "admin")
@@ -89,6 +91,48 @@ internal class MemberListEventHandlerTest(
                     event = FeedMemberUpdated(fid, nonMatchingMember),
                     verifyBlock = { state -> state.onMemberRemoved(nonMatchingMember.id) },
                 ),
+                run {
+                    val anotherMatching = feedMemberData(userId = "user-2", role = "admin")
+                    val anotherNonMatching = feedMemberData(userId = "user-3", role = "member")
+
+                    testParams<MemberListStateUpdates>(
+                        name = "FeedMemberBatchUpdate matching feed with mixed updates",
+                        event =
+                            FeedMemberBatchUpdate(
+                                fid = fid,
+                                updates =
+                                    ModelUpdates(
+                                        added = listOf(matchingMember, nonMatchingMember),
+                                        updated = listOf(anotherMatching, anotherNonMatching),
+                                        removedIds = listOf("removed-1", "removed-2"),
+                                    ),
+                            ),
+                        verifyBlock = { state ->
+                            state.onMembersUpdated(
+                                ModelUpdates(
+                                    added = listOf(matchingMember),
+                                    updated = listOf(anotherMatching),
+                                    removedIds =
+                                        listOf("removed-1", "removed-2", anotherNonMatching.id),
+                                )
+                            )
+                        },
+                    )
+                },
+                testParams<MemberListStateUpdates>(
+                    name = "FeedMemberBatchUpdate non-matching feed",
+                    event =
+                        FeedMemberBatchUpdate(
+                            fid = differentFeedId,
+                            updates =
+                                ModelUpdates(
+                                    added = listOf(matchingMember),
+                                    updated = emptyList(),
+                                    removedIds = listOf("removed-1"),
+                                ),
+                        ),
+                    verifyBlock = { state -> state wasNot called },
+                ),
             )
     }
 }