Moved database to data-sqlite module

mooncloak · Feb 25, 2025 · 5ea3dd7 · 5ea3dd7
1 parent 9aee6b4
commit 5ea3dd7
Show file tree

Hide file tree

Showing 16 changed files with 18 additions and 35 deletions.
diff --git a/...src/play/kotlin/com.mooncloak.vpn.app.android/di/AndroidGooglePlayApplicationComponent.kt b/...src/play/kotlin/com.mooncloak.vpn.app.android/di/AndroidGooglePlayApplicationComponent.kt
@@ -17,7 +17,7 @@ import com.mooncloak.vpn.app.shared.info.AppClientInfo
 import com.mooncloak.vpn.data.sqlite.invoke
 import com.mooncloak.vpn.app.shared.util.ApplicationContext
 import com.mooncloak.vpn.util.shared.coroutine.ApplicationCoroutineScope
-import com.mooncloak.vpn.app.storage.sqlite.database.MooncloakDatabase
+import com.mooncloak.vpn.data.sqlite.database.MooncloakDatabase
 import com.mooncloak.vpn.data.sqlite.SqlDriverFactory
 import com.wireguard.android.backend.GoBackend
 

diff --git a/app-desktop/src/main/kotlin/com/mooncloak/vpn/app/desktop/di/JvmApplicationComponent.kt b/app-desktop/src/main/kotlin/com/mooncloak/vpn/app/desktop/di/JvmApplicationComponent.kt
@@ -18,7 +18,7 @@ import com.mooncloak.vpn.data.sqlite.invoke
 import com.mooncloak.vpn.util.shared.coroutine.ApplicationCoroutineScope
 import com.mooncloak.vpn.app.shared.util.notification.NotificationManager
 import com.mooncloak.vpn.app.shared.util.notification.invoke
-import com.mooncloak.vpn.app.storage.sqlite.database.MooncloakDatabase
+import com.mooncloak.vpn.data.sqlite.database.MooncloakDatabase
 import com.mooncloak.vpn.data.sqlite.SqlDriverFactory
 import com.mooncloak.vpn.data.sqlite.util.getDatabaseFileLocation
 import kotlinx.datetime.Clock

diff --git a/app-shared/build.gradle.kts b/app-shared/build.gradle.kts
@@ -13,7 +13,6 @@ plugins {
     id("org.jetbrains.kotlin.plugin.compose")
     id("com.google.devtools.ksp")
     id("com.mikepenz.aboutlibraries.plugin")
-    id("app.cash.sqldelight")
     id("com.codingfeline.buildkonfig")
 }
 
@@ -385,19 +384,3 @@ buildkonfig {
         )
     }
 }
-
-/**
- * Creates and defines the core app database. This uses the SqlDelight library and Sqlite.
- *
- * @see [SqlDelight Documentation](https://sqldelight.github.io/sqldelight/2.0.2/multiplatform_sqlite/)
- */
-sqldelight {
-    databases {
-        create("MooncloakDatabase") {
-            packageName.set("com.mooncloak.vpn.app.storage.sqlite.database")
-            srcDirs("src/commonMain/sqldelight")
-            schemaOutputDirectory.set(file("src/commonMain/sqldelight/databases"))
-            verifyMigrations.set(false)
-        }
-    }
-}
diff --git a/...n/kotlin/com/mooncloak/vpn/app/shared/api/billing/ServicePurchaseReceiptDatabaseSource.kt b/...n/kotlin/com/mooncloak/vpn/app/shared/api/billing/ServicePurchaseReceiptDatabaseSource.kt
@@ -8,7 +8,7 @@ import com.mooncloak.vpn.api.shared.plan.BillingProvider
 import com.mooncloak.vpn.api.shared.plan.Price
 import com.mooncloak.vpn.api.shared.token.TransactionToken
 import com.mooncloak.vpn.app.shared.database.MooncloakDatabaseProvider
-import com.mooncloak.vpn.app.storage.sqlite.database.PurchaseReceipt
+import com.mooncloak.vpn.data.sqlite.database.PurchaseReceipt
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.sync.Mutex
 import kotlinx.coroutines.sync.withLock

diff --git a/...src/commonMain/kotlin/com/mooncloak/vpn/app/shared/api/plan/ServicePlansDatabaseSource.kt b/...src/commonMain/kotlin/com/mooncloak/vpn/app/shared/api/plan/ServicePlansDatabaseSource.kt
@@ -11,7 +11,7 @@ import com.mooncloak.vpn.api.shared.plan.ServicePlansRepository
 import com.mooncloak.vpn.api.shared.plan.TaxCode
 import com.mooncloak.vpn.api.shared.plan.UsageType
 import com.mooncloak.vpn.api.shared.plan.duration
-import com.mooncloak.vpn.app.storage.sqlite.database.MooncloakDatabase
+import com.mooncloak.vpn.data.sqlite.database.MooncloakDatabase
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.withContext
 import kotlinx.datetime.Clock
@@ -118,7 +118,7 @@ public class ServicePlansDatabaseSource @Inject public constructor(
         )
     }
 
-    private fun com.mooncloak.vpn.app.storage.sqlite.database.ServicePlan.toVPNServicePlan(): Plan =
+    private fun com.mooncloak.vpn.data.sqlite.database.ServicePlan.toVPNServicePlan(): Plan =
         Plan(
             id = id,
             provider = BillingProvider(value = this.provider),

diff --git a/...mmonMain/kotlin/com/mooncloak/vpn/app/shared/api/server/RegisteredClientDatabaseSource.kt b/...mmonMain/kotlin/com/mooncloak/vpn/app/shared/api/server/RegisteredClientDatabaseSource.kt
@@ -5,7 +5,7 @@ import com.mooncloak.vpn.api.shared.key.Base64Key
 import com.mooncloak.vpn.api.shared.server.RegisteredClient
 import com.mooncloak.vpn.api.shared.server.RegisteredClientRepository
 import com.mooncloak.vpn.api.shared.vpn.VPNProtocol
-import com.mooncloak.vpn.app.storage.sqlite.database.MooncloakDatabase
+import com.mooncloak.vpn.data.sqlite.database.MooncloakDatabase
 import kotlinx.coroutines.sync.Mutex
 import kotlinx.coroutines.sync.withLock
 import kotlinx.datetime.Clock
@@ -118,7 +118,7 @@ public class RegisteredClientDatabaseSource @Inject public constructor(
         }
     }
 
-    private fun com.mooncloak.vpn.app.storage.sqlite.database.RegisteredClient.toRegisteredPeer(): RegisteredClient =
+    private fun com.mooncloak.vpn.data.sqlite.database.RegisteredClient.toRegisteredPeer(): RegisteredClient =
         RegisteredClient(
             id = this.id,
             clientId = this.client_id,

diff --git a/...in/kotlin/com/mooncloak/vpn/app/shared/api/server/ServerConnectionRecordDatabaseSource.kt b/...in/kotlin/com/mooncloak/vpn/app/shared/api/server/ServerConnectionRecordDatabaseSource.kt
@@ -9,8 +9,8 @@ import com.mooncloak.vpn.api.shared.server.ServerConnectionRecord
 import com.mooncloak.vpn.api.shared.server.ServerConnectionRecordRepository
 import com.mooncloak.vpn.api.shared.vpn.VPNProtocol
 import com.mooncloak.vpn.app.shared.database.MooncloakDatabaseProvider
-import com.mooncloak.vpn.app.storage.sqlite.database.SelectAllStarred
-import com.mooncloak.vpn.app.storage.sqlite.database.SelectStarredPage
+import com.mooncloak.vpn.data.sqlite.database.SelectAllStarred
+import com.mooncloak.vpn.data.sqlite.database.SelectStarredPage
 import kotlinx.coroutines.sync.Mutex
 import kotlinx.coroutines.sync.withLock
 import kotlinx.datetime.Clock
@@ -312,7 +312,7 @@ public class ServerConnectionRecordDatabaseSource @Inject public constructor(
         }
     }
 
-    private fun com.mooncloak.vpn.app.storage.sqlite.database.ServerConnectionRecord.toServerConnectionRecord(): ServerConnectionRecord =
+    private fun com.mooncloak.vpn.data.sqlite.database.ServerConnectionRecord.toServerConnectionRecord(): ServerConnectionRecord =
         ServerConnectionRecord(
             lastConnected = this.connected,
             starred = this.starred,

diff --git a/...commonMain/kotlin/com/mooncloak/vpn/app/shared/api/service/ServiceTokensDatabaseSource.kt b/...commonMain/kotlin/com/mooncloak/vpn/app/shared/api/service/ServiceTokensDatabaseSource.kt
@@ -153,7 +153,7 @@ public class ServiceTokensDatabaseSource @Inject public constructor(
         }
     }
 
-    private fun com.mooncloak.vpn.app.storage.sqlite.database.ServiceTokens.toServiceTokens(): ServiceTokens =
+    private fun com.mooncloak.vpn.data.sqlite.database.ServiceTokens.toServiceTokens(): ServiceTokens =
         ServiceTokens(
             id = this.id,
             accessToken = Token(value = this.accessToken),

diff --git a/.../src/commonMain/kotlin/com/mooncloak/vpn/app/shared/database/MooncloakDatabaseProvider.kt b/.../src/commonMain/kotlin/com/mooncloak/vpn/app/shared/database/MooncloakDatabaseProvider.kt
@@ -7,14 +7,14 @@ import com.mooncloak.vpn.data.sqlite.adapter.DatabaseAdapter
 import com.mooncloak.vpn.data.sqlite.adapter.instantAsMillisecondsLong
 import com.mooncloak.vpn.data.sqlite.adapter.jsonElementAsString
 import com.mooncloak.vpn.data.sqlite.adapter.jsonObjectAsString
-import com.mooncloak.vpn.app.storage.sqlite.database.MooncloakDatabase
-import com.mooncloak.vpn.app.storage.sqlite.database.PurchaseReceipt
-import com.mooncloak.vpn.app.storage.sqlite.database.RegisteredClient
-import com.mooncloak.vpn.app.storage.sqlite.database.ServerConnectionRecord
-import com.mooncloak.vpn.app.storage.sqlite.database.ServicePlan
-import com.mooncloak.vpn.app.storage.sqlite.database.ServiceTokens
 import com.mooncloak.vpn.data.sqlite.DatabaseManager
 import com.mooncloak.vpn.data.sqlite.SqlDriverFactory
+import com.mooncloak.vpn.data.sqlite.database.MooncloakDatabase
+import com.mooncloak.vpn.data.sqlite.database.PurchaseReceipt
+import com.mooncloak.vpn.data.sqlite.database.RegisteredClient
+import com.mooncloak.vpn.data.sqlite.database.ServerConnectionRecord
+import com.mooncloak.vpn.data.sqlite.database.ServicePlan
+import com.mooncloak.vpn.data.sqlite.database.ServiceTokens
 
 @Singleton
 public class MooncloakDatabaseProvider @Inject public constructor(

diff --git a/app-shared/src/commonMain/kotlin/com/mooncloak/vpn/app/shared/di/ApplicationComponent.kt b/app-shared/src/commonMain/kotlin/com/mooncloak/vpn/app/shared/di/ApplicationComponent.kt
@@ -24,7 +24,7 @@ import com.mooncloak.vpn.app.shared.database.MooncloakDatabaseProvider
 import com.mooncloak.vpn.app.shared.util.http.DefaultUnauthorizedInterceptor
 import com.mooncloak.vpn.app.shared.util.http.UnauthorizedInterceptor
 import com.mooncloak.vpn.app.shared.util.http.interceptUnauthorized
-import com.mooncloak.vpn.app.storage.sqlite.database.MooncloakDatabase
+import com.mooncloak.vpn.data.sqlite.database.MooncloakDatabase
 import com.mooncloak.vpn.data.shared.keyvalue.MutableKeyValueStorage
 import com.mooncloak.vpn.data.shared.keyvalue.SettingsKeyValueStorage
 import com.russhwolf.settings.Settings

diff --git a/....mooncloak.vpn.data.sqlite/PlanInvoice.sq → ...k/vpn/data/sqlite/database/PlanInvoice.sq b/....mooncloak.vpn.data.sqlite/PlanInvoice.sq → ...k/vpn/data/sqlite/database/PlanInvoice.sq
diff --git a/...ncloak.vpn.data.sqlite/PurchaseReceipt.sq → ...n/data/sqlite/database/PurchaseReceipt.sq b/...ncloak.vpn.data.sqlite/PurchaseReceipt.sq → ...n/data/sqlite/database/PurchaseReceipt.sq
diff --git a/...cloak.vpn.data.sqlite/RegisteredClient.sq → .../data/sqlite/database/RegisteredClient.sq b/...cloak.vpn.data.sqlite/RegisteredClient.sq → .../data/sqlite/database/RegisteredClient.sq
diff --git a/...vpn.data.sqlite/ServerConnectionRecord.sq → ...sqlite/database/ServerConnectionRecord.sq b/...vpn.data.sqlite/ServerConnectionRecord.sq → ...sqlite/database/ServerConnectionRecord.sq
diff --git a/....mooncloak.vpn.data.sqlite/ServicePlan.sq → ...k/vpn/data/sqlite/database/ServicePlan.sq b/....mooncloak.vpn.data.sqlite/ServicePlan.sq → ...k/vpn/data/sqlite/database/ServicePlan.sq
diff --git a/...ooncloak.vpn.data.sqlite/ServiceTokens.sq → ...vpn/data/sqlite/database/ServiceTokens.sq b/...ooncloak.vpn.data.sqlite/ServiceTokens.sq → ...vpn/data/sqlite/database/ServiceTokens.sq