Setting up cache + users local cache

android/src/main/java/me/nathanfallet/extopy/di/AndroidModule.kt

@@ -1,6 +1,7 @@
 package me.nathanfallet.extopy.di
 
 import me.nathanfallet.extopy.BuildConfig
+import me.nathanfallet.extopy.database.DatabaseDriverFactory
 import me.nathanfallet.extopy.models.application.ExtopyEnvironment
 import me.nathanfallet.extopy.repositories.application.ITokenRepository
 import me.nathanfallet.extopy.repositories.application.TokenRepository
@@ -13,11 +14,16 @@ val environmentModule = module {
     }
 }
 
+val databaseModule = module {
+    single { DatabaseDriverFactory(get()) }
+}
+
 val repositoryModule = module {
     single<ITokenRepository> { TokenRepository(get()) }
 }
 
 val androidModule = listOf(
+    databaseModule,
     environmentModule,
     repositoryModule
 )

android/src/main/java/me/nathanfallet/extopy/features/root/RootView.kt

@@ -42,7 +42,7 @@ fun RootView() {
     val navController = rememberNavController()
     val navBackStackEntry by navController.currentBackStackEntryAsState()
 
-    LaunchedEffect("user") {
+    LaunchedEffect(Unit) {
         viewModel.fetchUser()
     }
 

ios/Extopy.xcodeproj/project.pbxproj

@@ -203,7 +203,6 @@
 			children = (
 				6AB01AE32B3605A1001AF7FF /* AuthView.swift */,
 				6A7D0795291D8C5F0023BE5B /* AuthSheet.swift */,
-				6A7D0793291D81950023BE5B /* SafariView.swift */,
 			);
 			path = Auth;
 			sourceTree = "<group>";
@@ -231,6 +230,7 @@
 			children = (
 				6AC04BBE2B35B682009938B9 /* Posts */,
 				6AC04BBD2B35B67A009938B9 /* Users */,
+				6A7D0793291D81950023BE5B /* SafariView.swift */,
 			);
 			path = Components;
 			sourceTree = "<group>";

shared/src/androidMain/kotlin/me/nathanfallet/extopy/database/DatabaseDriverFactory.kt

@@ -5,7 +5,8 @@ import app.cash.sqldelight.db.SqlDriver
 import app.cash.sqldelight.driver.android.AndroidSqliteDriver
 
 actual class DatabaseDriverFactory(private val context: Context) {
-    actual fun createDriver(): SqlDriver {
-        return AndroidSqliteDriver(AppDatabase.Schema, context, "solar.db")
-    }
+
+    actual fun createDriver(): SqlDriver =
+        AndroidSqliteDriver(AppDatabase.Schema, context, "extopy.db")
+
 }

shared/src/commonMain/kotlin/me/nathanfallet/extopy/database/Database.kt

@@ -3,6 +3,8 @@ package me.nathanfallet.extopy.database
 class Database(databaseDriverFactory: DatabaseDriverFactory) {
 
     private val database = AppDatabase(databaseDriverFactory.createDriver())
-    //private val dbQuery = database.appDatabaseQueries
+
+    val usersQueries = database.usersDatabaseQueries
+    val postsQueries = database.postsDatabaseQueries
 
 }

shared/src/commonMain/kotlin/me/nathanfallet/extopy/di/SharedModule.kt

@@ -2,6 +2,9 @@ package me.nathanfallet.extopy.di
 
 import me.nathanfallet.extopy.client.ExtopyClient
 import me.nathanfallet.extopy.client.IExtopyClient
+import me.nathanfallet.extopy.database.Database
+import me.nathanfallet.extopy.repositories.users.IUsersRepository
+import me.nathanfallet.extopy.repositories.users.UsersRepository
 import me.nathanfallet.extopy.usecases.auth.*
 import me.nathanfallet.extopy.usecases.posts.*
 import me.nathanfallet.extopy.usecases.timelines.FetchTimelinePostsUseCase
@@ -19,8 +22,16 @@ import me.nathanfallet.extopy.viewmodels.users.ProfileViewModel
 import me.nathanfallet.ktorx.usecases.api.IGetTokenUseCase
 import org.koin.dsl.module
 
+val databaseModule = module {
+    single { Database(get()) }
+}
+
 val repositoryModule = module {
+    // Remote client
     single<IExtopyClient> { ExtopyClient(get(), get()) }
+
+    // Local cache
+    single<IUsersRepository> { UsersRepository(get()) }
 }
 
 val useCaseModule = module {
@@ -36,7 +47,7 @@ val useCaseModule = module {
     single<IFetchTimelinePostsUseCase> { FetchTimelinePostsUseCase(get()) }
 
     // Users
-    single<IFetchUserUseCase> { FetchUserUseCase(get()) }
+    single<IFetchUserUseCase> { FetchUserUseCase(get(), get()) }
     single<IUpdateFollowInUserUseCase> { UpdateFollowInUserUseCase(get(), get()) }
     single<IFetchUserPostsUseCase> { FetchUserPostsUseCase(get()) }
 
@@ -58,6 +69,7 @@ val viewModelModule = module {
 }
 
 val sharedModule = listOf(
+    databaseModule,
     repositoryModule,
     useCaseModule,
     viewModelModule,

shared/src/commonMain/kotlin/me/nathanfallet/extopy/repositories/users/IUsersRepository.kt

@@ -0,0 +1,10 @@
+package me.nathanfallet.extopy.repositories.users
+
+import me.nathanfallet.extopy.models.users.User
+
+interface IUsersRepository {
+
+    fun upsert(user: User)
+    fun get(id: String): User?
+
+}

shared/src/commonMain/kotlin/me/nathanfallet/extopy/repositories/users/UsersRepository.kt

@@ -0,0 +1,39 @@
+package me.nathanfallet.extopy.repositories.users
+
+import kotlinx.datetime.Clock
+import kotlinx.datetime.DateTimeUnit
+import kotlinx.datetime.TimeZone
+import kotlinx.datetime.plus
+import me.nathanfallet.extopy.database.Database
+import me.nathanfallet.extopy.database.Users
+import me.nathanfallet.extopy.models.users.User
+
+class UsersRepository(
+    private val database: Database,
+) : IUsersRepository {
+
+    override fun upsert(user: User) = database.usersQueries.upsert(
+        id = user.id,
+        displayName = user.displayName,
+        username = user.username,
+        email = user.email,
+        biography = user.biography,
+        avatar = user.avatar,
+        expiresFromCacheAt = Clock.System.now()
+            .plus(60, DateTimeUnit.SECOND, TimeZone.currentSystemDefault())
+            .toString()
+    )
+
+    override fun get(id: String): User? = database.usersQueries.get(id)
+        .executeAsOneOrNull()?.toUser()
+
+    private fun Users.toUser() = User(
+        id = id,
+        displayName = displayName,
+        username = username,
+        email = email,
+        biography = biography,
+        avatar = avatar
+    )
+
+}

shared/src/commonMain/kotlin/me/nathanfallet/extopy/usecases/users/FetchUserUseCase.kt

@@ -2,15 +2,16 @@ package me.nathanfallet.extopy.usecases.users
 
 import me.nathanfallet.extopy.client.IExtopyClient
 import me.nathanfallet.extopy.models.users.User
+import me.nathanfallet.extopy.repositories.users.IUsersRepository
 
 class FetchUserUseCase(
     private val client: IExtopyClient,
+    private val usersRepository: IUsersRepository,
 ) : IFetchUserUseCase {
 
     override suspend fun invoke(input: String): User? {
-        // TODO: Read from cache (local db)
-        return client.users.get(input)?.also {
-            // TODO: Save in cache (local db)
+        return usersRepository.get(input) ?: client.users.get(input)?.also {
+            usersRepository.upsert(it)
         }
     }
 

shared/src/commonMain/sqldelight/me/nathanfallet/extopy/database/PostsDatabase.sq

@@ -0,0 +1,15 @@
+CREATE TABLE posts (
+    id TEXT PRIMARY KEY,
+    userId TEXT,
+    body TEXT
+);
+
+insert:
+INSERT INTO posts (id, userId, body)
+VALUES (?, ? , ?);
+
+get:
+SELECT * FROM posts WHERE id = ?;
+
+delete:
+DELETE FROM posts WHERE id = ?;

shared/src/commonMain/sqldelight/me/nathanfallet/extopy/database/UsersDatabase.sq

@@ -0,0 +1,37 @@
+CREATE TABLE users (
+    id TEXT PRIMARY KEY NOT NULL,
+    displayName TEXT NOT NULL,
+    username TEXT NOT NULL,
+    email TEXT,
+    biography TEXT,
+    avatar TEXT,
+    expiresFromCacheAt TEXT NOT NULL
+);
+
+upsert {
+    UPDATE users
+    SET displayName = :displayName,
+        username = :username,
+        email = :email,
+        biography = :biography,
+        avatar = :avatar,
+        expiresFromCacheAt = :expiresFromCacheAt
+    WHERE id = :id;
+
+    INSERT OR IGNORE INTO users (id, displayName, username, email, biography, avatar, expiresFromCacheAt)
+    VALUES (
+    :id,
+    :displayName,
+    :username,
+    :email,
+    :biography,
+    :avatar,
+    :expiresFromCacheAt
+    );
+}
+
+get:
+SELECT * FROM users WHERE id = ?;
+
+delete:
+DELETE FROM users WHERE id = ?;

shared/src/iosMain/kotlin/me/nathanfallet/extopy/database/DatabaseDriverFactory.kt

@@ -5,8 +5,7 @@ import app.cash.sqldelight.driver.native.NativeSqliteDriver
 
 actual class DatabaseDriverFactory {
 
-    actual fun createDriver(): SqlDriver {
-        return NativeSqliteDriver(AppDatabase.Schema, "solar.db")
-    }
+    actual fun createDriver(): SqlDriver =
+        NativeSqliteDriver(AppDatabase.Schema, "extopy.db")
 
 }

shared/src/iosMain/kotlin/me/nathanfallet/extopy/di/Koin.kt

@@ -15,7 +15,7 @@ fun KoinApplication.Companion.start(): KoinApplication = startKoin {
     modules(sharedModule)
 }
 
-// MARK: - View models (we should not call any other class from iOS directly, only use cases)
+// MARK: - View models (we should not call any other class from iOS directly, only view models)
 
 val Koin.rootViewModel: RootViewModel get() = get()
 val Koin.authViewModel: AuthViewModel get() = get()

shared/src/iosMain/kotlin/me/nathanfallet/extopy/di/SwiftModule.kt

@@ -1,5 +1,6 @@
 package me.nathanfallet.extopy.di
 
+import me.nathanfallet.extopy.database.DatabaseDriverFactory
 import me.nathanfallet.extopy.models.application.ExtopyEnvironment
 import me.nathanfallet.extopy.repositories.application.ITokenRepository
 
@@ -9,6 +10,8 @@ object SwiftModule {
     lateinit var tokenRepository: ITokenRepository
 
     fun module() = org.koin.dsl.module {
+        single { DatabaseDriverFactory() }
+
         single { environment }
         single { tokenRepository }
     }