[FEAT] #9 : 7차 세미나 도전과제

hansh0101 · hansh0101 · commit 2b4cc25b5e11 · 2022-06-10T11:41:51.000+09:00
- Room을 사용한 자동 로그인 구현
- StateFlow 사용한 상태 갱신
diff --git a/app/build.gradle b/app/build.gradle
@@ -47,10 +47,10 @@ android {
 }
 
 dependencies {
-    implementation 'androidx.core:core-ktx:1.7.0'
-    implementation 'androidx.appcompat:appcompat:1.4.1'
-    implementation 'com.google.android.material:material:1.6.0'
-    implementation 'androidx.constraintlayout:constraintlayout:2.1.3'
+    implementation 'androidx.core:core-ktx:1.8.0'
+    implementation 'androidx.appcompat:appcompat:1.4.2'
+    implementation 'com.google.android.material:material:1.6.1'
+    implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
     implementation 'androidx.legacy:legacy-support-v4:1.0.0'
     testImplementation 'junit:junit:4.13.2'
     androidTestImplementation 'androidx.test.ext:junit:1.1.3'
@@ -61,8 +61,8 @@ dependencies {
     kapt 'androidx.room:room-compiler:2.4.2'
 
     // Hilt
-    implementation "com.google.dagger:hilt-android:2.40"
-    kapt "com.google.dagger:hilt-android-compiler:2.40"
+    implementation "com.google.dagger:hilt-android:2.41"
+    kapt "com.google.dagger:hilt-android-compiler:2.41"
 
     // ktx
     implementation 'androidx.activity:activity-ktx:1.4.0'
@@ -90,5 +90,11 @@ dependencies {
 
     // OkHttp3
     implementation 'com.squareup.okhttp3:okhttp:5.0.0-alpha.2'
-    implementation 'com.squareup.okhttp3:logging-interceptor:4.9.1'
+    implementation 'com.squareup.okhttp3:logging-interceptor:4.9.3'
+
+    // Coroutines
+    implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-core:1.6.0'
+
+    // lifecycle
+    implementation 'androidx.lifecycle:lifecycle-runtime-ktx:2.4.1'
 }
diff --git a/app/src/main/java/co/kr/sopt_seminar_30th/data/database/AppDatabase.kt b/app/src/main/java/co/kr/sopt_seminar_30th/data/database/AppDatabase.kt
@@ -4,18 +4,21 @@ import android.content.Context
 import androidx.room.Database
 import androidx.room.Room
 import androidx.room.RoomDatabase
+import co.kr.sopt_seminar_30th.data.datasource.local.AuthorizationDao
 import co.kr.sopt_seminar_30th.data.datasource.local.FollowerDao
 import co.kr.sopt_seminar_30th.data.datasource.local.RepositoryDao
 import co.kr.sopt_seminar_30th.data.datasource.local.UserDao
+import co.kr.sopt_seminar_30th.data.model.dto.AuthorizationDto
 import co.kr.sopt_seminar_30th.data.model.dto.FollowerDto
 import co.kr.sopt_seminar_30th.data.model.dto.RepositoryDto
 import co.kr.sopt_seminar_30th.data.model.dto.UserDto
 
-@Database(entities = [UserDto::class, FollowerDto::class, RepositoryDto::class], version = 1)
+@Database(entities = [UserDto::class, FollowerDto::class, RepositoryDto::class, AuthorizationDto::class], version = 1)
 abstract class AppDatabase : RoomDatabase() {
     abstract fun userDao(): UserDao
     abstract fun followerDao(): FollowerDao
     abstract fun repositoryDao(): RepositoryDao
+    abstract fun authorizationDao(): AuthorizationDao
 
     companion object {
         fun getInstance(context: Context): AppDatabase = Room
diff --git a/app/src/main/java/co/kr/sopt_seminar_30th/data/datasource/local/AuthorizationDao.kt b/app/src/main/java/co/kr/sopt_seminar_30th/data/datasource/local/AuthorizationDao.kt
@@ -0,0 +1,16 @@
+package co.kr.sopt_seminar_30th.data.datasource.local
+
+import androidx.room.*
+import co.kr.sopt_seminar_30th.data.model.dto.AuthorizationDto
+
+@Dao
+interface AuthorizationDao {
+    @Insert
+    suspend fun insertAuthorization(authorizationDto: AuthorizationDto)
+
+    @Delete
+    suspend fun deleteAuthorization(authorizationDto: AuthorizationDto)
+
+    @Query("SELECT * FROM Authorization WHERE userId = :id")
+    suspend fun getAuthorization(id: String): AuthorizationDto
+}
diff --git a/app/src/main/java/co/kr/sopt_seminar_30th/data/model/dto/AuthorizationDto.kt b/app/src/main/java/co/kr/sopt_seminar_30th/data/model/dto/AuthorizationDto.kt
@@ -0,0 +1,11 @@
+package co.kr.sopt_seminar_30th.data.model.dto
+
+import androidx.room.ColumnInfo
+import androidx.room.Entity
+import androidx.room.PrimaryKey
+
+@Entity(tableName = "Authorization")
+data class AuthorizationDto(
+    @PrimaryKey val userId: String,
+    @ColumnInfo(name = "autoLogin") val autoLogin: Boolean
+)
diff --git a/app/src/main/java/co/kr/sopt_seminar_30th/data/repositoryimpl/local/AuthorizationRepositoryImpl.kt b/app/src/main/java/co/kr/sopt_seminar_30th/data/repositoryimpl/local/AuthorizationRepositoryImpl.kt
@@ -0,0 +1,28 @@
+package co.kr.sopt_seminar_30th.data.repositoryimpl.local
+
+import co.kr.sopt_seminar_30th.data.datasource.local.AuthorizationDao
+import co.kr.sopt_seminar_30th.data.model.dto.AuthorizationDto
+import co.kr.sopt_seminar_30th.domain.repository.local.AuthorizationRepository
+import kotlinx.coroutines.CoroutineDispatcher
+import kotlinx.coroutines.withContext
+import javax.inject.Inject
+
+class AuthorizationRepositoryImpl @Inject constructor(
+    private val dao: AuthorizationDao,
+    private val coroutineDispatcher: CoroutineDispatcher
+) : AuthorizationRepository {
+    override suspend fun insertAuthorization(userId: String, autoLogin: Boolean) =
+        withContext(coroutineDispatcher) {
+            dao.insertAuthorization(AuthorizationDto(userId, autoLogin))
+        }
+
+    override suspend fun deleteAuthorization(userId: String, autoLogin: Boolean) =
+        withContext(coroutineDispatcher) {
+            dao.deleteAuthorization(AuthorizationDto(userId, autoLogin))
+        }
+
+    override suspend fun getAuthorization(userId: String): Boolean =
+        withContext(coroutineDispatcher) {
+            dao.getAuthorization(userId).autoLogin
+        }
+}
diff --git a/app/src/main/java/co/kr/sopt_seminar_30th/di/DbModule.kt b/app/src/main/java/co/kr/sopt_seminar_30th/di/DbModule.kt
@@ -2,6 +2,7 @@ package co.kr.sopt_seminar_30th.di
 
 import android.content.Context
 import co.kr.sopt_seminar_30th.data.database.AppDatabase
+import co.kr.sopt_seminar_30th.data.datasource.local.AuthorizationDao
 import co.kr.sopt_seminar_30th.data.datasource.local.FollowerDao
 import co.kr.sopt_seminar_30th.data.datasource.local.RepositoryDao
 import co.kr.sopt_seminar_30th.data.datasource.local.UserDao
@@ -33,4 +34,8 @@ object DbModule {
     @Singleton
     @Provides
     fun provideRepositoryDao(appDatabase: AppDatabase): RepositoryDao = appDatabase.repositoryDao()
+
+    @Singleton
+    @Provides
+    fun provideAuthorizationDao(appDatabase: AppDatabase): AuthorizationDao = appDatabase.authorizationDao()
 }
diff --git a/app/src/main/java/co/kr/sopt_seminar_30th/di/RepositoryModule.kt b/app/src/main/java/co/kr/sopt_seminar_30th/di/RepositoryModule.kt
@@ -1,9 +1,7 @@
 package co.kr.sopt_seminar_30th.di
 
-import co.kr.sopt_seminar_30th.data.datasource.local.FollowerDao
-import co.kr.sopt_seminar_30th.data.datasource.local.RepositoryDao
-import co.kr.sopt_seminar_30th.data.datasource.local.SopthubDataStore
-import co.kr.sopt_seminar_30th.data.datasource.local.UserDao
+import co.kr.sopt_seminar_30th.data.datasource.local.*
+import co.kr.sopt_seminar_30th.data.repositoryimpl.local.AuthorizationRepositoryImpl
 import co.kr.sopt_seminar_30th.data.repositoryimpl.local.FollowerRepositoryImpl
 import co.kr.sopt_seminar_30th.data.repositoryimpl.local.RepositoryRepositoryImpl
 import co.kr.sopt_seminar_30th.data.repositoryimpl.local.UserRepositoryImpl
@@ -13,6 +11,7 @@ import co.kr.sopt_seminar_30th.data.repositoryimpl.remote.SignUpRepositoryImpl
 import co.kr.sopt_seminar_30th.data.service.auth.SignInService
 import co.kr.sopt_seminar_30th.data.service.auth.SignUpService
 import co.kr.sopt_seminar_30th.data.service.home.HomeService
+import co.kr.sopt_seminar_30th.domain.repository.local.AuthorizationRepository
 import co.kr.sopt_seminar_30th.domain.repository.local.FollowerRepository
 import co.kr.sopt_seminar_30th.domain.repository.local.RepositoryRepository
 import co.kr.sopt_seminar_30th.domain.repository.local.UserRepository
@@ -68,4 +67,12 @@ object RepositoryModule {
         homeService: HomeService,
         @IoDispatcher coroutineDispatcher: CoroutineDispatcher
     ): HomeRepository = HomeRepositoryImpl(homeService, coroutineDispatcher)
+
+    @Singleton
+    @Provides
+    fun provideAuthorizationRepository(
+        authorizationDao: AuthorizationDao,
+        @IoDispatcher coroutineDispatcher: CoroutineDispatcher
+    ): AuthorizationRepository =
+        AuthorizationRepositoryImpl(authorizationDao, coroutineDispatcher)
 }
diff --git a/app/src/main/java/co/kr/sopt_seminar_30th/domain/repository/local/AuthorizationRepository.kt b/app/src/main/java/co/kr/sopt_seminar_30th/domain/repository/local/AuthorizationRepository.kt
@@ -0,0 +1,7 @@
+package co.kr.sopt_seminar_30th.domain.repository.local
+
+interface AuthorizationRepository {
+    suspend fun insertAuthorization(userId: String, autoLogin: Boolean)
+    suspend fun deleteAuthorization(userId: String, autoLogin: Boolean)
+    suspend fun getAuthorization(userId: String): Boolean
+}
diff --git a/app/src/main/java/co/kr/sopt_seminar_30th/presentation/ui/auth/SignInActivity.kt b/app/src/main/java/co/kr/sopt_seminar_30th/presentation/ui/auth/SignInActivity.kt
@@ -5,13 +5,17 @@ import android.os.Bundle
 import android.widget.Toast
 import androidx.activity.result.contract.ActivityResultContracts
 import androidx.activity.viewModels
+import androidx.lifecycle.flowWithLifecycle
+import androidx.lifecycle.lifecycleScope
 import co.kr.sopt_seminar_30th.R
 import co.kr.sopt_seminar_30th.data.datasource.local.SopthubDataStore
 import co.kr.sopt_seminar_30th.databinding.ActivitySignInBinding
 import co.kr.sopt_seminar_30th.presentation.ui.base.BaseActivity
 import co.kr.sopt_seminar_30th.presentation.ui.home.HomeActivity
 import co.kr.sopt_seminar_30th.presentation.viewmodel.SignInViewModel
 import dagger.hilt.android.AndroidEntryPoint
+import kotlinx.coroutines.flow.launchIn
+import kotlinx.coroutines.flow.onEach
 import javax.inject.Inject
 
 @AndroidEntryPoint
@@ -47,8 +51,7 @@ class SignInActivity : BaseActivity<ActivitySignInBinding>() {
 
     private fun loginWithAutoLogin() {
         if (dataStore.autoLogin) {
-            startActivity(Intent(this, HomeActivity::class.java))
-            finish()
+            signInViewModel.checkAuthorization(dataStore.userId)
         }
     }
 
@@ -95,5 +98,13 @@ class SignInActivity : BaseActivity<ActivitySignInBinding>() {
                 Toast.makeText(this, "아이디/비밀번호를 확인해주세요", Toast.LENGTH_SHORT).show()
             }
         }
+        signInViewModel.autoLoginState
+            .flowWithLifecycle(this.lifecycle)
+            .onEach {
+                if(it) {
+                    startActivity(Intent(this, HomeActivity::class.java))
+                    finish()
+                }
+            }.launchIn(this.lifecycleScope)
     }
 }
diff --git a/app/src/main/java/co/kr/sopt_seminar_30th/presentation/ui/onboarding/OnBoardingActivity.kt b/app/src/main/java/co/kr/sopt_seminar_30th/presentation/ui/onboarding/OnBoardingActivity.kt
@@ -2,42 +2,61 @@ package co.kr.sopt_seminar_30th.presentation.ui.onboarding
 
 import android.content.Intent
 import android.os.Bundle
+import androidx.activity.viewModels
+import androidx.lifecycle.flowWithLifecycle
+import androidx.lifecycle.lifecycleScope
 import co.kr.sopt_seminar_30th.R
 import co.kr.sopt_seminar_30th.data.datasource.local.SopthubDataStore
 import co.kr.sopt_seminar_30th.databinding.ActivityOnBoardingBinding
 import co.kr.sopt_seminar_30th.presentation.ui.auth.SignInActivity
 import co.kr.sopt_seminar_30th.presentation.ui.base.BaseActivity
 import co.kr.sopt_seminar_30th.presentation.ui.home.HomeActivity
+import co.kr.sopt_seminar_30th.presentation.viewmodel.OnBoardingViewModel
 import dagger.hilt.android.AndroidEntryPoint
+import kotlinx.coroutines.flow.launchIn
+import kotlinx.coroutines.flow.onEach
 import javax.inject.Inject
 
 @AndroidEntryPoint
 class OnBoardingActivity : BaseActivity<ActivityOnBoardingBinding>() {
     override val layoutRes: Int
         get() = R.layout.activity_on_boarding
 
+    private val viewModel by viewModels<OnBoardingViewModel>()
+
     @Inject
     lateinit var dataStore: SopthubDataStore
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         checkAutoLoginEnabled()
         checkOnBoardingEnabled()
+        observeData()
     }
 
     private fun checkAutoLoginEnabled() {
         if (dataStore.autoLogin) {
-            startActivity(Intent(this, HomeActivity::class.java))
-            finish()
+            viewModel.checkAuthorization(dataStore.userId)
         }
     }
 
     private fun checkOnBoardingEnabled() {
         if (dataStore.onBoardingEnabled) {
-            if(!isFinishing) {
+            if (!isFinishing) {
                 startActivity(Intent(this, SignInActivity::class.java))
                 finish()
             }
         }
     }
+
+    private fun observeData() {
+        viewModel.autoLoginState
+            .flowWithLifecycle(this.lifecycle)
+            .onEach {
+                if (it) {
+                    startActivity(Intent(this, HomeActivity::class.java))
+                    finish()
+                }
+            }.launchIn(this.lifecycleScope)
+    }
 }
diff --git a/app/src/main/java/co/kr/sopt_seminar_30th/presentation/viewmodel/HomeViewModel.kt b/app/src/main/java/co/kr/sopt_seminar_30th/presentation/viewmodel/HomeViewModel.kt
@@ -9,6 +9,7 @@ import androidx.lifecycle.viewModelScope
 import co.kr.sopt_seminar_30th.domain.entity.home.UserFollow
 import co.kr.sopt_seminar_30th.domain.entity.home.UserProfile
 import co.kr.sopt_seminar_30th.domain.entity.home.UserRepository
+import co.kr.sopt_seminar_30th.domain.repository.local.AuthorizationRepository
 import co.kr.sopt_seminar_30th.domain.repository.remote.HomeRepository
 import co.kr.sopt_seminar_30th.domain.usecase.user.GetUserIdUseCase
 import co.kr.sopt_seminar_30th.domain.usecase.user.TurnOffAutoLoginUseCase
@@ -23,7 +24,8 @@ import javax.inject.Inject
 class HomeViewModel @Inject constructor(
     private val getUserIdUseCase: GetUserIdUseCase,
     private val turnOffAutoLoginUseCase: TurnOffAutoLoginUseCase,
-    private val homeRepository: HomeRepository
+    private val homeRepository: HomeRepository,
+    private val authorizationRepository: AuthorizationRepository
 ) : ViewModel() {
     private var id: String = ""
 
@@ -216,10 +218,14 @@ class HomeViewModel @Inject constructor(
 
     fun turnOffAutoLogin() {
         viewModelScope.launch {
-            kotlin.runCatching {
+            runCatching {
                 turnOffAutoLoginUseCase()
             }.onSuccess {
-                _turnOffSuccess.value = true
+                runCatching {
+                    authorizationRepository.deleteAuthorization(id, true)
+                }.onSuccess {
+                    _turnOffSuccess.value = true
+                }
             }
         }
     }
diff --git a/app/src/main/java/co/kr/sopt_seminar_30th/presentation/viewmodel/OnBoardingViewModel.kt b/app/src/main/java/co/kr/sopt_seminar_30th/presentation/viewmodel/OnBoardingViewModel.kt
@@ -0,0 +1,32 @@
+package co.kr.sopt_seminar_30th.presentation.viewmodel
+
+import androidx.lifecycle.ViewModel
+import androidx.lifecycle.viewModelScope
+import co.kr.sopt_seminar_30th.domain.repository.local.AuthorizationRepository
+import dagger.hilt.android.lifecycle.HiltViewModel
+import kotlinx.coroutines.flow.MutableStateFlow
+import kotlinx.coroutines.flow.asStateFlow
+import kotlinx.coroutines.launch
+import timber.log.Timber
+import javax.inject.Inject
+
+@HiltViewModel
+class OnBoardingViewModel @Inject constructor(
+    private val authorizationRepository: AuthorizationRepository
+): ViewModel() {
+    private val _autoLoginState = MutableStateFlow(false)
+    val autoLoginState = _autoLoginState.asStateFlow()
+
+    fun checkAuthorization(userId: String) {
+        viewModelScope.launch {
+            runCatching {
+                authorizationRepository.getAuthorization(userId)
+            }.onSuccess {
+                _autoLoginState.emit(true)
+            }.onFailure {
+                _autoLoginState.emit(false)
+                Timber.e(it)
+            }
+        }
+    }
+}
diff --git a/app/src/main/java/co/kr/sopt_seminar_30th/presentation/viewmodel/SignInViewModel.kt b/app/src/main/java/co/kr/sopt_seminar_30th/presentation/viewmodel/SignInViewModel.kt
