Check for nulls in state join condition

.github/PULL_REQUEST_TEMPLATE/maintainer_pull_request_template.md

@@ -4,48 +4,26 @@
 **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? -->
 
-**Please detail what change(s) this PR introduces and any additional information that should be known during the review of this PR:**
+**Please provide the finalized CHANGELOG entry which details the relevant changes included in this PR:**
+<!--- Copy/paste the CHANGELOG for this version below. -->
 
 ## PR Checklist
 ### Basic Validation
 Please acknowledge that you have successfully performed the following commands locally:
-- [ ] dbt compile
-- [ ] dbt run –full-refresh
-- [ ] dbt run
-- [ ] dbt test
-- [ ] dbt run –vars (if applicable)
+- [ ] dbt run –full-refresh && dbt test
+- [ ] dbt run (if incremental models are present) && dbt test
 
 Before marking this PR as "ready for review" the following have been applied:
-- [ ] The appropriate issue has been linked and tagged
-- [ ] You are assigned to the corresponding issue and this PR
+- [ ] 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
 
 ### Detailed Validation
-Please acknowledge that the following validation checks have been performed prior to marking this PR as "ready for review":
-- [ ] You have validated these changes and assure this PR will address the respective Issue/Feature.
-- [ ] You are reasonably confident these changes will not impact any other components of this package or any dependent packages.
-- [ ] You have provided details below around the validation steps performed to gain confidence in these changes.
+Please share any and all of your validation steps:
 <!--- Provide the steps you took to validate your changes below. -->
 
-### Standard Updates
-Please acknowledge that your PR contains the following standard updates:
-- Package versioning has been appropriately indexed in the following locations:
-    - [ ] indexed within dbt_project.yml
-    - [ ] indexed within integration_tests/dbt_project.yml
-- [ ] CHANGELOG has individual entries for each respective change in this PR
-    <!--- If there is a parallel upstream change, remember to reference the corresponding CHANGELOG as an individual entry.  -->
-- [ ] README updates have been applied (if applicable)
-    <!--- Remember to check the following README locations for common updates. →
-        <!--- Suggested install range (needed for breaking changes) →
-        <!--- Dependency matrix is appropriately updated (if applicable) →
-        <!--- New variable documentation (if applicable) -->
-- [ ] DECISIONLOG updates have been updated (if applicable)
-- [ ] Appropriate yml documentation has been added (if applicable)
-
-### dbt Docs
-Please acknowledge that after the above were all completed the below were applied to your branch:
-- [ ] docs were regenerated (unless this PR does not include any code or yml updates)
-
 ### 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:
+:dancer:

.github/workflows/auto-release.yml

@@ -0,0 +1,13 @@
+name: 'auto release'
+on:
+  pull_request:
+    types:
+      - closed
+    branches:
+      - main
+
+jobs:
+  call-workflow-passing-data:
+    if: github.event.pull_request.merged
+    uses: fivetran/dbt_package_automations/.github/workflows/auto-release.yml@main
+    secrets: inherit

.gitignore

@@ -2,3 +2,4 @@
 target/
 dbt_packages/
 logs/
+package-lock.yml

CHANGELOG.md

@@ -1,3 +1,16 @@
+# dbt_apple_store v0.3.2
+
+[PR #18](https://github.com/fivetran/dbt_apple_store/pull/18) includes the following updates:
+## Bug Fix
+- Enhanced the `state` join condition in `apple_store__subscription_report`. The new condition will now check for null values correctly. Previously this was causing wrong metrics for countries that do not specify or require a state.
+
+## Under the Hood
+- Included auto-releaser GitHub Actions workflow to automate future releases.
+- Updated the maintainer PR template to resemble the most up to date format.
+
+## Contributors
+- [@awoehrl](https://github.com/awoehrl) ([PR #18](https://github.com/fivetran/dbt_apple_store/pull/18))
+
 # dbt_apple_store v0.3.1
 
 This package version includes the following updates:

dbt_project.yml

@@ -1,5 +1,5 @@
 name: 'apple_store'
-version: '0.3.1'
+version: '0.3.2'
 config-version: 2
 require-dbt-version: [">=1.3.0", "<2.0.0"]
 vars:

integration_tests/ci/sample.profiles.yml

@@ -16,13 +16,13 @@ integration_tests:
       pass: "{{ env_var('CI_REDSHIFT_DBT_PASS') }}"
       dbname: "{{ env_var('CI_REDSHIFT_DBT_DBNAME') }}"
       port: 5439
-      schema: apple_store_integration_tests_6
+      schema: apple_store_integration_tests_7
       threads: 8
     bigquery:
       type: bigquery
       method: service-account-json
       project: 'dbt-package-testing'
-      schema: apple_store_integration_tests_6
+      schema: apple_store_integration_tests_7
       threads: 8
       keyfile_json: "{{ env_var('GCLOUD_SERVICE_KEY') | as_native }}"
     snowflake:
@@ -33,7 +33,7 @@ integration_tests:
       role: "{{ env_var('CI_SNOWFLAKE_DBT_ROLE') }}"
       database: "{{ env_var('CI_SNOWFLAKE_DBT_DATABASE') }}"
       warehouse: "{{ env_var('CI_SNOWFLAKE_DBT_WAREHOUSE') }}"
-      schema: apple_store_integration_tests_6
+      schema: apple_store_integration_tests_7
       threads: 8
     postgres:
       type: postgres
@@ -42,13 +42,13 @@ integration_tests:
       pass: "{{ env_var('CI_POSTGRES_DBT_PASS') }}"
       dbname: "{{ env_var('CI_POSTGRES_DBT_DBNAME') }}"
       port: 5432
-      schema: apple_store_integration_tests_6
+      schema: apple_store_integration_tests_7
       threads: 8
     databricks:
       catalog: "{{ env_var('CI_DATABRICKS_DBT_CATALOG') }}"
       host: "{{ env_var('CI_DATABRICKS_DBT_HOST') }}"
       http_path: "{{ env_var('CI_DATABRICKS_DBT_HTTP_PATH') }}"
-      schema: apple_store_integration_tests_6
+      schema: apple_store_integration_tests_7
       threads: 2
       token: "{{ env_var('CI_DATABRICKS_DBT_TOKEN') }}"
       type: databricks

integration_tests/dbt_project.yml

@@ -1,12 +1,12 @@
 config-version: 2
 
 name: 'apple_store_integration_tests'
-version: '0.3.1'
+version: '0.3.2'
 
 profile: 'integration_tests'
 
 vars:
-  apple_store_schema: apple_store_integration_tests_6
+  apple_store_schema: apple_store_integration_tests_7
   apple_store__using_subscriptions: True
   apple_store_source:
     app_identifier: "app"

models/apple_store__subscription_report.sql

@@ -83,14 +83,14 @@ joined as (
         and reporting_grain.app_name = subscription_summary.app_name
         and reporting_grain.subscription_name = subscription_summary.subscription_name
         and reporting_grain.country = subscription_summary.country
-        and reporting_grain.state = subscription_summary.state
+        and (reporting_grain.state = subscription_summary.state or (reporting_grain.state is null and subscription_summary.state is null))
     left join subscription_events
         on reporting_grain.date_day = subscription_events.date_day
         and reporting_grain.account_id =  subscription_events.account_id 
         and reporting_grain.app_name = subscription_events.app_name
         and reporting_grain.subscription_name = subscription_events.subscription_name
         and reporting_grain.country = subscription_events.country
-        and reporting_grain.state = subscription_events.state
+        and (reporting_grain.state = subscription_events.state or (reporting_grain.state is null and subscription_events.state is null))
     left join country_codes
         on reporting_grain.country = country_codes.country_code_alpha_2