chore: drafting solution

logic/build.gradle.kts

@@ -93,7 +93,7 @@ kotlin {
         val jvmMain by getting {
             addCommonKotlinJvmSourceDir()
             dependencies {
-//                 implementation(project(":persistence-pg"))
+                implementation(project(":persistence-pg"))
                 implementation(libs.jna)
                 implementation(libs.coreCryptoJvm)
             }

logic/src/androidMain/kotlin/com/wire/kalium/logic/CoreLogic.kt

@@ -33,7 +33,7 @@ import com.wire.kalium.logic.util.SecurityHelperImpl
 import com.wire.kalium.network.NetworkStateObserver
 import com.wire.kalium.persistence.db.GlobalDatabaseBuilder
 import com.wire.kalium.persistence.db.PlatformDatabaseData
-import com.wire.kalium.persistence.db.globalDatabaseProvider
+import com.wire.kalium.persistence.db.sqliteGlobalDatabaseProvider
 import com.wire.kalium.persistence.kmmSettings.GlobalPrefProvider
 import com.wire.kalium.util.KaliumDispatcherImpl
 import kotlinx.coroutines.cancel
@@ -54,7 +54,7 @@ actual class CoreLogic(
         kaliumConfigs.shouldEncryptData
     )
 
-    override val globalDatabaseBuilder: GlobalDatabaseBuilder = globalDatabaseProvider(
+    override val globalDatabaseBuilder: GlobalDatabaseBuilder = sqliteGlobalDatabaseProvider(
         platformDatabaseData = PlatformDatabaseData(appContext),
         queriesContext = KaliumDispatcherImpl.io,
         passphrase = if (kaliumConfigs.shouldEncryptData) {

logic/src/appleMain/kotlin/com/wire/kalium/logic/CoreLogic.kt

@@ -31,7 +31,7 @@ import com.wire.kalium.network.NetworkStateObserver
 import com.wire.kalium.persistence.db.GlobalDatabaseBuilder
 import com.wire.kalium.persistence.db.PlatformDatabaseData
 import com.wire.kalium.persistence.db.StorageData
-import com.wire.kalium.persistence.db.globalDatabaseProvider
+import com.wire.kalium.persistence.db.sqliteGlobalDatabaseProvider
 import com.wire.kalium.persistence.kmmSettings.GlobalPrefProvider
 import com.wire.kalium.util.KaliumDispatcherImpl
 import kotlinx.coroutines.cancel
@@ -50,7 +50,7 @@ actual class CoreLogic(
             shouldEncryptData = kaliumConfigs.shouldEncryptData
         )
 
-    override val globalDatabaseBuilder: GlobalDatabaseBuilder = globalDatabaseProvider(
+    override val globalDatabaseBuilder: GlobalDatabaseBuilder = sqliteGlobalDatabaseProvider(
         platformDatabaseData = PlatformDatabaseData(
             storageData = if (useInMemoryStorage) {
                 StorageData.InMemory

logic/src/jvmMain/kotlin/com/wire/kalium/logic/CoreLogic.kt

@@ -30,13 +30,10 @@ import com.wire.kalium.logic.sync.GlobalWorkSchedulerImpl
 import com.wire.kalium.logic.util.PlatformContext
 import com.wire.kalium.network.NetworkStateObserver
 import com.wire.kalium.persistence.db.GlobalDatabaseBuilder
-import com.wire.kalium.persistence.db.PlatformDatabaseData
-import com.wire.kalium.persistence.db.StorageData
-import com.wire.kalium.persistence.db.globalDatabaseProvider
+import com.wire.kalium.persistence.db.pgGlobalDatabaseProvider
+import com.wire.kalium.persistence.db.sqliteGlobalDatabaseProvider
 import com.wire.kalium.persistence.kmmSettings.GlobalPrefProvider
-import com.wire.kalium.util.KaliumDispatcherImpl
 import kotlinx.coroutines.cancel
-import java.io.File
 
 /**
  * @sample samples.logic.CoreLogicSamples.versionedAuthScope
@@ -45,7 +42,7 @@ actual class CoreLogic(
     rootPath: String,
     kaliumConfigs: KaliumConfigs,
     userAgent: String,
-    useInMemoryStorage: Boolean = false,
+    usePg: Boolean = false,
 ) : CoreLogicCommon(
     rootPath = rootPath, kaliumConfigs = kaliumConfigs, userAgent = userAgent
 ) {
@@ -56,17 +53,11 @@ actual class CoreLogic(
             shouldEncryptData = kaliumConfigs.shouldEncryptData
         )
 
-    override val globalDatabaseBuilder: GlobalDatabaseBuilder = globalDatabaseProvider(
-        platformDatabaseData = PlatformDatabaseData(
-            storageData = if (useInMemoryStorage) {
-                StorageData.InMemory
-            } else {
-                StorageData.FileBacked(File("$rootPath/global-storage"))
-            }
-        ),
-        passphrase = null,
-        queriesContext = KaliumDispatcherImpl.io
-    )
+    override val globalDatabaseBuilder: GlobalDatabaseBuilder = if (usePg) {
+        pgGlobalDatabaseProvider(sad)
+    } else {
+        sqliteGlobalDatabaseProvider()
+    }
 
     override fun getSessionScope(userId: UserId): UserSessionScope =
         userSessionScopeProvider.value.getOrCreate(userId)
@@ -92,7 +83,7 @@ actual class CoreLogic(
             networkStateObserver,
             logoutCallbackManager,
             userAgent,
-            useInMemoryStorage
+            usePg
         )
     }
 }

monkeys/src/main/kotlin/com/wire/kalium/monkeys/homeDirectory.kt

@@ -34,7 +34,7 @@ fun coreLogic(
             encryptProteusStorage = true,
             isMLSSupportEnabled = true,
             wipeOnDeviceRemoval = true,
-        ), userAgent = "Wire Infinite Monkeys", useInMemoryStorage = true
+        ), userAgent = "Wire Infinite Monkeys", usePg = true
     )
     coreLogic.updateApiVersionsScheduler.scheduleImmediateApiVersionUpdate()
     return coreLogic

persistence-api/src/commonMain/kotlin/com/wire/kalium/persistence/db/WireUserDb.kt

@@ -0,0 +1,29 @@
+/*
+ * Wire
+ * Copyright (C) 2024 Wire Swiss GmbH
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see http://www.gnu.org/licenses/.
+ */
+package com.wire.kalium.persistence.db
+
+import com.wire.kalium.persistence.daokaliumdb.AccountsDAO
+import com.wire.kalium.persistence.daokaliumdb.ServerConfigurationDAO
+
+interface WireUserDb {
+    val accountsDAO: AccountsDAO
+    val serverConfigurationDAO: ServerConfigurationDAO
+
+
+    // db driver
+}

persistence-pg/src/commonMain/kotlin/com/wire/kalium/persistence/db/GlobalDatabaseBuilder.kt

@@ -44,7 +44,7 @@ class GlobalDatabaseBuilder internal constructor(
     private val sqlDriver: SqlDriver,
     private val platformDatabaseData: PlatformDatabaseData,
     private val queriesContext: CoroutineContext = KaliumDispatcherImpl.io
-) {
+):WireUserDb {
 
     internal val database: GlobalDatabase = GlobalDatabase(
         sqlDriver,
@@ -70,10 +70,10 @@ class GlobalDatabaseBuilder internal constructor(
         database.globalDatabasePropertiesQueries.enableForeignKeyContraints()
     }
 
-    val serverConfigurationDAO: ServerConfigurationDAO
+    override val serverConfigurationDAO: ServerConfigurationDAO
         get() = ServerConfigurationDAOImpl(database.serverConfigurationQueries, queriesContext)
 
-    val accountsDAO: AccountsDAO
+    override val accountsDAO: AccountsDAO
         get() = AccountsDAOImpl(database.accountsQueries, database.currentAccountQueries, queriesContext)
 
     fun nuke(): Boolean {
@@ -94,7 +94,7 @@ expect fun nuke(platformDatabaseData: PlatformDatabaseData): Boolean
  *
  * @return a new instance of the [GlobalDatabaseBuilder].
  */
-expect fun globalDatabaseProvider(
+expect fun pgGlobalDatabaseProvider(
     platformDatabaseData: PlatformDatabaseData,
     queriesContext: CoroutineDispatcher = KaliumDispatcherImpl.io,
     passphrase: GlobalDatabaseSecret?,

persistence-pg/src/jvmMain/kotlin/com/wire/kalium/persistence/db/DatabaseCoordinates.kt

@@ -0,0 +1,20 @@
+/*
+ * Wire
+ * Copyright (C) 2024 Wire Swiss GmbH
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see http://www.gnu.org/licenses/.
+ */
+package com.wire.kalium.persistence.db
+
+data class DatabaseCoordinates(val port: String, val user: String)

persistence-pg/src/jvmMain/kotlin/com/wire/kalium/persistence/db/GlobalDatabase.kt

@@ -23,11 +23,10 @@ import com.wire.kalium.persistence.GlobalDatabase
 import com.wire.kalium.persistence.util.FileNameUtil
 import kotlinx.coroutines.CoroutineDispatcher
 
-actual fun globalDatabaseProvider(
+actual fun pgGlobalDatabaseProvider(
     platformDatabaseData: PlatformDatabaseData,
     queriesContext: CoroutineDispatcher,
     passphrase: GlobalDatabaseSecret?,
-    enableWAL: Boolean,
 ): GlobalDatabaseBuilder {
     val storageData = platformDatabaseData.storageData
     if (storageData is StorageData.InMemory) {

persistence-pg/src/jvmMain/kotlin/com/wire/kalium/persistence/db/PlatformDatabaseData.kt

@@ -20,16 +20,12 @@ package com.wire.kalium.persistence.db
 import app.cash.sqldelight.db.SqlDriver
 import app.cash.sqldelight.driver.jdbc.sqlite.JdbcSqliteDriver
 import org.sqlite.SQLiteConfig
-import java.io.File
 
 actual data class PlatformDatabaseData(
     val storageData: StorageData
 )
 
-sealed interface StorageData {
-    data class FileBacked(val file: File) : StorageData
-    data object InMemory : StorageData
-}
+data class StorageData(val uri: String, val username: String, val password: String)
 
 fun databaseDriver(uri: String, config: DriverConfigurationBuilder.() -> Unit = {}): SqlDriver {
     val driverConfiguration = DriverConfigurationBuilder().apply(config)

persistence-pg/src/jvmTest/kotlin/com/wire/kalium/persistence/GlobalDBBaseTest.kt

@@ -21,7 +21,7 @@ package com.wire.kalium.persistence
 import com.wire.kalium.persistence.db.GlobalDatabaseBuilder
 import com.wire.kalium.persistence.db.PlatformDatabaseData
 import com.wire.kalium.persistence.db.StorageData
-import com.wire.kalium.persistence.db.globalDatabaseProvider
+import com.wire.kalium.persistence.db.pgGlobalDatabaseProvider
 import kotlinx.coroutines.ExperimentalCoroutinesApi
 import kotlinx.coroutines.test.TestDispatcher
 import kotlinx.coroutines.test.UnconfinedTestDispatcher
@@ -37,7 +37,7 @@ actual abstract class GlobalDBBaseTest {
     }
 
     actual fun createDatabase(): GlobalDatabaseBuilder {
-        return globalDatabaseProvider(
+        return pgGlobalDatabaseProvider(
             platformDatabaseData = PlatformDatabaseData(
                 StorageData.FileBacked(databaseFile)
             ),

persistence-test/src/androidMain/kotlin/com/wire/kalium/persistence/TestDatabaseManipulation.kt

@@ -25,7 +25,7 @@ import com.wire.kalium.persistence.db.GlobalDatabaseBuilder
 import com.wire.kalium.persistence.db.GlobalDatabaseSecret
 import com.wire.kalium.persistence.db.PlatformDatabaseData
 import com.wire.kalium.persistence.db.UserDatabaseBuilder
-import com.wire.kalium.persistence.db.globalDatabaseProvider
+import com.wire.kalium.persistence.db.sqliteGlobalDatabaseProvider
 import com.wire.kalium.persistence.db.inMemoryDatabase
 import com.wire.kalium.persistence.util.FileNameUtil
 import kotlinx.coroutines.test.StandardTestDispatcher
@@ -45,7 +45,7 @@ internal actual fun deleteTestDatabase(userId: UserIDEntity) {
 }
 
 internal actual fun createTestGlobalDatabase(): GlobalDatabaseBuilder {
-    return globalDatabaseProvider(
+    return sqliteGlobalDatabaseProvider(
         platformDatabaseData = PlatformDatabaseData(ApplicationProvider.getApplicationContext()),
         passphrase = GlobalDatabaseSecret("test_db_secret".toByteArray()),
         enableWAL = true,

persistence-test/src/appleMain/kotlin/com/wire/kalium/persistence/TestDatabaseManipulation.kt

@@ -24,7 +24,7 @@ import com.wire.kalium.persistence.db.GlobalDatabaseBuilder
 import com.wire.kalium.persistence.db.PlatformDatabaseData
 import com.wire.kalium.persistence.db.StorageData
 import com.wire.kalium.persistence.db.UserDatabaseBuilder
-import com.wire.kalium.persistence.db.globalDatabaseProvider
+import com.wire.kalium.persistence.db.sqliteGlobalDatabaseProvider
 import com.wire.kalium.persistence.db.inMemoryDatabase
 import com.wire.kalium.persistence.util.FileNameUtil
 import kotlinx.coroutines.test.StandardTestDispatcher
@@ -42,7 +42,7 @@ internal actual fun deleteTestDatabase(userId: UserIDEntity) {
 }
 
 internal actual fun createTestGlobalDatabase(): GlobalDatabaseBuilder {
-    return globalDatabaseProvider(
+    return sqliteGlobalDatabaseProvider(
         platformDatabaseData = PlatformDatabaseData(StorageData.FileBacked(getTempDatabaseDirectory())),
         passphrase = null,
         queriesContext = StandardTestDispatcher()

persistence-test/src/jvmMain/kotlin/com/wire/kalium/persistence/TestDatabaseManipulation.kt

@@ -24,7 +24,7 @@ import com.wire.kalium.persistence.db.PlatformDatabaseData
 import com.wire.kalium.persistence.db.StorageData
 import com.wire.kalium.persistence.db.UserDatabaseBuilder
 import com.wire.kalium.persistence.db.clearInMemoryDatabase
-import com.wire.kalium.persistence.db.globalDatabaseProvider
+import com.wire.kalium.persistence.db.sqliteGlobalDatabaseProvider
 import com.wire.kalium.persistence.db.inMemoryDatabase
 import kotlinx.coroutines.test.StandardTestDispatcher
 import kotlinx.coroutines.test.TestDispatcher
@@ -39,7 +39,7 @@ internal actual fun deleteTestDatabase(userId: UserIDEntity) {
 }
 
 internal actual fun createTestGlobalDatabase(): GlobalDatabaseBuilder {
-    return globalDatabaseProvider(
+    return sqliteGlobalDatabaseProvider(
         platformDatabaseData = PlatformDatabaseData(StorageData.InMemory),
         passphrase = null,
         queriesContext = StandardTestDispatcher()

persistence/src/androidInstrumentedTest/kotlin/com/wire/kalium/persistence/GlobalDBBaseTest.kt

@@ -23,7 +23,7 @@ import androidx.test.core.app.ApplicationProvider
 import com.wire.kalium.persistence.db.GlobalDatabaseBuilder
 import com.wire.kalium.persistence.db.GlobalDatabaseSecret
 import com.wire.kalium.persistence.db.PlatformDatabaseData
-import com.wire.kalium.persistence.db.globalDatabaseProvider
+import com.wire.kalium.persistence.db.sqliteGlobalDatabaseProvider
 import com.wire.kalium.persistence.util.FileNameUtil
 import com.wire.kalium.util.KaliumDispatcherImpl
 
@@ -34,7 +34,7 @@ actual abstract class GlobalDBBaseTest {
         context.deleteDatabase(FileNameUtil.globalDBName())
     }
 
-    actual fun createDatabase(): GlobalDatabaseBuilder = globalDatabaseProvider(
+    actual fun createDatabase(): GlobalDatabaseBuilder = sqliteGlobalDatabaseProvider(
         platformDatabaseData = PlatformDatabaseData(ApplicationProvider.getApplicationContext()),
         queriesContext = KaliumDispatcherImpl.unconfined,
         passphrase = GlobalDatabaseSecret("test_db_secret".toByteArray()),

persistence/src/androidMain/kotlin/com/wire/kalium/persistence/db/GlobalDatabase.kt

@@ -22,7 +22,7 @@ import com.wire.kalium.persistence.GlobalDatabase
 import com.wire.kalium.persistence.util.FileNameUtil
 import kotlinx.coroutines.CoroutineDispatcher
 
-actual fun globalDatabaseProvider(
+actual fun sqliteGlobalDatabaseProvider(
     platformDatabaseData: PlatformDatabaseData,
     queriesContext: CoroutineDispatcher,
     passphrase: GlobalDatabaseSecret?,

persistence/src/appleMain/kotlin/com/wire/kalium/persistence/db/GlobalDatabase.kt

@@ -23,7 +23,7 @@ import com.wire.kalium.persistence.util.FileNameUtil
 import kotlinx.coroutines.CoroutineDispatcher
 import platform.Foundation.NSFileManager
 
-actual fun globalDatabaseProvider(
+actual fun sqliteGlobalDatabaseProvider(
     platformDatabaseData: PlatformDatabaseData,
     queriesContext: CoroutineDispatcher,
     passphrase: GlobalDatabaseSecret?,

persistence/src/appleTest/kotlin/com/wire/kalium/persistence/GlobalDBBaseTest.kt

@@ -22,7 +22,7 @@ import co.touchlab.sqliter.DatabaseFileContext.deleteDatabase
 import com.wire.kalium.persistence.db.GlobalDatabaseBuilder
 import com.wire.kalium.persistence.db.PlatformDatabaseData
 import com.wire.kalium.persistence.db.StorageData
-import com.wire.kalium.persistence.db.globalDatabaseProvider
+import com.wire.kalium.persistence.db.sqliteGlobalDatabaseProvider
 import com.wire.kalium.persistence.util.FileNameUtil
 import kotlinx.coroutines.test.StandardTestDispatcher
 import platform.Foundation.NSCachesDirectory
@@ -38,7 +38,7 @@ actual abstract class GlobalDBBaseTest {
     }
 
     actual fun createDatabase(): GlobalDatabaseBuilder {
-        return globalDatabaseProvider(
+        return sqliteGlobalDatabaseProvider(
             PlatformDatabaseData(StorageData.FileBacked(storePath)), StandardTestDispatcher(), null, false
         )
     }

persistence/src/commonMain/kotlin/com/wire/kalium/persistence/db/GlobalDatabaseBuilder.kt

@@ -43,7 +43,7 @@ class GlobalDatabaseBuilder internal constructor(
     private val sqlDriver: SqlDriver,
     private val platformDatabaseData: PlatformDatabaseData,
     private val queriesContext: CoroutineContext = KaliumDispatcherImpl.io
-) {
+) : WireUserDb {
 
     internal val database: GlobalDatabase = GlobalDatabase(
         sqlDriver,
@@ -65,10 +65,10 @@ class GlobalDatabaseBuilder internal constructor(
         database.globalDatabasePropertiesQueries.enableForeignKeyContraints()
     }
 
-    val serverConfigurationDAO: ServerConfigurationDAO
+    override val serverConfigurationDAO: ServerConfigurationDAO
         get() = ServerConfigurationDAOImpl(database.serverConfigurationQueries, queriesContext)
 
-    val accountsDAO: AccountsDAO
+    override val accountsDAO: AccountsDAO
         get() = AccountsDAOImpl(database.accountsQueries, database.currentAccountQueries, queriesContext)
 
     fun nuke(): Boolean {
@@ -89,7 +89,7 @@ expect fun nuke(platformDatabaseData: PlatformDatabaseData): Boolean
  *
  * @return a new instance of the [GlobalDatabaseBuilder].
  */
-expect fun globalDatabaseProvider(
+expect fun sqliteGlobalDatabaseProvider(
     platformDatabaseData: PlatformDatabaseData,
     queriesContext: CoroutineDispatcher = KaliumDispatcherImpl.io,
     passphrase: GlobalDatabaseSecret?,