Remove unused currentGroup.

Author: VelikovPetar

stream-chat-android-state/src/main/java/io/getstream/chat/android/state/event/handler/grouped/internal/ChannelGroupResolver.kt

@@ -22,7 +22,7 @@ import io.getstream.chat.android.models.Channel
  * Resolves the set of group keys a [Channel] belongs to for the purposes of grouped channel
  * lists driven by `queryGroupedChannels`.
  *
- * Used by [GroupAwareChatEventHandler] to decide whether an incoming event-bearing channel
+ * Used by [GroupAwareChatEventHandler] to decide whether an incoming channel-bearing event
  * should be added to, removed from, or skipped by a query identified by
  * [io.getstream.chat.android.client.internal.state.plugin.QueryChannelsIdentifier.Grouped].
  * Classification is performed against the channel's own `extraData`.
@@ -31,11 +31,8 @@ internal fun interface ChannelGroupResolver {
 
     /**
      * @param channel The channel whose group membership is being resolved.
-     * @param currentGroup The group key of the query asking. Most resolvers will not need this,
-     * but it allows a single resolver instance to be shared across multiple grouped queries and
-     * still differentiate behavior per asker (e.g. logging, short-circuiting, per-group rules).
      * @return The set of group keys this channel belongs to. A channel can belong to multiple
      * groups (e.g. an explicit group plus an `"all"` sentinel).
      */
-    fun resolve(channel: Channel, currentGroup: String): Set<String>
+    fun resolve(channel: Channel): Set<String>
 }

stream-chat-android-state/src/main/java/io/getstream/chat/android/state/event/handler/grouped/internal/DefaultChannelGroupResolver.kt

@@ -34,8 +34,7 @@ internal class DefaultChannelGroupResolver(
     private val allGroupKey: String? = DEFAULT_ALL_GROUP_KEY,
 ) : ChannelGroupResolver {
 
-    override fun resolve(channel: Channel, currentGroup: String): Set<String> = buildSet {
-        // currentGroup is intentionally unused — the channel's group membership is asker-independent.
+    override fun resolve(channel: Channel): Set<String> = buildSet {
         (channel.extraData[groupFieldName] as? String)?.let(::add)
         allGroupKey?.let(::add)
     }

stream-chat-android-state/src/main/java/io/getstream/chat/android/state/event/handler/grouped/internal/GroupAwareChatEventHandler.kt

@@ -117,7 +117,7 @@ internal class GroupAwareChatEventHandler(
     }
 
     private fun channelBelongsHere(channel: Channel): Boolean =
-        resolver.resolve(channel, groupKey).contains(groupKey)
+        resolver.resolve(channel).contains(groupKey)
 
     /**
      * Returns `true` if the current user is known to be a member of [cachedChannel].

stream-chat-android-state/src/test/java/io/getstream/chat/android/state/event/handler/grouped/internal/DefaultChannelGroupResolverTest.kt

@@ -17,7 +17,6 @@
 package io.getstream.chat.android.state.event.handler.grouped.internal
 
 import io.getstream.chat.android.randomChannel
-import io.getstream.chat.android.randomString
 import org.junit.jupiter.api.Assertions.assertEquals
 import org.junit.jupiter.api.Test
 
@@ -28,7 +27,7 @@ internal class DefaultChannelGroupResolverTest {
         val channel = randomChannel(extraData = mapOf("group" to "vip"))
         val resolver = DefaultChannelGroupResolver()
 
-        val result = resolver.resolve(channel, currentGroup = randomString())
+        val result = resolver.resolve(channel)
 
         assertEquals(setOf("vip", "all"), result)
     }
@@ -38,7 +37,7 @@ internal class DefaultChannelGroupResolverTest {
         val channel = randomChannel(extraData = emptyMap())
         val resolver = DefaultChannelGroupResolver()
 
-        val result = resolver.resolve(channel, currentGroup = randomString())
+        val result = resolver.resolve(channel)
 
         assertEquals(setOf("all"), result)
     }
@@ -48,7 +47,7 @@ internal class DefaultChannelGroupResolverTest {
         val channel = randomChannel(extraData = mapOf("tier" to "gold", "group" to "ignored"))
         val resolver = DefaultChannelGroupResolver(groupFieldName = "tier")
 
-        val result = resolver.resolve(channel, currentGroup = randomString())
+        val result = resolver.resolve(channel)
 
         assertEquals(setOf("gold", "all"), result)
     }
@@ -58,7 +57,7 @@ internal class DefaultChannelGroupResolverTest {
         val channel = randomChannel(extraData = mapOf("group" to "vip"))
         val resolver = DefaultChannelGroupResolver(allGroupKey = null)
 
-        val result = resolver.resolve(channel, currentGroup = randomString())
+        val result = resolver.resolve(channel)
 
         assertEquals(setOf("vip"), result)
     }
@@ -68,7 +67,7 @@ internal class DefaultChannelGroupResolverTest {
         val channel = randomChannel(extraData = mapOf("group" to 42))
         val resolver = DefaultChannelGroupResolver()
 
-        val result = resolver.resolve(channel, currentGroup = randomString())
+        val result = resolver.resolve(channel)
 
         assertEquals(setOf("all"), result)
     }

stream-chat-android-state/src/test/java/io/getstream/chat/android/state/event/handler/grouped/internal/GroupAwareChatEventHandlerTest.kt

@@ -273,7 +273,7 @@ internal class GroupAwareChatEventHandlerTest {
         val currentUser = randomUser()
         val channel = randomChannel(extraData = mapOf("tier" to "vip"))
         val cachedChannel = channel.copy(membership = randomMember(user = currentUser))
-        val customResolver = ChannelGroupResolver { ch, _ ->
+        val customResolver = ChannelGroupResolver { ch ->
             setOfNotNull(ch.extraData["tier"] as? String)
         }
         val handler = handlerFor(
@@ -289,26 +289,6 @@ internal class GroupAwareChatEventHandlerTest {
         assertEquals(EventHandlingResult.Add(channel), result)
     }
 
-    @Test
-    fun `Given custom resolver Should receive the handler's groupKey as currentGroup`() {
-        val channel = randomChannel(extraData = mapOf("group" to "vip"))
-        var capturedGroup: String? = null
-        val capturingResolver = ChannelGroupResolver { _, currentGroup ->
-            capturedGroup = currentGroup
-            setOf("vip")
-        }
-        val handler = handlerFor(
-            groupKey = "vip",
-            cachedChannels = emptyMap(),
-            resolver = capturingResolver,
-        )
-        val event = randomChannelUpdatedEvent(cid = channel.cid, channel = channel)
-
-        handler.handleChatEvent(event, Filters.neutral(), cachedChannel = null)
-
-        assertEquals("vip", capturedGroup)
-    }
-
     private fun handlerFor(
         groupKey: String,
         cachedChannels: Map<String, Channel>,