🔀 #57 from boostcampwm-2022/feat/running_tab

러닝 화면 개선 및 러닝 종료 화면 구현

Author: soopeach

data/src/main/java/com/whyranoid/data/account/RunningHistoryDao.kt

@@ -4,6 +4,7 @@ import androidx.room.Dao
 import androidx.room.Insert
 import androidx.room.OnConflictStrategy
 import androidx.room.Query
+import com.whyranoid.data.model.RunningHistoryEntity
 import kotlinx.coroutines.flow.Flow
 
 @Dao

data/src/main/java/com/whyranoid/data/account/RunningHistoryLocalDataBase.kt

@@ -2,6 +2,7 @@ package com.whyranoid.data.account
 
 import androidx.room.Database
 import androidx.room.RoomDatabase
+import com.whyranoid.data.model.RunningHistoryEntity
 
 @Database(
     entities = [RunningHistoryEntity::class],

data/src/main/java/com/whyranoid/data/account/RunningHistoryLocalDataSource.kt

@@ -1,8 +1,10 @@
 package com.whyranoid.data.account
 
+import com.whyranoid.data.model.RunningHistoryEntity
 import com.whyranoid.domain.model.RunningHistory
 import kotlinx.coroutines.flow.Flow
 
 interface RunningHistoryLocalDataSource {
     fun getRunningHistory(): Flow<Result<List<RunningHistory>>>
+    suspend fun saveRunningHistory(runningHistoryEntity: RunningHistoryEntity): Result<RunningHistory>
 }

data/src/main/java/com/whyranoid/data/account/RunningHistoryLocalDataSourceImpl.kt

@@ -1,5 +1,7 @@
 package com.whyranoid.data.account
 
+import com.whyranoid.data.model.RunningHistoryEntity
+import com.whyranoid.data.model.toRunningHistory
 import com.whyranoid.domain.model.RunningHistory
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.map
@@ -18,4 +20,11 @@ class RunningHistoryLocalDataSourceImpl @Inject constructor(
             }
         }
     }
+
+    override suspend fun saveRunningHistory(runningHistoryEntity: RunningHistoryEntity): Result<RunningHistory> {
+        return kotlin.runCatching {
+            runningHistoryDao.addRunningHistory(runningHistoryEntity)
+            runningHistoryEntity.toRunningHistory()
+        }
+    }
 }

data/src/main/java/com/whyranoid/data/account/RunningHistoryRepositoryImpl.kt

@@ -1,5 +1,6 @@
 package com.whyranoid.data.account
 
+import com.whyranoid.data.model.RunningHistoryEntity
 import com.whyranoid.domain.model.RunningHistory
 import com.whyranoid.domain.repository.RunningHistoryRepository
 import kotlinx.coroutines.flow.Flow
@@ -17,12 +18,22 @@ class RunningHistoryRepositoryImpl @Inject constructor(
     }
 
     override suspend fun saveRunningHistory(
+        historyId: String,
         startedAt: Long,
         finishedAt: Long,
         totalRunningTime: Int,
         pace: Double,
         totalDistance: Double
     ): Result<RunningHistory> {
-        TODO("Not yet implemented")
+        return runningHistoryLocalDataSource.saveRunningHistory(
+            RunningHistoryEntity(
+                historyId = historyId,
+                startedAt = startedAt,
+                finishedAt = finishedAt,
+                totalRunningTime = totalRunningTime,
+                pace = pace,
+                totalDistance = totalDistance
+            )
+        )
     }
 }

data/src/main/java/com/whyranoid/data/group/GroupRepositoryImpl.kt

@@ -5,6 +5,7 @@ import com.whyranoid.data.user.UserDataSource
 import com.whyranoid.domain.model.GroupInfo
 import com.whyranoid.domain.model.GroupNotification
 import com.whyranoid.domain.model.Rule
+import com.whyranoid.domain.model.RunningHistory
 import com.whyranoid.domain.repository.GroupRepository
 import kotlinx.coroutines.flow.Flow
 import javax.inject.Inject
@@ -50,6 +51,14 @@ class GroupRepositoryImpl @Inject constructor(
         groupNotificationDataSource.notifyRunningStart(uid, groupIdList)
     }
 
+    override suspend fun notifyRunningFinish(
+        uid: String,
+        runningHistory: RunningHistory,
+        groupIdList: List<String>
+    ) {
+        groupNotificationDataSource.notifyRunningFinish(uid, runningHistory, groupIdList)
+    }
+
     override suspend fun createGroup(
         groupName: String,
         introduce: String,

data/src/main/java/com/whyranoid/data/groupnotification/GroupNotificationDataSource.kt

@@ -73,6 +73,28 @@ class GroupNotificationDataSource @Inject constructor(
         }
     }
 
+    suspend fun notifyRunningFinish(
+        uid: String,
+        runningHistory: RunningHistory,
+        groupIdList: List<String>
+    ) {
+        withContext(Dispatchers.IO) {
+            groupIdList.forEach { groupId ->
+                db.collection(GROUP_NOTIFICATIONS_COLLECTION)
+                    .document(groupId)
+                    .collection(FINISH_NOTIFICATION)
+                    .document(UUID.randomUUID().toString())
+                    .set(
+                        FinishNotificationResponse(
+                            type = "finish",
+                            uid = uid,
+                            historyId = runningHistory.historyId
+                        )
+                    )
+            }
+        }
+    }
+
     private fun getGroupFinishNotifications(groupId: String): Flow<List<GroupNotification>> =
         callbackFlow {
             db.collection(GROUP_NOTIFICATIONS_COLLECTION)

data/src/main/java/com/whyranoid/data/account/RunningHistoryEntity.kt renamed to data/src/main/java/com/whyranoid/data/model/RunningHistoryEntity.kt

@@ -1,4 +1,4 @@
-package com.whyranoid.data.account
+package com.whyranoid.data.model
 
 import androidx.room.ColumnInfo
 import androidx.room.Entity

data/src/main/java/com/whyranoid/data/running/RunnerDataSourceImpl.kt

@@ -2,6 +2,7 @@ package com.whyranoid.data.running
 
 import com.google.firebase.firestore.FieldValue
 import com.google.firebase.firestore.FirebaseFirestore
+import com.whyranoid.data.constant.CollectionId
 import kotlinx.coroutines.channels.awaitClose
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.callbackFlow
@@ -11,7 +12,7 @@ import kotlin.coroutines.suspendCoroutine
 class RunnerDataSourceImpl(private val db: FirebaseFirestore) : RunnerDataSource {
 
     override fun getCurrentRunnerCount(): Flow<Int> = callbackFlow {
-        db.collection("Runners")
+        db.collection(CollectionId.RUNNERS_COLLECTION)
             .document("runnersId")
             .addSnapshotListener { snapshot, _ ->
                 snapshot?.let {
@@ -24,8 +25,9 @@ class RunnerDataSourceImpl(private val db: FirebaseFirestore) : RunnerDataSource
     }
 
     override suspend fun startRunning(uid: String): Boolean {
+        if (uid.isBlank()) return false
         return suspendCoroutine { continuation ->
-            db.collection("Runners")
+            db.collection(CollectionId.RUNNERS_COLLECTION)
                 .document("runnersId")
                 .update(uid, uid)
                 .addOnSuccessListener {
@@ -38,9 +40,9 @@ class RunnerDataSourceImpl(private val db: FirebaseFirestore) : RunnerDataSource
     }
 
     override suspend fun finishRunning(uid: String): Boolean {
-        // TODO 구현
+        if (uid.isBlank()) return false
         return suspendCoroutine { continuation ->
-            db.collection("Runners")
+            db.collection(CollectionId.RUNNERS_COLLECTION)
                 .document("runnersId")
                 .update(uid, FieldValue.delete())
                 .addOnSuccessListener {

data/src/main/java/com/whyranoid/data/running/RunnerRepositoryImpl.kt

@@ -13,6 +13,6 @@ class RunnerRepositoryImpl(private val runnerDataSource: RunnerDataSource) : Run
     }
 
     override suspend fun finishRunning(uid: String): Boolean {
-        return true
+        return runnerDataSource.finishRunning(uid)
     }
 }