Aligned Privacy dashboard first time pixel with Android

duckduckgo · Aug 2, 2024 · 6894299 · 6894299
1 parent 7f146c8
commit 6894299
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 35 deletions.
diff --git a/DuckDuckGo/MainViewController.swift b/DuckDuckGo/MainViewController.swift
@@ -1730,7 +1730,9 @@ extension MainViewController: OmniBarDelegate {
         guard !isSERPPresented else { return }
 
         // Track first tap of privacy icon button
-        contextualOnboardingPixelReporter.trackPrivacyDashboardOpenedForFirstTime(fromOnboarding: isHighlighted)
+        if isHighlighted {
+            contextualOnboardingPixelReporter.trackPrivacyDashboardOpenedForFirstTime()
+        }
         // Dismiss privacy icon animation when showing privacy dashboard
         dismissPrivacyDashboardButtonPulse()
 

diff --git a/DuckDuckGo/OnboardingExperiment/Pixels/OnboardingPixelReporter.swift b/DuckDuckGo/OnboardingExperiment/Pixels/OnboardingPixelReporter.swift
@@ -62,7 +62,7 @@ protocol OnboardingCustomInteractionPixelReporting {
     func trackCustomSearch()
     func trackCustomSite()
     func trackSecondSiteVisit()
-    func trackPrivacyDashboardOpenedForFirstTime(fromOnboarding: Bool)
+    func trackPrivacyDashboardOpenedForFirstTime()
 }
 
 protocol OnboardingScreenImpressionReporting {
@@ -96,12 +96,11 @@ final class OnboardingPixelReporter {
         self.userDefaults = userDefaults
     }
 
-    private func fire(event: Pixel.Event, unique: Bool, additionalParameters: [String: String] = [:]) {
-        let parameters: [Pixel.QueryParameters] = [.appVersion, .atb]
+    private func fire(event: Pixel.Event, unique: Bool, additionalParameters: [String: String] = [:], includedParameters: [Pixel.QueryParameters] = [.appVersion, .atb]) {
         if unique {
-            uniquePixel.fire(pixel: event, withAdditionalParameters: additionalParameters, includedParameters: parameters)
+            uniquePixel.fire(pixel: event, withAdditionalParameters: additionalParameters, includedParameters: includedParameters)
         } else {
-            pixel.fire(pixel: event, withAdditionalParameters: additionalParameters, includedParameters: parameters)
+            pixel.fire(pixel: event, withAdditionalParameters: additionalParameters, includedParameters: includedParameters)
         }
     }
 
@@ -163,13 +162,13 @@ extension OnboardingPixelReporter: OnboardingCustomInteractionPixelReporting {
         }
     }
 
-    func trackPrivacyDashboardOpenedForFirstTime(fromOnboarding: Bool) {
+    func trackPrivacyDashboardOpenedForFirstTime() {
         let daysSinceInstall = statisticsStore.installDate.flatMap { calendar.numberOfDaysBetween($0, and: dateProvider()) }
         let additionalParameters = [
-            PixelParameters.fromOnboarding: String(fromOnboarding),
+            PixelParameters.fromOnboarding: "true",
             PixelParameters.daysSinceInstall: String(daysSinceInstall ?? 0)
         ]
-        fire(event: .privacyDashboardFirstTimeOpenedUnique, unique: true, additionalParameters: additionalParameters)
+        fire(event: .privacyDashboardFirstTimeOpenedUnique, unique: true, additionalParameters: additionalParameters, includedParameters: [.appVersion])
     }
 
 }

diff --git a/DuckDuckGoTests/OnboardingNavigationDelegateTests.swift b/DuckDuckGoTests/OnboardingNavigationDelegateTests.swift
@@ -155,32 +155,28 @@ final class OnboardingNavigationDelegateTests: XCTestCase {
 
     // MARK: Pixel
 
-    func testWhenPrivacyBarIconIsPressed_AndPrivacyIconIsHighlighted_ThenFireFirstTimePrivacyDashboardUsedPixel_AndFromOnboardingIsTrue() {
+    func testWhenPrivacyBarIconIsPressed_AndPrivacyIconIsHighlighted_ThenFireFirstTimePrivacyDashboardUsedPixel() {
         // GIVEN
         let isHighlighted = true
         XCTAssertFalse(onboardingPixelReporter.didCallTrackPrivacyDashboardOpenedForFirstTime)
-        XCTAssertNil(onboardingPixelReporter.capturedFromOnboarding)
 
         // WHEN
         mainVC.onPrivacyIconPressed(isHighlighted: isHighlighted)
 
         // THEN
         XCTAssertTrue(onboardingPixelReporter.didCallTrackPrivacyDashboardOpenedForFirstTime)
-        XCTAssertEqual(onboardingPixelReporter.capturedFromOnboarding, true)
     }
 
-    func testWhenPrivacyBarIconIsPressed_AndPrivacyIconIsNotHighlighted_ThenFireFirstTimePrivacyDashboardUsedPixel_AndFromOnboardingIsFalse() {
+    func testWhenPrivacyBarIconIsPressed_AndPrivacyIconIsNotHighlighted_ThenDoNotFireFirstTimePrivacyDashboardUsedPixel() {
         // GIVEN
         let isHighlighted = false
         XCTAssertFalse(onboardingPixelReporter.didCallTrackPrivacyDashboardOpenedForFirstTime)
-        XCTAssertNil(onboardingPixelReporter.capturedFromOnboarding)
 
         // WHEN
         mainVC.onPrivacyIconPressed(isHighlighted: isHighlighted)
 
         // THEN
-        XCTAssertTrue(onboardingPixelReporter.didCallTrackPrivacyDashboardOpenedForFirstTime)
-        XCTAssertEqual(onboardingPixelReporter.capturedFromOnboarding, false)
+        XCTAssertFalse(onboardingPixelReporter.didCallTrackPrivacyDashboardOpenedForFirstTime)
     }
 
 }

diff --git a/DuckDuckGoTests/OnboardingPixelReporterMock.swift b/DuckDuckGoTests/OnboardingPixelReporterMock.swift
@@ -35,7 +35,6 @@ final class OnboardingPixelReporterMock: OnboardingSiteSuggestionsPixelReporting
     private(set) var didCallTrackScreenImpressionCalled = false
     private(set) var capturedScreenImpression: Pixel.Event?
     private(set) var didCallTrackPrivacyDashboardOpenedForFirstTime = false
-    private(set) var capturedFromOnboarding: Bool?
 
     func trackSiteSuggetionOptionTapped() {
         didCallTrackSiteOptionTapped = true
@@ -62,8 +61,7 @@ final class OnboardingPixelReporterMock: OnboardingSiteSuggestionsPixelReporting
         capturedScreenImpression = event
     }
 
-    func trackPrivacyDashboardOpenedForFirstTime(fromOnboarding: Bool) {
+    func trackPrivacyDashboardOpenedForFirstTime() {
         didCallTrackPrivacyDashboardOpenedForFirstTime = true
-        capturedFromOnboarding = fromOnboarding
     }
 }
diff --git a/DuckDuckGoTests/OnboardingPixelReporterTests.swift b/DuckDuckGoTests/OnboardingPixelReporterTests.swift
@@ -234,37 +234,26 @@ final class OnboardingPixelReporterTests: XCTestCase {
         XCTAssertEqual(OnboardingUniquePixelFireMock.capturedIncludeParameters, [])
 
         // WHEN
-        sut.trackPrivacyDashboardOpenedForFirstTime(fromOnboarding: true)
+        sut.trackPrivacyDashboardOpenedForFirstTime()
 
         // THEN
         XCTAssertTrue(OnboardingUniquePixelFireMock.didCallFire)
         XCTAssertEqual(OnboardingUniquePixelFireMock.capturedPixelEvent, expectedPixel)
         XCTAssertEqual(expectedPixel.name, "m_privacy_dashboard_first_time_used_unique")
-        XCTAssertEqual(OnboardingUniquePixelFireMock.capturedIncludeParameters, [.appVersion, .atb])
+        XCTAssertEqual(OnboardingUniquePixelFireMock.capturedIncludeParameters, [.appVersion])
     }
 
-    func testWhenTrackPrivacyDashboardOpenedForFirstTimeAndFromOnboardingFalseThenParameterIsSetToFalse() {
+    func testWhenTrackPrivacyDashboardOpenedForFirstTimeThenFromOnboardingParameterIsSetToTrue() {
         // GIVEN
         XCTAssertEqual(OnboardingUniquePixelFireMock.capturedParams, [:])
 
         // WHEN
-        sut.trackPrivacyDashboardOpenedForFirstTime(fromOnboarding: true)
+        sut.trackPrivacyDashboardOpenedForFirstTime()
 
         // THEN
         XCTAssertEqual(OnboardingUniquePixelFireMock.capturedParams["from_onboarding"], "true")
     }
 
-    func testWhenTrackPrivacyDashboardOpenedForFirstTimeAndFromOnboardingTrueThenParameterIsSetToTrue() {
-        // GIVEN
-        XCTAssertEqual(OnboardingUniquePixelFireMock.capturedParams, [:])
-
-        // WHEN
-        sut.trackPrivacyDashboardOpenedForFirstTime(fromOnboarding: false)
-
-        // THEN
-        XCTAssertEqual(OnboardingUniquePixelFireMock.capturedParams["from_onboarding"], "false")
-    }
-
     func testWhenTrackPrivacyDashboardOpenedForFirstTimeThenDaysSinceInstallParameterIsSet() {
         // GIVEN
         let installDate = Date(timeIntervalSince1970: 1722348000) // 30th July 2024 GMT
@@ -273,7 +262,7 @@ final class OnboardingPixelReporterTests: XCTestCase {
         XCTAssertEqual(OnboardingUniquePixelFireMock.capturedParams, [:])
 
         // WHEN
-        sut.trackPrivacyDashboardOpenedForFirstTime(fromOnboarding: false)
+        sut.trackPrivacyDashboardOpenedForFirstTime()
 
         // THEN
         XCTAssertEqual(OnboardingUniquePixelFireMock.capturedParams["daysSinceInstall"], "3")