Merge pull request #5 from fivetran/dev/pr-fixes

Dev/pr fixes

.github/ISSUE_TEMPLATE/config.yml

@@ -1,4 +1,7 @@
 contact_links:
+  - name: Provide feedback to our dbt package team
+    url: https://www.surveymonkey.com/r/DQ7K7WW
+    about: Fill out our survey form to provide valuable feedback to the Fivetran team developing and maintaining the dbt packages.
   - name: Ask a question during our office hours
     url: https://calendly.com/fivetran-solutions-team/fivetran-solutions-team-office-hours
     about: Schedule time during the external office hours block with the Fivetran Analytics Engineering team for support

.github/pull_request_template.md

@@ -1,4 +1,3 @@
-Pull Request
 **Are you a current Fivetran customer?** 
 <!--- Please tell us your name, title and company -->
 

README.md

@@ -44,7 +44,7 @@ vars:
     apple_store_database: your_destination_name
     apple_store_schema: your_schema_name 
 ```
-## Step 3: Disable models for non-existent sources
+## Step 3: Enabling additional models 
 Your Apple App Store connector may not sync every table that this package expects. If you use subscriptions and have the `sales_subscription_event_summary` and `sales_subscription_summary` tables synced, add the following variable to your `dbt_project.yml` file:
 
 ```yml
@@ -82,7 +82,7 @@ If an individual source table has a different name than the package expects, add
 
 ```yml
 vars:
-    apple_store_<default_source_table_name>_identifier: your_table_name 
+    <default_source_table_name>_identifier: your_table_name 
 ```
 
 </details>

integration_tests/dbt_project.yml

@@ -6,27 +6,25 @@ version: '0.1.0'
 profile: 'integration_tests' 
 
 vars:
+  apple_store_schema: apple_store_source_integration_tests
+  apple_store__using_subscriptions: True
   apple_store_source:
-    app: "{{ ref('app') }}"
-    app_store_device: "{{ ref('app_store_source_type_device') }}"
-    usage_device: "{{ ref('usage_source_type_device') }}"
-    downloads_device: "{{ ref('downloads_source_type_device') }}"
-
-    app_store_territory: "{{ ref('app_store_territory_source_type') }}"
-    downloads_territory: "{{ ref('downloads_territory_source_type') }}"
-    usage_territory: "{{ ref('usage_territory_source_type') }}"
-
-    app_store_platform_version: "{{ ref('app_store_platform_version_source_type') }}"
-    crashes_platform_version: "{{ ref('crashes_platform_version') }}"
-    downloads_platform_version: "{{ ref('downloads_platform_version_source_type') }}"
-    usage_platform_version: "{{ ref('usage_platform_version_source_type') }}"
-
-    crashes_app_version: "{{ ref('crashes_app_version') }}"
-    usage_app_version: "{{ ref('usage_app_version_source_type') }}"
-
-    sales_account: "{{ ref('sales_account') }}"
-    sales_subscription_events: "{{ ref('sales_subscription_events') }}"
-    sales_subscription_summary: "{{ ref('sales_subscription_summary') }}"
+    app_identifier: "app"
+    app_store_platform_version_source_type_report_identifier: "app_store_platform_version_source_type"
+    app_store_source_type_device_report_identifier: "app_store_source_type_device"
+    app_store_territory_source_type_report_identifier: "app_store_territory_source_type"
+    crashes_app_version_device_report_identifier: "crashes_app_version"
+    crashes_platform_version_device_report_identifier: "crashes_platform_version"
+    downloads_platform_version_source_type_report_identifier: "downloads_platform_version_source_type"
+    downloads_source_type_device_report_identifier: "downloads_source_type_device"
+    downloads_territory_source_type_report_identifier: "downloads_territory_source_type"
+    sales_account_identifier: "sales_account"
+    sales_subscription_event_summary_identifier: "sales_subscription_events"
+    sales_subscription_summary_identifier: "sales_subscription_summary"
+    usage_app_version_source_type_report_identifier: "usage_app_version_source_type"
+    usage_platform_version_source_type_report_identifier: "usage_platform_version_source_type"
+    usage_source_type_device_report_identifier: "usage_source_type_device"
+    usage_territory_source_type_report_identifier: "usage_territory_source_type"
 
 seeds:
   apple_store_source_integration_tests:

models/src_apple_store.yml

@@ -7,9 +7,9 @@ sources:
     loader: Fivetran
     loaded_at_field: _fivetran_synced
 
-    freshness:
+    freshness: 
       warn_after: {count: 48, period: hour}
-      error_after: {count: 72, period: hour}
+      error_after: {count: 168, period: hour}
 
     tables:
       - name: app

models/stg_apple_store__app.sql

@@ -3,7 +3,6 @@ with base as (
 
     select * 
     from {{ ref('stg_apple_store__app_tmp') }}
-
 ),
 
 fields as (
@@ -28,4 +27,5 @@ final as (
     from fields
 )
 
-select * from final
+select * 
+from final

models/stg_apple_store__app_store_device.sql

@@ -3,7 +3,6 @@ with base as (
 
     select * 
     from {{ ref('stg_apple_store__app_store_device_tmp') }}
-
 ),
 
 fields as (
@@ -33,4 +32,5 @@ final as (
     from fields
 )
 
-select * from final
+select * 
+from final

models/stg_apple_store__app_store_platform_version.sql

@@ -3,7 +3,6 @@ with base as (
 
     select * 
     from {{ ref('stg_apple_store__app_store_platform_version_tmp') }}
-
 ),
 
 fields as (
@@ -33,4 +32,5 @@ final as (
     from fields
 )
 
-select * from final
+select * 
+from final

models/stg_apple_store__app_store_territory.sql

@@ -3,7 +3,6 @@ with base as (
 
     select * 
     from {{ ref('stg_apple_store__app_store_territory_tmp') }}
-
 ),
 
 fields as (
@@ -33,4 +32,5 @@ final as (
     from fields
 )
 
-select * from final
+select * 
+from final

models/stg_apple_store__crashes_app_version.sql

@@ -3,7 +3,6 @@ with base as (
 
     select * 
     from {{ ref('stg_apple_store__crashes_app_version_tmp') }}
-
 ),
 
 fields as (
@@ -30,4 +29,5 @@ final as (
     from fields
 )
 
-select * from final
+select * 
+from final

models/stg_apple_store__crashes_platform_version.sql

@@ -3,7 +3,6 @@ with base as (
 
     select * 
     from {{ ref('stg_apple_store__crashes_platform_version_tmp') }}
-
 ),
 
 fields as (
@@ -30,4 +29,5 @@ final as (
     from fields
 )
 
-select * from final
+select * 
+from final

models/stg_apple_store__downloads_device.sql

@@ -2,7 +2,6 @@ with base as (
 
     select * 
     from {{ ref('stg_apple_store__downloads_device_tmp') }}
-
 ),
 
 fields as (
@@ -31,4 +30,5 @@ final as (
     from fields
 )
 
-select * from final
+select * 
+from final

models/stg_apple_store__downloads_platform_version.sql

@@ -2,7 +2,6 @@ with base as (
 
     select * 
     from {{ ref('stg_apple_store__downloads_platform_version_tmp') }}
-
 ),
 
 fields as (
@@ -31,4 +30,5 @@ final as (
     from fields
 )
 
-select * from final
+select * 
+from final

models/stg_apple_store__downloads_territory.sql

@@ -2,7 +2,6 @@ with base as (
 
     select * 
     from {{ ref('stg_apple_store__downloads_territory_tmp') }}
-
 ),
 
 fields as (
@@ -31,4 +30,5 @@ final as (
     from fields
 )
 
-select * from final
+select * 
+from final

models/stg_apple_store__sales_account.sql

@@ -3,7 +3,6 @@ with base as (
 
     select * 
     from {{ ref('stg_apple_store__sales_account_tmp') }}
-
 ),
 
 fields as (
@@ -27,4 +26,5 @@ final as (
     from fields
 )
 
-select * from final
+select * 
+from final

models/stg_apple_store__sales_subscription_events.sql

@@ -4,7 +4,6 @@ with base as (
 
     select * 
     from {{ ref('stg_apple_store__sales_subscription_events_tmp') }}
-
 ),
 
 fields as (
@@ -40,4 +39,5 @@ final as (
     {{ dbt_utils.group_by(8) }}
 )
 
-select * from final
+select * 
+from final

models/stg_apple_store__sales_subscription_summary.sql

@@ -4,7 +4,6 @@ with base as (
 
     select * 
     from {{ ref('stg_apple_store__sales_subscription_summary_tmp') }}
-
 ),
 
 fields as (
@@ -42,4 +41,5 @@ final as (
     {{ dbt_utils.group_by(7) }}
 )
 
-select * from final
+select * 
+from final

models/stg_apple_store__usage_app_version.sql

@@ -3,7 +3,6 @@ with base as (
 
     select * 
     from {{ ref('stg_apple_store__usage_app_version_tmp') }}
-
 ),
 
 fields as (
@@ -34,4 +33,5 @@ final as (
     from fields
 )
 
-select * from final
+select * 
+from final

models/stg_apple_store__usage_device.sql

@@ -3,7 +3,6 @@ with base as (
 
     select * 
     from {{ ref('stg_apple_store__usage_device_tmp') }}
-
 ),
 
 fields as (
@@ -34,4 +33,5 @@ final as (
     from fields
 )
 
-select * from final
+select * 
+from final

models/stg_apple_store__usage_platform_version.sql

@@ -3,7 +3,6 @@ with base as (
 
     select * 
     from {{ ref('stg_apple_store__usage_platform_version_tmp') }}
-
 ),
 
 fields as (
@@ -34,4 +33,5 @@ final as (
     from fields
 )
 
-select * from final
+select * 
+from final

models/stg_apple_store__usage_territory.sql

@@ -3,7 +3,6 @@ with base as (
 
     select * 
     from {{ ref('stg_apple_store__usage_territory_tmp') }}
-
 ),
 
 fields as (
@@ -34,4 +33,5 @@ final as (
     from fields
 )
 
-select * from final
+select * 
+from final

models/tmp/stg_apple_store__app_store_device_tmp.sql

@@ -1 +1,2 @@
-select * from {{ var('app_store_device') }}
+select * 
+from {{ var('app_store_device') }}

models/tmp/stg_apple_store__app_store_platform_version_tmp.sql

@@ -1 +1,2 @@
-select * from {{ var('app_store_platform_version') }}
+select * 
+from {{ var('app_store_platform_version') }}

models/tmp/stg_apple_store__app_store_territory_tmp.sql

@@ -1 +1,2 @@
-select * from {{ var('app_store_territory') }}
+select * 
+from {{ var('app_store_territory') }}

models/tmp/stg_apple_store__app_tmp.sql

@@ -1 +1,2 @@
-select * from {{ var('app') }}
+select * 
+from {{ var('app') }}

models/tmp/stg_apple_store__crashes_app_version_tmp.sql

@@ -1 +1,2 @@
-select * from {{ var('crashes_app_version') }}
+select * 
+from {{ var('crashes_app_version') }}

models/tmp/stg_apple_store__crashes_platform_version_tmp.sql

@@ -1 +1,2 @@
-select * from {{ var('crashes_platform_version') }}
+select * 
+from {{ var('crashes_platform_version') }}

models/tmp/stg_apple_store__downloads_device_tmp.sql

@@ -1 +1,2 @@
-select * from {{ var('downloads_device') }}
+select * 
+from {{ var('downloads_device') }}

models/tmp/stg_apple_store__downloads_platform_version_tmp.sql

@@ -1 +1,2 @@
-select * from {{ var('downloads_platform_version') }}
+select * 
+from {{ var('downloads_platform_version') }}

models/tmp/stg_apple_store__downloads_territory_tmp.sql

@@ -1 +1,2 @@
-select * from {{ var('downloads_territory') }}
+select * 
+from {{ var('downloads_territory') }}

models/tmp/stg_apple_store__sales_account_tmp.sql

@@ -1 +1,2 @@
-select * from {{ var('sales_account') }}
+select * 
+from {{ var('sales_account') }}

models/tmp/stg_apple_store__sales_subscription_events_tmp.sql

@@ -1,3 +1,4 @@
 {{ config(enabled=var('apple_store__using_subscriptions', False)) }}
 
-select * from {{ var('sales_subscription_events') }}
+select * 
+from {{ var('sales_subscription_events') }}

models/tmp/stg_apple_store__sales_subscription_summary_tmp.sql

@@ -1,3 +1,4 @@
 {{ config(enabled=var('apple_store__using_subscriptions', False)) }}
 
-select * from {{ var('sales_subscription_summary') }}
+select * 
+from {{ var('sales_subscription_summary') }}

models/tmp/stg_apple_store__usage_app_version_tmp.sql

@@ -1 +1,2 @@
-select * from {{ var('usage_app_version') }}
+select * 
+from {{ var('usage_app_version') }}

models/tmp/stg_apple_store__usage_device_tmp.sql

@@ -1 +1,2 @@
-select * from {{ var('usage_device') }}
+select * 
+from {{ var('usage_device') }}

models/tmp/stg_apple_store__usage_platform_version_tmp.sql

@@ -1 +1,2 @@
-select * from {{ var('usage_platform_version') }}
+select * 
+from {{ var('usage_platform_version') }}

models/tmp/stg_apple_store__usage_territory_tmp.sql

@@ -1 +1,2 @@
-select * from {{ var('usage_territory') }}
+select * 
+from {{ var('usage_territory') }}