♻️ Update push handler event properties

appcues · Sep 17, 2024 · 30758ff · 30758ff
1 parent 937c897
commit 30758ff
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 12 deletions.
diff --git a/Sources/AppcuesKit/Push/ParsedNotification.swift b/Sources/AppcuesKit/Push/ParsedNotification.swift
@@ -12,9 +12,9 @@ internal struct ParsedNotification {
     let accountID: String
     let userID: String
     let notificationID: String
-    let workflowID: String
-    let workflowTaskID: String
-    let transactionID: String
+    let workflowID: String?
+    let workflowTaskID: String?
+    let transactionID: String?
     let deepLinkURL: URL?
     let experienceID: String?
     let attachmentURL: URL?
@@ -24,20 +24,17 @@ internal struct ParsedNotification {
     init?(userInfo: [AnyHashable: Any]) {
         guard let accountID = userInfo["appcues_account_id"] as? String,
         let userID = userInfo["appcues_user_id"] as? String,
-        let notificationID = userInfo["appcues_notification_id"] as? String,
-        let workflowID = userInfo["appcues_workflow_id"] as? String,
-        let workflowTaskID = userInfo["appcues_workflow_task_id"] as? String,
-        let transactionID = userInfo["appcues_transaction_id"] as? String else {
+        let notificationID = userInfo["appcues_notification_id"] as? String else {
             return nil
         }
 
         self.accountID = accountID
         self.userID = userID
         self.notificationID = notificationID
-        self.workflowID = workflowID
-        self.workflowTaskID = workflowTaskID
-        self.transactionID = transactionID
 
+        self.workflowID = userInfo["appcues_workflow_id"] as? String
+        self.workflowTaskID = userInfo["appcues_workflow_task_id"] as? String
+        self.transactionID = userInfo["appcues_transaction_id"] as? String
         self.deepLinkURL = (userInfo["appcues_deep_link_url"] as? String)
             .flatMap { URL(string: $0) }
         self.experienceID = userInfo["appcues_experience_id"] as? String

diff --git a/Sources/AppcuesKit/Push/PushMonitor.swift b/Sources/AppcuesKit/Push/PushMonitor.swift
@@ -99,8 +99,12 @@ internal class PushMonitor: PushMonitoring {
         analyticsPublisher.publish(TrackingUpdate(
             type: .event(name: Events.Push.pushOpened.rawValue, interactive: false),
             properties: [
-                "notification_id": parsedNotification.notificationID
-            ],
+                "notification_id": parsedNotification.notificationID,
+                "workflow_id": parsedNotification.workflowID,
+                "workflow_task_id": parsedNotification.workflowTaskID,
+                "transaction_id": parsedNotification.transactionID,
+                "device_id": storage.deviceID
+            ].compactMapValues { $0 },
             isInternal: true
         ))