Merge pull request #49 from fivetran/bugfix/duplicate-accounts-payable

bugfix/duplicate-accounts-payable

.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 -->
 

.github/workflows/check_docs.yml

@@ -0,0 +1,35 @@
+name: 'check docs'
+on:
+  push:
+    branches:
+      - main
+  pull_request:
+    branches:
+      - main
+
+jobs:
+  changed-files:
+    runs-on: ubuntu-latest
+    name: test changed-files
+    steps:
+      - uses: actions/checkout@v3
+        with:
+          fetch-depth: 0
+
+      - name: Get changed files
+        id: changed-files
+        uses: tj-actions/changed-files@v29.0.4
+        with:
+          files: docs/**
+
+      - name: Check to see if docs folder hasn't changed
+        if: steps.changed-files.outputs.any_changed == 'false'
+        run: |
+          echo "Docs have not been regenerated."
+          exit 1
+      
+      - name: Check if docs folder has changed
+        if: steps.changed-files.outputs.any_changed == 'true'
+        run: |
+          echo "Docs have been regenerated!"
+          exit 0 

CHANGELOG.md

@@ -1,3 +1,9 @@
+# dbt_quickbooks v0.5.3
+## Bug Fixes
+- The `int_quickbooks__bill_payment_double_entry`, `int_quickbooks__credit_memo_double_entry`, `int_quickbooks__deposit_double_entry`, and `int_quickbooks__payment_double_entry` models perform a cross join on the `stg_quickbooks__accounts` model for the respective debit/credit account. However, if this cross join includes more than one record, it will result in duplicates. An additional filter to remove sub accounts has been added to ensure the output of the models do not have duplicates. ([#49](https://github.com/fivetran/dbt_quickbooks/pull/49))
+
+## Under the Hood
+- A GitHub workflow has been added to ensure the dbt docs are regenerated before each merge to the `main` release branch. ([#49](https://github.com/fivetran/dbt_quickbooks/pull/49))
 # dbt_quickbooks v0.5.2
 ## Bug Fixes
 - Within the `v0.5.1` release, the `transaction_id` field was erroneously removed from the `quickbooks__general_ledger` model. This field has since been added back. ([#46](https://github.com/fivetran/dbt_quickbooks/pull/46))

dbt_project.yml

@@ -1,7 +1,7 @@
 config-version: 2
 
 name: 'quickbooks'
-version: '0.5.2'
+version: '0.5.3'
 
 require-dbt-version: [">=1.0.0", "<2.0.0"]
 

integration_tests/.gitignore

@@ -1,3 +1,4 @@
 target/
 dbt_modules/
+dbt_packages/
 logs/

integration_tests/ci/sample.profiles.yml

@@ -16,7 +16,7 @@ integration_tests:
       pass: "{{ env_var('CI_REDSHIFT_DBT_PASS') }}"
       dbname: "{{ env_var('CI_REDSHIFT_DBT_DBNAME') }}"
       port: 5439
-      schema: quickbooks_source_integration_tests
+      schema: quickbooks_integrations_tests
       threads: 8
     postgres:
       type: postgres
@@ -25,14 +25,14 @@ integration_tests:
       pass: "{{ env_var('CI_POSTGRES_DBT_PASS') }}"
       dbname: "{{ env_var('CI_POSTGRES_DBT_DBNAME') }}"
       port: 5432
-      schema: quickbooks_source_integration_tests
+      schema: quickbooks_integrations_tests
       threads: 8
     bigquery:
       type: bigquery
       method: service-account
       keyfile: "{{ env_var('GCLOUD_SERVICE_KEY_PATH') }}"
       project: 'dbt-package-testing'
-      schema: quickbooks_source_integration_tests
+      schema: quickbooks_integrations_tests
       threads: 8
     snowflake:
       type: snowflake
@@ -42,5 +42,5 @@ integration_tests:
       role: "{{ env_var('CI_SNOWFLAKE_DBT_ROLE') }}"
       database: "{{ env_var('CI_SNOWFLAKE_DBT_DATABASE') }}"
       warehouse: "{{ env_var('CI_SNOWFLAKE_DBT_WAREHOUSE') }}"
-      schema: quickbooks_source_integration_tests_update
+      schema: quickbooks_integrations_tests
       threads: 8

integration_tests/dbt_project.yml

@@ -1,5 +1,5 @@
 name: 'quickbooks_integration_tests'
-version: '0.5.2'
+version: '0.5.3'
 profile: 'integration_tests'
 config-version: 2
 
@@ -18,46 +18,8 @@ models:
     tmp:
       +materialized: view
 
-vars: 
-  quickbooks:
-    using_purchase_order: True
-    account:              "{{ ref('stg_quickbooks__account') }}"
-    address:              "{{ ref('stg_quickbooks__address') }}"
-    bill_line:            "{{ ref('stg_quickbooks__bill_line') }}"
-    bill_linked_txn:      "{{ ref('stg_quickbooks__bill_linked_txn') }}"
-    bill_payment_line:    "{{ ref('stg_quickbooks__bill_payment_line') }}"
-    bill_payment:         "{{ ref('stg_quickbooks__bill_payment') }}"
-    bill:                 "{{ ref('stg_quickbooks__bill') }}"
-    bundle_item:          "{{ ref('stg_quickbooks__bundle_item') }}"
-    bundle:               "{{ ref('stg_quickbooks__bundle') }}"
-    credit_memo_line:     "{{ ref('stg_quickbooks__credit_memo_line') }}"
-    credit_memo:          "{{ ref('stg_quickbooks__credit_memo') }}"
-    customer:             "{{ ref('stg_quickbooks__customer') }}"
-    department:           "{{ ref('stg_quickbooks__department') }}"
-    deposit_line:         "{{ ref('stg_quickbooks__deposit_line') }}"
-    deposit:              "{{ ref('stg_quickbooks__deposit') }}"
-    estimate:             "{{ ref('stg_quickbooks__estimate') }}"
-    estimate_line:        "{{ ref('stg_quickbooks__estimate_line') }}"
-    invoice_line:         "{{ ref('stg_quickbooks__invoice_line') }}"
-    invoice_line_bundle:  "{{ ref('stg_quickbooks__invoice_line_bundle') }}"
-    invoice_linked_txn:   "{{ ref('stg_quickbooks__invoice_linked_txn') }}"
-    invoice:              "{{ ref('stg_quickbooks__invoice') }}"
-    item:                 "{{ ref('stg_quickbooks__item') }}"
-    journal_entry_line:   "{{ ref('stg_quickbooks__journal_entry_line') }}"
-    journal_entry:        "{{ ref('stg_quickbooks__journal_entry') }}"
-    payment_line:         "{{ ref('stg_quickbooks__payment_line') }}"
-    payment:              "{{ ref('stg_quickbooks__payment') }}"
-    purchase_line:        "{{ ref('stg_quickbooks__purchase_line') }}"
-    purchase:             "{{ ref('stg_quickbooks__purchase') }}"
-    refund_receipt_line:  "{{ ref('stg_quickbooks__refund_receipt_line') }}"
-    refund_receipt:       "{{ ref('stg_quickbooks__refund_receipt') }}"
-    sales_receipt_line:   "{{ ref('stg_quickbooks__sales_receipt_line') }}"
-    sales_receipt:        "{{ ref('stg_quickbooks__sales_receipt') }}"
-    transfer:             "{{ ref('stg_quickbooks__transfer') }}"
-    vendor_credit_line:   "{{ ref('stg_quickbooks__vendor_credit_line') }}"
-    vendor_credit:        "{{ ref('stg_quickbooks__vendor_credit') }}"
-    vendor:               "{{ ref('stg_quickbooks__vendor') }}"
-
+vars:
+  quickbooks_schema: quickbooks_source_integrations_tests
   quickbooks_source:
     account:              "{{ ref('account_data') }}"
     address:              "{{ ref('address_data') }}"

models/double_entry_transactions/int_quickbooks__bill_payment_double_entry.sql

@@ -27,6 +27,7 @@ ap_accounts as (
 
     where account_type = 'Accounts Payable'
         and is_active
+        and not is_sub_account
 ),
 
 bill_payment_join as (

models/double_entry_transactions/int_quickbooks__credit_memo_double_entry.sql

@@ -32,6 +32,7 @@ df_accounts as (
 
     where account_type = 'Accounts Receivable'
         and is_active
+        and not is_sub_account
 ),
 
 credit_memo_join as (

models/double_entry_transactions/int_quickbooks__deposit_double_entry.sql

@@ -28,6 +28,7 @@ uf_accounts as (
 
     where account_sub_type = 'UndepositedFunds'
         and is_active
+        and not is_sub_account
 ),
 
 deposit_join as (

models/double_entry_transactions/int_quickbooks__payment_double_entry.sql

@@ -27,6 +27,7 @@ ar_accounts as (
 
     where account_type = 'Accounts Receivable'
         and is_active
+        and not is_sub_account
 ),
 
 payment_join as (