FEAT: 유저 이름 가져오도록 구현

Author: eshc123

core/data/src/main/java/com/plottwist/core/data/mapper/Member.kt

@@ -0,0 +1,12 @@
+package com.plottwist.core.data.mapper
+
+import com.plottwist.core.domain.model.MemberInfo
+import com.plottwist.core.network.model.onboarding.MemberInfoData
+
+fun MemberInfoData.toDomainModel() : MemberInfo {
+    return MemberInfo(
+        memberId = this.memberId,
+        email = this.email,
+        name = this.name
+    )
+}

core/data/src/main/java/com/plottwist/core/data/onboarding/OnboardingRepositoryImpl.kt

@@ -1,5 +1,7 @@
 package com.plottwist.core.data.onboarding
 
+import com.plottwist.core.data.mapper.toDomainModel
+import com.plottwist.core.domain.model.MemberInfo
 import com.plottwist.core.domain.onboarding.OnboardingRepository
 import com.plottwist.core.network.model.onboarding.UpdateOnboardingInfoRequest
 import com.plottwist.core.network.service.OnboardingService
@@ -27,4 +29,18 @@ class OnboardingRepositoryImpl @Inject constructor(
             return Result.failure(Exception(e))
         }
     }
+
+    override suspend fun getMemberInfo(): Result<MemberInfo> {
+        try {
+            val result = onboardingService.getMemberInfo()
+
+            if (result.success) {
+                return Result.success(result.data.toDomainModel())
+            }
+
+            return Result.failure(Exception("Fail to get member info"))
+        } catch (e:Exception) {
+            return Result.failure(Exception(e))
+        }
+    }
 }

core/domain/src/main/java/com/plottwist/core/domain/model/MemberInfo.kt

@@ -0,0 +1,7 @@
+package com.plottwist.core.domain.model
+
+data class MemberInfo(
+    val memberId: Long,
+    val email: String,
+    val name: String
+)

core/domain/src/main/java/com/plottwist/core/domain/onboarding/OnboardingRepository.kt

@@ -1,7 +1,11 @@
 package com.plottwist.core.domain.onboarding
 
+import com.plottwist.core.domain.model.MemberInfo
+
 interface OnboardingRepository {
     suspend fun updateOnboardingInfo(
         name: String
     ): Result<Unit>
+
+    suspend fun getMemberInfo(): Result<MemberInfo>
 }

core/domain/src/main/java/com/plottwist/core/domain/onboarding/usecase/GetMemberInfoUseCase.kt

@@ -0,0 +1,13 @@
+package com.plottwist.core.domain.onboarding.usecase
+
+import com.plottwist.core.domain.model.MemberInfo
+import com.plottwist.core.domain.onboarding.OnboardingRepository
+import javax.inject.Inject
+
+class GetMemberInfoUseCase @Inject constructor(
+    private val onboardingRepository: OnboardingRepository
+) {
+    suspend operator fun invoke(): Result<MemberInfo> {
+        return onboardingRepository.getMemberInfo()
+    }
+}

core/network/src/main/java/com/plottwist/core/network/model/onboarding/MemberInfoResponse.kt

@@ -0,0 +1,18 @@
+package com.plottwist.core.network.model.onboarding
+
+import com.plottwist.core.network.model.auth.Meta
+import kotlinx.serialization.Serializable
+
+@Serializable
+data class MemberInfoResponse(
+    val success: Boolean,
+    val data: MemberInfoData,
+    val meta: Meta?
+)
+
+@Serializable
+data class MemberInfoData(
+    val memberId: Long,
+    val email: String,
+    val name: String
+)

core/network/src/main/java/com/plottwist/core/network/service/OnboardingService.kt

@@ -1,11 +1,12 @@
 package com.plottwist.core.network.service
 
-import com.plottwist.core.network.model.auth.DeviceInfo
 import com.plottwist.core.network.model.auth.DeviceInfoRequest
+import com.plottwist.core.network.model.onboarding.MemberInfoResponse
 import com.plottwist.core.network.model.onboarding.UpdateDeviceInfoResponse
 import com.plottwist.core.network.model.onboarding.UpdateOnboardingInfoRequest
 import com.plottwist.core.network.model.onboarding.UpdateOnboardingInfoResponse
 import retrofit2.http.Body
+import retrofit2.http.GET
 import retrofit2.http.POST
 import retrofit2.http.PUT
 
@@ -19,4 +20,7 @@ interface OnboardingService {
     suspend fun updateDeviceToken(
         @Body deviceInfo: DeviceInfoRequest
     ): UpdateDeviceInfoResponse
+
+    @GET("/api/v1/members/me")
+    suspend fun getMemberInfo(): MemberInfoResponse
 }

feature/home/src/main/java/com/plottwist/feature/home/HomeContract.kt

@@ -4,6 +4,7 @@ import com.plottwist.core.domain.model.Gatherings
 
 data class HomeState(
     val loginState: LoginState = LoginState.Loading,
+    val userName: String = "",
     val gatherings: Gatherings = Gatherings(),
     val whenLabel: String = "",
     val whereLabel: String = "",

feature/home/src/main/java/com/plottwist/feature/home/HomeScreen.kt

@@ -147,6 +147,7 @@ fun HomeScreen(
         modifier = modifier.fillMaxSize(),
         screenHeight = configuration.screenHeightDp.dp,
         statusBarHeight = statusBarHeight,
+        userName = state.userName,
         whenLabels = state.whenTags,
         whereLabels = state.whereTags,
         whatLabels = state.whatTags,
@@ -226,6 +227,7 @@ fun HomeScreen(
 private fun HomeScreen(
     screenHeight: Dp,
     statusBarHeight: Dp,
+    userName: String,
     loginState: LoginState,
     gatherings: Gatherings,
     whenLabels: List<String>,
@@ -276,7 +278,8 @@ private fun HomeScreen(
                 ).verticalScroll(verticalScrollState)
             ) {
                 HomeTitle(
-                    modifier = Modifier.height(HOME_TITLE_HEIGHT.dp)
+                    modifier = Modifier.height(HOME_TITLE_HEIGHT.dp),
+                    name = userName
                 )
 
                 HomeContent(
@@ -327,7 +330,7 @@ fun HomeAppBar(
 
 @Composable
 fun HomeTitle(
-    name: String = "",
+    name: String,
     modifier: Modifier = Modifier
 ) {
     Column (
@@ -445,6 +448,7 @@ fun HomeScreenPreview(modifier: Modifier = Modifier) {
         modifier = Modifier.fillMaxSize(),
         loginState = LoginState.LoggedIn,
         gatherings = Gatherings(),
+        userName = "",
         onMyPageClick = {},
         onAddGatheringClick = {},
         onGatheringClick = {},

feature/home/src/main/java/com/plottwist/feature/home/HomeViewModel.kt

@@ -6,6 +6,7 @@ import com.plottwist.core.domain.auth.usecase.CheckLoginStatusUseCase
 import com.plottwist.core.domain.gathering.usecase.GetGatheringsUseCase
 import com.plottwist.core.domain.gathering.usecase.GetPurposesUseCase
 import com.plottwist.core.domain.model.Purposes
+import com.plottwist.core.domain.onboarding.usecase.GetMemberInfoUseCase
 import com.plottwist.core.domain.onboarding.usecase.UpdateDeviceTokenUseCase
 import com.plottwist.core.weburl.WebUrlConfig
 import dagger.hilt.android.lifecycle.HiltViewModel
@@ -23,11 +24,13 @@ class HomeViewModel @Inject constructor(
     private val getGatheringsUseCase: GetGatheringsUseCase,
     private val getPurposesUseCase: GetPurposesUseCase,
     private val webViewConfig: WebUrlConfig,
-    private val updateDeviceTokenUseCase: UpdateDeviceTokenUseCase
+    private val updateDeviceTokenUseCase: UpdateDeviceTokenUseCase,
+    private val getMemberInfoUseCase: GetMemberInfoUseCase
 ) : ContainerHost<HomeState, HomeSideEffect>, ViewModel() {
     override val container = container<HomeState, HomeSideEffect>(HomeState()) {
         observeLoginState()
         getPurposes()
+        getMemberInfo()
     }
 
     private fun getPurposes() = intent {
@@ -43,7 +46,15 @@ class HomeViewModel @Inject constructor(
                 whenLabel = result.whenTags.firstOrNull() ?: ""
             )
         }
+    }
 
+    private fun getMemberInfo() = intent {
+        val result = getMemberInfoUseCase()
+        reduce {
+            state.copy(
+                userName = result.getOrNull()?.name ?: ""
+            )
+        }
     }
 
     fun handleAction(action: HomeAction) {