Fix/#117 UI qa

app/src/main/java/com/poti/android/core/designsystem/component/navigation/PotiHeaderPage.kt

@@ -61,7 +61,7 @@ fun PotiHeaderPage(
             subTitle?.let {
                 Text(
                     text = subTitle,
-                    style = PotiTheme.typography.caption10m.copy(
+                    style = PotiTheme.typography.caption12m.copy(
                         lineHeight = 1.35.em,
                     ),
                     color = PotiTheme.colors.gray700,

app/src/main/java/com/poti/android/core/designsystem/component/navigation/PotiHeaderPrimary.kt

@@ -46,7 +46,7 @@ fun PotiHeaderPrimary(
             )
         } else {
             Icon(
-                imageVector = ImageVector.vectorResource(R.drawable.ic_logo),
+                imageVector = ImageVector.vectorResource(R.drawable.ic_poti_logo),
                 contentDescription = null,
                 tint = Color.Unspecified,
             )

app/src/main/java/com/poti/android/data/mapper/home/GoodsCategoryMapper.kt

@@ -2,11 +2,11 @@ package com.poti.android.data.mapper.home
 
 import com.poti.android.data.remote.dto.response.home.GoodsCategoryResponseDto
 import com.poti.android.data.remote.dto.response.home.GroupItemDto
-import com.poti.android.domain.model.party.GoodsCategory
 import com.poti.android.domain.model.party.GroupItem
+import com.poti.android.domain.model.party.ProductCategory
 
-fun GoodsCategoryResponseDto.toDomain(): GoodsCategory =
-    GoodsCategory(
+fun GoodsCategoryResponseDto.toDomain(): ProductCategory =
+    ProductCategory(
         nickname = nickname,
         mainArtist = mainArtist,
         mainArtistId = mainArtistId,

app/src/main/java/com/poti/android/data/mapper/home/HomeMapper.kt

@@ -10,8 +10,8 @@ import com.poti.android.domain.model.home.HomeContent
 
 fun HomeResponseDto.toDomain(): HomeContent = HomeContent(
     nickname = nickname,
-    mainArtist = mainArtist.orEmpty(),
-    mainArtistId = mainArtistId ?: 0L,
+    mainArtist = mainArtist,
+    mainArtistId = mainArtistId,
     myGroupItems = myGroupItems.orEmpty().map { it.toDomain() },
     otherGroupItems = otherGroupItems.map { it.toDomain() },
     banners = banners.map { it.toDomain() },
@@ -20,7 +20,7 @@ fun HomeResponseDto.toDomain(): HomeContent = HomeContent(
 fun MyGroupItemDto.toDomain(): GroupItem = GroupItem(
     postTitle = postTitle.orEmpty(),
     artist = artist.orEmpty(),
-    artistId = artistId ?: 0L,
+    artistId = artistId ?: 0,
     postImage = postImage.orEmpty(),
     postCount = postCount ?: 0,
     tag = tag.orEmpty(),
@@ -29,7 +29,7 @@ fun MyGroupItemDto.toDomain(): GroupItem = GroupItem(
 fun OtherGroupItemDto.toDomain(): GroupItem = GroupItem(
     postTitle = postTitle,
     artist = artist,
-    artistId = artistId ?: 0L,
+    artistId = artistId ?: 0,
     postImage = postImage.orEmpty(),
     postCount = postCount,
     tag = tag,

app/src/main/java/com/poti/android/data/mapper/party/ProductPartyListMapper.kt

@@ -16,7 +16,7 @@ private fun PartyDto.toDomain(): PartySummary =
     PartySummary(
         partyId = potId,
         price = price,
-        goodsImageUrl = thumbnailUrl.orEmpty(),
+        productImageUrl = thumbnailUrl.orEmpty(),
         currentCount = currentCount,
         totalCount = totalCount,
         availableMembers = availableMembers,

app/src/main/java/com/poti/android/data/mapper/user/MyPageMapper.kt

@@ -1,9 +1,6 @@
 package com.poti.android.data.mapper.user
 
 import com.poti.android.data.remote.dto.response.user.MyPageResponseDto
-import com.poti.android.data.remote.dto.response.user.ParticipationSummaryDto
-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.UserMyPage
 import java.lang.String.format
 import java.util.Locale
@@ -21,17 +18,3 @@ fun MyPageResponseDto.toDomain(): UserMyPage =
         participationSummary = participationSummary.toDomain(),
         recruitSummary = recruitSummary.toDomain(),
     )
-
-fun ParticipationSummaryDto.toDomain(): HistorySummary =
-    HistorySummary(
-        total = total,
-        inProgress = inProgress,
-        completed = completed,
-    )
-
-fun RecruitSummaryDto.toDomain(): HistorySummary =
-    HistorySummary(
-        total = total,
-        inProgress = inProgress,
-        completed = completed,
-    )

app/src/main/java/com/poti/android/data/mapper/ProfileMapper.kt → app/src/main/java/com/poti/android/data/mapper/user/ProfileMapper.kt

@@ -1,7 +1,7 @@
-package com.poti.android.data.mapper
+package com.poti.android.data.mapper.user
 
 import com.poti.android.data.remote.dto.response.user.ProfileResponseDto
-import com.poti.android.data.remote.dto.response.user.RecruitSummaryDto
+import com.poti.android.data.remote.dto.response.user.ProfileSummaryDto
 import com.poti.android.domain.model.user.HistorySummary
 import com.poti.android.domain.model.user.UserProfile
 
@@ -18,7 +18,7 @@ fun ProfileResponseDto.toDomain(): UserProfile =
         recruitSummary = recruitSummary.toDomain(),
     )
 
-fun RecruitSummaryDto.toDomain(): HistorySummary =
+fun ProfileSummaryDto.toDomain(): HistorySummary =
     HistorySummary(
         total = total,
         inProgress = inProgress,

app/src/main/java/com/poti/android/data/remote/dto/request/user/OnboardingRequestDto.kt

@@ -8,5 +8,5 @@ data class OnboardingRequestDto(
     @SerialName("nickname")
     val nickname: String,
     @SerialName("favoriteArtistId")
-    val favoriteArtistId: Long,
+    val favoriteArtistId: Long?,
 )

app/src/main/java/com/poti/android/data/remote/dto/response/user/MyPageResponseDto.kt

@@ -24,7 +24,7 @@ data class MyPageResponseDto(
     @SerialName("favoriteArtistName")
     val favoriteArtistName: String?,
     @SerialName("participationSummary")
-    val participationSummary: ParticipationSummaryDto,
+    val participationSummary: ProfileSummaryDto,
     @SerialName("recruitSummary")
-    val recruitSummary: RecruitSummaryDto,
+    val recruitSummary: ProfileSummaryDto,
 )

app/src/main/java/com/poti/android/data/remote/dto/response/user/OnboardingResponseDto.kt

@@ -6,7 +6,7 @@ import kotlinx.serialization.Serializable
 @Serializable
 data class OnboardingResponseDto(
     @SerialName("nickname")
-    val nickname: String,
+    val nickname: String?,
     @SerialName("favoriteArtistId")
-    val favoriteArtistId: Long,
+    val favoriteArtistId: Long?,
 )

app/src/main/java/com/poti/android/data/remote/dto/response/user/ProfileResponseDto.kt

@@ -22,5 +22,5 @@ data class ProfileResponseDto(
     @SerialName("hasFavoriteArtist")
     val hasFavoriteArtist: Boolean,
     @SerialName("recruitSummary")
-    val recruitSummary: RecruitSummaryDto,
+    val recruitSummary: ProfileSummaryDto,
 )

app/src/main/java/com/poti/android/data/remote/dto/response/user/ProfileSummaryDto.kt

@@ -4,17 +4,7 @@ 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(
+data class ProfileSummaryDto(
     @SerialName("total")
     val total: Int,
     @SerialName("inProgress")

app/src/main/java/com/poti/android/data/repository/HomeRepositoryImpl.kt

@@ -5,7 +5,7 @@ import com.poti.android.core.network.util.HttpResponseHandler
 import com.poti.android.data.mapper.home.toDomain
 import com.poti.android.data.remote.datasource.HomeRemoteDataSource
 import com.poti.android.domain.model.home.HomeContent
-import com.poti.android.domain.model.party.GoodsCategory
+import com.poti.android.domain.model.party.ProductCategory
 import com.poti.android.domain.repository.HomeRepository
 import javax.inject.Inject
 
@@ -25,7 +25,7 @@ class HomeRepositoryImpl @Inject constructor(
         size: Int?,
         sort: String?,
         artistId: Long?,
-    ): Result<GoodsCategory> = httpResponseHandler.safeApiCall {
+    ): Result<ProductCategory> = httpResponseHandler.safeApiCall {
         homeRemoteDataSource.getGoodsCategoryList(
             page = page,
             size = size,

app/src/main/java/com/poti/android/data/repository/UserRepositoryImpl.kt

@@ -2,8 +2,6 @@ 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
@@ -19,13 +17,15 @@ class UserRepositoryImpl @Inject constructor(
 ) : UserRepository {
     override suspend fun patchOnboarding(
         nickname: String,
-        favoriteArtistId: Long,
+        favoriteArtistId: Long?,
     ): Result<Unit> = httpResponseHandler.safeApiCall {
         val requestDto = OnboardingRequestDto(
             nickname = nickname,
             favoriteArtistId = favoriteArtistId,
         )
         userRemoteDataSource.patchOnboarding(onboardingRequest = requestDto)
+            .handleApiResponse()
+            .getOrThrow()
     }
 
     override suspend fun postNicknameDuplicate(nickname: String): Result<Boolean> =

app/src/main/java/com/poti/android/domain/model/home/HomeContent.kt

@@ -1,12 +1,12 @@
 package com.poti.android.domain.model.home
 
 data class HomeContent(
-    val nickname: String = "",
-    val mainArtist: String = "",
-    val mainArtistId: Long = 0L,
-    val myGroupItems: List<GroupItem> = emptyList(),
-    val otherGroupItems: List<GroupItem> = emptyList(),
-    val banners: List<Banner> = emptyList(),
+    val nickname: String,
+    val mainArtist: String?,
+    val mainArtistId: Long?,
+    val myGroupItems: List<GroupItem>,
+    val otherGroupItems: List<GroupItem>,
+    val banners: List<Banner>,
 )
 
 data class GroupItem(

app/src/main/java/com/poti/android/domain/model/party/GoodsCategory.kt → app/src/main/java/com/poti/android/domain/model/party/ProductCategory.kt

@@ -1,6 +1,6 @@
 package com.poti.android.domain.model.party
 
-data class GoodsCategory(
+data class ProductCategory(
     val nickname: String,
     val mainArtist: String?,
     val mainArtistId: Long?,

app/src/main/java/com/poti/android/domain/model/party/ProductPartyList.kt

@@ -9,7 +9,7 @@ data class ProductPartyList(
 data class PartySummary(
     val partyId: Long,
     val price: Int,
-    val goodsImageUrl: String,
+    val productImageUrl: String,
     val currentCount: Int,
     val totalCount: Int,
     val availableMembers: List<String>,

app/src/main/java/com/poti/android/domain/repository/HomeRepository.kt

@@ -1,7 +1,7 @@
 package com.poti.android.domain.repository
 
 import com.poti.android.domain.model.home.HomeContent
-import com.poti.android.domain.model.party.GoodsCategory
+import com.poti.android.domain.model.party.ProductCategory
 
 interface HomeRepository {
     suspend fun getHomeContent(): Result<HomeContent>
@@ -11,5 +11,5 @@ interface HomeRepository {
         size: Int? = null,
         sort: String? = null,
         artistId: Long? = null,
-    ): Result<GoodsCategory>
+    ): Result<ProductCategory>
 }

app/src/main/java/com/poti/android/domain/repository/UserRepository.kt

@@ -6,7 +6,7 @@ import com.poti.android.domain.model.user.UserProfile
 interface UserRepository {
     suspend fun patchOnboarding(
         nickname: String,
-        favoriteArtistId: Long,
+        favoriteArtistId: Long?,
     ): Result<Unit>
 
     suspend fun postNicknameDuplicate(

app/src/main/java/com/poti/android/presentation/history/list/HistoryListScreen.kt

@@ -4,6 +4,7 @@ import androidx.compose.foundation.gestures.detectHorizontalDragGestures
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.PaddingValues
+import androidx.compose.foundation.layout.WindowInsets
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.padding
@@ -18,6 +19,8 @@ import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
 import androidx.hilt.lifecycle.viewmodel.compose.hiltViewModel
+import androidx.lifecycle.Lifecycle
+import androidx.lifecycle.compose.LifecycleEventEffect
 import androidx.lifecycle.compose.collectAsStateWithLifecycle
 import com.poti.android.core.common.state.ApiState
 import com.poti.android.core.common.util.HandleSideEffects
@@ -49,6 +52,10 @@ fun HistoryListRoute(
 ) {
     val uiState by viewModel.uiState.collectAsStateWithLifecycle()
 
+    LifecycleEventEffect(Lifecycle.Event.ON_RESUME) {
+        viewModel.processIntent(HistoryListUiIntent.OnResume)
+    }
+
     HandleSideEffects(viewModel.sideEffect) { effect ->
         when (effect) {
             HistoryListUiEffect.NavigateBack -> onPopBackStack()
@@ -82,6 +89,7 @@ private fun HistoryListScreen(
 ) {
     Scaffold(
         modifier = modifier,
+        contentWindowInsets = WindowInsets(),
         topBar = {
             PotiHeaderPage(
                 onNavigationClick = onBackClick,

app/src/main/java/com/poti/android/presentation/history/list/HistoryListViewModel.kt

@@ -12,6 +12,7 @@ import com.poti.android.domain.repository.ParticipationRepository
 import com.poti.android.domain.repository.PartyRepository
 import com.poti.android.domain.type.HistoryListType
 import com.poti.android.presentation.history.list.model.HistoryListUiEffect
+import com.poti.android.presentation.history.list.model.HistoryListUiEffect.*
 import com.poti.android.presentation.history.list.model.HistoryListUiIntent
 import com.poti.android.presentation.history.list.model.HistoryListUiState
 import com.poti.android.presentation.history.list.model.HistoryMode
@@ -41,11 +42,12 @@ class HistoryListViewModel @Inject constructor(
             is HistoryListUiIntent.OnTabSelected -> selectTab(intent.tab)
             is HistoryListUiIntent.OnCardClick -> {
                 if (uiState.value.mode == HistoryMode.RECRUIT) {
-                    sendEffect(HistoryListUiEffect.NavigateToRecruiterDetail(intent.id))
+                    sendEffect(NavigateToRecruiterDetail(intent.id))
                 } else {
-                    sendEffect(HistoryListUiEffect.NavigateToParticipantDetail(intent.id))
+                    sendEffect(NavigateToParticipantDetail(intent.id))
                 }
             }
+            HistoryListUiIntent.OnResume -> loadUserHistoryList()
         }
     }
 
@@ -117,7 +119,7 @@ class HistoryListViewModel @Inject constructor(
                             historyListType = listStatus,
                             partyStatus = item.postStatus,
                         )
-                    },
+                    }.distinctBy { it.id },
                 )
 
                 updateState {

app/src/main/java/com/poti/android/presentation/history/list/model/Contracts.kt

@@ -11,7 +11,7 @@ import com.poti.android.domain.model.history.HistoryListContent
 
 data class HistoryListUiState(
     val historyListLoadState: ApiState<HistoryListContent> = ApiState.Init,
-    val mode: HistoryMode = HistoryMode.RECRUIT,
+    val mode: HistoryMode = HistoryMode.PARTICIPATION,
     val selectedTab: PotiHeaderTabType = PotiHeaderTabType.ONGOING,
 ) : UiState {
     val titleRes = when (mode) {
@@ -52,6 +52,8 @@ sealed interface HistoryListUiIntent : UiIntent {
     data class OnTabSelected(val tab: PotiHeaderTabType) : HistoryListUiIntent
 
     data class OnCardClick(val id: Long) : HistoryListUiIntent
+
+    data object OnResume : HistoryListUiIntent
 }
 
 sealed interface HistoryListUiEffect : UiEffect {

app/src/main/java/com/poti/android/presentation/history/manage/ParticipantManageScreen.kt

@@ -12,6 +12,8 @@ import androidx.compose.runtime.remember
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.res.stringResource
 import androidx.hilt.lifecycle.viewmodel.compose.hiltViewModel
+import androidx.lifecycle.Lifecycle
+import androidx.lifecycle.compose.LifecycleEventEffect
 import androidx.lifecycle.compose.collectAsStateWithLifecycle
 import com.poti.android.R
 import com.poti.android.core.common.extension.onSuccess
@@ -39,6 +41,10 @@ fun ParticipantManageRoute(
 ) {
     val uiState by viewModel.uiState.collectAsStateWithLifecycle()
 
+    LifecycleEventEffect(Lifecycle.Event.ON_RESUME) {
+        viewModel.processIntent(ParticipantManageUiIntent.OnResume)
+    }
+
     HandleSideEffects(viewModel.sideEffect) { effect ->
         when (effect) {
             ParticipantManageUiEffect.NavigateBack -> popBackStack()