Merge pull request #69 from segment-integrations/bsneed/recursive_map

Make property mappings recursive

Author: bsneed

.circleci/config.yml

@@ -3,15 +3,15 @@ version: 2
 jobs:
   build_and_test:
     macos:
-      xcode: "11.0"
+      xcode: "12.0"
     steps:
       - checkout
       - run: xcrun simctl list
       - run:
           name: Install build dependencies
           command: |
             sudo gem install xcpretty
-            sudo gem install cocoapods -v 1.8.4
+            sudo gem install cocoapods -v 1.10.0
       - run:
           name: Fetch Cocoapods specs
           command: curl https://cocoapods-specs.circleci.com/fetch-cocoapods-repo-from-s3.sh | bash -s cf

Example/Tests/Tests.m

@@ -143,10 +143,10 @@
             @"currency" : @"USD",
             @"item_category" : @"Games",
             @"items" : @{
-                @"product_id" : @"2013294",
-                @"category" : @"Games",
-                @"name" : @"Monopoly: 3rd Edition",
-                @"brand" : @"Hasbros",
+                @"item_id" : @"2013294",
+                @"item_category" : @"Games",
+                @"item_name" : @"Monopoly: 3rd Edition",
+                @"item_brand" : @"Hasbros",
                 @"price" : @"21.99",
                 @"quantity" : @"1"
             }
@@ -178,7 +178,7 @@
             @"sku" : @"G-32",
             @"item_category" : @"Games",
             @"item_name" : @"Monopoly: 3rd Edition",
-            @"brand" : @"Hasbro",
+            @"item_brand" : @"Hasbro",
             @"variant" : @"200 pieces",
             @"price" : @18.99,
             @"quantity" : @1,
@@ -215,7 +215,7 @@
             @"sku" : @"G-32",
             @"item_category" : @"Games",
             @"item_name" : @"Monopoly 3rd Edition",
-            @"brand" : @"Hasbro",
+            @"item_brand" : @"Hasbro",
             @"variant" : @"200 pieces",
             @"price" : @18.99,
             @"quantity" : @1,
@@ -254,7 +254,7 @@
             @"sku" : @"G-32",
             @"item_category" : @"Games",
             @"item_name" : @"Monopoly: 3rd Edition",
-            @"brand" : @"Hasbro",
+            @"item_brand" : @"Hasbro",
             @"variant" : @"200 pieces",
             @"price" : @18.99,
             @"quantity" : @1,
@@ -292,7 +292,7 @@
             @"sku" : @"G-32",
             @"item_category" : @"Games",
             @"item_name" : @"Monopoly: 3rd Edition",
-            @"brand" : @"Hasbro",
+            @"item_brand" : @"Hasbro",
             @"variant" : @"200 pieces",
             @"price" : @18.99,
             @"quantity" : @1,
@@ -338,10 +338,10 @@
             @"currency" : @"USD",
             @"item_category" : @"Games",
             @"items" : @{
-                @"product_id" : @"2013294",
-                @"category" : @"Games",
-                @"name" : @"Monopoly: 3rd Edition",
-                @"brand" : @"Hasbros",
+                @"item_id" : @"2013294",
+                @"item_category" : @"Games",
+                @"item_name" : @"Monopoly: 3rd Edition",
+                @"item_brand" : @"Hasbros",
                 @"price" : @"21.99",
                 @"quantity" : @"1"
             }
@@ -431,10 +431,10 @@
             @"list_id" : @"hot_deals_1",
             @"item_category" : @"Deals",
             @"items" : @{
-                @"product_id" : @"2013294",
-                @"category" : @"Games",
-                @"name" : @"Monopoly: 3rd Edition",
-                @"brand" : @"Hasbros",
+                @"item_id" : @"2013294",
+                @"item_category" : @"Games",
+                @"item_name" : @"Monopoly: 3rd Edition",
+                @"item_brand" : @"Hasbros",
                 @"price" : @"21.99",
                 @"quantity" : @"1"
             }
@@ -471,7 +471,7 @@
             @"sku" : @"G-32",
             @"item_category" : @"Games",
             @"item_name" : @"Monopoly: 3rd Edition",
-            @"brand" : @"Hasbro",
+            @"item_brand" : @"Hasbro",
             @"variant" : @"200 pieces",
             @"price" : @18.99,
             @"quantity" : @1,
@@ -511,7 +511,7 @@
             @"sku" : @"G-32",
             @"item_category" : @"Games",
             @"item_name" : @"Monopoly: 3rd Edition",
-            @"brand" : @"Hasbro",
+            @"item_brand" : @"Hasbro",
             @"variant" : @"200 pieces",
             @"price" : @18.99,
             @"url" : @"https://www.company.com/product/path",
@@ -547,7 +547,7 @@
             @"sku" : @"G-32",
             @"item_category" : @"Games",
             @"item_name" : @"Monopoly: 3rd Edition",
-            @"brand" : @"Hasbro",
+            @"item_brand" : @"Hasbro",
             @"variant" : @"200 pieces",
             @"price" : @18.99,
             @"url" : @"https://www.company.com/product/path",
@@ -577,7 +577,7 @@
                                                               integrations:@{}];
         [integration screen:payload];
         // screen is set async, so need to pump the runloop.
-        [NSRunLoop.mainRunLoop runUntilDate:[NSDate distantPast]];
+        [NSRunLoop.mainRunLoop runUntilDate:[NSDate dateWithTimeIntervalSinceNow:5]];
         [verify(mockFirebase) logEventWithName:@"screen_view" parameters:@{
             kFIRParameterScreenName : @"Home screen"
         }];

Segment-Firebase/Classes/SEGFirebaseIntegration.m

@@ -147,6 +147,7 @@ - (NSDictionary *)returnMappedFirebaseParameters:(NSDictionary *)properties
                                           kFIRParameterItemCategory, @"category",
                                           kFIRParameterItemID, @"product_id",
                                           kFIRParameterItemName, @"name",
+                                          kFIRParameterItemBrand, @"brand",
                                           kFIRParameterPrice, @"price",
                                           kFIRParameterQuantity, @"quantity",
                                           kFIRParameterSearchTerm, @"query",
@@ -168,6 +169,20 @@ + (NSDictionary *)mapToFirebaseParameters:(NSDictionary *)properties withMap:(NS
         id data = [properties objectForKey:original];
         if (data) {
             [mappedParams removeObjectForKey:original];
+            if ([data isKindOfClass:[NSDictionary class]]) {
+                data = [self mapToFirebaseParameters:data withMap:mapper];
+            } else if ([data isKindOfClass: [NSArray class]]) {
+                NSMutableArray *newArray = [NSMutableArray array];
+                for (id entry in newArray) {
+                    if ([entry isKindOfClass:[NSDictionary class]]) {
+                        id newEntry = [self mapToFirebaseParameters:entry withMap:mapper];
+                        [newArray addObject:newEntry];
+                    } else {
+                        [newArray addObject:entry];
+                    }
+                }
+                data = newArray;
+            }
             [mappedParams setObject:data forKey:new];
         }
     }];