Tweaks to autofill pixels for KPIs

Core/UserDefaultsPropertyWrapper.swift

@@ -84,9 +84,9 @@ public struct UserDefaultsWrapper<T> {
                 "com.duckduckgo.ios.autofillCredentialsHasBeenEnabledAutomaticallyIfNecessary"
         case autofillImportViaSyncStart = "com.duckduckgo.ios.autofillImportViaSyncStart"
         case autofillSurveyEnabled = "com.duckduckgo.ios.autofillSurveyEnabled"
-        case autofillSearchDauDate = "com.duckduckgo.ios.autofillSearchDauDate"
-        case autofillFillDate = "com.duckduckgo.ios.autofillFillDate"
-        case autofillOnboardedUser = "com.duckduckgo.ios.autofillOnboardedUser"
+        case autofillSearchDauDate = "com.duckduckgo.app.autofill.SearchDauDate"
+        case autofillFillDate = "com.duckduckgo.app.autofill.FillDate"
+        case autofillOnboardedUser = "com.duckduckgo.app.autofill.OnboardedUser"
 
         // .v2 suffix added to fix https://app.asana.com/0/547792610048271/1206524375402369/f
         case featureFlaggingDidVerifyInternalUser = "com.duckduckgo.app.featureFlaggingDidVerifyInternalUser.v2"

DuckDuckGo/AppDelegate.swift

@@ -673,6 +673,8 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
         }
 
         AppDependencyProvider.shared.userBehaviorMonitor.handleAction(.reopenApp)
+
+        autofillPixelReporter.checkIfOnboardedUser()
     }
 
     func applicationDidEnterBackground(_ application: UIApplication) {

DuckDuckGo/AutofillPixelReporter.swift

@@ -33,29 +33,34 @@ final class AutofillPixelReporter {
     var autofillOnboardedUser: Bool
 
     private let statisticsStorage: StatisticsStore
-    private let secureVault: (any AutofillSecureVault)?
+    private var secureVault: (any AutofillSecureVault)?
 
     enum EventType {
         case fill
         case searchDAU
     }
 
-    init(statisticsStorage: StatisticsStore = StatisticsUserDefaults(), secureVault: (any AutofillSecureVault)? = try? AutofillSecureVaultFactory.makeVault(reporter: SecureVaultReporter.shared)) {
+    init(statisticsStorage: StatisticsStore = StatisticsUserDefaults(), secureVault: (any AutofillSecureVault)? = nil) {
         self.statisticsStorage = statisticsStorage
         self.secureVault = secureVault
 
         createNotificationObservers()
 
-        if shouldFireOnboardedUserPixel() {
-            DailyPixel.fire(pixel: .autofillOnboardedUser)
-        }
+        checkIfOnboardedUser()
     }
 
     private func createNotificationObservers() {
         NotificationCenter.default.addObserver(self, selector: #selector(didReceiveSearchDAU), name: .searchDAU, object: nil)
         NotificationCenter.default.addObserver(self, selector: #selector(didReceiveFillEvent), name: .autofillFillEvent, object: nil)
     }
 
+    private func vault() -> (any AutofillSecureVault)? {
+        if secureVault == nil {
+            secureVault = try? AutofillSecureVaultFactory.makeVault(reporter: SecureVaultReporter.shared)
+        }
+        return secureVault
+    }
+
     @objc
     private func didReceiveSearchDAU() {
         guard !Date().isSameDay(autofillSearchDauDate) else {
@@ -78,20 +83,29 @@ final class AutofillPixelReporter {
         firePixels(pixelsToFireFor(.fill))
     }
 
+    func checkIfOnboardedUser() {
+        guard !autofillOnboardedUser else { return }
+
+        if shouldFireOnboardedUserPixel() {
+            firePixels([.autofillOnboardedUser])
+        }
+    }
+
     func pixelsToFireFor(_ type: EventType) -> [Pixel.Event] {
         var pixelsToFire: [Pixel.Event] = []
 
         if shouldFireActiveUserPixel() {
             pixelsToFire.append(.autofillActiveUser)
+            pixelsToFire.append(.autofillLoginsStacked)
         }
 
         switch type {
-        case .fill:
-            pixelsToFire.append(.autofillLoginsStacked)
         case .searchDAU:
             if shouldFireEnabledUserPixel() {
                 pixelsToFire.append(.autofillEnabledUser)
             }
+        default:
+            break
         }
 
         return pixelsToFire
@@ -101,14 +115,29 @@ final class AutofillPixelReporter {
         for pixel in pixels {
             switch pixel {
             case .autofillLoginsStacked:
-                let bucket = (try? secureVault?.accountsCountBucket()) ?? ""
-                DailyPixel.fire(pixel: pixel, withAdditionalParameters: [PixelParameters.countBucket: bucket])
+                if let count = try? vault()?.accountsCount() {
+                    DailyPixel.fire(pixel: pixel, withAdditionalParameters: [PixelParameters.countBucket: accountsBucketNameFrom(count: count)])
+                }
             default:
                 DailyPixel.fire(pixel: pixel)
             }
         }
     }
 
+    public func accountsBucketNameFrom(count: Int) -> String {
+        if count == 0 {
+            return "none"
+        } else if count < 4 {
+            return "few"
+        } else if count < 11 {
+            return "some"
+        } else if count < 50 {
+            return "many"
+        } else {
+            return "lots"
+        }
+    }
+
     private func shouldFireActiveUserPixel() -> Bool {
         let today = Date()
         if today.isSameDay(autofillSearchDauDate) && today.isSameDay(autofillFillDate) {
@@ -118,7 +147,7 @@ final class AutofillPixelReporter {
     }
 
     private func shouldFireEnabledUserPixel() -> Bool {
-        if Date().isSameDay(autofillSearchDauDate), let count = try? secureVault?.accountsCount(), count >= 10 {
+        if Date().isSameDay(autofillSearchDauDate), let count = try? vault()?.accountsCount(), count >= 10 {
             return true
         }
         return false
@@ -132,7 +161,7 @@ final class AutofillPixelReporter {
         let pastWeek = Date().addingTimeInterval(.days(-7))
 
         if installDate >= pastWeek {
-            if let count = try? secureVault?.accountsCount(), count > 0 {
+            if let count = try? vault()?.accountsCount(), count > 0 {
                 autofillOnboardedUser = true
                 return true
             }

DuckDuckGoTests/AutofillPixelReporterTests.swift

@@ -59,35 +59,35 @@ final class AutofillPixelReporterTests: XCTestCase {
         XCTAssertTrue(autofillPixelReporter.pixelsToFireFor(.searchDAU).isEmpty)
     }
 
-    func testWhenUserSearchDauIsNotTodayAndEventTypeIsFillThenOnePixelWillBeFired() {
+    func testWhenUserSearchDauIsNotTodayAndEventTypeIsFillThenNoPixelsWillBeFired() {
         autofillPixelReporter.autofillSearchDauDate = Date().addingTimeInterval(-2 * 60 * 60 * 24)
         autofillPixelReporter.autofillFillDate = Date().addingTimeInterval(-2 * 60 * 60 * 24)
 
-        XCTAssertEqual(autofillPixelReporter.pixelsToFireFor(.fill).count, 1)
+        XCTAssertTrue(autofillPixelReporter.pixelsToFireFor(.fill).isEmpty)
     }
 
-    func testWhenUserSearchDauIsTodayAndAutofillDateIsTodayAndEventTypeIsSearchDauAndAccountsCountIsLessThanTenThenOnePixelWillBeFired() {
+    func testWhenUserSearchDauIsTodayAndAutofillDateIsTodayAndEventTypeIsSearchDauAndAccountsCountIsLessThanTenThenTwoPixelWillBeFired() {
         autofillPixelReporter.autofillSearchDauDate = Date()
         autofillPixelReporter.autofillFillDate = Date()
         createAccountsInVault(count: 4)
 
-        XCTAssertEqual(autofillPixelReporter.pixelsToFireFor(.searchDAU).count, 1)
+        XCTAssertEqual(autofillPixelReporter.pixelsToFireFor(.searchDAU).count, 2)
     }
 
-    func testWhenUserSearchDauIsTodayAndAutofillDateIsTodayAndEventTypeIsSearchDauAndAccountsCountIsTenThenTwoPixelsWillBeFired() {
+    func testWhenUserSearchDauIsTodayAndAutofillDateIsTodayAndEventTypeIsSearchDauAndAccountsCountIsTenThenThreePixelsWillBeFired() {
         autofillPixelReporter.autofillSearchDauDate = Date()
         autofillPixelReporter.autofillFillDate = Date()
         createAccountsInVault(count: 10)
 
-        XCTAssertEqual(autofillPixelReporter.pixelsToFireFor(.searchDAU).count, 2)
+        XCTAssertEqual(autofillPixelReporter.pixelsToFireFor(.searchDAU).count, 3)
     }
 
-    func testWhenUserSearchDauIsTodayAndAutofillDateIsTodayAndEventTypeIsSearchDauAndAccountsCountIsGreaterThanTenThenTwoPixelsWillBeFired() {
+    func testWhenUserSearchDauIsTodayAndAutofillDateIsTodayAndEventTypeIsSearchDauAndAccountsCountIsGreaterThanTenThenThreePixelsWillBeFired() {
         autofillPixelReporter.autofillSearchDauDate = Date()
         autofillPixelReporter.autofillFillDate = Date()
         createAccountsInVault(count: 15)
 
-        XCTAssertEqual(autofillPixelReporter.pixelsToFireFor(.searchDAU).count, 2)
+        XCTAssertEqual(autofillPixelReporter.pixelsToFireFor(.searchDAU).count, 3)
     }
 
     func testWhenUserSearchDauIsTodayAndAutofillDateIsNotTodayAndEventTypeIsSearchDauAndAccountsCountIsLessThanTenThenNoPixelsWillBeFired() {