Merge pull request #93 from YAPP-Github/fix/#89-random-pose

ikseong00 · web-flow · commit 4edb9e005468 · 2026-02-09T22:17:02.000+09:00
[fix] #89: 랜덤 포즈 화면 개선
diff --git a/core/common/src/main/java/com/neki/android/core/common/exception/ApiException.kt b/core/common/src/main/java/com/neki/android/core/common/exception/ApiException.kt
@@ -0,0 +1,11 @@
+package com.neki.android.core.common.exception
+
+class ServerApiException(
+    val code: Int,
+    message: String,
+) : Throwable(message)
+
+class ClientApiException(
+    val code: Int,
+    message: String,
+) : Throwable(message)
diff --git a/core/common/src/main/java/com/neki/android/core/common/exception/RandomPoseRetryExhaustedException.kt b/core/common/src/main/java/com/neki/android/core/common/exception/RandomPoseRetryExhaustedException.kt
diff --git a/core/data-api/src/main/java/com/neki/android/core/dataapi/repository/PoseRepository.kt b/core/data-api/src/main/java/com/neki/android/core/dataapi/repository/PoseRepository.kt
@@ -6,6 +6,8 @@ import com.neki.android.core.model.Pose
 import com.neki.android.core.model.SortOrder
 import kotlinx.coroutines.flow.Flow
 
+const val NO_MORE_RANDOM_POSE = 400
+
 interface PoseRepository {
 
     fun getPosesFlow(
@@ -22,14 +24,12 @@ interface PoseRepository {
     suspend fun getSingleRandomPose(
         headCount: PeopleCount,
         excludeIds: Set<Long>,
-        maxRetry: Int,
     ): Result<Pose>
 
     suspend fun getMultipleRandomPose(
         headCount: PeopleCount,
         excludeIds: Set<Long>,
         poseSize: Int,
-        maxRetry: Int,
     ): Result<List<Pose>>
 
     suspend fun updateScrap(poseId: Long, scrap: Boolean): Result<Unit>
diff --git a/core/data-api/src/main/java/com/neki/android/core/dataapi/repository/UserRepository.kt b/core/data-api/src/main/java/com/neki/android/core/dataapi/repository/UserRepository.kt
@@ -1,9 +1,13 @@
 package com.neki.android.core.dataapi.repository
 
 import com.neki.android.core.model.UserInfo
+import kotlinx.coroutines.flow.Flow
 
 interface UserRepository {
+    val hasVisitedRandomPose: Flow<Boolean>
+    suspend fun setRandomPoseVisited()
     suspend fun getUserInfo(): Result<UserInfo>
     suspend fun updateUserInfo(nickname: String): Result<Unit>
+
     suspend fun updateProfileImage(mediaId: Long?): Result<Unit>
 }
diff --git a/core/data/src/main/java/com/neki/android/core/data/local/di/DataStoreModule.kt b/core/data/src/main/java/com/neki/android/core/data/local/di/DataStoreModule.kt
@@ -17,6 +17,9 @@ private val Context.authDataStore: DataStore<Preferences> by preferencesDataStor
 private const val TOKEN_DATASTORE = "token_datastore"
 private val Context.tokenDataStore: DataStore<Preferences> by preferencesDataStore(name = TOKEN_DATASTORE)
 
+private const val USER_DATASTORE = "user_datastore"
+private val Context.userDataStore: DataStore<Preferences> by preferencesDataStore(name = USER_DATASTORE)
+
 @InstallIn(SingletonComponent::class)
 @Module
 internal object DataStoreModule {
@@ -30,4 +33,9 @@ internal object DataStoreModule {
     @Singleton
     @Provides
     fun provideTokenDataStore(@ApplicationContext context: Context): DataStore<Preferences> = context.tokenDataStore
+
+    @UserDataStore
+    @Singleton
+    @Provides
+    fun provideUserDataStore(@ApplicationContext context: Context): DataStore<Preferences> = context.userDataStore
 }
diff --git a/core/data/src/main/java/com/neki/android/core/data/local/di/DataStoreQualifier.kt b/core/data/src/main/java/com/neki/android/core/data/local/di/DataStoreQualifier.kt
@@ -9,3 +9,7 @@ annotation class AuthDataStore
 @Qualifier
 @Retention(AnnotationRetention.BINARY)
 annotation class TokenDataStore
+
+@Qualifier
+@Retention(AnnotationRetention.BINARY)
+annotation class UserDataStore
diff --git a/core/data/src/main/java/com/neki/android/core/data/remote/api/PoseService.kt b/core/data/src/main/java/com/neki/android/core/data/remote/api/PoseService.kt
@@ -37,9 +37,10 @@ class PoseService @Inject constructor(
     }
 
     // 랜덤 포즈 조회
-    suspend fun getRandomPose(headCount: String): BasicResponse<PoseDetailResponse> {
+    suspend fun getRandomPose(headCount: String, excludeIds: String): BasicResponse<PoseDetailResponse> {
         return client.get("/api/poses/random") {
             parameter("headCount", headCount)
+            parameter("excludeIds", excludeIds)
         }.body()
     }
 
diff --git a/core/data/src/main/java/com/neki/android/core/data/repository/impl/PoseRepositoryImpl.kt b/core/data/src/main/java/com/neki/android/core/data/repository/impl/PoseRepositoryImpl.kt
@@ -3,15 +3,17 @@ package com.neki.android.core.data.repository.impl
 import androidx.paging.Pager
 import androidx.paging.PagingConfig
 import androidx.paging.PagingData
-import com.neki.android.core.common.exception.RandomPoseRetryExhaustedException
+import com.neki.android.core.common.exception.ClientApiException
 import com.neki.android.core.data.paging.PosePagingSource
 import com.neki.android.core.data.paging.ScrapPosePagingSource
 import com.neki.android.core.data.remote.api.PoseService
 import com.neki.android.core.data.util.runSuspendCatching
+import com.neki.android.core.dataapi.repository.NO_MORE_RANDOM_POSE
 import com.neki.android.core.dataapi.repository.PoseRepository
 import com.neki.android.core.model.PeopleCount
 import com.neki.android.core.model.Pose
 import com.neki.android.core.model.SortOrder
+import io.ktor.client.plugins.ClientRequestException
 import kotlinx.coroutines.flow.Flow
 import javax.inject.Inject
 
@@ -69,38 +71,47 @@ class PoseRepositoryImpl @Inject constructor(
     override suspend fun getSingleRandomPose(
         headCount: PeopleCount,
         excludeIds: Set<Long>,
-        maxRetry: Int,
     ): Result<Pose> = runSuspendCatching {
-        repeat(maxRetry) {
-            val pose = poseService.getRandomPose(headCount = headCount.name).data.toModel()
-            if (pose.id !in excludeIds) {
-                return@runSuspendCatching pose
-            }
+        val excludeIdsString = excludeIds.joinToString(",")
+
+        return@runSuspendCatching try {
+            poseService.getRandomPose(
+                headCount = headCount.name,
+                excludeIds = excludeIdsString,
+            ).data.toModel()
+        } catch (e: ClientRequestException) {
+            if (e.response.status.value == NO_MORE_RANDOM_POSE)
+                throw ClientApiException(NO_MORE_RANDOM_POSE, e.message)
+            else throw e
         }
-        throw RandomPoseRetryExhaustedException("새로운 포즈를 찾지 못했어요")
     }
 
     override suspend fun getMultipleRandomPose(
         headCount: PeopleCount,
         excludeIds: Set<Long>,
         poseSize: Int,
-        maxRetry: Int,
     ): Result<List<Pose>> = runSuspendCatching {
         val result = mutableListOf<Pose>()
         val collectedIds = excludeIds.toMutableSet()
-        var retryCount = 0
+        repeat(poseSize) {
+            val excludeIdsString = collectedIds.joinToString(",")
+            val pose = try {
+                poseService.getRandomPose(
+                    headCount = headCount.name,
+                    excludeIds = excludeIdsString,
+                ).data.toModel()
+            } catch (e: ClientRequestException) {
+                // Http Error Code 이지만, 클라이언트에서 성공으로 취급
+                if (e.response.status.value == NO_MORE_RANDOM_POSE) return@runSuspendCatching result
+                else throw e
+            }
 
-        while (result.size < poseSize && retryCount < maxRetry) {
-            val pose = poseService.getRandomPose(headCount = headCount.name).data.toModel()
             if (pose.id !in collectedIds) {
                 result.add(pose)
                 collectedIds.add(pose.id)
-            } else {
-                retryCount++
             }
         }
-
-        result.ifEmpty { throw RandomPoseRetryExhaustedException("새로운 포즈를 찾지 못했어요") }
+        return@runSuspendCatching result
     }
 
     override suspend fun updateScrap(poseId: Long, scrap: Boolean): Result<Unit> = runSuspendCatching {
diff --git a/core/data/src/main/java/com/neki/android/core/data/repository/impl/UserRepositoryImpl.kt b/core/data/src/main/java/com/neki/android/core/data/repository/impl/UserRepositoryImpl.kt
@@ -1,16 +1,35 @@
 package com.neki.android.core.data.repository.impl
 
+import androidx.datastore.core.DataStore
+import androidx.datastore.preferences.core.Preferences
+import androidx.datastore.preferences.core.booleanPreferencesKey
+import androidx.datastore.preferences.core.edit
+import com.neki.android.core.data.local.di.UserDataStore
 import com.neki.android.core.data.remote.api.UserService
 import com.neki.android.core.data.remote.model.request.UpdateProfileImageRequest
 import com.neki.android.core.data.remote.model.request.UpdateUserInfoRequest
 import com.neki.android.core.data.util.runSuspendCatching
 import com.neki.android.core.dataapi.repository.UserRepository
 import com.neki.android.core.model.UserInfo
+import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.flow.map
 import javax.inject.Inject
 
 class UserRepositoryImpl @Inject constructor(
+    @UserDataStore private val dataStore: DataStore<Preferences>,
     private val userService: UserService,
 ) : UserRepository {
+    override val hasVisitedRandomPose: Flow<Boolean> =
+        dataStore.data.map { preferences ->
+            preferences[HAS_VISITED_RANDOM_POSE] ?: false
+        }
+
+    override suspend fun setRandomPoseVisited() {
+        dataStore.edit { preferences ->
+            preferences[HAS_VISITED_RANDOM_POSE] = true
+        }
+    }
+
     override suspend fun getUserInfo(): Result<UserInfo> = runSuspendCatching {
         userService.getUserInfo().data.toModel()
     }
@@ -22,4 +41,8 @@ class UserRepositoryImpl @Inject constructor(
     override suspend fun updateProfileImage(mediaId: Long?): Result<Unit> = runSuspendCatching {
         userService.updateProfileImage(UpdateProfileImageRequest(mediaId))
     }
+
+    companion object {
+        private val HAS_VISITED_RANDOM_POSE = booleanPreferencesKey("is_first_visit_random_pose")
+    }
 }
diff --git a/detekt-config.yml b/detekt-config.yml
@@ -52,6 +52,8 @@ formatting:
 exceptions:
     TooGenericExceptionCaught:
         active: false
+    SwallowedException:
+        active: false
 
 style:
     FunctionOnlyReturningConstant:
diff --git a/feature/pose/impl/src/main/java/com/neki/android/feature/pose/impl/navigation/PoseEntryProvider.kt b/feature/pose/impl/src/main/java/com/neki/android/feature/pose/impl/navigation/PoseEntryProvider.kt
@@ -16,6 +16,7 @@ import com.neki.android.feature.pose.impl.detail.PoseDetailViewModel
 import com.neki.android.feature.pose.impl.main.PoseIntent
 import com.neki.android.feature.pose.impl.main.PoseRoute
 import com.neki.android.feature.pose.impl.main.PoseViewModel
+import com.neki.android.feature.pose.impl.random.RandomPoseIntent
 import com.neki.android.feature.pose.impl.random.RandomPoseRoute
 import com.neki.android.feature.pose.impl.random.RandomPoseViewModel
 import dagger.Module
@@ -68,12 +69,23 @@ private fun EntryProviderScope<NavKey>.poseEntry(navigator: Navigator) {
     }
 
     entry<PoseNavKey.RandomPose> { key ->
+        val resultBus = LocalResultEventBus.current
+        val viewModel = hiltViewModel<RandomPoseViewModel, RandomPoseViewModel.Factory>(
+            creationCallback = { factory ->
+                factory.create(key.peopleCount)
+            },
+        )
+
+        ResultEffect<PoseResult>(resultBus) { result ->
+            when (result) {
+                is PoseResult.ScrapChanged -> {
+                    viewModel.store.onIntent(RandomPoseIntent.ScrapChanged(result.poseId, result.isScrapped))
+                }
+            }
+        }
+
         RandomPoseRoute(
-            viewModel = hiltViewModel<RandomPoseViewModel, RandomPoseViewModel.Factory>(
-                creationCallback = { factory ->
-                    factory.create(key.peopleCount)
-                },
-            ),
+            viewModel = viewModel,
             navigateBack = navigator::goBack,
             navigateToPoseDetail = navigator::navigateToPoseDetail,
         )
diff --git a/feature/pose/impl/src/main/java/com/neki/android/feature/pose/impl/random/RandomPoseContract.kt b/feature/pose/impl/src/main/java/com/neki/android/feature/pose/impl/random/RandomPoseContract.kt
@@ -10,6 +10,7 @@ data class RandomPoseUiState(
     val currentIndex: Int = 0,
     val poseList: ImmutableList<Pose> = persistentListOf(),
     val committedScraps: Map<Long, Boolean> = emptyMap(),
+    val hasNewPose: Boolean = true,
 ) {
     val currentPose: Pose?
         get() = poseList.getOrNull(currentIndex)
@@ -33,6 +34,7 @@ sealed interface RandomPoseIntent {
     data object ClickScrapIcon : RandomPoseIntent
     data object ClickLeftSwipe : RandomPoseIntent
     data object ClickRightSwipe : RandomPoseIntent
+    data class ScrapChanged(val poseId: Long, val isScrapped: Boolean) : RandomPoseIntent
 }
 
 sealed interface RandomPoseEffect {
diff --git a/feature/pose/impl/src/main/java/com/neki/android/feature/pose/impl/random/RandomPoseViewModel.kt b/feature/pose/impl/src/main/java/com/neki/android/feature/pose/impl/random/RandomPoseViewModel.kt

Original file line number	Diff line number	Diff line change
`@@ -37,9 +37,10 @@ class PoseService @Inject constructor(`
`37`	`37`	`}`
`38`	`38`
`39`	`39`	`// 랜덤 포즈 조회`
`40`		`- suspend fun getRandomPose(headCount: String): BasicResponse<PoseDetailResponse> {`
	`40`	`+ suspend fun getRandomPose(headCount: String, excludeIds: String): BasicResponse<PoseDetailResponse> {`
`41`	`41`	`return client.get("/api/poses/random") {`
`42`	`42`	`parameter("headCount", headCount)`
	`43`	`+ parameter("excludeIds", excludeIds)`
`43`	`44`	`}.body()`
`44`	`45`	`}`
`45`	`46`