Fix product key mappings (#36)

* map keys under properties.products

Author: prayansh

src/main/java/com/segment/analytics/android/integrations/firebase/FirebaseIntegration.java

@@ -19,7 +19,9 @@
 import com.segment.analytics.integrations.TrackPayload;
 import com.segment.analytics.integrations.ScreenPayload;
 
+import java.util.ArrayList;
 import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
 
 import static com.segment.analytics.internal.Utils.hasPermission;
@@ -104,6 +106,19 @@ private static Map<String, String> createPropertyMap() {
     return PROPERTY_MAPPER;
   }
 
+  private static final Map<String, String> PRODUCT_MAPPER = createProductMap();
+
+  private static Map<String, String> createProductMap() {
+    Map<String, String> MAPPER = new HashMap<>();
+    MAPPER.put("category", Param.ITEM_CATEGORY);
+    MAPPER.put("product_id", Param.ITEM_ID);
+    MAPPER.put("id", Param.ITEM_ID);
+    MAPPER.put("name", Param.ITEM_NAME);
+    MAPPER.put("price", Param.PRICE);
+    MAPPER.put("quantity", Param.QUANTITY);
+    return MAPPER;
+  }
+
   public FirebaseIntegration(Context context, Logger logger) {
     this.logger = logger;
     this.firebaseAnalytics = FirebaseAnalytics.getInstance(context);
@@ -196,23 +211,52 @@ && isNullOrEmpty(properties.currency())) {
       } else {
         property = makeKey(property);
       }
-      if (value instanceof Integer) {
-        int intValue = (int) value;
-        bundle.putInt(property, intValue);
-      } else if (value instanceof Double) {
-        double doubleValue = (double) value;
-        bundle.putDouble(property, doubleValue);
-      } else if (value instanceof Long) {
-        long longValue = (long) value;
-        bundle.putLong(property, longValue);
+      if (property.equals(Param.ITEMS)) {
+        List<ValueMap> products = properties.getList("products", ValueMap.class);
+        ArrayList<Bundle> mappedProducts = formatProducts(products);
+        bundle.putParcelableArrayList(property, mappedProducts);
       } else {
-        String stringValue = String.valueOf(value);
-        bundle.putString(property, stringValue);
+        putValue(bundle, property, value);
       }
     }
     return bundle;
   }
 
+  private static ArrayList<Bundle> formatProducts(List<ValueMap> products) {
+    ArrayList<Bundle> mappedProducts = new ArrayList<>();
+    for (ValueMap product : products) {
+      Bundle mappedProduct = new Bundle();
+      for (Map.Entry<String, Object> innerEntry : product.entrySet()) {
+        String key = innerEntry.getKey();
+        Object value = innerEntry.getValue();
+        if (PRODUCT_MAPPER.containsKey(key)) {
+          key = PRODUCT_MAPPER.get(key);
+        } else {
+          key = makeKey(key);
+        }
+        putValue(mappedProduct, key, value);
+      }
+      mappedProducts.add(mappedProduct);
+    }
+    return mappedProducts;
+  }
+
+  private static void putValue(Bundle bundle, String key, Object value) {
+    if (value instanceof Integer) {
+      int intValue = (int) value;
+      bundle.putInt(key, intValue);
+    } else if (value instanceof Double) {
+      double doubleValue = (double) value;
+      bundle.putDouble(key, doubleValue);
+    } else if (value instanceof Long) {
+      long longValue = (long) value;
+      bundle.putLong(key, longValue);
+    } else {
+      String stringValue = String.valueOf(value);
+      bundle.putString(key, stringValue);
+    }
+  }
+
   public static String makeKey(String key) {
     String[] forbiddenChars = {".", "-", " "};
     for (String forbidden : forbiddenChars) {

src/test/java/com/segment/analytics/android/integration/firebase/FirebaseTest.java

@@ -28,6 +28,7 @@
 import org.skyscreamer.jsonassert.JSONAssert;
 import org.skyscreamer.jsonassert.JSONCompareMode;
 
+import java.util.ArrayList;
 import java.util.Date;
 import java.util.HashMap;
 import java.util.Map;
@@ -125,14 +126,28 @@ public void trackPurchaseWithProducts() {
                 .putValue("revenue", 100.0)
                 .putValue("currency", "USD");
         Properties.Product product1 = new Properties.Product( "123",  "abc",  10.0);
+        product1.putName("foo");
+        product1.put("category", "bar");
+        product1.put("quantity", 2);
         properties.putProducts(product1);
 
         integration.track(new TrackPayload.Builder().anonymousId("1234").properties(properties).event("Order Completed").build());
 
+        Bundle product = new Bundle();
+        product.putString("item_id", "123");
+        product.putString("item_name", "foo");
+        product.putString("item_category", "bar");
+        product.putDouble("price", 10.0);
+        product.putString("sku", "abc");
+        product.putInt("quantity", 2);
+
+        ArrayList<Bundle> items = new ArrayList<>();
+        items.add(product);
+
         Bundle expected = new Bundle();
         expected.putDouble("value", 100.0);
         expected.putString("currency", "USD");
-        expected.putString("items", "[{id=123, sku=abc, price=10.0}]");
+        expected.putParcelableArrayList("items", items);
 
         verify(firebase).logEvent(eq("purchase"), bundleEq(expected));
     }