FEAT: 사용자가 이전에 설정한 온보딩 조회 UI 구현 및 온보딩 조회 API 연결

l5x5l · l5x5l · commit 1a274964a5fa · 2025-08-20T22:33:57.000+09:00
diff --git a/data/src/main/java/com/threegap/bitnagil/data/onboarding/datasource/OnBoardingDataSource.kt b/data/src/main/java/com/threegap/bitnagil/data/onboarding/datasource/OnBoardingDataSource.kt
@@ -4,10 +4,12 @@ import com.threegap.bitnagil.data.onboarding.model.dto.OnBoardingAbstractDto
 import com.threegap.bitnagil.data.onboarding.model.dto.OnBoardingDto
 import com.threegap.bitnagil.data.onboarding.model.request.GetOnBoardingRecommendRoutinesRequest
 import com.threegap.bitnagil.data.onboarding.model.response.GetOnBoardingRecommendRoutinesResponse
+import com.threegap.bitnagil.data.onboarding.model.response.GetUserOnBoardingResponse
 
 interface OnBoardingDataSource {
     suspend fun getOnBoardingList(): List<OnBoardingDto>
     suspend fun getOnBoardingRecommendRoutines(request: GetOnBoardingRecommendRoutinesRequest): Result<GetOnBoardingRecommendRoutinesResponse>
     suspend fun getOnBoardingAbstract(selectedOnBoardingItemIdList: List<Pair<String, List<String>>>): OnBoardingAbstractDto
     suspend fun registerRecommendRoutineList(selectedRecommendRoutineIds: List<Int>): Result<Unit>
+    suspend fun getUserOnBoarding(): Result<GetUserOnBoardingResponse>
 }
diff --git a/data/src/main/java/com/threegap/bitnagil/data/onboarding/datasourceImpl/OnBoardingDataSourceImpl.kt b/data/src/main/java/com/threegap/bitnagil/data/onboarding/datasourceImpl/OnBoardingDataSourceImpl.kt
@@ -11,6 +11,7 @@ import com.threegap.bitnagil.data.onboarding.model.dto.OnBoardingItemDto
 import com.threegap.bitnagil.data.onboarding.model.request.GetOnBoardingRecommendRoutinesRequest
 import com.threegap.bitnagil.data.onboarding.model.request.RegisterOnBoardingRecommendRoutinesRequest
 import com.threegap.bitnagil.data.onboarding.model.response.GetOnBoardingRecommendRoutinesResponse
+import com.threegap.bitnagil.data.onboarding.model.response.GetUserOnBoardingResponse
 import com.threegap.bitnagil.data.onboarding.service.OnBoardingService
 import javax.inject.Inject
 
@@ -57,6 +58,12 @@ class OnBoardingDataSourceImpl @Inject constructor(
         }
     }
 
+    override suspend fun getUserOnBoarding(): Result<GetUserOnBoardingResponse> {
+        return safeApiCall {
+            onBoardingService.getOnBoarding()
+        }
+    }
+
     private fun getOnBoardingAbstractText(onBoardingId: String, selectedOnBoardingDetailIdList: List<String>): OnBoardingAbstractTextDto? {
         if (selectedOnBoardingDetailIdList.isEmpty()) return null
         val onBoarding = onBoardingDtoList.find { it.id == onBoardingId }
diff --git a/data/src/main/java/com/threegap/bitnagil/data/onboarding/model/request/GetOnBoardingRecommendRoutinesRequest.kt b/data/src/main/java/com/threegap/bitnagil/data/onboarding/model/request/GetOnBoardingRecommendRoutinesRequest.kt
@@ -8,7 +8,7 @@ data class GetOnBoardingRecommendRoutinesRequest(
     @SerialName("timeSlot")
     val timeSlot: String,
     @SerialName("emotionType")
-    val emotionType: String,
+    val emotionType: List<String>,
     @SerialName("realOutingFrequency")
     val realOutingFrequency: String,
     @SerialName("targetOutingFrequency")
diff --git a/data/src/main/java/com/threegap/bitnagil/data/onboarding/model/response/GetUserOnBoardingResponse.kt b/data/src/main/java/com/threegap/bitnagil/data/onboarding/model/response/GetUserOnBoardingResponse.kt
@@ -0,0 +1,14 @@
+package com.threegap.bitnagil.data.onboarding.model.response
+
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
+
+@Serializable
+data class GetUserOnBoardingResponse(
+    @SerialName("timeSlot")
+    val timeSlot: String,
+    @SerialName("emotionTypes")
+    val emotionTypes: List<String>,
+    @SerialName("targetOutingFrequency")
+    val targetOutingFrequency: String,
+)
diff --git a/data/src/main/java/com/threegap/bitnagil/data/onboarding/repositoryImpl/OnBoardingRepositoryImpl.kt b/data/src/main/java/com/threegap/bitnagil/data/onboarding/repositoryImpl/OnBoardingRepositoryImpl.kt
@@ -34,13 +34,13 @@ class OnBoardingRepositoryImpl @Inject constructor(
         selectedItemIdsWithOnBoardingId: List<Pair<String, List<String>>>,
     ): Result<List<OnBoardingRecommendRoutine>> {
         val timeSlot = selectedItemIdsWithOnBoardingId.find { it.first == OnBoardingDto.TimeSlot.id }?.second?.first()
-        val emotionType = selectedItemIdsWithOnBoardingId.find { it.first == OnBoardingDto.EmotionType.id }?.second?.first()
+        val emotionType = selectedItemIdsWithOnBoardingId.find { it.first == OnBoardingDto.EmotionType.id }?.second
         val realOutingFrequency = selectedItemIdsWithOnBoardingId.find { it.first == OnBoardingDto.RealOutingFrequency.id }?.second?.first()
         val targetOutingFrequency = selectedItemIdsWithOnBoardingId.find { it.first == OnBoardingDto.TargetOutingFrequency.id }?.second?.first()
 
         val request = GetOnBoardingRecommendRoutinesRequest(
             timeSlot = timeSlot ?: "",
-            emotionType = emotionType ?: "",
+            emotionType = emotionType ?: listOf(),
             realOutingFrequency = realOutingFrequency ?: "",
             targetOutingFrequency = targetOutingFrequency ?: "",
         )
@@ -64,6 +64,16 @@ class OnBoardingRepositoryImpl @Inject constructor(
         }
     }
 
+    override suspend fun getUserOnBoarding(): Result<List<Pair<String, List<String>>>> {
+        return onBoardingDataSource.getUserOnBoarding().map {
+            listOf(
+                OnBoardingDto.TimeSlot.id to listOf(it.timeSlot),
+                OnBoardingDto.EmotionType.id to it.emotionTypes,
+                OnBoardingDto.TargetOutingFrequency.id to listOf(it.targetOutingFrequency),
+            )
+        }
+    }
+
     private val _onBoardingRecommendRoutineEventFlow = MutableSharedFlow<OnBoardingRecommendRoutineEvent>(
         extraBufferCapacity = 1,
         onBufferOverflow = BufferOverflow.DROP_OLDEST,
diff --git a/data/src/main/java/com/threegap/bitnagil/data/onboarding/service/OnBoardingService.kt b/data/src/main/java/com/threegap/bitnagil/data/onboarding/service/OnBoardingService.kt
@@ -3,18 +3,23 @@ package com.threegap.bitnagil.data.onboarding.service
 import com.threegap.bitnagil.data.onboarding.model.request.GetOnBoardingRecommendRoutinesRequest
 import com.threegap.bitnagil.data.onboarding.model.request.RegisterOnBoardingRecommendRoutinesRequest
 import com.threegap.bitnagil.data.onboarding.model.response.GetOnBoardingRecommendRoutinesResponse
+import com.threegap.bitnagil.data.onboarding.model.response.GetUserOnBoardingResponse
 import com.threegap.bitnagil.network.model.BaseResponse
 import retrofit2.http.Body
+import retrofit2.http.GET
 import retrofit2.http.POST
 
 interface OnBoardingService {
-    @POST("/api/v1/onboardings")
+    @POST("/api/v2/onboardings")
     suspend fun postOnBoarding(
         @Body onBoardingRecommendRoutinesRequest: GetOnBoardingRecommendRoutinesRequest,
     ): BaseResponse<GetOnBoardingRecommendRoutinesResponse>
 
-    @POST("/api/v1/onboardings/routines")
+    @POST("/api/v2/onboardings/routines")
     suspend fun postOnBoardingRoutines(
         @Body registerOnBoardingRecommendRoutinesRequest: RegisterOnBoardingRecommendRoutinesRequest,
     ): BaseResponse<Unit>
+
+    @GET("/api/v2/onboardings")
+    suspend fun getOnBoarding(): BaseResponse<GetUserOnBoardingResponse>
 }
diff --git a/domain/src/main/java/com/threegap/bitnagil/domain/onboarding/repository/OnBoardingRepository.kt b/domain/src/main/java/com/threegap/bitnagil/domain/onboarding/repository/OnBoardingRepository.kt
@@ -12,4 +12,5 @@ interface OnBoardingRepository {
     suspend fun getRecommendOnBoardingRouteList(selectedItemIdsWithOnBoardingId: List<Pair<String, List<String>>>): Result<List<OnBoardingRecommendRoutine>>
     suspend fun registerRecommendRoutineList(selectedRecommendRoutineIds: List<String>): Result<Unit>
     suspend fun getOnBoardingRecommendRoutineEventFlow(): Flow<OnBoardingRecommendRoutineEvent>
+    suspend fun getUserOnBoarding(): Result<List<Pair<String, List<String>>>>
 }
diff --git a/domain/src/main/java/com/threegap/bitnagil/domain/onboarding/usecase/GetUserOnBoardingUseCase.kt b/domain/src/main/java/com/threegap/bitnagil/domain/onboarding/usecase/GetUserOnBoardingUseCase.kt
@@ -0,0 +1,12 @@
+package com.threegap.bitnagil.domain.onboarding.usecase
+
+import com.threegap.bitnagil.domain.onboarding.repository.OnBoardingRepository
+import javax.inject.Inject
+
+class GetUserOnBoardingUseCase @Inject constructor(
+    private val onBoardingRepository: OnBoardingRepository,
+) {
+    suspend operator fun invoke(): Result<List<Pair<String, List<String>>>> {
+        return onBoardingRepository.getUserOnBoarding()
+    }
+}
diff --git a/presentation/src/main/java/com/threegap/bitnagil/presentation/onboarding/OnBoardingScreen.kt b/presentation/src/main/java/com/threegap/bitnagil/presentation/onboarding/OnBoardingScreen.kt
@@ -13,6 +13,7 @@ import androidx.hilt.navigation.compose.hiltViewModel
 import com.threegap.bitnagil.designsystem.BitnagilTheme
 import com.threegap.bitnagil.designsystem.component.block.BitnagilProgressTopBar
 import com.threegap.bitnagil.presentation.common.flow.collectAsEffect
+import com.threegap.bitnagil.presentation.common.toast.GlobalBitnagilToast
 import com.threegap.bitnagil.presentation.onboarding.component.template.OnBoardingAbstractTemplate
 import com.threegap.bitnagil.presentation.onboarding.component.template.OnBoardingIntroTemplate
 import com.threegap.bitnagil.presentation.onboarding.component.template.OnBoardingSelectTemplate
@@ -38,12 +39,17 @@ fun OnBoardingScreenContainer(
             OnBoardingSideEffect.NavigateToHomeScreen -> {
                 navigateToHome()
             }
+
+            is OnBoardingSideEffect.ShowToast -> {
+                GlobalBitnagilToast.showWarning(sideEffect.message)
+            }
         }
     }
 
     OnBoardingScreen(
         state = state,
         onClickNext = onBoardingViewModel::selectNext,
+        onClickLoadOnBoarding = onBoardingViewModel::loadOnBoardingItems,
         onClickPreviousInSelectOnBoarding = onBoardingViewModel::selectPrevious,
         onClickItem = onBoardingViewModel::selectItem,
         onClickRoutine = onBoardingViewModel::selectRoutine,
@@ -58,6 +64,7 @@ fun OnBoardingScreenContainer(
 private fun OnBoardingScreen(
     state: OnBoardingState,
     onClickNext: () -> Unit,
+    onClickLoadOnBoarding: () -> Unit,
     onClickPreviousInSelectOnBoarding: () -> Unit,
     onClickItem: (String) -> Unit,
     onClickRoutine: (String) -> Unit,
@@ -84,7 +91,7 @@ private fun OnBoardingScreen(
                     OnBoardingPageInfo.Intro -> {
                         OnBoardingIntroTemplate(
                             userName = state.userName,
-                            onClickNextButton = onClickNext
+                            onClickNextButton = onClickLoadOnBoarding
                         )
                     }
                     is OnBoardingPageInfo.Abstract -> {
@@ -129,6 +136,18 @@ private fun OnBoardingScreen(
                             onClickItem = onClickItem,
                         )
                     }
+
+                    is OnBoardingPageInfo.ExistedOnBoardingAbstract -> {
+                        OnBoardingAbstractTemplate(
+                            modifier = Modifier.weight(1f),
+                            title = "이전에 설정한 목표예요!\n변경하시겠어요?",
+                            onBoardingAbstractTexts = currentOnBoardingPageInfo.abstractTexts,
+                            onDispose = cancelRecommendRoutines,
+                            onClickNextButton = onClickLoadOnBoarding,
+                            nextButtonEnable = true,
+                            userName = state.userName,
+                        )
+                    }
                 }
             }
             OnBoardingState.Loading -> {
@@ -155,6 +174,7 @@ fun OnBoardingScreenPreview() {
             userName = "안드로이드"
         ),
         onClickNext = {},
+        onClickLoadOnBoarding = {},
         onClickPreviousInSelectOnBoarding = {},
         onClickItem = {},
         onClickRoutine = {},
diff --git a/presentation/src/main/java/com/threegap/bitnagil/presentation/onboarding/OnBoardingViewModel.kt b/presentation/src/main/java/com/threegap/bitnagil/presentation/onboarding/OnBoardingViewModel.kt
@@ -5,6 +5,7 @@ import androidx.lifecycle.viewModelScope
 import com.threegap.bitnagil.domain.onboarding.usecase.GetOnBoardingAbstractUseCase
 import com.threegap.bitnagil.domain.onboarding.usecase.GetOnBoardingsUseCase
 import com.threegap.bitnagil.domain.onboarding.usecase.GetRecommendOnBoardingRoutinesUseCase
+import com.threegap.bitnagil.domain.onboarding.usecase.GetUserOnBoardingUseCase
 import com.threegap.bitnagil.domain.onboarding.usecase.RegisterRecommendOnBoardingRoutinesUseCase
 import com.threegap.bitnagil.domain.user.usecase.FetchUserProfileUseCase
 import com.threegap.bitnagil.presentation.common.mviviewmodel.MviViewModel
@@ -34,6 +35,7 @@ class OnBoardingViewModel @AssistedInject constructor(
     private val getOnBoardingAbstractUseCase: GetOnBoardingAbstractUseCase,
     private val registerRecommendOnBoardingRoutinesUseCase: RegisterRecommendOnBoardingRoutinesUseCase,
     private val fetchUserProfileUseCase: FetchUserProfileUseCase,
+    private val getUserOnBoardingUseCase: GetUserOnBoardingUseCase,
     @Assisted private val onBoardingArg: OnBoardingScreenArg,
 ) : MviViewModel<OnBoardingState, OnBoardingSideEffect, OnBoardingIntent>(
     initState = OnBoardingState.Loading,
@@ -45,31 +47,73 @@ class OnBoardingViewModel @AssistedInject constructor(
 
     // 내부에 전체 온보딩 항목 저장
     private val selectOnBoardingPageInfos = mutableListOf<OnBoardingPageInfo.SelectOnBoarding>()
+    private var existedOnBoardingAbstract: OnBoardingPageInfo.ExistedOnBoardingAbstract? = null
 
     private var loadRecommendRoutinesJob: Job? = null
 
     init {
-        loadOnBoardingItems()
+        loadInitData()
     }
 
-    private fun loadOnBoardingItems() {
+    private fun loadInitData() {
+        val onBoardingSetType = OnBoardingSetType.fromOnBoardingScreenArg(onBoardingArg)
+
+        when(onBoardingSetType) {
+            OnBoardingSetType.NEW -> {
+                loadIntro()
+            }
+            OnBoardingSetType.RESET -> {
+                loadUserOnBoarding()
+            }
+        }
+    }
+
+    private fun loadIntro() {
+        viewModelScope.launch {
+            val userName = fetchUserProfileUseCase().getOrNull()?.nickname ?: "-"
+
+            sendIntent(OnBoardingIntent.LoadIntroSuccess(userName = userName))
+        }
+    }
+
+    private fun loadUserOnBoarding() {
+        viewModelScope.launch {
+            val userName = fetchUserProfileUseCase().getOrNull()?.nickname ?: "-"
+            val userOnBoarding = getUserOnBoardingUseCase().fold(
+                onSuccess = { it },
+                onFailure = {
+                    sendIntent(OnBoardingIntent.LoadUserOnBoardingFailure(message = it.message ?: "에러가 발생했습니다. 잠시 후 시도해주세요."))
+                    return@launch
+                }
+            )
+
+            val onBoardingAbstract = getOnBoardingAbstractUseCase(selectedItemIdsWithOnBoardingId = userOnBoarding)
+
+            val abstractPagePrefixText = onBoardingAbstract.prefix
+            val abstractTexts = onBoardingAbstract.abstractTexts.map { onBoardingAbstractText ->
+                onBoardingAbstractText.textItems.map { onBoardingAbstractTextItem ->
+                    OnBoardingAbstractTextItem.fromOnBoardingAbstractTextItem(onBoardingAbstractTextItem)
+                }
+            }
+
+            sendIntent(OnBoardingIntent.LoadUserOnBoardingSuccess(
+                onBoardingAbstract = OnBoardingPageInfo.ExistedOnBoardingAbstract(
+                    prefix = abstractPagePrefixText,
+                    abstractTexts = abstractTexts,
+                ),
+                userName = userName,
+            ))
+        }
+    }
+
+    fun loadOnBoardingItems() {
         viewModelScope.launch {
             val onBoardings = getOnBoardingsUseCase()
             val onBoardingPages = onBoardings.map { onBoarding ->
                 OnBoardingPageInfo.SelectOnBoarding.fromOnBoarding(onBoarding = onBoarding)
             }
 
-            val userProfile = fetchUserProfileUseCase()
-            val userName = userProfile.fold(
-                onSuccess = {
-                    return@fold it.nickname
-                },
-                onFailure = {
-                    return@fold "-"
-                },
-            )
-
-            sendIntent(intent = OnBoardingIntent.LoadOnBoardingSuccess(onBoardingPageInfos = onBoardingPages, userName = userName))
+            sendIntent(intent = OnBoardingIntent.LoadOnBoardingSuccess(onBoardingPageInfos = onBoardingPages))
         }
     }
 
@@ -78,26 +122,45 @@ class OnBoardingViewModel @AssistedInject constructor(
         state: OnBoardingState,
     ): OnBoardingState? {
         when (intent) {
-            is OnBoardingIntent.LoadOnBoardingSuccess -> {
-                selectOnBoardingPageInfos.clear()
-                selectOnBoardingPageInfos.addAll(intent.onBoardingPageInfos)
+            is OnBoardingIntent.LoadUserOnBoardingSuccess -> {
+                existedOnBoardingAbstract = intent.onBoardingAbstract
 
-                val onBoardingSetType =  OnBoardingSetType.fromOnBoardingScreenArg(onBoardingArg)
-                val firstPage = when(onBoardingSetType) {
-                    OnBoardingSetType.NEW -> OnBoardingPageInfo.Intro
-                    OnBoardingSetType.RESET -> OnBoardingPageInfo.Intro
-                }
+                return OnBoardingState.Idle(
+                    nextButtonEnable = true,
+                    currentOnBoardingPageInfo = intent.onBoardingAbstract,
+                    totalStep = 1,
+                    currentStep = 0,
+                    onBoardingSetType = OnBoardingSetType.RESET,
+                    userName = intent.userName
+                )
+            }
 
+            is OnBoardingIntent.LoadIntroSuccess -> {
                 return OnBoardingState.Idle(
                     nextButtonEnable = true,
-                    currentOnBoardingPageInfo = firstPage,
-                    totalStep = selectOnBoardingPageInfos.size + 2,
+                    currentOnBoardingPageInfo = OnBoardingPageInfo.Intro,
+                    totalStep = 1,
                     currentStep = 0,
-                    onBoardingSetType = onBoardingSetType,
+                    onBoardingSetType = OnBoardingSetType.NEW,
                     userName = intent.userName
                 )
             }
 
+            is OnBoardingIntent.LoadOnBoardingSuccess -> {
+                val currentState = state
+                if (currentState !is OnBoardingState.Idle) return null
+
+                selectOnBoardingPageInfos.clear()
+                selectOnBoardingPageInfos.addAll(intent.onBoardingPageInfos)
+
+                return currentState.copy(
+                    nextButtonEnable = false,
+                    currentOnBoardingPageInfo = intent.onBoardingPageInfos.first(),
+                    totalStep = selectOnBoardingPageInfos.size + 2,
+                    currentStep = 1,
+                )
+            }
+
             is OnBoardingIntent.SelectItem -> {
                 val currentState = state
                 if (currentState !is OnBoardingState.Idle) return null
@@ -204,6 +267,12 @@ class OnBoardingViewModel @AssistedInject constructor(
                     currentStep = currentState.currentStep + 1,
                 )
             }
+
+            is OnBoardingIntent.LoadUserOnBoardingFailure -> {
+                sendSideEffect(sideEffect = OnBoardingSideEffect.MoveToPreviousScreen)
+                sendSideEffect(sideEffect = OnBoardingSideEffect.ShowToast(message = intent.message))
+                return null
+            }
         }
     }
 
diff --git a/presentation/src/main/java/com/threegap/bitnagil/presentation/onboarding/model/OnBoardingPageInfo.kt b/presentation/src/main/java/com/threegap/bitnagil/presentation/onboarding/model/OnBoardingPageInfo.kt
@@ -10,6 +10,12 @@ sealed class OnBoardingPageInfo : Parcelable {
     @Parcelize
     data object Intro : OnBoardingPageInfo()
 
+    @Parcelize
+    data class ExistedOnBoardingAbstract(
+        val prefix: String,
+        @Stable val abstractTexts: List<List<OnBoardingAbstractTextItem>>,
+    ): OnBoardingPageInfo()
+
     @Parcelize
     data class SelectOnBoarding(
         val id: String,
diff --git a/presentation/src/main/java/com/threegap/bitnagil/presentation/onboarding/model/mvi/OnBoardingIntent.kt b/presentation/src/main/java/com/threegap/bitnagil/presentation/onboarding/model/mvi/OnBoardingIntent.kt
diff --git a/presentation/src/main/java/com/threegap/bitnagil/presentation/onboarding/model/mvi/OnBoardingSideEffect.kt b/presentation/src/main/java/com/threegap/bitnagil/presentation/onboarding/model/mvi/OnBoardingSideEffect.kt

Original file line number	Diff line number	Diff line change
`@@ -12,4 +12,5 @@ interface OnBoardingRepository {`
`12`	`12`	`suspend fun getRecommendOnBoardingRouteList(selectedItemIdsWithOnBoardingId: List<Pair<String, List<String>>>): Result<List<OnBoardingRecommendRoutine>>`
`13`	`13`	`suspend fun registerRecommendRoutineList(selectedRecommendRoutineIds: List<String>): Result<Unit>`
`14`	`14`	`suspend fun getOnBoardingRecommendRoutineEventFlow(): Flow<OnBoardingRecommendRoutineEvent>`
	`15`	`+ suspend fun getUserOnBoarding(): Result<List<Pair<String, List<String>>>>`
`15`	`16`	`}`