Removed io dispatcher (#73)

JackEblan · Oct 2, 2024 · 20d49a5 · 20d49a5
1 parent 6f9adad
commit 20d49a5
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 30 deletions.
diff --git a/core/network/build.gradle.kts b/core/network/build.gradle.kts
@@ -35,7 +35,6 @@ dependencies {
     implementation(platform(libs.firebase.bom))
     implementation(libs.firebase.firestore)
 
-    implementation(projects.core.common)
     implementation(projects.core.model)
 
     testImplementation(projects.core.testing)

diff --git a/...n/kotlin/com/eblan/socialworkreviewer/core/network/firestore/DefaultCategoryDataSource.kt b/...n/kotlin/com/eblan/socialworkreviewer/core/network/firestore/DefaultCategoryDataSource.kt
@@ -17,8 +17,6 @@
  */
 package com.eblan.socialworkreviewer.core.network.firestore
 
-import com.eblan.socialworkreviewer.core.common.Dispatcher
-import com.eblan.socialworkreviewer.core.common.SwrDispatchers.IO
 import com.eblan.socialworkreviewer.core.model.Category
 import com.eblan.socialworkreviewer.core.network.firestore.CategoryDataSource.Companion.CATEGORIES_COLLECTION
 import com.eblan.socialworkreviewer.core.network.mapper.toCategory
@@ -28,17 +26,14 @@ import com.google.firebase.firestore.FirebaseFirestore
 import com.google.firebase.firestore.Query
 import com.google.firebase.firestore.snapshots
 import com.google.firebase.firestore.toObject
-import kotlinx.coroutines.CoroutineDispatcher
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.distinctUntilChanged
 import kotlinx.coroutines.flow.mapNotNull
 import kotlinx.coroutines.tasks.await
-import kotlinx.coroutines.withContext
 import javax.inject.Inject
 
 internal class DefaultCategoryDataSource @Inject constructor(
     private val firestore: FirebaseFirestore,
-    @Dispatcher(IO) private val ioDispatcher: CoroutineDispatcher,
 ) : CategoryDataSource {
     override fun getCategoryDocuments(): Flow<List<Category>> {
         return firestore.collection(CATEGORIES_COLLECTION).orderBy(DATE, Query.Direction.ASCENDING)
@@ -54,16 +49,13 @@ internal class DefaultCategoryDataSource @Inject constructor(
     }
 
     override suspend fun getCategoryDocument(categoryDocumentId: String): Category? {
-        return withContext(ioDispatcher) {
-            val documentSnapshot =
-                firestore.collection(CATEGORIES_COLLECTION).document(categoryDocumentId).get()
-                    .await()
+        val documentSnapshot =
+            firestore.collection(CATEGORIES_COLLECTION).document(categoryDocumentId).get().await()
 
-            try {
-                toCategory(categoryDocument = documentSnapshot.toObject<CategoryDocument>())
-            } catch (e: RuntimeException) {
-                null
-            }
+        return try {
+            toCategory(categoryDocument = documentSnapshot.toObject<CategoryDocument>())
+        } catch (e: RuntimeException) {
+            null
         }
     }
 }
diff --git a/...n/kotlin/com/eblan/socialworkreviewer/core/network/firestore/DefaultQuestionDataSource.kt b/...n/kotlin/com/eblan/socialworkreviewer/core/network/firestore/DefaultQuestionDataSource.kt
@@ -17,35 +17,27 @@
  */
 package com.eblan.socialworkreviewer.core.network.firestore
 
-import com.eblan.socialworkreviewer.core.common.Dispatcher
-import com.eblan.socialworkreviewer.core.common.SwrDispatchers
 import com.eblan.socialworkreviewer.core.model.Question
 import com.eblan.socialworkreviewer.core.network.firestore.CategoryDataSource.Companion.CATEGORIES_COLLECTION
 import com.eblan.socialworkreviewer.core.network.firestore.QuestionDataSource.Companion.QUESTIONS_COLLECTION
 import com.eblan.socialworkreviewer.core.network.mapper.toQuestion
 import com.eblan.socialworkreviewer.core.network.model.QuestionDocument
 import com.google.firebase.firestore.FirebaseFirestore
 import com.google.firebase.firestore.toObject
-import kotlinx.coroutines.CoroutineDispatcher
 import kotlinx.coroutines.tasks.await
-import kotlinx.coroutines.withContext
 import javax.inject.Inject
 
 internal class DefaultQuestionDataSource @Inject constructor(
     private val firestore: FirebaseFirestore,
-    @Dispatcher(SwrDispatchers.IO) private val ioDispatcher: CoroutineDispatcher,
 ) : QuestionDataSource {
     override suspend fun getQuestions(id: String): List<Question> {
-        return withContext(ioDispatcher) {
-            firestore.collection(CATEGORIES_COLLECTION).document(id)
-                .collection(QUESTIONS_COLLECTION).get().await()
-                .mapNotNull { queryDocumentSnapshot ->
-                    try {
-                        toQuestion(questionDocument = queryDocumentSnapshot.toObject<QuestionDocument>())
-                    } catch (e: RuntimeException) {
-                        null
-                    }
+        return firestore.collection(CATEGORIES_COLLECTION).document(id)
+            .collection(QUESTIONS_COLLECTION).get().await().mapNotNull { queryDocumentSnapshot ->
+                try {
+                    toQuestion(questionDocument = queryDocumentSnapshot.toObject<QuestionDocument>())
+                } catch (e: RuntimeException) {
+                    null
                 }
-        }
+            }
     }
 }