Merge pull request #2 from la-haus/feature/allow-nested-properties

Allow nested properties (Without Null Safety)

Author: danielgomezrico

android/build.gradle

@@ -37,3 +37,7 @@ android {
         implementation 'com.segment.analytics.android.integrations:amplitude:+'
     }
 }
+
+dependencies {
+    testImplementation 'junit:junit:4.12'
+}

android/src/main/java/com/example/flutter_segment/FlutterSegmentPlugin.java

@@ -8,6 +8,8 @@
 import android.os.Bundle;
 import android.util.Log;
 
+import androidx.annotation.VisibleForTesting;
+
 import com.segment.analytics.Analytics;
 import com.segment.analytics.AnalyticsContext;
 import com.segment.analytics.Properties;
@@ -34,6 +36,7 @@
 public class FlutterSegmentPlugin implements MethodCallHandler, FlutterPlugin {
   private Context applicationContext;
   private MethodChannel methodChannel;
+  private PropertiesMapper propertiesMapper = new PropertiesMapper();
 
   static HashMap<String, Object> appendToContextMiddleware;
 
@@ -201,15 +204,9 @@ private void callTrack(
     HashMap<String, Object> propertiesData,
     HashMap<String, Object> optionsData
   ) {
-    Properties properties = new Properties();
+    Properties properties = propertiesMapper.buildProperties(propertiesData);
     Options options = this.buildOptions(optionsData);
 
-    for(Map.Entry<String, Object> property : propertiesData.entrySet()) {
-      String key = property.getKey();
-      Object value = property.getValue();
-      properties.putValue(key, value);
-    }
-
     Analytics.with(this.applicationContext).track(eventName, properties, options);
   }
 
@@ -230,15 +227,9 @@ private void callScreen(
     HashMap<String, Object> propertiesData,
     HashMap<String, Object> optionsData
   ) {
-    Properties properties = new Properties();
+    Properties properties = propertiesMapper.buildProperties(propertiesData);
     Options options = this.buildOptions(optionsData);
 
-    for(Map.Entry<String, Object> property : propertiesData.entrySet()) {
-      String key = property.getKey();
-      Object value = property.getValue();
-      properties.putValue(key, value);
-    }
-
     Analytics.with(this.applicationContext).screen(null, screenName, properties, options);
   }
 

android/src/main/java/com/example/flutter_segment/PropertiesMapper.java

@@ -0,0 +1,28 @@
+package com.example.flutter_segment;
+
+import androidx.annotation.VisibleForTesting;
+
+import com.segment.analytics.Properties;
+
+import java.util.Map;
+
+public class PropertiesMapper {
+    @VisibleForTesting
+    protected Properties buildProperties(Map<String, Object> map) {
+        Properties properties = new Properties();
+
+        for(Map.Entry<String, Object> property : map.entrySet()) {
+            String key = property.getKey();
+            Object value = property.getValue();
+
+            if (value instanceof Map){
+                Properties nestedProperties = buildProperties((Map<String, Object>) value);
+                properties.putValue(key, nestedProperties);
+            } else {
+                properties.putValue(key, value);
+            }
+        }
+
+        return properties;
+    }
+}

android/src/test/java/com/example/flutter_segment/PropertiesMapperTest.java

@@ -0,0 +1,56 @@
+package com.example.flutter_segment;
+
+import com.segment.analytics.Properties;
+
+import org.junit.Test;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+
+public class PropertiesMapperTest {
+    @Test
+    public void buildProperties_withoutNestedProperties_returnsIt() {
+        Map<String, Object> properties = new HashMap();
+        properties.put("string", "value");
+        properties.put("int", 1);
+        properties.put("bool", true);
+
+        PropertiesMapper mapper = new PropertiesMapper();
+        Properties result = mapper.buildProperties(properties);
+
+        assertEquals(result.get("string"), "value");
+        assertEquals(result.get("int"), 1);
+        assertEquals(result.get("bool"), true);
+    }
+
+    @Test
+    public void buildProperties_withNestedMap_returnsIt() {
+        Map<String, Object> properties = new HashMap();
+        Map<String, Object> nestedProperties = new HashMap();
+        properties.put("nested", nestedProperties);
+
+        properties.put("string", "value");
+        properties.put("int", 1);
+        properties.put("bool", true);
+
+        nestedProperties.put("string", "value2");
+        nestedProperties.put("int", 2);
+        nestedProperties.put("bool", false);
+
+        PropertiesMapper mapper = new PropertiesMapper();
+        Properties result = mapper.buildProperties(properties);
+
+        assertEquals(result.get("string"), "value");
+        assertEquals(result.get("int"), 1);
+        assertEquals(result.get("bool"), true);
+
+        Properties nestedResult = (Properties) result.get("nested");
+        assertNotNull(nestedResult);
+        assertEquals(nestedResult.get("string"), "value2");
+        assertEquals(nestedResult.get("int"), 2);
+        assertEquals(nestedResult.get("bool"), false);
+    }
+}