fix(services/flipcash): update IapMetadata to use CurrencyCode; normalize at API level

Signed-off-by: Brandon McAnsh <git@bmcreations.dev>

Author: bmc08gt

services/flipcash/src/main/kotlin/com/flipcash/services/billing/BillingClient.kt

@@ -21,14 +21,18 @@ class IapPaymentError(val code: Int, override val message: String): Throwable(me
     constructor(result: BillingResult): this(result.responseCode, result.debugMessage)
 }
 
+data class ProductPrice(
+    val amount: Double,
+    val currency: String
+)
 interface BillingClient {
     val eventFlow: SharedFlow<IapPaymentEvent>
     val state: StateFlow<BillingClientState>
 
     fun connect()
     fun disconnect()
     fun hasPaidFor(product: IapProduct): Boolean
-    fun costOf(product: IapProduct): String
+    fun costOf(product: IapProduct): ProductPrice?
     suspend fun purchase(activity: Activity, product: IapProduct)
 }
 
@@ -47,7 +51,7 @@ object StubBillingClient: BillingClient {
     override fun connect() = Unit
     override fun disconnect() = Unit
     override fun hasPaidFor(product: IapProduct): Boolean = false
-    override fun costOf(product: IapProduct): String = "NOT_DEFINED"
+    override fun costOf(product: IapProduct): ProductPrice? = null
     override suspend fun purchase(activity: Activity, product: IapProduct) {
         delay(1.seconds)
         _eventFlow.emit(IapPaymentEvent.OnSuccess(product.productId))

services/flipcash/src/main/kotlin/com/flipcash/services/internal/billing/GooglePlayBillingClient.kt

@@ -25,10 +25,12 @@ import com.flipcash.services.billing.BillingClientState
 import com.flipcash.services.billing.IapPaymentError
 import com.flipcash.services.billing.IapPaymentEvent
 import com.flipcash.services.billing.IapProduct
+import com.flipcash.services.billing.ProductPrice
 import com.flipcash.services.internal.model.billing.IapMetadata
 import com.flipcash.services.internal.model.billing.Receipt
 import com.flipcash.services.repository.PurchaseRepository
 import com.flipcash.services.user.UserManager
+import com.getcode.opencode.model.financial.CurrencyCode
 import com.getcode.utils.TraceType
 import com.getcode.utils.trace
 import com.google.common.collect.ImmutableList
@@ -113,7 +115,7 @@ internal class GooglePlayBillingClient(
     override fun hasPaidFor(product: IapProduct) =
         purchases[product.productId] == PurchaseState.PURCHASED
 
-    override fun costOf(product: IapProduct): String {
+    override fun costOf(product: IapProduct): ProductPrice? {
         printLog("checking cost of ${product.productId} in ${productDetails.entries}")
         var details = productDetails[product.productId]
         if (details == null) {
@@ -130,10 +132,15 @@ internal class GooglePlayBillingClient(
                     )
                 )
             }
-            return "     "
+            return null
         }
 
-        return details.oneTimePurchaseOfferDetails?.formattedPrice ?: "     "
+        return details.oneTimePurchaseOfferDetails?.let {
+            ProductPrice(
+                amount = it.priceAmountMicros / 1_000_000.0,
+                currency = it.priceCurrencyCode
+            )
+        }
     }
 
     override suspend fun purchase(activity: Activity, product: IapProduct) {
@@ -173,21 +180,26 @@ internal class GooglePlayBillingClient(
                 printLog("onPurchaseComplete for ${item.purchaseToken}")
 
                 val details = productDetails[item.products.first()]
+                val product = item.products.first()
+                val receipt = Receipt(item.purchaseToken)
                 val price = details?.oneTimePurchaseOfferDetails?.priceAmountMicros
                     ?.let { priceMicros -> priceMicros / 1_000_000.0 } ?: 0.0
-                val currency = details?.oneTimePurchaseOfferDetails?.priceCurrencyCode ?: "USD"
+                val currencyCode = CurrencyCode.tryValueOf(details?.oneTimePurchaseOfferDetails?.priceCurrencyCode) ?: CurrencyCode.USD
+
+                printLog("product=$product, $receipt=$receipt, price=$price, currency=${currencyCode.name}")
 
                 purchaseRepository.onPurchaseCompleted(
                     owner = userManager.accountCluster?.authority?.keyPair!!,
-                    receipt = Receipt(item.purchaseToken),
+                    receipt = receipt,
                     metadata = IapMetadata(
-                        product = item.products.first(),
+                        product = product,
                         amount = price,
-                        currency = currency
+                        currency = currencyCode
                     )
                 ).onSuccess {
                     acknowledgeOrConsume(item)
                 }.onFailure {
+                    it.printStackTrace()
                     _eventFlow.emit(
                         IapPaymentEvent.OnError(
                             item.products.firstOrNull() ?: "NONE",

services/flipcash/src/main/kotlin/com/flipcash/services/internal/model/billing/IapMetadata.kt

@@ -1,11 +1,13 @@
 package com.flipcash.services.internal.model.billing
 
+import com.getcode.opencode.model.financial.CurrencyCode
+
 /**
  * Additional IAP metadata, which can be trusted given a verified receipt (they can
  * only be generated by production-signed apps).
  */
 data class IapMetadata(
     val product: String,
-    val currency: String,
+    val currency: CurrencyCode,
     val amount: Double,
 )

services/flipcash/src/main/kotlin/com/flipcash/services/internal/network/api/PurchaseApi.kt

@@ -32,7 +32,7 @@ class PurchaseApi @Inject constructor(
             .setReceipt(IapService.Receipt.newBuilder().setValue(receiptValue))
             .setMetadata(IapService.Metadata.newBuilder()
                 .setProduct(metadata.product)
-                .setCurrency(metadata.currency)
+                .setCurrency(metadata.currency.name.lowercase())
                 .setAmount(metadata.amount)
             )
             .apply { setAuth(authenticate(owner)) }