🔀 #37 from boostcampwm-2022/feat/my_run_room

Room DB 구현 및 나의 운동기록 가져와서 화면에 띄우는 로직 구현, 바텀 네비게이션 구현

Author: peter-j0y

build.gradle

@@ -27,6 +27,7 @@ buildscript {
         desugarVersion = "2.0.0"
         calendarVersion = "1.0.4"
         glideVersion = "4.14.2"
+        roomVersion = "2.4.3"
     }
     dependencies {
         classpath "com.google.gms:google-services:$googleServiceVersion"

data/build.gradle

@@ -52,4 +52,10 @@ dependencies {
     // datastore
     implementation "androidx.datastore:datastore-preferences:$dataStoreVersion"
     implementation "androidx.datastore:datastore-preferences-core:$dataStoreVersion"
+
+    // Room
+    implementation "androidx.room:room-ktx:$roomVersion"
+    implementation "androidx.room:room-runtime:$roomVersion"
+    annotationProcessor "androidx.room:room-compiler:$roomVersion"
+    kapt "androidx.room:room-compiler:$roomVersion"
 }

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

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
     }

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

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

@@ -0,0 +1,17 @@
+package com.whyranoid.data.account
+
+import androidx.room.Dao
+import androidx.room.Insert
+import androidx.room.OnConflictStrategy
+import androidx.room.Query
+import kotlinx.coroutines.flow.Flow
+
+@Dao
+interface RunningHistoryDao {
+    // TODO 일단 쓰기, 읽기만 해놨습니다~
+    @Insert(onConflict = OnConflictStrategy.ABORT)
+    suspend fun addRunningHistory(runningHistory: RunningHistoryEntity)
+
+    @Query("SELECT * FROM running_history ORDER BY startedAt ASC")
+    fun getRunningHistory(): Flow<List<RunningHistoryEntity>>
+}

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

@@ -0,0 +1,27 @@
+package com.whyranoid.data.account
+
+import androidx.room.Entity
+import androidx.room.PrimaryKey
+import com.whyranoid.domain.model.RunningHistory
+
+@Entity(tableName = "running_history")
+data class RunningHistoryEntity(
+    @PrimaryKey
+    val historyId: String,
+    val startedAt: Long,
+    val finishedAt: Long,
+    val totalRunningTime: Int,
+    val pace: Double,
+    val totalDistance: Double
+)
+
+fun RunningHistoryEntity.toRunningHistory(): RunningHistory {
+    return RunningHistory(
+        historyId = historyId,
+        startedAt = startedAt,
+        finishedAt = finishedAt,
+        totalRunningTime = totalRunningTime,
+        pace = pace,
+        totalDistance = totalDistance
+    )
+}

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

@@ -0,0 +1,12 @@
+package com.whyranoid.data.account
+
+import androidx.room.Database
+import androidx.room.RoomDatabase
+
+@Database(
+    entities = [RunningHistoryEntity::class],
+    version = 1
+)
+abstract class RunningHistoryLocalDataBase : RoomDatabase() {
+    abstract fun runningHistoryDao(): RunningHistoryDao
+}

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

@@ -0,0 +1,8 @@
+package com.whyranoid.data.account
+
+import com.whyranoid.domain.model.RunningHistory
+import kotlinx.coroutines.flow.Flow
+
+interface RunningHistoryLocalDataSource {
+    fun getRunningHistory(): Flow<List<RunningHistory>>
+}

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

@@ -0,0 +1,19 @@
+package com.whyranoid.data.account
+
+import com.whyranoid.domain.model.RunningHistory
+import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.flow.map
+import javax.inject.Inject
+
+class RunningHistoryLocalDataSourceImpl @Inject constructor(
+    private val roomDb: RunningHistoryLocalDataBase
+) : RunningHistoryLocalDataSource {
+
+    override fun getRunningHistory(): Flow<List<RunningHistory>> {
+        return roomDb.runningHistoryDao().getRunningHistory().map { runningHistoryList ->
+            runningHistoryList.map { runningHistoryEntity ->
+                runningHistoryEntity.toRunningHistory()
+            }
+        }
+    }
+}