Room multiplatform

michaelbel · May 4, 2024 · 5a215f5 · 5a215f5
1 parent 4386e0a
commit 5a215f5
Show file tree

Hide file tree

Showing 108 changed files with 308 additions and 669 deletions.
diff --git a/core/interactor/src/commonMain/kotlin/org/michaelbel/movies/interactor/AccountInteractor.kt b/core/interactor/src/commonMain/kotlin/org/michaelbel/movies/interactor/AccountInteractor.kt
@@ -1,7 +1,7 @@
 package org.michaelbel.movies.interactor
 
 import kotlinx.coroutines.flow.Flow
-import org.michaelbel.movies.persistence.database.entity.AccountPojo
+import org.michaelbel.movies.persistence.database.entity.pojo.AccountPojo
 import org.michaelbel.movies.persistence.database.typealiases.AccountId
 
 interface AccountInteractor {

diff --git a/core/interactor/src/commonMain/kotlin/org/michaelbel/movies/interactor/ImageInteractor.kt b/core/interactor/src/commonMain/kotlin/org/michaelbel/movies/interactor/ImageInteractor.kt
@@ -1,7 +1,7 @@
 package org.michaelbel.movies.interactor
 
 import kotlinx.coroutines.flow.Flow
-import org.michaelbel.movies.persistence.database.entity.ImagePojo
+import org.michaelbel.movies.persistence.database.entity.pojo.ImagePojo
 import org.michaelbel.movies.persistence.database.typealiases.MovieId
 
 interface ImageInteractor {

diff --git a/core/interactor/src/commonMain/kotlin/org/michaelbel/movies/interactor/MovieInteractor.kt b/core/interactor/src/commonMain/kotlin/org/michaelbel/movies/interactor/MovieInteractor.kt
@@ -4,7 +4,7 @@ import androidx.paging.PagingData
 import androidx.paging.PagingSource
 import kotlinx.coroutines.flow.Flow
 import org.michaelbel.movies.common.list.MovieList
-import org.michaelbel.movies.persistence.database.entity.MoviePojo
+import org.michaelbel.movies.persistence.database.entity.pojo.MoviePojo
 import org.michaelbel.movies.persistence.database.entity.mini.MovieDbMini
 import org.michaelbel.movies.persistence.database.typealiases.Limit
 import org.michaelbel.movies.persistence.database.typealiases.MovieId

diff --git a/...interactor/src/commonMain/kotlin/org/michaelbel/movies/interactor/SuggestionInteractor.kt b/...interactor/src/commonMain/kotlin/org/michaelbel/movies/interactor/SuggestionInteractor.kt
@@ -1,7 +1,7 @@
 package org.michaelbel.movies.interactor
 
 import kotlinx.coroutines.flow.Flow
-import org.michaelbel.movies.persistence.database.entity.SuggestionPojo
+import org.michaelbel.movies.persistence.database.entity.pojo.SuggestionPojo
 
 interface SuggestionInteractor {
 

diff --git a/...ctor/src/commonMain/kotlin/org/michaelbel/movies/interactor/impl/AccountInteractorImpl.kt b/...ctor/src/commonMain/kotlin/org/michaelbel/movies/interactor/impl/AccountInteractorImpl.kt
@@ -4,7 +4,7 @@ import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.withContext
 import org.michaelbel.movies.common.dispatchers.MoviesDispatchers
 import org.michaelbel.movies.interactor.AccountInteractor
-import org.michaelbel.movies.persistence.database.entity.AccountPojo
+import org.michaelbel.movies.persistence.database.entity.pojo.AccountPojo
 import org.michaelbel.movies.persistence.database.typealiases.AccountId
 import org.michaelbel.movies.repository.AccountRepository
 

diff --git a/...ractor/src/commonMain/kotlin/org/michaelbel/movies/interactor/impl/ImageInteractorImpl.kt b/...ractor/src/commonMain/kotlin/org/michaelbel/movies/interactor/impl/ImageInteractorImpl.kt
@@ -4,7 +4,7 @@ import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.withContext
 import org.michaelbel.movies.common.dispatchers.MoviesDispatchers
 import org.michaelbel.movies.interactor.ImageInteractor
-import org.michaelbel.movies.persistence.database.entity.ImagePojo
+import org.michaelbel.movies.persistence.database.entity.pojo.ImagePojo
 import org.michaelbel.movies.persistence.database.typealiases.MovieId
 import org.michaelbel.movies.repository.ImageRepository
 

diff --git a/...ractor/src/commonMain/kotlin/org/michaelbel/movies/interactor/impl/MovieInteractorImpl.kt b/...ractor/src/commonMain/kotlin/org/michaelbel/movies/interactor/impl/MovieInteractorImpl.kt
@@ -18,7 +18,7 @@ import org.michaelbel.movies.interactor.remote.FeedMoviesRemoteMediator
 import org.michaelbel.movies.interactor.remote.SearchMoviesRemoteMediator
 import org.michaelbel.movies.network.model.MovieResponse
 import org.michaelbel.movies.persistence.database.MoviesDatabase
-import org.michaelbel.movies.persistence.database.entity.MoviePojo
+import org.michaelbel.movies.persistence.database.entity.pojo.MoviePojo
 import org.michaelbel.movies.persistence.database.entity.mini.MovieDbMini
 import org.michaelbel.movies.persistence.database.typealiases.Limit
 import org.michaelbel.movies.persistence.database.typealiases.MovieId

diff --git a/...r/src/commonMain/kotlin/org/michaelbel/movies/interactor/impl/SuggestionInteractorImpl.kt b/...r/src/commonMain/kotlin/org/michaelbel/movies/interactor/impl/SuggestionInteractorImpl.kt
@@ -5,7 +5,7 @@ import kotlinx.coroutines.withContext
 import org.michaelbel.movies.common.dispatchers.MoviesDispatchers
 import org.michaelbel.movies.interactor.LocaleInteractor
 import org.michaelbel.movies.interactor.SuggestionInteractor
-import org.michaelbel.movies.persistence.database.entity.SuggestionPojo
+import org.michaelbel.movies.persistence.database.entity.pojo.SuggestionPojo
 import org.michaelbel.movies.repository.SuggestionRepository
 
 internal class SuggestionInteractorImpl(

diff --git a/core/interactor/src/commonMain/kotlin/org/michaelbel/movies/interactor/ktx/MovieListKtx.kt b/core/interactor/src/commonMain/kotlin/org/michaelbel/movies/interactor/ktx/MovieListKtx.kt
@@ -2,7 +2,7 @@ package org.michaelbel.movies.interactor.ktx
 
 import org.michaelbel.movies.common.list.MovieList
 import org.michaelbel.movies.network.config.isTmdbApiKeyEmpty
-import org.michaelbel.movies.persistence.database.entity.MoviePojo
+import org.michaelbel.movies.persistence.database.entity.pojo.MoviePojo
 
 val MovieList.nameOrLocalList: String
     get() = if (isTmdbApiKeyEmpty) MoviePojo.MOVIES_LOCAL_LIST else MovieList.name(this)
diff --git a/...src/commonMain/kotlin/org/michaelbel/movies/interactor/remote/FeedMoviesRemoteMediator.kt b/...src/commonMain/kotlin/org/michaelbel/movies/interactor/remote/FeedMoviesRemoteMediator.kt
@@ -12,7 +12,7 @@ import org.michaelbel.movies.network.ktx.isEmpty
 import org.michaelbel.movies.network.ktx.isPaginationReached
 import org.michaelbel.movies.network.ktx.nextPage
 import org.michaelbel.movies.persistence.database.MoviesDatabase
-import org.michaelbel.movies.persistence.database.entity.MoviePojo
+import org.michaelbel.movies.persistence.database.entity.pojo.MoviePojo
 import org.michaelbel.movies.persistence.database.typealiases.PagingKey
 import org.michaelbel.movies.repository.MovieRepository
 import org.michaelbel.movies.repository.PagingKeyRepository

diff --git a/...c/commonMain/kotlin/org/michaelbel/movies/interactor/remote/SearchMoviesRemoteMediator.kt b/...c/commonMain/kotlin/org/michaelbel/movies/interactor/remote/SearchMoviesRemoteMediator.kt
@@ -12,7 +12,7 @@ import org.michaelbel.movies.network.ktx.isEmpty
 import org.michaelbel.movies.network.ktx.isPaginationReached
 import org.michaelbel.movies.network.ktx.nextPage
 import org.michaelbel.movies.persistence.database.MoviesDatabase
-import org.michaelbel.movies.persistence.database.entity.MoviePojo
+import org.michaelbel.movies.persistence.database.entity.pojo.MoviePojo
 import org.michaelbel.movies.persistence.database.typealiases.Query
 import org.michaelbel.movies.repository.MovieRepository
 import org.michaelbel.movies.repository.PagingKeyRepository

diff --git a/core/persistence/build.gradle.kts b/core/persistence/build.gradle.kts
@@ -1,6 +1,7 @@
 plugins {
     alias(libs.plugins.kotlin.multiplatform)
     alias(libs.plugins.android.library)
+    alias(libs.plugins.androidx.room)
     alias(libs.plugins.google.ksp)
 }
 
@@ -20,11 +21,12 @@ kotlin {
             api(project(":core:network"))
             implementation(libs.bundles.datastore.common)
             implementation(libs.bundles.paging.common)
+            implementation(libs.bundles.room.common)
+            implementation(libs.bundles.sqlite.common)
             implementation(libs.bundles.okio.common)
         }
         androidMain.dependencies {
             implementation(libs.bundles.datastore.android)
-            implementation(libs.bundles.room.android)
         }
         val desktopMain by getting
         desktopMain.dependencies {
@@ -52,8 +54,12 @@ android {
         checkDependencies = true
         lintConfig = file("${project.rootDir}/config/codestyle/lint.xml")
     }
+}
 
-    dependencies {
-        ksp(libs.bundles.room.compiler.android)
-    }
+dependencies {
+    add("kspAndroid", libs.bundles.room.compiler.common)
+}
+
+room {
+    schemaDirectory("$projectDir/schemas")
 }
diff --git a/...e/src/androidMain/kotlin/org/michaelbel/movies/persistence/database/AccountPersistence.kt b/...e/src/androidMain/kotlin/org/michaelbel/movies/persistence/database/AccountPersistence.kt
diff --git a/...nce/src/androidMain/kotlin/org/michaelbel/movies/persistence/database/ImagePersistence.kt b/...nce/src/androidMain/kotlin/org/michaelbel/movies/persistence/database/ImagePersistence.kt
diff --git a/...nce/src/androidMain/kotlin/org/michaelbel/movies/persistence/database/MoviePersistence.kt b/...nce/src/androidMain/kotlin/org/michaelbel/movies/persistence/database/MoviePersistence.kt
diff --git a/...src/androidMain/kotlin/org/michaelbel/movies/persistence/database/PagingKeyPersistence.kt b/...src/androidMain/kotlin/org/michaelbel/movies/persistence/database/PagingKeyPersistence.kt
diff --git a/...rc/androidMain/kotlin/org/michaelbel/movies/persistence/database/SuggestionPersistence.kt b/...rc/androidMain/kotlin/org/michaelbel/movies/persistence/database/SuggestionPersistence.kt
diff --git a/...nce/src/androidMain/kotlin/org/michaelbel/movies/persistence/database/di/DaoKoinModule.kt b/...nce/src/androidMain/kotlin/org/michaelbel/movies/persistence/database/di/DaoKoinModule.kt
diff --git a/...rc/androidMain/kotlin/org/michaelbel/movies/persistence/database/di/DatabaseKoinModule.kt b/...rc/androidMain/kotlin/org/michaelbel/movies/persistence/database/di/DatabaseKoinModule.kt
@@ -1,9 +1,19 @@
 package org.michaelbel.movies.persistence.database.di
 
-import org.koin.android.ext.koin.androidContext
+import android.app.Application
+import androidx.room.Room
+import kotlinx.coroutines.Dispatchers
+import org.koin.android.ext.koin.androidApplication
 import org.koin.dsl.module
 import org.michaelbel.movies.persistence.database.db.AppDatabase
 
 actual val databaseKoinModule = module {
-    single { AppDatabase.getInstance(androidContext()) }
+    single { createRoomDatabase(androidApplication()) }
+}
+
+private fun createRoomDatabase(app: Application): AppDatabase {
+    val dbFile = app.getDatabasePath(AppDatabase.DATABASE_NAME)
+    return Room.databaseBuilder<AppDatabase>(app, dbFile.absolutePath)
+        .setQueryCoroutineContext(Dispatchers.IO)
+        .build()
 }
diff --git a/...androidMain/kotlin/org/michaelbel/movies/persistence/database/di/PersistenceKoinModule.kt b/...androidMain/kotlin/org/michaelbel/movies/persistence/database/di/PersistenceKoinModule.kt
diff --git a/...e/src/androidMain/kotlin/org/michaelbel/movies/persistence/database/ktx/AccountPojoKtx.kt b/...e/src/androidMain/kotlin/org/michaelbel/movies/persistence/database/ktx/AccountPojoKtx.kt