Skip to content

Commit

Permalink
Merge pull request #14072 from /issues/23899
Browse files Browse the repository at this point in the history
Decouple Brave Ads business logic from ads event handlers
  • Loading branch information
tmancey authored Jul 11, 2022
2 parents 72a352c + 6370b65 commit 1b9d7fe
Show file tree
Hide file tree
Showing 170 changed files with 3,470 additions and 2,328 deletions.
38 changes: 27 additions & 11 deletions components/brave_ads/test/BUILD.gn
Original file line number Diff line number Diff line change
Expand Up @@ -87,6 +87,16 @@ source_set("brave_ads_unit_tests") {
"//brave/vendor/bat-native-ads/src/bat/ads/internal/ads/ad_events/notification_ads/notification_ad_event_handler_unittest.cc",
"//brave/vendor/bat-native-ads/src/bat/ads/internal/ads/ad_events/promoted_content_ads/promoted_content_ad_event_handler_unittest.cc",
"//brave/vendor/bat-native-ads/src/bat/ads/internal/ads/ad_events/search_result_ads/search_result_ad_event_handler_unittest.cc",
"//brave/vendor/bat-native-ads/src/bat/ads/internal/ads/inline_content_ad_test.cc",
"//brave/vendor/bat-native-ads/src/bat/ads/internal/ads/new_tab_page_ad_test.cc",
"//brave/vendor/bat-native-ads/src/bat/ads/internal/ads/notification_ad_for_mobile_test.cc",
"//brave/vendor/bat-native-ads/src/bat/ads/internal/ads/notification_ad_test.cc",
"//brave/vendor/bat-native-ads/src/bat/ads/internal/ads/notification_ad_unittest_util.cc",
"//brave/vendor/bat-native-ads/src/bat/ads/internal/ads/notification_ad_unittest_util.h",
"//brave/vendor/bat-native-ads/src/bat/ads/internal/ads/notification_ad_util_serve_at_regular_intervals_unittest.cc",
"//brave/vendor/bat-native-ads/src/bat/ads/internal/ads/notification_ad_util_unittest.cc",
"//brave/vendor/bat-native-ads/src/bat/ads/internal/ads/promoted_content_ad_test.cc",
"//brave/vendor/bat-native-ads/src/bat/ads/internal/ads/search_result_ad_test.cc",
"//brave/vendor/bat-native-ads/src/bat/ads/internal/ads/serving/choose/eligible_ads_predictor_util_unittest.cc",
"//brave/vendor/bat-native-ads/src/bat/ads/internal/ads/serving/choose/sample_ads_unittest.cc",
"//brave/vendor/bat-native-ads/src/bat/ads/internal/ads/serving/eligible_ads/eligible_ads_features_unittest.cc",
Expand All @@ -110,18 +120,18 @@ source_set("brave_ads_unit_tests") {
"//brave/vendor/bat-native-ads/src/bat/ads/internal/ads/serving/eligible_ads/exclusion_rules/subdivision_targeting_exclusion_rule_unittest.cc",
"//brave/vendor/bat-native-ads/src/bat/ads/internal/ads/serving/eligible_ads/exclusion_rules/total_max_exclusion_rule_unittest.cc",
"//brave/vendor/bat-native-ads/src/bat/ads/internal/ads/serving/eligible_ads/exclusion_rules/transferred_exclusion_rule_unittest.cc",
"//brave/vendor/bat-native-ads/src/bat/ads/internal/ads/serving/eligible_ads/pacing/pacing_test.cc",
"//brave/vendor/bat-native-ads/src/bat/ads/internal/ads/serving/eligible_ads/pacing/pacing_unittest.cc",
"//brave/vendor/bat-native-ads/src/bat/ads/internal/ads/serving/eligible_ads/pipelines/inline_content_ads/eligible_inline_content_ads_v1_unittest.cc",
"//brave/vendor/bat-native-ads/src/bat/ads/internal/ads/serving/eligible_ads/pipelines/inline_content_ads/eligible_inline_content_ads_v2_unittest.cc",
"//brave/vendor/bat-native-ads/src/bat/ads/internal/ads/serving/eligible_ads/pipelines/new_tab_page_ads/eligible_new_tab_page_ads_v1_unittest.cc",
"//brave/vendor/bat-native-ads/src/bat/ads/internal/ads/serving/eligible_ads/pipelines/new_tab_page_ads/eligible_new_tab_page_ads_v2_unittest.cc",
"//brave/vendor/bat-native-ads/src/bat/ads/internal/ads/serving/eligible_ads/pipelines/notification_ads/eligible_notification_ads_v1_issue_17199_unittest.cc",
"//brave/vendor/bat-native-ads/src/bat/ads/internal/ads/serving/eligible_ads/pipelines/notification_ads/eligible_notification_ads_v1_unittest.cc",
"//brave/vendor/bat-native-ads/src/bat/ads/internal/ads/serving/eligible_ads/pipelines/notification_ads/eligible_notification_ads_v2_unittest.cc",
"//brave/vendor/bat-native-ads/src/bat/ads/internal/ads/serving/eligible_ads/priority/priority_test.cc",
"//brave/vendor/bat-native-ads/src/bat/ads/internal/ads/serving/inline_content_ad_serving_test.cc",
"//brave/vendor/bat-native-ads/src/bat/ads/internal/ads/serving/new_tab_page_ad_serving_test.cc",
"//brave/vendor/bat-native-ads/src/bat/ads/internal/ads/serving/notification_ad_serving_test.cc",
"//brave/vendor/bat-native-ads/src/bat/ads/internal/ads/serving/eligible_ads/priority/priority_unittest.cc",
"//brave/vendor/bat-native-ads/src/bat/ads/internal/ads/serving/inline_content_ad_serving_unittest.cc",
"//brave/vendor/bat-native-ads/src/bat/ads/internal/ads/serving/new_tab_page_ad_serving_unittest.cc",
"//brave/vendor/bat-native-ads/src/bat/ads/internal/ads/serving/notification_ad_serving_unittest.cc",
"//brave/vendor/bat-native-ads/src/bat/ads/internal/ads/serving/permission_rules/allow_notifications_permission_rule_unittest.cc",
"//brave/vendor/bat-native-ads/src/bat/ads/internal/ads/serving/permission_rules/browser_is_active_permission_rule_unittest.cc",
"//brave/vendor/bat-native-ads/src/bat/ads/internal/ads/serving/permission_rules/catalog_permission_rule_test.cc",
Expand Down Expand Up @@ -157,6 +167,8 @@ source_set("brave_ads_unit_tests") {
"//brave/vendor/bat-native-ads/src/bat/ads/internal/ads/serving/permission_rules/user_activity_permission_rule_unittest_util.cc",
"//brave/vendor/bat-native-ads/src/bat/ads/internal/ads/serving/permission_rules/user_activity_permission_rule_unittest_util.h",
"//brave/vendor/bat-native-ads/src/bat/ads/internal/ads/serving/serving_features_unittest.cc",
"//brave/vendor/bat-native-ads/src/bat/ads/internal/ads/serving/serving_features_unittest_util.cc",
"//brave/vendor/bat-native-ads/src/bat/ads/internal/ads/serving/serving_features_unittest_util.h",
"//brave/vendor/bat-native-ads/src/bat/ads/internal/ads/serving/targeting/models/behavioral/bandits/epsilon_greedy_bandit_model_unittest.cc",
"//brave/vendor/bat-native-ads/src/bat/ads/internal/ads/serving/targeting/models/behavioral/bandits/epsilon_greedy_bandit_model_unittest_util.cc",
"//brave/vendor/bat-native-ads/src/bat/ads/internal/ads/serving/targeting/models/behavioral/bandits/epsilon_greedy_bandit_model_unittest_util.h",
Expand Down Expand Up @@ -249,6 +261,8 @@ source_set("brave_ads_unit_tests") {
"//brave/vendor/bat-native-ads/src/bat/ads/internal/creatives/promoted_content_ads/creative_promoted_content_ad_unittest_util.h",
"//brave/vendor/bat-native-ads/src/bat/ads/internal/creatives/promoted_content_ads/creative_promoted_content_ads_database_table_test.cc",
"//brave/vendor/bat-native-ads/src/bat/ads/internal/creatives/promoted_content_ads/creative_promoted_content_ads_database_table_unittest.cc",
"//brave/vendor/bat-native-ads/src/bat/ads/internal/creatives/search_result_ads/search_result_ad_unittest_util.cc",
"//brave/vendor/bat-native-ads/src/bat/ads/internal/creatives/search_result_ads/search_result_ad_unittest_util.h",
"//brave/vendor/bat-native-ads/src/bat/ads/internal/creatives/segments_database_table_unittest.cc",
"//brave/vendor/bat-native-ads/src/bat/ads/internal/deprecated/client/preferences/ad_preferences_info_unittest.cc",
"//brave/vendor/bat-native-ads/src/bat/ads/internal/diagnostics/diagnostic_manager_unittest.cc",
Expand All @@ -264,6 +278,8 @@ source_set("brave_ads_unit_tests") {
"//brave/vendor/bat-native-ads/src/bat/ads/internal/history/filters/date_range_history_filter_unittest.cc",
"//brave/vendor/bat-native-ads/src/bat/ads/internal/history/history_item_util_unittest.cc",
"//brave/vendor/bat-native-ads/src/bat/ads/internal/history/history_manager_unittest.cc",
"//brave/vendor/bat-native-ads/src/bat/ads/internal/history/history_unittest_util.cc",
"//brave/vendor/bat-native-ads/src/bat/ads/internal/history/history_unittest_util.h",
"//brave/vendor/bat-native-ads/src/bat/ads/internal/history/history_util_unittest.cc",
"//brave/vendor/bat-native-ads/src/bat/ads/internal/history/sorts/history_sort_unittest.cc",
"//brave/vendor/bat-native-ads/src/bat/ads/internal/legacy_migration/client/legacy_client_migration_issue_23794_unittest.cc",
Expand Down Expand Up @@ -348,14 +364,14 @@ source_set("brave_ads_unit_tests") {
"//brave/vendor/bat-native-ads/src/bat/ads/internal/settings/settings_unittest.cc",
"//brave/vendor/bat-native-ads/src/bat/ads/internal/tabs/tab_manager_unittest.cc",
"//brave/vendor/bat-native-ads/src/bat/ads/internal/transfer/transfer_unittest.cc",
"//brave/vendor/bat-native-ads/src/bat/ads/internal/user_interaction/browsing/page_transition_util_unittest.cc",
"//brave/vendor/bat-native-ads/src/bat/ads/internal/user_interaction/browsing/user_activity_features_unittest.cc",
"//brave/vendor/bat-native-ads/src/bat/ads/internal/user_interaction/browsing/user_activity_manager_unittest.cc",
"//brave/vendor/bat-native-ads/src/bat/ads/internal/user_interaction/browsing/user_activity_scoring_unittest.cc",
"//brave/vendor/bat-native-ads/src/bat/ads/internal/user_interaction/browsing/user_activity_scoring_util_unittest.cc",
"//brave/vendor/bat-native-ads/src/bat/ads/internal/user_interaction/browsing/user_activity_util_unittest.cc",
"//brave/vendor/bat-native-ads/src/bat/ads/internal/user_interaction/idle_detection/idle_detection_manager_unittest.cc",
"//brave/vendor/bat-native-ads/src/bat/ads/internal/user_interaction/idle_detection/idle_detection_util_unittest.cc",
"//brave/vendor/bat-native-ads/src/bat/ads/internal/user_interaction/user_activity/page_transition_util_unittest.cc",
"//brave/vendor/bat-native-ads/src/bat/ads/internal/user_interaction/user_activity/user_activity_features_unittest.cc",
"//brave/vendor/bat-native-ads/src/bat/ads/internal/user_interaction/user_activity/user_activity_manager_unittest.cc",
"//brave/vendor/bat-native-ads/src/bat/ads/internal/user_interaction/user_activity/user_activity_scoring_unittest.cc",
"//brave/vendor/bat-native-ads/src/bat/ads/internal/user_interaction/user_activity/user_activity_scoring_util_unittest.cc",
"//brave/vendor/bat-native-ads/src/bat/ads/internal/user_interaction/user_activity/user_activity_util_unittest.cc",
"//brave/vendor/bat-native-ads/src/bat/ads/new_tab_page_ad_info_unittest.cc",
]

Expand Down
44 changes: 22 additions & 22 deletions vendor/bat-native-ads/BUILD.gn
Original file line number Diff line number Diff line change
Expand Up @@ -317,6 +317,8 @@ source_set("ads") {
"src/bat/ads/internal/ads/new_tab_page_ad.h",
"src/bat/ads/internal/ads/notification_ad.cc",
"src/bat/ads/internal/ads/notification_ad.h",
"src/bat/ads/internal/ads/notification_ad_util.cc",
"src/bat/ads/internal/ads/notification_ad_util.h",
"src/bat/ads/internal/ads/promoted_content_ad.cc",
"src/bat/ads/internal/ads/promoted_content_ad.h",
"src/bat/ads/internal/ads/search_result_ad.cc",
Expand All @@ -327,8 +329,6 @@ source_set("ads") {
"src/bat/ads/internal/ads/serving/choose/eligible_ads_predictor_util.h",
"src/bat/ads/internal/ads/serving/choose/predict_ad.h",
"src/bat/ads/internal/ads/serving/choose/sample_ads.h",
"src/bat/ads/internal/ads/serving/delivery/notification_ads/notification_ad_delivery.cc",
"src/bat/ads/internal/ads/serving/delivery/notification_ads/notification_ad_delivery.h",
"src/bat/ads/internal/ads/serving/eligible_ads/allocation/round_robin_ads.h",
"src/bat/ads/internal/ads/serving/eligible_ads/allocation/round_robin_advertisers.h",
"src/bat/ads/internal/ads/serving/eligible_ads/allocation/seen_ads.h",
Expand Down Expand Up @@ -1065,31 +1065,31 @@ source_set("ads") {
"src/bat/ads/internal/tabs/tab_manager.h",
"src/bat/ads/internal/transfer/transfer.cc",
"src/bat/ads/internal/transfer/transfer.h",
"src/bat/ads/internal/user_interaction/browsing/page_transition_util.cc",
"src/bat/ads/internal/user_interaction/browsing/page_transition_util.h",
"src/bat/ads/internal/user_interaction/browsing/user_activity_constants.h",
"src/bat/ads/internal/user_interaction/browsing/user_activity_event_info.cc",
"src/bat/ads/internal/user_interaction/browsing/user_activity_event_info.h",
"src/bat/ads/internal/user_interaction/browsing/user_activity_event_info_aliases.h",
"src/bat/ads/internal/user_interaction/browsing/user_activity_event_types.h",
"src/bat/ads/internal/user_interaction/browsing/user_activity_features.cc",
"src/bat/ads/internal/user_interaction/browsing/user_activity_features.h",
"src/bat/ads/internal/user_interaction/browsing/user_activity_manager.cc",
"src/bat/ads/internal/user_interaction/browsing/user_activity_manager.h",
"src/bat/ads/internal/user_interaction/browsing/user_activity_scoring.cc",
"src/bat/ads/internal/user_interaction/browsing/user_activity_scoring.h",
"src/bat/ads/internal/user_interaction/browsing/user_activity_scoring_util.cc",
"src/bat/ads/internal/user_interaction/browsing/user_activity_scoring_util.h",
"src/bat/ads/internal/user_interaction/browsing/user_activity_trigger_info.cc",
"src/bat/ads/internal/user_interaction/browsing/user_activity_trigger_info.h",
"src/bat/ads/internal/user_interaction/browsing/user_activity_trigger_info_aliases.h",
"src/bat/ads/internal/user_interaction/browsing/user_activity_util.cc",
"src/bat/ads/internal/user_interaction/browsing/user_activity_util.h",
"src/bat/ads/internal/user_interaction/idle_detection/idle_detection_manager.cc",
"src/bat/ads/internal/user_interaction/idle_detection/idle_detection_manager.h",
"src/bat/ads/internal/user_interaction/idle_detection/idle_detection_manager_observer.h",
"src/bat/ads/internal/user_interaction/idle_detection/idle_detection_util.cc",
"src/bat/ads/internal/user_interaction/idle_detection/idle_detection_util.h",
"src/bat/ads/internal/user_interaction/user_activity/page_transition_util.cc",
"src/bat/ads/internal/user_interaction/user_activity/page_transition_util.h",
"src/bat/ads/internal/user_interaction/user_activity/user_activity_constants.h",
"src/bat/ads/internal/user_interaction/user_activity/user_activity_event_info.cc",
"src/bat/ads/internal/user_interaction/user_activity/user_activity_event_info.h",
"src/bat/ads/internal/user_interaction/user_activity/user_activity_event_info_aliases.h",
"src/bat/ads/internal/user_interaction/user_activity/user_activity_event_types.h",
"src/bat/ads/internal/user_interaction/user_activity/user_activity_features.cc",
"src/bat/ads/internal/user_interaction/user_activity/user_activity_features.h",
"src/bat/ads/internal/user_interaction/user_activity/user_activity_manager.cc",
"src/bat/ads/internal/user_interaction/user_activity/user_activity_manager.h",
"src/bat/ads/internal/user_interaction/user_activity/user_activity_scoring.cc",
"src/bat/ads/internal/user_interaction/user_activity/user_activity_scoring.h",
"src/bat/ads/internal/user_interaction/user_activity/user_activity_scoring_util.cc",
"src/bat/ads/internal/user_interaction/user_activity/user_activity_scoring_util.h",
"src/bat/ads/internal/user_interaction/user_activity/user_activity_trigger_info.cc",
"src/bat/ads/internal/user_interaction/user_activity/user_activity_trigger_info.h",
"src/bat/ads/internal/user_interaction/user_activity/user_activity_trigger_info_aliases.h",
"src/bat/ads/internal/user_interaction/user_activity/user_activity_util.cc",
"src/bat/ads/internal/user_interaction/user_activity/user_activity_util.h",
"src/bat/ads/new_tab_page_ad_info.cc",
"src/bat/ads/new_tab_page_ad_wallpaper_focal_point_info.cc",
"src/bat/ads/new_tab_page_ad_wallpaper_info.cc",
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,70 @@
{
"version": 9,
"ping": 7200000,
"campaigns": [
{
"creativeSets": [
{
"creatives": [
{
"creativeInstanceId": "30db5f7b-dba3-48a3-b299-c9bd9c67da65",
"type": {
"code": "inline_content_all_v1",
"name": "inline_content",
"platform": "all",
"version": 1
},
"payload": {
"title": "Test Title",
"description": "Test Description",
"imageUrl": "https://www.brave.com",
"dimensions": "200x100",
"ctaText": "Test Call to Action Text",
"targetUrl": "https://brave.com"
}
}
],
"segments": [
{
"code": "Svp7l-zGN",
"name": "untargeted"
}
],
"oses": [
],
"conversions": [
{
"observationWindow": 30,
"urlPattern": "https://www.brave.com/*",
"type": "postview"
}
],
"channels": [
],
"creativeSetId": "340c927f-696e-4060-9933-3eafc56c3f31",
"perDay": 1,
"perWeek": 1,
"perMonth": 1,
"totalMax": 1,
"value": "1.0"
}
],
"dayParts": [
],
"geoTargets": [
{
"code": "US",
"name": "United States"
}
],
"campaignId": "27a624a1-9c80-494a-bf1b-af327b563f85",
"startAt": "<time:now>",
"endAt": "<time:distant_future>",
"dailyCap": 1,
"advertiserId": "a437c7f3-9a48-4fe8-b37b-99321bea93fe",
"priority": 1,
"ptr": 1.0
}
],
"catalogId": "29e5c8bc0ba319069980bb390d8e8f9b58c05a20"
}
86 changes: 86 additions & 0 deletions vendor/bat-native-ads/data/test/catalog_with_new_tab_page_ad.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,86 @@
{
"version": 9,
"ping": 7200000,
"campaigns": [
{
"creativeSets": [
{
"creatives": [
{
"creativeInstanceId": "7ff400b9-7f8a-46a8-89f1-cb386612edcf",
"type": {
"code": "new_tab_page_all_v1",
"platform": "all",
"name": "new_tab_page",
"version": 1
},
"payload": {
"logo": {
"alt": "Test Alt",
"imageUrl": "https://brave.com/image.jpg",
"companyName": "Test Company Name",
"destinationUrl": "https://brave.com"
},
"wallpapers": [
{
"focalPoint": {
"x": 1200,
"y": 1400
},
"imageUrl": "https://brave.com/wallpaper_1.jpg"
},
{
"focalPoint": {
"x": 1200,
"y": 1400
},
"imageUrl": "https://brave.com/wallpaper_2.jpg"
}
]
}
}
],
"segments": [
{
"code": "Svp7l-zGN",
"name": "untargeted"
}
],
"oses": [
],
"conversions": [
{
"observationWindow": 30,
"urlPattern": "https://www.brave.com/*",
"type": "postview"
}
],
"channels": [
],
"creativeSetId": "340c927f-696e-4060-9933-3eafc56c3f31",
"perDay": 1,
"perWeek": 1,
"perMonth": 1,
"totalMax": 1,
"value": "1.0"
}
],
"dayParts": [
],
"geoTargets": [
{
"code": "US",
"name": "United States"
}
],
"campaignId": "27a624a1-9c80-494a-bf1b-af327b563f85",
"startAt": "<time:now>",
"endAt": "<time:distant_future>",
"dailyCap": 1,
"advertiserId": "a437c7f3-9a48-4fe8-b37b-99321bea93fe",
"priority": 1,
"ptr": 1.0
}
],
"catalogId": "29e5c8bc0ba319069980bb390d8e8f9b58c05a20"
}
Loading

0 comments on commit 1b9d7fe

Please sign in to comment.