Introduce ChatClientRepository to encapsulate internal repositories used by ChatClient. This new repository is now a required dependency for ChatClient.

Author: andremion

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

@@ -122,6 +122,8 @@ import io.getstream.chat.android.client.parser2.adapters.internal.StreamDateForm
 import io.getstream.chat.android.client.persistance.repository.RepositoryFacade
 import io.getstream.chat.android.client.persistance.repository.factory.RepositoryFactory
 import io.getstream.chat.android.client.persistance.repository.noop.NoOpRepositoryFactory
+import io.getstream.chat.android.client.persistence.db.ChatClientDatabase
+import io.getstream.chat.android.client.persistence.repository.ChatClientRepository
 import io.getstream.chat.android.client.plugin.DependencyResolver
 import io.getstream.chat.android.client.plugin.MessageDeliveredPluginFactory
 import io.getstream.chat.android.client.plugin.Plugin
@@ -276,6 +278,7 @@ internal constructor(
     @InternalStreamChatApi
     public val audioPlayer: AudioPlayer,
     private val now: () -> Date = ::Date,
+    private val repository: ChatClientRepository,
 ) {
     private val logger by taggedLogger(TAG)
     private val waitConnection = MutableSharedFlow<Result<ConnectionData>>()
@@ -1509,6 +1512,8 @@ internal constructor(
             userCredentialStorage.clear()
         }
 
+        repository.clear()
+
         _repositoryFacade = null
         attachmentsSender.cancelJobs()
         appSettingsManager.clear()
@@ -4751,12 +4756,14 @@ internal constructor(
                 isMarshmallowOrHigher = Build.VERSION.SDK_INT >= Build.VERSION_CODES.M,
             )
 
+            val database = ChatClientDatabase.build(appContext)
+
             return ChatClient(
-                config,
-                module.api(),
-                module.dtoMapping,
-                module.notifications(),
-                tokenManager,
+                config = config,
+                api = module.api(),
+                dtoMapping = module.dtoMapping,
+                notifications = module.notifications(),
+                tokenManager = tokenManager,
                 userCredentialStorage = userCredentialStorage ?: SharedPreferencesCredentialStorage(appContext),
                 userStateService = module.userStateService,
                 clientDebugger = clientDebugger ?: StubChatClientDebugger,
@@ -4774,6 +4781,7 @@ internal constructor(
                 mutableClientState = MutableClientState(module.networkStateProvider),
                 currentUserFetcher = module.currentUserFetcher,
                 audioPlayer = audioPlayer,
+                repository = ChatClientRepository.from(database),
             ).apply {
                 attachmentsSender = AttachmentsSender(
                     context = appContext,

stream-chat-android-client/src/main/java/io/getstream/chat/android/client/persistence/repository/ChatClientRepository.kt

@@ -16,8 +16,12 @@
 
 package io.getstream.chat.android.client.persistence.repository
 
+import io.getstream.chat.android.client.ChatClient
 import io.getstream.chat.android.client.persistence.db.ChatClientDatabase
 
+/**
+ * Repository that aggregates all internal repositories used by [ChatClient].
+ */
 internal class ChatClientRepository(
     private val messageReceiptRepository: MessageReceiptRepository,
 ) : MessageReceiptRepository by messageReceiptRepository {

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

@@ -26,12 +26,12 @@ import io.getstream.chat.android.client.events.ErrorEvent
 import io.getstream.chat.android.client.network.NetworkStateProvider
 import io.getstream.chat.android.client.parser2.adapters.internal.StreamDateFormatter
 import io.getstream.chat.android.client.persistance.repository.noop.NoOpRepositoryFactory
+import io.getstream.chat.android.client.persistence.repository.ChatClientRepository
 import io.getstream.chat.android.client.scope.ClientTestScope
 import io.getstream.chat.android.client.scope.UserTestScope
 import io.getstream.chat.android.client.setup.state.internal.MutableClientState
 import io.getstream.chat.android.client.socket.FakeChatSocket
 import io.getstream.chat.android.client.token.FakeTokenManager
-import io.getstream.chat.android.client.token.TokenManager
 import io.getstream.chat.android.client.user.CredentialConfig
 import io.getstream.chat.android.client.user.storage.UserCredentialStorage
 import io.getstream.chat.android.client.utils.TokenUtils
@@ -60,6 +60,7 @@ import org.amshove.kluent.shouldBeInstanceOf
 import org.junit.jupiter.api.BeforeEach
 import org.junit.jupiter.api.Test
 import org.junit.jupiter.api.extension.RegisterExtension
+import org.mockito.kotlin.any
 import org.mockito.kotlin.doReturn
 import org.mockito.kotlin.eq
 import org.mockito.kotlin.mock
@@ -91,7 +92,6 @@ internal class ChatClientConnectionTests {
     private val mutableClientState: MutableClientState = MutableClientState(mock())
     private val streamDateFormatter = StreamDateFormatter()
     private val config = mock<ChatClientConfig>()
-    private val tokenManager = mock<TokenManager>()
     private val userCredentialStorage = mock<UserCredentialStorage>()
 
     @BeforeEach
@@ -114,6 +114,9 @@ internal class ChatClientConnectionTests {
             tokenManager = tokenManager,
             networkStateProvider = networkStateProvider,
         )
+        val mockRepository = mock<ChatClientRepository> {
+            onBlocking { getAllMessageReceiptsByType(type = any(), limit = any()) } doReturn emptyList()
+        }
         client = ChatClient(
             config = config,
             api = chatApi,
@@ -133,6 +136,7 @@ internal class ChatClientConnectionTests {
             mutableClientState = mutableClientState,
             currentUserFetcher = mock(),
             audioPlayer = mock(),
+            repository = mockRepository,
         ).apply {
             attachmentsSender = mock()
         }

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

@@ -35,6 +35,7 @@ import io.getstream.chat.android.client.notifications.handler.NotificationConfig
 import io.getstream.chat.android.client.parser.EventArguments
 import io.getstream.chat.android.client.parser2.adapters.internal.StreamDateFormatter
 import io.getstream.chat.android.client.persistance.repository.noop.NoOpRepositoryFactory
+import io.getstream.chat.android.client.persistence.repository.ChatClientRepository
 import io.getstream.chat.android.client.plugin.factory.PluginFactory
 import io.getstream.chat.android.client.scope.ClientTestScope
 import io.getstream.chat.android.client.scope.UserTestScope
@@ -97,8 +98,8 @@ internal class ChatClientTest {
     val tokenUtils: TokenUtils = mock()
     var pluginFactories: List<PluginFactory> = emptyList()
     var errorHandlerFactories: List<ErrorHandlerFactory> = emptyList()
-    private val streamDateFormatter = StreamDateFormatter()
 
+    @Suppress("LongMethod")
     @BeforeEach
     fun setUp() {
         val apiKey = "api-key"
@@ -133,6 +134,9 @@ internal class ChatClientTest {
             wssUrl = wssUrl,
             networkStateProvider = networkStateProvider,
         )
+        val mockRepository = mock<ChatClientRepository> {
+            onBlocking { getAllMessageReceiptsByType(type = any(), limit = any()) } doReturn emptyList()
+        }
         client = ChatClient(
             config = config,
             api = api,
@@ -152,6 +156,7 @@ internal class ChatClientTest {
             repositoryFactoryProvider = NoOpRepositoryFactory.Provider,
             currentUserFetcher = mock(),
             audioPlayer = mock(),
+            repository = mockRepository,
         ).apply {
             attachmentsSender = mock()
             connectUser(user, token).enqueue()

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

@@ -16,6 +16,7 @@
 
 package io.getstream.chat.android.client
 
+import io.getstream.chat.android.client.DependencyResolverTest.Companion.initializationStatesArguments
 import io.getstream.chat.android.client.api2.mapping.DtoMapping
 import io.getstream.chat.android.client.plugin.Plugin
 import io.getstream.chat.android.client.plugin.factory.PluginFactory
@@ -178,6 +179,7 @@ public class DependencyResolverTest {
             mutableClientState = mutableClientState,
             currentUserFetcher = mock(),
             audioPlayer = mock(),
+            repository = mock(),
         ).apply {
             this.plugins = this@Fixture.plugins
         }

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

@@ -126,6 +126,7 @@ internal class MockClientBuilder(
             mutableClientState = mutableClientState,
             currentUserFetcher = mock(),
             audioPlayer = streamPlayer,
+            repository = mock(),
         )
 
         client.attachmentsSender = attachmentSender

stream-chat-android-client/src/test/java/io/getstream/chat/android/client/chatclient/BaseChatClientTest.kt

@@ -128,6 +128,7 @@ internal open class BaseChatClientTest {
             currentUserFetcher = currentUserFetcher,
             audioPlayer = mock(),
             now = { now },
+            repository = mock(),
         )
         chatClient.attachmentsSender = attachmentsSender
         chatClient.plugins = plugins

stream-chat-android-client/src/test/java/io/getstream/chat/android/client/debugger/ChatClientDebuggerTest.kt

@@ -29,6 +29,7 @@ import io.getstream.chat.android.client.events.ChatEvent
 import io.getstream.chat.android.client.network.NetworkStateProvider
 import io.getstream.chat.android.client.notifications.handler.NotificationConfig
 import io.getstream.chat.android.client.persistance.repository.noop.NoOpRepositoryFactory
+import io.getstream.chat.android.client.persistence.repository.ChatClientRepository
 import io.getstream.chat.android.client.plugin.factory.PluginFactory
 import io.getstream.chat.android.client.scope.ClientTestScope
 import io.getstream.chat.android.client.scope.UserTestScope
@@ -123,6 +124,9 @@ internal class ChatClientDebuggerTest {
                 isRetrying: Boolean,
             ): SendMessageDebugger = sendMessageDebugger
         }
+        val mockRepository = mock<ChatClientRepository> {
+            onBlocking { getAllMessageReceiptsByType(type = any(), limit = any()) } doReturn emptyList()
+        }
         client = ChatClient(
             config = config,
             api = api,
@@ -143,6 +147,7 @@ internal class ChatClientDebuggerTest {
             repositoryFactoryProvider = NoOpRepositoryFactory.Provider,
             currentUserFetcher = mock(),
             audioPlayer = mock(),
+            repository = mockRepository,
         ).apply {
             attachmentsSender = this@ChatClientDebuggerTest.attachmentsSender
             connectUser(user, token).enqueue()