✨ getUid 로직 구현

peter-j0y · peter-j0y · commit b1020100ae9b · 2022-11-25T12:08:31.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,5 +5,6 @@ import kotlinx.coroutines.flow.Flow
 interface AccountDataSource {
     fun getUserNickName(): Flow<String>
     fun getUserProfileImgUri(): Flow<String>
-    suspend fun updateUserNickName(newNickName: String): Result<String>
+    fun getUserUid(): Flow<String>
+    suspend fun updateUserNickName(uid: String, newNickName: String): Result<String>
 }
diff --git a/data/src/main/java/com/whyranoid/data/account/AccountDataSourceImpl.kt b/data/src/main/java/com/whyranoid/data/account/AccountDataSourceImpl.kt
@@ -8,60 +8,45 @@ import com.google.firebase.firestore.FirebaseFirestore
 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.CoroutineScope
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.flow.launchIn
 import kotlinx.coroutines.flow.map
-import kotlinx.coroutines.flow.onEach
 import javax.inject.Inject
 
 class AccountDataSourceImpl @Inject constructor(
     private val dataStoreDb: DataStore<Preferences>,
     private val fireBaseDb: FirebaseFirestore
 ) : AccountDataSource {
 
-    init {
-        getUid()
-    }
-
-    private var userUid = EMPTY_STRING
-
     private object PreferenceKeys {
         val uid = stringPreferencesKey(UID_KEY)
         val email = stringPreferencesKey(EMAIL_KEY)
         val nickName = stringPreferencesKey(NICK_NAME_KEY)
         val profileImgUri = stringPreferencesKey(PROFILE_IMG_URI)
     }
 
-    // TODO : flow -> suspend로 변경해야 함.
     override fun getUserNickName() = dataStoreDb.data
         .map { preferences ->
             preferences[nickName] ?: EMPTY_STRING
         }
 
-    // TODO : flow -> suspend로 변경해야 함.
     override fun getUserProfileImgUri() = dataStoreDb.data
         .map { preferences ->
             preferences[profileImgUri] ?: EMPTY_STRING
         }
 
-    // TODO : flow -> suspend로 변경해야 함.
-    private fun getUid() = dataStoreDb.data
+    override fun getUserUid() = dataStoreDb.data
         .map { preferences ->
-            preferences[uid]
-        }.onEach {
-            userUid = it ?: EMPTY_STRING
-        }.launchIn(CoroutineScope(Dispatchers.IO))
+            preferences[uid] ?: EMPTY_STRING
+        }
 
-    override suspend fun updateUserNickName(newNickName: String) = runCatching {
+    override suspend fun updateUserNickName(uid: String, newNickName: String) = runCatching {
         // 로컬에 업데이트
         dataStoreDb.edit { preferences ->
             preferences[nickName] = newNickName
         }
 
         // 리모트에 업데이트
         fireBaseDb.collection(USER_COLLECTION_PATH)
-            .document(userUid).update(USER_FIELD_NICK_NAME, newNickName)
+            .document(uid).update(USER_FIELD_NICK_NAME, newNickName)
 
         newNickName
     }
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,19 +17,19 @@ class AccountRepositoryImpl @Inject constructor(
         return true
     }
 
-    override suspend fun getUid(): Result<String> {
-        return Result.success("byeonghee-uid")
+    override fun getUid(): Flow<String> {
+        return accountDataSource.getUserUid()
     }
 
-    override suspend fun getNickname(): Flow<String> {
+    override fun getNickname(): Flow<String> {
         return accountDataSource.getUserNickName()
     }
 
-    override suspend fun updateNickname(newNickName: String): Result<String> {
-        return accountDataSource.updateUserNickName(newNickName)
+    override suspend fun updateNickname(uid: String, newNickName: String): Result<String> {
+        return accountDataSource.updateUserNickName(uid, newNickName)
     }
 
-    override suspend fun getProfileUri(): Flow<String> {
+    override fun getProfileUri(): Flow<String> {
         return accountDataSource.getUserProfileImgUri()
     }
 
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,17 +12,17 @@ interface AccountRepository {
     suspend fun loginUser(): Boolean
 
     // 데이터스토어에서 uid 가져오기
-    suspend fun getUid(): Result<String>
+    fun getUid(): Flow<String>
 
     // 데이터스토어에서 닉네임 가져오기
-    suspend fun getNickname(): Flow<String>
+    fun getNickname(): Flow<String>
 
     // 닉네임 수정, 서버에 먼저 보내고 성공하면 로컬에 반영
     // 실패하면 실패 사용자에게 알리기
-    suspend fun updateNickname(newNickName: String): Result<String>
+    suspend fun updateNickname(uid: String, newNickName: String): Result<String>
 
     // 데이터스토어에서 프로필 이미지 가져오기
-    suspend fun getProfileUri(): Flow<String>
+    fun getProfileUri(): Flow<String>
 
     // 프로필 사진 서버에 업데이트
     suspend fun updateProfileUrl(newProfileUrl: String): Boolean
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,11 +9,9 @@ class FinishRunningUseCase @Inject constructor(
     private val accountRepository: AccountRepository
 ) {
     suspend operator fun invoke(): Boolean {
-        accountRepository.getUid().onSuccess { uid ->
-            return runningRepository.finishRunning(uid)
-        }.onFailure {
-            println("uid 이상해 희희")
+        accountRepository.getUid().collect { uid ->
+            runningRepository.finishRunning(uid)
         }
-        return false
+        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,10 +1,11 @@
 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) {
-    suspend operator fun invoke(): Result<String> {
+    operator fun invoke(): Flow<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,11 +9,9 @@ class JoinGroupUseCase @Inject constructor(
     private val accountRepository: AccountRepository
 ) {
     suspend operator fun invoke(groupId: String): Boolean {
-        accountRepository.getUid().onSuccess { uid ->
-            return groupRepository.joinGroup(uid, groupId)
-        }.onFailure {
-            println("UID 이상해 병희희")
+        accountRepository.getUid().collect { uid ->
+            groupRepository.joinGroup(uid, groupId)
         }
-        return false
+        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,16 +11,11 @@ class StartRunningUseCase @Inject constructor(
     private val groupRepository: GroupRepository
 ) {
     suspend operator fun invoke(): Boolean {
-        accountRepository.getUid().onSuccess { uid ->
+        accountRepository.getUid().collect { uid ->
             runningRepository.startRunning(uid)
             groupRepository.getMyGroupList(uid).onSuccess { groupInfos ->
                 groupRepository.notifyRunningStart(uid, groupInfos.map { it.groupId })
-                return true
-            }.onFailure {
-                return false
             }
-        }.onFailure {
-            return false
         }
         return false
     }
diff --git a/domain/src/main/java/com/whyranoid/domain/usecase/UpdateNicknameUseCase.kt b/domain/src/main/java/com/whyranoid/domain/usecase/UpdateNicknameUseCase.kt
@@ -4,7 +4,7 @@ import com.whyranoid.domain.repository.AccountRepository
 import javax.inject.Inject
 
 class UpdateNicknameUseCase @Inject constructor(private val accountRepository: AccountRepository) {
-    suspend operator fun invoke(newNickname: String): Result<String> {
-        return accountRepository.updateNickname(newNickname)
+    suspend operator fun invoke(uid: String, newNickname: String): Result<String> {
+        return accountRepository.updateNickname(uid, newNickname)
     }
 }
diff --git a/presentation/src/main/java/com/whyranoid/presentation/myrun/MyRunFragment.kt b/presentation/src/main/java/com/whyranoid/presentation/myrun/MyRunFragment.kt
@@ -31,16 +31,14 @@ internal class MyRunFragment : BaseFragment<FragmentMyRunBinding>(R.layout.fragm
         observeInfo()
     }
 
-    private fun initViews() {
-        viewModel.getNickName()
-        viewModel.getProfileImgUri()
-        binding.ivEditNickName.setOnClickListener {
+    private fun initViews() = with(binding) {
+        ivEditNickName.setOnClickListener {
             popUpEditNickNameDialog()
         }
 
-        binding.rvMyRunningHistory.adapter = runningHistoryAdapter
+        rvMyRunningHistory.adapter = runningHistoryAdapter
 
-        binding.topAppBar.setOnMenuItemClickListener { menuItem ->
+        topAppBar.setOnMenuItemClickListener { menuItem ->
             when (menuItem.itemId) {
                 R.id.my_run_setting ->
                     findNavController().navigate(R.id.action_myRunFragment_to_settingFragment)
@@ -79,7 +77,7 @@ internal class MyRunFragment : BaseFragment<FragmentMyRunBinding>(R.layout.fragm
                 .setPositiveButton(
                     getString(R.string.my_run_edit_nick_name_dialog_positive)
                 ) { dialog, _ ->
-                    viewModel.updateNickName(dialogView.findViewById<EditText>(R.id.et_change_nick_name).text.toString())
+                    viewModel.updateNickName(viewModel.uid.value, dialogView.findViewById<EditText>(R.id.et_change_nick_name).text.toString())
                     dialog.dismiss()
                 }
                 .setNegativeButton(
diff --git a/presentation/src/main/java/com/whyranoid/presentation/myrun/MyRunViewModel.kt b/presentation/src/main/java/com/whyranoid/presentation/myrun/MyRunViewModel.kt
@@ -6,6 +6,7 @@ import com.whyranoid.domain.model.RunningHistory
 import com.whyranoid.domain.usecase.GetNicknameUseCase
 import com.whyranoid.domain.usecase.GetProfileUriUseCase
 import com.whyranoid.domain.usecase.GetRunningHistoryUseCase
+import com.whyranoid.domain.usecase.GetUidUseCase
 import com.whyranoid.domain.usecase.UpdateNicknameUseCase
 import dagger.hilt.android.lifecycle.HiltViewModel
 import kotlinx.coroutines.flow.MutableStateFlow
@@ -19,11 +20,22 @@ class MyRunViewModel @Inject constructor(
     private val getNicknameUseCase: GetNicknameUseCase,
     private val getProfileUriUseCase: GetProfileUriUseCase,
     private val updateNickNameUseCase: UpdateNicknameUseCase,
-    private val getRunningHistoryUseCase: GetRunningHistoryUseCase
+    private val getRunningHistoryUseCase: GetRunningHistoryUseCase,
+    private val getUidUseCase: GetUidUseCase
 ) : ViewModel() {
 
+    init {
+        getUid()
+        getNickName()
+        getProfileImgUri()
+    }
+
     private val EMPTY_STRING = ""
 
+    private val _uid = MutableStateFlow(EMPTY_STRING)
+    val uid: StateFlow<String>
+        get() = _uid.asStateFlow()
+
     private val _nickName = MutableStateFlow(EMPTY_STRING)
     val nickName: StateFlow<String>
         get() = _nickName.asStateFlow()
@@ -36,25 +48,33 @@ class MyRunViewModel @Inject constructor(
     val runningHistoryList: StateFlow<List<RunningHistory>>
         get() = _runningHistoryList.asStateFlow()
 
-    fun getNickName() {
+    private fun getUid() {
+        viewModelScope.launch {
+            getUidUseCase().collect {
+                _uid.value = it
+            }
+        }
+    }
+
+    private fun getNickName() {
         viewModelScope.launch {
             getNicknameUseCase().collect {
                 _nickName.value = it
             }
         }
     }
 
-    fun getProfileImgUri() {
+    private fun getProfileImgUri() {
         viewModelScope.launch {
             getProfileUriUseCase().collect {
                 _profileImgUri.value = it
             }
         }
     }
 
-    fun updateNickName(newNickName: String) {
+    fun updateNickName(uid: String, newNickName: String) {
         viewModelScope.launch {
-            updateNickNameUseCase(newNickName).onSuccess {
+            updateNickNameUseCase(uid, newNickName).onSuccess {
                 _nickName.value = it
             }.onFailure {
                 // TODO 닉네임 변경 실패시

Original file line number	Diff line number	Diff line change
`@@ -5,5 +5,6 @@ import kotlinx.coroutines.flow.Flow`
`5`	`5`	`interface AccountDataSource {`
`6`	`6`	`fun getUserNickName(): Flow<String>`
`7`	`7`	`fun getUserProfileImgUri(): Flow<String>`
`8`		`- suspend fun updateUserNickName(newNickName: String): Result<String>`
	`8`	`+ fun getUserUid(): Flow<String>`
	`9`	`+ suspend fun updateUserNickName(uid: String, newNickName: String): Result<String>`
`9`	`10`	`}`
Original file line number	Diff line number	Diff line change
`@@ -17,19 +17,19 @@ class AccountRepositoryImpl @Inject constructor(`
`17`	`17`	`return true`
`18`	`18`	`}`
`19`	`19`
`20`		`- override suspend fun getUid(): Result<String> {`
`21`		`- return Result.success("byeonghee-uid")`
	`20`	`+ override fun getUid(): Flow<String> {`
	`21`	`+ return accountDataSource.getUserUid()`
`22`	`22`	`}`
`23`	`23`
`24`		`- override suspend fun getNickname(): Flow<String> {`
	`24`	`+ override fun getNickname(): Flow<String> {`
`25`	`25`	`return accountDataSource.getUserNickName()`
`26`	`26`	`}`
`27`	`27`
`28`		`- override suspend fun updateNickname(newNickName: String): Result<String> {`
`29`		`- return accountDataSource.updateUserNickName(newNickName)`
	`28`	`+ override suspend fun updateNickname(uid: String, newNickName: String): Result<String> {`
	`29`	`+ return accountDataSource.updateUserNickName(uid, newNickName)`
`30`	`30`	`}`
`31`	`31`
`32`		`- override suspend fun getProfileUri(): Flow<String> {`
	`32`	`+ override fun getProfileUri(): Flow<String> {`
`33`	`33`	`return accountDataSource.getUserProfileImgUri()`
`34`	`34`	`}`
`35`	`35`
Original file line number	Diff line number	Diff line change
`@@ -9,11 +9,9 @@ class FinishRunningUseCase @Inject constructor(`
`9`	`9`	`private val accountRepository: AccountRepository`
`10`	`10`	`) {`
`11`	`11`	`suspend operator fun invoke(): Boolean {`
`12`		`- accountRepository.getUid().onSuccess { uid ->`
`13`		`- return runningRepository.finishRunning(uid)`
`14`		`- }.onFailure {`
`15`		`- println("uid 이상해 희희")`
	`12`	`+ accountRepository.getUid().collect { uid ->`
	`13`	`+ runningRepository.finishRunning(uid)`
`16`	`14`	`}`
`17`		`- return false`
	`15`	`+ return true`
`18`	`16`	`}`
`19`	`17`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,10 +1,11 @@`
`1`	`1`	`package com.whyranoid.domain.usecase`
`2`	`2`
`3`	`3`	`import com.whyranoid.domain.repository.AccountRepository`
	`4`	`+import kotlinx.coroutines.flow.Flow`
`4`	`5`	`import javax.inject.Inject`
`5`	`6`
`6`	`7`	`class GetUidUseCase @Inject constructor(private val accountRepository: AccountRepository) {`
`7`		`- suspend operator fun invoke(): Result<String> {`
	`8`	`+ operator fun invoke(): Flow<String> {`
`8`	`9`	`return accountRepository.getUid()`
`9`	`10`	`}`
`10`	`11`	`}`
Original file line number	Diff line number	Diff line change
`@@ -9,11 +9,9 @@ class JoinGroupUseCase @Inject constructor(`
`9`	`9`	`private val accountRepository: AccountRepository`
`10`	`10`	`) {`
`11`	`11`	`suspend operator fun invoke(groupId: String): Boolean {`
`12`		`- accountRepository.getUid().onSuccess { uid ->`
`13`		`- return groupRepository.joinGroup(uid, groupId)`
`14`		`- }.onFailure {`
`15`		`- println("UID 이상해 병희희")`
	`12`	`+ accountRepository.getUid().collect { uid ->`
	`13`	`+ groupRepository.joinGroup(uid, groupId)`
`16`	`14`	`}`
`17`		`- return false`
	`15`	`+ return true`
`18`	`16`	`}`
`19`	`17`	`}`
Original file line number	Diff line number	Diff line change
`@@ -11,16 +11,11 @@ class StartRunningUseCase @Inject constructor(`
`11`	`11`	`private val groupRepository: GroupRepository`
`12`	`12`	`) {`
`13`	`13`	`suspend operator fun invoke(): Boolean {`
`14`		`- accountRepository.getUid().onSuccess { uid ->`
	`14`	`+ accountRepository.getUid().collect { uid ->`
`15`	`15`	`runningRepository.startRunning(uid)`
`16`	`16`	`groupRepository.getMyGroupList(uid).onSuccess { groupInfos ->`
`17`	`17`	`groupRepository.notifyRunningStart(uid, groupInfos.map { it.groupId })`
`18`		`- return true`
`19`		`- }.onFailure {`
`20`		`- return false`
`21`	`18`	`}`
`22`		`- }.onFailure {`
`23`		`- return false`
`24`	`19`	`}`
`25`	`20`	`return false`
`26`	`21`	`}`
Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@ import com.whyranoid.domain.repository.AccountRepository`
`4`	`4`	`import javax.inject.Inject`
`5`	`5`
`6`	`6`	`class UpdateNicknameUseCase @Inject constructor(private val accountRepository: AccountRepository) {`
`7`		`- suspend operator fun invoke(newNickname: String): Result<String> {`
`8`		`- return accountRepository.updateNickname(newNickname)`
	`7`	`+ suspend operator fun invoke(uid: String, newNickname: String): Result<String> {`
	`8`	`+ return accountRepository.updateNickname(uid, newNickname)`
`9`	`9`	`}`
`10`	`10`	`}`