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

app/src/main/java/com/acon/acon/navigation/nested/AreaVerificationNavigation.kt

@@ -34,6 +34,8 @@ fun NavGraphBuilder.areaVerificationNavigation(
                 },
                 skippable = LocalNavController.current.hasPreviousBackStackEntry().not(),
                 onNavigateToChooseDislikes = { navController.navigateAndClear(OnboardingRoute.ChooseDislikes) },
+                onNavigateToIntroduce = { navController.navigateAndClear(OnboardingRoute.Introduce) },
+                onNavigateToSpotList = { navController.navigateAndClear(SpotRoute.SpotList) }
             )
         }
 

app/src/main/java/com/acon/acon/navigation/nested/ProfileNavigation.kt

@@ -2,7 +2,6 @@ package com.acon.acon.navigation.nested
 
 import androidx.compose.animation.EnterTransition
 import androidx.compose.animation.ExitTransition
-import androidx.compose.foundation.background
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.statusBarsPadding
 import androidx.compose.foundation.layout.systemBarsPadding
@@ -12,13 +11,12 @@ import androidx.navigation.NavHostController
 import androidx.navigation.compose.composable
 import androidx.navigation.compose.navigation
 import com.acon.acon.core.designsystem.effect.screenDefault
-import com.acon.acon.core.designsystem.theme.AconTheme
 import com.acon.acon.core.model.model.spot.SpotNavigationParameter
 import com.acon.acon.core.navigation.route.ProfileRoute
 import com.acon.acon.core.navigation.route.SettingsRoute
 import com.acon.acon.core.navigation.route.SpotRoute
 import com.acon.acon.core.navigation.route.UploadRoute
-import com.acon.acon.feature.profile.composable.screen.bookmark.composable.BookmarkScreenContainer
+import com.acon.feature.profile.savedspot.composable.BookmarkScreenContainer
 import com.acon.feature.profile.info.composable.ProfileInfoScreenContainer
 import com.acon.feature.profile.update.composable.ProfileUpdateScreenContainer
 

app/src/main/java/com/acon/acon/navigation/nested/SettingsNavigation.kt

@@ -14,6 +14,7 @@ import com.acon.acon.core.navigation.route.OnboardingRoute
 import com.acon.acon.core.navigation.route.ProfileRoute
 import com.acon.acon.core.navigation.route.SettingsRoute
 import com.acon.acon.core.navigation.route.SignInRoute
+import com.acon.acon.core.navigation.utils.navigateAndClear
 import com.acon.acon.feature.settings.screen.composable.SettingsScreenContainer
 import com.acon.acon.feature.verification.screen.composable.UserVerifiedAreasScreenContainer
 import com.acon.acon.feature.withdraw.screen.composable.DeleteAccountScreenContainer
@@ -44,11 +45,7 @@ internal fun NavGraphBuilder.settingsNavigation(
                     navController.navigate(SettingsRoute.UserVerifiedAreas)
                 },
                 onNavigateToSignInScreen = {
-                    navController.navigate(SignInRoute.SignIn) {
-                        popUpTo(SettingsRoute.Graph) {
-                            inclusive = true
-                        }
-                    }
+                    navController.navigateAndClear(SignInRoute.SignIn)
                 },
                 onNavigateToDeleteAccountScreen = {
                     navController.navigate(SettingsRoute.DeleteAccount)

core/data/src/main/kotlin/com/acon/core/data/api/remote/ProfileApi.kt

@@ -1,12 +1,16 @@
 package com.acon.core.data.api.remote
 
+import com.acon.core.data.dto.request.ReplaceVerifiedAreaRequest
 import com.acon.core.data.dto.request.profile.UpdateProfileRequest
+import com.acon.core.data.dto.response.area.VerifiedAreaListResponse
 import com.acon.core.data.dto.response.profile.ProfileResponse
-import com.acon.core.data.dto.response.profile.SavedSpotResponse
 import com.acon.core.data.dto.response.profile.SavedSpotsResponse
 import retrofit2.http.Body
+import retrofit2.http.DELETE
 import retrofit2.http.GET
 import retrofit2.http.PATCH
+import retrofit2.http.POST
+import retrofit2.http.Path
 import retrofit2.http.Query
 
 interface ProfileApi {
@@ -22,4 +26,17 @@ interface ProfileApi {
 
     @GET("/api/v1/saved-spots")
     suspend fun getSavedSpots() : SavedSpotsResponse
+
+    @GET("/api/v1/verified-areas")
+    suspend fun getVerifiedAreas() : VerifiedAreaListResponse
+
+    @POST("/api/v1/verified-areas/replacement")
+    suspend fun replaceVerifiedArea(
+        @Body request: ReplaceVerifiedAreaRequest
+    )
+
+    @DELETE("/api/v1/verified-areas/{verifiedAreaId}")
+    suspend fun deleteVerifiedArea(
+        @Path("verifiedAreaId") verifiedAreaId: Long
+    )
 }

core/data/src/main/kotlin/com/acon/core/data/api/remote/auth/SpotAuthApi.kt

@@ -4,7 +4,6 @@ import com.acon.core.data.dto.request.AddBookmarkRequest
 import com.acon.core.data.dto.request.SpotListRequest
 import com.acon.core.data.dto.response.SpotDetailResponse
 import com.acon.core.data.dto.response.SpotListResponse
-import com.acon.core.data.dto.response.profile.SavedSpotsResponseLegacy
 import retrofit2.http.Body
 import retrofit2.http.DELETE
 import retrofit2.http.GET
@@ -19,9 +18,6 @@ interface SpotAuthApi {
         @Body request: SpotListRequest
     ): SpotListResponse
 
-    @GET("/api/v1/saved-spots")
-    suspend fun fetchSavedSpotList(): SavedSpotsResponseLegacy
-
     @POST("/api/v1/saved-spots")
     suspend fun addBookmark(
         @Body addBookmarkRequest: AddBookmarkRequest

core/data/src/main/kotlin/com/acon/core/data/datasource/remote/ProfileRemoteDataSource.kt

@@ -1,7 +1,9 @@
 package com.acon.core.data.datasource.remote
 
 import com.acon.core.data.api.remote.ProfileApi
+import com.acon.core.data.dto.request.ReplaceVerifiedAreaRequest
 import com.acon.core.data.dto.request.profile.UpdateProfileRequest
+import com.acon.core.data.dto.response.area.VerifiedAreaListResponse
 import com.acon.core.data.dto.response.profile.ProfileResponse
 import com.acon.core.data.dto.response.profile.SavedSpotResponse
 import javax.inject.Inject
@@ -12,6 +14,8 @@ interface ProfileRemoteDataSource {
     suspend fun updateProfile(updateProfileRequest: UpdateProfileRequest)
     suspend fun validateNickname(nickname: String)
     suspend fun getSavedSpots() : List<SavedSpotResponse>
+    suspend fun getVerifiedAreas(): VerifiedAreaListResponse
+    suspend fun deleteVerifiedArea(verifiedAreaId: Long)
 }
 
 class ProfileRemoteDataSourceImpl @Inject constructor(
@@ -33,4 +37,12 @@ class ProfileRemoteDataSourceImpl @Inject constructor(
     override suspend fun getSavedSpots(): List<SavedSpotResponse> {
         return profileApi.getSavedSpots().savedSpotList
     }
+
+    override suspend fun getVerifiedAreas(): VerifiedAreaListResponse {
+        return profileApi.getVerifiedAreas()
+    }
+
+    override suspend fun deleteVerifiedArea(verifiedAreaId: Long) {
+        return profileApi.deleteVerifiedArea(verifiedAreaId)
+    }
 }

core/data/src/main/kotlin/com/acon/core/data/datasource/remote/SpotRemoteDataSource.kt

@@ -9,7 +9,6 @@ import com.acon.core.data.dto.request.SpotListRequest
 import com.acon.core.data.dto.response.MenuBoardListResponse
 import com.acon.core.data.dto.response.SpotDetailResponse
 import com.acon.core.data.dto.response.SpotListResponse
-import com.acon.core.data.dto.response.profile.SavedSpotsResponseLegacy
 import javax.inject.Inject
 
 class SpotRemoteDataSource @Inject constructor(
@@ -39,10 +38,6 @@ class SpotRemoteDataSource @Inject constructor(
         return spotAuthApi.fetchSpotDetailFromUser(spotId)
     }
 
-    suspend fun fetchSavedSpotList(): SavedSpotsResponseLegacy {
-        return spotAuthApi.fetchSavedSpotList()
-    }
-
     suspend fun addBookmark(request: AddBookmarkRequest) {
         return spotAuthApi.addBookmark(request)
     }

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

@@ -9,7 +9,6 @@ import com.acon.core.data.api.remote.MapApi
 import com.acon.core.data.api.remote.MapSearchApi
 import com.acon.core.data.api.remote.ProfileApi
 import com.acon.core.data.api.remote.auth.OnboardingAuthApi
-import com.acon.core.data.api.remote.auth.ProfileAuthApiLegacy
 import com.acon.core.data.api.remote.auth.SpotAuthApi
 import com.acon.core.data.api.remote.noauth.SpotNoAuthApi
 import com.acon.core.data.api.remote.auth.UploadAuthApi
@@ -75,14 +74,6 @@ internal object ApiModule {
         return retrofit.create(UploadAuthApi::class.java)
     }
 
-    @Singleton
-    @Provides
-    fun providesProfileApiLegacy(
-        @Auth retrofit: Retrofit
-    ): ProfileAuthApiLegacy {
-        return retrofit.create(ProfileAuthApiLegacy::class.java)
-    }
-
     @Singleton
     @Provides
     fun providesProfileApi(

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