♻️ 복잡한 콜백 구조 suspend로 변경(GroupList)

Author: soopeach

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

@@ -7,6 +7,7 @@ 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.CoroutineScope
 import kotlinx.coroutines.flow.Flow
 import javax.inject.Inject
 
@@ -20,7 +21,7 @@ class GroupRepositoryImpl @Inject constructor(
         return userDataSource.getMyGroupList(uid)
     }
 
-    override fun getMyGroupListFlow(uid: String) = userDataSource.getMyGroupListFlow(uid)
+    override fun getMyGroupListFlow(uid: String, coroutineScope: CoroutineScope) = userDataSource.getMyGroupListFlow(uid, coroutineScope)
 
     override suspend fun updateGroupInfo(
         groupId: String,

data/src/main/java/com/whyranoid/data/user/UserDataSource.kt

@@ -1,11 +1,12 @@
 package com.whyranoid.data.user
 
 import com.whyranoid.domain.model.GroupInfo
+import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.flow.Flow
 
 interface UserDataSource {
 
     suspend fun getMyGroupList(uid: String): Result<List<GroupInfo>>
 
-    fun getMyGroupListFlow(uid: String): Flow<List<GroupInfo>>
+    fun getMyGroupListFlow(uid: String, coroutineScope: CoroutineScope): Flow<List<GroupInfo>>
 }

data/src/main/java/com/whyranoid/data/user/UserDataSourceImpl.kt

@@ -11,10 +11,13 @@ import com.whyranoid.data.model.UserResponse
 import com.whyranoid.data.model.toGroupInfo
 import com.whyranoid.data.model.toUser
 import com.whyranoid.domain.model.GroupInfo
+import com.whyranoid.domain.model.User
 import com.whyranoid.domain.model.toRule
+import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.channels.awaitClose
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.callbackFlow
+import kotlinx.coroutines.launch
 import kotlinx.coroutines.tasks.await
 import javax.inject.Inject
 
@@ -62,9 +65,11 @@ class UserDataSourceImpl @Inject constructor(
         }
     }
 
-    // TODO: 콜백을 suspend로 변경
     // TODO: 예외처리
-    override fun getMyGroupListFlow(uid: String): Flow<List<GroupInfo>> = callbackFlow {
+    override fun getMyGroupListFlow(
+        uid: String,
+        coroutineScope: CoroutineScope
+    ): Flow<List<GroupInfo>> = callbackFlow {
         db.collection(USERS_COLLECTION)
             .document(uid)
             .addSnapshotListener { documentSnapshot, _ ->
@@ -74,39 +79,45 @@ class UserDataSourceImpl @Inject constructor(
 
                 joinedGroupList?.forEach { groupId ->
 
-                    db.collection(GROUPS_COLLECTION)
-                        .document(groupId)
-                        .get()
-                        .addOnSuccessListener { documentSnapshot ->
-
-                            val groupInfoResponse =
-                                documentSnapshot.toObject(GroupInfoResponse::class.java)
-
-                            groupInfoResponse?.let {
-                                db.collection(USERS_COLLECTION)
-                                    .document(it.leaderId)
-                                    .get()
-                                    .addOnSuccessListener { documentSnapshot ->
-                                        val leader =
-                                            documentSnapshot.toObject(UserResponse::class.java)
-                                                ?.toUser()
-
-                                        leader?.let {
-                                            val groupInfo = groupInfoResponse.toGroupInfo(
-                                                leader = leader,
-                                                rules = groupInfoResponse.rules.map {
-                                                    it.toRule()
-                                                }
-                                            )
-                                            myGroupInfoList.add(groupInfo)
-                                            trySend(myGroupInfoList)
-                                        }
-                                    }
-                            }
-                        }
+                    coroutineScope.launch {
+                        val groupInfo = getGroupInfo(groupId)
+                        myGroupInfoList.add(groupInfo)
+                        trySend(myGroupInfoList)
+                    }
                 }
             }
 
         awaitClose()
     }
+
+    // TODO : 예외 처리
+    private suspend fun getGroupInfo(groupId: String): GroupInfo {
+        val groupInfoResponse = requireNotNull(
+            db.collection(GROUPS_COLLECTION)
+                .document(groupId)
+                .get()
+                .await()
+                .toObject(GroupInfoResponse::class.java)
+        )
+
+        val leader = getLeaderInfo(groupInfoResponse.leaderId)
+
+        return groupInfoResponse.toGroupInfo(
+            leader = leader,
+            rules = groupInfoResponse.rules.map {
+                it.toRule()
+            }
+        )
+    }
+
+    // TODO : 예외 처리
+    private suspend fun getLeaderInfo(leaderId: String): User {
+        return requireNotNull(
+            db.collection(USERS_COLLECTION)
+                .document(leaderId)
+                .get()
+                .await()
+                .toObject(UserResponse::class.java)?.toUser()
+        )
+    }
 }

domain/src/main/java/com/whyranoid/domain/repository/GroupRepository.kt

@@ -4,13 +4,14 @@ 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 kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.flow.Flow
 
 interface GroupRepository {
 
     suspend fun getMyGroupList(uid: String): Result<List<GroupInfo>>
 
-    fun getMyGroupListFlow(uid: String): Flow<List<GroupInfo>>
+    fun getMyGroupListFlow(uid: String, coroutineScope: CoroutineScope): Flow<List<GroupInfo>>
 
     // 그룹 정보 수정, 홍보 글 수정
     suspend fun updateGroupInfo(

domain/src/main/java/com/whyranoid/domain/usecase/GetMyGroupListUseCase.kt

@@ -3,15 +3,16 @@ package com.whyranoid.domain.usecase
 import com.whyranoid.domain.model.GroupInfo
 import com.whyranoid.domain.repository.AccountRepository
 import com.whyranoid.domain.repository.GroupRepository
+import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.flow.Flow
 import javax.inject.Inject
 
 class GetMyGroupListUseCase @Inject constructor(
     private val groupRepository: GroupRepository,
     private val accountRepository: AccountRepository
 ) {
-    suspend operator fun invoke(): Flow<List<GroupInfo>> {
+    suspend operator fun invoke(coroutineScope: CoroutineScope): Flow<List<GroupInfo>> {
         val uid = accountRepository.getUid()
-        return groupRepository.getMyGroupListFlow(uid)
+        return groupRepository.getMyGroupListFlow(uid, coroutineScope)
     }
 }

presentation/src/main/java/com/whyranoid/presentation/community/CommunityViewModel.kt

@@ -82,7 +82,7 @@ class CommunityViewModel @Inject constructor(
 
     init {
         viewModelScope.launch {
-            getMyGroupListUseCase().onEach { groupInfoList ->
+            getMyGroupListUseCase(this).onEach { groupInfoList ->
                 _myGroupList.value = groupInfoList.map { groupInfo ->
                     groupInfo.toGroupInfoUiModel()
                 }