Skip to content

Commit

Permalink
Product serialization: fixed snake_case and camelCase serialization i…
Browse files Browse the repository at this point in the history 
…nconsistency (#187)

Pointed out by RevenueCat/react-native-purchases#388
Using the major release in all the hybrids to fix this.
  • Loading branch information
@NachoSoto
NachoSoto authored Aug 2, 2022
1 parent ec8c29d commit 1a95b94
Show file tree
Hide file tree
Showing 4 changed files with 91 additions and 91 deletions.
10 changes: 5 additions & 5 deletions android/src/main/java/com/revenuecat/purchases/hybridcommon/mappers/StoreProductMapper.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,12 @@ fun StoreProduct.map(): Map<String, Any?> =
"description" to description,
"title" to title,
"price" to priceAmountMicros / 1_000_000.0,
"price_string" to price,
"currency_code" to priceCurrencyCode,
"intro_price" to mapIntroPrice(),
"priceString" to price,
"currencyCode" to priceCurrencyCode,
"introPrice" to mapIntroPrice(),
"discounts" to null,
"product_category" to mapProductCategory(),
"product_type" to mapProductType()
"productCategory" to mapProductCategory(),
"productType" to mapProductType()
)

fun List<StoreProduct>.map(): List<Map<String, Any?>> = this.map { it.map() }
Expand Down
12 changes: 6 additions & 6 deletions ios/PurchasesHybridCommon/PurchasesHybridCommon/SKProduct+HybridAdditions.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,21 +14,21 @@ import StoreKit

@objc var rc_dictionary: [String: Any] {
var dictionary: [String: Any] = [
"currency_code": self.currencyCode ?? NSNull(),
"currencyCode": self.currencyCode ?? NSNull(),
"description": self.localizedDescription,
"discounts": NSNull(),
"identifier": self.productIdentifier,
"intro_price": NSNull(),
"introPrice": NSNull(),
"price": self.price,
"price_string": self.localizedPriceString,
"product_category": self.productCategoryString,
"product_type": self.productTypeString,
"priceString": self.localizedPriceString,
"productCategory": self.productCategoryString,
"productType": self.productTypeString,
"title": self.localizedTitle,
]

if #available(iOS 11.2, tvOS 11.2, macOS 10.13.2, *),
let introductoryDiscount = self.introductoryDiscount {
dictionary["intro_price"] = introductoryDiscount.rc_dictionary
dictionary["introPrice"] = introductoryDiscount.rc_dictionary
}

if #available(iOS 12.2, tvOS 12.2, macOS 10.14.4, *) {
Expand Down
80 changes: 40 additions & 40 deletions ...monIntegrationTests/__Snapshots__/StoreKitIntegrationTests/SK1-testCanGetOfferings.1.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,13 @@
"offeringIdentifier" : "default",
"packageType" : "ANNUAL",
"product" : {
"currency_code" : "USD",
"currencyCode" : "USD",
"description" : "Annual Subscription with 1 week trial",
"discounts" : [

],
"identifier" : "com.revenuecat.purchases_hybrid_common.annual_39.99_.1_week_intro",
"intro_price" : {
"introPrice" : {
"cycles" : 1,
"period" : "P1W",
"periodNumberOfUnits" : 1,
Expand All @@ -21,9 +21,9 @@
"priceString" : "$0.00"
},
"price" : 39.99,
"price_string" : "$39.99",
"product_category" : "SUBSCRIPTION",
"product_type" : "NON_CONSUMABLE",
"priceString" : "$39.99",
"productCategory" : "SUBSCRIPTION",
"productType" : "NON_CONSUMABLE",
"title" : "Annual Subscription"
}
},
Expand All @@ -33,13 +33,13 @@
"offeringIdentifier" : "default",
"packageType" : "ANNUAL",
"product" : {
"currency_code" : "USD",
"currencyCode" : "USD",
"description" : "Annual Subscription with 1 week trial",
"discounts" : [

],
"identifier" : "com.revenuecat.purchases_hybrid_common.annual_39.99_.1_week_intro",
"intro_price" : {
"introPrice" : {
"cycles" : 1,
"period" : "P1W",
"periodNumberOfUnits" : 1,
Expand All @@ -48,9 +48,9 @@
"priceString" : "$0.00"
},
"price" : 39.99,
"price_string" : "$39.99",
"product_category" : "SUBSCRIPTION",
"product_type" : "NON_CONSUMABLE",
"priceString" : "$39.99",
"productCategory" : "SUBSCRIPTION",
"productType" : "NON_CONSUMABLE",
"title" : "Annual Subscription"
}
},
Expand All @@ -59,13 +59,13 @@
"offeringIdentifier" : "default",
"packageType" : "MONTHLY",
"product" : {
"currency_code" : "USD",
"currencyCode" : "USD",
"description" : "Monthly Subscription with 1 week trial",
"discounts" : [

],
"identifier" : "com.revenuecat.purchases_hybrid_common.monthly_19.99_.1_week_intro",
"intro_price" : {
"introPrice" : {
"cycles" : 1,
"period" : "P1W",
"periodNumberOfUnits" : 1,
Expand All @@ -74,9 +74,9 @@
"priceString" : "$0.00"
},
"price" : 19.99,
"price_string" : "$19.99",
"product_category" : "SUBSCRIPTION",
"product_type" : "NON_CONSUMABLE",
"priceString" : "$19.99",
"productCategory" : "SUBSCRIPTION",
"productType" : "NON_CONSUMABLE",
"title" : "Monthly Subscription"
}
}
Expand All @@ -87,13 +87,13 @@
"offeringIdentifier" : "default",
"packageType" : "MONTHLY",
"product" : {
"currency_code" : "USD",
"currencyCode" : "USD",
"description" : "Monthly Subscription with 1 week trial",
"discounts" : [

],
"identifier" : "com.revenuecat.purchases_hybrid_common.monthly_19.99_.1_week_intro",
"intro_price" : {
"introPrice" : {
"cycles" : 1,
"period" : "P1W",
"periodNumberOfUnits" : 1,
Expand All @@ -102,9 +102,9 @@
"priceString" : "$0.00"
},
"price" : 19.99,
"price_string" : "$19.99",
"product_category" : "SUBSCRIPTION",
"product_type" : "NON_CONSUMABLE",
"priceString" : "$19.99",
"productCategory" : "SUBSCRIPTION",
"productType" : "NON_CONSUMABLE",
"title" : "Monthly Subscription"
}
},
Expand All @@ -117,13 +117,13 @@
"offeringIdentifier" : "default",
"packageType" : "ANNUAL",
"product" : {
"currency_code" : "USD",
"currencyCode" : "USD",
"description" : "Annual Subscription with 1 week trial",
"discounts" : [

],
"identifier" : "com.revenuecat.purchases_hybrid_common.annual_39.99_.1_week_intro",
"intro_price" : {
"introPrice" : {
"cycles" : 1,
"period" : "P1W",
"periodNumberOfUnits" : 1,
Expand All @@ -132,9 +132,9 @@
"priceString" : "$0.00"
},
"price" : 39.99,
"price_string" : "$39.99",
"product_category" : "SUBSCRIPTION",
"product_type" : "NON_CONSUMABLE",
"priceString" : "$39.99",
"productCategory" : "SUBSCRIPTION",
"productType" : "NON_CONSUMABLE",
"title" : "Annual Subscription"
}
},
Expand All @@ -144,13 +144,13 @@
"offeringIdentifier" : "default",
"packageType" : "ANNUAL",
"product" : {
"currency_code" : "USD",
"currencyCode" : "USD",
"description" : "Annual Subscription with 1 week trial",
"discounts" : [

],
"identifier" : "com.revenuecat.purchases_hybrid_common.annual_39.99_.1_week_intro",
"intro_price" : {
"introPrice" : {
"cycles" : 1,
"period" : "P1W",
"periodNumberOfUnits" : 1,
Expand All @@ -159,9 +159,9 @@
"priceString" : "$0.00"
},
"price" : 39.99,
"price_string" : "$39.99",
"product_category" : "SUBSCRIPTION",
"product_type" : "NON_CONSUMABLE",
"priceString" : "$39.99",
"productCategory" : "SUBSCRIPTION",
"productType" : "NON_CONSUMABLE",
"title" : "Annual Subscription"
}
},
Expand All @@ -170,13 +170,13 @@
"offeringIdentifier" : "default",
"packageType" : "MONTHLY",
"product" : {
"currency_code" : "USD",
"currencyCode" : "USD",
"description" : "Monthly Subscription with 1 week trial",
"discounts" : [

],
"identifier" : "com.revenuecat.purchases_hybrid_common.monthly_19.99_.1_week_intro",
"intro_price" : {
"introPrice" : {
"cycles" : 1,
"period" : "P1W",
"periodNumberOfUnits" : 1,
Expand All @@ -185,9 +185,9 @@
"priceString" : "$0.00"
},
"price" : 19.99,
"price_string" : "$19.99",
"product_category" : "SUBSCRIPTION",
"product_type" : "NON_CONSUMABLE",
"priceString" : "$19.99",
"productCategory" : "SUBSCRIPTION",
"productType" : "NON_CONSUMABLE",
"title" : "Monthly Subscription"
}
}
Expand All @@ -198,13 +198,13 @@
"offeringIdentifier" : "default",
"packageType" : "MONTHLY",
"product" : {
"currency_code" : "USD",
"currencyCode" : "USD",
"description" : "Monthly Subscription with 1 week trial",
"discounts" : [

],
"identifier" : "com.revenuecat.purchases_hybrid_common.monthly_19.99_.1_week_intro",
"intro_price" : {
"introPrice" : {
"cycles" : 1,
"period" : "P1W",
"periodNumberOfUnits" : 1,
Expand All @@ -213,9 +213,9 @@
"priceString" : "$0.00"
},
"price" : 19.99,
"price_string" : "$19.99",
"product_category" : "SUBSCRIPTION",
"product_type" : "NON_CONSUMABLE",
"priceString" : "$19.99",
"productCategory" : "SUBSCRIPTION",
"productType" : "NON_CONSUMABLE",
"title" : "Monthly Subscription"
}
},
Expand Down
Loading

0 comments on commit 1a95b94

Please sign in to comment.