refactor

Author: f-arslan

core/domain/src/main/kotlin/com/espressodev/gptmap/core/domain/AddDatabaseIfUserIsNewUseCase.kt

@@ -1,28 +1,22 @@
 package com.espressodev.gptmap.core.domain
 
-import com.espressodev.gptmap.core.data.AccountService
 import com.espressodev.gptmap.core.data.FirestoreService
-import com.espressodev.gptmap.core.model.Exceptions
 import com.espressodev.gptmap.core.mongodb.RealmSyncService
 import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.async
 import kotlinx.coroutines.withContext
 import javax.inject.Inject
 
 class AddDatabaseIfUserIsNewUseCase @Inject constructor(
-    private val accountService: AccountService,
     private val firestoreService: FirestoreService,
     private val realmSyncService: RealmSyncService
 ) {
     suspend operator fun invoke(): Result<Boolean> = withContext(Dispatchers.IO) {
-        val isUserInRealmDb = async { realmSyncService.isUserInDatabase() }.await()
-        if (isUserInRealmDb) {
-            return@withContext Result.success(value = true)
+        runCatching {
+            val isUserInRealmDb = realmSyncService.isUserInDatabase().getOrThrow()
+            if (isUserInRealmDb) return@runCatching true
+            val realmUser = firestoreService.getUser().toRealmUser()
+            realmSyncService.saveUser(realmUser).getOrThrow()
+            true
         }
-        val realmUser =
-            accountService.userId?.let { userId -> firestoreService.getUser(userId).toRealmUser() }
-                ?: throw Exceptions.FirebaseUserIsNullException()
-        realmSyncService.saveUser(realmUser).getOrThrow()
-        Result.success(value = true)
     }
 }

core/mongodb/src/main/kotlin/com/espressodev/gptmap/core/mongodb/RealmSyncService.kt

@@ -14,13 +14,11 @@ interface RealmSyncService {
 
     suspend fun saveImageAnalysis(realmImageAnalysis: RealmImageAnalysis): Result<Boolean>
 
-    fun isUserInDatabase(): Boolean
+    fun isUserInDatabase(): Result<Boolean>
 
     fun getFavourites(): Flow<List<Favourite>>
 
     fun getFavourite(id: String): Favourite
 
     fun getImageAnalyses(): Flow<List<ImageAnalysis>>
-
-    suspend fun getImageAnalysis(id: String): Result<ImageAnalysis>
 }

core/mongodb/src/main/kotlin/com/espressodev/gptmap/core/mongodb/impl/RealmSyncServiceImpl.kt

@@ -13,10 +13,8 @@ import com.espressodev.gptmap.core.mongodb.module.RealmModule.realm
 import com.espressodev.gptmap.core.mongodb.module.RealmModule.realmUser
 import io.realm.kotlin.UpdatePolicy
 import io.realm.kotlin.ext.query
-import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.map
-import kotlinx.coroutines.withContext
 
 class RealmSyncServiceImpl : RealmSyncService {
 
@@ -84,21 +82,7 @@ class RealmSyncServiceImpl : RealmSyncService {
             it.list.map { realmImageAnalysis -> realmImageAnalysis.toImageAnalysis() }
         }
 
-    override suspend fun getImageAnalysis(id: String): Result<ImageAnalysis> =
-        withContext(Dispatchers.IO) {
-            runCatching {
-                realm.query<RealmImageAnalysis>(
-                    "userId == $0 AND imageId == $1",
-                    realmUserId,
-                    id
-                )
-                    .find()
-                    .first()
-                    .toImageAnalysis()
-            }
-        }
-
-    override fun isUserInDatabase(): Boolean =
+    override fun isUserInDatabase(): Result<Boolean> = runCatching {
         realm.query<RealmUser>("userId == $0", realmUserId).first().find() != null
-
+    }
 }

gradle/libs.versions.toml

@@ -6,20 +6,20 @@ androidxComposeBom = "2023.10.01"
 androidxComposeCompiler = "1.5.3"  # Compose VC
 androidxCoreSplashscreen = "1.0.1"
 androidxHiltNavigationCompose = "1.1.0"
-androidxLifecycle = "2.6.2"
+androidxLifecycle = "2.7.0"
 androidxNavigation = "2.7.6"
 androidxTestExt = "1.1.5"
-androidxTestRunner = "1.5.0"
+androidxTestRunner = "1.5.2"
 androidxWork = "2.9.0"
-firebaseBom = "32.7.0"
+firebaseBom = "32.7.1"
 firebaseCrashlyticsPlugin = "2.9.9"
-firebase-crashlytics = "18.6.0"
-firebase-auth = "22.3.0"
-firebase-firestore = "24.10.0"
+firebase-crashlytics = "18.6.1"
+firebase-auth = "22.3.1"
+firebase-firestore = "24.10.1"
 firebase-analytics = "21.5.0"
 firebase-messaging = "23.4.0"
 gmsPlugin = "4.4.0"
-hilt = "2.48.1"
+hilt = "2.50"
 hiltExt = "1.1.0"
 kotlin = "1.9.10"  # Can't update due to Realm
 kotlinxCoroutines = "1.7.3"
@@ -42,15 +42,15 @@ junitVersion = "4.13.2"
 espressoCore = "3.5.1"
 appcompat = "1.6.1"
 coilCompose = "2.5.0"
-generativeai = "0.1.1"
+generativeai = "0.1.2"
 lottieCompose = "6.2.0"
 firebaseStorage = "20.3.0"
 kotlin2 = "1.9.10"
 coreKtxVersion = "1.12.0"
 baseJunit = "4.13.2"
 espressoCoreVersion = "3.5.1"
 appcompatVersion = "1.6.1"
-material = "1.11.0"
+material = "1.5.4"
 detekt = "1.23.3"
 detektCompose = "0.3.8"
 kotlinxCollectionsImmutable = "0.3.6"
@@ -65,6 +65,7 @@ turbine = "1.0.0"
 # Compose
 androidx-activity-compose = { group = "androidx.activity", name = "activity-compose", version.ref = "androidxActivity" }
 androidx-compose-foundation = { group = "androidx.compose.foundation", name = "foundation" }
+androidx-compose-material = { group = "androidx.compose.material", name = "material", version.ref = "material" }
 androidx-compose-foundation-layout = { group = "androidx.compose.foundation", name = "foundation-layout" }
 androidx-compose-material-iconsExtended = { group = "androidx.compose.material", name = "material-icons-extended" }
 androidx-compose-material3 = { group = "androidx.compose.material3", name = "material3" }
@@ -171,9 +172,6 @@ kotlin-gradlePlugin = { group = "org.jetbrains.kotlin", name = "kotlin-gradle-pl
 ksp-gradlePlugin = { group = "com.google.devtools.ksp", name = "com.google.devtools.ksp.gradle.plugin", version.ref = "ksp" }
 androidx-core-ktx = { group = "androidx.core", name = "core-ktx", version.ref = "coreKtxVersion" }
 junit = { group = "junit", name = "junit", version.ref = "baseJunit" }
-androidx-espresso-core = { group = "androidx.test.espresso", name = "espresso-core", version.ref = "espressoCoreVersion" }
-androidx-appcompat = { group = "androidx.appcompat", name = "appcompat", version.ref = "appcompatVersion" }
-material = { group = "com.google.android.material", name = "material", version.ref = "material" }
 # End of it
 
 [plugins]