♻️ 코드 리뷰 피드백 반영해서 수정

Author: peter-j0y

data/src/main/java/com/whyranoid/data/account/RunningHistoryDao.kt

@@ -12,6 +12,6 @@ interface RunningHistoryDao {
     @Insert(onConflict = OnConflictStrategy.ABORT)
     suspend fun addRunningHistory(runningHistory: RunningHistoryEntity)
 
-    @Query("SELECT * FROM running_history ORDER BY startedAt ASC")
+    @Query("SELECT * FROM running_history ORDER BY started_at ASC")
     fun getRunningHistory(): Flow<List<RunningHistoryEntity>>
 }

data/src/main/java/com/whyranoid/data/account/RunningHistoryEntity.kt

@@ -1,5 +1,6 @@
 package com.whyranoid.data.account
 
+import androidx.room.ColumnInfo
 import androidx.room.Entity
 import androidx.room.PrimaryKey
 import com.whyranoid.domain.model.RunningHistory
@@ -8,11 +9,11 @@ import com.whyranoid.domain.model.RunningHistory
 data class RunningHistoryEntity(
     @PrimaryKey
     val historyId: String,
-    val startedAt: Long,
-    val finishedAt: Long,
-    val totalRunningTime: Int,
-    val pace: Double,
-    val totalDistance: Double
+    @ColumnInfo(name = "started_at") val startedAt: Long,
+    @ColumnInfo(name = "finished_at") val finishedAt: Long,
+    @ColumnInfo(name = "total_running_time") val totalRunningTime: Int,
+    @ColumnInfo(name = "pace") val pace: Double,
+    @ColumnInfo(name = "total_distance") val totalDistance: Double
 )
 
 fun RunningHistoryEntity.toRunningHistory(): RunningHistory {

data/src/main/java/com/whyranoid/data/account/RunningHistoryLocalDataSourceImpl.kt

@@ -6,11 +6,11 @@ import kotlinx.coroutines.flow.map
 import javax.inject.Inject
 
 class RunningHistoryLocalDataSourceImpl @Inject constructor(
-    private val roomDb: RunningHistoryLocalDataBase
+    private val runningHistoryDao: RunningHistoryDao
 ) : RunningHistoryLocalDataSource {
 
     override fun getRunningHistory(): Flow<List<RunningHistory>> {
-        return roomDb.runningHistoryDao().getRunningHistory().map { runningHistoryList ->
+        return runningHistoryDao.getRunningHistory().map { runningHistoryList ->
             runningHistoryList.map { runningHistoryEntity ->
                 runningHistoryEntity.toRunningHistory()
             }

data/src/main/java/com/whyranoid/data/di/RunningHistoryDataBaseModule.kt

@@ -0,0 +1,32 @@
+package com.whyranoid.data.di
+
+import android.content.Context
+import androidx.room.Room
+import com.whyranoid.data.account.RunningHistoryDao
+import com.whyranoid.data.account.RunningHistoryLocalDataBase
+import dagger.Module
+import dagger.Provides
+import dagger.hilt.InstallIn
+import dagger.hilt.android.qualifiers.ApplicationContext
+import dagger.hilt.components.SingletonComponent
+import javax.inject.Singleton
+
+@Module
+@InstallIn(SingletonComponent::class)
+object RunningHistoryDataBaseModule {
+    @Singleton
+    @Provides
+    fun provideRoomDataBase(
+        @ApplicationContext appContext: Context
+    ): RunningHistoryLocalDataBase = Room.databaseBuilder(
+        appContext,
+        RunningHistoryLocalDataBase::class.java,
+        "mogakrun_running_history.db"
+    )
+        .build()
+
+    @Singleton
+    @Provides
+    fun provideRunningHistoryDao(runningHistoryLocalDataBase: RunningHistoryLocalDataBase): RunningHistoryDao =
+        runningHistoryLocalDataBase.runningHistoryDao()
+}

data/src/main/java/com/whyranoid/data/di/DataBaseModule.kt renamed to data/src/main/java/com/whyranoid/data/di/UserDataBaseModule.kt

@@ -5,8 +5,6 @@ import androidx.datastore.core.DataStore
 import androidx.datastore.preferences.core.PreferenceDataStoreFactory
 import androidx.datastore.preferences.core.Preferences
 import androidx.datastore.preferences.preferencesDataStoreFile
-import androidx.room.Room
-import com.whyranoid.data.account.RunningHistoryLocalDataBase
 import dagger.Module
 import dagger.Provides
 import dagger.hilt.InstallIn
@@ -16,22 +14,7 @@ import javax.inject.Singleton
 
 @Module
 @InstallIn(SingletonComponent::class)
-object DataBaseModule {
-    @Singleton
-    @Provides
-    fun provideRoomDataBase(
-        @ApplicationContext appContext: Context
-    ): RunningHistoryLocalDataBase = Room.databaseBuilder(
-        appContext,
-        RunningHistoryLocalDataBase::class.java,
-        "mogakrun_running_history.db"
-    )
-        .build()
-}
-
-@Module
-@InstallIn(SingletonComponent::class)
-object DataStoreModule {
+object UserDataBaseModule {
 
     private const val USER_PREFERENCES = "user_preferences"
 

presentation/src/main/java/com/whyranoid/presentation/myrun/RunningHistoryUiModel.kt renamed to presentation/src/main/java/com/whyranoid/presentation/model/RunningHistoryUiModel.kt

@@ -1,4 +1,4 @@
-package com.whyranoid.presentation.myrun
+package com.whyranoid.presentation.model
 
 import com.whyranoid.domain.model.RunningHistory
 

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

@@ -40,8 +40,10 @@ internal class MyRunFragment : BaseFragment<FragmentMyRunBinding>(R.layout.fragm
 
         topAppBar.setOnMenuItemClickListener { menuItem ->
             when (menuItem.itemId) {
-                R.id.my_run_setting ->
-                    findNavController().navigate(R.id.action_myRunFragment_to_settingFragment)
+                R.id.my_run_setting -> {
+                    val direction = MyRunFragmentDirections.actionMyRunFragmentToSettingFragment()
+                    findNavController().navigate(direction)
+                }
             }
             true
         }
@@ -77,7 +79,10 @@ internal class MyRunFragment : BaseFragment<FragmentMyRunBinding>(R.layout.fragm
                 .setPositiveButton(
                     getString(R.string.my_run_edit_nick_name_dialog_positive)
                 ) { dialog, _ ->
-                    viewModel.updateNickName(viewModel.uid.value, 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(

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

@@ -30,8 +30,6 @@ class MyRunViewModel @Inject constructor(
         getProfileImgUri()
     }
 
-    private val EMPTY_STRING = ""
-
     private val _uid = MutableStateFlow(EMPTY_STRING)
     val uid: StateFlow<String>
         get() = _uid.asStateFlow()
@@ -89,4 +87,8 @@ class MyRunViewModel @Inject constructor(
             }
         }
     }
+
+    companion object {
+        private const val EMPTY_STRING = ""
+    }
 }

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

@@ -3,11 +3,13 @@ package com.whyranoid.presentation.myrun
 import android.view.LayoutInflater
 import android.view.View
 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
 
 class MyRunningHistoryAdapter :
     ListAdapter<RunningHistory, RunningHistoryViewHolder>(
@@ -23,6 +25,24 @@ class MyRunningHistoryAdapter :
     override fun onBindViewHolder(holder: RunningHistoryViewHolder, position: Int) {
         holder.bind(getItem(position))
     }
+
+    companion object {
+        class MyRunningHistoryDiffCallback : DiffUtil.ItemCallback<RunningHistory>() {
+            override fun areItemsTheSame(
+                oldItem: RunningHistory,
+                newItem: RunningHistory
+            ): Boolean {
+                return oldItem.historyId == newItem.historyId
+            }
+
+            override fun areContentsTheSame(
+                oldItem: RunningHistory,
+                newItem: RunningHistory
+            ): Boolean {
+                return oldItem == newItem
+            }
+        }
+    }
 }
 
 class RunningHistoryViewHolder(view: View) : RecyclerView.ViewHolder(view) {