persistence/sqldelight support

Author: joreilly

app/src/main/java/com/surrus/peopleinspace/PeopleInSpaceApplication.kt

@@ -1,6 +1,7 @@
 package com.surrus.peopleinspace
 
 import android.app.Application
+import com.surrus.common.repository.appContext
 import com.surrus.peopleinspace.di.appModule
 import org.koin.android.ext.koin.androidContext
 import org.koin.android.ext.koin.androidLogger
@@ -11,6 +12,8 @@ class PeopleInSpaceApplication : Application() {
     override fun onCreate() {
         super.onCreate()
 
+        appContext = this
+
         startKoin {
             androidLogger()
             androidContext(this@PeopleInSpaceApplication)

app/src/main/java/com/surrus/peopleinspace/ui/PeopleInSpaceViewModel.kt

@@ -5,15 +5,18 @@ import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
 import com.surrus.common.remote.Assignment
 import com.surrus.common.repository.PeopleInSpaceRepository
+import kotlinx.coroutines.flow.collect
 import kotlinx.coroutines.launch
 
 class PeopleInSpaceViewModel(peopleInSpaceRepository: PeopleInSpaceRepository) : ViewModel() {
     val peopleInSpace = MutableLiveData<List<Assignment>>(emptyList())
 
     init {
         viewModelScope.launch {
-            val people = peopleInSpaceRepository.fetchPeople()
-            peopleInSpace.value = people
+            peopleInSpaceRepository.fetchPeopleAsFlow().collect {
+                peopleInSpace.value = it
+            }
         }
+
     }
 }

build.gradle

@@ -10,6 +10,7 @@ buildscript {
         classpath "com.android.tools.build:gradle:${Versions.androidBuildToolsVersion}"
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:${Versions.kotlin}"
         classpath "org.jetbrains.kotlin:kotlin-serialization:${Versions.kotlin}"
+        classpath "com.squareup.sqldelight:gradle-plugin:${Versions.sqlDelight}"
     }
 }
 

buildSrc/src/main/java/Dependencies.kt

@@ -1,13 +1,13 @@
 
 object Versions {
-    const val androidBuildToolsVersion = "4.0.0-alpha08"
+    const val androidBuildToolsVersion = "4.0.0-alpha09"
 
     const val kotlin = "1.3.61"
     const val kotlinCoroutines = "1.3.3"
     const val koin = "2.0.0"
     const val ktor = "1.3.0-rc"
     const val kotlinxSerialization = "0.14.0"
-    const val sqlDelight = "1.2.0"
+    const val sqlDelight = "1.2.2"
     const val retrofit = "2.4.0"
     const val okHttp = "3.12.0"
     const val ktx = "1.0.1"

common/build.gradle

@@ -2,7 +2,7 @@ apply plugin: 'com.android.library'
 apply plugin: 'kotlin-multiplatform'
 apply plugin: 'kotlinx-serialization'
 apply plugin: 'org.jetbrains.kotlin.native.cocoapods'
-
+apply plugin: "com.squareup.sqldelight"
 
 
 android {
@@ -74,6 +74,10 @@ kotlin {
 
             // Serialize
             implementation "org.jetbrains.kotlinx:kotlinx-serialization-runtime-common:${Versions.kotlinxSerialization}"
+
+            // SQL Delight
+            implementation "com.squareup.sqldelight:runtime:${Versions.sqlDelight}"
+            implementation "com.squareup.sqldelight:coroutines-extensions:${Versions.sqlDelight}"
         }
 
         androidMain.dependencies {
@@ -93,6 +97,10 @@ kotlin {
 
             // Serialize
             implementation "org.jetbrains.kotlinx:kotlinx-serialization-runtime:${Versions.kotlinxSerialization}"
+
+            // SQL Delight
+            implementation "com.squareup.sqldelight:android-driver:${Versions.sqlDelight}"
+            implementation "com.squareup.sqldelight:coroutines-extensions-jvm:${Versions.sqlDelight}"
         }
 
         iOSMain.dependencies {
@@ -113,6 +121,9 @@ kotlin {
 
             // Serialize
             implementation "org.jetbrains.kotlinx:kotlinx-serialization-runtime-native:${Versions.kotlinxSerialization}"
+
+            // SQL Delight
+            implementation "com.squareup.sqldelight:native-driver:${Versions.sqlDelight}"
         }
 
         watchMain.dependencies {
@@ -132,6 +143,16 @@ kotlin {
 
             // Serialize
             implementation "org.jetbrains.kotlinx:kotlinx-serialization-runtime-native:${Versions.kotlinxSerialization}"
+
+            // SQL Delight
+            implementation "com.squareup.sqldelight:native-driver:${Versions.sqlDelight}"
         }
     }
 }
+
+sqldelight {
+    PeopleInSpaceDatabase {
+        packageName = "com.surrus.peopleinspace.db"
+        sourceFolders = ["sqldelight"]
+    }
+}

common/src/androidMain/kotlin/com/surrus/common/repository/createDb.kt

@@ -0,0 +1,13 @@
+package com.surrus.common.repository
+
+import android.content.Context
+import com.squareup.sqldelight.android.AndroidSqliteDriver
+import com.surrus.peopleinspace.db.PeopleInSpaceDatabase
+
+
+lateinit var appContext: Context
+
+actual fun createDb(): PeopleInSpaceDatabase {
+    val driver = AndroidSqliteDriver(PeopleInSpaceDatabase.Schema, appContext, "peopleinspace.db")
+    return PeopleInSpaceDatabase(driver)
+}

common/src/commonMain/kotlin/com/surrus/common/repository/PeopleInSpaceRepository.kt

@@ -1,22 +1,45 @@
 package com.surrus.common.repository
 
+import com.squareup.sqldelight.runtime.coroutines.asFlow
+import com.squareup.sqldelight.runtime.coroutines.mapToList
 import com.surrus.common.remote.Assignment
 import com.surrus.common.remote.PeopleInSpaceApi
+import com.surrus.peopleinspace.db.PeopleInSpaceDatabase
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.GlobalScope
+import kotlinx.coroutines.flow.collect
 import kotlinx.coroutines.launch
 
+expect fun createDb() : PeopleInSpaceDatabase
+
 class PeopleInSpaceRepository {
     private val peopleInSpaceApi = PeopleInSpaceApi()
+    private val peopleInSpaceDatabase = createDb()
+    private val peopleInSpaceQueries = peopleInSpaceDatabase.peopleInSpaceQueries
+
+    init {
+        GlobalScope.launch (Dispatchers.Main) {
+            fetchAndStorePeople()
+        }
+    }
+
+    fun fetchPeopleAsFlow()  = peopleInSpaceQueries.selectAll(mapper = { name, craft ->
+            Assignment(name = name, craft = craft)
+        }).asFlow().mapToList()
 
-    suspend fun fetchPeople() : List<Assignment> {
+    suspend fun fetchAndStorePeople()  {
         val result = peopleInSpaceApi.fetchPeople()
-        return result.people
+        result.people.forEach {
+            peopleInSpaceQueries.insertItem(it.name, it.craft)
+        }
     }
 
+    // called from iOS/watchOS client
     fun fetchPeople(success: (List<Assignment>) -> Unit) {
         GlobalScope.launch(Dispatchers.Main) {
-            success(fetchPeople())
+            fetchPeopleAsFlow().collect {
+                success(it)
+            }
         }
     }
 }

common/src/commonMain/sqldelight/com/surrus/peopleinspace/db/PeopleInSpace.sq

@@ -0,0 +1,12 @@
+
+CREATE TABLE People(
+name TEXT NOT NULL PRIMARY KEY,
+craft TEXT NOT NULL
+);
+
+insertItem:
+INSERT OR REPLACE INTO People(name, craft)VALUES(?,?);
+
+selectAll:
+SELECT * FROM People;
+

common/src/iOSMain/kotlin/com/surrus/common/repository/createDb.kt

@@ -0,0 +1,9 @@
+package com.surrus.common.repository
+
+import com.squareup.sqldelight.drivers.native.NativeSqliteDriver
+import com.surrus.peopleinspace.db.PeopleInSpaceDatabase
+
+actual fun createDb(): PeopleInSpaceDatabase {
+    val driver = NativeSqliteDriver(PeopleInSpaceDatabase.Schema, "peopleinspace.db")
+    return PeopleInSpaceDatabase(driver)
+}

common/src/watchMain/kotlin/com/surrus/common/repository/createDb.kt

@@ -0,0 +1,9 @@
+package com.surrus.common.repository
+
+import com.squareup.sqldelight.drivers.native.NativeSqliteDriver
+import com.surrus.peopleinspace.db.PeopleInSpaceDatabase
+
+actual fun createDb(): PeopleInSpaceDatabase {
+    val driver = NativeSqliteDriver(PeopleInSpaceDatabase.Schema, "peopleinspace.db")
+    return PeopleInSpaceDatabase(driver)
+}