Skip to content

Updating deprecated tags #7

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Aug 24, 2023
Merged

Updating deprecated tags #7

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
14 changes: 8 additions & 6 deletions lib/src/main/java/com/segment/analytics/kotlin/destinations/firebase/FirebaseDestination.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -198,7 +198,7 @@ class FirebaseDestination(
"revenue" to FirebaseAnalytics.Param.VALUE,
"order_id" to FirebaseAnalytics.Param.TRANSACTION_ID,
"currency" to FirebaseAnalytics.Param.CURRENCY,
"products" to FirebaseAnalytics.Param.ITEM_LIST
"products" to FirebaseAnalytics.Param.ITEMS
)

private val PRODUCT_MAPPER: Map<String, String> = mapOf(
Expand All @@ -213,12 +213,12 @@ class FirebaseDestination(
private val EVENT_MAPPER: Map<String, String> = mapOf(
"Product Added" to FirebaseAnalytics.Event.ADD_TO_CART,
"Checkout Started" to FirebaseAnalytics.Event.BEGIN_CHECKOUT,
"Order Completed" to FirebaseAnalytics.Event.ECOMMERCE_PURCHASE,
"Order Refunded" to FirebaseAnalytics.Event.PURCHASE_REFUND,
"Order Completed" to FirebaseAnalytics.Event.PURCHASE,
"Order Refunded" to FirebaseAnalytics.Event.REFUND,
"Product Viewed" to FirebaseAnalytics.Event.VIEW_ITEM,
"Product List Viewed" to FirebaseAnalytics.Event.VIEW_ITEM_LIST,
"Payment Info Entered" to FirebaseAnalytics.Event.ADD_PAYMENT_INFO,
"Promotion Viewed" to FirebaseAnalytics.Event.PRESENT_OFFER,
"Promotion Viewed" to FirebaseAnalytics.Event.VIEW_PROMOTION,
"Product Added to Wishlist" to FirebaseAnalytics.Event.ADD_TO_WISHLIST,
"Product Shared" to FirebaseAnalytics.Event.SHARE,
"Product Clicked" to FirebaseAnalytics.Event.SELECT_CONTENT,
Expand All @@ -242,7 +242,7 @@ class FirebaseDestination(
finalProperty = PROPERTY_MAPPER[property].toString()
}

if (finalProperty == FirebaseAnalytics.Param.ITEM_LIST) {
if (finalProperty == FirebaseAnalytics.Param.ITEMS) {
val products = properties.getMapList("products") ?: continue
val formattedProducts = formatProducts(products)
bundle.putParcelableArrayList(finalProperty, formattedProducts)
Expand All @@ -267,7 +267,9 @@ class FirebaseDestination(
for (key in product.keys) {
val value = product[key]
val finalKey = PRODUCT_MAPPER[key] ?: makeKey(key)
mappedProduct.putValue(finalKey, value)
if(value != null) {
mappedProduct.putValue(finalKey, value)
}
}
mappedProducts.add(mappedProduct)
}
Expand Down
2 changes: 1 addition & 1 deletion ...c/test/java/com/segment/analytics/kotlin/destinations/firebase/FirebaseDestinationTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -291,7 +291,7 @@ class FirebaseDestinationTests {
assertEquals("house items", getString("search_term"))
assertEquals("USD", getString("currency"))
assertEquals(160, getInt("value"))
val products = getParcelableArrayList<Bundle>("item_list")
val products = getParcelableArrayList<Bundle>("items")
with(products!!) {
assertEquals(2, size)
with(get(0)!!) {
Expand Down