Revert "Release PR: Check for the negative attribution case (#3311)"

This reverts commit dddd0e2.
duckduckgo · Sep 12, 2024 · 101b907 · 101b907
1 parent 966fa49
commit 101b907
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 18 deletions.
diff --git a/Core/PixelEvent.swift b/Core/PixelEvent.swift
@@ -725,7 +725,6 @@ extension Pixel {
 
         // MARK: Apple Ad Attribution
         case appleAdAttribution
-        case appleAdAttributionNotAttributed
 
         // MARK: Secure Vault
         case secureVaultL1KeyMigration
@@ -1446,7 +1445,6 @@ extension Pixel.Event {
 
         // MARK: - Apple Ad Attribution
         case .appleAdAttribution: return "m_apple-ad-attribution"
-        case .appleAdAttributionNotAttributed: return "m_apple-ad-attribution_not-attributed"
 
         // MARK: - User behavior
         case .userBehaviorReloadTwiceWithin12Seconds: return "m_reload-twice-within-12-seconds"

diff --git a/DuckDuckGo/AdAttribution/AdAttributionPixelReporter.swift b/DuckDuckGo/AdAttribution/AdAttributionPixelReporter.swift
@@ -56,17 +56,17 @@ final actor AdAttributionPixelReporter {
         }
 
         if let (token, attributionData) = await self.attributionFetcher.fetch() {
-            let event: Pixel.Event = attributionData.attribution ? .appleAdAttribution : .appleAdAttributionNotAttributed
-            let parameters = attributionData.attribution ? self.pixelParametersForAttribution(attributionData, attributionToken: token) : [:]
-
-            do {
-                try await pixelFiring.fire(
-                    pixel: event,
-                    withAdditionalParameters: parameters,
-                    includedParameters: [.appVersion, .atb]
-                )
-            } catch {
-                return false
+            if attributionData.attribution {
+                let parameters = self.pixelParametersForAttribution(attributionData, attributionToken: token)
+                do {
+                    try await pixelFiring.fire(
+                        pixel: .appleAdAttribution,
+                        withAdditionalParameters: parameters,
+                        includedParameters: [.appVersion, .atb]
+                    )
+                } catch {
+                    return false
+                }
             }
 
             await fetcherStorage.markAttributionReportSuccessful()

diff --git a/DuckDuckGoTests/AdAttributionPixelReporterTests.swift b/DuckDuckGoTests/AdAttributionPixelReporterTests.swift
@@ -124,16 +124,13 @@ final class AdAttributionPixelReporterTests: XCTestCase {
         XCTAssertNil(pixelAttributes["ad_id"])
     }
 
-    func testNotAttributedPixelFiredAndMarkedReported_WhenAttributionFalse() async throws {
+    func testPixelNotFiredAndMarksReport_WhenAttributionFalse() async {
         let sut = createSUT()
         attributionFetcher.fetchResponse = ("example", AdServicesAttributionResponse(attribution: false))
 
         let result = await sut.reportAttributionIfNeeded()
 
-        let pixelAttributes = try XCTUnwrap(PixelFiringMock.lastParams)
-
-        XCTAssertEqual(pixelAttributes, [:])
-        XCTAssertEqual(PixelFiringMock.lastPixel?.name, "m_apple-ad-attribution_not-attributed")
+        XCTAssertNil(PixelFiringMock.lastPixel)
         XCTAssertTrue(fetcherStorage.wasAttributionReportSuccessful)
         XCTAssertTrue(result)
     }