adding search with ads organic to mobile_search_aggregates and search_revenue_levers_daily table (#5682)

* updates to mobile_search_aggregates and search_revenue_levers_table

adding search_with_ads_organic to mobile_search_aggregates and search_revenue_levers_table

* Update query.sql

* Fix schema.yaml and test files

* Fix CI issue

Fix CI issue

---------

Co-authored-by: Alekhya Kommasani <akommasani@mozilla.com>
Co-authored-by: Alekhya <88394696+alekhyamoz@users.noreply.github.com>

sql/moz-fx-data-shared-prod/search_derived/mobile_search_aggregates_v1/query.sql

@@ -20,6 +20,7 @@ SELECT
   SUM(ad_click) AS ad_click,
   SUM(ad_click_organic) AS ad_click_organic,
   SUM(search_with_ads) AS search_with_ads,
+  SUM(search_with_ads_organic) AS search_with_ads_organic,
   SUM(unknown) AS unknown,
   CAST(NULL AS string) normalized_engine,
 FROM

sql/moz-fx-data-shared-prod/search_derived/mobile_search_aggregates_v1/schema.yaml

@@ -59,6 +59,9 @@ fields:
 - mode: NULLABLE
   name: search_with_ads
   type: INTEGER
+- mode: NULLABLE
+  name: search_with_ads_organic
+  type: INTEGER
 - mode: NULLABLE
   name: unknown
   type: INTEGER

sql/moz-fx-data-shared-prod/search_derived/search_revenue_levers_daily_v1/query.sql

@@ -232,8 +232,8 @@ mobile_data_google AS (
     SUM(IF(normalized_engine = 'Google', ad_click, 0)) AS ad_click,
     SUM(IF(normalized_engine = 'Google', organic, 0)) AS organic,
     SUM(IF(normalized_engine = 'Google', ad_click_organic, 0)) AS ad_click_organic,
+    SUM(IF(normalized_engine = 'Google', search_with_ads_organic, 0)) AS search_with_ads_organic,
     -- metrics do not exist for mobile
-    0 AS search_with_ads_organic,
     0 AS monetizable_sap
   FROM
     `moz-fx-data-shared-prod.search.mobile_search_clients_engines_sources_daily`
@@ -303,8 +303,8 @@ mobile_data_bing_ddg AS (
     SUM(IF(normalized_engine = 'Bing', ad_click, 0)) AS bing_ad_click,
     SUM(IF(normalized_engine = 'Bing', organic, 0)) AS bing_organic,
     SUM(IF(normalized_engine = 'Bing', ad_click_organic, 0)) AS bing_ad_click_organic,
+    SUM(IF(normalized_engine = 'Bing', search_with_ads_organic, 0)) AS bing_search_with_ads_organic,
     -- metrics do not exist for mobile
-    0 AS bing_search_with_ads_organic,
     0 AS bing_monetizable_sap,
     SUM(IF(normalized_engine = 'DuckDuckGo', sap, 0)) AS ddg_sap,
     SUM(IF(normalized_engine = 'DuckDuckGo', tagged_sap, 0)) AS ddg_tagged_sap,
@@ -313,8 +313,10 @@ mobile_data_bing_ddg AS (
     SUM(IF(normalized_engine = 'DuckDuckGo', ad_click, 0)) AS ddg_ad_click,
     SUM(IF(normalized_engine = 'DuckDuckGo', organic, 0)) AS ddg_organic,
     SUM(IF(normalized_engine = 'DuckDuckGo', ad_click_organic, 0)) AS ddg_ad_click_organic,
+    SUM(
+      IF(normalized_engine = 'DuckDuckGo', search_with_ads_organic, 0)
+    ) AS ddg_search_with_ads_organic,
     -- metrics do not exist for mobile
-    0 AS ddg_search_with_ads_organic,
     0 AS ddg_monetizable_sap
   FROM
     `moz-fx-data-shared-prod.search.mobile_search_clients_engines_sources_daily`

tests/sql/moz-fx-data-shared-prod/search_derived/mobile_search_aggregates_v1/mobile_search_clients_daily_v1.schema.json

@@ -64,6 +64,11 @@
     "name": "search_with_ads",
     "mode": "NULLABLE"
   },
+  {
+    "type": "INTEGER",
+    "name": "search_with_ads_organic",
+    "mode": "NULLABLE"
+  },
   {
     "type": "INTEGER",
     "name": "unknown",

tests/sql/moz-fx-data-shared-prod/search_derived/mobile_search_aggregates_v1/test_aggregation/expect.yaml

@@ -19,6 +19,7 @@
   ad_click: 0
   ad_click_organic: 0
   search_with_ads: 0
+  search_with_ads_organic: 0
   unknown: 0
 - <<: *base
   engine: engine1

tests/sql/moz-fx-data-shared-prod/search_derived/mobile_search_aggregates_v1/test_aggregation/mobile_search_clients_daily_v1.yaml

@@ -10,6 +10,7 @@
   ad_click: 0
   ad_click_organic: 0
   search_with_ads: 0
+  search_with_ads_organic: 0
   unknown: 0
   locale: fr-FR
   app_version: 68.2.1