Mark channel as delivered on query a single channel

Author: andremion

stream-chat-android-client/src/main/java/io/getstream/chat/android/client/plugin/MessageDeliveredPlugin.kt

@@ -17,6 +17,7 @@
 package io.getstream.chat.android.client.plugin
 
 import io.getstream.chat.android.client.ChatClient
+import io.getstream.chat.android.client.api.models.QueryChannelRequest
 import io.getstream.chat.android.client.api.models.QueryChannelsRequest
 import io.getstream.chat.android.client.plugin.factory.PluginFactory
 import io.getstream.chat.android.client.receipts.MessageReceiptManager
@@ -31,11 +32,25 @@ internal class MessageDeliveredPlugin(
     chatClient: ChatClient = ChatClient.instance(),
     private val messageReceiptManager: MessageReceiptManager = chatClient.messageReceiptManager,
 ) : Plugin {
+
     override suspend fun onQueryChannelsResult(result: Result<List<Channel>>, request: QueryChannelsRequest) {
         result.onSuccess { channels ->
             messageReceiptManager.markChannelsAsDelivered(channels)
         }
     }
+
+    override suspend fun onQueryChannelResult(
+        result: Result<Channel>,
+        channelType: String,
+        channelId: String,
+        request: QueryChannelRequest,
+    ) {
+        result.onSuccess { channel ->
+            if (request.pagination() == null) { // only mark as delivered on initial load
+                messageReceiptManager.markChannelsAsDelivered(channels = listOf(channel))
+            }
+        }
+    }
 }
 
 internal object MessageDeliveredPluginFactory : PluginFactory {

stream-chat-android-client/src/test/java/io/getstream/chat/android/client/plugin/MessageDeliveredPluginTest.kt

@@ -23,6 +23,7 @@ import io.getstream.result.Result
 import kotlinx.coroutines.test.runTest
 import org.junit.Test
 import org.mockito.kotlin.any
+import org.mockito.kotlin.doReturn
 import org.mockito.kotlin.mock
 import org.mockito.kotlin.never
 import org.mockito.kotlin.times
@@ -52,6 +53,55 @@ internal class MessageDeliveredPluginTest {
         fixture.verifyMarkChannelsAsDeliveredCalled(never())
     }
 
+    @Test
+    fun `on query channel with successful result and null pagination, should mark channel as delivered`() = runTest {
+        val channel = randomChannel()
+        val fixture = Fixture()
+        val sut = fixture.get()
+
+        sut.onQueryChannelResult(
+            result = Result.Success(channel),
+            channelType = channel.type,
+            channelId = channel.id,
+            request = mock { on { pagination() } doReturn null },
+        )
+
+        fixture.verifyMarkChannelsAsDeliveredCalled(channels = listOf(channel))
+    }
+
+    @Test
+    fun `on query channel with successful result and non-null pagination, should not mark channel as delivered`() =
+        runTest {
+            val channel = randomChannel()
+            val fixture = Fixture()
+            val sut = fixture.get()
+
+            sut.onQueryChannelResult(
+                result = Result.Success(channel),
+                channelType = channel.type,
+                channelId = channel.id,
+                request = mock { on { pagination() } doReturn mock() },
+            )
+
+            fixture.verifyMarkChannelsAsDeliveredCalled(never())
+        }
+
+    @Test
+    fun `on query channel with failure result, should not mark channel as delivered`() = runTest {
+        val channel = randomChannel()
+        val fixture = Fixture()
+        val sut = fixture.get()
+
+        sut.onQueryChannelResult(
+            result = Result.Failure(mock()),
+            channelType = channel.type,
+            channelId = channel.id,
+            request = mock(),
+        )
+
+        fixture.verifyMarkChannelsAsDeliveredCalled(never())
+    }
+
     private class Fixture {
         private val mockMessageReceiptManager = mock<MessageReceiptManager>()