Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -2,21 +2,43 @@ package com.revenuecat.purchases.hybridcommon.mappers

import com.revenuecat.purchases.SubscriptionInfo

fun SubscriptionInfo.map(): Map<String, Any?> =
mapOf(
fun SubscriptionInfo.map(): Map<String, Any?> {
var priceObject: Map<String, Any>? = null
price?.let {
priceObject = mapOf(
"currency" to it.currencyCode,
"amount" to (it.amountMicros.toDouble() / 1_000_000.0),
"formatted" to it.formatted,
)
}

return mapOf(
"productIdentifier" to productIdentifier,
"purchaseDate" to purchaseDate.toIso8601(),
"purchaseDateMillis" to purchaseDate.toMillis(),
"originalPurchaseDate" to originalPurchaseDate?.toIso8601(),
"originalPurchaseDateMillis" to originalPurchaseDate?.toMillis(),
"expiresDate" to expiresDate?.toIso8601(),
"expiresDateMillis" to expiresDate?.toMillis(),
"store" to store.name,
"unsubscribeDetectedAt" to unsubscribeDetectedAt?.toIso8601(),
"unsubscribeDetectedAtMillis" to unsubscribeDetectedAt?.toMillis(),
"isSandbox" to isSandbox,
"billingIssuesDetectedAt" to billingIssuesDetectedAt?.toIso8601(),
"billingIssuesDetectedAtMillis" to billingIssuesDetectedAt?.toMillis(),
"gracePeriodExpiresDate" to gracePeriodExpiresDate?.toIso8601(),
"gracePeriodExpiresDateMillis" to gracePeriodExpiresDate?.toMillis(),
"ownershipType" to ownershipType.name,
"periodType" to periodType.name,
"refundedAt" to refundedAt?.toIso8601(),
"refundedAtMillis" to refundedAt?.toMillis(),
"storeTransactionId" to storeTransactionId,
"autoResumeDate" to autoResumeDate?.toIso8601(),
"autoResumeDateMillis" to autoResumeDate?.toMillis(),
"price" to priceObject,
"productPlanIdentifier" to productPlanIdentifier,
"managementURL" to managementURL?.toString(),
"isActive" to isActive,
"willRenew" to willRenew,
)
}
Original file line number Diff line number Diff line change
Expand Up @@ -14,23 +14,45 @@ internal extension SubscriptionInfo {
var dictionary: [String: Any] {
var priceObject: [String: Any]? = nil
if let priceCurrency = price?.currency, let priceAmount = price?.amount {
priceObject = ["currency": priceCurrency, "amount": priceAmount]
let formatter = NumberFormatter()
formatter.numberStyle = .currency
formatter.locale = .autoupdatingCurrent
formatter.currencyCode = priceCurrency
let formattedPrice = formatter.string(from: NSDecimalNumber(decimal: Decimal(priceAmount))) ?? "\(priceAmount) \(priceCurrency)"

priceObject = [
"currency": priceCurrency,
"amount": priceAmount,
"formatted": formattedPrice
]
}

return [
"productIdentifier": productIdentifier,
"purchaseDate": purchaseDate.rc_formattedAsISO8601(),
"purchaseDateMillis": purchaseDate.rc_millisecondsSince1970AsDouble(),
"originalPurchaseDate": originalPurchaseDate?.rc_formattedAsISO8601() ?? NSNull(),
"originalPurchaseDateMillis": originalPurchaseDate?.rc_millisecondsSince1970AsDouble() ?? NSNull(),
"expiresDate": expiresDate?.rc_formattedAsISO8601() ?? NSNull(),
"expiresDateMillis": expiresDate?.rc_millisecondsSince1970AsDouble() ?? NSNull(),
"store": store.storeString,
"isSandbox": isSandbox,
"unsubscribeDetectedAt": unsubscribeDetectedAt?.rc_formattedAsISO8601() ?? NSNull(),
"unsubscribeDetectedAtMillis": unsubscribeDetectedAt?.rc_millisecondsSince1970AsDouble() ?? NSNull(),
"billingIssuesDetectedAt": billingIssuesDetectedAt?.rc_formattedAsISO8601() ?? NSNull(),
"billingIssuesDetectedAtMillis": billingIssuesDetectedAt?.rc_millisecondsSince1970AsDouble() ?? NSNull(),
"gracePeriodExpiresDate": gracePeriodExpiresDate?.rc_formattedAsISO8601() ?? NSNull(),
"gracePeriodExpiresDateMillis": gracePeriodExpiresDate?.rc_millisecondsSince1970AsDouble() ?? NSNull(),
"ownershipType": ownershipType.ownershipTypeString,
"periodType": periodType.periodTypeString,
"refundedAt": refundedAt?.rc_formattedAsISO8601() ?? NSNull(),
"refundedAtMillis": refundedAt?.rc_millisecondsSince1970AsDouble() ?? NSNull(),
"storeTransactionId": storeTransactionId ?? NSNull(),
"autoResumeDate": NSNull(),
"autoResumeDateMillis": NSNull(),
"productPlanIdentifier": NSNull(),
"price": priceObject ?? NSNull(),
"managementURL": managementURL?.absoluteString ?? NSNull(),
"isActive": isActive,
"willRenew": willRenew,
]
Expand Down