Changes from code review

Author: joshheald

WooCommerce/Classes/Analytics/WooAnalyticsEvent+BackgroudUpdates.swift

@@ -14,14 +14,9 @@ extension WooAnalyticsEvent {
             static let batteryLevel = "battery_level"
             static let isLowPowerMode = "is_low_power_mode"
             static let timeSinceLastRun = "time_since_last_run"
-            static let completionStatus = "completion_status"
         }
 
-        static func dataSynced(timeTaken: TimeInterval) -> WooAnalyticsEvent {
-            WooAnalyticsEvent(statName: .backgroundDataSynced, properties: [Keys.timeTaken: timeTaken])
-        }
-
-        static func dataSyncedDetailed(
+        static func dataSynced(
             timeTaken: TimeInterval,
             backgroundTimeGranted: TimeInterval?,
             networkType: String,

WooCommerce/Classes/Extensions/UserDefaults+Woo.swift

@@ -50,7 +50,7 @@ extension UserDefaults {
 
         // Background Task Refresh
         case latestBackgroundOrderSyncDate
-        case lastBackgroundRefreshTime
+        case lastBackgroundRefreshCompletionTime
 
         // Blaze Local notification
         case blazeNoCampaignReminderOpened

WooCommerce/Classes/Tools/BackgroundTasks/BackgroundTaskRefreshDispatcher.swift

@@ -62,7 +62,6 @@ final class BackgroundTaskRefreshDispatcher {
         let refreshTasks = Task {
             do {
                 let systemInfo = await BackgroundTaskSystemInfo()
-                let lastRunTime = UserDefaults.standard[.lastBackgroundRefreshTime] as? Date
 
                 let startTime = Date.now
 
@@ -81,9 +80,13 @@ final class BackgroundTaskRefreshDispatcher {
                 }
 
                 let timeTaken = round(Date.now.timeIntervalSince(startTime))
-                let timeSinceLastRun = lastRunTime?.timeIntervalSinceNow.magnitude
 
-                ServiceLocator.analytics.track(event: .BackgroundUpdates.dataSyncedDetailed(
+                var timeSinceLastRun: TimeInterval? = nil
+                if let lastRunTime = UserDefaults.standard[.lastBackgroundRefreshCompletionTime] as? Date {
+                    timeSinceLastRun = round(lastRunTime.timeIntervalSinceNow.magnitude)
+                }
+
+                ServiceLocator.analytics.track(event: .BackgroundUpdates.dataSynced(
                     timeTaken: timeTaken,
                     backgroundTimeGranted: systemInfo.backgroundTimeGranted,
                     networkType: systemInfo.networkType,
@@ -96,7 +99,7 @@ final class BackgroundTaskRefreshDispatcher {
                 ))
 
                 // Save date, for use in analytics next time we refresh
-                UserDefaults.standard[.lastBackgroundRefreshTime] = Date.now
+                UserDefaults.standard[.lastBackgroundRefreshCompletionTime] = Date.now
 
                 backgroundTask.setTaskCompleted(success: true)
 
@@ -139,7 +142,7 @@ private struct NetworkInfo {
 
 private struct BackgroundTaskSystemInfo {
     let backgroundTimeGranted: TimeInterval?
-    let networkInfo: NetworkInfo
+    private let networkInfo: NetworkInfo
     let isPowered: Bool
     let batteryLevel: Float
     let isLowPowerMode: Bool