diff options
Diffstat (limited to 'adservices/tests/unittest/service-core/assets/msmt_browser_deletion_tests')
18 files changed, 1042 insertions, 461 deletions
diff --git a/adservices/tests/unittest/service-core/assets/msmt_browser_deletion_tests/registrant_not_found.json b/adservices/tests/unittest/service-core/assets/msmt_browser_deletion_tests/registrant_not_found.json index c1153ccd6a..738d5e5c8d 100644 --- a/adservices/tests/unittest/service-core/assets/msmt_browser_deletion_tests/registrant_not_found.json +++ b/adservices/tests/unittest/service-core/assets/msmt_browser_deletion_tests/registrant_not_found.json @@ -68,7 +68,7 @@ "event_reports": [ { "id": "E1", - "sourceId": 1, + "sourceEventId": 1, "attributionDestination": "android-app://com.site3", "enrollmentId": "enrollment-id", "triggerData": 2, @@ -80,7 +80,7 @@ }, { "id": "E2", - "sourceId": 2, + "sourceEventId": 2, "attributionDestination": "android-app://com.site3", "enrollmentId": "enrollment-id", "triggerData": 2, @@ -182,7 +182,7 @@ "event_reports": [ { "id": "E1", - "sourceId": 1, + "sourceEventId": 1, "attributionDestination": "android-app://com.site3", "enrollmentId": "enrollment-id", "triggerData": 2, @@ -194,7 +194,7 @@ }, { "id": "E2", - "sourceId": 2, + "sourceEventId": 2, "attributionDestination": "android-app://com.site3", "enrollmentId": "enrollment-id", "triggerData": 2, @@ -229,7 +229,7 @@ ] }, "param": { - "registrant": "android-app://com.registrant.toBeDeleted", + "registrant": "com.registrant.toBeDeleted", "origins": [], "domains": [] } diff --git a/adservices/tests/unittest/service-core/assets/msmt_browser_deletion_tests/with_multiple_origin_no_domain.json b/adservices/tests/unittest/service-core/assets/msmt_browser_deletion_tests/with_multiple_origin_no_domain.json index 18ab8ccf58..fc28db5738 100644 --- a/adservices/tests/unittest/service-core/assets/msmt_browser_deletion_tests/with_multiple_origin_no_domain.json +++ b/adservices/tests/unittest/service-core/assets/msmt_browser_deletion_tests/with_multiple_origin_no_domain.json @@ -137,7 +137,7 @@ "event_reports": [ { "id": "E1", - "sourceId": 1, + "sourceEventId": 1, "attributionDestination": "https://deleteCandidate1.site.com", "enrollmentId": "enrollment-id", "triggerData": 2, @@ -145,11 +145,13 @@ "status": 0, "reportTime": -1, "triggerPriority": 101, - "sourceType": "navigation" + "sourceType": "navigation", + "sourceId": "S1", + "triggerId": "T1" }, { "id": "E2", - "sourceId": 1, + "sourceEventId": 1, "attributionDestination": "android-app://com.site.notInRangeButDeleteDueToSourceId1", "enrollmentId": "enrollment-id", "triggerData": 2, @@ -157,11 +159,13 @@ "status": 0, "reportTime": -1, "triggerPriority": 101, - "sourceType": "navigation" + "sourceType": "navigation", + "sourceId": "S1", + "triggerId": "T2" }, { "id": "E3", - "sourceId": 2, + "sourceEventId": 2, "attributionDestination": "https://doNotDelete.site.com", "enrollmentId": "enrollment-id", "triggerData": 2, @@ -169,11 +173,13 @@ "status": 0, "reportTime": -1, "triggerPriority": 101, - "sourceType": "navigation" + "sourceType": "navigation", + "sourceId": "S3", + "triggerId": "T3" }, { "id": "E4", - "sourceId": 2, + "sourceEventId": 2, "attributionDestination": "https://deleteCandidate1.site.com", "enrollmentId": "enrollment-id", "triggerData": 2, @@ -181,11 +187,13 @@ "status": 0, "reportTime": -1, "triggerPriority": 101, - "sourceType": "navigation" + "sourceType": "navigation", + "sourceId": "S1", + "triggerId": "T1" }, { "id": "E5", - "sourceId": 2, + "sourceEventId": 2, "attributionDestination": "https://deleteCandidate1.site.com", "enrollmentId": "enrollment-id", "triggerData": 2, @@ -193,11 +201,13 @@ "status": 0, "reportTime": -1, "triggerPriority": 101, - "sourceType": "navigation" + "sourceType": "navigation", + "sourceId": "S3", + "triggerId": "T3" }, { "id": "E6", - "sourceId": 2, + "sourceEventId": 2, "attributionDestination": "https://deleteCandidate2.site.com", "enrollmentId": "enrollment-id", "triggerData": 2, @@ -205,7 +215,9 @@ "status": 0, "reportTime": -1, "triggerPriority": 101, - "sourceType": "navigation" + "sourceType": "navigation", + "sourceId": "S3", + "triggerId": "T4" } ], "attributions": [ @@ -217,7 +229,9 @@ "destinationOrigin": "https://site2.com", "enrollmentId": "enrollment-id", "triggerTime": 1648665733601, - "registrant": "android-app://com.registrant.deleteCandidate" + "registrant": "android-app://com.registrant.deleteCandidate", + "sourceId": "S1", + "triggerId": "T1" }, { "id": "A2", @@ -227,7 +241,9 @@ "destinationOrigin": "https://site2.com", "enrollmentId": "enrollment-id", "triggerTime": 1648665733605, - "registrant": "android-app://com.registrant.deleteCandidate" + "registrant": "android-app://com.registrant.deleteCandidate", + "sourceId": "S2", + "triggerId": "T3" }, { "id": "A3", @@ -237,7 +253,9 @@ "destinationOrigin": "https://site2.com", "enrollmentId": "enrollment-id", "triggerTime": 1648665733601, - "registrant": "android-app://com.registrant.deleteCandidate" + "registrant": "android-app://com.registrant.deleteCandidate", + "sourceId": "S3", + "triggerId": "T3" }, { "id": "A4", @@ -247,7 +265,9 @@ "destinationOrigin": "https://site2.com", "enrollmentId": "enrollment-id", "triggerTime": 1648665733601, - "registrant": "android-app://com.registrant.deleteCandidate" + "registrant": "android-app://com.registrant.deleteCandidate", + "sourceId": "S2", + "triggerId": "T4" } ] }, @@ -323,7 +343,7 @@ "event_reports": [ { "id": "E3", - "sourceId": 2, + "sourceEventId": 2, "attributionDestination": "https://doNotDelete.site.com", "enrollmentId": "enrollment-id", "triggerData": 2, @@ -331,11 +351,13 @@ "status": 0, "reportTime": -1, "triggerPriority": 101, - "sourceType": "navigation" + "sourceType": "navigation", + "sourceId": "S3", + "triggerId": "T3" }, { "id": "E5", - "sourceId": 2, + "sourceEventId": 2, "attributionDestination": "https://deleteCandidate1.site.com", "enrollmentId": "enrollment-id", "triggerData": 2, @@ -343,7 +365,9 @@ "status": 0, "reportTime": -1, "triggerPriority": 101, - "sourceType": "navigation" + "sourceType": "navigation", + "sourceId": "S3", + "triggerId": "T3" } ], "attributions": [ @@ -355,7 +379,9 @@ "destinationOrigin": "https://site2.com", "enrollmentId": "enrollment-id", "triggerTime": 1648665733605, - "registrant": "android-app://com.registrant.deleteCandidate" + "registrant": "android-app://com.registrant.deleteCandidate", + "sourceId": "S2", + "triggerId": "T3" }, { "id": "A3", @@ -365,12 +391,14 @@ "destinationOrigin": "https://site2.com", "enrollmentId": "enrollment-id", "triggerTime": 1648665733601, - "registrant": "android-app://com.registrant.deleteCandidate" + "registrant": "android-app://com.registrant.deleteCandidate", + "sourceId": "S3", + "triggerId": "T3" } ] }, "param": { - "registrant": "android-app://com.registrant.deleteCandidate", + "registrant": "com.registrant.deleteCandidate", "start": 1648665733600, "end": 1648665733602, "origins": ["https://deleteCandidate1.site.com", "https://deleteCandidate2.site.com"], diff --git a/adservices/tests/unittest/service-core/assets/msmt_browser_deletion_tests/with_multiple_origin_no_domain_preserve.json b/adservices/tests/unittest/service-core/assets/msmt_browser_deletion_tests/with_multiple_origin_no_domain_preserve.json index cab136da19..95d779d70f 100644 --- a/adservices/tests/unittest/service-core/assets/msmt_browser_deletion_tests/with_multiple_origin_no_domain_preserve.json +++ b/adservices/tests/unittest/service-core/assets/msmt_browser_deletion_tests/with_multiple_origin_no_domain_preserve.json @@ -1,6 +1,6 @@ { "name": "With multiple origin and no domain - preserve", - "description": "(S3), (T3), (E3) AND (A1, A3, A4, A5) will be deleted due to mismatched origins. E2 not delete as it is out of range", + "description": "(S3), (T3), (E3) AND (A2, A3, A5) will be deleted due to mismatched origins. E2 not delete as it is out of range", "input": { "sources": [ { @@ -137,7 +137,7 @@ "event_reports": [ { "id": "E1", - "sourceId": 1, + "sourceEventId": 1, "attributionDestination": "https://deleteCandidate1.site.com", "enrollmentId": "enrollment-id", "triggerData": 2, @@ -145,23 +145,27 @@ "status": 0, "reportTime": -1, "triggerPriority": 101, - "sourceType": "navigation" + "sourceType": "navigation", + "sourceId": "S1", + "triggerId": "T1" }, { "id": "E2", - "sourceId": 1, - "attributionDestination": "android-app://com.site.notInRangeButDeleteDueToSourceId1", + "sourceEventId": 1, + "attributionDestination": "android-app://com.site.notInRangeButDeleteDueTosourceEventId1", "enrollmentId": "enrollment-id", "triggerData": 2, "triggerTime": 1648665733605, "status": 0, "reportTime": -1, "triggerPriority": 101, - "sourceType": "navigation" + "sourceType": "navigation", + "sourceId": "S1", + "triggerId": "T2" }, { "id": "E3", - "sourceId": 2, + "sourceEventId": 2, "attributionDestination": "https://doNotDelete.site.com", "enrollmentId": "enrollment-id", "triggerData": 2, @@ -169,11 +173,13 @@ "status": 0, "reportTime": -1, "triggerPriority": 101, - "sourceType": "navigation" + "sourceType": "navigation", + "sourceId": "S3", + "triggerId": "T3" }, { "id": "E4", - "sourceId": 2, + "sourceEventId": 2, "attributionDestination": "https://deleteCandidate1.site.com", "enrollmentId": "enrollment-id", "triggerData": 2, @@ -181,11 +187,13 @@ "status": 0, "reportTime": -1, "triggerPriority": 101, - "sourceType": "navigation" + "sourceType": "navigation", + "sourceId": "S2", + "triggerId": "T2" }, { "id": "E5", - "sourceId": 2, + "sourceEventId": 2, "attributionDestination": "https://deleteCandidate1.site.com", "enrollmentId": "enrollment-id", "triggerData": 2, @@ -193,11 +201,13 @@ "status": 0, "reportTime": -1, "triggerPriority": 101, - "sourceType": "navigation" + "sourceType": "navigation", + "sourceId": "S1", + "triggerId": "T4" }, { "id": "E6", - "sourceId": 2, + "sourceEventId": 2, "attributionDestination": "https://deleteCandidate2.site.com", "enrollmentId": "enrollment-id", "triggerData": 2, @@ -205,7 +215,9 @@ "status": 0, "reportTime": -1, "triggerPriority": 101, - "sourceType": "navigation" + "sourceType": "navigation", + "sourceId": "S4", + "triggerId": "T4" } ], "attributions": [ @@ -217,7 +229,9 @@ "destinationOrigin": "https://site2.com", "enrollmentId": "enrollment-id", "triggerTime": 1648665733601, - "registrant": "android-app://com.registrant.deleteCandidate" + "registrant": "android-app://com.registrant.deleteCandidate", + "sourceId": "S1", + "triggerId": "T1" }, { "id": "A2", @@ -227,7 +241,9 @@ "destinationOrigin": "https://deleteCandidate2.site.com", "enrollmentId": "enrollment-id", "triggerTime": 1648665733605, - "registrant": "android-app://com.registrant.deleteCandidate" + "registrant": "android-app://com.registrant.deleteCandidate", + "sourceId": "S1", + "triggerId": "T3" }, { "id": "A3", @@ -237,7 +253,9 @@ "destinationOrigin": "https://site2.com", "enrollmentId": "enrollment-id", "triggerTime": 1648665733601, - "registrant": "android-app://com.registrant.deleteCandidate" + "registrant": "android-app://com.registrant.deleteCandidate", + "sourceId": "S3", + "triggerId": "T3" }, { "id": "A4", @@ -247,7 +265,9 @@ "destinationOrigin": "https://site2.com", "enrollmentId": "enrollment-id", "triggerTime": 1648665733601, - "registrant": "android-app://com.registrant.deleteCandidate" + "registrant": "android-app://com.registrant.deleteCandidate", + "sourceId": "S2", + "triggerId": "T4" }, { "id": "A5", @@ -257,7 +277,9 @@ "destinationOrigin": "https://site2.com", "enrollmentId": "enrollment-id", "triggerTime": 1648665733601, - "registrant": "android-app://com.registrant.deleteCandidate" + "registrant": "android-app://com.registrant.deleteCandidate", + "sourceId": "S3", + "triggerId": "T4" } ] }, @@ -365,7 +387,7 @@ "event_reports": [ { "id": "E1", - "sourceId": 1, + "sourceEventId": 1, "attributionDestination": "https://deleteCandidate1.site.com", "enrollmentId": "enrollment-id", "triggerData": 2, @@ -373,23 +395,27 @@ "status": 0, "reportTime": -1, "triggerPriority": 101, - "sourceType": "navigation" + "sourceType": "navigation", + "sourceId": "S1", + "triggerId": "T1" }, { "id": "E2", - "sourceId": 1, - "attributionDestination": "android-app://com.site.notInRangeButDeleteDueToSourceId1", + "sourceEventId": 1, + "attributionDestination": "android-app://com.site.notInRangeButDeleteDueTosourceEventId1", "enrollmentId": "enrollment-id", "triggerData": 2, "triggerTime": 1648665733605, "status": 0, "reportTime": -1, "triggerPriority": 101, - "sourceType": "navigation" + "sourceType": "navigation", + "sourceId": "S1", + "triggerId": "T2" }, { "id": "E4", - "sourceId": 2, + "sourceEventId": 2, "attributionDestination": "https://deleteCandidate1.site.com", "enrollmentId": "enrollment-id", "triggerData": 2, @@ -397,11 +423,13 @@ "status": 0, "reportTime": -1, "triggerPriority": 101, - "sourceType": "navigation" + "sourceType": "navigation", + "sourceId": "S2", + "triggerId": "T2" }, { "id": "E5", - "sourceId": 2, + "sourceEventId": 2, "attributionDestination": "https://deleteCandidate1.site.com", "enrollmentId": "enrollment-id", "triggerData": 2, @@ -409,11 +437,13 @@ "status": 0, "reportTime": -1, "triggerPriority": 101, - "sourceType": "navigation" + "sourceType": "navigation", + "sourceId": "S1", + "triggerId": "T4" }, { "id": "E6", - "sourceId": 2, + "sourceEventId": 2, "attributionDestination": "https://deleteCandidate2.site.com", "enrollmentId": "enrollment-id", "triggerData": 2, @@ -421,24 +451,40 @@ "status": 0, "reportTime": -1, "triggerPriority": 101, - "sourceType": "navigation" + "sourceType": "navigation", + "sourceId": "S4", + "triggerId": "T4" } ], "attributions": [ { - "id": "A2", + "id": "A1", "sourceSite": "https://site.com", "sourceOrigin": "https://deleteCandidate1.site.com", - "destinationSite": "https://site.com", - "destinationOrigin": "https://deleteCandidate2.site.com", + "destinationSite": "https://site2.com", + "destinationOrigin": "https://site2.com", "enrollmentId": "enrollment-id", - "triggerTime": 1648665733605, - "registrant": "android-app://com.registrant.deleteCandidate" + "triggerTime": 1648665733601, + "registrant": "android-app://com.registrant.deleteCandidate", + "sourceId": "S1", + "triggerId": "T1" + }, + { + "id": "A4", + "sourceSite": "https://site.com", + "sourceOrigin": "https://deleteCandidate2.site.com", + "destinationSite": "https://site2.com", + "destinationOrigin": "https://site2.com", + "enrollmentId": "enrollment-id", + "triggerTime": 1648665733601, + "registrant": "android-app://com.registrant.deleteCandidate", + "sourceId": "S2", + "triggerId": "T4" } ] }, "param": { - "registrant": "android-app://com.registrant.deleteCandidate", + "registrant": "com.registrant.deleteCandidate", "start": 1648665733600, "end": 1648665733602, "origins": ["https://deleteCandidate1.site.com", "https://deleteCandidate2.site.com"], diff --git a/adservices/tests/unittest/service-core/assets/msmt_browser_deletion_tests/with_no_origin_multiple_domain.json b/adservices/tests/unittest/service-core/assets/msmt_browser_deletion_tests/with_no_origin_multiple_domain.json index 683075d30b..89651845f6 100644 --- a/adservices/tests/unittest/service-core/assets/msmt_browser_deletion_tests/with_no_origin_multiple_domain.json +++ b/adservices/tests/unittest/service-core/assets/msmt_browser_deletion_tests/with_no_origin_multiple_domain.json @@ -137,7 +137,7 @@ "event_reports": [ { "id": "E1", - "sourceId": 1, + "sourceEventId": 1, "attributionDestination": "https://deleteCandidate1.site.com", "enrollmentId": "enrollment-id", "triggerData": 2, @@ -145,23 +145,27 @@ "status": 0, "reportTime": -1, "triggerPriority": 101, - "sourceType": "navigation" + "sourceType": "navigation", + "sourceId" : "S1", + "triggerId" : "T1" }, { "id": "E2", - "sourceId": 1, - "attributionDestination": "android-app://com.site.notInRangeButDeleteDueToSourceId1", + "sourceEventId": 1, + "attributionDestination": "android-app://com.site.notInRangeButDeleteDueTosourceEventId1", "enrollmentId": "enrollment-id", "triggerData": 2, "triggerTime": 1648665733605, "status": 0, "reportTime": -1, "triggerPriority": 101, - "sourceType": "navigation" + "sourceType": "navigation", + "sourceId" : "S1", + "triggerId" : "T1" }, { "id": "E3", - "sourceId": 2, + "sourceEventId": 2, "attributionDestination": "https://delete.sitec.com", "enrollmentId": "enrollment-id", "triggerData": 2, @@ -169,11 +173,13 @@ "status": 0, "reportTime": -1, "triggerPriority": 101, - "sourceType": "navigation" + "sourceType": "navigation", + "sourceId" : "S4", + "triggerId" : "T1" }, { "id": "E4", - "sourceId": 2, + "sourceEventId": 2, "attributionDestination": "https://deleteCandidate1.site.com", "enrollmentId": "enrollment-id", "triggerData": 2, @@ -181,11 +187,13 @@ "status": 0, "reportTime": -1, "triggerPriority": 101, - "sourceType": "navigation" + "sourceType": "navigation", + "sourceId" : "S1", + "triggerId" : "T1" }, { "id": "E5", - "sourceId": 2, + "sourceEventId": 2, "attributionDestination": "https://deleteCandidate1.site.com", "enrollmentId": "enrollment-id", "triggerData": 2, @@ -193,11 +201,13 @@ "status": 0, "reportTime": -1, "triggerPriority": 101, - "sourceType": "navigation" + "sourceType": "navigation", + "sourceId" : "S3", + "triggerId" : "T2" }, { "id": "E6", - "sourceId": 2, + "sourceEventId": 2, "attributionDestination": "https://deleteCandidate2.site.com", "enrollmentId": "enrollment-id", "triggerData": 2, @@ -205,7 +215,9 @@ "status": 0, "reportTime": -1, "triggerPriority": 101, - "sourceType": "navigation" + "sourceType": "navigation", + "sourceId" : "S3", + "triggerId" : "T4" } ], "attributions": [ @@ -217,7 +229,9 @@ "destinationOrigin": "https://site2.com", "enrollmentId": "enrollment-id", "triggerTime": 1648665733601, - "registrant": "android-app://com.registrant.deleteCandidate" + "registrant": "android-app://com.registrant.deleteCandidate", + "sourceId" : "S1", + "triggerId" : "T1" }, { "id": "A2", @@ -227,7 +241,9 @@ "destinationOrigin": "https://site2.com", "enrollmentId": "enrollment-id", "triggerTime": 1648665733605, - "registrant": "android-app://com.registrant.deleteCandidate" + "registrant": "android-app://com.registrant.deleteCandidate", + "sourceId" : "S2", + "triggerId" : "T2" }, { "id": "A3", @@ -237,7 +253,9 @@ "destinationOrigin": "https://site2.com", "enrollmentId": "enrollment-id", "triggerTime": 1648665733601, - "registrant": "android-app://com.registrant.deleteCandidate" + "registrant": "android-app://com.registrant.deleteCandidate", + "sourceId" : "S3", + "triggerId" : "T3" }, { "id": "A4", @@ -247,7 +265,9 @@ "destinationOrigin": "https://site2.com", "enrollmentId": "enrollment-id", "triggerTime": 1648665733601, - "registrant": "android-app://com.registrant.deleteCandidate" + "registrant": "android-app://com.registrant.deleteCandidate", + "sourceId" : "S4", + "triggerId" : "T4" }, { "id": "A5", @@ -257,7 +277,9 @@ "destinationOrigin": "https://site2.com", "enrollmentId": "enrollment-id", "triggerTime": 1648665733601, - "registrant": "android-app://com.registrant.deleteCandidate" + "registrant": "android-app://com.registrant.deleteCandidate", + "sourceId" : "S3", + "triggerId" : "T2" } ] }, @@ -333,7 +355,7 @@ "event_reports": [ { "id": "E5", - "sourceId": 2, + "sourceEventId": 2, "attributionDestination": "https://deleteCandidate1.site.com", "enrollmentId": "enrollment-id", "triggerData": 2, @@ -341,7 +363,9 @@ "status": 0, "reportTime": -1, "triggerPriority": 101, - "sourceType": "navigation" + "sourceType": "navigation", + "sourceId" : "S3", + "triggerId" : "T2" } ], "attributions": [ @@ -353,7 +377,9 @@ "destinationOrigin": "https://site2.com", "enrollmentId": "enrollment-id", "triggerTime": 1648665733605, - "registrant": "android-app://com.registrant.deleteCandidate" + "registrant": "android-app://com.registrant.deleteCandidate", + "sourceId" : "S2", + "triggerId" : "T2" }, { "id": "A3", @@ -363,7 +389,9 @@ "destinationOrigin": "https://site2.com", "enrollmentId": "enrollment-id", "triggerTime": 1648665733601, - "registrant": "android-app://com.registrant.deleteCandidate" + "registrant": "android-app://com.registrant.deleteCandidate", + "sourceId" : "S3", + "triggerId" : "T3" }, { "id": "A5", @@ -373,12 +401,14 @@ "destinationOrigin": "https://site2.com", "enrollmentId": "enrollment-id", "triggerTime": 1648665733601, - "registrant": "android-app://com.registrant.deleteCandidate" + "registrant": "android-app://com.registrant.deleteCandidate", + "sourceId" : "S3", + "triggerId" : "T2" } ] }, "param": { - "registrant": "android-app://com.registrant.deleteCandidate", + "registrant": "com.registrant.deleteCandidate", "start": 1648665733600, "end": 1648665733602, "origins": [], diff --git a/adservices/tests/unittest/service-core/assets/msmt_browser_deletion_tests/with_no_origin_multiple_domain_preserve.json b/adservices/tests/unittest/service-core/assets/msmt_browser_deletion_tests/with_no_origin_multiple_domain_preserve.json index 8779a4cdf7..800b19eaea 100644 --- a/adservices/tests/unittest/service-core/assets/msmt_browser_deletion_tests/with_no_origin_multiple_domain_preserve.json +++ b/adservices/tests/unittest/service-core/assets/msmt_browser_deletion_tests/with_no_origin_multiple_domain_preserve.json @@ -137,7 +137,7 @@ "event_reports": [ { "id": "E1", - "sourceId": 1, + "sourceEventId": 1, "attributionDestination": "https://deleteCandidate1.site.com", "enrollmentId": "enrollment-id", "triggerData": 2, @@ -145,23 +145,27 @@ "status": 0, "reportTime": -1, "triggerPriority": 101, - "sourceType": "navigation" + "sourceType": "navigation", + "sourceId": "S1", + "triggerId": "T1" }, { "id": "E2", - "sourceId": 1, - "attributionDestination": "android-app://com.site.notInRangeButDeleteDueToSourceId1", + "sourceEventId": 1, + "attributionDestination": "android-app://com.site.notInRangeButDeleteDueTosourceEventId1", "enrollmentId": "enrollment-id", "triggerData": 2, "triggerTime": 1648665733605, "status": 0, "reportTime": -1, "triggerPriority": 101, - "sourceType": "navigation" + "sourceType": "navigation", + "sourceId": "S1", + "triggerId": "T2" }, { "id": "E3", - "sourceId": 2, + "sourceEventId": 2, "attributionDestination": "https://delete.sitec.com", "enrollmentId": "enrollment-id", "triggerData": 2, @@ -169,11 +173,13 @@ "status": 0, "reportTime": -1, "triggerPriority": 101, - "sourceType": "navigation" + "sourceType": "navigation", + "sourceId": "S1", + "triggerId": "T4" }, { "id": "E4", - "sourceId": 2, + "sourceEventId": 2, "attributionDestination": "https://deleteCandidate1.site.com", "enrollmentId": "enrollment-id", "triggerData": 2, @@ -181,11 +187,13 @@ "status": 0, "reportTime": -1, "triggerPriority": 101, - "sourceType": "navigation" + "sourceType": "navigation", + "sourceId": "S2", + "triggerId": "T1" }, { "id": "E5", - "sourceId": 2, + "sourceEventId": 2, "attributionDestination": "https://deleteCandidate1.site.com", "enrollmentId": "enrollment-id", "triggerData": 2, @@ -193,11 +201,13 @@ "status": 0, "reportTime": -1, "triggerPriority": 101, - "sourceType": "navigation" + "sourceType": "navigation", + "sourceId": "S2", + "triggerId": "T2" }, { "id": "E6", - "sourceId": 2, + "sourceEventId": 2, "attributionDestination": "https://deleteCandidate2.site.com", "enrollmentId": "enrollment-id", "triggerData": 2, @@ -205,11 +215,13 @@ "status": 0, "reportTime": -1, "triggerPriority": 101, - "sourceType": "navigation" + "sourceType": "navigation", + "sourceId": "S4", + "triggerId": "T1" }, { "id": "E7", - "sourceId": 2, + "sourceEventId": 2, "attributionDestination": "https://deleteCandidate2.sitea.com", "enrollmentId": "enrollment-id", "triggerData": 2, @@ -217,7 +229,9 @@ "status": 0, "reportTime": -1, "triggerPriority": 101, - "sourceType": "navigation" + "sourceType": "navigation", + "sourceId": "S3", + "triggerId": "T3" } ], "attributions": [ @@ -229,7 +243,9 @@ "destinationOrigin": "https://site2.com", "enrollmentId": "enrollment-id", "triggerTime": 1648665733601, - "registrant": "android-app://com.registrant.deleteCandidate" + "registrant": "android-app://com.registrant.deleteCandidate", + "sourceId": "S1", + "triggerId": "T3" }, { "id": "A2", @@ -239,7 +255,9 @@ "destinationOrigin": "https://site2.com", "enrollmentId": "enrollment-id", "triggerTime": 1648665733605, - "registrant": "android-app://com.registrant.deleteCandidate" + "registrant": "android-app://com.registrant.deleteCandidate", + "sourceId": "S2", + "triggerId": "T2" }, { "id": "A3", @@ -249,7 +267,9 @@ "destinationOrigin": "https://site2.com", "enrollmentId": "enrollment-id", "triggerTime": 1648665733601, - "registrant": "android-app://com.registrant.deleteCandidate" + "registrant": "android-app://com.registrant.deleteCandidate", + "sourceId": "S3", + "triggerId": "T2" }, { "id": "A4", @@ -259,7 +279,9 @@ "destinationOrigin": "https://site2.com", "enrollmentId": "enrollment-id", "triggerTime": 1648665733601, - "registrant": "android-app://com.registrant.deleteCandidate" + "registrant": "android-app://com.registrant.deleteCandidate", + "sourceId": "S2", + "triggerId": "T3" }, { "id": "A5", @@ -269,17 +291,9 @@ "destinationOrigin": "https://site2.com", "enrollmentId": "enrollment-id", "triggerTime": 1648665733601, - "registrant": "android-app://com.registrant.deleteCandidate" - }, - { - "id": "A6", - "sourceSite": "https://sitec.com", - "sourceOrigin": "https://a.sitec.com", - "destinationSite": "https://site.com", - "destinationOrigin": "https://b.site.com", - "enrollmentId": "enrollment-id", - "triggerTime": 1648665733601, - "registrant": "android-app://com.registrant.deleteCandidate" + "registrant": "android-app://com.registrant.deleteCandidate", + "sourceId": "S3", + "triggerId": "T3" } ] }, @@ -387,7 +401,7 @@ "event_reports": [ { "id": "E1", - "sourceId": 1, + "sourceEventId": 1, "attributionDestination": "https://deleteCandidate1.site.com", "enrollmentId": "enrollment-id", "triggerData": 2, @@ -395,23 +409,27 @@ "status": 0, "reportTime": -1, "triggerPriority": 101, - "sourceType": "navigation" + "sourceType": "navigation", + "sourceId": "S1", + "triggerId": "T1" }, { "id": "E2", - "sourceId": 1, - "attributionDestination": "android-app://com.site.notInRangeButDeleteDueToSourceId1", + "sourceEventId": 1, + "attributionDestination": "android-app://com.site.notInRangeButDeleteDueTosourceEventId1", "enrollmentId": "enrollment-id", "triggerData": 2, "triggerTime": 1648665733605, "status": 0, "reportTime": -1, "triggerPriority": 101, - "sourceType": "navigation" + "sourceType": "navigation", + "sourceId": "S1", + "triggerId": "T2" }, { "id": "E3", - "sourceId": 2, + "sourceEventId": 2, "attributionDestination": "https://delete.sitec.com", "enrollmentId": "enrollment-id", "triggerData": 2, @@ -419,11 +437,13 @@ "status": 0, "reportTime": -1, "triggerPriority": 101, - "sourceType": "navigation" + "sourceType": "navigation", + "sourceId": "S1", + "triggerId": "T4" }, { "id": "E4", - "sourceId": 2, + "sourceEventId": 2, "attributionDestination": "https://deleteCandidate1.site.com", "enrollmentId": "enrollment-id", "triggerData": 2, @@ -431,11 +451,13 @@ "status": 0, "reportTime": -1, "triggerPriority": 101, - "sourceType": "navigation" + "sourceType": "navigation", + "sourceId": "S2", + "triggerId": "T1" }, { "id": "E5", - "sourceId": 2, + "sourceEventId": 2, "attributionDestination": "https://deleteCandidate1.site.com", "enrollmentId": "enrollment-id", "triggerData": 2, @@ -443,11 +465,13 @@ "status": 0, "reportTime": -1, "triggerPriority": 101, - "sourceType": "navigation" + "sourceType": "navigation", + "sourceId": "S2", + "triggerId": "T2" }, { "id": "E6", - "sourceId": 2, + "sourceEventId": 2, "attributionDestination": "https://deleteCandidate2.site.com", "enrollmentId": "enrollment-id", "triggerData": 2, @@ -455,7 +479,9 @@ "status": 0, "reportTime": -1, "triggerPriority": 101, - "sourceType": "navigation" + "sourceType": "navigation", + "sourceId": "S4", + "triggerId": "T1" } ], "attributions": [ @@ -467,22 +493,14 @@ "destinationOrigin": "https://site2.com", "enrollmentId": "enrollment-id", "triggerTime": 1648665733605, - "registrant": "android-app://com.registrant.deleteCandidate" - }, - { - "id": "A6", - "sourceSite": "https://sitec.com", - "sourceOrigin": "https://a.sitec.com", - "destinationSite": "https://site.com", - "destinationOrigin": "https://b.site.com", - "enrollmentId": "enrollment-id", - "triggerTime": 1648665733601, - "registrant": "android-app://com.registrant.deleteCandidate" + "registrant": "android-app://com.registrant.deleteCandidate", + "sourceId": "S2", + "triggerId": "T2" } ] }, "param": { - "registrant": "android-app://com.registrant.deleteCandidate", + "registrant": "com.registrant.deleteCandidate", "start": 1648665733600, "end": 1648665733602, "origins": [], diff --git a/adservices/tests/unittest/service-core/assets/msmt_browser_deletion_tests/with_no_origin_nor_range.json b/adservices/tests/unittest/service-core/assets/msmt_browser_deletion_tests/with_no_origin_nor_range.json index 8b72ad2ff4..b3a849ef6b 100644 --- a/adservices/tests/unittest/service-core/assets/msmt_browser_deletion_tests/with_no_origin_nor_range.json +++ b/adservices/tests/unittest/service-core/assets/msmt_browser_deletion_tests/with_no_origin_nor_range.json @@ -1,5 +1,6 @@ { "name": "With no origin nor range", + "description": "Delete S1, T1, E1 and A1 because registrant matches.", "input": { "sources": [ { @@ -68,19 +69,21 @@ "event_reports": [ { "id": "E1", - "sourceId": 1, - "attributionDestination": "android-app://com.site3.toBeDeletedBecauseOfSourceId1", + "sourceEventId": 1, + "attributionDestination": "android-app://com.site3.toBeDeletedBecauseOfsourceEventId1", "enrollmentId": "enrollment-id", "triggerData": 2, "triggerTime": 8640000002, "status": 0, "reportTime": -1, "triggerPriority": 101, - "sourceType": "navigation" + "sourceType": "navigation", + "sourceId": "S1", + "triggerId": "T1" }, { "id": "E2", - "sourceId": 2, + "sourceEventId": 2, "attributionDestination": "android-app://com.site3", "enrollmentId": "enrollment-id", "triggerData": 2, @@ -88,7 +91,9 @@ "status": 0, "reportTime": -1, "triggerPriority": 101, - "sourceType": "navigation" + "sourceType": "navigation", + "sourceId": "S2", + "triggerId": "T2" } ], "attributions": [ @@ -100,7 +105,9 @@ "destinationOrigin": "android-app://com.site3", "enrollmentId": "enrollment-id", "triggerTime": 10, - "registrant": "android-app://com.registrant.toBeDeleted" + "registrant": "android-app://com.registrant.toBeDeleted", + "sourceId": "S1", + "triggerId": "T1" }, { "id": "A2", @@ -110,7 +117,9 @@ "destinationOrigin": "android-app://com.site3", "enrollmentId": "enrollment-id", "triggerTime": 10, - "registrant": "android-app://com.registrant2" + "registrant": "android-app://com.registrant2", + "sourceId": "S2", + "triggerId": "T2" } ] }, @@ -152,7 +161,7 @@ "event_reports": [ { "id": "E2", - "sourceId": 2, + "sourceEventId": 2, "attributionDestination": "android-app://com.site3", "enrollmentId": "enrollment-id", "triggerData": 2, @@ -160,7 +169,9 @@ "status": 0, "reportTime": -1, "triggerPriority": 101, - "sourceType": "navigation" + "sourceType": "navigation", + "sourceId": "S2", + "triggerId": "T2" } ], "attributions": [ @@ -172,12 +183,14 @@ "destinationOrigin": "android-app://com.site3", "enrollmentId": "enrollment-id", "triggerTime": 10, - "registrant": "android-app://com.registrant2" + "registrant": "android-app://com.registrant2", + "sourceId": "S2", + "triggerId": "T2" } ] }, "param": { - "registrant": "android-app://com.registrant.toBeDeleted", + "registrant": "com.registrant.toBeDeleted", "origins": [], "domains": [] } diff --git a/adservices/tests/unittest/service-core/assets/msmt_browser_deletion_tests/with_origin_and_domain.json b/adservices/tests/unittest/service-core/assets/msmt_browser_deletion_tests/with_origin_and_domain.json index fe3334db78..ee0f6919cc 100644 --- a/adservices/tests/unittest/service-core/assets/msmt_browser_deletion_tests/with_origin_and_domain.json +++ b/adservices/tests/unittest/service-core/assets/msmt_browser_deletion_tests/with_origin_and_domain.json @@ -192,7 +192,7 @@ "registrant": "android-app://com.registrant.deleteCandidate" }, { - "id": "T6", + "id": "Trigger6", "attributionDestination": "https://deletesite2.com", "enrollmentId": "enrollment-id", "priority": 101, @@ -214,7 +214,7 @@ "event_reports": [ { "id": "E1", - "sourceId": 2, + "sourceEventId": 2, "attributionDestination": "https://abc.deletesite1.com", "enrollmentId": "enrollment-id", "triggerData": 2, @@ -222,23 +222,27 @@ "status": 0, "reportTime": -1, "triggerPriority": 101, - "sourceType": "navigation" + "sourceType": "navigation", + "sourceId" : "S1", + "triggerId" : "T1" }, { "id": "E2", - "sourceId": 1, - "attributionDestination": "android-app://com.site.notInRangeButDeleteDueToSourceId1", + "sourceEventId": 1, + "attributionDestination": "android-app://com.site.notInRangeButDeleteDueTosourceEventId1", "enrollmentId": "enrollment-id", "triggerData": 2, "triggerTime": 1648665733605, "status": 0, "reportTime": -1, "triggerPriority": 101, - "sourceType": "navigation" + "sourceType": "navigation", + "sourceId" : "S1", + "triggerId" : "T2" }, { "id": "E3", - "sourceId": 2, + "sourceEventId": 2, "attributionDestination": "https://doNotDelete.site.com", "enrollmentId": "enrollment-id", "triggerData": 2, @@ -246,11 +250,13 @@ "status": 0, "reportTime": -1, "triggerPriority": 101, - "sourceType": "navigation" + "sourceType": "navigation", + "sourceId" : "S2", + "triggerId" : "T2" }, { "id": "E4", - "sourceId": 2, + "sourceEventId": 2, "attributionDestination": "https://deleteCandidate1.site.com", "enrollmentId": "enrollment-id", "triggerData": 2, @@ -258,11 +264,13 @@ "status": 0, "reportTime": -1, "triggerPriority": 101, - "sourceType": "navigation" + "sourceType": "navigation", + "sourceId" : "S2", + "triggerId" : "T4" }, { "id": "E5", - "sourceId": 2, + "sourceEventId": 2, "attributionDestination": "https://deleteCandidate1.site.com", "enrollmentId": "enrollment-id", "triggerData": 2, @@ -270,11 +278,13 @@ "status": 0, "reportTime": -1, "triggerPriority": 101, - "sourceType": "navigation" + "sourceType": "navigation", + "sourceId" : "S3", + "triggerId" : "T3" }, { "id": "E6", - "sourceId": 2, + "sourceEventId": 2, "attributionDestination": "https://deleteCandidate2.site.com", "enrollmentId": "enrollment-id", "triggerData": 2, @@ -282,11 +292,13 @@ "status": 0, "reportTime": -1, "triggerPriority": 101, - "sourceType": "navigation" + "sourceType": "navigation", + "sourceId" : "S3", + "triggerId" : "T5" }, { "id": "E7", - "sourceId": 2, + "sourceEventId": 2, "attributionDestination": "https://qwe.deletesite1.com", "enrollmentId": "enrollment-id", "triggerData": 2, @@ -294,11 +306,13 @@ "status": 0, "reportTime": -1, "triggerPriority": 101, - "sourceType": "navigation" + "sourceType": "navigation", + "sourceId" : "S5", + "triggerId" : "T5" }, { "id": "E8", - "sourceId": 2, + "sourceEventId": 2, "attributionDestination": "https://qwe.deletesite2.com", "enrollmentId": "enrollment-id", "triggerData": 2, @@ -306,7 +320,9 @@ "status": 0, "reportTime": -1, "triggerPriority": 101, - "sourceType": "navigation" + "sourceType": "navigation", + "sourceId" : "S6", + "triggerId" : "Trigger6" } ], "attributions": [ @@ -318,7 +334,9 @@ "destinationOrigin": "https://site2.com", "enrollmentId": "enrollment-id", "triggerTime": 1648665733601, - "registrant": "android-app://com.registrant.deleteCandidate" + "registrant": "android-app://com.registrant.deleteCandidate", + "sourceId" : "S1", + "triggerId" : "T1" }, { "id": "A2", @@ -328,7 +346,9 @@ "destinationOrigin": "https://site2.com", "enrollmentId": "enrollment-id", "triggerTime": 1648665733605, - "registrant": "android-app://com.registrant.deleteCandidate" + "registrant": "android-app://com.registrant.deleteCandidate", + "sourceId" : "S2", + "triggerId" : "T2" }, { "id": "A3", @@ -338,7 +358,9 @@ "destinationOrigin": "https://site2.com", "enrollmentId": "enrollment-id", "triggerTime": 1648665733601, - "registrant": "android-app://com.registrant.deleteCandidate" + "registrant": "android-app://com.registrant.deleteCandidate", + "sourceId" : "S3", + "triggerId" : "T3" }, { "id": "A4", @@ -348,7 +370,9 @@ "destinationOrigin": "https://site2.com", "enrollmentId": "enrollment-id", "triggerTime": 1648665733601, - "registrant": "android-app://com.registrant.deleteCandidate" + "registrant": "android-app://com.registrant.deleteCandidate", + "sourceId" : "S4", + "triggerId" : "T1" }, { "id": "A5", @@ -358,7 +382,9 @@ "destinationOrigin": "https://abc.deletesite2.com", "enrollmentId": "enrollment-id", "triggerTime": 1648665733601, - "registrant": "android-app://com.registrant.deleteCandidate" + "registrant": "android-app://com.registrant.deleteCandidate", + "sourceId" : "S5", + "triggerId" : "Trigger6" }, { "id": "A6", @@ -368,7 +394,9 @@ "destinationOrigin": "https://site2.com", "enrollmentId": "enrollment-id", "triggerTime": 1648665733601, - "registrant": "android-app://com.registrant.deleteCandidate" + "registrant": "android-app://com.registrant.deleteCandidate", + "sourceId" : "S6", + "triggerId" : "Trigger6" } ] }, @@ -457,7 +485,7 @@ "event_reports": [ { "id": "E3", - "sourceId": 2, + "sourceEventId": 2, "attributionDestination": "https://doNotDelete.site.com", "enrollmentId": "enrollment-id", "triggerData": 2, @@ -465,11 +493,13 @@ "status": 0, "reportTime": -1, "triggerPriority": 101, - "sourceType": "navigation" + "sourceType": "navigation", + "sourceId" : "S2", + "triggerId" : "T2" }, { "id": "E5", - "sourceId": 2, + "sourceEventId": 2, "attributionDestination": "https://deleteCandidate1.site.com", "enrollmentId": "enrollment-id", "triggerData": 2, @@ -477,7 +507,9 @@ "status": 0, "reportTime": -1, "triggerPriority": 101, - "sourceType": "navigation" + "sourceType": "navigation", + "sourceId" : "S3", + "triggerId" : "T3" } ], "attributions": [ @@ -489,7 +521,9 @@ "destinationOrigin": "https://site2.com", "enrollmentId": "enrollment-id", "triggerTime": 1648665733605, - "registrant": "android-app://com.registrant.deleteCandidate" + "registrant": "android-app://com.registrant.deleteCandidate", + "sourceId" : "S2", + "triggerId" : "T2" }, { "id": "A3", @@ -499,12 +533,14 @@ "destinationOrigin": "https://site2.com", "enrollmentId": "enrollment-id", "triggerTime": 1648665733601, - "registrant": "android-app://com.registrant.deleteCandidate" + "registrant": "android-app://com.registrant.deleteCandidate", + "sourceId" : "S3", + "triggerId" : "T3" } ] }, "param": { - "registrant": "android-app://com.registrant.deleteCandidate", + "registrant": "com.registrant.deleteCandidate", "start": 1648665733600, "end": 1648665733602, "origins": ["https://deleteCandidate1.site.com", "https://deleteCandidate2.site.com"], diff --git a/adservices/tests/unittest/service-core/assets/msmt_browser_deletion_tests/with_origin_and_domain_exclude_rate_limit.json b/adservices/tests/unittest/service-core/assets/msmt_browser_deletion_tests/with_origin_and_domain_exclude_rate_limit.json index cf0f9fd1f9..be59247fa2 100644 --- a/adservices/tests/unittest/service-core/assets/msmt_browser_deletion_tests/with_origin_and_domain_exclude_rate_limit.json +++ b/adservices/tests/unittest/service-core/assets/msmt_browser_deletion_tests/with_origin_and_domain_exclude_rate_limit.json @@ -8,7 +8,7 @@ "eventId": 1, "sourceType": "navigation", "publisher": "https://deleteCandidate1.site.com", - "appDestination": "android-app://com.site2", + "appDestination": "android-app://com.app2", "enrollmentId": "enrollment-id", "eventTime": 1648665733601, "expiryTime": 1648665733611, @@ -21,7 +21,7 @@ "eventId": 2, "sourceType": "navigation", "publisher": "https://deleteCandidate1.site.com", - "appDestination": "android-app://com.site2", + "appDestination": "android-app://com.app2", "enrollmentId": "enrollment-id", "eventTime": 1648665733605, "expiryTime": 1648665733615, @@ -34,7 +34,7 @@ "eventId": 3, "sourceType": "navigation", "publisher": "https://siteNotMatch.site3.com", - "appDestination": "android-app://com.site2", + "appDestination": "android-app://com.app2", "enrollmentId": "enrollment-id", "eventTime": 1648665733601, "expiryTime": 1648665733611, @@ -47,7 +47,7 @@ "eventId": 1, "sourceType": "navigation", "publisher": "https://deleteCandidate2.site.com", - "appDestination": "android-app://com.site2", + "appDestination": "android-app://com.app2", "enrollmentId": "enrollment-id", "eventTime": 1648665733601, "expiryTime": 1648665733611, @@ -60,7 +60,7 @@ "eventId": 1, "sourceType": "navigation", "publisher": "https://abc.deletesite1.com", - "appDestination": "android-app://com.site2", + "appDestination": "android-app://com.app2", "enrollmentId": "enrollment-id", "eventTime": 1648665733601, "expiryTime": 1648665733611, @@ -73,7 +73,7 @@ "eventId": 1, "sourceType": "navigation", "publisher": "https://abc.deletesite2.com", - "appDestination": "android-app://com.site2", + "appDestination": "android-app://com.app2", "enrollmentId": "enrollment-id", "eventTime": 1648665733601, "expiryTime": 1648665733611, @@ -86,7 +86,7 @@ "eventId": 1, "sourceType": "navigation", "publisher": "https://somedeletesite2.com", - "appDestination": "android-app://com.site2", + "appDestination": "android-app://com.app2", "enrollmentId": "enrollment-id", "eventTime": 1648665733601, "expiryTime": 1648665733611, @@ -192,7 +192,7 @@ "registrant": "android-app://com.registrant.deleteCandidate" }, { - "id": "T6", + "id": "Trigger6", "attributionDestination": "https://deletesite2.com", "enrollmentId": "enrollment-id", "priority": 101, @@ -214,7 +214,7 @@ "event_reports": [ { "id": "E1", - "sourceId": 2, + "sourceEventId": 2, "attributionDestination": "https://abc.deletesite1.com", "enrollmentId": "enrollment-id", "triggerData": 2, @@ -222,23 +222,27 @@ "status": 0, "reportTime": -1, "triggerPriority": 101, - "sourceType": "navigation" + "sourceType": "navigation", + "sourceId" : "S1", + "triggerId" : "T1" }, { "id": "E2", - "sourceId": 1, - "attributionDestination": "android-app://com.site.notInRangeButDeleteDueToSourceId1", + "sourceEventId": 1, + "attributionDestination": "android-app://com.site.notInRangeButDeleteDueTosourceEventId1", "enrollmentId": "enrollment-id", "triggerData": 2, "triggerTime": 1648665733605, "status": 0, "reportTime": -1, "triggerPriority": 101, - "sourceType": "navigation" + "sourceType": "navigation", + "sourceId" : "S1", + "triggerId" : "T2" }, { "id": "E3", - "sourceId": 2, + "sourceEventId": 2, "attributionDestination": "https://doNotDelete.site.com", "enrollmentId": "enrollment-id", "triggerData": 2, @@ -246,11 +250,13 @@ "status": 0, "reportTime": -1, "triggerPriority": 101, - "sourceType": "navigation" + "sourceType": "navigation", + "sourceId" : "S2", + "triggerId" : "T2" }, { "id": "E4", - "sourceId": 2, + "sourceEventId": 2, "attributionDestination": "https://deleteCandidate1.site.com", "enrollmentId": "enrollment-id", "triggerData": 2, @@ -258,11 +264,13 @@ "status": 0, "reportTime": -1, "triggerPriority": 101, - "sourceType": "navigation" + "sourceType": "navigation", + "sourceId" : "S2", + "triggerId" : "T4" }, { "id": "E5", - "sourceId": 2, + "sourceEventId": 2, "attributionDestination": "https://deleteCandidate1.site.com", "enrollmentId": "enrollment-id", "triggerData": 2, @@ -270,11 +278,13 @@ "status": 0, "reportTime": -1, "triggerPriority": 101, - "sourceType": "navigation" + "sourceType": "navigation", + "sourceId" : "S3", + "triggerId" : "T3" }, { "id": "E6", - "sourceId": 2, + "sourceEventId": 2, "attributionDestination": "https://deleteCandidate2.site.com", "enrollmentId": "enrollment-id", "triggerData": 2, @@ -282,11 +292,13 @@ "status": 0, "reportTime": -1, "triggerPriority": 101, - "sourceType": "navigation" + "sourceType": "navigation", + "sourceId" : "S3", + "triggerId" : "T5" }, { "id": "E7", - "sourceId": 2, + "sourceEventId": 2, "attributionDestination": "https://qwe.deletesite1.com", "enrollmentId": "enrollment-id", "triggerData": 2, @@ -294,11 +306,13 @@ "status": 0, "reportTime": -1, "triggerPriority": 101, - "sourceType": "navigation" + "sourceType": "navigation", + "sourceId" : "S5", + "triggerId" : "T5" }, { "id": "E8", - "sourceId": 2, + "sourceEventId": 2, "attributionDestination": "https://qwe.deletesite2.com", "enrollmentId": "enrollment-id", "triggerData": 2, @@ -306,7 +320,9 @@ "status": 0, "reportTime": -1, "triggerPriority": 101, - "sourceType": "navigation" + "sourceType": "navigation", + "sourceId" : "S6", + "triggerId" : "Trigger6" } ], "attributions": [ @@ -318,7 +334,9 @@ "destinationOrigin": "https://site2.com", "enrollmentId": "enrollment-id", "triggerTime": 1648665733601, - "registrant": "android-app://com.registrant.deleteCandidate" + "registrant": "android-app://com.registrant.deleteCandidate", + "sourceId" : "S1", + "triggerId" : "T1" }, { "id": "A2", @@ -328,7 +346,9 @@ "destinationOrigin": "https://site2.com", "enrollmentId": "enrollment-id", "triggerTime": 1648665733605, - "registrant": "android-app://com.registrant.deleteCandidate" + "registrant": "android-app://com.registrant.deleteCandidate", + "sourceId" : "S2", + "triggerId" : "T2" }, { "id": "A3", @@ -338,7 +358,9 @@ "destinationOrigin": "https://site2.com", "enrollmentId": "enrollment-id", "triggerTime": 1648665733601, - "registrant": "android-app://com.registrant.deleteCandidate" + "registrant": "android-app://com.registrant.deleteCandidate", + "sourceId" : "S3", + "triggerId" : "T3" }, { "id": "A4", @@ -348,7 +370,9 @@ "destinationOrigin": "https://site2.com", "enrollmentId": "enrollment-id", "triggerTime": 1648665733601, - "registrant": "android-app://com.registrant.deleteCandidate" + "registrant": "android-app://com.registrant.deleteCandidate", + "sourceId" : "S4", + "triggerId" : "T1" }, { "id": "A5", @@ -358,7 +382,9 @@ "destinationOrigin": "https://abc.deletesite2.com", "enrollmentId": "enrollment-id", "triggerTime": 1648665733601, - "registrant": "android-app://com.registrant.deleteCandidate" + "registrant": "android-app://com.registrant.deleteCandidate", + "sourceId" : "S5", + "triggerId" : "Trigger6" }, { "id": "A6", @@ -368,18 +394,33 @@ "destinationOrigin": "https://site2.com", "enrollmentId": "enrollment-id", "triggerTime": 1648665733601, - "registrant": "android-app://com.registrant.deleteCandidate" + "registrant": "android-app://com.registrant.deleteCandidate", + "sourceId" : "S6", + "triggerId" : "Trigger6" } ] }, "output": { "sources": [ { + "id": "S1", + "eventId": 1, + "sourceType": "navigation", + "publisher": "https://deleteCandidate1.site.com", + "appDestination": "android-app://com.app2", + "enrollmentId": "enrollment-id", + "eventTime": 1648665733601, + "expiryTime": 1648665733611, + "priority": 100, + "status": 2, + "registrant": "android-app://com.registrant.deleteCandidate" + }, + { "id": "S2", "eventId": 2, "sourceType": "navigation", "publisher": "https://deleteCandidate1.site.com", - "appDestination": "android-app://com.site2", + "appDestination": "android-app://com.app2", "enrollmentId": "enrollment-id", "eventTime": 1648665733605, "expiryTime": 1648665733615, @@ -392,7 +433,7 @@ "eventId": 3, "sourceType": "navigation", "publisher": "https://siteNotMatch.site3.com", - "appDestination": "android-app://com.site2", + "appDestination": "android-app://com.app2", "enrollmentId": "enrollment-id", "eventTime": 1648665733601, "expiryTime": 1648665733611, @@ -401,11 +442,50 @@ "registrant": "android-app://com.registrant.deleteCandidate" }, { + "id": "S4", + "eventId": 1, + "sourceType": "navigation", + "publisher": "https://deleteCandidate2.site.com", + "appDestination": "android-app://com.app2", + "enrollmentId": "enrollment-id", + "eventTime": 1648665733601, + "expiryTime": 1648665733611, + "priority": 100, + "status": 2, + "registrant": "android-app://com.registrant.deleteCandidate" + }, + { + "id": "S5", + "eventId": 1, + "sourceType": "navigation", + "publisher": "https://abc.deletesite1.com", + "appDestination": "android-app://com.app2", + "enrollmentId": "enrollment-id", + "eventTime": 1648665733601, + "expiryTime": 1648665733611, + "priority": 100, + "status": 2, + "registrant": "android-app://com.registrant.deleteCandidate" + }, + { + "id": "S6", + "eventId": 1, + "sourceType": "navigation", + "publisher": "https://abc.deletesite2.com", + "appDestination": "android-app://com.app2", + "enrollmentId": "enrollment-id", + "eventTime": 1648665733601, + "expiryTime": 1648665733611, + "priority": 100, + "status": 2, + "registrant": "android-app://com.registrant.deleteCandidate" + }, + { "id": "S7", "eventId": 1, "sourceType": "navigation", "publisher": "https://somedeletesite2.com", - "appDestination": "android-app://com.site2", + "appDestination": "android-app://com.app2", "enrollmentId": "enrollment-id", "eventTime": 1648665733601, "expiryTime": 1648665733611, @@ -416,6 +496,25 @@ ], "triggers": [ { + "id": "T1", + "attributionDestination": "https://deleteCandidate1.site.com", + "enrollmentId": "enrollment-id", + "priority": 101, + "status": 3, + "triggerData": 2, + "eventTriggers": [ + { + "trigger_data": 2, + "priority": 101, + "filters": { + "key_1": ["value_1"] + } + } + ], + "triggerTime": 1648665733601, + "registrant": "android-app://com.registrant.deleteCandidate" + }, + { "id": "T2", "attributionDestination": "https://deleteCandidate1.site.com", "enrollmentId": "enrollment-id", @@ -452,12 +551,97 @@ ], "triggerTime": 1648665733601, "registrant": "android-app://com.registrant.deleteCandidate" + }, + { + "id": "T4", + "attributionDestination": "https://deleteCandidate2.site.com", + "enrollmentId": "enrollment-id", + "priority": 101, + "status": 3, + "triggerData": 2, + "eventTriggers": [ + { + "trigger_data": 2, + "priority": 101, + "filters": { + "key_1": ["value_1"] + } + } + ], + "triggerTime": 1648665733601, + "registrant": "android-app://com.registrant.deleteCandidate" + }, + { + "id": "T5", + "attributionDestination": "https://deletesite1.com", + "enrollmentId": "enrollment-id", + "priority": 101, + "status": 3, + "triggerData": 2, + "eventTriggers": [ + { + "trigger_data": 2, + "priority": 101, + "filters": { + "key_1": ["value_1"] + } + } + ], + "triggerTime": 1648665733601, + "registrant": "android-app://com.registrant.deleteCandidate" + }, + { + "id": "Trigger6", + "attributionDestination": "https://deletesite2.com", + "enrollmentId": "enrollment-id", + "priority": 101, + "status": 3, + "triggerData": 2, + "eventTriggers": [ + { + "trigger_data": 2, + "priority": 101, + "filters": { + "key_1": ["value_1"] + } + } + ], + "triggerTime": 1648665733601, + "registrant": "android-app://com.registrant.deleteCandidate" } ], "event_reports": [ { + "id": "E1", + "sourceEventId": 2, + "attributionDestination": "https://abc.deletesite1.com", + "enrollmentId": "enrollment-id", + "triggerData": 2, + "triggerTime": 1648665733601, + "status": 2, + "reportTime": -1, + "triggerPriority": 101, + "sourceType": "navigation", + "sourceId" : "S1", + "triggerId" : "T1" + }, + { + "id": "E2", + "sourceEventId": 1, + "attributionDestination": "android-app://com.site.notInRangeButDeleteDueTosourceEventId1", + "enrollmentId": "enrollment-id", + "triggerData": 2, + "triggerTime": 1648665733605, + "status": 2, + "reportTime": -1, + "triggerPriority": 101, + "sourceType": "navigation", + "sourceId" : "S1", + "triggerId" : "T2" + }, + { "id": "E3", - "sourceId": 2, + "sourceEventId": 2, "attributionDestination": "https://doNotDelete.site.com", "enrollmentId": "enrollment-id", "triggerData": 2, @@ -465,11 +649,27 @@ "status": 0, "reportTime": -1, "triggerPriority": 101, - "sourceType": "navigation" + "sourceType": "navigation", + "sourceId" : "S2", + "triggerId" : "T2" + }, + { + "id": "E4", + "sourceEventId": 2, + "attributionDestination": "https://deleteCandidate1.site.com", + "enrollmentId": "enrollment-id", + "triggerData": 2, + "triggerTime": 1648665733601, + "status": 2, + "reportTime": -1, + "triggerPriority": 101, + "sourceType": "navigation", + "sourceId" : "S2", + "triggerId" : "T4" }, { "id": "E5", - "sourceId": 2, + "sourceEventId": 2, "attributionDestination": "https://deleteCandidate1.site.com", "enrollmentId": "enrollment-id", "triggerData": 2, @@ -477,7 +677,51 @@ "status": 0, "reportTime": -1, "triggerPriority": 101, - "sourceType": "navigation" + "sourceType": "navigation", + "sourceId" : "S3", + "triggerId" : "T3" + }, + { + "id": "E6", + "sourceEventId": 2, + "attributionDestination": "https://deleteCandidate2.site.com", + "enrollmentId": "enrollment-id", + "triggerData": 2, + "triggerTime": 1648665733601, + "status": 2, + "reportTime": -1, + "triggerPriority": 101, + "sourceType": "navigation", + "sourceId" : "S3", + "triggerId" : "T5" + }, + { + "id": "E7", + "sourceEventId": 2, + "attributionDestination": "https://qwe.deletesite1.com", + "enrollmentId": "enrollment-id", + "triggerData": 2, + "triggerTime": 1648665733601, + "status": 2, + "reportTime": -1, + "triggerPriority": 101, + "sourceType": "navigation", + "sourceId" : "S5", + "triggerId" : "T5" + }, + { + "id": "E8", + "sourceEventId": 2, + "attributionDestination": "https://qwe.deletesite2.com", + "enrollmentId": "enrollment-id", + "triggerData": 2, + "triggerTime": 1648665733601, + "status": 2, + "reportTime": -1, + "triggerPriority": 101, + "sourceType": "navigation", + "sourceId" : "S6", + "triggerId" : "Trigger6" } ], "attributions": [ @@ -489,7 +733,9 @@ "destinationOrigin": "https://site2.com", "enrollmentId": "enrollment-id", "triggerTime": 1648665733601, - "registrant": "android-app://com.registrant.deleteCandidate" + "registrant": "android-app://com.registrant.deleteCandidate", + "sourceId" : "S1", + "triggerId" : "T1" }, { "id": "A2", @@ -499,7 +745,9 @@ "destinationOrigin": "https://site2.com", "enrollmentId": "enrollment-id", "triggerTime": 1648665733605, - "registrant": "android-app://com.registrant.deleteCandidate" + "registrant": "android-app://com.registrant.deleteCandidate", + "sourceId" : "S2", + "triggerId" : "T2" }, { "id": "A3", @@ -509,7 +757,9 @@ "destinationOrigin": "https://site2.com", "enrollmentId": "enrollment-id", "triggerTime": 1648665733601, - "registrant": "android-app://com.registrant.deleteCandidate" + "registrant": "android-app://com.registrant.deleteCandidate", + "sourceId" : "S3", + "triggerId" : "T3" }, { "id": "A4", @@ -519,7 +769,9 @@ "destinationOrigin": "https://site2.com", "enrollmentId": "enrollment-id", "triggerTime": 1648665733601, - "registrant": "android-app://com.registrant.deleteCandidate" + "registrant": "android-app://com.registrant.deleteCandidate", + "sourceId" : "S4", + "triggerId" : "T1" }, { "id": "A5", @@ -529,7 +781,9 @@ "destinationOrigin": "https://abc.deletesite2.com", "enrollmentId": "enrollment-id", "triggerTime": 1648665733601, - "registrant": "android-app://com.registrant.deleteCandidate" + "registrant": "android-app://com.registrant.deleteCandidate", + "sourceId" : "S5", + "triggerId" : "Trigger6" }, { "id": "A6", @@ -539,12 +793,14 @@ "destinationOrigin": "https://site2.com", "enrollmentId": "enrollment-id", "triggerTime": 1648665733601, - "registrant": "android-app://com.registrant.deleteCandidate" + "registrant": "android-app://com.registrant.deleteCandidate", + "sourceId" : "S6", + "triggerId" : "Trigger6" } ] }, "param": { - "registrant": "android-app://com.registrant.deleteCandidate", + "registrant": "com.registrant.deleteCandidate", "start": 1648665733600, "end": 1648665733602, "origins": ["https://deleteCandidate1.site.com", "https://deleteCandidate2.site.com"], diff --git a/adservices/tests/unittest/service-core/assets/msmt_browser_deletion_tests/with_origin_and_domain_preserve.json b/adservices/tests/unittest/service-core/assets/msmt_browser_deletion_tests/with_origin_and_domain_preserve.json index b195522c2f..6779044c99 100644 --- a/adservices/tests/unittest/service-core/assets/msmt_browser_deletion_tests/with_origin_and_domain_preserve.json +++ b/adservices/tests/unittest/service-core/assets/msmt_browser_deletion_tests/with_origin_and_domain_preserve.json @@ -192,7 +192,7 @@ "registrant": "android-app://com.registrant.deleteCandidate" }, { - "id": "T6", + "id": "Trigger6", "attributionDestination": "https://deletesite2.com", "enrollmentId": "enrollment-id", "priority": 101, @@ -214,7 +214,7 @@ "event_reports": [ { "id": "E1", - "sourceId": 2, + "sourceEventId": 2, "attributionDestination": "https://abc.deletesite1.com", "enrollmentId": "enrollment-id", "triggerData": 2, @@ -222,23 +222,27 @@ "status": 0, "reportTime": -1, "triggerPriority": 101, - "sourceType": "navigation" + "sourceType": "navigation", + "sourceId" : "S1", + "triggerId" : "T1" }, { "id": "E2", - "sourceId": 1, - "attributionDestination": "android-app://com.site.notInRangeButDeleteDueToSourceId1", + "sourceEventId": 1, + "attributionDestination": "android-app://com.site.notInRangeButDeleteDueTosourceEventId1", "enrollmentId": "enrollment-id", "triggerData": 2, "triggerTime": 1648665733605, "status": 0, "reportTime": -1, "triggerPriority": 101, - "sourceType": "navigation" + "sourceType": "navigation", + "sourceId" : "S3", + "triggerId" : "T2" }, { "id": "E3", - "sourceId": 2, + "sourceEventId": 2, "attributionDestination": "https://doNotDelete.site.com", "enrollmentId": "enrollment-id", "triggerData": 2, @@ -246,11 +250,13 @@ "status": 0, "reportTime": -1, "triggerPriority": 101, - "sourceType": "navigation" + "sourceType": "navigation", + "sourceId" : "S2", + "triggerId" : "T3" }, { "id": "E4", - "sourceId": 2, + "sourceEventId": 2, "attributionDestination": "https://deleteCandidate1.site.com", "enrollmentId": "enrollment-id", "triggerData": 2, @@ -258,11 +264,13 @@ "status": 0, "reportTime": -1, "triggerPriority": 101, - "sourceType": "navigation" + "sourceType": "navigation", + "sourceId" : "S2", + "triggerId" : "T4" }, { "id": "E5", - "sourceId": 2, + "sourceEventId": 2, "attributionDestination": "https://deleteCandidate1.site.com", "enrollmentId": "enrollment-id", "triggerData": 2, @@ -270,11 +278,13 @@ "status": 0, "reportTime": -1, "triggerPriority": 101, - "sourceType": "navigation" + "sourceType": "navigation", + "sourceId" : "S1", + "triggerId" : "T2" }, { "id": "E6", - "sourceId": 2, + "sourceEventId": 2, "attributionDestination": "https://deleteCandidate2.site.com", "enrollmentId": "enrollment-id", "triggerData": 2, @@ -282,11 +292,13 @@ "status": 0, "reportTime": -1, "triggerPriority": 101, - "sourceType": "navigation" + "sourceType": "navigation", + "sourceId" : "S2", + "triggerId" : "T1" }, { "id": "E7", - "sourceId": 2, + "sourceEventId": 2, "attributionDestination": "https://qwe.deletesite1.com", "enrollmentId": "enrollment-id", "triggerData": 2, @@ -294,11 +306,13 @@ "status": 0, "reportTime": -1, "triggerPriority": 101, - "sourceType": "navigation" + "sourceType": "navigation", + "sourceId" : "S5", + "triggerId" : "T5" }, { "id": "E8", - "sourceId": 2, + "sourceEventId": 2, "attributionDestination": "https://qwe.deletesite2.com", "enrollmentId": "enrollment-id", "triggerData": 2, @@ -306,7 +320,9 @@ "status": 0, "reportTime": -1, "triggerPriority": 101, - "sourceType": "navigation" + "sourceType": "navigation", + "sourceId" : "S4", + "triggerId" : "Trigger6" } ], "attributions": [ @@ -318,7 +334,9 @@ "destinationOrigin": "https://site2.com", "enrollmentId": "enrollment-id", "triggerTime": 1648665733601, - "registrant": "android-app://com.registrant.deleteCandidate" + "registrant": "android-app://com.registrant.deleteCandidate", + "sourceId" : "S3", + "triggerId" : "T1" }, { "id": "A2", @@ -328,7 +346,9 @@ "destinationOrigin": "https://site2.com", "enrollmentId": "enrollment-id", "triggerTime": 1648665733605, - "registrant": "android-app://com.registrant.deleteCandidate" + "registrant": "android-app://com.registrant.deleteCandidate", + "sourceId" : "S2", + "triggerId" : "T2" }, { "id": "A3", @@ -338,7 +358,9 @@ "destinationOrigin": "https://deleteCandidate2.site.com", "enrollmentId": "enrollment-id", "triggerTime": 1648665733601, - "registrant": "android-app://com.registrant.deleteCandidate" + "registrant": "android-app://com.registrant.deleteCandidate", + "sourceId" : "S2", + "triggerId" : "T1" }, { "id": "A4", @@ -348,7 +370,9 @@ "destinationOrigin": "https://site2.com", "enrollmentId": "enrollment-id", "triggerTime": 1648665733601, - "registrant": "android-app://com.registrant.deleteCandidate" + "registrant": "android-app://com.registrant.deleteCandidate", + "sourceId" : "S1", + "triggerId" : "T3" }, { "id": "A5", @@ -358,7 +382,9 @@ "destinationOrigin": "https://abc.deletesite2.com", "enrollmentId": "enrollment-id", "triggerTime": 1648665733601, - "registrant": "android-app://com.registrant.deleteCandidate" + "registrant": "android-app://com.registrant.deleteCandidate", + "sourceId" : "S7", + "triggerId" : "Trigger6" }, { "id": "A6", @@ -368,17 +394,9 @@ "destinationOrigin": "https://site2.com", "enrollmentId": "enrollment-id", "triggerTime": 1648665733601, - "registrant": "android-app://com.registrant.deleteCandidate" - }, - { - "id": "A7", - "sourceSite": "https://site1.com", - "sourceOrigin": "https://site1.com", - "destinationSite": "https://site2.com", - "destinationOrigin": "https://site2.com", - "enrollmentId": "enrollment-id", - "triggerTime": 1648665733601, - "registrant": "android-app://com.registrant.deleteCandidate" + "registrant": "android-app://com.registrant.deleteCandidate", + "sourceId" : "S3", + "triggerId" : "Trigger6" } ] }, @@ -528,7 +546,7 @@ "registrant": "android-app://com.registrant.deleteCandidate" }, { - "id": "T6", + "id": "Trigger6", "attributionDestination": "https://deletesite2.com", "enrollmentId": "enrollment-id", "priority": 101, @@ -550,7 +568,7 @@ "event_reports": [ { "id": "E1", - "sourceId": 2, + "sourceEventId": 2, "attributionDestination": "https://abc.deletesite1.com", "enrollmentId": "enrollment-id", "triggerData": 2, @@ -558,11 +576,13 @@ "status": 0, "reportTime": -1, "triggerPriority": 101, - "sourceType": "navigation" + "sourceType": "navigation", + "sourceId" : "S1", + "triggerId" : "T1" }, { "id": "E4", - "sourceId": 2, + "sourceEventId": 2, "attributionDestination": "https://deleteCandidate1.site.com", "enrollmentId": "enrollment-id", "triggerData": 2, @@ -570,11 +590,13 @@ "status": 0, "reportTime": -1, "triggerPriority": 101, - "sourceType": "navigation" + "sourceType": "navigation", + "sourceId" : "S2", + "triggerId" : "T4" }, { "id": "E5", - "sourceId": 2, + "sourceEventId": 2, "attributionDestination": "https://deleteCandidate1.site.com", "enrollmentId": "enrollment-id", "triggerData": 2, @@ -582,11 +604,13 @@ "status": 0, "reportTime": -1, "triggerPriority": 101, - "sourceType": "navigation" + "sourceType": "navigation", + "sourceId" : "S1", + "triggerId" : "T2" }, { "id": "E6", - "sourceId": 2, + "sourceEventId": 2, "attributionDestination": "https://deleteCandidate2.site.com", "enrollmentId": "enrollment-id", "triggerData": 2, @@ -594,11 +618,13 @@ "status": 0, "reportTime": -1, "triggerPriority": 101, - "sourceType": "navigation" + "sourceType": "navigation", + "sourceId" : "S2", + "triggerId" : "T1" }, { "id": "E7", - "sourceId": 2, + "sourceEventId": 2, "attributionDestination": "https://qwe.deletesite1.com", "enrollmentId": "enrollment-id", "triggerData": 2, @@ -606,11 +632,13 @@ "status": 0, "reportTime": -1, "triggerPriority": 101, - "sourceType": "navigation" + "sourceType": "navigation", + "sourceId" : "S5", + "triggerId" : "T5" }, { "id": "E8", - "sourceId": 2, + "sourceEventId": 2, "attributionDestination": "https://qwe.deletesite2.com", "enrollmentId": "enrollment-id", "triggerData": 2, @@ -618,7 +646,9 @@ "status": 0, "reportTime": -1, "triggerPriority": 101, - "sourceType": "navigation" + "sourceType": "navigation", + "sourceId" : "S4", + "triggerId" : "Trigger6" } ], "attributions": [ @@ -630,7 +660,9 @@ "destinationOrigin": "https://site2.com", "enrollmentId": "enrollment-id", "triggerTime": 1648665733605, - "registrant": "android-app://com.registrant.deleteCandidate" + "registrant": "android-app://com.registrant.deleteCandidate", + "sourceId" : "S2", + "triggerId" : "T2" }, { "id": "A3", @@ -640,12 +672,14 @@ "destinationOrigin": "https://deleteCandidate2.site.com", "enrollmentId": "enrollment-id", "triggerTime": 1648665733601, - "registrant": "android-app://com.registrant.deleteCandidate" + "registrant": "android-app://com.registrant.deleteCandidate", + "sourceId" : "S2", + "triggerId" : "T1" } ] }, "param": { - "registrant": "android-app://com.registrant.deleteCandidate", + "registrant": "com.registrant.deleteCandidate", "start": 1648665733600, "end": 1648665733602, "origins": ["https://deleteCandidate1.site.com", "https://deleteCandidate2.site.com"], diff --git a/adservices/tests/unittest/service-core/assets/msmt_browser_deletion_tests/with_origin_but_no_range.json b/adservices/tests/unittest/service-core/assets/msmt_browser_deletion_tests/with_origin_but_no_range.json index b08551d700..9007a3f50b 100644 --- a/adservices/tests/unittest/service-core/assets/msmt_browser_deletion_tests/with_origin_but_no_range.json +++ b/adservices/tests/unittest/service-core/assets/msmt_browser_deletion_tests/with_origin_but_no_range.json @@ -68,19 +68,21 @@ "event_reports": [ { "id": "E1", - "sourceId": 1, - "attributionDestination": "android-app://com.site.toBeDeletedDueToSourceId1", + "sourceEventId": 1, + "attributionDestination": "android-app://com.site.toBeDeletedDueTosourceEventId1", "enrollmentId": "enrollment-id", "triggerData": 2, "triggerTime": 8640000002, "status": 0, "reportTime": -1, "triggerPriority": 101, - "sourceType": "navigation" + "sourceType": "navigation", + "sourceId": "S1", + "triggerId": "T1" }, { "id": "E2", - "sourceId": 2, + "sourceEventId": 2, "attributionDestination": "android-app://com.site.toBeDeleted", "enrollmentId": "enrollment-id", "triggerData": 2, @@ -88,11 +90,13 @@ "status": 0, "reportTime": -1, "triggerPriority": 101, - "sourceType": "navigation" + "sourceType": "navigation", + "sourceId": "S1", + "triggerId": "T2" }, { "id": "E3", - "sourceId": 3, + "sourceEventId": 3, "attributionDestination": "android-app://com.site.doNotDelete", "enrollmentId": "enrollment-id", "triggerData": 2, @@ -100,7 +104,9 @@ "status": 0, "reportTime": -1, "triggerPriority": 101, - "sourceType": "navigation" + "sourceType": "navigation", + "sourceId": "S2", + "triggerId": "T2" } ], "attributions": [ @@ -112,7 +118,9 @@ "destinationOrigin": "android-app://com.site3", "enrollmentId": "enrollment-id", "triggerTime": 10, - "registrant": "android-app://com.registrant.deleteCandidate" + "registrant": "android-app://com.registrant.deleteCandidate", + "sourceId": "S1", + "triggerId": "T1" }, { "id": "A2", @@ -122,7 +130,9 @@ "destinationOrigin": "android-app://com.site.toBeDeleted", "enrollmentId": "enrollment-id", "triggerTime": 10, - "registrant": "android-app://com.registrant.deleteCandidate" + "registrant": "android-app://com.registrant.deleteCandidate", + "sourceId": "S1", + "triggerId": "T2" }, { "id": "A3", @@ -132,7 +142,9 @@ "destinationOrigin": "android-app://com.site2.doNotDelete", "enrollmentId": "enrollment-id", "triggerTime": 10, - "registrant": "android-app://com.registrant.deleteCandidate" + "registrant": "android-app://com.registrant.deleteCandidate", + "sourceId": "S2", + "triggerId": "T2" } ] }, @@ -174,7 +186,7 @@ "event_reports": [ { "id": "E3", - "sourceId": 3, + "sourceEventId": 3, "attributionDestination": "android-app://com.site.doNotDelete", "enrollmentId": "enrollment-id", "triggerData": 2, @@ -182,7 +194,9 @@ "status": 0, "reportTime": -1, "triggerPriority": 101, - "sourceType": "navigation" + "sourceType": "navigation", + "sourceId": "S2", + "triggerId": "T2" } ], "attributions": [ @@ -194,12 +208,14 @@ "destinationOrigin": "android-app://com.site2.doNotDelete", "enrollmentId": "enrollment-id", "triggerTime": 10, - "registrant": "android-app://com.registrant.deleteCandidate" + "registrant": "android-app://com.registrant.deleteCandidate", + "sourceId": "S2", + "triggerId": "T2" } ] }, "param": { - "registrant": "android-app://com.registrant.deleteCandidate", + "registrant": "com.registrant.deleteCandidate", "origins": ["android-app://com.site.toBeDeleted"], "domains": [] } diff --git a/adservices/tests/unittest/service-core/assets/msmt_browser_deletion_tests/with_range_and_origin.json b/adservices/tests/unittest/service-core/assets/msmt_browser_deletion_tests/with_range_and_origin.json index 80c7383021..f0a2b6217a 100644 --- a/adservices/tests/unittest/service-core/assets/msmt_browser_deletion_tests/with_range_and_origin.json +++ b/adservices/tests/unittest/service-core/assets/msmt_browser_deletion_tests/with_range_and_origin.json @@ -104,7 +104,7 @@ "event_reports": [ { "id": "E1", - "sourceId": 1, + "sourceEventId": 1, "attributionDestination": "android-app://com.site.deleteCandidate", "enrollmentId": "enrollment-id", "triggerData": 2, @@ -112,23 +112,27 @@ "status": 0, "reportTime": -1, "triggerPriority": 101, - "sourceType": "navigation" + "sourceType": "navigation", + "sourceId": "S1", + "triggerId": "T1" }, { "id": "E2", - "sourceId": 1, - "attributionDestination": "android-app://com.site.notInRangeButDeleteDueToSourceId1", + "sourceEventId": 1, + "attributionDestination": "android-app://com.site.notInRangeButDeleteDueTosourceEventId1", "enrollmentId": "enrollment-id", "triggerData": 2, "triggerTime": 1648665733605, "status": 0, "reportTime": -1, "triggerPriority": 101, - "sourceType": "navigation" + "sourceType": "navigation", + "sourceId": "S1", + "triggerId": "T2" }, { "id": "E3", - "sourceId": 2, + "sourceEventId": 2, "attributionDestination": "android-app://com.site.doNotDelete", "enrollmentId": "enrollment-id", "triggerData": 2, @@ -136,11 +140,13 @@ "status": 0, "reportTime": -1, "triggerPriority": 101, - "sourceType": "navigation" + "sourceType": "navigation", + "sourceId": "S2", + "triggerId": "T2" }, { "id": "E4", - "sourceId": 2, + "sourceEventId": 2, "attributionDestination": "android-app://com.site.deleteCandidate", "enrollmentId": "enrollment-id", "triggerData": 2, @@ -148,11 +154,13 @@ "status": 0, "reportTime": -1, "triggerPriority": 101, - "sourceType": "navigation" + "sourceType": "navigation", + "sourceId": "S2", + "triggerId": "T1" }, { "id": "E5", - "sourceId": 2, + "sourceEventId": 2, "attributionDestination": "android-app://com.site.deleteCandidate", "enrollmentId": "enrollment-id", "triggerData": 2, @@ -160,7 +168,9 @@ "status": 0, "reportTime": -1, "triggerPriority": 101, - "sourceType": "navigation" + "sourceType": "navigation", + "sourceId": "S3", + "triggerId": "T3" } ], "attributions": [ @@ -172,7 +182,9 @@ "destinationOrigin": "android-app://com.site2", "enrollmentId": "enrollment-id", "triggerTime": 1648665733601, - "registrant": "android-app://com.registrant.deleteCandidate" + "registrant": "android-app://com.registrant.deleteCandidate", + "sourceId": "S1", + "triggerId": "T1" }, { "id": "A2", @@ -182,7 +194,9 @@ "destinationOrigin": "android-app://com.site2", "enrollmentId": "enrollment-id", "triggerTime": 1648665733605, - "registrant": "android-app://com.registrant.deleteCandidate" + "registrant": "android-app://com.registrant.deleteCandidate", + "sourceId": "S2", + "triggerId": "T2" }, { "id": "A3", @@ -192,7 +206,9 @@ "destinationOrigin": "android-app://com.site2", "enrollmentId": "enrollment-id", "triggerTime": 1648665733601, - "registrant": "android-app://com.registrant.deleteCandidate" + "registrant": "android-app://com.registrant.deleteCandidate", + "sourceId": "S3", + "triggerId": "T3" } ] }, @@ -268,7 +284,7 @@ "event_reports": [ { "id": "E3", - "sourceId": 2, + "sourceEventId": 2, "attributionDestination": "android-app://com.site.doNotDelete", "enrollmentId": "enrollment-id", "triggerData": 2, @@ -276,11 +292,13 @@ "status": 0, "reportTime": -1, "triggerPriority": 101, - "sourceType": "navigation" + "sourceType": "navigation", + "sourceId": "S2", + "triggerId": "T2" }, { "id": "E5", - "sourceId": 2, + "sourceEventId": 2, "attributionDestination": "android-app://com.site.deleteCandidate", "enrollmentId": "enrollment-id", "triggerData": 2, @@ -288,7 +306,9 @@ "status": 0, "reportTime": -1, "triggerPriority": 101, - "sourceType": "navigation" + "sourceType": "navigation", + "sourceId": "S3", + "triggerId": "T3" } ], "attributions": [ @@ -300,7 +320,9 @@ "destinationOrigin": "android-app://com.site2", "enrollmentId": "enrollment-id", "triggerTime": 1648665733605, - "registrant": "android-app://com.registrant.deleteCandidate" + "registrant": "android-app://com.registrant.deleteCandidate", + "sourceId": "S2", + "triggerId": "T2" }, { "id": "A3", @@ -310,12 +332,14 @@ "destinationOrigin": "android-app://com.site2", "enrollmentId": "enrollment-id", "triggerTime": 1648665733601, - "registrant": "android-app://com.registrant.deleteCandidate" + "registrant": "android-app://com.registrant.deleteCandidate", + "sourceId": "S3", + "triggerId": "T3" } ] }, "param": { - "registrant": "android-app://com.registrant.deleteCandidate", + "registrant": "com.registrant.deleteCandidate", "start": 1648665733600, "end": 1648665733602, "origins": ["android-app://com.site.deleteCandidate"], diff --git a/adservices/tests/unittest/service-core/assets/msmt_browser_deletion_tests/with_range_but_no_origin.json b/adservices/tests/unittest/service-core/assets/msmt_browser_deletion_tests/with_range_but_no_origin.json index 7e651ffd45..4049d0cf80 100644 --- a/adservices/tests/unittest/service-core/assets/msmt_browser_deletion_tests/with_range_but_no_origin.json +++ b/adservices/tests/unittest/service-core/assets/msmt_browser_deletion_tests/with_range_but_no_origin.json @@ -72,7 +72,7 @@ "event_reports": [ { "id": "E1", - "sourceId": 1, + "sourceEventId": 1, "attributionDestination": "android-app://com.site2.toBeDeletedDueToSourceId1", "enrollmentId": "enrollment-id", "triggerData": 2, @@ -80,11 +80,13 @@ "status": 0, "reportTime": -1, "triggerPriority": 101, - "sourceType": "navigation" + "sourceType": "navigation", + "sourceId": "S1", + "triggerId": "T1" }, { "id": "E2", - "sourceId": 1, + "sourceEventId": 1, "attributionDestination": "android-app://com.site2.toBeDeletedDueToSourceId1", "enrollmentId": "enrollment-id", "triggerData": 2, @@ -92,11 +94,13 @@ "status": 0, "reportTime": -1, "triggerPriority": 101, - "sourceType": "navigation" + "sourceType": "navigation", + "sourceId": "S1", + "triggerId": "T2" }, { "id": "E3", - "sourceId": 2, + "sourceEventId": 2, "attributionDestination": "android-app://com.site2", "enrollmentId": "enrollment-id", "triggerData": 2, @@ -104,7 +108,9 @@ "status": 0, "reportTime": -1, "triggerPriority": 101, - "sourceType": "navigation" + "sourceType": "navigation", + "sourceId": "S2", + "triggerId": "T2" } ], "attributions": [ @@ -116,7 +122,9 @@ "destinationOrigin": "android-app://com.site2", "enrollmentId": "enrollment-id", "triggerTime": 1648665733601, - "registrant": "android-app://com.registrant.deleteCandidate" + "registrant": "android-app://com.registrant.deleteCandidate", + "sourceId": "S1", + "triggerId": "T1" }, { "id": "A2", @@ -126,7 +134,9 @@ "destinationOrigin": "android-app://com.site2", "enrollmentId": "enrollment-id", "triggerTime": 1648665733605, - "registrant": "android-app://com.registrant.deleteCandidate" + "registrant": "android-app://com.registrant.deleteCandidate", + "sourceId": "S2", + "triggerId": "T2" } ] }, @@ -170,7 +180,7 @@ "event_reports": [ { "id": "E3", - "sourceId": 2, + "sourceEventId": 2, "attributionDestination": "android-app://com.site2", "enrollmentId": "enrollment-id", "triggerData": 2, @@ -178,7 +188,9 @@ "status": 0, "reportTime": -1, "triggerPriority": 101, - "sourceType": "navigation" + "sourceType": "navigation", + "sourceId": "S2", + "triggerId": "T2" } ], "attributions": [ @@ -190,12 +202,14 @@ "destinationOrigin": "android-app://com.site2", "enrollmentId": "enrollment-id", "triggerTime": 1648665733605, - "registrant": "android-app://com.registrant.deleteCandidate" + "registrant": "android-app://com.registrant.deleteCandidate", + "sourceId": "S2", + "triggerId": "T2" } ] }, "param": { - "registrant": "android-app://com.registrant.deleteCandidate", + "registrant": "com.registrant.deleteCandidate", "start": 1648665733600, "end": 1648665733602, "origins": [], diff --git a/adservices/tests/unittest/service-core/assets/msmt_browser_deletion_tests/with_range_on_ending_edge_and_origin.json b/adservices/tests/unittest/service-core/assets/msmt_browser_deletion_tests/with_range_on_ending_edge_and_origin.json index 3ab4b09a63..aeff084838 100644 --- a/adservices/tests/unittest/service-core/assets/msmt_browser_deletion_tests/with_range_on_ending_edge_and_origin.json +++ b/adservices/tests/unittest/service-core/assets/msmt_browser_deletion_tests/with_range_on_ending_edge_and_origin.json @@ -104,7 +104,7 @@ "event_reports": [ { "id": "E1", - "sourceId": 1, + "sourceEventId": 1, "attributionDestination": "android-app://com.site.deleteCandidate", "enrollmentId": "enrollment-id", "triggerData": 2, @@ -112,11 +112,13 @@ "status": 0, "reportTime": -1, "triggerPriority": 101, - "sourceType": "navigation" + "sourceType": "navigation", + "sourceId": "S1", + "triggerId": "T1" }, { "id": "E2", - "sourceId": 1, + "sourceEventId": 1, "attributionDestination": "android-app://com.site.notInRangeButDeleteDueToSourceId1", "enrollmentId": "enrollment-id", "triggerData": 2, @@ -124,11 +126,13 @@ "status": 0, "reportTime": -1, "triggerPriority": 101, - "sourceType": "navigation" + "sourceType": "navigation", + "sourceId": "S1", + "triggerId": "T2" }, { "id": "E3", - "sourceId": 2, + "sourceEventId": 2, "attributionDestination": "android-app://com.site.doNotDelete", "enrollmentId": "enrollment-id", "triggerData": 2, @@ -136,11 +140,13 @@ "status": 0, "reportTime": -1, "triggerPriority": 101, - "sourceType": "navigation" + "sourceType": "navigation", + "sourceId": "S2", + "triggerId": "T2" }, { "id": "E4", - "sourceId": 2, + "sourceEventId": 2, "attributionDestination": "android-app://com.site.deleteCandidate", "enrollmentId": "enrollment-id", "triggerData": 2, @@ -148,11 +154,13 @@ "status": 0, "reportTime": -1, "triggerPriority": 101, - "sourceType": "navigation" + "sourceType": "navigation", + "sourceId": "S2", + "triggerId": "T1" }, { "id": "E5", - "sourceId": 2, + "sourceEventId": 2, "attributionDestination": "android-app://com.site.deleteCandidate", "enrollmentId": "enrollment-id", "triggerData": 2, @@ -160,7 +168,9 @@ "status": 0, "reportTime": -1, "triggerPriority": 101, - "sourceType": "navigation" + "sourceType": "navigation", + "sourceId": "S3", + "triggerId": "T3" } ], "attributions": [ @@ -172,7 +182,9 @@ "destinationOrigin": "android-app://com.site2", "enrollmentId": "enrollment-id", "triggerTime": 1648665733602, - "registrant": "android-app://com.registrant.deleteCandidate" + "registrant": "android-app://com.registrant.deleteCandidate", + "sourceId": "S1", + "triggerId": "T1" }, { "id": "A2", @@ -182,7 +194,9 @@ "destinationOrigin": "android-app://com.site2", "enrollmentId": "enrollment-id", "triggerTime": 1648665733605, - "registrant": "android-app://com.registrant.deleteCandidate" + "registrant": "android-app://com.registrant.deleteCandidate", + "sourceId": "S2", + "triggerId": "T2" }, { "id": "A3", @@ -192,7 +206,9 @@ "destinationOrigin": "android-app://com.site2", "enrollmentId": "enrollment-id", "triggerTime": 1648665733602, - "registrant": "android-app://com.registrant.deleteCandidate" + "registrant": "android-app://com.registrant.deleteCandidate", + "sourceId": "S3", + "triggerId": "T3" } ] }, @@ -268,7 +284,7 @@ "event_reports": [ { "id": "E3", - "sourceId": 2, + "sourceEventId": 2, "attributionDestination": "android-app://com.site.doNotDelete", "enrollmentId": "enrollment-id", "triggerData": 2, @@ -276,11 +292,13 @@ "status": 0, "reportTime": -1, "triggerPriority": 101, - "sourceType": "navigation" + "sourceType": "navigation", + "sourceId": "S2", + "triggerId": "T2" }, { "id": "E5", - "sourceId": 2, + "sourceEventId": 2, "attributionDestination": "android-app://com.site.deleteCandidate", "enrollmentId": "enrollment-id", "triggerData": 2, @@ -288,7 +306,9 @@ "status": 0, "reportTime": -1, "triggerPriority": 101, - "sourceType": "navigation" + "sourceType": "navigation", + "sourceId": "S3", + "triggerId": "T3" } ], "attributions": [ @@ -300,7 +320,9 @@ "destinationOrigin": "android-app://com.site2", "enrollmentId": "enrollment-id", "triggerTime": 1648665733605, - "registrant": "android-app://com.registrant.deleteCandidate" + "registrant": "android-app://com.registrant.deleteCandidate", + "sourceId": "S2", + "triggerId": "T2" }, { "id": "A3", @@ -310,12 +332,14 @@ "destinationOrigin": "android-app://com.site2", "enrollmentId": "enrollment-id", "triggerTime": 1648665733602, - "registrant": "android-app://com.registrant.deleteCandidate" + "registrant": "android-app://com.registrant.deleteCandidate", + "sourceId": "S3", + "triggerId": "T3" } ] }, "param": { - "registrant": "android-app://com.registrant.deleteCandidate", + "registrant": "com.registrant.deleteCandidate", "start": 1648665733600, "end": 1648665733602, "origins": ["android-app://com.site.deleteCandidate"], diff --git a/adservices/tests/unittest/service-core/assets/msmt_browser_deletion_tests/with_range_on_ending_edge_no_origin.json b/adservices/tests/unittest/service-core/assets/msmt_browser_deletion_tests/with_range_on_ending_edge_no_origin.json index 708db5af93..a8095ee28f 100644 --- a/adservices/tests/unittest/service-core/assets/msmt_browser_deletion_tests/with_range_on_ending_edge_no_origin.json +++ b/adservices/tests/unittest/service-core/assets/msmt_browser_deletion_tests/with_range_on_ending_edge_no_origin.json @@ -72,7 +72,7 @@ "event_reports": [ { "id": "E1", - "sourceId": 1, + "sourceEventId": 1, "attributionDestination": "android-app://com.site2.toBeDeletedDueToSourceId1", "enrollmentId": "enrollment-id", "triggerData": 2, @@ -80,11 +80,13 @@ "status": 0, "reportTime": -1, "triggerPriority": 101, - "sourceType": "navigation" + "sourceType": "navigation", + "sourceId": "S1", + "triggerId": "T1" }, { "id": "E2", - "sourceId": 1, + "sourceEventId": 1, "attributionDestination": "android-app://com.site2.toBeDeletedDueToSourceId1", "enrollmentId": "enrollment-id", "triggerData": 2, @@ -92,11 +94,13 @@ "status": 0, "reportTime": -1, "triggerPriority": 101, - "sourceType": "navigation" + "sourceType": "navigation", + "sourceId": "S1", + "triggerId": "T2" }, { "id": "E3", - "sourceId": 2, + "sourceEventId": 2, "attributionDestination": "android-app://com.site2", "enrollmentId": "enrollment-id", "triggerData": 2, @@ -104,7 +108,9 @@ "status": 0, "reportTime": -1, "triggerPriority": 101, - "sourceType": "navigation" + "sourceType": "navigation", + "sourceId": "S2", + "triggerId": "T2" } ], "attributions": [ @@ -116,7 +122,9 @@ "destinationOrigin": "android-app://com.site2", "enrollmentId": "enrollment-id", "triggerTime": 1648665733602, - "registrant": "android-app://com.registrant.deleteCandidate" + "registrant": "android-app://com.registrant.deleteCandidate", + "sourceId": "S1", + "triggerId": "T1" }, { "id": "A2", @@ -126,7 +134,9 @@ "destinationOrigin": "android-app://com.site2", "enrollmentId": "enrollment-id", "triggerTime": 1648665733605, - "registrant": "android-app://com.registrant.deleteCandidate" + "registrant": "android-app://com.registrant.deleteCandidate", + "sourceId": "S2", + "triggerId": "T2" } ] }, @@ -170,7 +180,7 @@ "event_reports": [ { "id": "E3", - "sourceId": 2, + "sourceEventId": 2, "attributionDestination": "android-app://com.site2", "enrollmentId": "enrollment-id", "triggerData": 2, @@ -178,7 +188,9 @@ "status": 0, "reportTime": -1, "triggerPriority": 101, - "sourceType": "navigation" + "sourceType": "navigation", + "sourceId": "S2", + "triggerId": "T2" } ], "attributions": [ @@ -190,12 +202,14 @@ "destinationOrigin": "android-app://com.site2", "enrollmentId": "enrollment-id", "triggerTime": 1648665733605, - "registrant": "android-app://com.registrant.deleteCandidate" + "registrant": "android-app://com.registrant.deleteCandidate", + "sourceId": "S2", + "triggerId": "T2" } ] }, "param": { - "registrant": "android-app://com.registrant.deleteCandidate", + "registrant": "com.registrant.deleteCandidate", "start": 1648665733600, "end": 1648665733602, "origins": [], diff --git a/adservices/tests/unittest/service-core/assets/msmt_browser_deletion_tests/with_range_on_starting_edge_and_origin.json b/adservices/tests/unittest/service-core/assets/msmt_browser_deletion_tests/with_range_on_starting_edge_and_origin.json index 4fbdc711cd..f4adcc7f7f 100644 --- a/adservices/tests/unittest/service-core/assets/msmt_browser_deletion_tests/with_range_on_starting_edge_and_origin.json +++ b/adservices/tests/unittest/service-core/assets/msmt_browser_deletion_tests/with_range_on_starting_edge_and_origin.json @@ -104,7 +104,7 @@ "event_reports": [ { "id": "E1", - "sourceId": 1, + "sourceEventId": 1, "attributionDestination": "android-app://com.site.deleteCandidate", "enrollmentId": "enrollment-id", "triggerData": 2, @@ -112,11 +112,13 @@ "status": 0, "reportTime": -1, "triggerPriority": 101, - "sourceType": "navigation" + "sourceType": "navigation", + "sourceId": "S1", + "triggerId": "T1" }, { "id": "E2", - "sourceId": 1, + "sourceEventId": 1, "attributionDestination": "android-app://com.site.notInRangeButDeleteDueToSourceId1", "enrollmentId": "enrollment-id", "triggerData": 2, @@ -124,11 +126,13 @@ "status": 0, "reportTime": -1, "triggerPriority": 101, - "sourceType": "navigation" + "sourceType": "navigation", + "sourceId": "S1", + "triggerId": "T2" }, { "id": "E3", - "sourceId": 2, + "sourceEventId": 2, "attributionDestination": "android-app://com.site.doNotDelete", "enrollmentId": "enrollment-id", "triggerData": 2, @@ -136,11 +140,13 @@ "status": 0, "reportTime": -1, "triggerPriority": 101, - "sourceType": "navigation" + "sourceType": "navigation", + "sourceId": "S2", + "triggerId": "T2" }, { "id": "E4", - "sourceId": 2, + "sourceEventId": 2, "attributionDestination": "android-app://com.site.deleteCandidate", "enrollmentId": "enrollment-id", "triggerData": 2, @@ -148,11 +154,13 @@ "status": 0, "reportTime": -1, "triggerPriority": 101, - "sourceType": "navigation" + "sourceType": "navigation", + "sourceId": "S2", + "triggerId": "T1" }, { "id": "E5", - "sourceId": 2, + "sourceEventId": 2, "attributionDestination": "android-app://com.site.deleteCandidate", "enrollmentId": "enrollment-id", "triggerData": 2, @@ -160,7 +168,9 @@ "status": 0, "reportTime": -1, "triggerPriority": 101, - "sourceType": "navigation" + "sourceType": "navigation", + "sourceId": "S2", + "triggerId": "T2" } ], "attributions": [ @@ -172,7 +182,9 @@ "destinationOrigin": "android-app://com.site2", "enrollmentId": "enrollment-id", "triggerTime": 1648665733600, - "registrant": "android-app://com.registrant.deleteCandidate" + "registrant": "android-app://com.registrant.deleteCandidate", + "sourceId": "S1", + "triggerId": "T1" }, { "id": "A2", @@ -182,17 +194,9 @@ "destinationOrigin": "android-app://com.site2", "enrollmentId": "enrollment-id", "triggerTime": 1648665733605, - "registrant": "android-app://com.registrant.deleteCandidate" - }, - { - "id": "A3", - "sourceSite": "android-app://com.site3", - "sourceOrigin": "android-app://com.site3", - "destinationSite": "android-app://com.site2", - "destinationOrigin": "android-app://com.site2", - "enrollmentId": "enrollment-id", - "triggerTime": 1648665733600, - "registrant": "android-app://com.registrant.deleteCandidate" + "registrant": "android-app://com.registrant.deleteCandidate", + "sourceId": "S2", + "triggerId": "T2" } ] }, @@ -268,7 +272,7 @@ "event_reports": [ { "id": "E3", - "sourceId": 2, + "sourceEventId": 2, "attributionDestination": "android-app://com.site.doNotDelete", "enrollmentId": "enrollment-id", "triggerData": 2, @@ -276,11 +280,13 @@ "status": 0, "reportTime": -1, "triggerPriority": 101, - "sourceType": "navigation" + "sourceType": "navigation", + "sourceId": "S2", + "triggerId": "T2" }, { "id": "E5", - "sourceId": 2, + "sourceEventId": 2, "attributionDestination": "android-app://com.site.deleteCandidate", "enrollmentId": "enrollment-id", "triggerData": 2, @@ -288,7 +294,9 @@ "status": 0, "reportTime": -1, "triggerPriority": 101, - "sourceType": "navigation" + "sourceType": "navigation", + "sourceId": "S2", + "triggerId": "T2" } ], "attributions": [ @@ -300,22 +308,14 @@ "destinationOrigin": "android-app://com.site2", "enrollmentId": "enrollment-id", "triggerTime": 1648665733605, - "registrant": "android-app://com.registrant.deleteCandidate" - }, - { - "id": "A3", - "sourceSite": "android-app://com.site3", - "sourceOrigin": "android-app://com.site3", - "destinationSite": "android-app://com.site2", - "destinationOrigin": "android-app://com.site2", - "enrollmentId": "enrollment-id", - "triggerTime": 1648665733600, - "registrant": "android-app://com.registrant.deleteCandidate" + "registrant": "android-app://com.registrant.deleteCandidate", + "sourceId": "S2", + "triggerId": "T2" } ] }, "param": { - "registrant": "android-app://com.registrant.deleteCandidate", + "registrant": "com.registrant.deleteCandidate", "start": 1648665733600, "end": 1648665733602, "origins": ["android-app://com.site.deleteCandidate"], diff --git a/adservices/tests/unittest/service-core/assets/msmt_browser_deletion_tests/with_range_on_starting_edge_no_origin.json b/adservices/tests/unittest/service-core/assets/msmt_browser_deletion_tests/with_range_on_starting_edge_no_origin.json index d162d2fed1..1bf656c55c 100644 --- a/adservices/tests/unittest/service-core/assets/msmt_browser_deletion_tests/with_range_on_starting_edge_no_origin.json +++ b/adservices/tests/unittest/service-core/assets/msmt_browser_deletion_tests/with_range_on_starting_edge_no_origin.json @@ -72,31 +72,35 @@ "event_reports": [ { "id": "E1", - "sourceId": 1, + "sourceEventId": 1, "attributionDestination": "android-app://com.site2.toBeDeletedDueToSourceId1", "enrollmentId": "enrollment-id", "triggerData": 2, "triggerTime": 1648665733600, - "status": 0, + "status": 2, "reportTime": -1, "triggerPriority": 101, - "sourceType": "navigation" + "sourceType": "navigation", + "sourceId": "S1", + "triggerId": "T1" }, { "id": "E2", - "sourceId": 1, + "sourceEventId": 1, "attributionDestination": "android-app://com.site2.toBeDeletedDueToSourceId1", "enrollmentId": "enrollment-id", "triggerData": 2, "triggerTime": 1648665733605, - "status": 0, + "status": 2, "reportTime": -1, "triggerPriority": 101, - "sourceType": "navigation" + "sourceType": "navigation", + "sourceId": "S1", + "triggerId": "T2" }, { "id": "E3", - "sourceId": 2, + "sourceEventId": 2, "attributionDestination": "android-app://com.site2", "enrollmentId": "enrollment-id", "triggerData": 2, @@ -104,7 +108,9 @@ "status": 0, "reportTime": -1, "triggerPriority": 101, - "sourceType": "navigation" + "sourceType": "navigation", + "sourceId": "S2", + "triggerId": "T2" } ], "attributions": [ @@ -116,7 +122,9 @@ "destinationOrigin": "android-app://com.site2", "enrollmentId": "enrollment-id", "triggerTime": 1648665733600, - "registrant": "android-app://com.registrant.deleteCandidate" + "registrant": "android-app://com.registrant.deleteCandidate", + "sourceId": "S1", + "triggerId": "T1" }, { "id": "A2", @@ -126,7 +134,9 @@ "destinationOrigin": "android-app://com.site2", "enrollmentId": "enrollment-id", "triggerTime": 1648665733605, - "registrant": "android-app://com.registrant.deleteCandidate" + "registrant": "android-app://com.registrant.deleteCandidate", + "sourceId": "S2", + "triggerId": "T2" } ] }, @@ -170,7 +180,7 @@ "event_reports": [ { "id": "E3", - "sourceId": 2, + "sourceEventId": 2, "attributionDestination": "android-app://com.site2", "enrollmentId": "enrollment-id", "triggerData": 2, @@ -178,7 +188,9 @@ "status": 0, "reportTime": -1, "triggerPriority": 101, - "sourceType": "navigation" + "sourceType": "navigation", + "sourceId": "S2", + "triggerId": "T2" } ], "attributions": [ @@ -190,12 +202,14 @@ "destinationOrigin": "android-app://com.site2", "enrollmentId": "enrollment-id", "triggerTime": 1648665733605, - "registrant": "android-app://com.registrant.deleteCandidate" + "registrant": "android-app://com.registrant.deleteCandidate", + "sourceId": "S2", + "triggerId": "T2" } ] }, "param": { - "registrant": "android-app://com.registrant.deleteCandidate", + "registrant": "com.registrant.deleteCandidate", "start": 1648665733600, "end": 1648665733602, "origins": [], diff --git a/adservices/tests/unittest/service-core/assets/msmt_browser_deletion_tests/with_start_equals_end_and_origin.json b/adservices/tests/unittest/service-core/assets/msmt_browser_deletion_tests/with_start_equals_end_and_origin.json index 91f25ba4ee..242f3bbb60 100644 --- a/adservices/tests/unittest/service-core/assets/msmt_browser_deletion_tests/with_start_equals_end_and_origin.json +++ b/adservices/tests/unittest/service-core/assets/msmt_browser_deletion_tests/with_start_equals_end_and_origin.json @@ -104,7 +104,7 @@ "event_reports": [ { "id": "E1", - "sourceId": 1, + "sourceEventId": 1, "attributionDestination": "android-app://com.site.deleteCandidate", "enrollmentId": "enrollment-id", "triggerData": 2, @@ -112,11 +112,13 @@ "status": 0, "reportTime": -1, "triggerPriority": 101, - "sourceType": "navigation" + "sourceType": "navigation", + "sourceId": "S1", + "triggerId": "T1" }, { "id": "E2", - "sourceId": 1, + "sourceEventId": 1, "attributionDestination": "android-app://com.site.notInRangeButDeleteDueToSourceId1", "enrollmentId": "enrollment-id", "triggerData": 2, @@ -124,11 +126,13 @@ "status": 0, "reportTime": -1, "triggerPriority": 101, - "sourceType": "navigation" + "sourceType": "navigation", + "sourceId": "S1", + "triggerId": "T2" }, { "id": "E3", - "sourceId": 2, + "sourceEventId": 2, "attributionDestination": "android-app://com.site.doNotDelete", "enrollmentId": "enrollment-id", "triggerData": 2, @@ -136,11 +140,13 @@ "status": 0, "reportTime": -1, "triggerPriority": 101, - "sourceType": "navigation" + "sourceType": "navigation", + "sourceId": "S2", + "triggerId": "T2" }, { "id": "E4", - "sourceId": 2, + "sourceEventId": 2, "attributionDestination": "android-app://com.site.deleteCandidate", "enrollmentId": "enrollment-id", "triggerData": 2, @@ -148,11 +154,13 @@ "status": 0, "reportTime": -1, "triggerPriority": 101, - "sourceType": "navigation" + "sourceType": "navigation", + "sourceId": "S2", + "triggerId": "T1" }, { "id": "E5", - "sourceId": 2, + "sourceEventId": 2, "attributionDestination": "android-app://com.site.deleteCandidate", "enrollmentId": "enrollment-id", "triggerData": 2, @@ -160,7 +168,9 @@ "status": 0, "reportTime": -1, "triggerPriority": 101, - "sourceType": "navigation" + "sourceType": "navigation", + "sourceId": "S2", + "triggerId": "T2" } ], "attributions": [ @@ -172,7 +182,9 @@ "destinationOrigin": "android-app://com.site2", "enrollmentId": "enrollment-id", "triggerTime": 1648665733600, - "registrant": "android-app://com.registrant.deleteCandidate" + "registrant": "android-app://com.registrant.deleteCandidate", + "sourceId": "S1", + "triggerId": "T1" }, { "id": "A2", @@ -182,17 +194,9 @@ "destinationOrigin": "android-app://com.site2", "enrollmentId": "enrollment-id", "triggerTime": 1648665733605, - "registrant": "android-app://com.registrant.deleteCandidate" - }, - { - "id": "A3", - "sourceSite": "android-app://com.site3", - "sourceOrigin": "android-app://com.site3", - "destinationSite": "android-app://com.site2", - "destinationOrigin": "android-app://com.site2", - "enrollmentId": "enrollment-id", - "triggerTime": 1648665733600, - "registrant": "android-app://com.registrant.deleteCandidate" + "registrant": "android-app://com.registrant.deleteCandidate", + "sourceId": "S2", + "triggerId": "T2" } ] }, @@ -268,7 +272,7 @@ "event_reports": [ { "id": "E3", - "sourceId": 2, + "sourceEventId": 2, "attributionDestination": "android-app://com.site.doNotDelete", "enrollmentId": "enrollment-id", "triggerData": 2, @@ -276,11 +280,13 @@ "status": 0, "reportTime": -1, "triggerPriority": 101, - "sourceType": "navigation" + "sourceType": "navigation", + "sourceId": "S2", + "triggerId": "T2" }, { "id": "E5", - "sourceId": 2, + "sourceEventId": 2, "attributionDestination": "android-app://com.site.deleteCandidate", "enrollmentId": "enrollment-id", "triggerData": 2, @@ -288,7 +294,9 @@ "status": 0, "reportTime": -1, "triggerPriority": 101, - "sourceType": "navigation" + "sourceType": "navigation", + "sourceId": "S2", + "triggerId": "T2" } ], "attributions": [ @@ -300,22 +308,14 @@ "destinationOrigin": "android-app://com.site2", "enrollmentId": "enrollment-id", "triggerTime": 1648665733605, - "registrant": "android-app://com.registrant.deleteCandidate" - }, - { - "id": "A3", - "sourceSite": "android-app://com.site3", - "sourceOrigin": "android-app://com.site3", - "destinationSite": "android-app://com.site2", - "destinationOrigin": "android-app://com.site2", - "enrollmentId": "enrollment-id", - "triggerTime": 1648665733600, - "registrant": "android-app://com.registrant.deleteCandidate" + "registrant": "android-app://com.registrant.deleteCandidate", + "sourceId": "S2", + "triggerId": "T2" } ] }, "param": { - "registrant": "android-app://com.registrant.deleteCandidate", + "registrant": "com.registrant.deleteCandidate", "start": 1648665733600, "end": 1648665733600, "origins": ["android-app://com.site.deleteCandidate"], diff --git a/adservices/tests/unittest/service-core/assets/msmt_browser_deletion_tests/with_start_equals_end_no_origin.json b/adservices/tests/unittest/service-core/assets/msmt_browser_deletion_tests/with_start_equals_end_no_origin.json index a85586a9aa..62a8b900cc 100644 --- a/adservices/tests/unittest/service-core/assets/msmt_browser_deletion_tests/with_start_equals_end_no_origin.json +++ b/adservices/tests/unittest/service-core/assets/msmt_browser_deletion_tests/with_start_equals_end_no_origin.json @@ -72,7 +72,7 @@ "event_reports": [ { "id": "E1", - "sourceId": 1, + "sourceEventId": 1, "attributionDestination": "android-app://com.site2.toBeDeletedDueToSourceId1", "enrollmentId": "enrollment-id", "triggerData": 2, @@ -80,11 +80,13 @@ "status": 0, "reportTime": -1, "triggerPriority": 101, - "sourceType": "navigation" + "sourceType": "navigation", + "sourceId": "S1", + "triggerId": "T1" }, { "id": "E2", - "sourceId": 1, + "sourceEventId": 1, "attributionDestination": "android-app://com.site2.toBeDeletedDueToSourceId1", "enrollmentId": "enrollment-id", "triggerData": 2, @@ -92,11 +94,13 @@ "status": 0, "reportTime": -1, "triggerPriority": 101, - "sourceType": "navigation" + "sourceType": "navigation", + "sourceId": "S1", + "triggerId": "T2" }, { "id": "E3", - "sourceId": 2, + "sourceEventId": 2, "attributionDestination": "android-app://com.site2", "enrollmentId": "enrollment-id", "triggerData": 2, @@ -104,7 +108,9 @@ "status": 0, "reportTime": -1, "triggerPriority": 101, - "sourceType": "navigation" + "sourceType": "navigation", + "sourceId": "S2", + "triggerId": "T2" } ], "attributions": [ @@ -116,7 +122,9 @@ "destinationOrigin": "android-app://com.site2", "enrollmentId": "enrollment-id", "triggerTime": 1648665733600, - "registrant": "android-app://com.registrant.deleteCandidate" + "registrant": "android-app://com.registrant.deleteCandidate", + "sourceId": "S1", + "triggerId": "T1" }, { "id": "A2", @@ -126,7 +134,9 @@ "destinationOrigin": "android-app://com.site2", "enrollmentId": "enrollment-id", "triggerTime": 1648665733605, - "registrant": "android-app://com.registrant.deleteCandidate" + "registrant": "android-app://com.registrant.deleteCandidate", + "sourceId": "S2", + "triggerId": "T2" } ] }, @@ -170,7 +180,7 @@ "event_reports": [ { "id": "E3", - "sourceId": 2, + "sourceEventId": 2, "attributionDestination": "android-app://com.site2", "enrollmentId": "enrollment-id", "triggerData": 2, @@ -178,7 +188,9 @@ "status": 0, "reportTime": -1, "triggerPriority": 101, - "sourceType": "navigation" + "sourceType": "navigation", + "sourceId": "S2", + "triggerId": "T2" } ], "attributions": [ @@ -190,12 +202,14 @@ "destinationOrigin": "android-app://com.site2", "enrollmentId": "enrollment-id", "triggerTime": 1648665733605, - "registrant": "android-app://com.registrant.deleteCandidate" + "registrant": "android-app://com.registrant.deleteCandidate", + "sourceId": "S2", + "triggerId": "T2" } ] }, "param": { - "registrant": "android-app://com.registrant.deleteCandidate", + "registrant": "com.registrant.deleteCandidate", "start": 1648665733600, "end": 1648665733600, "origins": [], |