diff --git a/data/src/main/java/com/threegap/bitnagil/data/emotion/service/EmotionService.kt b/data/src/main/java/com/threegap/bitnagil/data/emotion/service/EmotionService.kt index 82eb3dcb..728c8d44 100644 --- a/data/src/main/java/com/threegap/bitnagil/data/emotion/service/EmotionService.kt +++ b/data/src/main/java/com/threegap/bitnagil/data/emotion/service/EmotionService.kt @@ -8,7 +8,7 @@ import com.threegap.bitnagil.network.model.BaseResponse import retrofit2.http.Body import retrofit2.http.GET import retrofit2.http.POST -import retrofit2.http.Query +import retrofit2.http.Path interface EmotionService { @GET("/api/v1/emotion-marbles") @@ -19,8 +19,8 @@ interface EmotionService { @Body request: RegisterEmotionRequest, ): BaseResponse - @GET("/api/v1/emotion-marbles/me") + @GET("/api/v1/emotion-marbles/{searchDate}") suspend fun getMyEmotionMarble( - @Query("searchDate") date: String, + @Path("searchDate") date: String, ): BaseResponse } diff --git a/data/src/main/java/com/threegap/bitnagil/data/user/service/UserService.kt b/data/src/main/java/com/threegap/bitnagil/data/user/service/UserService.kt index 76b4823e..d2fc21db 100644 --- a/data/src/main/java/com/threegap/bitnagil/data/user/service/UserService.kt +++ b/data/src/main/java/com/threegap/bitnagil/data/user/service/UserService.kt @@ -5,6 +5,6 @@ import com.threegap.bitnagil.network.model.BaseResponse import retrofit2.http.GET interface UserService { - @GET("/api/v1/users/nickname") + @GET("/api/v1/users/infos") suspend fun fetchUserProfile(): BaseResponse } diff --git a/presentation/src/main/java/com/threegap/bitnagil/presentation/mypage/MyPageViewModel.kt b/presentation/src/main/java/com/threegap/bitnagil/presentation/mypage/MyPageViewModel.kt index 9b63e38c..cd57e4c1 100644 --- a/presentation/src/main/java/com/threegap/bitnagil/presentation/mypage/MyPageViewModel.kt +++ b/presentation/src/main/java/com/threegap/bitnagil/presentation/mypage/MyPageViewModel.kt @@ -2,6 +2,7 @@ package com.threegap.bitnagil.presentation.mypage import androidx.lifecycle.SavedStateHandle import androidx.lifecycle.viewModelScope +import com.threegap.bitnagil.domain.user.usecase.FetchUserProfileUseCase import com.threegap.bitnagil.presentation.common.mviviewmodel.MviViewModel import com.threegap.bitnagil.presentation.mypage.model.MyPageIntent import com.threegap.bitnagil.presentation.mypage.model.MyPageSideEffect @@ -14,6 +15,7 @@ import javax.inject.Inject @HiltViewModel class MyPageViewModel @Inject constructor( savedStateHandle: SavedStateHandle, + private val fetchUserProfileUseCase: FetchUserProfileUseCase, ) : MviViewModel( MyPageState.Init, savedStateHandle, @@ -24,7 +26,18 @@ class MyPageViewModel @Inject constructor( private fun loadMyPageInfo() { viewModelScope.launch { - sendIntent(MyPageIntent.LoadMyPageSuccess(name = "이름", profileUrl = "profileUrl")) + fetchUserProfileUseCase().fold( + onSuccess = { + sendIntent( + MyPageIntent.LoadMyPageSuccess( + name = it.nickname, + profileUrl = "profileUrl", + ), + ) + }, + onFailure = { + }, + ) } }