Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 26 additions & 0 deletions app/src/main/java/com/poti/android/data/mapper/ProfileMapper.kt
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
package com.poti.android.data.mapper

import com.poti.android.data.remote.dto.response.user.ProfileResponseDto
import com.poti.android.data.remote.dto.response.user.RecruitSummaryDto
import com.poti.android.domain.model.user.HistorySummary
import com.poti.android.domain.model.user.UserProfile

fun ProfileResponseDto.toDomain(): UserProfile =
UserProfile(
userId = userId,
email = email,
nickname = nickname,
profileImageUrl = profileImageUrl,
ratingAvg = ratingAvg,
activityMessage = activityMessage,
joinedAt = joinedAt,
hasFavoriteArtist = hasFavoriteArtist,
recruitSummary = recruitSummary.toDomain(),
)

fun RecruitSummaryDto.toDomain(): HistorySummary =
HistorySummary(
total = total,
inProgress = inProgress,
completed = completed,
)
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ import com.poti.android.data.remote.dto.request.user.OnboardingRequestDto
import com.poti.android.data.remote.dto.response.user.MyPageResponseDto
import com.poti.android.data.remote.dto.response.user.NicknameDuplicateResponseDto
import com.poti.android.data.remote.dto.response.user.OnboardingResponseDto
import com.poti.android.data.remote.dto.response.user.ProfileResponseDto
import com.poti.android.data.remote.service.UserService
import javax.inject.Inject

Expand All @@ -20,4 +21,7 @@ class UserRemoteDataSource @Inject constructor(

suspend fun getUserMyPage(): BaseResponse<MyPageResponseDto> =
userService.getUserMyPage()

suspend fun getUserProfile(userId: Long): BaseResponse<ProfileResponseDto> =
userService.getUserProfile(userId)
}
Original file line number Diff line number Diff line change
Expand Up @@ -28,23 +28,3 @@ data class MyPageResponseDto(
@SerialName("recruitSummary")
val recruitSummary: RecruitSummaryDto,
)

@Serializable
data class ParticipationSummaryDto(
@SerialName("total")
val total: Int,
@SerialName("inProgress")
val inProgress: Int,
@SerialName("completed")
val completed: Int,
)

@Serializable
data class RecruitSummaryDto(
@SerialName("total")
val total: Int,
@SerialName("inProgress")
val inProgress: Int,
@SerialName("completed")
val completed: Int,
)
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
package com.poti.android.data.remote.dto.response.user

import kotlinx.serialization.SerialName
import kotlinx.serialization.Serializable

@Serializable
data class ProfileResponseDto(
@SerialName("userId")
val userId: Long,
@SerialName("email")
val email: String,
@SerialName("nickname")
val nickname: String,
@SerialName("profileImageUrl")
val profileImageUrl: String,
@SerialName("ratingAvg")
val ratingAvg: Double,
@SerialName("activityMessage")
val activityMessage: String,
@SerialName("joinedAt")
val joinedAt: String,
@SerialName("hasFavoriteArtist")
val hasFavoriteArtist: Boolean,
@SerialName("recruitSummary")
val recruitSummary: RecruitSummaryDto,
)
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
package com.poti.android.data.remote.dto.response.user

import kotlinx.serialization.SerialName
import kotlinx.serialization.Serializable

@Serializable
data class ParticipationSummaryDto(
@SerialName("total")
val total: Int,
@SerialName("inProgress")
val inProgress: Int,
@SerialName("completed")
val completed: Int,
)

@Serializable
data class RecruitSummaryDto(
@SerialName("total")
val total: Int,
@SerialName("inProgress")
val inProgress: Int,
@SerialName("completed")
val completed: Int,
)
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,12 @@ import com.poti.android.data.remote.dto.request.user.OnboardingRequestDto
import com.poti.android.data.remote.dto.response.user.MyPageResponseDto
import com.poti.android.data.remote.dto.response.user.NicknameDuplicateResponseDto
import com.poti.android.data.remote.dto.response.user.OnboardingResponseDto
import com.poti.android.data.remote.dto.response.user.ProfileResponseDto
import retrofit2.http.Body
import retrofit2.http.GET
import retrofit2.http.PATCH
import retrofit2.http.POST
import retrofit2.http.Path

interface UserService {
@PATCH("/api/v1/users/onboarding")
Expand All @@ -24,4 +26,9 @@ interface UserService {

@GET("/api/v1/users/mypage")
suspend fun getUserMyPage(): BaseResponse<MyPageResponseDto>

@GET("/api/v1/users/{userId}/profile")
suspend fun getUserProfile(
@Path("userId") userId: Long,
): BaseResponse<ProfileResponseDto>
}
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,13 @@ package com.poti.android.data.repository
import com.poti.android.core.network.model.handleApiResponse
import com.poti.android.core.network.util.HttpResponseHandler
import com.poti.android.data.mapper.artist.toDomain
import com.poti.android.data.mapper.toDomain
import com.poti.android.data.mapper.user.toDomain
import com.poti.android.data.remote.datasource.UserRemoteDataSource
import com.poti.android.data.remote.dto.request.user.NicknameDuplicateRequestDto
import com.poti.android.data.remote.dto.request.user.OnboardingRequestDto
import com.poti.android.domain.model.user.UserMyPage
import com.poti.android.domain.model.user.UserProfile
import com.poti.android.domain.repository.UserRepository
import javax.inject.Inject

Expand Down Expand Up @@ -44,4 +46,11 @@ class UserRepositoryImpl @Inject constructor(
.getOrThrow()
.toDomain()
}

override suspend fun getUserProfile(userId: Long): Result<UserProfile> = httpResponseHandler.safeApiCall {
userRemoteDataSource.getUserProfile(userId)
.handleApiResponse()
.getOrThrow()
.toDomain()
}
}
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
package com.poti.android.domain.repository

import com.poti.android.domain.model.user.UserMyPage
import com.poti.android.domain.model.user.UserProfile

interface UserRepository {
suspend fun patchOnboarding(
Expand All @@ -13,4 +14,8 @@ interface UserRepository {
): Result<Boolean>

suspend fun getUserMyPage(): Result<UserMyPage>

suspend fun getUserProfile(
userId: Long,
): Result<UserProfile>
}
Original file line number Diff line number Diff line change
@@ -1,19 +1,26 @@
package com.poti.android.presentation.user.profile

import androidx.lifecycle.SavedStateHandle
import androidx.navigation.toRoute
import com.poti.android.core.base.BaseViewModel
import com.poti.android.core.common.state.ApiState
import com.poti.android.domain.model.user.HistorySummary
import com.poti.android.domain.model.user.UserProfile
import com.poti.android.domain.repository.UserRepository
import com.poti.android.presentation.user.profile.model.ProfileUiEffect
import com.poti.android.presentation.user.profile.model.ProfileUiIntent
import com.poti.android.presentation.user.profile.model.ProfileUiState
import com.poti.android.presentation.user.profile.navigation.ProfileRoute
import dagger.hilt.android.lifecycle.HiltViewModel
import javax.inject.Inject

@HiltViewModel
class ProfileViewModel @Inject constructor() : BaseViewModel<ProfileUiState, ProfileUiIntent, ProfileUiEffect>(
initialState = ProfileUiState(),
) {
class ProfileViewModel @Inject constructor(
private val userRepository: UserRepository,
savedStateHandle: SavedStateHandle,
) : BaseViewModel<ProfileUiState, ProfileUiIntent, ProfileUiEffect>(
initialState = ProfileUiState(),
) {
private val userId = savedStateHandle.toRoute<ProfileRoute.Profile>().userId

override fun processIntent(intent: ProfileUiIntent) {
when (intent) {
ProfileUiIntent.OnBackClick -> sendEffect(ProfileUiEffect.NavigateBack)
Expand All @@ -24,27 +31,19 @@ class ProfileViewModel @Inject constructor() : BaseViewModel<ProfileUiState, Pro
loadUserProfile()
}

private fun loadUserProfile() {
updateState {
copy(
userProfileLoadState = ApiState.Success(
UserProfile(
userId = 1L,
email = "akkma@app.jam",
nickname = "분철의 악마",
profileImageUrl = "",
ratingAvg = 4.8,
activityMessage = "최근 3일 이내 활동",
joinedAt = "2025-12-28",
hasFavoriteArtist = true,
recruitSummary = HistorySummary(
total = 7,
inProgress = 2,
completed = 5,
),
),
),
)
}
private fun loadUserProfile() = launchScope {
userRepository.getUserProfile(userId = userId)
.onSuccess { userProfile ->
updateState {
copy(userProfileLoadState = ApiState.Success(userProfile))
}
}
.onFailure { throwable ->
updateState {
copy(
userProfileLoadState = ApiState.Failure(throwable.message ?: "Failed"),
)
}
}
}
}