[PC-1355] 결제 성공 후 완료 모달 구현 (#170)

* [PC-1355] 스토어 이동 시 BillingClient 중복 생성 방지

BillingHelper를 ViewModelScoped로 변경하여 Store 이동 시 BillingClient 중복 생성과 결제 중복 문제 해결

* [PC-1355] 일회성 결제 로직에 인정 및 소비 처리 추가

- INAPP 일회성 결제 상품 처리 로직 추가
- 결제 완료 후 상품을 먼저 인정(acknowledge)하고 소비(consume)하도록 수정
- 중복 토큰 처리 방지

* [PC-1355] 결제 성공 후 완료 모달 구현

- 현재 구매 성공 후 모달 구현
- /api/payments/in-app << api 실패
- 구매한 퍼즐 개수를 모름 << 알아낼 방법 회의 필요

* Revert "[PC-1355] 일회성 결제 로직에 인정 및 소비 처리 추가"

This reverts commit 8568c15.

* [PC-1355] 결제 성공 모달 인자(구매한 퍼즐의 수) 추가

* [PC-1355] 오타 수정

* [PC-1355] BillingClient 생성 및 해제 시점에 로그

* [PC-1355] purchasedPuzzleCount를 ViewModel state로 관리하도록 변경

* [PC-1355] 오타 수정

* [PC-1355] 구매 검증 API 응답에 rewardPuzzleCount 추가 및 모달에 표시

* [PC-1355] 현재 퍼즐 수 업데이트 로직 위치 변경

* [PC-1355] 현재 유저의 퍼즐 조회 API 세팅

* [PC-1355] store 화면 진입 시 현재 유저의 퍼즐 조회

* [PC-1355] 결제 검증 성공 시 서버에서 최신 퍼즐 개수 재조회하도록 수정

* [PC-1355] FakeUserDataSource에서 getUserPuzzle 미구현으로 인한 CI 실패 수정

* [PC-1355] FakeUserRepository에서 getUserPuzzle 미구현으로 인한 CI 실패 수정

* [PC-1355] FakeUserRepository에 setUserPuzzle 추가

* [PC-1355] 하드코딩된 문자열을 리소스로 분리

* [PC-1355] 테스트 끝난 로직 로그 제거

* [PC-1355] 뷰모델 init에서 getUserPuzzle이 병렬로 처리되도록 변경

* [PC-1355] StoreLoadingScreen 구현

* [PC-1355] Store 화면 관련 파일 구조 정리

* [PC-1355] Store 로딩 화면 Compact, Expanded 구분

* [PC-1355} StoreLoading 애니메이션 로직 변경

* [PC-1355] 구매 성공 모달 테스트 코드 작성

* [PC-1355] StoreLoading 로직 추가

* [PC-1355] 프로퍼티 명 변경 (puzzleCount -> count)

* [PC-1355] async -> launch 변경

* [PC-1355] 컴포넌트 Preview 작성

* [PC-1355] Store 설명 문자열 리소스로 분리

* [PC-1355] 스켈레톤 애니메이션 로직 분리

* [PC-1355] 반환값 List -> ImmutableList

Author: comst19

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

@@ -17,23 +17,16 @@ 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
@@ -67,7 +60,9 @@ class BillingHelperImpl @Inject constructor(
         .setListener(purchasesUpdatedListener)
         .enablePendingPurchases(pendingPurchasesParams)
         .enableAutoServiceReconnection()
-        .build()
+        .build().also{
+            Log.d("BillingClient", "BillingClient created")
+        }
 
     override suspend fun getAvailableProducts(): CashProduct = paymentRepository.getAvailableProduct()
 
@@ -174,4 +169,13 @@ class BillingHelperImpl @Inject constructor(
         }
     }
 
+    override fun release() {
+        if (billingClient.isReady) {
+            Log.d("BillingClient", "BillingClient connection closing...")
+            billingClient.endConnection()
+        } else {
+            Log.d("BillingClient", "BillingClient release called, but it wasn't ready")
+        }
+    }
+
 }

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

@@ -13,5 +13,5 @@ class PaymentRepositoryImpl @Inject constructor(
         paymentDataSource.getAvailableProduct().toDomain()
 
     override suspend fun verifyPurchaseProduct(purchaseProduct: PurchaseProduct) =
-        paymentDataSource.verifyPurchaseProduct(purchaseProduct)
+        paymentDataSource.verifyPurchaseProduct(purchaseProduct).toDomain()
 }

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

@@ -4,6 +4,7 @@ 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 com.puzzle.domain.model.payment.VerifyPurchaseProduct
 import kotlinx.collections.immutable.ImmutableList
 import kotlinx.coroutines.flow.StateFlow
 
@@ -12,5 +13,6 @@ interface BillingHelper {
     suspend fun getAvailableProducts(): CashProduct
     suspend fun processAvailableProducts(cashProducts: CashProduct): ImmutableList<PieceProduct>
     fun purchaseProduct(activity: Activity, purchaseProduct: PieceProduct)
-    suspend fun verifyPurchaseProduct(purchaseProduct: PurchaseProduct)
+    suspend fun verifyPurchaseProduct(purchaseProduct: PurchaseProduct): VerifyPurchaseProduct
+    fun release()
 }

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

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

core/data/src/main/java/com/puzzle/data/repository/UserRepositoryImpl.kt

@@ -4,6 +4,7 @@ import com.puzzle.datastore.datasource.token.LocalTokenDataSource
 import com.puzzle.datastore.datasource.user.LocalUserDataSource
 import com.puzzle.domain.model.user.RejectReason
 import com.puzzle.domain.model.user.UserInfo
+import com.puzzle.domain.model.user.UserPuzzle
 import com.puzzle.domain.model.user.UserRole
 import com.puzzle.domain.model.user.UserSetting
 import com.puzzle.domain.repository.UserRepository
@@ -55,6 +56,9 @@ class UserRepositoryImpl @Inject constructor(
         return response.toDomain()
     }
 
+    override suspend fun getUserPuzzle(): UserPuzzle =
+        userDataSource.getUserPuzzle().toDomain()
+
     override suspend fun updatePushNotification(toggle: Boolean) =
         userDataSource.updatePushNotification(toggle)
 

core/data/src/test/java/com/puzzle/data/source/user/FakeUserDataSource.kt

@@ -4,6 +4,7 @@ import com.puzzle.network.model.user.GetBlockSyncTimeResponse
 import com.puzzle.network.model.user.GetRejectReasonResponse
 import com.puzzle.network.model.user.GetSettingInfoResponse
 import com.puzzle.network.model.user.GetUserInfoResponse
+import com.puzzle.network.model.user.GetUserPuzzleResponse
 import com.puzzle.network.source.user.UserDataSource
 
 class FakeUserDataSource : UserDataSource {
@@ -14,6 +15,8 @@ class FakeUserDataSource : UserDataSource {
     }
 
     override suspend fun getUserInfo(): GetUserInfoResponse = userInfoResponse
+    override suspend fun getUserPuzzle(): GetUserPuzzleResponse = throw NotImplementedError()
+
     override suspend fun getBlockSyncTime(): GetBlockSyncTimeResponse = throw NotImplementedError()
     override suspend fun getSettingsInfo(): GetSettingInfoResponse = throw NotImplementedError()
     override suspend fun getRejectReason(): GetRejectReasonResponse = throw NotImplementedError()

core/designsystem/src/main/res/values/strings.xml

@@ -278,4 +278,14 @@
     <string name="alarm_matching_accepted_content">당신을 기다리는 조각이 있어요🧩\n마음이 닿으면 응답해보세요💕</string>
     <string name="alarm_matching_success_title">퍼즐이 완성되었어요🎉</string>
     <string name="alarm_matching_success_content">OOO님과 연락처가 공개되었어요.\n대화를 시작해보세요!</string>
+
+    <!--Store-->
+    <string name="store_purchase_success_dialog_title">퍼즐 %1$s개를 구매했어요.</string>
+    <string name="store_purchase_success_dialog_subtext">지금 바로 새로운 인연을 만나보세요!</string>
+    <string name="store_purchase_success_dialog_btn_label">홈으로</string>
+    <string name="store_description_1">구매한 퍼즐은 새로운 매칭 조각 열기, 연락처 확인하기, 사진 보기, 매칭 수락하기 등에 사용할 수 있습니다.</string>
+    <string name="store_description_2">사용하지 않은 퍼즐에 한해, 구매일로부터 7일 이내 청약 철회가 가능합니다.</string>
+    <string name="store_description_3">결제에 문제가 있으신 경우, </string>
+    <string name="store_description_4">고객센터</string>
+    <string name="store_description_5">로 문의 주세요.</string>
 </resources>

core/domain/src/main/java/com/puzzle/domain/model/payment/VerifyPurchaseProduct.kt

@@ -0,0 +1,5 @@
+package com.puzzle.domain.model.payment
+
+data class VerifyPurchaseProduct (
+    val rewardPuzzleCount: Int
+)

core/domain/src/main/java/com/puzzle/domain/model/user/UserPuzzle.kt

@@ -0,0 +1,5 @@
+package com.puzzle.domain.model.user
+
+data class UserPuzzle (
+    val count: Int
+)

core/domain/src/main/java/com/puzzle/domain/repository/UserRepository.kt

@@ -2,6 +2,7 @@ package com.puzzle.domain.repository
 
 import com.puzzle.domain.model.user.RejectReason
 import com.puzzle.domain.model.user.UserInfo
+import com.puzzle.domain.model.user.UserPuzzle
 import com.puzzle.domain.model.user.UserRole
 import com.puzzle.domain.model.user.UserSetting
 import kotlinx.coroutines.flow.Flow
@@ -13,6 +14,7 @@ interface UserRepository {
     suspend fun getUserSettingInfo(): UserSetting
     suspend fun getBlockSyncTime(): LocalDateTime
     suspend fun getUserInfo(): UserInfo
+    suspend fun getUserPuzzle(): UserPuzzle
     suspend fun updatePushNotification(toggle: Boolean)
     suspend fun updateBlockAcquaintances(toggle: Boolean)
 }