From f8011f7630147b58e5b8f083606e4b6b9eea29b0 Mon Sep 17 00:00:00 2001 From: Konrad Schlatte Date: Tue, 19 Apr 2022 01:06:24 +0100 Subject: [PATCH] Google ads added fields and reports (#9310) * combine all working locally missing fields in click view and keyqord_view add date to campaigns add fields to click_view test * configured_catalog campaigns * rem keywordview * conflicts * string type * remove network type * change ad group id to integer Co-authored-by: Konrad --- .../schemas/ad_group_ad_report.json | 6 ++++++ .../source_google_ads/schemas/campaigns.json | 15 +++++++++++++++ .../source_google_ads/schemas/click_view.json | 15 +++++++++++++++ .../display_keyword_performance_report.json | 11 +++++++---- .../source_google_ads/schemas/keyword_report.json | 15 +++++++++++++++ .../source-google-ads/source_google_ads/source.py | 1 - 6 files changed, 58 insertions(+), 5 deletions(-) diff --git a/airbyte-integrations/connectors/source-google-ads/source_google_ads/schemas/ad_group_ad_report.json b/airbyte-integrations/connectors/source-google-ads/source_google_ads/schemas/ad_group_ad_report.json index d72d2d89ccd3..d3f00f6cfa27 100644 --- a/airbyte-integrations/connectors/source-google-ads/source_google_ads/schemas/ad_group_ad_report.json +++ b/airbyte-integrations/connectors/source-google-ads/source_google_ads/schemas/ad_group_ad_report.json @@ -5,6 +5,9 @@ "ad_group_ad.ad.legacy_responsive_display_ad.accent_color": { "type": ["null", "string"] }, + "ad_group.id": { + "type": ["null", "integer"] + }, "customer.currency_code": { "type": ["null", "string"] }, @@ -171,6 +174,9 @@ "segments.day_of_week": { "type": ["null", "string"] }, + "segments.keyword.ad_group_criterion": { + "type": ["null", "string"] + }, "ad_group_ad.ad.expanded_text_ad.description": { "type": ["null", "string"] }, diff --git a/airbyte-integrations/connectors/source-google-ads/source_google_ads/schemas/campaigns.json b/airbyte-integrations/connectors/source-google-ads/source_google_ads/schemas/campaigns.json index 1e2701046928..96446d569103 100644 --- a/airbyte-integrations/connectors/source-google-ads/source_google_ads/schemas/campaigns.json +++ b/airbyte-integrations/connectors/source-google-ads/source_google_ads/schemas/campaigns.json @@ -242,6 +242,21 @@ "campaign.video_brand_safety_suitability": { "type": ["null", "string"] }, + "metrics.clicks": { + "type": ["null", "integer"] + }, + "metrics.cost_micros": { + "type": ["null", "integer"] + }, + "metrics.impressions": { + "type": ["null", "number"] + }, + "metrics.video_views": { + "type": ["null", "number"] + }, + "metrics.video_quartile_p100_rate": { + "type": ["null", "number"] + }, "segments.date": { "type": ["null", "string"], "format": "date" diff --git a/airbyte-integrations/connectors/source-google-ads/source_google_ads/schemas/click_view.json b/airbyte-integrations/connectors/source-google-ads/source_google_ads/schemas/click_view.json index cc7c65043598..4a8b6c3d682d 100644 --- a/airbyte-integrations/connectors/source-google-ads/source_google_ads/schemas/click_view.json +++ b/airbyte-integrations/connectors/source-google-ads/source_google_ads/schemas/click_view.json @@ -2,9 +2,24 @@ "$schema": "http://json-schema.org/draft-07/schema#", "type": "object", "properties": { + "ad_group.name": { + "type": ["null", "string"] + }, "click_view.gclid": { "type": ["null", "string"] }, + "click_view.ad_group_ad": { + "type": ["null", "string"] + }, + "click_view.keyword": { + "type": ["null", "string"] + }, + "click_view.keyword_info.match_type": { + "type": ["null", "string"] + }, + "click_view.keyword_info.text": { + "type": ["null", "string"] + }, "campaign.id": { "type": ["null", "integer"] }, diff --git a/airbyte-integrations/connectors/source-google-ads/source_google_ads/schemas/display_keyword_performance_report.json b/airbyte-integrations/connectors/source-google-ads/source_google_ads/schemas/display_keyword_performance_report.json index 2dc46c51c474..0eb6676e558f 100644 --- a/airbyte-integrations/connectors/source-google-ads/source_google_ads/schemas/display_keyword_performance_report.json +++ b/airbyte-integrations/connectors/source-google-ads/source_google_ads/schemas/display_keyword_performance_report.json @@ -137,10 +137,6 @@ "metrics.ctr": { "type": ["null", "number"] }, - "segments.date": { - "type": ["null", "string"], - "format": "date" - }, "segments.day_of_week": { "type": ["null", "string"] }, @@ -210,6 +206,9 @@ "ad_group_criterion.tracking_url_template": { "type": ["null", "string"] }, + "ad_group_criterion.keyword.match_type": { + "type": ["null", "string"] + }, "ad_group_criterion.url_custom_parameters": { "type": ["null", "array"], "items": { @@ -248,6 +247,10 @@ }, "segments.year": { "type": ["null", "integer"] + }, + "segments.date": { + "type": ["null", "string"], + "format": "date" } } } diff --git a/airbyte-integrations/connectors/source-google-ads/source_google_ads/schemas/keyword_report.json b/airbyte-integrations/connectors/source-google-ads/source_google_ads/schemas/keyword_report.json index 3a8fd5ab6e92..4116c2ba57df 100644 --- a/airbyte-integrations/connectors/source-google-ads/source_google_ads/schemas/keyword_report.json +++ b/airbyte-integrations/connectors/source-google-ads/source_google_ads/schemas/keyword_report.json @@ -67,6 +67,21 @@ "segments.date": { "type": ["null", "string"], "format": "date" + }, + "campaign.bidding_strategy_type": { + "type": ["null", "string"] + }, + "metrics.clicks": { + "type": ["null", "integer"] + }, + "metrics.cost_micros": { + "type": ["null", "integer"] + }, + "metrics.impressions": { + "type": ["null", "integer"] + }, + "ad_group_criterion.criterion_id": { + "type": ["null", "integer"] } } } diff --git a/airbyte-integrations/connectors/source-google-ads/source_google_ads/source.py b/airbyte-integrations/connectors/source-google-ads/source_google_ads/source.py index 5118f5e0629e..679b2871ee70 100644 --- a/airbyte-integrations/connectors/source-google-ads/source_google_ads/source.py +++ b/airbyte-integrations/connectors/source-google-ads/source_google_ads/source.py @@ -130,7 +130,6 @@ def streams(self, config: Mapping[str, Any]) -> List[Stream]: CampaignLabels(google_api), ClickView(**incremental_stream_config), ] - custom_query_streams = [ CustomQuery(custom_query_config=single_query_config, **incremental_stream_config) for single_query_config in config.get("custom_queries", [])