Add handling of missing activity events (#120)

* Handle ActivityDeleted in ActivityEventHandler

* Handle activity upserted for ActivityList

* Merge activity added & updated handling and add it where missing

* Add missing doc for param

Author: gpunto

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

@@ -47,7 +47,7 @@ internal class ActivityListImpl(
 
     private val _state: ActivityListStateImpl = ActivityListStateImpl(query, currentUserId)
 
-    private val eventHandler = ActivityListEventHandler(state = _state)
+    private val eventHandler = ActivityListEventHandler(query.filter, state = _state)
 
     init {
         subscriptionManager.subscribe(eventHandler)

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

@@ -89,7 +89,7 @@ internal class ActivityListStateImpl(
         _activities.update { current -> current.filter { it.id != activityId } }
     }
 
-    override fun onActivityUpdated(activity: ActivityData) {
+    override fun onActivityUpserted(activity: ActivityData) {
         _activities.update { current ->
             current.upsertSorted(activity, ActivityData::id, activitiesSorting)
         }
@@ -198,11 +198,11 @@ internal interface ActivityListStateUpdates {
     fun onActivityRemoved(activityId: String)
 
     /**
-     * Called when an activity is updated in the list.
+     * Called when an activity is added to or updated in the list.
      *
-     * @param activity The updated activity data.
+     * @param activity The activity data.
      */
-    fun onActivityUpdated(activity: ActivityData)
+    fun onActivityUpserted(activity: ActivityData)
 
     /**
      * Called when a bookmark was removed.

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

@@ -62,6 +62,11 @@ internal class ActivityStateImpl(
     override val poll: StateFlow<PollData?>
         get() = _poll.asStateFlow()
 
+    override fun onActivityRemoved() {
+        _activity.update { null }
+        _poll.update { null }
+    }
+
     override fun onActivityUpdated(activity: ActivityData) {
         _activity.update { current -> current?.update(activity) ?: activity }
         _poll.update { current ->
@@ -130,6 +135,8 @@ internal interface ActivityMutableState : ActivityState, ActivityStateUpdates
  * updated, closed, deleted, or when votes are casted, changed, or removed.
  */
 internal interface ActivityStateUpdates {
+    /** Called when the activity is removed. */
+    fun onActivityRemoved()
 
     /**
      * Called when the activity is updated.

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

@@ -157,16 +157,18 @@ internal class FeedStateImpl(
         }
     }
 
-    override fun onActivityAdded(activity: ActivityData) {
-        _activities.update { current ->
-            current.upsertSorted(activity, ActivityData::id, activitiesSorting)
+    override fun onActivityUpserted(activity: ActivityData) {
+        if (_activities.value.any { it.id == activity.id }) {
+            updateActivitiesWhere({ it.id == activity.id }) { existingActivity ->
+                existingActivity.update(activity)
+            }
+        } else {
+            _activities.update { current ->
+                current.upsertSorted(activity, ActivityData::id, activitiesSorting)
+            }
         }
     }
 
-    override fun onActivityUpdated(activity: ActivityData) {
-        updateActivitiesWhere({ it.id == activity.id }) { it.update(activity) }
-    }
-
     override fun onActivityRemoved(activityId: String) {
         _activities.update { current -> current.filter { it.id != activityId } }
         // Also remove the activity from pinned activities if it exists
@@ -368,11 +370,8 @@ internal interface FeedStateUpdates {
         queryConfig: ActivitiesQueryConfig,
     )
 
-    /** Handles updates to the feed state when activity is added. */
-    fun onActivityAdded(activity: ActivityData)
-
-    /** Handles updates to the feed state when activity is updated. */
-    fun onActivityUpdated(activity: ActivityData)
+    /** Handles updates to the feed state when activity is added or updated. */
+    fun onActivityUpserted(activity: ActivityData)
 
     /** Handles updates to the feed state when an activity is removed. */
     fun onActivityRemoved(activityId: String)

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

@@ -41,6 +41,16 @@ internal class ActivityEventHandler(
      */
     override fun onEvent(event: StateUpdateEvent) {
         when (event) {
+            is StateUpdateEvent.ActivityDeleted -> {
+                if (event.fid != fid.rawValue || event.activityId != activityId) return
+                state.onActivityRemoved()
+            }
+
+            is StateUpdateEvent.ActivityUpdated -> {
+                if (event.fid != fid.rawValue || event.activity.id != activityId) return
+                state.onActivityUpdated(event.activity)
+            }
+
             is StateUpdateEvent.ActivityReactionAdded -> {
                 if (event.fid != fid.rawValue || event.reaction.activityId != activityId) return
                 state.onReactionUpserted(event.reaction, event.activity)
@@ -56,11 +66,6 @@ internal class ActivityEventHandler(
                 state.onReactionUpserted(event.reaction, event.activity)
             }
 
-            is StateUpdateEvent.ActivityUpdated -> {
-                if (event.fid != fid.rawValue || event.activity.id != activityId) return
-                state.onActivityUpdated(event.activity)
-            }
-
             is StateUpdateEvent.BookmarkAdded -> {
                 val eventActivity = event.bookmark.activity
                 if (fid.rawValue !in eventActivity.feeds || eventActivity.id != activityId) return

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

@@ -15,16 +15,32 @@
  */
 package io.getstream.feeds.android.client.internal.state.event.handler
 
+import io.getstream.feeds.android.client.api.state.query.ActivitiesFilter
 import io.getstream.feeds.android.client.internal.state.ActivityListStateUpdates
 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 ActivityListEventHandler(private val state: ActivityListStateUpdates) :
-    StateUpdateEventListener {
+internal class ActivityListEventHandler(
+    private val filter: ActivitiesFilter?,
+    private val state: ActivityListStateUpdates,
+) : StateUpdateEventListener {
 
     override fun onEvent(event: StateUpdateEvent) {
         when (event) {
+            is StateUpdateEvent.ActivityAdded -> {
+                if (event.activity matches filter) {
+                    state.onActivityUpserted(event.activity)
+                }
+            }
+
             is StateUpdateEvent.ActivityDeleted -> state.onActivityRemoved(event.activityId)
+            is StateUpdateEvent.ActivityUpdated -> {
+                if (event.activity matches filter) {
+                    state.onActivityUpserted(event.activity)
+                }
+            }
+
             is StateUpdateEvent.ActivityReactionAdded ->
                 state.onReactionUpserted(event.reaction, event.activity)
 
@@ -47,6 +63,7 @@ internal class ActivityListEventHandler(private val state: ActivityListStateUpda
 
             is StateUpdateEvent.CommentReactionUpdated ->
                 state.onCommentReactionUpserted(event.comment, event.reaction)
+
             else -> {
                 // No action needed for other event types
             }

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

@@ -29,6 +29,7 @@ import io.getstream.feeds.android.client.internal.subscribe.StateUpdateEventList
  * other feed-related actions.
  *
  * @param fid The unique identifier for the feed this handler is associated with.
+ * @param activityFilter An optional filter to determine which activities should be processed.
  * @property state The instance that manages updates to the feed state.
  */
 internal class FeedEventHandler(
@@ -46,7 +47,7 @@ internal class FeedEventHandler(
         when (event) {
             is StateUpdateEvent.ActivityAdded -> {
                 if (event.fid == fid.rawValue && event.activity matches activityFilter) {
-                    state.onActivityAdded(event.activity)
+                    state.onActivityUpserted(event.activity)
                 }
             }
 
@@ -58,7 +59,7 @@ internal class FeedEventHandler(
 
             is StateUpdateEvent.ActivityUpdated -> {
                 if (event.fid == fid.rawValue && event.activity matches activityFilter) {
-                    state.onActivityUpdated(event.activity)
+                    state.onActivityUpserted(event.activity)
                 }
             }
 

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

@@ -54,17 +54,31 @@ internal class ActivityListStateImplTest {
     }
 
     @Test
-    fun `on onActivityUpdated, then update specific activity`() = runTest {
+    fun `on onActivityUpserted, then update specific activity`() = runTest {
         val activity1 = activityData("activity-1")
         val activity2 = activityData("activity-2")
         setupInitialActivities(activity1, activity2)
 
         val updatedActivity = activityData("activity-1", text = "Updated activity")
-        activityListState.onActivityUpdated(updatedActivity)
+        activityListState.onActivityUpserted(updatedActivity)
 
         assertEquals(listOf(updatedActivity, activity2), activityListState.activities.value)
     }
 
+    @Test
+    fun `on onActivityUpserted with new activity, then insert it in sorted position`() = runTest {
+        val activity1 = activityData("activity-1", createdAt = 1000)
+        val activity2 = activityData("activity-2", createdAt = 2000)
+        setupInitialActivities(activity2, activity1)
+
+        val newActivity = activityData("activity-new", createdAt = 1500)
+        activityListState.onActivityUpserted(newActivity)
+
+        // Default sort is by createdAt descending
+        val expectedActivities = listOf(activity2, newActivity, activity1)
+        assertEquals(expectedActivities, activityListState.activities.value)
+    }
+
     @Test
     fun `on onActivityRemoved, then remove specific activity`() = runTest {
         val activity1 = activityData("activity-1")

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

@@ -102,6 +102,16 @@ internal class ActivityStateImplTest {
         assertNull(activityState.poll.value)
     }
 
+    @Test
+    fun `on onActivityRemoved, then clear activity and poll state`() = runTest {
+        setupInitialPoll(pollData())
+
+        activityState.onActivityRemoved()
+
+        assertNull(activityState.activity.value)
+        assertNull(activityState.poll.value)
+    }
+
     @Test
     fun `on onActivityUpdated with new poll, then set new poll`() = runTest {
         val initialActivity = activityData("activity-1", text = "Original", poll = null)

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

@@ -106,79 +106,33 @@ internal class FeedStateImplTest {
     }
 
     @Test
-    fun `on onActivityAdded, then add activity`() = runTest {
+    fun `on onActivityUpserted, then add activity`() = runTest {
         val initialActivity = activityData()
         setupInitialState(listOf(initialActivity))
 
         val newActivity = activityData("activity-2")
-        feedState.onActivityAdded(newActivity)
+        feedState.onActivityUpserted(newActivity)
 
         val activities = feedState.activities.value
         assertEquals(listOf(initialActivity, newActivity), activities)
     }
 
     @Test
-    fun `on onActivityUpdated, then update activity`() = runTest {
+    fun `on onActivityUpserted, then update activity`() = runTest {
         val initialActivity = activityData("activity-1")
         val activityPin = activityPin(initialActivity)
         setupInitialState(listOf(initialActivity), listOf(activityPin))
 
         val updatedActivity = activityData("activity-1", text = "Updated activity")
-        feedState.onActivityUpdated(updatedActivity)
+        feedState.onActivityUpserted(updatedActivity)
 
         assertEquals(listOf(updatedActivity), feedState.activities.value)
         val expectedPinnedActivity = activityPin.copy(activity = updatedActivity)
         assertEquals(listOf(expectedPinnedActivity), feedState.pinnedActivities.value)
     }
 
     @Test
-    fun `on onActivityUpdated, then preserve ownBookmarks when updating activity`() = runTest {
-        val initialBookmark = bookmarkData("activity-1", currentUserId)
-        val initialActivity =
-            activityData("activity-1", text = "Original", ownBookmarks = listOf(initialBookmark))
-        setupInitialState(listOf(initialActivity))
-
-        val updatedActivity =
-            activityData("activity-1", text = "Updated", ownBookmarks = emptyList())
-        feedState.onActivityUpdated(updatedActivity)
-
-        val expectedActivity = updatedActivity.copy(ownBookmarks = listOf(initialBookmark))
-        assertEquals(listOf(expectedActivity), feedState.activities.value)
-    }
-
-    @Test
-    fun `on onActivityUpdated, then preserve ownReactions when updating activity`() = runTest {
-        val initialReaction = feedsReactionData("activity-1", "like", currentUserId)
-        val initialActivity =
-            activityData("activity-1", text = "Original", ownReactions = listOf(initialReaction))
-        setupInitialState(listOf(initialActivity))
-
-        val updatedActivity =
-            activityData("activity-1", text = "Updated", ownReactions = emptyList())
-        feedState.onActivityUpdated(updatedActivity)
-
-        val expectedActivity = updatedActivity.copy(ownReactions = listOf(initialReaction))
-        assertEquals(listOf(expectedActivity), feedState.activities.value)
-    }
-
-    @Test
-    fun `on onActivityUpdated, then preserve poll ownVotes when updating activity`() = runTest {
-        val ownVote = pollVoteData("vote-1", "poll-1", "option-1", currentUserId)
-        val initialPoll = pollData("poll-1", "Test Poll", ownVotes = listOf(ownVote))
-        val initialActivity = activityData("activity-1", text = "Original", poll = initialPoll)
-        setupInitialState(listOf(initialActivity))
-
-        val updatedPoll = pollData("poll-1", "Updated Poll", ownVotes = emptyList())
-        val updatedActivity = activityData("activity-1", text = "Updated", poll = updatedPoll)
-        feedState.onActivityUpdated(updatedActivity)
-
-        val expectedPoll = updatedPoll.copy(ownVotes = listOf(ownVote))
-        val expectedActivity = updatedActivity.copy(poll = expectedPoll)
-        assertEquals(listOf(expectedActivity), feedState.activities.value)
-    }
-
-    @Test
-    fun `on onActivityUpdated, then preserve all own properties together in feed`() = runTest {
+    fun `on onActivityUpserted, then preserve own properties in activity`() = runTest {
         val initialBookmark = bookmarkData("activity-1", currentUserId)
         val initialReaction = feedsReactionData("activity-1", "like", currentUserId)
         val ownVote = pollVoteData("vote-1", "poll-1", "option-1", currentUserId)
@@ -203,7 +157,7 @@ internal class FeedStateImplTest {
                 ownBookmarks = emptyList(),
                 ownReactions = emptyList(),
             )
-        feedState.onActivityUpdated(updatedActivity)
+        feedState.onActivityUpserted(updatedActivity)
 
         // Verify all "own" properties are preserved
         val expectedPoll = updatedPoll.copy(ownVotes = listOf(ownVote))
@@ -217,13 +171,13 @@ internal class FeedStateImplTest {
     }
 
     @Test
-    fun `on onActivityUpdated with new poll in feed, then set new poll`() = runTest {
+    fun `on onActivityUpserted with new poll in feed, then set new poll`() = runTest {
         val initialActivity = activityData("activity-1", text = "Original", poll = null)
         setupInitialState(listOf(initialActivity))
 
         val newPoll = pollData("poll-1", "New Poll")
         val updatedActivity = activityData("activity-1", text = "Updated", poll = newPoll)
-        feedState.onActivityUpdated(updatedActivity)
+        feedState.onActivityUpserted(updatedActivity)
 
         assertEquals(listOf(updatedActivity), feedState.activities.value)
     }