♻️ 코드리뷰 피드백 반영하여 수정

Author: peter-j0y

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 {

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()
 }

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(),

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?
+)

presentation/src/main/java/com/whyranoid/presentation/myrun/MyRunFragment.kt

@@ -28,15 +28,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 +69,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
@@ -120,4 +120,8 @@ internal class MyRunFragment : BaseFragment<FragmentMyRunBinding>(R.layout.fragm
             binding.calendarView.smoothScrollToMonth(currentMonth)
         }
     }
+
+    companion object {
+        private const val MONTH_OFFSET = 120L
+    }
 }

presentation/src/main/java/com/whyranoid/presentation/myrun/MyRunViewModel.kt

@@ -2,12 +2,13 @@ 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.toRunningHistoryUiModel
 import dagger.hilt.android.lifecycle.HiltViewModel
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.StateFlow
@@ -42,8 +43,8 @@ class MyRunViewModel @Inject constructor(
     val profileImgUri: StateFlow<String>
         get() = _profileImgUri.asStateFlow()
 
-    private val _runningHistoryList = MutableStateFlow<List<RunningHistory>>(emptyList())
-    val runningHistoryList: StateFlow<List<RunningHistory>>
+    private val _runningHistoryList = MutableStateFlow<List<RunningHistoryUiModel>>(emptyList())
+    val runningHistoryList: StateFlow<List<RunningHistoryUiModel>>
         get() = _runningHistoryList.asStateFlow()
 
     private fun getUid() {
@@ -83,7 +84,9 @@ class MyRunViewModel @Inject constructor(
     private fun getRunningHistoryList() {
         viewModelScope.launch {
             getRunningHistoryUseCase().collect { runningHistoryList ->
-                _runningHistoryList.value = runningHistoryList
+                _runningHistoryList.value = runningHistoryList.map { runningHistory ->
+                    runningHistory.toRunningHistoryUiModel()
+                }
             }
         }
     }

presentation/src/main/java/com/whyranoid/presentation/myrun/MyRunningHistoryAdapter.kt

@@ -6,13 +6,12 @@ import android.view.ViewGroup
 import androidx.recyclerview.widget.DiffUtil
 import androidx.recyclerview.widget.ListAdapter
 import androidx.recyclerview.widget.RecyclerView
-import com.whyranoid.domain.model.RunningHistory
 import com.whyranoid.presentation.R
 import com.whyranoid.presentation.databinding.ItemRunningHistoryBinding
-import com.whyranoid.presentation.model.toRunningHistoryUiModel
+import com.whyranoid.presentation.model.RunningHistoryUiModel
 
 class MyRunningHistoryAdapter :
-    ListAdapter<RunningHistory, RunningHistoryViewHolder>(
+    ListAdapter<RunningHistoryUiModel, RunningHistoryViewHolder>(
         MyRunningHistoryDiffCallback()
     ) {
 
@@ -27,17 +26,17 @@ class MyRunningHistoryAdapter :
     }
 
     companion object {
-        class MyRunningHistoryDiffCallback : DiffUtil.ItemCallback<RunningHistory>() {
+        class MyRunningHistoryDiffCallback : DiffUtil.ItemCallback<RunningHistoryUiModel>() {
             override fun areItemsTheSame(
-                oldItem: RunningHistory,
-                newItem: RunningHistory
+                oldItem: RunningHistoryUiModel,
+                newItem: RunningHistoryUiModel
             ): Boolean {
                 return oldItem.historyId == newItem.historyId
             }
 
             override fun areContentsTheSame(
-                oldItem: RunningHistory,
-                newItem: RunningHistory
+                oldItem: RunningHistoryUiModel,
+                newItem: RunningHistoryUiModel
             ): Boolean {
                 return oldItem == newItem
             }
@@ -48,7 +47,7 @@ class MyRunningHistoryAdapter :
 class RunningHistoryViewHolder(view: View) : RecyclerView.ViewHolder(view) {
     private val binding = ItemRunningHistoryBinding.bind(view)
 
-    fun bind(runningHistory: RunningHistory) {
-        binding.runningHistory = runningHistory.toRunningHistoryUiModel()
+    fun bind(runningHistory: RunningHistoryUiModel) {
+        binding.runningHistory = runningHistory
     }
 }