feat: 약관동의 기능 구현

app/src/main/java/com/into/websoso/core/common/util/ExtentionFuction.kt

@@ -21,9 +21,15 @@ import androidx.datastore.preferences.core.PreferenceDataStoreFactory
 import androidx.datastore.preferences.core.Preferences
 import androidx.datastore.preferences.core.emptyPreferences
 import androidx.datastore.preferences.preferencesDataStoreFile
+import androidx.lifecycle.Lifecycle
+import androidx.lifecycle.LifecycleOwner
+import androidx.lifecycle.lifecycleScope
+import androidx.lifecycle.repeatOnLifecycle
 import com.into.websoso.BuildConfig
 import com.into.websoso.core.common.ui.custom.WebsosoCustomSnackBar
 import com.into.websoso.core.common.ui.custom.WebsosoCustomToast
+import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.launch
 import java.io.Serializable
 
 fun Float.toFloatPxFromDp(): Float = this * Resources.getSystem().displayMetrics.density
@@ -96,23 +102,26 @@ inline fun <reified T : Serializable> Intent.getAdaptedSerializableExtra(key: St
         getSerializableExtra(key, T::class.java)
     } else {
         @Suppress("DEPRECATION")
-        getSerializableExtra(key) as? T
+        getSerializableExtra(key)
+            as? T
     }
 
 inline fun <reified T : Parcelable> Intent.getAdaptedParcelableExtra(key: String): T? =
     if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
         getParcelableExtra(key, T::class.java)
     } else {
         @Suppress("DEPRECATION")
-        getParcelableExtra(key) as? T
+        getParcelableExtra(key)
+            as? T
     }
 
 inline fun <reified T : Parcelable> Bundle.getAdaptedParcelable(key: String): T? =
     if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
         getParcelable(key, T::class.java)
     } else {
         @Suppress("DEPRECATION")
-        getParcelable(key) as? T
+        getParcelable(key)
+            as? T
     }
 
 fun Context.createDataStore(preferencesName: String): DataStore<Preferences> =
@@ -137,3 +146,15 @@ fun Modifier.clickableWithoutRipple(
         onClick = onClick,
     )
 }
+
+fun <T> Flow<T>.collectWithLifecycle(
+    lifecycleOwner: LifecycleOwner,
+    state: Lifecycle.State = Lifecycle.State.STARTED,
+    collector: suspend (T) -> Unit,
+) {
+    lifecycleOwner.lifecycleScope.launch {
+        lifecycleOwner.repeatOnLifecycle(state) {
+            collect { collector(it) }
+        }
+    }
+}

app/src/main/java/com/into/websoso/data/mapper/UserMapper.kt

@@ -6,6 +6,7 @@ import com.into.websoso.data.model.GenrePreferenceEntity
 import com.into.websoso.data.model.MyProfileEntity
 import com.into.websoso.data.model.NovelPreferenceEntity
 import com.into.websoso.data.model.OtherUserProfileEntity
+import com.into.websoso.data.model.TermsAgreementEntity
 import com.into.websoso.data.model.UserFeedsEntity
 import com.into.websoso.data.model.UserFeedsEntity.UserFeedEntity
 import com.into.websoso.data.model.UserInfoDetailEntity
@@ -19,6 +20,7 @@ import com.into.websoso.data.remote.response.GenrePreferenceResponseDto
 import com.into.websoso.data.remote.response.MyProfileResponseDto
 import com.into.websoso.data.remote.response.NovelPreferenceResponseDto
 import com.into.websoso.data.remote.response.OtherUserProfileResponseDto
+import com.into.websoso.data.remote.response.TermsAgreementResponseDto
 import com.into.websoso.data.remote.response.UserFeedsResponseDto
 import com.into.websoso.data.remote.response.UserFeedsResponseDto.UserFeedResponseDto
 import com.into.websoso.data.remote.response.UserInfoDetailResponseDto
@@ -29,56 +31,52 @@ import com.into.websoso.data.remote.response.UserStorageResponseDto
 import com.into.websoso.data.remote.response.UserStorageResponseDto.StorageNovelDto
 import com.into.websoso.ui.main.myPage.myActivity.model.Genres
 
-fun UserInfoResponseDto.toData(): UserInfoEntity {
-    return UserInfoEntity(
+fun UserInfoResponseDto.toData(): UserInfoEntity =
+    UserInfoEntity(
         userId = this.userId,
         nickname = this.nickname,
         gender = this.gender,
     )
-}
 
-fun UserInfoDetailResponseDto.toData(): UserInfoDetailEntity {
-    return UserInfoDetailEntity(
+fun UserInfoDetailResponseDto.toData(): UserInfoDetailEntity =
+    UserInfoDetailEntity(
         email = email,
         gender = gender,
         birthYear = birth,
     )
-}
 
-fun BlockedUsersResponseDto.toData(): BlockedUsersEntity {
-    return BlockedUsersEntity(blockedUsers = blocks.map { blockedUser ->
-        BlockedUserEntity(
-            blockId = blockedUser.blockId,
-            userId = blockedUser.userId,
-            nickName = blockedUser.nickName,
-            avatarImage = blockedUser.avatarImage,
-        )
-    })
-}
+fun BlockedUsersResponseDto.toData(): BlockedUsersEntity =
+    BlockedUsersEntity(
+        blockedUsers = blocks.map { blockedUser ->
+            BlockedUserEntity(
+                blockId = blockedUser.blockId,
+                userId = blockedUser.userId,
+                nickName = blockedUser.nickName,
+                avatarImage = blockedUser.avatarImage,
+            )
+        },
+    )
 
-fun UserNovelStatsResponseDto.toData(): UserNovelStatsEntity {
-    return UserNovelStatsEntity(
+fun UserNovelStatsResponseDto.toData(): UserNovelStatsEntity =
+    UserNovelStatsEntity(
         interestNovelCount = interestNovelCount,
         watchingNovelCount = watchingNovelCount,
         watchedNovelCount = watchedNovelCount,
         quitNovelCount = quitNovelCount,
     )
-}
 
-fun UserProfileStatusResponseDto.toData(): UserProfileStatusEntity {
-    return UserProfileStatusEntity(
+fun UserProfileStatusResponseDto.toData(): UserProfileStatusEntity =
+    UserProfileStatusEntity(
         isProfilePublic = isProfilePublic,
     )
-}
 
-fun MyProfileResponseDto.toData(): MyProfileEntity {
-    return MyProfileEntity(
+fun MyProfileResponseDto.toData(): MyProfileEntity =
+    MyProfileEntity(
         nickname = this.nickname,
         intro = this.intro,
         avatarImage = this.avatarImage,
         genrePreferences = this.genrePreferences,
     )
-}
 
 fun GenrePreferenceResponseDto.GenrePreferenceDto.toData(): GenrePreferenceEntity {
     val koreanGenreName = Genres.from(this.genreName)?.korean ?: this.genreName
@@ -89,59 +87,53 @@ fun GenrePreferenceResponseDto.GenrePreferenceDto.toData(): GenrePreferenceEntit
     )
 }
 
-fun NovelPreferenceResponseDto.toData(): NovelPreferenceEntity {
-    return NovelPreferenceEntity(
+fun NovelPreferenceResponseDto.toData(): NovelPreferenceEntity =
+    NovelPreferenceEntity(
         attractivePoints = this.attractivePoints,
         keywords = this.keywords.map { it.toData() },
     )
-}
 
-fun NovelPreferenceResponseDto.AttractivePointKeywordDto.toData(): NovelPreferenceEntity.KeywordEntity {
-    return NovelPreferenceEntity.KeywordEntity(
+fun NovelPreferenceResponseDto.AttractivePointKeywordDto.toData(): NovelPreferenceEntity.KeywordEntity =
+    NovelPreferenceEntity.KeywordEntity(
         keywordName = this.keywordName,
         keywordCount = this.keywordCount,
     )
-}
 
-fun OtherUserProfileResponseDto.toData(): OtherUserProfileEntity {
-    return OtherUserProfileEntity(
+fun OtherUserProfileResponseDto.toData(): OtherUserProfileEntity =
+    OtherUserProfileEntity(
         nickname = this.nickname,
         intro = this.intro,
         avatarImage = this.avatarImage,
         isProfilePublic = this.isProfilePublic,
         genrePreferences = this.genrePreferences,
     )
-}
 
-fun UserStorageResponseDto.toData(): UserStorageEntity {
-    return UserStorageEntity(
+fun UserStorageResponseDto.toData(): UserStorageEntity =
+    UserStorageEntity(
         isLoadable = this.isLoadable,
         userNovelRating = this.userNovelRating,
         userNovelCount = this.userNovelCount,
         userNovels = this.userNovels.map { it.toData() },
     )
-}
 
-fun StorageNovelDto.toData(): StorageNovelEntity {
-    return StorageNovelEntity(
+fun StorageNovelDto.toData(): StorageNovelEntity =
+    StorageNovelEntity(
         author = this.author,
         userNovelId = this.userNovelId,
         novelId = this.novelId,
         novelRating = this.novelRating,
         novelImage = this.novelImage,
         title = this.title,
     )
-}
 
-fun UserFeedsResponseDto.toData(): UserFeedsEntity {
-    return UserFeedsEntity(
+fun UserFeedsResponseDto.toData(): UserFeedsEntity =
+    UserFeedsEntity(
         isLoadable = this.isLoadable,
         feeds = this.feeds.map { it.toData() },
     )
-}
 
-fun UserFeedResponseDto.toData(): UserFeedEntity {
-    return UserFeedEntity(
+fun UserFeedResponseDto.toData(): UserFeedEntity =
+    UserFeedEntity(
         feedId = this.feedId,
         isSpoiler = this.isSpoiler,
         feedContent = this.feedContent,
@@ -156,4 +148,10 @@ fun UserFeedResponseDto.toData(): UserFeedEntity {
         novelRating = this.novelRating,
         relevantCategories = this.relevantCategories,
     )
-}
+
+fun TermsAgreementResponseDto.toData(): TermsAgreementEntity =
+    TermsAgreementEntity(
+        serviceAgreed = this.serviceAgreed,
+        privacyAgreed = this.privacyAgreed,
+        marketingAgreed = this.marketingAgreed,
+    )

app/src/main/java/com/into/websoso/data/model/TermsAgreementEntity.kt

@@ -0,0 +1,7 @@
+package com.into.websoso.data.model
+
+data class TermsAgreementEntity(
+    val serviceAgreed: Boolean,
+    val privacyAgreed: Boolean,
+    val marketingAgreed: Boolean,
+)

app/src/main/java/com/into/websoso/data/remote/api/UserApi.kt

@@ -1,5 +1,6 @@
 package com.into.websoso.data.remote.api
 
+import com.into.websoso.data.remote.request.TermsAgreementRequestDto
 import com.into.websoso.data.remote.request.UserInfoRequestDto
 import com.into.websoso.data.remote.request.UserProfileEditRequestDto
 import com.into.websoso.data.remote.request.UserProfileStatusRequestDto
@@ -8,6 +9,7 @@ import com.into.websoso.data.remote.response.GenrePreferenceResponseDto
 import com.into.websoso.data.remote.response.MyProfileResponseDto
 import com.into.websoso.data.remote.response.NovelPreferenceResponseDto
 import com.into.websoso.data.remote.response.OtherUserProfileResponseDto
+import com.into.websoso.data.remote.response.TermsAgreementResponseDto
 import com.into.websoso.data.remote.response.UserFeedsResponseDto
 import com.into.websoso.data.remote.response.UserInfoDetailResponseDto
 import com.into.websoso.data.remote.response.UserInfoResponseDto
@@ -25,7 +27,6 @@ import retrofit2.http.Path
 import retrofit2.http.Query
 
 interface UserApi {
-
     @GET("users/me")
     suspend fun getUserInfo(): UserInfoResponseDto
 
@@ -106,4 +107,12 @@ interface UserApi {
         @Query("lastFeedId") lastFeedId: Long,
         @Query("size") size: Int,
     ): UserFeedsResponseDto
+
+    @PATCH("users/terms-settings")
+    suspend fun patchTermsAgreement(
+        @Body termsAgreementRequestDto: TermsAgreementRequestDto,
+    )
+
+    @GET("users/terms-settings")
+    suspend fun getTermsAgreement(): TermsAgreementResponseDto
 }

app/src/main/java/com/into/websoso/data/remote/request/TermsAgreementRequestDto.kt

@@ -0,0 +1,14 @@
+package com.into.websoso.data.remote.request
+
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
+
+@Serializable
+data class TermsAgreementRequestDto(
+    @SerialName("serviceAgreed")
+    val serviceAgreed: Boolean,
+    @SerialName("privacyAgreed")
+    val privacyAgreed: Boolean,
+    @SerialName("marketingAgreed")
+    val marketingAgreed: Boolean,
+)

app/src/main/java/com/into/websoso/data/remote/response/TermsAgreementResponseDto.kt

@@ -0,0 +1,14 @@
+package com.into.websoso.data.remote.response
+
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
+
+@Serializable
+data class TermsAgreementResponseDto(
+    @SerialName("serviceAgreed")
+    val serviceAgreed: Boolean,
+    @SerialName("privacyAgreed")
+    val privacyAgreed: Boolean,
+    @SerialName("marketingAgreed")
+    val marketingAgreed: Boolean,
+)

app/src/main/java/com/into/websoso/data/repository/UserRepository.kt

@@ -11,17 +11,21 @@ import com.into.websoso.data.model.GenrePreferenceEntity
 import com.into.websoso.data.model.MyProfileEntity
 import com.into.websoso.data.model.NovelPreferenceEntity
 import com.into.websoso.data.model.OtherUserProfileEntity
+import com.into.websoso.data.model.TermsAgreementEntity
 import com.into.websoso.data.model.UserFeedsEntity
 import com.into.websoso.data.model.UserInfoDetailEntity
 import com.into.websoso.data.model.UserInfoEntity
 import com.into.websoso.data.model.UserNovelStatsEntity
 import com.into.websoso.data.model.UserProfileStatusEntity
 import com.into.websoso.data.model.UserStorageEntity
 import com.into.websoso.data.remote.api.UserApi
+import com.into.websoso.data.remote.request.TermsAgreementRequestDto
 import com.into.websoso.data.remote.request.UserInfoRequestDto
 import com.into.websoso.data.remote.request.UserProfileEditRequestDto
 import com.into.websoso.data.remote.request.UserProfileStatusRequestDto
+import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.first
+import kotlinx.coroutines.flow.map
 import javax.inject.Inject
 
 class UserRepository
@@ -30,6 +34,9 @@ class UserRepository
         private val userApi: UserApi,
         private val userStorage: DataStore<Preferences>,
     ) {
+        val isTermsAgreementChecked: Flow<Boolean> = userStorage.data
+            .map { preferences -> preferences[TERMS_AGREEMENT_CHECKED_KEY] ?: false }
+
         suspend fun fetchUserInfo(): UserInfoEntity {
             val userInfo = userApi.getUserInfo().toData()
             saveUserInfo(userInfo.userId, userInfo.nickname, userInfo.gender)
@@ -164,8 +171,35 @@ class UserRepository
             }
         }
 
+        suspend fun saveTermsAgreements(
+            serviceAgreed: Boolean,
+            privacyAgreed: Boolean,
+            marketingAgreed: Boolean,
+        ) {
+            userApi.patchTermsAgreement(
+                TermsAgreementRequestDto(serviceAgreed, privacyAgreed, marketingAgreed),
+            )
+            saveTermsAgreementChecked(serviceAgreed, privacyAgreed)
+        }
+
+        suspend fun fetchTermsAgreements(): TermsAgreementEntity {
+            val termsAgreement = userApi.getTermsAgreement().toData()
+            saveTermsAgreementChecked(termsAgreement.serviceAgreed, termsAgreement.privacyAgreed)
+            return termsAgreement
+        }
+
+        private suspend fun saveTermsAgreementChecked(
+            serviceAgreed: Boolean,
+            privacyAgreed: Boolean,
+        ) {
+            userStorage.edit { preferences ->
+                preferences[TERMS_AGREEMENT_CHECKED_KEY] = serviceAgreed && privacyAgreed
+            }
+        }
+
         companion object {
             val NOVEL_DETAIL_FIRST_LAUNCHED_KEY = booleanPreferencesKey("NOVEL_DETAIL_FIRST_LAUNCHED")
+            val TERMS_AGREEMENT_CHECKED_KEY = booleanPreferencesKey("terms_agreement_checked")
             val USER_ID_KEY = stringPreferencesKey("USER_ID")
             val USER_NICKNAME_KEY = stringPreferencesKey("USER_NICKNAME")
             val USER_GENDER_KEY = stringPreferencesKey("USER_GENDER")