🔀 #47 from boostcampwm-2022/feat/community_post

peter-j0y · web-flow · commit 69e0fb67f7a5 · 2022-11-29T15:17:11.000+09:00
코드 리뷰 피드백 반영 및 운동 기록 가져오기 레이아웃 및 기능 구현
diff --git a/data/src/main/java/com/whyranoid/data/account/AccountDataSourceImpl.kt b/data/src/main/java/com/whyranoid/data/account/AccountDataSourceImpl.kt
@@ -16,10 +16,10 @@ import javax.inject.Inject
 
 class AccountDataSourceImpl @Inject constructor(
     private val dataStoreDb: DataStore<Preferences>,
-    private val fireBaseDb: FirebaseFirestore
+    private val fireBaseDb: FirebaseFirestore,
+    private val auth: FirebaseAuth
 ) : AccountDataSource {
 
-    private val auth = FirebaseAuth.getInstance()
     private val currentUser = auth.currentUser
 
     private object PreferenceKeys {
@@ -67,12 +67,13 @@ class AccountDataSourceImpl @Inject constructor(
     }
 
     override suspend fun signOut(): Result<Boolean> = runCatching {
-        signOut()
+        auth.signOut()
         true
     }
 
-    override suspend fun withDrawal(): Result<Boolean> {
-        TODO("Not yet implemented")
+    override suspend fun withDrawal(): Result<Boolean> = runCatching {
+        currentUser?.delete()
+        true
     }
 
     companion object {
diff --git a/data/src/main/java/com/whyranoid/data/account/RunningHistoryLocalDataSource.kt b/data/src/main/java/com/whyranoid/data/account/RunningHistoryLocalDataSource.kt
@@ -4,5 +4,5 @@ import com.whyranoid.domain.model.RunningHistory
 import kotlinx.coroutines.flow.Flow
 
 interface RunningHistoryLocalDataSource {
-    fun getRunningHistory(): Flow<List<RunningHistory>>
+    fun getRunningHistory(): Flow<Result<List<RunningHistory>>>
 }
diff --git a/data/src/main/java/com/whyranoid/data/account/RunningHistoryLocalDataSourceImpl.kt b/data/src/main/java/com/whyranoid/data/account/RunningHistoryLocalDataSourceImpl.kt
@@ -9,10 +9,12 @@ class RunningHistoryLocalDataSourceImpl @Inject constructor(
     private val runningHistoryDao: RunningHistoryDao
 ) : RunningHistoryLocalDataSource {
 
-    override fun getRunningHistory(): Flow<List<RunningHistory>> {
+    override fun getRunningHistory(): Flow<Result<List<RunningHistory>>> {
         return runningHistoryDao.getRunningHistory().map { runningHistoryList ->
-            runningHistoryList.map { runningHistoryEntity ->
-                runningHistoryEntity.toRunningHistory()
+            runCatching {
+                runningHistoryList.map { runningHistoryEntity ->
+                    runningHistoryEntity.toRunningHistory()
+                }
             }
         }
     }
diff --git a/data/src/main/java/com/whyranoid/data/account/RunningHistoryRepositoryImpl.kt b/data/src/main/java/com/whyranoid/data/account/RunningHistoryRepositoryImpl.kt
@@ -8,7 +8,7 @@ import javax.inject.Inject
 class RunningHistoryRepositoryImpl @Inject constructor(
     private val runningHistoryLocalDataSource: RunningHistoryLocalDataSource
 ) : RunningHistoryRepository {
-    override fun getRunningHistory(): Flow<List<RunningHistory>> {
+    override fun getRunningHistory(): Flow<Result<List<RunningHistory>>> {
         return runningHistoryLocalDataSource.getRunningHistory()
     }
 
diff --git a/data/src/main/java/com/whyranoid/data/di/UserDataBaseModule.kt b/data/src/main/java/com/whyranoid/data/di/UserDataBaseModule.kt
@@ -5,6 +5,7 @@ import androidx.datastore.core.DataStore
 import androidx.datastore.preferences.core.PreferenceDataStoreFactory
 import androidx.datastore.preferences.core.Preferences
 import androidx.datastore.preferences.preferencesDataStoreFile
+import com.google.firebase.auth.FirebaseAuth
 import dagger.Module
 import dagger.Provides
 import dagger.hilt.InstallIn
@@ -26,4 +27,8 @@ object UserDataBaseModule {
                 appContext.preferencesDataStoreFile(USER_PREFERENCES)
             }
         )
+
+    @Singleton
+    @Provides
+    fun provideFirebaseAuth(): FirebaseAuth = FirebaseAuth.getInstance()
 }
diff --git a/domain/src/main/java/com/whyranoid/domain/repository/RunningHistoryRepository.kt b/domain/src/main/java/com/whyranoid/domain/repository/RunningHistoryRepository.kt
@@ -6,7 +6,7 @@ import kotlinx.coroutines.flow.Flow
 interface RunningHistoryRepository {
 
     // 운동 내역 가져오기 - 로컬
-    fun getRunningHistory(): Flow<List<RunningHistory>>
+    fun getRunningHistory(): Flow<Result<List<RunningHistory>>>
 
     // 글 안쓴 운동 내역 가져오기 - 로컬
     suspend fun getUnpostedRunningHistory(): List<RunningHistory>
diff --git a/domain/src/main/java/com/whyranoid/domain/usecase/GetRunningHistoryUseCase.kt b/domain/src/main/java/com/whyranoid/domain/usecase/GetRunningHistoryUseCase.kt
@@ -6,7 +6,7 @@ import kotlinx.coroutines.flow.Flow
 import javax.inject.Inject
 
 class GetRunningHistoryUseCase @Inject constructor(private val runningHistoryRepository: RunningHistoryRepository) {
-    operator fun invoke(): Flow<List<RunningHistory>> {
+    operator fun invoke(): Flow<Result<List<RunningHistory>>> {
         return runningHistoryRepository.getRunningHistory()
     }
 }
diff --git a/presentation/src/main/java/com/whyranoid/presentation/community/CreateRunningPostFragment.kt b/presentation/src/main/java/com/whyranoid/presentation/community/CreateRunningPostFragment.kt
@@ -0,0 +1,8 @@
+package com.whyranoid.presentation.community
+
+import com.whyranoid.presentation.R
+import com.whyranoid.presentation.base.BaseFragment
+import com.whyranoid.presentation.databinding.FragmentCreateRunningPostBinding
+
+internal class CreateRunningPostFragment :
+    BaseFragment<FragmentCreateRunningPostBinding>(R.layout.fragment_create_running_post)
diff --git a/presentation/src/main/java/com/whyranoid/presentation/community/SelectRunningHistoryFragment.kt b/presentation/src/main/java/com/whyranoid/presentation/community/SelectRunningHistoryFragment.kt
@@ -0,0 +1,57 @@
+package com.whyranoid.presentation.community
+
+import android.os.Bundle
+import android.view.View
+import androidx.fragment.app.viewModels
+import com.whyranoid.presentation.R
+import com.whyranoid.presentation.base.BaseFragment
+import com.whyranoid.presentation.databinding.FragmentSelectRunningHistoryBinding
+import com.whyranoid.presentation.model.RunningHistoryUiModel
+import com.whyranoid.presentation.model.UiState
+import com.whyranoid.presentation.myrun.MyRunningHistoryAdapter
+import com.whyranoid.presentation.util.repeatWhenUiStarted
+
+internal class SelectRunningHistoryFragment :
+    BaseFragment<FragmentSelectRunningHistoryBinding>(R.layout.fragment_select_running_history) {
+
+    private val viewModel: SelectRunningHistoryViewModel by viewModels()
+    private val runningHistoryAdapter = MyRunningHistoryAdapter()
+
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
+
+        initViews()
+        observeState()
+    }
+
+    private fun initViews() {
+        binding.rvSelectRunningHistory.adapter = runningHistoryAdapter
+    }
+
+    private fun observeState() {
+        viewLifecycleOwner.repeatWhenUiStarted {
+            viewModel.runningHistoryListState.collect { runningHistoryState ->
+                when (runningHistoryState) {
+                    is UiState.UnInitialized -> {
+                        // 초기화
+                    }
+                    is UiState.Loading -> {
+                        // 로딩중
+                    }
+
+                    is UiState.Success<List<RunningHistoryUiModel>> -> initRecyclerView(
+                        runningHistoryState.value
+                    )
+
+                    is UiState.Failure -> {
+                        // 실패
+                    }
+                }
+            }
+        }
+    }
+
+    private fun initRecyclerView(runningHistoryList: List<RunningHistoryUiModel>) {
+        runningHistoryAdapter.submitList(runningHistoryList)
+    }
+}
diff --git a/presentation/src/main/java/com/whyranoid/presentation/community/SelectRunningHistoryViewModel.kt b/presentation/src/main/java/com/whyranoid/presentation/community/SelectRunningHistoryViewModel.kt
@@ -0,0 +1,43 @@
+package com.whyranoid.presentation.community
+
+import androidx.lifecycle.ViewModel
+import androidx.lifecycle.viewModelScope
+import com.whyranoid.domain.usecase.GetRunningHistoryUseCase
+import com.whyranoid.presentation.model.RunningHistoryUiModel
+import com.whyranoid.presentation.model.UiState
+import com.whyranoid.presentation.model.toRunningHistoryUiModel
+import dagger.hilt.android.lifecycle.HiltViewModel
+import kotlinx.coroutines.flow.MutableStateFlow
+import kotlinx.coroutines.flow.StateFlow
+import kotlinx.coroutines.flow.asStateFlow
+import kotlinx.coroutines.launch
+import javax.inject.Inject
+
+@HiltViewModel
+class SelectRunningHistoryViewModel @Inject constructor(private val getRunningHistoryUseCase: GetRunningHistoryUseCase) :
+    ViewModel() {
+
+    init {
+        getRunningHistoryList()
+    }
+
+    private val _runningHistoryListState =
+        MutableStateFlow<UiState<List<RunningHistoryUiModel>>>(UiState.UnInitialized)
+    val runningHistoryListState: StateFlow<UiState<List<RunningHistoryUiModel>>>
+        get() = _runningHistoryListState.asStateFlow()
+
+    private fun getRunningHistoryList() {
+        viewModelScope.launch {
+            _runningHistoryListState.value = UiState.Loading
+
+            getRunningHistoryUseCase().collect { runningHistoryListResult ->
+                runningHistoryListResult.onSuccess { runningHistoryList ->
+                    _runningHistoryListState.value =
+                        UiState.Success(runningHistoryList.map { runningHistory -> runningHistory.toRunningHistoryUiModel() })
+                }.onFailure { throwable ->
+                    _runningHistoryListState.value = UiState.Failure(throwable)
+                }
+            }
+        }
+    }
+}
diff --git a/presentation/src/main/java/com/whyranoid/presentation/model/RunningHistoryUiModel.kt b/presentation/src/main/java/com/whyranoid/presentation/model/RunningHistoryUiModel.kt
@@ -1,19 +1,24 @@
 package com.whyranoid.presentation.model
 
+import android.os.Parcelable
 import com.whyranoid.domain.model.RunningHistory
+import kotlinx.parcelize.Parcelize
 
+@Parcelize
 data class RunningHistoryUiModel(
+    val historyId: String,
     val date: String,
     val totalRunningTime: String,
     val startedAt: String,
     val finishedAt: String,
     val totalDistance: String,
     val pace: String
-)
+) : Parcelable
 
 // TODO 원하는 형태로 변환하도록 코드 수정해야함
 fun RunningHistory.toRunningHistoryUiModel(): RunningHistoryUiModel {
     return RunningHistoryUiModel(
+        historyId = historyId,
         date = startedAt.toString(),
         totalRunningTime = totalRunningTime.toString(),
         startedAt = startedAt.toString(),
diff --git a/presentation/src/main/java/com/whyranoid/presentation/myrun/CalendarDayBinder.kt b/presentation/src/main/java/com/whyranoid/presentation/myrun/CalendarDayBinder.kt
@@ -14,7 +14,7 @@ import java.time.LocalDate
 class CalendarDayBinder(
     private val calendarView: CalendarView
 ) : DayBinder<CalendarDayBinder.DayContainer> {
-    private var calendar: Pair<LocalDate?, LocalDate?> = null to null
+    private var calendar: CalendarRange = CalendarRange(null, null)
 
     class DayContainer(
         val binding: ItemCalendarDayBinding
@@ -50,6 +50,7 @@ class CalendarDayBinder(
                     R.color.black
                 )
             )
+            container.binding.root.background = null
         }
 
         if (isInRange(day.date)) {
@@ -83,3 +84,8 @@ class CalendarDayBinder(
         return startDate == date || endDate == date || (startDate != null && endDate != null && startDate < date && date < endDate)
     }
 }
+
+data class CalendarRange(
+    val startDate: LocalDate?,
+    val endDate: LocalDate?
+)
diff --git a/presentation/src/main/java/com/whyranoid/presentation/myrun/MyRunFragment.kt b/presentation/src/main/java/com/whyranoid/presentation/myrun/MyRunFragment.kt
@@ -9,6 +9,8 @@ import androidx.navigation.fragment.findNavController
 import com.whyranoid.presentation.R
 import com.whyranoid.presentation.base.BaseFragment
 import com.whyranoid.presentation.databinding.FragmentMyRunBinding
+import com.whyranoid.presentation.model.RunningHistoryUiModel
+import com.whyranoid.presentation.model.UiState
 import com.whyranoid.presentation.util.loadImage
 import com.whyranoid.presentation.util.repeatWhenUiStarted
 import dagger.hilt.android.AndroidEntryPoint
@@ -28,15 +30,15 @@ internal class MyRunFragment : BaseFragment<FragmentMyRunBinding>(R.layout.fragm
     private val runningHistoryAdapter = MyRunningHistoryAdapter()
 
     private val currentMonth = YearMonth.now()
-    private val firstMonth = currentMonth.minusMonths(5)
-    private val lastMonth = currentMonth.plusMonths(5)
+    private val firstMonth = currentMonth.minusMonths(MONTH_OFFSET)
+    private val lastMonth = currentMonth.plusMonths(MONTH_OFFSET)
     private val firstDayOfWeek = WeekFields.of(Locale.getDefault()).firstDayOfWeek
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
 
         initViews()
-        observeInfo()
+        observeState()
     }
 
     private fun initViews() = with(binding) {
@@ -69,7 +71,7 @@ internal class MyRunFragment : BaseFragment<FragmentMyRunBinding>(R.layout.fragm
         }
     }
 
-    private fun observeInfo() {
+    private fun observeState() {
         viewLifecycleOwner.repeatWhenUiStarted {
             viewModel.nickName.collect { nickName ->
                 binding.tvNickName.text = nickName
@@ -83,12 +85,27 @@ internal class MyRunFragment : BaseFragment<FragmentMyRunBinding>(R.layout.fragm
         }
 
         viewLifecycleOwner.repeatWhenUiStarted {
-            viewModel.runningHistoryList.collect { runningHistoryList ->
-                runningHistoryAdapter.submitList(runningHistoryList)
+            viewModel.runningHistoryListState.collect { runningHistoryListState ->
+                when (runningHistoryListState) {
+                    is UiState.UnInitialized -> {
+                    }
+                    is UiState.Loading -> {
+                    }
+                    is UiState.Success<List<RunningHistoryUiModel>> -> initRecyclerView(
+                        runningHistoryListState.value
+                    )
+
+                    is UiState.Failure -> {
+                    }
+                }
             }
         }
     }
 
+    private fun initRecyclerView(runningHistoryList: List<RunningHistoryUiModel>) {
+        runningHistoryAdapter.submitList(runningHistoryList)
+    }
+
     private fun popUpEditNickNameDialog() {
         val dialogView = layoutInflater.inflate(R.layout.dialog_edit_nick_name, null)
 
@@ -120,4 +137,8 @@ internal class MyRunFragment : BaseFragment<FragmentMyRunBinding>(R.layout.fragm
             binding.calendarView.smoothScrollToMonth(currentMonth)
         }
     }
+
+    companion object {
+        private const val MONTH_OFFSET = 120L
+    }
 }
diff --git a/presentation/src/main/java/com/whyranoid/presentation/myrun/MyRunViewModel.kt b/presentation/src/main/java/com/whyranoid/presentation/myrun/MyRunViewModel.kt
@@ -2,12 +2,14 @@ package com.whyranoid.presentation.myrun
 
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
-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 com.whyranoid.presentation.model.RunningHistoryUiModel
+import com.whyranoid.presentation.model.UiState
+import com.whyranoid.presentation.model.toRunningHistoryUiModel
 import dagger.hilt.android.lifecycle.HiltViewModel
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.StateFlow
@@ -42,9 +44,10 @@ class MyRunViewModel @Inject constructor(
     val profileImgUri: StateFlow<String>
         get() = _profileImgUri.asStateFlow()
 
-    private val _runningHistoryList = MutableStateFlow<List<RunningHistory>>(emptyList())
-    val runningHistoryList: StateFlow<List<RunningHistory>>
-        get() = _runningHistoryList.asStateFlow()
+    private val _runningHistoryListState =
+        MutableStateFlow<UiState<List<RunningHistoryUiModel>>>(UiState.UnInitialized)
+    val runningHistoryListState: StateFlow<UiState<List<RunningHistoryUiModel>>>
+        get() = _runningHistoryListState.asStateFlow()
 
     private fun getUid() {
         viewModelScope.launch {
@@ -82,8 +85,15 @@ class MyRunViewModel @Inject constructor(
 
     private fun getRunningHistoryList() {
         viewModelScope.launch {
-            getRunningHistoryUseCase().collect { runningHistoryList ->
-                _runningHistoryList.value = runningHistoryList
+            _runningHistoryListState.value = UiState.Loading
+
+            getRunningHistoryUseCase().collect { runningHistoryListResult ->
+                runningHistoryListResult.onSuccess { runningHistoryList ->
+                    _runningHistoryListState.value =
+                        UiState.Success(runningHistoryList.map { runningHistory -> runningHistory.toRunningHistoryUiModel() })
+                }.onFailure { throwable ->
+                    _runningHistoryListState.value = UiState.Failure(throwable)
+                }
             }
         }
     }
diff --git a/presentation/src/main/java/com/whyranoid/presentation/myrun/MyRunningHistoryAdapter.kt b/presentation/src/main/java/com/whyranoid/presentation/myrun/MyRunningHistoryAdapter.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
diff --git a/presentation/src/main/res/layout/fragment_select_running_history.xml b/presentation/src/main/res/layout/fragment_select_running_history.xml
diff --git a/presentation/src/main/res/values/strings.xml b/presentation/src/main/res/values/strings.xml

Original file line number	Diff line number	Diff line change
`@@ -4,5 +4,5 @@ import com.whyranoid.domain.model.RunningHistory`
`4`	`4`	`import kotlinx.coroutines.flow.Flow`
`5`	`5`
`6`	`6`	`interface RunningHistoryLocalDataSource {`
`7`		`- fun getRunningHistory(): Flow<List<RunningHistory>>`
	`7`	`+ fun getRunningHistory(): Flow<Result<List<RunningHistory>>>`
`8`	`8`	`}`
Original file line number	Diff line number	Diff line change
`@@ -9,10 +9,12 @@ class RunningHistoryLocalDataSourceImpl @Inject constructor(`
`9`	`9`	`private val runningHistoryDao: RunningHistoryDao`
`10`	`10`	`) : RunningHistoryLocalDataSource {`
`11`	`11`
`12`		`- override fun getRunningHistory(): Flow<List<RunningHistory>> {`
	`12`	`+ override fun getRunningHistory(): Flow<Result<List<RunningHistory>>> {`
`13`	`13`	`return runningHistoryDao.getRunningHistory().map { runningHistoryList ->`
`14`		`- runningHistoryList.map { runningHistoryEntity ->`
`15`		`- runningHistoryEntity.toRunningHistory()`
	`14`	`+ runCatching {`
	`15`	`+ runningHistoryList.map { runningHistoryEntity ->`
	`16`	`+ runningHistoryEntity.toRunningHistory()`
	`17`	`+ }`
`16`	`18`	`}`
`17`	`19`	`}`
`18`	`20`	`}`
Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@ import javax.inject.Inject`
`8`	`8`	`class RunningHistoryRepositoryImpl @Inject constructor(`
`9`	`9`	`private val runningHistoryLocalDataSource: RunningHistoryLocalDataSource`
`10`	`10`	`) : RunningHistoryRepository {`
`11`		`- override fun getRunningHistory(): Flow<List<RunningHistory>> {`
	`11`	`+ override fun getRunningHistory(): Flow<Result<List<RunningHistory>>> {`
`12`	`12`	`return runningHistoryLocalDataSource.getRunningHistory()`
`13`	`13`	`}`
`14`	`14`
Original file line number	Diff line number	Diff line change
`@@ -5,6 +5,7 @@ import androidx.datastore.core.DataStore`
`5`	`5`	`import androidx.datastore.preferences.core.PreferenceDataStoreFactory`
`6`	`6`	`import androidx.datastore.preferences.core.Preferences`
`7`	`7`	`import androidx.datastore.preferences.preferencesDataStoreFile`
	`8`	`+import com.google.firebase.auth.FirebaseAuth`
`8`	`9`	`import dagger.Module`
`9`	`10`	`import dagger.Provides`
`10`	`11`	`import dagger.hilt.InstallIn`
`@@ -26,4 +27,8 @@ object UserDataBaseModule {`
`26`	`27`	`appContext.preferencesDataStoreFile(USER_PREFERENCES)`
`27`	`28`	`}`
`28`	`29`	`)`
	`30`	`+`
	`31`	`+ @Singleton`
	`32`	`+ @Provides`
	`33`	`+ fun provideFirebaseAuth(): FirebaseAuth = FirebaseAuth.getInstance()`
`29`	`34`	`}`
Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@ import kotlinx.coroutines.flow.Flow`
`6`	`6`	`import javax.inject.Inject`
`7`	`7`
`8`	`8`	`class GetRunningHistoryUseCase @Inject constructor(private val runningHistoryRepository: RunningHistoryRepository) {`
`9`		`- operator fun invoke(): Flow<List<RunningHistory>> {`
	`9`	`+ operator fun invoke(): Flow<Result<List<RunningHistory>>> {`
`10`	`10`	`return runningHistoryRepository.getRunningHistory()`
`11`	`11`	`}`
`12`	`12`	`}`