[PC-1331] 결제 모듈 리팩토링 (#168)

* [PC-1331] 파일 구조 변경 및 함수명 수정

* [PC-1331] BillingHelper 뷰모델 scope로 변경

* [PC-1331] billinHelper 안에 paymentRepository 주입. StoreViewModel 까지 수정.

* [PC-1331] core/data 모듈의 billingclient 의존성 제거

* [PC-1331] API 호출에 대한 책임을 viewModel로 변경

* [PC-1331] 패키지 구조 변경 및 gradle 세팅 수정

Author: kkh725

core/billing/build.gradle.kts

@@ -10,6 +10,7 @@ android {
 dependencies {
     implementation(projects.core.common)
     implementation(projects.core.domain)
+    implementation(projects.core.network)
 
     implementation(libs.android.billingclient)
 }

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

@@ -1,41 +1,47 @@
-package com.puzzle.data.billing
+package com.puzzle.billing.data
 
 import android.app.Activity
 import android.content.Context
 import android.util.Log
 import com.android.billingclient.api.BillingClient
-import com.android.billingclient.api.BillingClient.BillingResponseCode
 import com.android.billingclient.api.BillingClientStateListener
 import com.android.billingclient.api.BillingFlowParams
 import com.android.billingclient.api.BillingResult
-import com.android.billingclient.api.ConsumeParams
 import com.android.billingclient.api.PendingPurchasesParams
 import com.android.billingclient.api.ProductDetails
 import com.android.billingclient.api.PurchasesUpdatedListener
 import com.android.billingclient.api.QueryProductDetailsParams
-import com.android.billingclient.api.QueryPurchasesParams
 import com.android.billingclient.api.queryProductDetails
-import com.puzzle.billing.BillingHelper
+import com.puzzle.billing.domain.BillingHelper
+import com.puzzle.billing.domain.PaymentRepository
 import com.puzzle.billing.model.NormalProduct
 import com.puzzle.billing.model.PieceProduct
 import com.puzzle.billing.model.PromotionProduct
+import com.puzzle.common.suspendRunCatching
+import com.puzzle.domain.model.error.ErrorHelper
 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 dagger.hilt.android.scopes.ViewModelScoped
 import kotlinx.collections.immutable.ImmutableList
+import kotlinx.collections.immutable.persistentListOf
 import kotlinx.collections.immutable.toImmutableList
+import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.SupervisorJob
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.StateFlow
 import kotlinx.coroutines.flow.asStateFlow
+import kotlinx.coroutines.launch
 import kotlinx.coroutines.suspendCancellableCoroutine
 import kotlinx.coroutines.withContext
 import javax.inject.Inject
 import kotlin.coroutines.resume
 import kotlin.coroutines.resumeWithException
 
 class BillingHelperImpl @Inject constructor(
+    private val paymentRepository: PaymentRepository,
     @ApplicationContext context: Context,
 ) : BillingHelper {
     private val _purchaseProduct = MutableStateFlow<PurchaseProduct?>(null)
@@ -44,7 +50,7 @@ class BillingHelperImpl @Inject constructor(
     private val purchasesUpdatedListener = PurchasesUpdatedListener { result, purchases ->
         Log.d("purchasesUpdateListener", "$result $purchases")
 
-        if (result.responseCode == BillingResponseCode.OK && !purchases.isNullOrEmpty()) {
+        if (result.responseCode == BillingClient.BillingResponseCode.OK && !purchases.isNullOrEmpty()) {
             purchases.forEach { purchase ->
                 val token = purchase.purchaseToken
                 val uuid = purchase.products.firstOrNull() ?: return@forEach
@@ -63,7 +69,9 @@ class BillingHelperImpl @Inject constructor(
         .enableAutoServiceReconnection()
         .build()
 
-    override suspend fun getAvailableProducts(cashProducts: CashProduct): ImmutableList<PieceProduct> {
+    override suspend fun getAvailableProducts(): CashProduct = paymentRepository.getAvailableProduct()
+
+    override suspend fun processAvailableProducts(cashProducts: CashProduct): ImmutableList<PieceProduct> {
         connectGooglePlayIfNeeded()
 
         val productList = cashProducts.products.map {
@@ -108,11 +116,14 @@ class BillingHelperImpl @Inject constructor(
 
         val billingResult = billingClient.launchBillingFlow(activity, billingFlowParams)
 
-        if (billingResult.responseCode != BillingResponseCode.OK) {
+        if (billingResult.responseCode != BillingClient.BillingResponseCode.OK) {
             Log.e("Billing", "Purchase failed: ${billingResult.debugMessage}")
         }
     }
 
+    override suspend fun verifyPurchaseProduct(purchaseProduct: PurchaseProduct) =
+        paymentRepository.verifyPurchaseProduct(purchaseProduct)
+
     private suspend fun connectGooglePlayIfNeeded() = suspendCancellableCoroutine { continuation ->
         if (billingClient.isReady) {
             continuation.resume(Result.success(Unit))
@@ -121,7 +132,9 @@ class BillingHelperImpl @Inject constructor(
 
         billingClient.startConnection(object : BillingClientStateListener {
             override fun onBillingSetupFinished(result: BillingResult) {
-                if (result.responseCode == BillingResponseCode.OK) continuation.resume(Unit)
+                if (result.responseCode == BillingClient.BillingResponseCode.OK) continuation.resume(
+                    Unit
+                )
                 else continuation.resumeWithException(Exception("Billing setup failed: ${result.debugMessage}"))
             }
 
@@ -160,4 +173,5 @@ class BillingHelperImpl @Inject constructor(
             }
         }
     }
-}
+
+}

core/data/src/main/java/com/puzzle/data/repository/PaymentRepositoryImpl.kt renamed to core/billing/src/main/java/com/puzzle/billing/data/PaymentRepositoryImpl.kt

@@ -1,8 +1,8 @@
-package com.puzzle.data.repository
+package com.puzzle.billing.data
 
+import com.puzzle.billing.domain.PaymentRepository
 import com.puzzle.domain.model.payment.CashProduct
 import com.puzzle.domain.model.payment.PurchaseProduct
-import com.puzzle.domain.repository.PaymentRepository
 import com.puzzle.network.source.payment.PaymentDataSource
 import javax.inject.Inject
 
@@ -12,6 +12,6 @@ class PaymentRepositoryImpl @Inject constructor(
     override suspend fun getAvailableProduct(): CashProduct =
         paymentDataSource.getAvailableProduct().toDomain()
 
-    override suspend fun purchaseProduct(purchaseProduct: PurchaseProduct) =
-        paymentDataSource.purchaseProduct(purchaseProduct)
-}
+    override suspend fun verifyPurchaseProduct(purchaseProduct: PurchaseProduct) =
+        paymentDataSource.verifyPurchaseProduct(purchaseProduct)
+}

core/billing/src/main/java/com/puzzle/billing/BillingHelper.kt renamed to core/billing/src/main/java/com/puzzle/billing/domain/BillingHelper.kt

@@ -1,4 +1,4 @@
-package com.puzzle.billing
+package com.puzzle.billing.domain
 
 import android.app.Activity
 import com.puzzle.billing.model.PieceProduct
@@ -9,6 +9,8 @@ import kotlinx.coroutines.flow.StateFlow
 
 interface BillingHelper {
     val purchaseProduct: StateFlow<PurchaseProduct?>
-    suspend fun getAvailableProducts(cashProducts: CashProduct): ImmutableList<PieceProduct>
+    suspend fun getAvailableProducts(): CashProduct
+    suspend fun processAvailableProducts(cashProducts: CashProduct): ImmutableList<PieceProduct>
     fun purchaseProduct(activity: Activity, purchaseProduct: PieceProduct)
-}
+    suspend fun verifyPurchaseProduct(purchaseProduct: PurchaseProduct)
+}

core/domain/src/main/java/com/puzzle/domain/repository/PaymentRepository.kt renamed to core/billing/src/main/java/com/puzzle/billing/domain/PaymentRepository.kt

@@ -1,9 +1,9 @@
-package com.puzzle.domain.repository
+package com.puzzle.billing.domain
 
 import com.puzzle.domain.model.payment.CashProduct
 import com.puzzle.domain.model.payment.PurchaseProduct
 
 interface PaymentRepository {
     suspend fun getAvailableProduct(): CashProduct
-    suspend fun purchaseProduct(purchaseProduct: PurchaseProduct)
-}
+    suspend fun verifyPurchaseProduct(purchaseProduct: PurchaseProduct)
+}

core/data/build.gradle.kts

@@ -15,5 +15,4 @@ dependencies {
     implementation(projects.core.billing)
 
     implementation(libs.androidx.exifinterface)
-    implementation(libs.android.billingclient)
 }

core/data/src/main/java/com/puzzle/data/di/DataModule.kt

@@ -1,15 +1,15 @@
 package com.puzzle.data.di
 
-import com.puzzle.billing.BillingHelper
-import com.puzzle.data.billing.BillingHelperImpl
+import com.puzzle.billing.domain.BillingHelper
+import com.puzzle.billing.data.BillingHelperImpl
 import com.puzzle.data.image.ImageResizeProcessor
 import com.puzzle.data.image.ImageResizeProcessorImpl
 import com.puzzle.data.repository.AuthRepositoryImpl
 import com.puzzle.data.repository.ConfigureRepositoryImpl
 import com.puzzle.data.repository.ErrorRepositoryImpl
 import com.puzzle.data.repository.MatchingRepositoryImpl
 import com.puzzle.data.repository.NotificationRepositoryImpl
-import com.puzzle.data.repository.PaymentRepositoryImpl
+import com.puzzle.billing.data.PaymentRepositoryImpl
 import com.puzzle.data.repository.ProfileRepositoryImpl
 import com.puzzle.data.repository.TermsRepositoryImpl
 import com.puzzle.data.repository.TokenManagerImpl
@@ -19,14 +19,16 @@ import com.puzzle.domain.repository.ConfigureRepository
 import com.puzzle.domain.repository.ErrorRepository
 import com.puzzle.domain.repository.MatchingRepository
 import com.puzzle.domain.repository.NotificationRepository
-import com.puzzle.domain.repository.PaymentRepository
+import com.puzzle.billing.domain.PaymentRepository
 import com.puzzle.domain.repository.ProfileRepository
 import com.puzzle.domain.repository.TermsRepository
 import com.puzzle.domain.repository.UserRepository
 import com.puzzle.network.interceptor.TokenManager
 import dagger.Binds
 import dagger.Module
 import dagger.hilt.InstallIn
+import dagger.hilt.android.components.ViewModelComponent
+import dagger.hilt.android.scopes.ViewModelScoped
 import dagger.hilt.components.SingletonComponent
 import javax.inject.Singleton
 
@@ -99,9 +101,14 @@ abstract class DataModule {
     abstract fun bindTokenManager(
         tokenManagerImpl: TokenManagerImpl,
     ): TokenManager
+}
+
+@Module
+@InstallIn(ViewModelComponent::class)
+abstract class BillingModule {
 
     @Binds
-    @Singleton
+    @ViewModelScoped
     abstract fun bindBillingHelper(
         billingHelperImpl: BillingHelperImpl
     ): BillingHelper

core/network/build.gradle.kts

@@ -56,5 +56,4 @@ dependencies {
     implementation(libs.okhttp.logging)
     implementation(libs.firebase.config)
     implementation(libs.firebase.messaging)
-    implementation(libs.android.billingclient)
 }

core/network/src/main/java/com/puzzle/network/source/payment/PaymentDataSource.kt

@@ -5,5 +5,5 @@ import com.puzzle.network.model.payment.GetAvailableProductResponse
 
 interface PaymentDataSource {
     suspend fun getAvailableProduct(): GetAvailableProductResponse
-    suspend fun purchaseProduct(purchaseProduct: PurchaseProduct)
+    suspend fun verifyPurchaseProduct(purchaseProduct: PurchaseProduct)
 }

core/network/src/main/java/com/puzzle/network/source/payment/PaymentDataSourceImpl.kt

@@ -13,6 +13,6 @@ class PaymentDataSourceImpl @Inject constructor(
     override suspend fun getAvailableProduct(): GetAvailableProductResponse =
         pieceApi.getAvailableProduct().unwrapData()
 
-    override suspend fun purchaseProduct(purchaseProduct: PurchaseProduct) =
+    override suspend fun verifyPurchaseProduct(purchaseProduct: PurchaseProduct) =
         pieceApi.verifyPurchaseProduct(purchaseProduct.toDto()).unwrapData()
 }