Campaign opened_app analytics (#419)

* first draft of client side changes needed for campaign analytics * chagne to campaign name * clean up * going with campaigns id * use the notification meta data instead
radarlabs · Dec 10, 2024 · b5d7635 · b5d7635
1 parent 65844f2
commit b5d7635
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 26 deletions.
diff --git a/RadarSDK/Radar.m b/RadarSDK/Radar.m
@@ -538,17 +538,6 @@ + (void)logConversionWithNotification:(UNNotificationRequest *)request
                        deliveredAfter:(NSDate *)deliveredAfter {
 
     NSMutableDictionary *metadata = [[NSMutableDictionary alloc] initWithDictionary:request.content.userInfo];
-    NSDictionary<NSString *, NSString *> *result = [RadarUtils
-                                                    extractGeofenceIdAndTimestampFromIdentifier:request.identifier];
-    if (result) {
-        NSString *geofenceId = result[@"geofenceId"];
-        [metadata setValue:geofenceId forKey:@"geofenceId"];
-        NSString *timestamp = result[@"registeredAt"];
-        [metadata setValue:timestamp forKey:@"registeredAt"];
-        if (deliveredAfter) {
-            [metadata setObject:deliveredAfter forKey:@"deliveredAfter"];
-        }
-    }
 
     if (conversionSource) {
         [metadata setValue:conversionSource forKey:@"conversionSource"];

diff --git a/RadarSDK/RadarLocationManager.m b/RadarSDK/RadarLocationManager.m
@@ -558,6 +558,7 @@ - (void)replaceSyncedGeofences:(NSArray<RadarGeofence *> *)geofences {
                 NSString *notificationTitle = [geofence.metadata objectForKey:@"radar:notificationTitle"];
                 NSString *notificationSubtitle = [geofence.metadata objectForKey:@"radar:notificationSubtitle"];
                 NSString *notificationURL = [geofence.metadata objectForKey:@"radar:notificationURL"];
+                NSString *campaignId = [geofence.metadata objectForKey:@"radar:campaignId"];
                 if (notificationText) {
                     UNMutableNotificationContent *content = [UNMutableNotificationContent new];
                     if (notificationTitle) {
@@ -569,9 +570,19 @@ - (void)replaceSyncedGeofences:(NSArray<RadarGeofence *> *)geofences {
                     content.body = [NSString localizedUserNotificationStringForKey:notificationText arguments:nil];
 
                     NSMutableDictionary *mutableUserInfo = [geofence.metadata mutableCopy];
+
+                    mutableUserInfo[@"geofenceId"] = geofence._id;
+                    NSDate *now = [NSDate new];
+                    NSTimeInterval lastSyncInterval = [now timeIntervalSince1970];
+                    mutableUserInfo[@"registeredAt"] = [NSString stringWithFormat:@"%f", lastSyncInterval];
+
                     if (notificationURL) {
                         mutableUserInfo[@"url"] = notificationURL;
                     }
+
+                    if (campaignId) {
+                        mutableUserInfo[@"campaignId"] = campaignId;
+                    }
 
                     content.userInfo = [mutableUserInfo copy];
 

diff --git a/RadarSDK/RadarNotificationHelper.m b/RadarSDK/RadarNotificationHelper.m
@@ -214,8 +214,7 @@ + (void)checkNotificationPermissionsWithCompletionHandler:(NotificationPermissio
         if (completionHandler) {
             completionHandler(NO);
         }
-    }
-
+    } 
 }
 
 @end
diff --git a/RadarSDK/RadarUtils.h b/RadarSDK/RadarUtils.h
@@ -31,7 +31,6 @@ NS_ASSUME_NONNULL_BEGIN
 + (CLLocation *)locationForDictionary:(NSDictionary *_Nonnull)dict;
 + (NSDictionary *)dictionaryForLocation:(CLLocation *)location;
 + (NSString *)dictionaryToJson:(NSDictionary *)dict;
-+ (NSDictionary<NSString *, NSString *> *)extractGeofenceIdAndTimestampFromIdentifier:(NSString *)identifier;
 + (void)runOnMainThread:(dispatch_block_t)block;
 
 @end

diff --git a/RadarSDK/RadarUtils.m b/RadarSDK/RadarUtils.m
@@ -164,18 +164,6 @@ + (NSString *)dictionaryToJson:(NSDictionary *)dict {
     } 
 }
 
-+ (NSDictionary<NSString *, NSString *> *)extractGeofenceIdAndTimestampFromIdentifier:(NSString *)identifier {
-    NSArray<NSString *> *components = [identifier componentsSeparatedByString:@"_"];
-    if (components.count != 4) {
-        return nil; // Invalid format
-    }
-
-    NSString *geofenceId = components[2];
-    NSString *registeredAt = components[3];
-
-    return @{@"geofenceId": geofenceId, @"registeredAt": registeredAt};
-}
-
 #pragma mark - threading
 
 + (void)runOnMainThread:(dispatch_block_t)block {
-Original file line number
+Diff line change
@@ Expand Up @@
             if (completionHandler) {
                 completionHandler(NO);
             }
-        }
+        }
     }
     @end