Add fallback for empty userId by using null in Firestore query

canopas · Jan 10, 2025 · ac43e50 · ac43e50
1 parent 6391d5e
commit ac43e50
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/data/src/main/java/com/canopas/yourspace/data/service/user/ApiUserService.kt b/data/src/main/java/com/canopas/yourspace/data/service/user/ApiUserService.kt
@@ -49,7 +49,8 @@ class ApiUserService @Inject constructor(
 
     suspend fun getUser(userId: String): ApiUser? {
         return try {
-            val user = userRef.document(userId).get().await().toObject(ApiUser::class.java)
+            val user = userRef.document(userId.takeIf { it.isNotBlank() } ?: "null").get().await()
+                .toObject(ApiUser::class.java)
             when {
                 user == null -> null
                 currentUser == null || user.id != currentUser.id -> user
@@ -107,7 +108,7 @@ class ApiUserService @Inject constructor(
                 last_name = account?.familyName ?: "",
                 provider_firebase_id_token = firebaseToken,
                 profile_image = account?.photoUrl?.toString() ?: firebaseUser?.photoUrl?.toString()
-                    ?: ""
+                ?: ""
             )
             userRef.document(uid).set(user).await()
             val sessionDocRef = sessionRef(user.id).document()