[PC-1298] PR 피드백 수정

build-logic/src/main/java/com/puzzle/build/logic/KotlinAndroid.kt

@@ -54,6 +54,8 @@ internal fun Project.configureKotlinAndroid() {
         implementation(platform(libs.findLibrary("firebase-bom").get()))
         implementation(libs.findLibrary("firebase-analytics").get())
         implementation(libs.findLibrary("firebase-crashlytics").get())
+
+        implementation(libs.findLibrary("kotlinx-collections-immutable").get())
     }
 
     configureKotlin()

build-logic/src/main/java/com/puzzle/build/logic/configure/AndroidComposes.kt

@@ -25,7 +25,6 @@ internal fun Project.configureAndroidCompose() {
         dependencies {
             val bom = libs.findLibrary("androidx-compose-bom").get()
             add("implementation", platform(bom))
-            add("implementation", libs.findLibrary("compose.material3.adaptive").get())
             add("implementation", libs.findLibrary("androidx.compose.material").get())
             add("implementation", libs.findLibrary("androidx.compose.material3").get())
             add("implementation", libs.findLibrary("androidx.compose.ui").get())

core/billing/src/main/java/com/puzzle/billing/BillingHelper.kt

@@ -4,12 +4,11 @@ import android.app.Activity
 import com.puzzle.billing.model.PieceProduct
 import com.puzzle.domain.model.payment.CashProduct
 import com.puzzle.domain.model.payment.PurchaseProduct
+import kotlinx.collections.immutable.ImmutableList
 import kotlinx.coroutines.flow.StateFlow
 
 interface BillingHelper {
     val purchaseProduct: StateFlow<PurchaseProduct?>
-    suspend fun getAvailableProducts(cashProducts: CashProduct): List<PieceProduct>
+    suspend fun getAvailableProducts(cashProducts: CashProduct): ImmutableList<PieceProduct>
     fun purchaseProduct(activity: Activity, purchaseProduct: PieceProduct)
-//    fun consumeProductList(purchaseProductList: List<PurchaseProduct>)
-    suspend fun getUnconsumedProductList() : List<PurchaseProduct>
 }

core/billing/src/main/java/com/puzzle/billing/model/PieceProduct.kt

@@ -14,21 +14,13 @@ data class NormalProduct(
     val description: String,
     val priceAmountMicros: Long,
     val currencyCode: String,
-    val isOnSale: Boolean,  // 서버에서 내려줘야 함
-    val originPrice: String,  // 서버에서 내려줘야 함
-    val salePercent: Int,  // 서버에서 내려줘야 함
+    val isOnSale: Boolean,
+    val originPrice: String,
+    val salePercent: Int
 ) : PieceProduct
 
 data class PromotionProduct(
     override val detail: ProductDetails,
     override val price: String,
-    val imageUrl : String,
-//    val eventName: String,  // 서버에서 내려줘야 함
-//    val eventDescription: String,  // 서버에서 내려줘야 함
-//    val priceAmountMicros: Long,
-//    val currencyCode: String,
-//    val originPrice: String,  // 서버에서 내려줘야 함
-//    val salePercent: Int,  // 서버에서 내려줘야 함
-//    val itemCount: Int,   // 서버에서 내려줘야 함
-//    val benefitDescription: String,  // 서버에서 내려줘야 함
+    val imageUrl : String
 ) : PieceProduct

core/data/src/main/java/com/puzzle/data/billing/BillingHelperImpl.kt

@@ -23,6 +23,8 @@ import com.puzzle.domain.model.payment.CashProduct
 import com.puzzle.domain.model.payment.Product
 import com.puzzle.domain.model.payment.PurchaseProduct
 import dagger.hilt.android.qualifiers.ApplicationContext
+import kotlinx.collections.immutable.ImmutableList
+import kotlinx.collections.immutable.toImmutableList
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.StateFlow
@@ -61,7 +63,7 @@ class BillingHelperImpl @Inject constructor(
         .enableAutoServiceReconnection()
         .build()
 
-    override suspend fun getAvailableProducts(cashProducts: CashProduct): List<PieceProduct> {
+    override suspend fun getAvailableProducts(cashProducts: CashProduct): ImmutableList<PieceProduct> {
         connectGooglePlayIfNeeded()
 
         val productList = cashProducts.products.map {
@@ -79,14 +81,19 @@ class BillingHelperImpl @Inject constructor(
         val products = result.productDetailsList ?: emptyList()
 
         // 3. 서버 상품과 Google Play 상품 매칭 후 변환
+        // PromotionProduct 먼저, NormalProduct 나중
         return products.mapNotNull { product ->
             val serverProduct = cashProducts.products.find { it.uuid == product.productId }
-            serverProduct?.let { product.toPieceProduct(it) }
+            serverProduct?.let {
+                convertToPieceProduct(
+                    productDetail = product,
+                    serverProduct = it
+                )
+            }
         }.let { list ->
-            // PromotionProduct와 NormalProduct 분리
             val (promotions, normals) = list.partition { it is PromotionProduct }
-            // Promotion 먼저 표시
-            promotions + normals
+            // ImmutableList로 변환
+            (promotions + normals).toImmutableList()
         }
     }
 
@@ -111,47 +118,6 @@ class BillingHelperImpl @Inject constructor(
         }
     }
 
-    //consume 은 서버단에서 진행
-//    override fun consumeProductList(purchaseProductList: List<PurchaseProduct>) {
-//        purchaseProductList.forEach { purchaseProduct ->
-//            val consumeParams = ConsumeParams.newBuilder()
-//                .setPurchaseToken(purchaseProduct.credential)
-//                .build()
-//
-//            billingClient.consumeAsync(consumeParams) { billingResult, _ ->
-//                if (billingResult.responseCode == BillingResponseCode.OK) {
-//                    _purchaseProduct.value = null
-//                }
-//            }
-//        }
-
-    // consume 되지 않은 상품 획득
-    override suspend fun getUnconsumedProductList(): List<PurchaseProduct> {
-        connectGooglePlayIfNeeded()
-
-        return suspendCancellableCoroutine { continuation ->
-            billingClient.queryPurchasesAsync(
-                QueryPurchasesParams.newBuilder()
-                    .setProductType(BillingClient.ProductType.INAPP)
-                    .build()
-            ) { result, purchases ->
-                if (result.responseCode == BillingResponseCode.OK) {
-                    val list = purchases
-                        .filter { !it.isAcknowledged }
-                        .map { purchase ->
-                            PurchaseProduct(
-                                uuid = purchase.products.firstOrNull().orEmpty(),
-                                credential = purchase.purchaseToken
-                            )
-                        }
-                    continuation.resume(list) { cause, _, _ -> }
-                } else {
-                    continuation.resume(emptyList()) { cause, _, _ -> }
-                }
-            }
-        }
-    }
-
     private suspend fun connectGooglePlayIfNeeded() = suspendCancellableCoroutine { continuation ->
         if (billingClient.isReady) {
             continuation.resume(Result.success(Unit))
@@ -168,17 +134,19 @@ class BillingHelperImpl @Inject constructor(
         })
     }
 
-    // 위치가 고민스럽네요..
-    private fun ProductDetails.toPieceProduct(serverProduct: Product): PieceProduct? {
-        val offer = this.oneTimePurchaseOfferDetails ?: return null
-        this.oneTimePurchaseOfferDetails?.formattedPrice
+    private fun convertToPieceProduct(
+        productDetail: ProductDetails,
+        serverProduct: Product
+    ): PieceProduct? {
+        val offer = productDetail.oneTimePurchaseOfferDetails ?: return null
+        productDetail.oneTimePurchaseOfferDetails?.formattedPrice
 
         when (serverProduct) {
             is Product.BasicCashProduct -> {
                 return NormalProduct(
-                    detail = this,
-                    name = this.name,
-                    description = this.description,
+                    detail = productDetail,
+                    name = productDetail.name,
+                    description = productDetail.description,
                     price = offer.formattedPrice,
                     currencyCode = offer.priceCurrencyCode,
                     priceAmountMicros = offer.priceAmountMicros,
@@ -190,7 +158,7 @@ class BillingHelperImpl @Inject constructor(
 
             is Product.PromotionProduct -> {
                 return PromotionProduct(
-                    detail = this,
+                    detail = productDetail,
                     price = offer.formattedPrice,
                     imageUrl = serverProduct.imageUrl
                 )

core/network/src/main/java/com/puzzle/network/interceptor/PieceInterceptor.kt

@@ -32,7 +32,6 @@ class PieceInterceptor @Inject constructor(
             "/api/terms" -> false
             "/api/valueTalks" -> false
             "/api/valuePicks" -> false
-//            "/api/cash-products" -> false
             else -> true
         }
     }

feature/store/build.gradle.kts

@@ -23,8 +23,8 @@ android {
 }
 
 dependencies {
-    implementation(libs.android.billingclient)
-
     implementation(projects.core.common)
-    api(projects.core.billing)
+    implementation(projects.core.billing)
+
+    implementation(libs.compose.material3.adaptive)
 }

feature/store/src/main/java/com/puzzle/store/StoreScreen.kt

@@ -35,7 +35,7 @@ import androidx.lifecycle.compose.collectAsStateWithLifecycle
 import com.puzzle.billing.model.NormalProduct
 import com.puzzle.billing.model.PieceProduct
 import com.puzzle.billing.model.PromotionProduct
-import com.puzzle.common.ui.AdaptiveLayout
+import com.puzzle.store.ui.AdaptiveLayout
 import com.puzzle.common.ui.clickable
 import com.puzzle.designsystem.R
 import com.puzzle.designsystem.component.PieceImage
@@ -45,6 +45,8 @@ import com.puzzle.store.contract.StoreIntent
 import com.puzzle.store.contract.StoreState
 import com.puzzle.store.ui.card.StoreCard
 import com.puzzle.store.ui.text.DescriptionText
+import kotlinx.collections.immutable.ImmutableList
+import kotlinx.collections.immutable.toImmutableList
 
 @Composable
 internal fun StoreRoute(viewModel: StoreViewModel = hiltViewModel()) {
@@ -125,7 +127,7 @@ private fun ExpandedStoreScreen(
 
         Row(modifier = Modifier.fillMaxSize()) {
             ProductList(
-                products = state.products.filterIsInstance<PromotionProduct>(),
+                products = state.products.filterIsInstance<PromotionProduct>().toImmutableList(),
                 onPurchaseClick = onPurchaseClick,
                 modifier = Modifier
                     .weight(1f)
@@ -138,7 +140,7 @@ private fun ExpandedStoreScreen(
                 .weight(1f)
                 .fillMaxHeight()) {
                 ProductList(
-                    products = state.products.filterIsInstance<NormalProduct>(),
+                    products = state.products.filterIsInstance<NormalProduct>().toImmutableList(),
                     onPurchaseClick = onPurchaseClick,
                 )
 
@@ -159,7 +161,7 @@ private fun StoreTopBar(
     modifier: Modifier = Modifier
 ) {
     PiecePuzzleTopBar(
-        count = count, // 이 값도 state로부터 받는 것을 고려해볼 수 있습니다.
+        count = count,
         chipColor = PieceTheme.colors.white,
         contentColor = PieceTheme.colors.black,
         isShowPlus = false,
@@ -179,7 +181,7 @@ private fun StoreTopBar(
 
 @Composable
 private fun ProductList(
-    products: List<PieceProduct>,
+    products: ImmutableList<PieceProduct>,
     onPurchaseClick: (PieceProduct) -> Unit,
     modifier: Modifier = Modifier
 ) {
@@ -190,7 +192,7 @@ private fun ProductList(
         verticalArrangement = Arrangement.spacedBy(12.dp),
         modifier = modifier
     ) {
-        items(products, key = { it.detail.productId }) { product ->
+        items(products) { product ->
             when (product) {
                 is PromotionProduct -> PieceImage(
                     model = product.imageUrl,

feature/store/src/main/java/com/puzzle/store/StoreViewModel.kt

@@ -1,6 +1,5 @@
 package com.puzzle.store
 
-import android.content.ContentValues.TAG
 import android.util.Log
 import androidx.lifecycle.viewModelScope
 import com.puzzle.billing.BillingHelper
@@ -29,9 +28,8 @@ class StoreViewModel @Inject constructor(
 
     init {
         viewModelScope.launch {
-            processUnConsumedProducts()
-            getAvailableProducts()
             collectPurchaseProducts()
+            getAvailableProducts()
         }
     }
 
@@ -56,18 +54,16 @@ class StoreViewModel @Inject constructor(
         }
     }
 
-    private fun collectPurchaseProducts() {
-        viewModelScope.launch {
-            billingHelper.purchaseProduct.collectLatest { product ->
-                if (product != null) {
-                    suspendRunCatching {
-                        paymentRepository.purchaseProduct(product)
-                    }.onSuccess {
-                        Log.d([email protected], "purchaseProduct api success")
-                    }.onFailure {
-                        Log.e([email protected], "purchaseProduct api fail")
-                        errorHelper.sendError(it)
-                    }
+    private suspend fun collectPurchaseProducts() {
+        billingHelper.purchaseProduct.collectLatest { product ->
+            if (product != null) {
+                suspendRunCatching {
+                    paymentRepository.purchaseProduct(product)
+                }.onSuccess {
+                    Log.d([email protected], "purchaseProduct api success")
+                }.onFailure {
+                    Log.e([email protected], "purchaseProduct api fail")
+                    errorHelper.sendError(it)
                 }
             }
         }
@@ -76,30 +72,12 @@ class StoreViewModel @Inject constructor(
     private suspend fun getAvailableProducts() {
         suspendRunCatching {
             val availableProducts = paymentRepository.getAvailableProduct()
-            Log.d("test", "viewModel : $availableProducts")
             billingHelper.getAvailableProducts(availableProducts)
         }.onSuccess { products ->
             setState { copy(products = products) }
         }.onFailure {
             errorHelper.sendError(it)
         }
     }
-
-    // consume 되지 않은 상품 처리
-    private suspend fun processUnConsumedProducts() {
-        val unConsumedProducts = billingHelper.getUnconsumedProductList()
-
-        if (unConsumedProducts.isNotEmpty()) {
-            suspendRunCatching {
-                // paymentRepository.purchaseProductList(unConsumedProducts) 로 변경 예정
-                paymentRepository.purchaseProduct(unConsumedProducts.first())
-            }.onSuccess {
-                Log.d([email protected], "purchaseProduct api success")
-            }.onFailure {
-                Log.e([email protected], "purchaseProduct api fail")
-                errorHelper.sendError(it)
-            }
-        }
-    }
 }
 

feature/store/src/main/java/com/puzzle/store/contract/StoreState.kt

@@ -2,7 +2,9 @@ package com.puzzle.store.contract
 
 import com.puzzle.common.base.UiState
 import com.puzzle.billing.model.PieceProduct
+import kotlinx.collections.immutable.ImmutableList
+import kotlinx.collections.immutable.persistentListOf
 
 data class StoreState(
-    val products: List<PieceProduct> = emptyList(),
+    val products: ImmutableList<PieceProduct> = persistentListOf(),
 ) : UiState

core/common-ui/src/main/java/com/puzzle/common/ui/AdaptiveLayout.kt → feature/store/src/main/java/com/puzzle/store/ui/AdaptiveLayout.kt

@@ -1,4 +1,4 @@
-package com.puzzle.common.ui
+package com.puzzle.store.ui
 
 import androidx.compose.material3.adaptive.currentWindowAdaptiveInfo
 import androidx.compose.runtime.Composable