♻️ Flow로 받아오던 uid를 1번만 받아서 string으로 반환하도록 수정

peter-j0y · peter-j0y · commit dbba00d82cdd · 2022-12-01T14:01:50.000+09:00
diff --git a/data/src/main/java/com/whyranoid/data/account/AccountDataSource.kt b/data/src/main/java/com/whyranoid/data/account/AccountDataSource.kt
@@ -5,7 +5,7 @@ import kotlinx.coroutines.flow.Flow
 interface AccountDataSource {
     fun getUserNickName(): Flow<String>
     fun getUserProfileImgUri(): Flow<String>
-    fun getUserUid(): Flow<String>
+    suspend fun getUserUid(): String
     fun getEmail(): Flow<Result<String>>
     suspend fun updateUserNickName(uid: String, newNickName: String): Result<String>
     suspend fun signOut(): Result<Boolean>
diff --git a/data/src/main/java/com/whyranoid/data/account/AccountDataSourceImpl.kt b/data/src/main/java/com/whyranoid/data/account/AccountDataSourceImpl.kt
@@ -11,6 +11,7 @@ import com.whyranoid.data.account.AccountDataSourceImpl.PreferenceKeys.nickName
 import com.whyranoid.data.account.AccountDataSourceImpl.PreferenceKeys.profileImgUri
 import com.whyranoid.data.account.AccountDataSourceImpl.PreferenceKeys.uid
 import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.flow.first
 import kotlinx.coroutines.flow.map
 import javax.inject.Inject
 
@@ -39,10 +40,10 @@ class AccountDataSourceImpl @Inject constructor(
             preferences[profileImgUri] ?: EMPTY_STRING
         }
 
-    override fun getUserUid() = dataStoreDb.data
+    override suspend fun getUserUid(): String = dataStoreDb.data
         .map { preferences ->
             preferences[uid] ?: EMPTY_STRING
-        }
+        }.first()
 
     override fun getEmail(): Flow<Result<String>> {
         return dataStoreDb.data
diff --git a/data/src/main/java/com/whyranoid/data/account/AccountRepositoryImpl.kt b/data/src/main/java/com/whyranoid/data/account/AccountRepositoryImpl.kt
@@ -17,7 +17,7 @@ class AccountRepositoryImpl @Inject constructor(
         return true
     }
 
-    override fun getUid(): Flow<String> {
+    override suspend fun getUid(): String {
         return accountDataSource.getUserUid()
     }
 
diff --git a/data/src/main/java/com/whyranoid/data/di/PostModule.kt b/data/src/main/java/com/whyranoid/data/di/PostModule.kt
@@ -1,6 +1,6 @@
 package com.whyranoid.data.di
 
-import com.whyranoid.data.Post.PostRepositoryImpl
+import com.whyranoid.data.post.PostRepositoryImpl
 import com.whyranoid.domain.repository.PostRepository
 import dagger.Binds
 import dagger.Module
diff --git a/data/src/main/java/com/whyranoid/data/post/PostDataSourceImpl.kt b/data/src/main/java/com/whyranoid/data/post/PostDataSourceImpl.kt
@@ -1,5 +1,6 @@
-package com.whyranoid.data.Post
+package com.whyranoid.data.post
 
+import android.util.Log
 import com.google.firebase.firestore.FirebaseFirestore
 import com.google.firebase.firestore.Query
 import com.whyranoid.data.constant.CollectionId
@@ -24,7 +25,7 @@ import java.util.*
 import javax.inject.Inject
 import kotlin.coroutines.resume
 
-class PostDataSource @Inject constructor(
+class PostDataSourceImpl @Inject constructor(
     private val db: FirebaseFirestore
 ) {
 
@@ -145,4 +146,35 @@ class PostDataSource @Inject constructor(
                 }
         }
     }
+
+    suspend fun createRunningPost(
+        authorUid: String,
+        runningHistory: RunningHistory,
+        content: String
+    ): Result<Boolean> {
+        val postId = UUID.randomUUID().toString()
+        Log.d("createRunningPost: 파이어베이스 성공", "ㅛㅅ")
+        return runCatching {
+            suspendCancellableCoroutine { cancellableContinuation ->
+
+                db.collection(CollectionId.POST_COLLECTION)
+                    .document(postId)
+                    .set(
+                        RunningPostResponse(
+                            postId = "seungmin_post_id",
+                            authorId = "seungmin",
+                            updatedAt = 879696,
+                            runningHistoryId = "asdf",
+                            content = "jkkjkjg"
+                        )
+                    ).addOnSuccessListener {
+                        Log.d("createRunningPost: 파이어베이스 성공", "ㅛㅅ")
+                        cancellableContinuation.resume(true)
+                    }.addOnFailureListener {
+                        Log.d("createRunningPost: 파이어베이스 실패", "ㅛㅅ")
+                        cancellableContinuation.resume(false)
+                    }
+            }
+        }
+    }
 }
diff --git a/data/src/main/java/com/whyranoid/data/post/PostRepositoryImpl.kt b/data/src/main/java/com/whyranoid/data/post/PostRepositoryImpl.kt
@@ -1,14 +1,13 @@
-package com.whyranoid.data.Post
+package com.whyranoid.data.post
 
 import com.whyranoid.domain.model.Post
 import com.whyranoid.domain.model.RunningHistory
-import com.whyranoid.domain.model.User
 import com.whyranoid.domain.repository.PostRepository
 import kotlinx.coroutines.flow.Flow
 import javax.inject.Inject
 
 class PostRepositoryImpl @Inject constructor(
-    private val postDataSource: PostDataSource
+    private val postDataSourceImpl: PostDataSourceImpl
 ) : PostRepository {
 
     // TODO : 페이징처리하기
@@ -17,23 +16,22 @@ class PostRepositoryImpl @Inject constructor(
     }
 
     override fun getAllPostFlow(): Flow<List<Post>> {
-        return postDataSource.getAllPostFlow()
+        return postDataSourceImpl.getAllPostFlow()
     }
 
-    override suspend fun createPost(
-        user: User,
-        postContent: String,
+    override suspend fun createRunningPost(
+        authorUid: String,
         runningHistory: RunningHistory,
-        updatedAt: Long
-    ): Boolean {
-        TODO("Not yet implemented")
+        content: String
+    ): Result<Boolean> {
+        return postDataSourceImpl.createRunningPost(authorUid, runningHistory, content)
     }
 
     override suspend fun createRecruitPost(
         authorUid: String,
         groupUid: String
     ): Boolean {
-        return postDataSource.createRecruitPost(authorUid, groupUid)
+        return postDataSourceImpl.createRecruitPost(authorUid, groupUid)
     }
 
     override suspend fun deletePost(postId: String): Boolean {
diff --git a/domain/src/main/java/com/whyranoid/domain/repository/AccountRepository.kt b/domain/src/main/java/com/whyranoid/domain/repository/AccountRepository.kt
@@ -12,7 +12,7 @@ interface AccountRepository {
     suspend fun loginUser(): Boolean
 
     // 데이터스토어에서 uid 가져오기
-    fun getUid(): Flow<String>
+    suspend fun getUid(): String
 
     // 데이터스토어에서 닉네임 가져오기
     fun getNickname(): Flow<String>
diff --git a/domain/src/main/java/com/whyranoid/domain/repository/PostRepository.kt b/domain/src/main/java/com/whyranoid/domain/repository/PostRepository.kt
@@ -2,7 +2,6 @@ package com.whyranoid.domain.repository
 
 import com.whyranoid.domain.model.Post
 import com.whyranoid.domain.model.RunningHistory
-import com.whyranoid.domain.model.User
 import kotlinx.coroutines.flow.Flow
 
 interface PostRepository {
@@ -14,12 +13,11 @@ interface PostRepository {
     fun getAllPostFlow(): Flow<List<Post>>
 
     // 글 작성하기 - 리모트
-    suspend fun createPost(
-        user: User,
-        postContent: String,
+    suspend fun createRunningPost(
+        authorUid: String,
         runningHistory: RunningHistory,
-        updatedAt: Long
-    ): Boolean
+        content: String
+    ): Result<Boolean>
 
     suspend fun createRecruitPost(
         authorUid: String,
diff --git a/domain/src/main/java/com/whyranoid/domain/usecase/CreateRunningPostUseCase.kt b/domain/src/main/java/com/whyranoid/domain/usecase/CreateRunningPostUseCase.kt
@@ -5,20 +5,14 @@ import com.whyranoid.domain.repository.AccountRepository
 import com.whyranoid.domain.repository.PostRepository
 import javax.inject.Inject
 
-class CreatePostUseCase @Inject constructor(
+class CreateRunningPostUseCase @Inject constructor(
     private val postRepository: PostRepository,
     private val accountRepository: AccountRepository
 ) {
     suspend operator fun invoke(
         postContent: String,
-        runningHistory: RunningHistory,
-        updatedAt: Long
-    ): Boolean {
-        accountRepository.getUser().onSuccess { user ->
-            return postRepository.createPost(user, postContent, runningHistory, updatedAt)
-        }.onFailure {
-            println("User 정보 없음")
-        }
-        return false
+        runningHistory: RunningHistory
+    ): Result<Boolean> {
+        return postRepository.createRunningPost(accountRepository.getUid(), runningHistory, postContent)
     }
 }
diff --git a/domain/src/main/java/com/whyranoid/domain/usecase/FinishRunningUseCase.kt b/domain/src/main/java/com/whyranoid/domain/usecase/FinishRunningUseCase.kt
@@ -9,9 +9,7 @@ class FinishRunningUseCase @Inject constructor(
     private val accountRepository: AccountRepository
 ) {
     suspend operator fun invoke(): Boolean {
-        accountRepository.getUid().collect { uid ->
-            runnerRepository.finishRunning(uid)
-        }
+        runnerRepository.finishRunning(accountRepository.getUid())
         return true
     }
 }
diff --git a/domain/src/main/java/com/whyranoid/domain/usecase/GetUidUseCase.kt b/domain/src/main/java/com/whyranoid/domain/usecase/GetUidUseCase.kt
@@ -1,11 +1,10 @@
 package com.whyranoid.domain.usecase
 
 import com.whyranoid.domain.repository.AccountRepository
-import kotlinx.coroutines.flow.Flow
 import javax.inject.Inject
 
 class GetUidUseCase @Inject constructor(private val accountRepository: AccountRepository) {
-    operator fun invoke(): Flow<String> {
+    suspend operator fun invoke(): String {
         return accountRepository.getUid()
     }
 }
diff --git a/domain/src/main/java/com/whyranoid/domain/usecase/JoinGroupUseCase.kt b/domain/src/main/java/com/whyranoid/domain/usecase/JoinGroupUseCase.kt
@@ -9,9 +9,7 @@ class JoinGroupUseCase @Inject constructor(
     private val accountRepository: AccountRepository
 ) {
     suspend operator fun invoke(groupId: String): Boolean {
-        accountRepository.getUid().collect { uid ->
-            groupRepository.joinGroup(uid, groupId)
-        }
+        groupRepository.joinGroup(accountRepository.getUid(), groupId)
         return true
     }
 }
diff --git a/domain/src/main/java/com/whyranoid/domain/usecase/StartRunningUseCase.kt b/domain/src/main/java/com/whyranoid/domain/usecase/StartRunningUseCase.kt
@@ -11,11 +11,12 @@ class StartRunningUseCase @Inject constructor(
     private val groupRepository: GroupRepository
 ) {
     suspend operator fun invoke(): Boolean {
-        accountRepository.getUid().collect { uid ->
-            runnerRepository.startRunning(uid)
-            groupRepository.getMyGroupList(uid).onSuccess { groupInfos ->
-                groupRepository.notifyRunningStart(uid, groupInfos.map { it.groupId })
-            }
+        runnerRepository.startRunning(accountRepository.getUid())
+        groupRepository.getMyGroupList(accountRepository.getUid()).onSuccess { groupInfos ->
+            groupRepository.notifyRunningStart(
+                accountRepository.getUid(),
+                groupInfos.map { it.groupId }
+            )
         }
         return false
     }
diff --git a/presentation/src/main/java/com/whyranoid/presentation/community/group/create/CreateGroupFragment.kt b/presentation/src/main/java/com/whyranoid/presentation/community/group/create/CreateGroupFragment.kt
@@ -118,11 +118,11 @@ internal class CreateGroupFragment :
         viewLifecycleOwner.repeatWhenUiStarted {
             viewModel.isGroupCreateButtonEnable.collect { isEnable ->
                 if (isEnable) {
-                    binding.topAppBar.menu.setGroupVisible(R.id.ready_to_create_running_post, true)
-                    binding.topAppBar.menu.setGroupVisible(R.id.not_ready_to_create_running_post, false)
+                    binding.topAppBar.menu.setGroupVisible(R.id.ready_to_create, true)
+                    binding.topAppBar.menu.setGroupVisible(R.id.not_ready_to_create, false)
                 } else {
-                    binding.topAppBar.menu.setGroupVisible(R.id.ready_to_create_running_post, false)
-                    binding.topAppBar.menu.setGroupVisible(R.id.not_ready_to_create_running_post, true)
+                    binding.topAppBar.menu.setGroupVisible(R.id.ready_to_create, false)
+                    binding.topAppBar.menu.setGroupVisible(R.id.not_ready_to_create, true)
                 }
             }
         }
diff --git a/presentation/src/main/java/com/whyranoid/presentation/community/runningpost/CreateRunningPostFragment.kt b/presentation/src/main/java/com/whyranoid/presentation/community/runningpost/CreateRunningPostFragment.kt
@@ -2,15 +2,19 @@ package com.whyranoid.presentation.community.runningpost
 
 import android.os.Bundle
 import android.view.View
-import androidx.navigation.fragment.navArgs
+import androidx.fragment.app.viewModels
+import com.google.android.material.snackbar.Snackbar
 import com.whyranoid.presentation.R
 import com.whyranoid.presentation.base.BaseFragment
 import com.whyranoid.presentation.databinding.FragmentCreateRunningPostBinding
+import com.whyranoid.presentation.util.repeatWhenUiStarted
+import dagger.hilt.android.AndroidEntryPoint
 
+@AndroidEntryPoint
 internal class CreateRunningPostFragment :
     BaseFragment<FragmentCreateRunningPostBinding>(R.layout.fragment_create_running_post) {
 
-    private val args: CreateRunningPostFragmentArgs by navArgs()
+    private val viewModel: CreateRunningPostViewModel by viewModels()
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
@@ -19,6 +23,43 @@ internal class CreateRunningPostFragment :
     }
 
     private fun initViews() {
-        binding.selectedRunningHistory = args.selectedRunningHistory
+        binding.vm = viewModel
+        binding.selectedRunningHistory = viewModel.selectedRunningHistory
+        setUpMenu()
+    }
+
+    private fun setUpMenu() {
+        with(binding.topAppBar) {
+            inflateMenu(R.menu.community_create_running_post_menu)
+
+            viewLifecycleOwner.repeatWhenUiStarted {
+                viewModel.createPostButtonEnableState.collect { isEnable ->
+                    if (isEnable) {
+                        menu.setGroupVisible(R.id.ready_to_create_running_post, true)
+                        menu.setGroupVisible(R.id.not_ready_to_create_running_post, false)
+                    } else {
+                        menu.setGroupVisible(R.id.ready_to_create_running_post, false)
+                        menu.setGroupVisible(R.id.not_ready_to_create_running_post, true)
+                    }
+                }
+            }
+
+            setOnMenuItemClickListener { menuItem ->
+                when (menuItem.itemId) {
+                    R.id.create_running_post_button -> {
+                        viewModel.createRunningPost()
+                        true
+                    }
+                    R.id.warning_about_create_running_post_button -> {
+                        Snackbar.make(binding.root, "내용을 1글자 이상 입력하세요", Snackbar.LENGTH_SHORT)
+                            .show()
+                        true
+                    }
+                    else -> {
+                        false
+                    }
+                }
+            }
+        }
     }
 }
diff --git a/presentation/src/main/java/com/whyranoid/presentation/community/runningpost/CreateRunningPostViewModel.kt b/presentation/src/main/java/com/whyranoid/presentation/community/runningpost/CreateRunningPostViewModel.kt
diff --git a/presentation/src/main/java/com/whyranoid/presentation/community/runningpost/SelectRunningHistoryViewModel.kt b/presentation/src/main/java/com/whyranoid/presentation/community/runningpost/SelectRunningHistoryViewModel.kt
diff --git a/presentation/src/main/java/com/whyranoid/presentation/myrun/MyRunViewModel.kt b/presentation/src/main/java/com/whyranoid/presentation/myrun/MyRunViewModel.kt
diff --git a/presentation/src/main/res/layout/fragment_create_running_post.xml b/presentation/src/main/res/layout/fragment_create_running_post.xml

Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,7 @@ class AccountRepositoryImpl @Inject constructor(`
`17`	`17`	`return true`
`18`	`18`	`}`
`19`	`19`
`20`		`- override fun getUid(): Flow<String> {`
	`20`	`+ override suspend fun getUid(): String {`
`21`	`21`	`return accountDataSource.getUserUid()`
`22`	`22`	`}`
`23`	`23`
Original file line number	Diff line number	Diff line change
`@@ -9,9 +9,7 @@ class FinishRunningUseCase @Inject constructor(`
`9`	`9`	`private val accountRepository: AccountRepository`
`10`	`10`	`) {`
`11`	`11`	`suspend operator fun invoke(): Boolean {`
`12`		`- accountRepository.getUid().collect { uid ->`
`13`		`- runnerRepository.finishRunning(uid)`
`14`		`- }`
	`12`	`+ runnerRepository.finishRunning(accountRepository.getUid())`
`15`	`13`	`return true`
`16`	`14`	`}`
`17`	`15`	`}`