exclude null values

customerio · Nov 8, 2024 · a661d96 · a661d96
1 parent 5bdecac
commit a661d96
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 8 deletions.
diff --git a/android/src/main/kotlin/io/customer/customer_io/CustomerIoPlugin.kt b/android/src/main/kotlin/io/customer/customer_io/CustomerIoPlugin.kt
@@ -174,9 +174,7 @@ class CustomerIoPlugin : FlutterPlugin, MethodCallHandler, ActivityAware {
         val name = requireNotNull(params.getAsTypeOrNull<String>(Keys.Tracking.NAME)) {
             "Event name is missing in params: $params"
         }
-        val properties = params
-            .getAsTypeOrNull<Map<String, Any?>>(Keys.Tracking.PROPERTIES)
-            ?.filterValues { it != null }
+        val properties = params.getAsTypeOrNull<Map<String, Any>>(Keys.Tracking.PROPERTIES)
 
         if (properties.isNullOrEmpty()) {
             CustomerIO.instance().track(name)
@@ -231,9 +229,7 @@ class CustomerIoPlugin : FlutterPlugin, MethodCallHandler, ActivityAware {
         val title = requireNotNull(params.getAsTypeOrNull<String>(Keys.Tracking.TITLE)) {
             "Screen title is missing in params: $params"
         }
-        val properties = params
-            .getAsTypeOrNull<Map<String, Any?>>(Keys.Tracking.PROPERTIES)
-            ?.filterValues { it != null }
+        val properties = params.getAsTypeOrNull<Map<String, Any>>(Keys.Tracking.PROPERTIES)
 
         if (properties.isNullOrEmpty()) {
             CustomerIO.instance().screen(title)

diff --git a/lib/customer_io.dart b/lib/customer_io.dart
@@ -7,6 +7,7 @@ import 'customer_io_config.dart';
 import 'customer_io_enums.dart';
 import 'customer_io_inapp.dart';
 import 'customer_io_platform_interface.dart';
+import 'extensions/map_extensions.dart';
 import 'messaging_in_app/platform_interface.dart';
 import 'messaging_push/platform_interface.dart';
 
@@ -108,7 +109,8 @@ class CustomerIO {
   /// @param properties (Optional) params to be sent with event
   void track(
       {required String name, Map<String, dynamic> properties = const {}}) {
-    return _platform.track(name: name, properties: properties);
+    return _platform.track(
+        name: name, properties: properties.excludeNullValues());
   }
 
   /// Track a push metric
@@ -132,7 +134,8 @@ class CustomerIO {
   /// @param attributes (Optional) params to be sent with event
   void screen(
       {required String title, Map<String, dynamic> properties = const {}}) {
-    return _platform.screen(title: title, properties: properties);
+    return _platform.screen(
+        title: title, properties: properties.excludeNullValues());
   }
 
   /// Use this function to send custom device attributes

diff --git a/lib/extensions/map_extensions.dart b/lib/extensions/map_extensions.dart
@@ -0,0 +1,7 @@
+/// Extensions for [Map] class that provide additional functionality and convenience methods.
+extension CustomerIOMapExtension on Map<String, dynamic> {
+  /// Returns a new map with entries that have non-null values, excluding null values.
+  Map<String, dynamic> excludeNullValues() {
+    return Map.fromEntries(entries.where((entry) => entry.value != null));
+  }
+}