Add date event attribute

(user attribute already implemented)

Author: Minishlink

android/src/main/java/tech/bam/RNBatchPush/RNUtils.java

@@ -16,6 +16,7 @@
 import org.json.JSONArray;
 
 import java.net.URI;
+import java.util.Date;
 import java.util.Map;
 
 public class RNUtils {
@@ -37,6 +38,8 @@ public static WritableMap convertMapToWritableMap(Map<String, Object> input) {
                 output.putDouble(key, (Double) value);
             } else if (value instanceof String) {
                 output.putString(key, (String) value);
+            } else if (value instanceof Date) {
+                output.putDouble(key, ((Date) value).getTime());
             } else if (value instanceof URI) {
                 output.putString(key, value.toString());
             } else {
@@ -63,6 +66,8 @@ public static WritableArray convertArrayToWritableArray(Object[] input) {
                 output.pushDouble((Double) value);
             } else if (value instanceof String) {
                 output.pushString((String) value);
+            } else if (value instanceof Date) {
+                output.pushDouble(((Date) value).getTime());
             } else if (value instanceof URI) {
                 output.pushString(value.toString());
             } else {
@@ -100,6 +105,10 @@ public static BatchEventData convertSerializedEventDataToEventData(@Nullable Rea
                 batchEventData.put(key, valueMap.getDouble("value"));
             } else if ("float".equals(type)) {
                 batchEventData.put(key, valueMap.getDouble("value"));
+            } else if ("date".equals(type)) {
+                long timestamp = (long) valueMap.getDouble("value");
+                Date date = new Date(timestamp);
+                batchEventData.put(key, date);
             } else if ("url".equals(type)) {
                 batchEventData.put(key, URI.create(valueMap.getString("value")));
             } else {

ios/RNBatch.m

@@ -357,6 +357,14 @@ - (NSDictionary*) dictionaryWithEventDispatcherPayload:(id<BatchEventDispatcherP
                     return;
                 }
                 [batchEventData putDouble:[(NSNumber*)value doubleValue] forKey:key];
+            } else if ([@"date" isEqualToString:type]) {
+                if (![value isKindOfClass:[NSNumber class]])
+                {
+                    NSLog(@"RNBatch: Error while tracking event data: event data.attributes: expected number value, got something else");
+                    return;
+                }
+                NSDate *date = [NSDate dateWithTimeIntervalSince1970:[(NSNumber*)value doubleValue] / 1000.0];
+                [batchEventData putDate:date forKey:key];
             } else if ([@"url" isEqualToString:type]) {
                 if (![value isKindOfClass:[NSString class]])
                 {

src/BatchEventData.test.ts

@@ -50,6 +50,14 @@ describe('BatchEventData', () => {
 
     expect(spy).toHaveBeenCalled();
   });
+  it(`handles a date attribute`, () => {
+    const batchEventData = new BatchEventData();
+    const spy = jest.spyOn(Logger, 'Log');
+
+    batchEventData.putDate('test_date', Date.now());
+
+    expect(spy).not.toHaveBeenCalled();
+  });
   it(`handles an url attribute`, () => {
     const batchEventData = new BatchEventData();
     const spy = jest.spyOn(Logger, 'Log');

src/BatchEventData.ts

@@ -14,6 +14,7 @@ export enum TypedEventAttributeType {
   Boolean = 'boolean',
   Integer = 'integer',
   Float = 'float',
+  Date = 'date',
   URL = 'url',
 }
 
@@ -112,6 +113,22 @@ export class BatchEventData {
     return key.toLowerCase();
   }
 
+  public putDate(key: string, value: number): BatchEventData {
+    key = this.prepareAttributeKey(key);
+    try {
+      this.checkBeforePuttingAttribute(key, value);
+    } catch {
+      return this;
+    }
+
+    this._attributes[key] = {
+      type: TypedEventAttributeType.Date,
+      value,
+    };
+
+    return this;
+  }
+
   public putURL(key: string, url: string): BatchEventData {
     key = this.prepareAttributeKey(key);
     try {