[Feat/#94] 굿즈별 페이지 API 연동

Author: sonyerim

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

@@ -0,0 +1,26 @@
+package com.poti.android.data.mapper.party
+
+import com.poti.android.data.remote.dto.response.party.PartyDto
+import com.poti.android.data.remote.dto.response.party.ProductPartyListResponseDto
+import com.poti.android.domain.model.party.PartySummary
+import com.poti.android.domain.model.party.ProductPartyList
+
+fun ProductPartyListResponseDto.toDomain(): ProductPartyList =
+    ProductPartyList(
+        partyTitle = postTitle,
+        artistName = artist,
+        partySummaries = pots.map { it.toDomain() },
+    )
+
+private fun PartyDto.toDomain(): PartySummary =
+    PartySummary(
+        partyId = potId,
+        price = price,
+        goodsImageUrl = thumbnailUrl.orEmpty(),
+        currentCount = currentCount,
+        totalCount = totalCount,
+        availableMembers = availableMembers,
+        profileImageUrl = uploader.profileImage,
+        nickname = uploader.nickname,
+        rating = uploader.rating,
+    )

app/src/main/java/com/poti/android/data/remote/datasource/PartyRemoteDataSource.kt

@@ -11,6 +11,7 @@ import com.poti.android.data.remote.dto.response.party.MyRecruitListDto
 import com.poti.android.data.remote.dto.response.party.PartyDetailResponseDto
 import com.poti.android.data.remote.dto.response.party.PartyJoinOptionsDto
 import com.poti.android.data.remote.dto.response.party.PartyJoinResponseDto
+import com.poti.android.data.remote.dto.response.party.ProductPartyListResponseDto
 import com.poti.android.data.remote.dto.response.party.ProductSearchResponseDto
 import com.poti.android.data.remote.dto.response.party.ShippingOptionResponseDto
 import com.poti.android.data.remote.service.PartyService
@@ -51,4 +52,21 @@ class PartyRemoteDataSource @Inject constructor(
 
     suspend fun getRecruitPostParticipant(postId: Long): BaseResponse<GroupBuyPostParticipantDetailDto> =
         partyService.getRecruitPostParticipant(postId)
+
+    suspend fun getProductPartyList(
+        page: Int?,
+        size: Int?,
+        title: String,
+        artistId: Long,
+        sort: String,
+        memberIds: List<Long>?,
+    ): BaseResponse<ProductPartyListResponseDto> =
+        partyService.getProductPartyList(
+            page = page,
+            size = size,
+            title = title,
+            artistId = artistId,
+            sort = sort,
+            memberIds = memberIds,
+        )
 }

app/src/main/java/com/poti/android/data/remote/dto/response/party/ProductPartyListResponseDto.kt

@@ -0,0 +1,52 @@
+package com.poti.android.data.remote.dto.response.party
+
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
+
+@Serializable
+data class ProductPartyListResponseDto(
+    @SerialName("postTitle")
+    val postTitle: String,
+    @SerialName("artistId")
+    val artistId: Long,
+    @SerialName("artist")
+    val artist: String,
+    @SerialName("currentPage")
+    val currentPage: Int,
+    @SerialName("hasNext")
+    val hasNext: Boolean,
+    @SerialName("pots")
+    val pots: List<PartyDto>,
+)
+
+@Serializable
+data class PartyDto(
+    @SerialName("potId")
+    val potId: Long,
+    @SerialName("price")
+    val price: Int,
+    @SerialName("thumbnailUrl")
+    val thumbnailUrl: String?,
+    @SerialName("currentCount")
+    val currentCount: Int,
+    @SerialName("totalCount")
+    val totalCount: Int,
+    @SerialName("status")
+    val status: String,
+    @SerialName("availableMembers")
+    val availableMembers: List<String>,
+    @SerialName("uploader")
+    val uploader: PartyUploaderDto,
+)
+
+@Serializable
+data class PartyUploaderDto(
+    @SerialName("userId")
+    val userId: Long,
+    @SerialName("nickname")
+    val nickname: String,
+    @SerialName("profileImage")
+    val profileImage: String?,
+    @SerialName("rating")
+    val rating: Double,
+)

app/src/main/java/com/poti/android/data/remote/service/PartyService.kt

@@ -11,6 +11,7 @@ import com.poti.android.data.remote.dto.response.party.MyRecruitListDto
 import com.poti.android.data.remote.dto.response.party.PartyDetailResponseDto
 import com.poti.android.data.remote.dto.response.party.PartyJoinOptionsDto
 import com.poti.android.data.remote.dto.response.party.PartyJoinResponseDto
+import com.poti.android.data.remote.dto.response.party.ProductPartyListResponseDto
 import com.poti.android.data.remote.dto.response.party.ProductSearchResponseDto
 import com.poti.android.data.remote.dto.response.party.ShippingOptionResponseDto
 import retrofit2.http.Body
@@ -68,4 +69,14 @@ interface PartyService {
     suspend fun getRecruitPostParticipant(
         @Path("postId") postId: Long,
     ): BaseResponse<GroupBuyPostParticipantDetailDto>
+
+    @GET("/api/v1/posts/pots")
+    suspend fun getProductPartyList(
+        @Query("page") page: Int?,
+        @Query("size") size: Int?,
+        @Query("title") title: String,
+        @Query("artistId") artistId: Long,
+        @Query("sort") sort: String,
+        @Query("memberIds") memberIds: List<Long>?,
+    ): BaseResponse<ProductPartyListResponseDto>
 }

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

@@ -20,6 +20,7 @@ import com.poti.android.domain.model.history.RecruiterDetail
 import com.poti.android.domain.model.party.PartyDetail
 import com.poti.android.domain.model.party.PartyJoinInfo
 import com.poti.android.domain.model.party.PartyJoinOption
+import com.poti.android.domain.model.party.ProductPartyList
 import com.poti.android.domain.repository.PartyRepository
 import javax.inject.Inject
 
@@ -124,4 +125,25 @@ class PartyRepositoryImpl @Inject constructor(
                 .getOrThrow()
                 .toDomain()
         }
+
+    override suspend fun getProductPartyList(
+        page: Int?,
+        size: Int?,
+        title: String,
+        artistId: Long,
+        sort: String,
+        memberIds: List<Long>?,
+    ): Result<ProductPartyList> = httpResponseHandler.safeApiCall {
+        partyRemoteDataSource.getProductPartyList(
+            page = page,
+            size = size,
+            title = title,
+            artistId = artistId,
+            sort = sort,
+            memberIds = memberIds,
+        )
+            .handleApiResponse()
+            .getOrThrow()
+            .toDomain()
+    }
 }

…/android/domain/model/party/PartyList.kt …d/domain/model/party/ProductPartyList.ktapp/src/main/java/com/poti/android/domain/model/party/PartyList.kt renamed to app/src/main/java/com/poti/android/domain/model/party/ProductPartyList.kt app/src/main/java/com/poti/android/domain/model/party/PartyList.kt renamed to app/src/main/java/com/poti/android/domain/model/party/ProductPartyList.kt

@@ -1,8 +1,6 @@
 package com.poti.android.domain.model.party
 
-import com.poti.android.domain.model.artist.Member
-
-data class PartyList(
+data class ProductPartyList(
     val partyTitle: String,
     val artistName: String,
     val partySummaries: List<PartySummary>,
@@ -14,7 +12,7 @@ data class PartySummary(
     val goodsImageUrl: String,
     val currentCount: Int,
     val totalCount: Int,
-    val availableMembers: List<Member>,
+    val availableMembers: List<String>,
     val profileImageUrl: String?,
     val nickname: String,
     val rating: Double,

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

@@ -9,6 +9,7 @@ import com.poti.android.domain.model.history.RecruiterDetail
 import com.poti.android.domain.model.party.PartyDetail
 import com.poti.android.domain.model.party.PartyJoinInfo
 import com.poti.android.domain.model.party.PartyJoinOption
+import com.poti.android.domain.model.party.ProductPartyList
 
 interface PartyRepository {
     suspend fun searchProductTitle(
@@ -45,4 +46,13 @@ interface PartyRepository {
     suspend fun getRecruitDetail(postId: Long): Result<RecruiterDetail>
 
     suspend fun getRecruitPostParticipant(postId: Long): Result<ParticipantManageDetail>
+
+    suspend fun getProductPartyList(
+        page: Int?,
+        size: Int?,
+        title: String,
+        artistId: Long,
+        sort: String,
+        memberIds: List<Long>?,
+    ): Result<ProductPartyList>
 }

app/src/main/java/com/poti/android/presentation/party/goodsfilter/DummyPotsDate.kt

@@ -1,10 +1,9 @@
 package com.poti.android.presentation.party.goodsfilter
 
-import com.poti.android.domain.model.artist.Member
-import com.poti.android.domain.model.party.PartyList
 import com.poti.android.domain.model.party.PartySummary
+import com.poti.android.domain.model.party.ProductPartyList
 
-val dummyPartyList = PartyList(
+val dummyProductPartyList = ProductPartyList(
     partyTitle = "러브다이브 위드뮤",
     artistName = "IVE(아이브)",
     partySummaries = listOf(
@@ -14,10 +13,7 @@ val dummyPartyList = PartyList(
             goodsImageUrl = "",
             currentCount = 3,
             totalCount = 5,
-            availableMembers = listOf(
-                Member(1, "원영"),
-                Member(2, "유진"),
-            ),
+            availableMembers = listOf("원영", "유진"),
             profileImageUrl = "",
             nickname = "포티공주",
             rating = 4.8,
@@ -28,10 +24,7 @@ val dummyPartyList = PartyList(
             goodsImageUrl = "",
             currentCount = 6,
             totalCount = 6,
-            availableMembers = listOf(
-                Member(1, "원영"),
-                Member(2, "유진"),
-            ),
+            availableMembers = listOf("원영", "유진"),
             profileImageUrl = "",
             nickname = "굿즈요정",
             rating = 4.5,
@@ -42,10 +35,7 @@ val dummyPartyList = PartyList(
             goodsImageUrl = "",
             currentCount = 1,
             totalCount = 4,
-            availableMembers = listOf(
-                Member(1, "가을"),
-                Member(2, "이서"),
-            ),
+            availableMembers = listOf("원영", "유진"),
             profileImageUrl = "",
             nickname = "공구마스터",
             rating = 5.0,

app/src/main/java/com/poti/android/presentation/party/goodsfilter/GoodsCategoryScreen.kt

@@ -38,7 +38,7 @@ fun GoodsCategoryRoute(
     artistId: Long,
     onPopBackStack: () -> Unit,
     onNavigateToPartyCreate: () -> Unit,
-    onNavigateToGoodsPartyList: (Long) -> Unit,
+    onNavigateToGoodsPartyList: (Long, String) -> Unit,
     modifier: Modifier = Modifier,
     viewModel: GoodsCategoryViewModel = hiltViewModel(),
 ) {
@@ -48,7 +48,7 @@ fun GoodsCategoryRoute(
         when (effect) {
             GoodsCategoryUiEffect.NavigateBack -> onPopBackStack()
             GoodsCategoryUiEffect.NavigateToPartyCreate -> onNavigateToPartyCreate()
-            GoodsCategoryUiEffect.NavigateToGoodsFilter -> onNavigateToGoodsPartyList(artistId)
+            is GoodsCategoryUiEffect.NavigateToGoodsPartyList -> onNavigateToGoodsPartyList(artistId, effect.title)
         }
     }
 
@@ -72,8 +72,8 @@ fun GoodsCategoryRoute(
             onSortDismiss = {
                 viewModel.processIntent(GoodsCategoryUiIntent.OnSortDismiss)
             },
-            onCardClick = {
-                viewModel.processIntent(GoodsCategoryUiIntent.OnCardClick)
+            onCardClick = { artistId, title ->
+                viewModel.processIntent(GoodsCategoryUiIntent.OnCardClick(artistId, title))
             },
             modifier = modifier,
         )
@@ -90,7 +90,7 @@ private fun GoodsCategoryScreen(
     onSortFilterClick: () -> Unit,
     onSortSelect: (GoodsSortType) -> Unit,
     onSortDismiss: () -> Unit,
-    onCardClick: () -> Unit,
+    onCardClick: (Long, String) -> Unit,
     modifier: Modifier = Modifier,
 ) {
     if (isSortBottomSheetVisible) {
@@ -139,10 +139,11 @@ private fun GoodsCategoryScreen(
                     title = groupItem.postTitle,
                     partyCount = groupItem.postCount,
                     tag = groupItem.tag,
-                    onClick = onCardClick, // TODO: [예림] 굿즈별 페이지로 이동; 타이틀, 아티스트 아이디
+                    onClick = { id, title -> onCardClick(id, title) },
                     modifier = Modifier
                         .fillMaxWidth()
                         .padding(bottom = 16.dp),
+                    artistId = groupItem.artistId,
                 )
             }
             item {
@@ -165,7 +166,7 @@ private fun GoodsCategoryScreenPreview() {
             onSortFilterClick = {},
             onSortSelect = {},
             onSortDismiss = {},
-            onCardClick = {},
+            onCardClick = { _, _ -> },
         )
     }
 }

app/src/main/java/com/poti/android/presentation/party/goodsfilter/GoodsCategoryViewModel.kt

@@ -23,16 +23,9 @@ class GoodsCategoryViewModel @Inject constructor(
 
         override fun processIntent(intent: GoodsCategoryUiIntent) {
             when (intent) {
-                GoodsCategoryUiIntent.OnBackClick ->
-                    sendEffect(GoodsCategoryUiEffect.NavigateBack)
-
-                GoodsCategoryUiIntent.OnFloatingClick ->
-                    sendEffect(GoodsCategoryUiEffect.NavigateToPartyCreate)
-
-                GoodsCategoryUiIntent.OnSortFilterClick -> {
-                    updateState { copy(isSortBottomSheetVisible = true) }
-                }
-
+                GoodsCategoryUiIntent.OnBackClick -> sendEffect(GoodsCategoryUiEffect.NavigateBack)
+                GoodsCategoryUiIntent.OnFloatingClick -> sendEffect(GoodsCategoryUiEffect.NavigateToPartyCreate)
+                GoodsCategoryUiIntent.OnSortFilterClick -> updateState { copy(isSortBottomSheetVisible = true) }
                 is GoodsCategoryUiIntent.OnSortSelected -> {
                     updateState {
                         copy(
@@ -42,13 +35,8 @@ class GoodsCategoryViewModel @Inject constructor(
                     }
                     loadGoodsCategoryList(intent.sortType)
                 }
-
-                GoodsCategoryUiIntent.OnSortDismiss -> {
-                    updateState { copy(isSortBottomSheetVisible = false) }
-                }
-
-                GoodsCategoryUiIntent.OnCardClick ->
-                    sendEffect(GoodsCategoryUiEffect.NavigateToGoodsFilter)
+                GoodsCategoryUiIntent.OnSortDismiss -> updateState { copy(isSortBottomSheetVisible = false) }
+                is GoodsCategoryUiIntent.OnCardClick -> sendEffect(GoodsCategoryUiEffect.NavigateToGoodsPartyList(intent.artistId, intent.title))
             }
         }