Merge pull request #80 from YAPP-Github/BOOK-186-feature/#79

feat: 약관 동의 API 연동

Author: easyhooon

core/data/api/src/main/kotlin/com/ninecraft/booket/core/data/api/repository/AuthRepository.kt

@@ -4,4 +4,6 @@ interface AuthRepository {
     suspend fun login(accessToken: String): Result<Unit>
 
     suspend fun logout(): Result<Unit>
+
+    suspend fun agreeTerms(termsAgreed: Boolean): Result<Unit>
 }

core/data/api/src/main/kotlin/com/ninecraft/booket/core/data/api/repository/UserRepository.kt

@@ -1,12 +1,13 @@
 package com.ninecraft.booket.core.data.api.repository
 
+import com.ninecraft.booket.core.model.OnboardingState
 import com.ninecraft.booket.core.model.UserProfileModel
 import kotlinx.coroutines.flow.Flow
 
 interface UserRepository {
     suspend fun getUserProfile(): Result<UserProfileModel>
 
-    val isOnboardingCompleted: Flow<Boolean>
+    val onboardingState: Flow<OnboardingState>
 
     suspend fun setOnboardingCompleted(isCompleted: Boolean)
 }

core/data/impl/src/main/kotlin/com/ninecraft/booket/core/data/impl/mapper/ResponseToModel.kt

@@ -26,6 +26,7 @@ internal fun UserProfileResponse.toModel(): UserProfileModel {
         email = email,
         nickname = nickname,
         provider = provider,
+        termsAgreed = termsAgreed,
     )
 }
 

core/data/impl/src/main/kotlin/com/ninecraft/booket/core/data/impl/repository/DefaultAuthRepository.kt

@@ -4,6 +4,7 @@ import com.ninecraft.booket.core.common.utils.runSuspendCatching
 import com.ninecraft.booket.core.data.api.repository.AuthRepository
 import com.ninecraft.booket.core.datastore.api.datasource.TokenDataSource
 import com.ninecraft.booket.core.network.request.LoginRequest
+import com.ninecraft.booket.core.network.request.TermsAgreementRequest
 import com.ninecraft.booket.core.network.service.ReedService
 import javax.inject.Inject
 
@@ -28,6 +29,11 @@ internal class DefaultAuthRepository @Inject constructor(
         clearTokens()
     }
 
+    override suspend fun agreeTerms(termsAgreed: Boolean) = runSuspendCatching {
+        service.agreeTerms(TermsAgreementRequest(termsAgreed))
+        Unit
+    }
+
     private suspend fun saveTokens(accessToken: String, refreshToken: String) {
         tokenDatasource.apply {
             setAccessToken(accessToken)

core/data/impl/src/main/kotlin/com/ninecraft/booket/core/data/impl/repository/DefaultUserRepository.kt

@@ -15,7 +15,7 @@ internal class DefaultUserRepository @Inject constructor(
         service.getUserProfile().toModel()
     }
 
-    override val isOnboardingCompleted = onboardingDataSource.isOnboardingCompleted
+    override val onboardingState = onboardingDataSource.onboardingState
 
     override suspend fun setOnboardingCompleted(isCompleted: Boolean) {
         onboardingDataSource.setOnboardingCompleted(isCompleted)

core/datastore/api/build.gradle.kts

@@ -7,5 +7,9 @@ android {
 }
 
 dependencies {
-    implementation(libs.kotlinx.coroutines.core)
+    implementations(
+        projects.core.model,
+
+        libs.kotlinx.coroutines.core,
+    )
 }

core/datastore/api/src/main/kotlin/com/ninecraft/booket/core/datastore/api/datasource/OnboardingDataSource.kt

@@ -1,8 +1,9 @@
 package com.ninecraft.booket.core.datastore.api.datasource
 
+import com.ninecraft.booket.core.model.OnboardingState
 import kotlinx.coroutines.flow.Flow
 
 interface OnboardingDataSource {
-    val isOnboardingCompleted: Flow<Boolean>
+    val onboardingState: Flow<OnboardingState>
     suspend fun setOnboardingCompleted(isCompleted: Boolean)
 }

core/datastore/impl/build.gradle.kts

@@ -17,6 +17,8 @@ android {
 dependencies {
     implementations(
         projects.core.datastore.api,
+        projects.core.model,
+
         libs.androidx.datastore.preferences,
 
         libs.logger,

core/datastore/impl/src/main/kotlin/com/ninecraft/booket/core/datastore/impl/datasource/DefaultOnboardingDataSource.kt

@@ -5,6 +5,7 @@ import androidx.datastore.preferences.core.Preferences
 import androidx.datastore.preferences.core.booleanPreferencesKey
 import androidx.datastore.preferences.core.edit
 import com.ninecraft.booket.core.datastore.api.datasource.OnboardingDataSource
+import com.ninecraft.booket.core.model.OnboardingState
 import com.ninecraft.booket.core.datastore.impl.di.OnboardingDataStore
 import com.ninecraft.booket.core.datastore.impl.util.handleIOException
 import kotlinx.coroutines.flow.Flow
@@ -14,10 +15,13 @@ import javax.inject.Inject
 class DefaultOnboardingDataSource @Inject constructor(
     @OnboardingDataStore private val dataStore: DataStore<Preferences>,
 ) : OnboardingDataSource {
-    override val isOnboardingCompleted: Flow<Boolean> = dataStore.data
+    override val onboardingState: Flow<OnboardingState> = dataStore.data
         .handleIOException()
         .map { prefs ->
-            prefs[IS_ONBOARDING_COMPLETED] ?: false
+            when (prefs[IS_ONBOARDING_COMPLETED] ?: false) {
+                false -> OnboardingState.NOT_COMPLETED
+                true -> OnboardingState.COMPLETED
+            }
         }
 
     override suspend fun setOnboardingCompleted(isCompleted: Boolean) {