Merge pull request #29 from YAPP-Github/feature/#28-terms-agreement-ui

[Feature/#28] 약관동의 화면 구현

Author: wjdrjs00

app/src/main/java/com/threegap/bitnagil/MainNavHost.kt

@@ -8,6 +8,7 @@ import com.threegap.bitnagil.presentation.home.HomeScreen
 import com.threegap.bitnagil.presentation.intro.IntroScreenContainer
 import com.threegap.bitnagil.presentation.login.LoginScreenContainer
 import com.threegap.bitnagil.presentation.splash.SplashScreenContainer
+import com.threegap.bitnagil.presentation.terms.TermsAgreementScreenContainer
 
 @Composable
 fun MainNavHost(
@@ -33,7 +34,17 @@ fun MainNavHost(
         }
 
         composable<Route.Login> {
-            LoginScreenContainer()
+            LoginScreenContainer(
+                navigateToHome = { navigator.navController.navigate(Route.Home) },
+                navigateToTermsAgreement = { navigator.navController.navigate(Route.TermsAgreement) },
+            )
+        }
+
+        composable<Route.TermsAgreement> {
+            TermsAgreementScreenContainer(
+                navigateToOnBoarding = { },
+                navigateToBack = { navigator.navController.popBackStack() },
+            )
         }
 
         composable<Route.Home> {

app/src/main/java/com/threegap/bitnagil/Route.kt

@@ -10,6 +10,9 @@ sealed interface Route {
     @Serializable
     data object Intro : Route
 
+    @Serializable
+    data object TermsAgreement : Route
+
     @Serializable
     data object Login : Route
 

data/src/main/java/com/threegap/bitnagil/data/auth/datasource/AuthRemoteDataSource.kt

@@ -1,8 +1,11 @@
 package com.threegap.bitnagil.data.auth.datasource
 
 import com.threegap.bitnagil.data.auth.model.request.LoginRequestDto
+import com.threegap.bitnagil.data.auth.model.request.TermsAgreementRequestDto
 import com.threegap.bitnagil.data.auth.model.response.LoginResponseDto
 
 interface AuthRemoteDataSource {
     suspend fun login(socialAccessToken: String, loginRequestDto: LoginRequestDto): Result<LoginResponseDto>
+
+    suspend fun submitAgreement(termsAgreementRequestDto: TermsAgreementRequestDto): Result<Unit>
 }

data/src/main/java/com/threegap/bitnagil/data/auth/datasourceimpl/AuthRemoteDataSourceImpl.kt

@@ -2,6 +2,7 @@ package com.threegap.bitnagil.data.auth.datasourceimpl
 
 import com.threegap.bitnagil.data.auth.datasource.AuthRemoteDataSource
 import com.threegap.bitnagil.data.auth.model.request.LoginRequestDto
+import com.threegap.bitnagil.data.auth.model.request.TermsAgreementRequestDto
 import com.threegap.bitnagil.data.auth.model.response.LoginResponseDto
 import com.threegap.bitnagil.data.auth.service.AuthService
 import com.threegap.bitnagil.data.common.safeApiCall
@@ -14,4 +15,9 @@ class AuthRemoteDataSourceImpl @Inject constructor(
         safeApiCall {
             authService.postLogin(socialAccessToken, loginRequestDto)
         }
+
+    override suspend fun submitAgreement(termsAgreementRequestDto: TermsAgreementRequestDto): Result<Unit> =
+        safeApiCall {
+            authService.submitAgreement(termsAgreementRequestDto)
+        }
 }

data/src/main/java/com/threegap/bitnagil/data/auth/mapper/AuthMapper.kt

@@ -1,11 +1,23 @@
 package com.threegap.bitnagil.data.auth.mapper
 
+import com.threegap.bitnagil.data.auth.model.request.TermsAgreementRequestDto
 import com.threegap.bitnagil.data.auth.model.response.LoginResponseDto
 import com.threegap.bitnagil.domain.auth.model.AuthSession
+import com.threegap.bitnagil.domain.auth.model.TermsAgreement
 import com.threegap.bitnagil.domain.auth.model.UserRole
 
-internal fun LoginResponseDto.toDomain() = AuthSession(
-    accessToken = accessToken,
-    refreshToken = refreshToken,
-    role = UserRole.from(role),
-)
+// toDomain
+internal fun LoginResponseDto.toDomain() =
+    AuthSession(
+        accessToken = this.accessToken,
+        refreshToken = this.refreshToken,
+        role = UserRole.from(this.role),
+    )
+
+// toDto
+internal fun TermsAgreement.toDto() =
+    TermsAgreementRequestDto(
+        agreedToTermsOfService = this.agreedToTermsOfService,
+        agreedToPrivacyPolicy = this.agreedToPrivacyPolicy,
+        isOverFourteen = this.isOverFourteen,
+    )

data/src/main/java/com/threegap/bitnagil/data/auth/model/request/TermsAgreementRequestDto.kt

@@ -0,0 +1,14 @@
+package com.threegap.bitnagil.data.auth.model.request
+
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
+
+@Serializable
+data class TermsAgreementRequestDto(
+    @SerialName("agreedToTermsOfService")
+    val agreedToTermsOfService: Boolean,
+    @SerialName("agreedToPrivacyPolicy")
+    val agreedToPrivacyPolicy: Boolean,
+    @SerialName("isOverFourteen")
+    val isOverFourteen: Boolean,
+)

data/src/main/java/com/threegap/bitnagil/data/auth/repositoryimpl/AuthRepositoryImpl.kt

@@ -3,8 +3,10 @@ package com.threegap.bitnagil.data.auth.repositoryimpl
 import com.threegap.bitnagil.data.auth.datasource.AuthLocalDataSource
 import com.threegap.bitnagil.data.auth.datasource.AuthRemoteDataSource
 import com.threegap.bitnagil.data.auth.mapper.toDomain
+import com.threegap.bitnagil.data.auth.mapper.toDto
 import com.threegap.bitnagil.data.auth.model.request.LoginRequestDto
 import com.threegap.bitnagil.domain.auth.model.AuthSession
+import com.threegap.bitnagil.domain.auth.model.TermsAgreement
 import com.threegap.bitnagil.domain.auth.repository.AuthRepository
 import javax.inject.Inject
 
@@ -20,4 +22,9 @@ class AuthRepositoryImpl @Inject constructor(
 
     override suspend fun updateAuthToken(accessToken: String, refreshToken: String): Result<Unit> =
         authLocalDataSource.updateAuthToken(accessToken, refreshToken)
+
+    override suspend fun submitAgreement(termsAgreement: TermsAgreement): Result<Unit> =
+        authRemoteDataSource.submitAgreement(
+            termsAgreement.toDto(),
+        )
 }

data/src/main/java/com/threegap/bitnagil/data/auth/service/AuthService.kt

@@ -1,6 +1,7 @@
 package com.threegap.bitnagil.data.auth.service
 
 import com.threegap.bitnagil.data.auth.model.request.LoginRequestDto
+import com.threegap.bitnagil.data.auth.model.request.TermsAgreementRequestDto
 import com.threegap.bitnagil.data.auth.model.response.LoginResponseDto
 import com.threegap.bitnagil.network.model.BaseResponse
 import retrofit2.http.Body
@@ -15,4 +16,9 @@ interface AuthService {
         @Header("SocialAccessToken") socialAccessToken: String,
         @Body loginRequestDto: LoginRequestDto,
     ): BaseResponse<LoginResponseDto>
+
+    @POST("/api/v1/auth/agreements")
+    suspend fun submitAgreement(
+        @Body termsAgreementRequestDto: TermsAgreementRequestDto,
+    ): BaseResponse<Unit>
 }

domain/src/main/java/com/threegap/bitnagil/domain/auth/model/TermsAgreement.kt

@@ -0,0 +1,10 @@
+package com.threegap.bitnagil.domain.auth.model
+
+data class TermsAgreement(
+    val agreedToTermsOfService: Boolean,
+    val agreedToPrivacyPolicy: Boolean,
+    val isOverFourteen: Boolean,
+) {
+    val isValid: Boolean
+        get() = agreedToTermsOfService && agreedToPrivacyPolicy && isOverFourteen
+}

domain/src/main/java/com/threegap/bitnagil/domain/auth/repository/AuthRepository.kt

@@ -1,11 +1,14 @@
 package com.threegap.bitnagil.domain.auth.repository
 
 import com.threegap.bitnagil.domain.auth.model.AuthSession
+import com.threegap.bitnagil.domain.auth.model.TermsAgreement
 
 interface AuthRepository {
     suspend fun login(socialAccessToken: String, socialType: String): Result<AuthSession>
 
     suspend fun hasToken(): Boolean
 
     suspend fun updateAuthToken(accessToken: String, refreshToken: String): Result<Unit>
+
+    suspend fun submitAgreement(termsAgreement: TermsAgreement): Result<Unit>
 }