🔀 #89 from boostcampwm-2022/feat/running_tab

♻️ 문자열 상수로 변경, 취소 가능한 서스펜드 변경
boostcampwm-2022 · Dec 9, 2022 · 8ab338a · 8ab338a
2 parents a26b243 + 444ca57
commit 8ab338a
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 6 deletions.
diff --git a/data/src/main/java/com/whyranoid/data/constant/CollectionId.kt b/data/src/main/java/com/whyranoid/data/constant/CollectionId.kt
@@ -4,6 +4,7 @@ object CollectionId {
 
     const val USERS_COLLECTION = "Users"
     const val RUNNERS_COLLECTION = "Runners"
+    const val RUNNERS_ID = "runnersId"
     const val GROUPS_COLLECTION = "Groups"
     const val GROUP_NOTIFICATIONS_COLLECTION = "GroupNotifications"
     const val START_NOTIFICATION = "start"

diff --git a/data/src/main/java/com/whyranoid/data/running/RunnerDataSourceImpl.kt b/data/src/main/java/com/whyranoid/data/running/RunnerDataSourceImpl.kt
@@ -6,14 +6,14 @@ import com.whyranoid.data.constant.CollectionId
 import kotlinx.coroutines.channels.awaitClose
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.callbackFlow
+import kotlinx.coroutines.suspendCancellableCoroutine
 import kotlin.coroutines.resume
-import kotlin.coroutines.suspendCoroutine
 
 class RunnerDataSourceImpl(private val db: FirebaseFirestore) : RunnerDataSource {
 
     override fun getCurrentRunnerCount(): Flow<Int> = callbackFlow {
         db.collection(CollectionId.RUNNERS_COLLECTION)
-            .document("runnersId")
+            .document(CollectionId.RUNNERS_ID)
             .addSnapshotListener { snapshot, _ ->
                 snapshot?.let {
                     val count = it.data?.size ?: -1
@@ -26,9 +26,9 @@ class RunnerDataSourceImpl(private val db: FirebaseFirestore) : RunnerDataSource
 
     override suspend fun startRunning(uid: String): Boolean {
         if (uid.isBlank()) return false
-        return suspendCoroutine { continuation ->
+        return suspendCancellableCoroutine { continuation ->
             db.collection(CollectionId.RUNNERS_COLLECTION)
-                .document("runnersId")
+                .document(CollectionId.RUNNERS_ID)
                 .update(uid, uid)
                 .addOnSuccessListener {
                     continuation.resume(true)
@@ -41,9 +41,9 @@ class RunnerDataSourceImpl(private val db: FirebaseFirestore) : RunnerDataSource
 
     override suspend fun finishRunning(uid: String): Boolean {
         if (uid.isBlank()) return false
-        return suspendCoroutine { continuation ->
+        return suspendCancellableCoroutine { continuation ->
             db.collection(CollectionId.RUNNERS_COLLECTION)
-                .document("runnersId")
+                .document(CollectionId.RUNNERS_ID)
                 .update(uid, FieldValue.delete())
                 .addOnSuccessListener {
                     continuation.resume(true)