Only track pushNotificationAlertPressed when the app is in inactive state. Also track the app state for pushNotificationReceived.

jaclync · jaclync · commit aa13c34d3a9e · 2022-01-17T16:32:02.000+08:00
diff --git a/WooCommerce/Classes/Notifications/PushNotificationsManager.swift b/WooCommerce/Classes/Notifications/PushNotificationsManager.swift
@@ -524,8 +524,13 @@ private extension PushNotificationsManager {
             properties[AnalyticKey.fromSelectedSite] = siteID == notificationSiteID
         }
 
-        let event: WooAnalyticsStat = (applicationState == .background) ? .pushNotificationReceived : .pushNotificationAlertPressed
-        ServiceLocator.analytics.track(event, withProperties: properties)
+        switch applicationState {
+        case .inactive:
+            ServiceLocator.analytics.track(.pushNotificationAlertPressed, withProperties: properties)
+        default:
+            properties[AnalyticKey.appState] = applicationState.rawValue
+            ServiceLocator.analytics.track(.pushNotificationReceived, withProperties: properties)
+        }
     }
 }
 
@@ -605,6 +610,7 @@ private enum AnalyticKey {
     static let type = "push_notification_type"
     static let token = "push_notification_token"
     static let fromSelectedSite = "is_from_selected_site"
+    static let appState = "app_state"
 }
 
 private enum PushType {

Original file line number	Diff line number	Diff line change
`@@ -524,8 +524,13 @@ private extension PushNotificationsManager {`
`524`	`524`	`properties[AnalyticKey.fromSelectedSite] = siteID == notificationSiteID`
`525`	`525`	`}`
`526`	`526`
`527`		`- let event: WooAnalyticsStat = (applicationState == .background) ? .pushNotificationReceived : .pushNotificationAlertPressed`
`528`		`- ServiceLocator.analytics.track(event, withProperties: properties)`
	`527`	`+ switch applicationState {`
	`528`	`+ case .inactive:`
	`529`	`+ ServiceLocator.analytics.track(.pushNotificationAlertPressed, withProperties: properties)`
	`530`	`+ default:`
	`531`	`+ properties[AnalyticKey.appState] = applicationState.rawValue`
	`532`	`+ ServiceLocator.analytics.track(.pushNotificationReceived, withProperties: properties)`
	`533`	`+ }`
`529`	`534`	`}`
`530`	`535`	`}`
`531`	`536`
`@@ -605,6 +610,7 @@ private enum AnalyticKey {`
`605`	`610`	`static let type = "push_notification_type"`
`606`	`611`	`static let token = "push_notification_token"`
`607`	`612`	`static let fromSelectedSite = "is_from_selected_site"`
	`613`	`+ static let appState = "app_state"`
`608`	`614`	`}`
`609`	`615`
`610`	`616`	`private enum PushType {`