Update handling of feed member & follow events (#122)

gpunto · web-flow · commit a82510d34271 · 2025-10-23T08:04:08.000+02:00
* Merge feed member added &amp; updated handling and add it where missing

* Merge follow added &amp; updated handling
diff --git a/stream-feeds-android-client/src/main/kotlin/io/getstream/feeds/android/client/internal/state/FollowListImpl.kt b/stream-feeds-android-client/src/main/kotlin/io/getstream/feeds/android/client/internal/state/FollowListImpl.kt
@@ -45,7 +45,7 @@ internal class FollowListImpl(
 
     private val _state: FollowListStateImpl = FollowListStateImpl(query)
 
-    private val eventHandler = FollowListEventHandler(_state)
+    private val eventHandler = FollowListEventHandler(query.filter, _state)
 
     init {
         subscriptionManager.subscribe(eventHandler)
diff --git a/stream-feeds-android-client/src/main/kotlin/io/getstream/feeds/android/client/internal/state/FollowListStateImpl.kt b/stream-feeds-android-client/src/main/kotlin/io/getstream/feeds/android/client/internal/state/FollowListStateImpl.kt
@@ -23,6 +23,7 @@ import io.getstream.feeds.android.client.api.state.query.FollowsSort
 import io.getstream.feeds.android.client.internal.model.PaginationResult
 import io.getstream.feeds.android.client.internal.state.query.FollowsQueryConfig
 import io.getstream.feeds.android.client.internal.utils.mergeSorted
+import io.getstream.feeds.android.client.internal.utils.upsertSorted
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.StateFlow
 import kotlinx.coroutines.flow.asStateFlow
@@ -65,16 +66,8 @@ internal class FollowListStateImpl(override val query: FollowsQuery) : FollowLis
         }
     }
 
-    override fun onFollowUpdated(follow: FollowData) {
-        _follows.update { current ->
-            current.map {
-                if (it.id == follow.id) {
-                    follow
-                } else {
-                    it
-                }
-            }
-        }
+    override fun onFollowUpserted(follow: FollowData) {
+        _follows.update { current -> current.upsertSorted(follow, FollowData::id, followsSorting) }
     }
 
     override fun onFollowRemoved(follow: FollowData) {
@@ -96,8 +89,8 @@ internal interface FollowListStateUpdates {
     /** Handles the result of a query for more follows. */
     fun onQueryMoreFollows(result: PaginationResult<FollowData>, queryConfig: FollowsQueryConfig)
 
-    /** Handles the update of a follow data. */
-    fun onFollowUpdated(follow: FollowData)
+    /** Handles the addition or update of a follow. */
+    fun onFollowUpserted(follow: FollowData)
 
     /** Handles the removal of a follow. */
     fun onFollowRemoved(follow: FollowData)
diff --git a/stream-feeds-android-client/src/main/kotlin/io/getstream/feeds/android/client/internal/state/MemberListImpl.kt b/stream-feeds-android-client/src/main/kotlin/io/getstream/feeds/android/client/internal/state/MemberListImpl.kt
@@ -45,7 +45,7 @@ internal class MemberListImpl(
 
     private val _state: MemberListStateImpl = MemberListStateImpl(query)
 
-    private val eventHandler = MemberListEventHandler(query.fid, _state)
+    private val eventHandler = MemberListEventHandler(query.fid, query.filter, _state)
 
     init {
         subscriptionManager.subscribe(eventHandler)
diff --git a/stream-feeds-android-client/src/main/kotlin/io/getstream/feeds/android/client/internal/state/MemberListStateImpl.kt b/stream-feeds-android-client/src/main/kotlin/io/getstream/feeds/android/client/internal/state/MemberListStateImpl.kt
@@ -69,17 +69,11 @@ internal class MemberListStateImpl(override val query: MembersQuery) : MemberLis
         }
     }
 
-    override fun onMemberAdded(member: FeedMemberData) {
-        _members.update { current ->
-            current.upsertSorted(member, FeedMemberData::id, membersSorting)
-        }
-    }
-
     override fun onMemberRemoved(memberId: String) {
         _members.update { current -> current.filter { it.id != memberId } }
     }
 
-    override fun onMemberUpdated(member: FeedMemberData) {
+    override fun onMemberUpserted(member: FeedMemberData) {
         _members.update { current ->
             current.upsertSorted(member, FeedMemberData::id, membersSorting)
         }
@@ -133,14 +127,11 @@ internal interface MemberListStateUpdates {
         queryConfig: MembersQueryConfig,
     )
 
-    /** Handles the addition of a new member. */
-    fun onMemberAdded(member: FeedMemberData)
-
     /** Handles the removal of a member by their ID. */
     fun onMemberRemoved(memberId: String)
 
-    /** Handles the update of a member's data. */
-    fun onMemberUpdated(member: FeedMemberData)
+    /** Handles the addition or update of a member. */
+    fun onMemberUpserted(member: FeedMemberData)
 
     /** Handles updates to multiple members. */
     fun onMembersUpdated(updates: ModelUpdates<FeedMemberData>)
diff --git a/stream-feeds-android-client/src/main/kotlin/io/getstream/feeds/android/client/internal/state/event/StateUpdateEvent.kt b/stream-feeds-android-client/src/main/kotlin/io/getstream/feeds/android/client/internal/state/event/StateUpdateEvent.kt
@@ -155,10 +155,10 @@ internal sealed interface StateUpdateEvent {
 
     data class FollowAdded(val follow: FollowData) : StateUpdateEvent
 
-    data class FollowUpdated(val follow: FollowData) : StateUpdateEvent
-
     data class FollowDeleted(val follow: FollowData) : StateUpdateEvent
 
+    data class FollowUpdated(val follow: FollowData) : StateUpdateEvent
+
     data class NotificationFeedUpdated(
         val fid: String,
         val aggregatedActivities: List<AggregatedActivityData>,
diff --git a/stream-feeds-android-client/src/main/kotlin/io/getstream/feeds/android/client/internal/state/event/handler/FollowListEventHandler.kt b/stream-feeds-android-client/src/main/kotlin/io/getstream/feeds/android/client/internal/state/event/handler/FollowListEventHandler.kt
@@ -15,23 +15,35 @@
  */
 package io.getstream.feeds.android.client.internal.state.event.handler
 
+import io.getstream.feeds.android.client.api.state.query.FollowsFilter
 import io.getstream.feeds.android.client.internal.state.FollowListStateUpdates
 import io.getstream.feeds.android.client.internal.state.event.StateUpdateEvent
+import io.getstream.feeds.android.client.internal.state.query.matches
 import io.getstream.feeds.android.client.internal.subscribe.StateUpdateEventListener
 
-internal class FollowListEventHandler(private val state: FollowListStateUpdates) :
-    StateUpdateEventListener {
+internal class FollowListEventHandler(
+    private val filter: FollowsFilter?,
+    private val state: FollowListStateUpdates,
+) : StateUpdateEventListener {
 
     override fun onEvent(event: StateUpdateEvent) {
         when (event) {
-            is StateUpdateEvent.FollowUpdated -> {
-                state.onFollowUpdated(event.follow)
+            is StateUpdateEvent.FollowAdded -> {
+                if (event.follow matches filter) {
+                    state.onFollowUpserted(event.follow)
+                }
             }
 
             is StateUpdateEvent.FollowDeleted -> {
                 state.onFollowRemoved(event.follow)
             }
 
+            is StateUpdateEvent.FollowUpdated -> {
+                if (event.follow matches filter) {
+                    state.onFollowUpserted(event.follow)
+                }
+            }
+
             else -> {}
         }
     }
diff --git a/stream-feeds-android-client/src/main/kotlin/io/getstream/feeds/android/client/internal/state/event/handler/MemberListEventHandler.kt b/stream-feeds-android-client/src/main/kotlin/io/getstream/feeds/android/client/internal/state/event/handler/MemberListEventHandler.kt
@@ -16,19 +16,22 @@
 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.state.query.MembersFilter
 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.query.matches
 import io.getstream.feeds.android.client.internal.subscribe.StateUpdateEventListener
 
 internal class MemberListEventHandler(
     private val fid: FeedId,
+    private val filter: MembersFilter?,
     private val state: MemberListStateUpdates,
 ) : StateUpdateEventListener {
     override fun onEvent(event: StateUpdateEvent) {
         when (event) {
             is StateUpdateEvent.FeedMemberAdded -> {
-                if (event.fid == fid.rawValue) {
-                    state.onMemberAdded(event.member)
+                if (event.fid == fid.rawValue && event.member matches filter) {
+                    state.onMemberUpserted(event.member)
                 }
             }
 
@@ -39,8 +42,8 @@ internal class MemberListEventHandler(
             }
 
             is StateUpdateEvent.FeedMemberUpdated -> {
-                if (event.fid == fid.rawValue) {
-                    state.onMemberUpdated(event.member)
+                if (event.fid == fid.rawValue && event.member matches filter) {
+                    state.onMemberUpserted(event.member)
                 }
             }
 
diff --git a/stream-feeds-android-client/src/test/kotlin/io/getstream/feeds/android/client/internal/state/FollowListStateImplTest.kt b/stream-feeds-android-client/src/test/kotlin/io/getstream/feeds/android/client/internal/state/FollowListStateImplTest.kt
@@ -49,36 +49,35 @@ internal class FollowListStateImplTest {
     }
 
     @Test
-    fun `on followUpdated, then update specific follow`() = runTest {
+    fun `on followUpserted, then update specific follow`() = runTest {
         val initialFollows = listOf(followData(), followData("user-2", "user-3"))
         val paginationResult = defaultPaginationResult(initialFollows)
         followListState.onQueryMoreFollows(paginationResult, queryConfig)
 
         val updatedFollow =
-            followData(
-                sourceFid = "user:user-1",
-                targetFid = "user:user-2",
-                createdAt = java.util.Date(1000),
-            )
-        followListState.onFollowUpdated(updatedFollow)
+            followData(sourceFid = "user:user-1", targetFid = "user:user-2", createdAt = 1000)
+        followListState.onFollowUpserted(updatedFollow)
 
         val updatedFollows = followListState.follows.value
         assertEquals(updatedFollow, updatedFollows.find { it.id == updatedFollow.id })
         assertEquals(initialFollows[1], updatedFollows.find { it.id == initialFollows[1].id })
     }
 
     @Test
-    fun `on followUpdated with non-existent follow, then keep existing follows unchanged`() =
-        runTest {
-            val initialFollows = listOf(followData(), followData("user-2", "user-3"))
-            val paginationResult = defaultPaginationResult(initialFollows)
-            followListState.onQueryMoreFollows(paginationResult, queryConfig)
+    fun `on followUpserted with non-existent follow, then insert in sorted position`() = runTest {
+        val follow1 = followData("user-1", "user-2", createdAt = 2000)
+        val follow2 = followData("user-2", "user-3", createdAt = 1000)
+        val initialFollows = listOf(follow1, follow2)
+        val paginationResult = defaultPaginationResult(initialFollows)
+        followListState.onQueryMoreFollows(paginationResult, queryConfig)
 
-            val nonExistentFollow = followData("user-4", "user-5")
-            followListState.onFollowUpdated(nonExistentFollow)
+        val newFollow = followData("user-4", "user-5", createdAt = 1500)
+        followListState.onFollowUpserted(newFollow)
 
-            assertEquals(initialFollows, followListState.follows.value)
-        }
+        // Expect follows to be sorted by createdAt in descending order (newest first)
+        val expectedFollows = listOf(follow1, newFollow, follow2)
+        assertEquals(expectedFollows, followListState.follows.value)
+    }
 
     @Test
     fun `on followRemoved, then remove specific follow`() = runTest {
diff --git a/stream-feeds-android-client/src/test/kotlin/io/getstream/feeds/android/client/internal/state/MemberListStateImplTest.kt b/stream-feeds-android-client/src/test/kotlin/io/getstream/feeds/android/client/internal/state/MemberListStateImplTest.kt
@@ -62,7 +62,7 @@ internal class MemberListStateImplTest {
         setupInitialState(initialMembers)
 
         val updatedMember = feedMemberData("user-1", role = "admin", createdAt = Date(3000))
-        memberListState.onMemberUpdated(updatedMember)
+        memberListState.onMemberUpserted(updatedMember)
 
         // Member should be repositioned according to new sort criteria
         val expectedMembers = listOf(updatedMember, initialMembers[0])
@@ -106,7 +106,7 @@ internal class MemberListStateImplTest {
     }
 
     @Test
-    fun `on memberAdded, then add member in sorted position`() = runTest {
+    fun `on onMemberUpserted, then add member in sorted position`() = runTest {
         // Initial members already sorted by createdAt desc
         val initialMembers =
             listOf(
@@ -116,15 +116,15 @@ internal class MemberListStateImplTest {
         setupInitialState(initialMembers)
 
         val newMember = feedMemberData("user-2", createdAt = Date(2000))
-        memberListState.onMemberAdded(newMember)
+        memberListState.onMemberUpserted(newMember)
 
         // Member should be inserted in correct sorted position
         val expectedMembers = listOf(initialMembers[0], newMember, initialMembers[1])
         assertEquals(expectedMembers, memberListState.members.value)
     }
 
     @Test
-    fun `on memberAdded with existing id, then update and reposition member`() = runTest {
+    fun `on onMemberUpserted with existing id, then update and reposition member`() = runTest {
         // Initial members already sorted by createdAt desc
         val initialMembers =
             listOf(
@@ -135,7 +135,7 @@ internal class MemberListStateImplTest {
 
         // Add existing user-1 with newer createdAt that should move it to the front
         val updatedMember = feedMemberData("user-1", role = "admin", createdAt = Date(3000))
-        memberListState.onMemberAdded(updatedMember)
+        memberListState.onMemberUpserted(updatedMember)
 
         // Member should be updated and repositioned according to new sort criteria (3000, 2000)
         val expectedMembers = listOf(updatedMember, initialMembers[0])
diff --git a/stream-feeds-android-client/src/test/kotlin/io/getstream/feeds/android/client/internal/state/event/handler/FollowListEventHandlerTest.kt b/stream-feeds-android-client/src/test/kotlin/io/getstream/feeds/android/client/internal/state/event/handler/FollowListEventHandlerTest.kt
@@ -15,12 +15,16 @@
  */
 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.state.query.FollowsFilterField
 import io.getstream.feeds.android.client.internal.state.FollowListStateUpdates
 import io.getstream.feeds.android.client.internal.state.event.StateUpdateEvent
+import io.getstream.feeds.android.client.internal.state.event.StateUpdateEvent.FollowAdded
 import io.getstream.feeds.android.client.internal.state.event.StateUpdateEvent.FollowDeleted
 import io.getstream.feeds.android.client.internal.state.event.StateUpdateEvent.FollowUpdated
 import io.getstream.feeds.android.client.internal.test.TestData.followData
 import io.mockk.MockKVerificationScope
+import io.mockk.called
 import io.mockk.mockk
 import org.junit.runners.Parameterized
 
@@ -31,22 +35,45 @@ internal class FollowListEventHandlerTest(
 ) : BaseEventHandlerTest<FollowListStateUpdates>(testName, event, verifyBlock) {
 
     override val state: FollowListStateUpdates = mockk(relaxed = true)
-    override val handler = FollowListEventHandler(state)
+    override val handler = FollowListEventHandler(filter, state)
 
     companion object {
+        private val filter = FollowsFilterField.sourceFeed.equal("user:timeline")
+
         @JvmStatic
         @Parameterized.Parameters(name = "{0}")
         fun data(): List<Array<Any>> =
             listOf(
                 testParams<FollowListStateUpdates>(
-                    name = "FollowUpdated",
-                    event = FollowUpdated(followData()),
-                    verifyBlock = { state -> state.onFollowUpdated(followData()) },
+                    name = "FollowAdded matching filter",
+                    event = FollowAdded(followData(sourceFid = "user:timeline")),
+                    verifyBlock = { state ->
+                        state.onFollowUpserted(followData(sourceFid = "user:timeline"))
+                    },
+                ),
+                testParams<FollowListStateUpdates>(
+                    name = "FollowAdded non-matching filter",
+                    event = FollowAdded(followData(sourceFid = "user:notifications")),
+                    verifyBlock = { state -> state wasNot called },
+                ),
+                testParams<FollowListStateUpdates>(
+                    name = "FollowDeleted calls onFollowRemoved",
+                    event = FollowDeleted(followData(sourceFid = "user:timeline")),
+                    verifyBlock = { state ->
+                        state.onFollowRemoved(followData(sourceFid = "user:timeline"))
+                    },
+                ),
+                testParams<FollowListStateUpdates>(
+                    name = "FollowUpdated matching filter",
+                    event = FollowUpdated(followData(sourceFid = "user:timeline")),
+                    verifyBlock = { state ->
+                        state.onFollowUpserted(followData(sourceFid = "user:timeline"))
+                    },
                 ),
                 testParams<FollowListStateUpdates>(
-                    name = "FollowDeleted",
-                    event = FollowDeleted(followData()),
-                    verifyBlock = { state -> state.onFollowRemoved(followData()) },
+                    name = "FollowUpdated non-matching filter",
+                    event = FollowUpdated(followData(sourceFid = "user:notifications")),
+                    verifyBlock = { state -> state wasNot called },
                 ),
             )
     }
diff --git a/stream-feeds-android-client/src/test/kotlin/io/getstream/feeds/android/client/internal/state/event/handler/MemberListEventHandlerTest.kt b/stream-feeds-android-client/src/test/kotlin/io/getstream/feeds/android/client/internal/state/event/handler/MemberListEventHandlerTest.kt
diff --git a/stream-feeds-android-client/src/test/kotlin/io/getstream/feeds/android/client/internal/test/TestData.kt b/stream-feeds-android-client/src/test/kotlin/io/getstream/feeds/android/client/internal/test/TestData.kt
