Skip to content

Commit b78d5d8

Browse files
authored
Updating deprecated tags (#7)
1 parent 388f483 commit b78d5d8

File tree

2 files changed

+9
-7
lines changed

2 files changed

+9
-7
lines changed

lib/src/main/java/com/segment/analytics/kotlin/destinations/firebase/FirebaseDestination.kt

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -198,7 +198,7 @@ class FirebaseDestination(
198198
"revenue" to FirebaseAnalytics.Param.VALUE,
199199
"order_id" to FirebaseAnalytics.Param.TRANSACTION_ID,
200200
"currency" to FirebaseAnalytics.Param.CURRENCY,
201-
"products" to FirebaseAnalytics.Param.ITEM_LIST
201+
"products" to FirebaseAnalytics.Param.ITEMS
202202
)
203203

204204
private val PRODUCT_MAPPER: Map<String, String> = mapOf(
@@ -213,12 +213,12 @@ class FirebaseDestination(
213213
private val EVENT_MAPPER: Map<String, String> = mapOf(
214214
"Product Added" to FirebaseAnalytics.Event.ADD_TO_CART,
215215
"Checkout Started" to FirebaseAnalytics.Event.BEGIN_CHECKOUT,
216-
"Order Completed" to FirebaseAnalytics.Event.ECOMMERCE_PURCHASE,
217-
"Order Refunded" to FirebaseAnalytics.Event.PURCHASE_REFUND,
216+
"Order Completed" to FirebaseAnalytics.Event.PURCHASE,
217+
"Order Refunded" to FirebaseAnalytics.Event.REFUND,
218218
"Product Viewed" to FirebaseAnalytics.Event.VIEW_ITEM,
219219
"Product List Viewed" to FirebaseAnalytics.Event.VIEW_ITEM_LIST,
220220
"Payment Info Entered" to FirebaseAnalytics.Event.ADD_PAYMENT_INFO,
221-
"Promotion Viewed" to FirebaseAnalytics.Event.PRESENT_OFFER,
221+
"Promotion Viewed" to FirebaseAnalytics.Event.VIEW_PROMOTION,
222222
"Product Added to Wishlist" to FirebaseAnalytics.Event.ADD_TO_WISHLIST,
223223
"Product Shared" to FirebaseAnalytics.Event.SHARE,
224224
"Product Clicked" to FirebaseAnalytics.Event.SELECT_CONTENT,
@@ -242,7 +242,7 @@ class FirebaseDestination(
242242
finalProperty = PROPERTY_MAPPER[property].toString()
243243
}
244244

245-
if (finalProperty == FirebaseAnalytics.Param.ITEM_LIST) {
245+
if (finalProperty == FirebaseAnalytics.Param.ITEMS) {
246246
val products = properties.getMapList("products") ?: continue
247247
val formattedProducts = formatProducts(products)
248248
bundle.putParcelableArrayList(finalProperty, formattedProducts)
@@ -267,7 +267,9 @@ class FirebaseDestination(
267267
for (key in product.keys) {
268268
val value = product[key]
269269
val finalKey = PRODUCT_MAPPER[key] ?: makeKey(key)
270-
mappedProduct.putValue(finalKey, value)
270+
if(value != null) {
271+
mappedProduct.putValue(finalKey, value)
272+
}
271273
}
272274
mappedProducts.add(mappedProduct)
273275
}

lib/src/test/java/com/segment/analytics/kotlin/destinations/firebase/FirebaseDestinationTest.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -291,7 +291,7 @@ class FirebaseDestinationTests {
291291
assertEquals("house items", getString("search_term"))
292292
assertEquals("USD", getString("currency"))
293293
assertEquals(160, getInt("value"))
294-
val products = getParcelableArrayList<Bundle>("item_list")
294+
val products = getParcelableArrayList<Bundle>("items")
295295
with(products!!) {
296296
assertEquals(2, size)
297297
with(get(0)!!) {

0 commit comments

Comments
 (0)