Add geo reports + fold in Google Ads search report (#144)

* country report with name standardization

* bk

* postgres

* seeds and such

* Remove extra `endmacro` block in `fivetran_n_days_ago.sql` (#143)

* Remove extra `endmacro` block in `fivetran_n_days_ago.sql`

For a long time dbt-core has ignored extraneous/orphaned block tags.
However, in 1.10 we're going to start issuing a deprecation warning
for them. As such, it made sense to get this cleaned up :)

* Document orphaned `endmacro` fix in changelog

* Bump version to 1.13.1

Only change is a bug fix so, doing a patch release seems appropriate.

* bk

* region working + moved country mapping to ephemeral model

* tests

* polishing

* polish up

* joe feedback

* Readme

* remove s

* Update CHANGELOG.md

* quickstart.yml updates

* Update CHANGELOG.md

Co-authored-by: fivetran-catfritz <111930712+fivetran-catfritz@users.noreply.github.com>

* docs regen

---------

Co-authored-by: Quigley Malcolm <QMalcolm@users.noreply.github.com>
Co-authored-by: Joe Markiewicz <74217849+fivetran-joemarkiewicz@users.noreply.github.com>
Co-authored-by: fivetran-catfritz <111930712+fivetran-catfritz@users.noreply.github.com>

Author: 4 people

.buildkite/scripts/run_models.sh

@@ -17,7 +17,7 @@ echo `pwd`
 cd integration_tests
 dbt deps
 dbt seed --target "$db" --full-refresh
-dbt run --target "$db" --full-refresh --vars '{ad_reporting__facebook_ads_enabled: true, ad_reporting__google_ads_enabled: true, ad_reporting__amazon_ads_enabled: false, ad_reporting__apple_search_ads_enabled: false, ad_reporting__linkedin_ads_enabled: true, ad_reporting__microsoft_ads_enabled: false, ad_reporting__pinterest_ads_enabled: false, ad_reporting__reddit_ads_enabled: false, ad_reporting__snapchat_ads_enabled: false, ad_reporting__tiktok_ads_enabled: false, ad_reporting__twitter_ads_enabled: false}' 
-dbt test --target "$db" --vars '{ad_reporting__facebook_ads_enabled: true, ad_reporting__google_ads_enabled: true, ad_reporting__amazon_ads_enabled: false, ad_reporting__apple_search_ads_enabled: false, ad_reporting__linkedin_ads_enabled: true, ad_reporting__microsoft_ads_enabled: false, ad_reporting__pinterest_ads_enabled: false, ad_reporting__reddit_ads_enabled: false, ad_reporting__snapchat_ads_enabled: false, ad_reporting__tiktok_ads_enabled: false, ad_reporting__twitter_ads_enabled: false}'
+dbt run --target "$db" --full-refresh --vars '{ad_reporting__facebook_ads_enabled: true, facebook_ads__using_demographics_country: true, facebook_ads__using_demographics_region: true, ad_reporting__google_ads_enabled: true, ad_reporting__amazon_ads_enabled: false, ad_reporting__apple_search_ads_enabled: false, ad_reporting__linkedin_ads_enabled: true, ad_reporting__microsoft_ads_enabled: false, ad_reporting__pinterest_ads_enabled: false, ad_reporting__reddit_ads_enabled: false, ad_reporting__snapchat_ads_enabled: false, ad_reporting__tiktok_ads_enabled: false, ad_reporting__twitter_ads_enabled: false}' 
+dbt test --target "$db" --vars '{ad_reporting__facebook_ads_enabled: true, facebook_ads__using_demographics_country: true, facebook_ads__using_demographics_region: true, ad_reporting__google_ads_enabled: true, ad_reporting__amazon_ads_enabled: false, ad_reporting__apple_search_ads_enabled: false, ad_reporting__linkedin_ads_enabled: true, ad_reporting__microsoft_ads_enabled: false, ad_reporting__pinterest_ads_enabled: false, ad_reporting__reddit_ads_enabled: false, ad_reporting__snapchat_ads_enabled: false, ad_reporting__tiktok_ads_enabled: false, ad_reporting__twitter_ads_enabled: false}'
 
 dbt run-operation fivetran_utils.drop_schemas_automation --target "$db"

.github/PULL_REQUEST_TEMPLATE/maintainer_pull_request_template.md

@@ -1,35 +1,35 @@
-## PR Overview
-**This PR will address the following Issue/Feature:**
+<!--
+Pre-Submission Reminders  
+Before marking this PR as "ready for review":
 
-**This PR will result in the following new package version:**
-<!--- Please add details around your decision for breaking vs non-breaking version upgrade. If this is a breaking change, were backwards-compatible options explored? -->
+- `dbt run --full-refresh && dbt test`  
+- `dbt run` && `dbt test` (if incremental models are present)  
+- The related issue is linked, tagged, and appropriately assigned  
+- Documentation and version updates are included, if applicable  
+- `docs` have been regenerated (unless there are no code or YAML changes)  
+- BuildKite integration tests are passing
+-->
 
-**Please provide the finalized CHANGELOG entry which details the relevant changes included in this PR:**
-<!--- Copy/paste the CHANGELOG for this version below. -->
+## PR Overview 
+**Package version introduced in this PR:** 
+ 
+**This PR addresses the following Issue/Feature(s):**
+<!-- Add Issue # or internal ticket reference -->
 
-## PR Checklist
-### Basic Validation
-Please acknowledge that you have successfully performed the following commands locally:
-- [ ] dbt run –full-refresh && dbt test
-- [ ] dbt run (if incremental models are present) && dbt test
+**Summary of changes:**  
+<!-- 1-2 sentences describing PR changes. -->
 
-Before marking this PR as "ready for review" the following have been applied:
-- [ ] The appropriate issue has been linked, tagged, and properly assigned
-- [ ] All necessary documentation and version upgrades have been applied
-- [ ] docs were regenerated (unless this PR does not include any code or yml updates)
-- [ ] BuildKite integration tests are passing
-- [ ] Detailed validation steps have been provided below
 
-#### ❗ Special Updates for Ad Reporting ❗
-To reduce integration testing time, not all models should be enabled in the `run_models.sh` vars. Update the variables after `dbt run` and `dbt test` to set:
-- [ ] this PR's package to `true`
-- [ ] Google Ads and Facebook Ads to `true` (if not already)
-- [ ] All other packages to `false`
+### Submission Checklist  
+- [ ] Alignment meeting with the reviewer (if needed)  
+  - [ ] Timeline and validation requirements discussed  
+- [ ] Provide validation details:  
+  - [ ] **Validation Steps:** Check for unintentional effects (e.g., add/run consistency & integrity tests)
+  - [ ] **Testing Instructions:** Confirm the change addresses the issue(s)
+  - [ ] **Focus Areas:** Complex logic or queries that need extra attention  
 
-### Detailed Validation
-Please share any and all of your validation steps:
-<!--- Provide the steps you took to validate your changes below. -->
-
-### If you had to summarize this PR in an emoji, which would it be?
-<!--- For a complete list of markdown compatible emojis check our this git repo (https://gist.github.com/rxaviers/7360908)  --> 
-:dancer:
+### Changelog  
+<!-- Recommend drafting changelog notes, then refining via ChatGPT using:  
+"Draft a changelog entry based on the following notes." -->
+- [ ] Draft changelog for PR  
+- [ ] Final changelog for release review

.quickstart/quickstart.yml

@@ -54,8 +54,44 @@ table_variables:
   pinterest__using_keywords:
     - keyword_history
     - keyword_report
+  pinterest__using_pin_promotion_targeting_report:
+    - pin_promotion_targeting_report
+  pinterest__using_targeting_geo:
+    - targeting_geo
+  pinterest__using_targeting_geo_region:
+    - targeting_geo_region
   twitter_ads__using_keywords:
     - line_item_keywords_report
+  twitter_ads__using_campaign_locations_report:
+    - campaign_locations_report
+  twitter_ads__using_campaign_regions_report:
+    - campaign_regions_report
+  google_ads__using_search_term_keyword_stats:
+    - search_term_keyword_stats
+  facebook_ads__using_demographics_country:
+    - demographics_country
+    - demographics_country_actions
+  facebook_ads__using_demographics_region:
+    - demographics_region
+    - demographics_region_actions
+  linkedin_ads__using_geo:
+    - geo
+  linkedin_ads__using_monthly_ad_analytics_by_member_country:
+    - monthly_ad_analytics_by_member_country
+  linkedin_ads__using_monthly_ad_analytics_by_member_region:
+    - monthly_ad_analytics_by_member_region
+  microsoft_ads__using_geographic_daily_report:
+    - geographic_performance_daily_report
+  reddit_ads__using_campaign_country_report:
+    - campaign_country_report
+  reddit_ads__using_campaign_country_conversions_report:
+    - campaign_country_conversions_report
+  snapchat_ads__using_campaign_country_report:
+    - campaign_geo_country_daily_report
+  snapchat_ads__using_campaign_region_report:  
+    - campaign_geo_region_daily_report
+  tiktok_ads__using_campaign_country_report:
+    - campaign_country_report
 
 destination_configurations:
   databricks:
@@ -72,5 +108,7 @@ public_models: [
   "ad_reporting__ad_report",
   "ad_reporting__keyword_report",
   "ad_reporting__search_report",
-  "ad_reporting__url_report"
+  "ad_reporting__url_report",
+  "ad_reporting__monthly_campaign_country_report",
+  "ad_reporting__monthly_campaign_region_report"
 ]