Merge pull request #30 from YAPP-Github/BOOK-92-feature/#28

feat: 유저 프로필 조회 API 연동

Author: easyhooon

build-logic/src/main/kotlin/AndroidFeatureConventionPlugin.kt

@@ -24,6 +24,8 @@ internal class AndroidFeatureConventionPlugin : Plugin<Project> {
                 implementation(project(path = ":core:model"))
                 implementation(project(path = ":core:ui"))
 
+                implementation(libs.compose.effects)
+
                 implementation(libs.bundles.circuit)
 
                 api(libs.circuit.codegen.annotation)

core/data/api/src/main/kotlin/com/ninecraft/booket/core/data/api/repository/UserRepository.kt

@@ -0,0 +1,7 @@
+package com.ninecraft.booket.core.data.api.repository
+
+import com.ninecraft.booket.core.model.UserProfileModel
+
+interface UserRepository {
+    suspend fun getUserProfile(): Result<UserProfileModel>
+}

core/data/impl/src/main/kotlin/com/ninecraft/booket/core/data/impl/di/RepositoryModule.kt

@@ -1,7 +1,9 @@
 package com.ninecraft.booket.core.data.impl.di
 
 import com.ninecraft.booket.core.data.api.repository.AuthRepository
+import com.ninecraft.booket.core.data.api.repository.UserRepository
 import com.ninecraft.booket.core.data.impl.repository.DefaultAuthRepository
+import com.ninecraft.booket.core.data.impl.repository.DefaultUserRepository
 import dagger.Binds
 import dagger.Module
 import dagger.hilt.InstallIn
@@ -15,4 +17,8 @@ internal abstract class RepositoryModule {
     @Binds
     @Singleton
     abstract fun bindAuthRepository(defaultAuthRepository: DefaultAuthRepository): AuthRepository
+
+    @Binds
+    @Singleton
+    abstract fun bindUserRepository(defaultUserRepository: DefaultUserRepository): UserRepository
 }

core/data/impl/src/main/kotlin/com/ninecraft/booket/core/data/impl/mapper/ResponseToModel.kt

@@ -1,11 +1,22 @@
 package com.ninecraft.booket.core.data.impl.mapper
 
 import com.ninecraft.booket.core.model.LoginModel
+import com.ninecraft.booket.core.model.UserProfileModel
 import com.ninecraft.booket.core.network.response.LoginResponse
+import com.ninecraft.booket.core.network.response.UserProfileResponse
 
 internal fun LoginResponse.toModel(): LoginModel {
     return LoginModel(
         accessToken = accessToken,
         refreshToken = refreshToken,
     )
 }
+
+internal fun UserProfileResponse.toModel(): UserProfileModel {
+    return UserProfileModel(
+        id = id,
+        email = email,
+        nickname = nickname,
+        provider = provider,
+    )
+}

core/data/impl/src/main/kotlin/com/ninecraft/booket/core/data/impl/repository/DefaultUserRepository.kt

@@ -0,0 +1,15 @@
+package com.ninecraft.booket.core.data.impl.repository
+
+import com.ninecraft.booket.core.common.utils.runSuspendCatching
+import com.ninecraft.booket.core.data.api.repository.UserRepository
+import com.ninecraft.booket.core.data.impl.mapper.toModel
+import com.ninecraft.booket.core.network.service.AuthService
+import javax.inject.Inject
+
+internal class DefaultUserRepository @Inject constructor(
+    private val authService: AuthService,
+) : UserRepository {
+    override suspend fun getUserProfile() = runSuspendCatching {
+        authService.getUserProfile().toModel()
+    }
+}

core/model/src/main/kotlin/com/ninecraft/booket/core/model/UserProfileModel.kt

@@ -0,0 +1,8 @@
+package com.ninecraft.booket.core.model
+
+data class UserProfileModel(
+    val id: String,
+    val email: String,
+    val nickname: String,
+    val provider: String,
+)

core/network/src/main/kotlin/com/ninecraft/booket/core/network/response/UserProfileResponse.kt

@@ -0,0 +1,16 @@
+package com.ninecraft.booket.core.network.response
+
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
+
+@Serializable
+data class UserProfileResponse(
+    @SerialName("id")
+    val id: String,
+    @SerialName("email")
+    val email: String,
+    @SerialName("nickname")
+    val nickname: String,
+    @SerialName("provider")
+    val provider: String,
+)

core/network/src/main/kotlin/com/ninecraft/booket/core/network/service/AuthService.kt

@@ -1,8 +1,13 @@
 package com.ninecraft.booket.core.network.service
 
+import com.ninecraft.booket.core.network.response.UserProfileResponse
+import retrofit2.http.GET
 import retrofit2.http.POST
 
 interface AuthService {
     @POST("api/v1/auth/signout")
     suspend fun logout()
+
+    @GET("api/v1/auth/me")
+    suspend fun getUserProfile(): UserProfileResponse
 }

feature/library/src/main/kotlin/com/ninecraft/booket/feature/library/LibraryPresenter.kt

@@ -7,8 +7,10 @@ import androidx.compose.runtime.rememberCoroutineScope
 import androidx.compose.runtime.setValue
 import com.ninecraft.booket.core.common.utils.handleException
 import com.ninecraft.booket.core.data.api.repository.AuthRepository
+import com.ninecraft.booket.core.data.api.repository.UserRepository
 import com.ninecraft.booket.feature.login.LoginScreen
 import com.orhanobut.logger.Logger
+import com.skydoves.compose.effects.RememberedEffect
 import com.slack.circuit.codegen.annotations.CircuitInject
 import com.slack.circuit.retained.rememberRetained
 import com.slack.circuit.runtime.Navigator
@@ -21,14 +23,51 @@ import kotlinx.coroutines.launch
 
 class LibraryPresenter @AssistedInject constructor(
     @Assisted private val navigator: Navigator,
-    private val repository: AuthRepository,
+    private val authRepository: AuthRepository,
+    private val userRepository: UserRepository,
 ) : Presenter<LibraryScreen.State> {
 
     @Composable
     override fun present(): LibraryScreen.State {
         val scope = rememberCoroutineScope()
         var isLoading by rememberRetained { mutableStateOf(false) }
         var sideEffect by rememberRetained { mutableStateOf<LibraryScreen.SideEffect?>(null) }
+        var nickname by rememberRetained { mutableStateOf("") }
+        var email by rememberRetained { mutableStateOf("") }
+
+        fun getUserProfile() {
+            scope.launch {
+                try {
+                    isLoading = true
+                    userRepository.getUserProfile()
+                        .onSuccess { user ->
+                            nickname = user.nickname
+                            email = user.email
+                        }
+                        .onFailure { exception ->
+                            val handleErrorMessage = { message: String ->
+                                Logger.e(message)
+                                sideEffect = LibraryScreen.SideEffect.ShowToast(message)
+                            }
+
+                            handleException(
+                                exception = exception,
+                                onServerError = handleErrorMessage,
+                                onNetworkError = handleErrorMessage,
+                                onLoginRequired = {
+                                    navigator.resetRoot(LoginScreen)
+                                },
+                            )
+                        }
+                } finally {
+                    isLoading = false
+                }
+            }
+        }
+
+        RememberedEffect(Unit) {
+            getUserProfile()
+        }
 
         fun handleEvent(event: LibraryScreen.Event) {
             when (event) {
@@ -40,9 +79,9 @@ class LibraryPresenter @AssistedInject constructor(
                     scope.launch {
                         try {
                             isLoading = true
-                            repository.logout()
+                            authRepository.logout()
                                 .onSuccess {
-                                    repository.clearTokens()
+                                    authRepository.clearTokens()
                                     navigator.resetRoot(LoginScreen)
                                 }
                                 .onFailure { exception ->
@@ -70,6 +109,8 @@ class LibraryPresenter @AssistedInject constructor(
 
         return LibraryScreen.State(
             isLoading = isLoading,
+            nickname = nickname,
+            email = email,
             sideEffect = sideEffect,
             eventSink = ::handleEvent,
         )

feature/library/src/main/kotlin/com/ninecraft/booket/feature/library/LibraryScreen.kt

@@ -3,6 +3,7 @@ package com.ninecraft.booket.feature.library
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.Spacer
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.height
@@ -31,6 +32,8 @@ import kotlinx.parcelize.Parcelize
 data object LibraryScreen : Screen {
     data class State(
         val isLoading: Boolean = false,
+        val nickname: String = "",
+        val email: String = "",
         val sideEffect: SideEffect? = null,
         val eventSink: (Event) -> Unit,
     ) : CircuitUiState
@@ -51,6 +54,11 @@ internal fun Library(
     state: LibraryScreen.State,
     modifier: Modifier = Modifier,
 ) {
+    HandleLibrarySideEffects(
+        state = state,
+        eventSink = state.eventSink,
+    )
+
     Column(
         modifier = modifier.fillMaxSize(),
         horizontalAlignment = Alignment.CenterHorizontally,
@@ -68,21 +76,23 @@ internal fun LibraryContent(
     state: LibraryScreen.State,
     modifier: Modifier = Modifier,
 ) {
-    HandleLibrarySideEffects(
-        state = state,
-        eventSink = state.eventSink,
-    )
-
     Column(
         modifier = modifier.fillMaxSize(),
         horizontalAlignment = Alignment.CenterHorizontally,
         verticalArrangement = Arrangement.Center,
     ) {
         Box(modifier = modifier.fillMaxSize()) {
-            Text(
-                text = "내 서재",
-                modifier = Modifier.align(Alignment.Center),
-            )
+            Column(
+                modifier = Modifier.fillMaxSize(),
+                horizontalAlignment = Alignment.CenterHorizontally,
+                verticalArrangement = Arrangement.Center,
+            ) {
+                Text(text = "내 서재")
+                Spacer(modifier = Modifier.height(16.dp))
+                Text(text = state.nickname)
+                Spacer(modifier = Modifier.height(16.dp))
+                Text(text = state.email)
+            }
             BooketButton(
                 onClick = {
                     state.eventSink(LibraryScreen.Event.OnLogoutButtonClick)
@@ -118,6 +128,8 @@ private fun LibraryPreview() {
     BooketTheme {
         Library(
             state = LibraryScreen.State(
+                nickname = "홍길동",
+                email = "[email protected]",
                 eventSink = {},
             ),
         )