✨ 운동 종료 알림 데이터 형식 변경 및 그에 따른 DataSource 수정

Author: soopeach

data/src/main/java/com/whyranoid/data/constant/CollectionId.kt

@@ -9,4 +9,5 @@ object CollectionId {
     const val START_NOTIFICATION = "start"
     const val FINISH_NOTIFICATION = "finish"
     const val POST_COLLECTION = "Posts"
+    const val RUNNING_HISTORY_COLLECTION = "RunningHistory"
 }

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

@@ -3,12 +3,14 @@ package com.whyranoid.data.groupnotification
 import com.google.firebase.firestore.FirebaseFirestore
 import com.whyranoid.data.constant.CollectionId.FINISH_NOTIFICATION
 import com.whyranoid.data.constant.CollectionId.GROUP_NOTIFICATIONS_COLLECTION
+import com.whyranoid.data.constant.CollectionId.RUNNING_HISTORY_COLLECTION
 import com.whyranoid.data.constant.CollectionId.START_NOTIFICATION
 import com.whyranoid.data.model.FinishNotificationResponse
 import com.whyranoid.data.model.StartNotificationResponse
-import com.whyranoid.data.model.toFinishNotification
 import com.whyranoid.data.model.toStartNotification
+import com.whyranoid.domain.model.FinishNotification
 import com.whyranoid.domain.model.GroupNotification
+import com.whyranoid.domain.model.RunningHistory
 import com.whyranoid.domain.model.StartNotification
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.FlowPreview
@@ -79,9 +81,26 @@ class GroupNotificationDataSource @Inject constructor(
                 .addSnapshotListener { snapshot, error ->
                     val finishNotificationList = mutableListOf<GroupNotification>()
                     snapshot?.forEach { document ->
-                        val finishNotification =
+                        val finishNotificationResponse =
                             document.toObject(FinishNotificationResponse::class.java)
-                        finishNotificationList.add(finishNotification.toFinishNotification())
+
+                        finishNotificationResponse.let { finishNotificationResponse ->
+                            db.collection(RUNNING_HISTORY_COLLECTION)
+                                .document(finishNotificationResponse.historyId)
+                                .get()
+                                .addOnSuccessListener {
+                                    val runningHistory = it.toObject(RunningHistory::class.java)
+
+                                    runningHistory?.let {
+                                        finishNotificationList.add(
+                                            FinishNotification(
+                                                uid = finishNotificationResponse.uid,
+                                                runningHistory = runningHistory
+                                            )
+                                        )
+                                    }
+                                }
+                        }
                     }
                     trySend(finishNotificationList)
                 }

data/src/main/java/com/whyranoid/data/model/GroupNotificationResponse.kt

@@ -1,7 +1,5 @@
 package com.whyranoid.data.model
 
-import com.whyranoid.domain.model.FinishNotification
-import com.whyranoid.domain.model.RunningHistory
 import com.whyranoid.domain.model.StartNotification
 
 sealed interface GroupNotificationResponse {
@@ -18,29 +16,11 @@ data class StartNotificationResponse(
 data class FinishNotificationResponse(
     override val type: String = "",
     override val uid: String = "",
-    val finishedAt: Long = 0L,
-    val historyId: String = "",
-    val pace: Double = 0.0,
-    val startedAt: Long = 0L,
-    val totalDistance: Double = 0.0,
-    val totalRunningTime: Int = 0
+    val historyId: String = ""
 ) : GroupNotificationResponse
 
 fun StartNotificationResponse.toStartNotification() =
     StartNotification(
         uid = this.uid,
         startedAt = this.startedAt
     )
-
-fun FinishNotificationResponse.toFinishNotification() =
-    FinishNotification(
-        uid = this.uid,
-        runningHistory = RunningHistory(
-            historyId = this.historyId,
-            startedAt = this.startedAt,
-            finishedAt = this.finishedAt,
-            totalRunningTime = this.totalRunningTime,
-            pace = this.pace,
-            totalDistance = this.totalDistance
-        )
-    )

domain/src/main/java/com/whyranoid/domain/model/RunningHistory.kt

@@ -1,10 +1,10 @@
 package com.whyranoid.domain.model
 
 data class RunningHistory(
-    val historyId: String,
-    val startedAt: Long,
-    val finishedAt: Long,
-    val totalRunningTime: Int,
-    val pace: Double,
-    val totalDistance: Double
+    val historyId: String = "",
+    val startedAt: Long = 0L,
+    val finishedAt: Long = 0L,
+    val totalRunningTime: Int = 0,
+    val pace: Double = 0.0,
+    val totalDistance: Double = 0.0
 )