[Feat/#248] 프로필 리팩토링 완료, 이슈 일부 수정

core/data/src/main/kotlin/com/acon/core/data/di/DataStreamModule.kt

@@ -0,0 +1,27 @@
+package com.acon.core.data.di
+
+import com.acon.core.data.stream.DataStream
+import com.acon.core.data.stream.DataStreamImpl
+import dagger.Binds
+import dagger.Module
+import dagger.hilt.InstallIn
+import dagger.hilt.components.SingletonComponent
+import javax.inject.Qualifier
+import javax.inject.Singleton
+
+@Module
+@InstallIn(SingletonComponent::class)
+abstract class DataStreamModule {
+
+    @Singleton
+    @Binds
+    @VerifiedArea
+    abstract fun bindsVerifiedAreaDataStream(
+        impl: DataStreamImpl
+    ) : DataStream
+
+}
+
+@Qualifier
+@Retention(AnnotationRetention.BINARY)
+annotation class VerifiedArea

core/data/src/main/kotlin/com/acon/core/data/repository/OnboardingRepositoryImpl.kt

@@ -5,15 +5,18 @@ import com.acon.acon.core.model.type.FoodType
 import com.acon.acon.domain.error.onboarding.PostTastePreferenceResultError
 import com.acon.acon.domain.error.onboarding.VerifyAreaError
 import com.acon.acon.domain.repository.OnboardingRepository
+import com.acon.core.data.stream.DataStream
 import com.acon.core.data.datasource.local.OnboardingLocalDataSource
 import com.acon.core.data.datasource.remote.OnboardingRemoteDataSource
+import com.acon.core.data.di.VerifiedArea
 import com.acon.core.data.dto.request.TastePreferenceRequest
 import com.acon.core.data.error.runCatchingWith
 import javax.inject.Inject
 
 class OnboardingRepositoryImpl @Inject constructor(
     private val onboardingRemoteDataSource: OnboardingRemoteDataSource,
     private val onboardingLocalDataSource: OnboardingLocalDataSource,
+    @VerifiedArea private val areaDataStream: DataStream
 ) : OnboardingRepository {
 
     override suspend fun submitTastePreferenceResult(
@@ -35,6 +38,7 @@ class OnboardingRepositoryImpl @Inject constructor(
             longitude = longitude
         )
         onboardingLocalDataSource.updateHasVerifiedArea(true)
+        areaDataStream.notifyDataChanged()
     }
 
     override suspend fun updateHasTastePreference(hasPreference: Boolean): Result<Unit> {

core/data/src/main/kotlin/com/acon/core/data/repository/ProfileRepositoryImpl.kt

@@ -8,14 +8,14 @@ import com.acon.acon.core.model.model.profile.ProfileImageStatus
 import com.acon.acon.core.model.model.profile.SavedSpot
 import com.acon.acon.core.model.type.ImageType
 import com.acon.acon.domain.error.area.DeleteVerifiedAreaError
-import com.acon.acon.domain.error.area.ReplaceVerifiedArea
 import com.acon.acon.domain.error.profile.UpdateProfileError
 import com.acon.acon.domain.error.profile.ValidateNicknameError
 import com.acon.acon.domain.repository.ProfileRepository
-import com.acon.core.data.api.remote.noauth.FileUploadApi
+import com.acon.core.data.stream.DataStream
 import com.acon.core.data.datasource.local.ProfileLocalDataSource
 import com.acon.core.data.datasource.remote.AconAppRemoteDataSource
 import com.acon.core.data.datasource.remote.ProfileRemoteDataSource
+import com.acon.core.data.di.VerifiedArea
 import com.acon.core.data.dto.request.GetPresignedUrlRequest
 import com.acon.core.data.dto.request.profile.toUpdateProfileRequest
 import com.acon.core.data.error.runCatchingWith
@@ -32,6 +32,7 @@ class ProfileRepositoryImpl @Inject constructor(
     private val profileRemoteDataSource: ProfileRemoteDataSource,
     private val profileLocalDataSource: ProfileLocalDataSource,
     private val aconAppRemoteDataSource: AconAppRemoteDataSource,
+    @VerifiedArea private val areaDataStream: DataStream,
     @ApplicationContext private val context: Context
 ) : ProfileRepository {
 
@@ -122,17 +123,19 @@ class ProfileRepositoryImpl @Inject constructor(
         }
     }
 
-    override suspend fun getVerifiedAreas(): Result<List<Area>> {
-        // TODO - 인증 지역 조회 API Error 처리 안됨
-        return runCatchingWith() {
-            profileRemoteDataSource.getVerifiedAreas().verifiedAreaList
-                .map { it.toVerifiedArea() }
+    override fun getVerifiedAreas(): Flow<Result<List<Area>>> {
+        return areaDataStream.subscribe {
+            emit(runCatchingWith() {
+                profileRemoteDataSource.getVerifiedAreas().verifiedAreaList
+                    .map { it.toVerifiedArea() }
+            })
         }
     }
 
     override suspend fun deleteVerifiedArea(verifiedAreaId: Long): Result<Unit> {
         return runCatchingWith(DeleteVerifiedAreaError()) {
             profileRemoteDataSource.deleteVerifiedArea(verifiedAreaId)
+            areaDataStream.notifyDataChanged()
         }
     }
-}
+}

core/data/src/test/java/com/acon/core/data/repository/ProfileRepositoryTest.kt

@@ -16,6 +16,7 @@ import com.acon.core.data.datasource.remote.AconAppRemoteDataSource
 import com.acon.core.data.datasource.remote.ProfileRemoteDataSource
 import com.acon.core.data.dto.response.profile.ProfileResponse
 import com.acon.core.data.dto.response.profile.SavedSpotResponse
+import com.acon.core.data.stream.DataStream
 import io.mockk.coEvery
 import io.mockk.coVerify
 import io.mockk.impl.annotations.MockK
@@ -48,6 +49,9 @@ class ProfileRepositoryTest {
     @MockK
     private lateinit var aconAppRemoteDataSource: AconAppRemoteDataSource
 
+    @MockK
+    private lateinit var dataStream: DataStream
+
     private lateinit var profileRepository: ProfileRepository
 
     private val sampleNewProfile get() = Profile(
@@ -59,7 +63,7 @@ class ProfileRepositoryTest {
     @BeforeEach
     fun setUp() {
         profileRepository = ProfileRepositoryImpl(
-            profileRemoteDataSource, profileLocalDataSource, aconAppRemoteDataSource,
+            profileRemoteDataSource, profileLocalDataSource, aconAppRemoteDataSource, dataStream,
             mockk(relaxed = true)
         )
     }

domain/src/main/java/com/acon/acon/domain/repository/ProfileRepository.kt

@@ -11,6 +11,6 @@ interface ProfileRepository {
     suspend fun updateProfile(newProfile: Profile) : Result<Unit>
     suspend fun validateNickname(nickname: String) : Result<Unit>
     suspend fun getSavedSpots() : Flow<Result<List<SavedSpot>>>
-    suspend fun getVerifiedAreas(): Result<List<Area>>
+    fun getVerifiedAreas(): Flow<Result<List<Area>>>
     suspend fun deleteVerifiedArea(verifiedAreaId: Long): Result<Unit>
 }

feature/settings/src/main/java/com/acon/acon/feature/verification/screen/UserVerifiedAreasViewModel.kt

@@ -4,6 +4,7 @@ import com.acon.acon.core.ui.base.BaseContainerHost
 import com.acon.acon.domain.error.area.DeleteVerifiedAreaError
 import com.acon.acon.domain.repository.ProfileRepository
 import dagger.hilt.android.lifecycle.HiltViewModel
+import kotlinx.coroutines.Job
 import org.orbitmvi.orbit.Container
 import org.orbitmvi.orbit.annotation.OrbitExperimental
 import org.orbitmvi.orbit.viewmodel.container
@@ -16,26 +17,31 @@ class UserVerifiedAreasViewModel @Inject constructor(
     private val profileRepository: ProfileRepository
 ) : BaseContainerHost<UserVerifiedAreasUiState, UserVerifiedAreasSideEffect>() {
 
+    private var loadVerifiedAreasJob: Job? = null
+
     override val container: Container<UserVerifiedAreasUiState, UserVerifiedAreasSideEffect> =
         container(UserVerifiedAreasUiState.Loading) {
-            fetchVerifiedAreaList()
+            loadVerifiedAreasJob = loadVerifiedAreas()
         }
 
-    private fun fetchVerifiedAreaList() = intent {
-        profileRepository.getVerifiedAreas()
-            .onSuccess {
+    private fun loadVerifiedAreas() = intent {
+        profileRepository.getVerifiedAreas().collect { result ->
+            result.onSuccess { areas ->
                 reduce {
-                    UserVerifiedAreasUiState.Success(verificationAreaList = it)
+                    UserVerifiedAreasUiState.Success(verificationAreaList = areas)
+                }
+            }.onFailure {
+                reduce {
+                    UserVerifiedAreasUiState.LoadFailed
                 }
             }
-            .onFailure {
-                UserVerifiedAreasUiState.LoadFailed
-            }
+        }
     }
 
     fun retry() = intent {
         reduce { UserVerifiedAreasUiState.Loading }
-        fetchVerifiedAreaList()
+        loadVerifiedAreasJob?.cancel()
+        loadVerifiedAreas()
     }
 
     private fun showAreaDeleteFailDialog() = intent {
@@ -72,9 +78,6 @@ class UserVerifiedAreasViewModel @Inject constructor(
 
     fun deleteVerifiedArea(verifiedAreaId: Long) = intent {
         profileRepository.deleteVerifiedArea(verifiedAreaId)
-            .onSuccess {
-                fetchVerifiedAreaList()
-            }
             .onFailure { error ->
                 when (error) {
                     is DeleteVerifiedAreaError.InvalidVerifiedArea -> {

feature/spot/src/main/java/com/acon/acon/feature/spot/screen/spotdetail/composable/SpotDetailViewModel.kt

@@ -7,6 +7,7 @@ import androidx.navigation.toRoute
 import com.acon.acon.core.analytics.amplitude.AconAmplitude
 import com.acon.acon.core.analytics.constants.EventNames
 import com.acon.acon.core.analytics.constants.PropertyKeys
+import com.acon.acon.core.model.type.SignInStatus
 import com.acon.acon.core.navigation.route.SpotRoute
 import com.acon.acon.core.navigation.type.spotNavigationParameterNavType
 import com.acon.acon.core.ui.base.BaseContainerHost
@@ -15,6 +16,7 @@ import com.acon.acon.domain.repository.SpotRepository
 import dagger.hilt.android.lifecycle.HiltViewModel
 import kotlinx.coroutines.async
 import kotlinx.coroutines.delay
+import kotlinx.coroutines.flow.firstOrNull
 import org.orbitmvi.orbit.annotation.OrbitExperimental
 import org.orbitmvi.orbit.viewmodel.container
 import javax.annotation.concurrent.Immutable
@@ -45,7 +47,7 @@ class SpotDetailViewModel @Inject constructor(
         container<SpotDetailUiState, SpotDetailSideEffect>(SpotDetailUiState.Loading) {
             signInStatus.collect {
                 when (it) {
-                    com.acon.acon.core.model.type.SignInStatus.GUEST -> {
+                    SignInStatus.GUEST -> {
                         if (spotNavData.isFromDeepLink == true) {
                             fetchedSpotDetail()
                         } else {
@@ -82,8 +84,8 @@ class SpotDetailViewModel @Inject constructor(
 
         // GUEST 인 경우 빈 리스트
         val verifiedAreaListDeferred = viewModelScope.async {
-            if (signInStatus.value != com.acon.acon.core.model.type.SignInStatus.GUEST) {
-                profileRepository.getVerifiedAreas()
+            if (signInStatus.value != SignInStatus.GUEST) {
+                profileRepository.getVerifiedAreas().firstOrNull()
             } else {
                 Result.success(emptyList())
             }
@@ -94,7 +96,7 @@ class SpotDetailViewModel @Inject constructor(
 
         reduce {
             val isAreaVerified = verifiedAreaListResult
-                .getOrNull()
+                ?.getOrNull()
                 .orEmpty()
                 .isNotEmpty()