Merge pull request #63 from MozartData/MarcelloMolinaro/adds-department_id

Adds department id to general ledger

Author: fivetran-joemarkiewicz

CHANGELOG.md

@@ -1,3 +1,10 @@
+# dbt_quickbooks v0.8.1
+## Additional Features
+- Added `department_id` to the `quickbooks__general_ledger` and the upstream tables required for that change. ([#63](https://github.com/fivetran/dbt_quickbooks/pull/63))
+
+## Contributors
+- [@MarcelloMolinaro](https://github.com/MarcelloMolinaro) ([#63](https://github.com/fivetran/dbt_quickbooks/pull/63))
+
 # dbt_quickbooks v0.8.0
 ## 🚨 Breaking Changes 🚨
 - Replacing `account_name` with `account_id` as input for the `generate_surrogate_key` function to fix `unique_id` uniqueness issues in the `quickbooks__general_ledger` model.  A full refresh is recommended for accurate and consistent surrogate keys. ([#73](https://github.com/fivetran/dbt_quickbooks/pull/73))
@@ -60,6 +67,8 @@
 - Addition of the `credit_card_payment_txn` (enabled/disabled using the `using_credit_card_payment_txn` variable) source as well as the accompanying staging and intermediate models. This source includes all credit card payment transactions and will be used in downstream General Ledger generation to ensure accurate reporting of all transaction types. ([#61](https://github.com/fivetran/dbt_quickbooks/pull/61))
   >**Note**: the `credit_card_payment_txn` source and models are disabled by default. In order to enable them, you will want to set the `using_credit_card_payment_txn` variable to `true` in your dbt_project.yml.
 
+- Added `department_id` to the `quickbooks__general_ledger` and the upstream tables required for that change.
+
 ## Contributors
 - [@mikerenderco](https://github.com/mikerenderco) ([#50](https://github.com/fivetran/dbt_quickbooks/pull/50), [#47](https://github.com/fivetran/dbt_quickbooks/issues/47))
 - [@mel-restori](https://github.com/mel-restori) ([#54](https://github.com/fivetran/dbt_quickbooks/pull/54), [#47](https://github.com/fivetran/dbt_quickbooks/issues/47))

dbt_project.yml

@@ -1,6 +1,6 @@
 config-version: 2
 name: 'quickbooks'
- 
+
 version: '0.8.0'
 require-dbt-version: [">=1.3.0", "<2.0.0"]
 

integration_tests/dbt_project.yml

@@ -16,7 +16,7 @@ models:
   quickbooks_source:
     +materialized: table
     tmp:
-      +materialized: view   
+      +materialized: view
 vars:
   quickbooks_source:
     quickbooks_schema: quickbooks_integrations_tests
@@ -56,7 +56,7 @@ vars:
     quickbooks_refund_receipt_identifier: "refund_receipt_data"
     quickbooks_sales_receipt_line_identifier: "sales_receipt_line_data"
     quickbooks_sales_receipt_identifier: "sales_receipt_data"
-    quickbooks_transfer_identifier: "transfer_data"    
+    quickbooks_transfer_identifier: "transfer_data"
     quickbooks_vendor_credit_line_identifier: "vendor_credit_line_data"
     quickbooks_vendor_credit_identifier: "vendor_credit_data"
     quickbooks_vendor_identifier: "vendor_data"

integration_tests/seeds/bill_data.csv

@@ -1,11 +1,11 @@
 id,_fivetran_deleted,_fivetran_synced,balance,created_at,currency_id,department_id,doc_number,due_date,exchange_rate,global_tax_calculation,home_balance,payable_account_id,private_note,sales_term_id,sync_token,total_amount,transaction_date,updated_at,vendor_id
-19,TRUE,2020-06-23 3:58:57,1069,2020-05-19 20:48:23,USD,,,,,,,,,,,588,,2020-05-20 12:36:09,
-17,TRUE,2020-06-23 3:58:57,992,2020-05-19 20:43:56,USD,,,,,,,,,,,974,,2020-05-22 16:39:03,
-15,TRUE,2020-06-23 3:58:57,800,2020-05-19 20:40:52,USD,,,,,,,,,,,386,,2020-06-05 20:14:19,
-14,TRUE,2020-06-23 3:58:57,572,2020-05-19 20:25:52,USD,,,,,,,,,,,666,,2020-06-05 20:14:12,
-16,TRUE,2020-06-23 3:58:57,737,2020-05-19 20:41:52,USD,,,,,,,,,,,878,,2020-05-19 20:41:55,
-18,TRUE,2020-06-23 3:58:57,213,2020-05-19 20:45:15,USD,,,,,,,,,,,946,,2020-05-22 16:40:28,
-398,FALSE,2020-12-17 19:32:00,52,2020-12-17 19:21:21,USD,,,2020-12-17,,,,37,,,0,822,2020-12-17,2020-12-17 19:21:21,20
-399,FALSE,2020-12-17 19:32:00,991,2020-12-17 19:28:35,USD,,2021-01-01,2020-12-17,,,,37,4e607e75b05d403ca078f850ccab9518,,0,647,2020-12-17,2020-12-17 19:28:35,6
-397,FALSE,2020-12-17 19:31:59,832,2020-12-17 19:21:02,USD,,,2020-12-17,,,,37,,,0,757,2020-12-17,2020-12-17 19:21:02,20
-401,FALSE,2020-12-17 19:32:00,454,2020-12-17 19:30:30,USD,,2021-03-01,2020-12-17,,,,37,6b681d0cbc9eeb22c903ccedfc47fe17,,0,485,2020-12-17,2020-12-17 19:30:30,6
+19,TRUE,2020-06-23 3:58:57,1069,2020-05-19 20:48:23,USD,1,,,,,,,,,,588,,2020-05-20 12:36:09,
+17,TRUE,2020-06-23 3:58:57,992,2020-05-19 20:43:56,USD,1,,,,,,,,,,974,,2020-05-22 16:39:03,
+15,TRUE,2020-06-23 3:58:57,800,2020-05-19 20:40:52,USD,1,,,,,,,,,,386,,2020-06-05 20:14:19,
+14,TRUE,2020-06-23 3:58:57,572,2020-05-19 20:25:52,USD,1,,,,,,,,,,666,,2020-06-05 20:14:12,
+16,TRUE,2020-06-23 3:58:57,737,2020-05-19 20:41:52,USD,1,,,,,,,,,,878,,2020-05-19 20:41:55,
+18,TRUE,2020-06-23 3:58:57,213,2020-05-19 20:45:15,USD,1,,,,,,,,,,946,,2020-05-22 16:40:28,
+398,FALSE,2020-12-17 19:32:00,52,2020-12-17 19:21:21,USD,1,,2020-12-17,,,,37,,,0,822,2020-12-17,2020-12-17 19:21:21,20
+399,FALSE,2020-12-17 19:32:00,991,2020-12-17 19:28:35,USD,1,2021-01-01,2020-12-17,,,,37,4e607e75b05d403ca078f850ccab9518,,0,647,2020-12-17,2020-12-17 19:28:35,6
+397,FALSE,2020-12-17 19:31:59,832,2020-12-17 19:21:02,USD,1,,2020-12-17,,,,37,,,0,757,2020-12-17,2020-12-17 19:21:02,20
+401,FALSE,2020-12-17 19:32:00,454,2020-12-17 19:30:30,USD,1,2021-03-01,2020-12-17,,,,37,6b681d0cbc9eeb22c903ccedfc47fe17,,0,485,2020-12-17,2020-12-17 19:30:30,6

integration_tests/seeds/purchase_data.csv

@@ -1,11 +1,11 @@
 id,_fivetran_deleted,_fivetran_synced,account_id,created_at,credit,currency_id,customer_id,department_id,doc_number,employee_id,exchange_rate,global_tax_calculation,payment_method_id,payment_type,print_status,private_note,remit_to_address_id,sync_token,tax_code_id,total_amount,total_tax,transaction_date,transaction_source,updated_at,vendor_id
-107,false,2020-12-30 15:02:20,,2020-11-06 1:19:33,,USD,,,,,,,,CreditCard,,,,,,,,2020-11-06 1:19:33,,2020-11-06 1:19:33,18
-101,false,2020-12-30 15:02:20,,2020-11-06 1:24:25,,USD,,,,,,,,CreditCard,,,,,,,,,,2020-11-06 1:24:25,18
-103,false,2020-12-30 15:02:20,,2020-11-06 1:18:27,,USD,,,,,,,,CreditCard,,,,,,,,,,2020-11-06 1:18:27,18
-232,false,2020-09-01 21:02:33,,2020-07-15 20:03:18,,USD,,,,,,,,CreditCard,,,,,,,,,,2020-07-15 20:03:18,18
-228,false,2020-12-30 15:02:20,,2020-11-06 1:21:34,,USD,,,,,,,,CreditCard,,,,,,,,,,2020-11-06 1:21:34,18
-372,false,2020-12-30 15:02:20,,2020-09-25 3:42:57,,USD,,,,,,,,CreditCard,,,,,,,,,,2020-10-15 14:17:12,18
-190,false,2020-12-30 15:02:20,,2020-11-06 1:22:25,,USD,,,,,,,,CreditCard,,,,,,,,,,2020-11-06 1:22:25,18
-340,false,2020-12-30 15:02:20,,2020-11-06 1:18:45,,USD,,,,,,,,CreditCard,,,,,,,,,,2020-11-06 1:18:45,18
-342,false,2020-12-30 15:02:20,,2020-11-21 3:21:38,,USD,,,,,,,,CreditCard,,,,,,,,,,2020-12-02 20:19:49,
-350,false,2020-12-30 15:02:20,,2020-11-07 1:43:36,,USD,,,,,,,,CreditCard,,,,,,,,,,2020-11-07 1:43:36,18
+107,FALSE,2020-12-30 15:02:20,,2020-11-06 1:19:33,,USD,,1,,,,,,CreditCard,,,,,,,,2020-11-06 1:19:33,,2020-11-06 1:19:33,18
+101,FALSE,2020-12-30 15:02:20,,2020-11-06 1:24:25,,USD,,1,,,,,,CreditCard,,,,,,,,,,2020-11-06 1:24:25,18
+103,FALSE,2020-12-30 15:02:20,,2020-11-06 1:18:27,,USD,,1,,,,,,CreditCard,,,,,,,,,,2020-11-06 1:18:27,18
+232,FALSE,2020-09-01 21:02:33,,2020-07-15 20:03:18,,USD,,1,,,,,,CreditCard,,,,,,,,,,2020-07-15 20:03:18,18
+228,FALSE,2020-12-30 15:02:20,,2020-11-06 1:21:34,,USD,,2,,,,,,CreditCard,,,,,,,,,,2020-11-06 1:21:34,18
+372,FALSE,2020-12-30 15:02:20,,2020-09-25 3:42:57,,USD,,2,,,,,,CreditCard,,,,,,,,,,2020-10-15 14:17:12,18
+190,FALSE,2020-12-30 15:02:20,,2020-11-06 1:22:25,,USD,,1,,,,,,CreditCard,,,,,,,,,,2020-11-06 1:22:25,18
+340,FALSE,2020-12-30 15:02:20,,2020-11-06 1:18:45,,USD,,1,,,,,,CreditCard,,,,,,,,,,2020-11-06 1:18:45,18
+342,FALSE,2020-12-30 15:02:20,,2020-11-21 3:21:38,,USD,,1,,,,,,CreditCard,,,,,,,,,,2020-12-02 20:19:49,
+350,FALSE,2020-12-30 15:02:20,,2020-11-07 1:43:36,,USD,,1,,,,,,CreditCard,,,,,,,,,,2020-11-07 1:43:36,18

models/double_entry_transactions/int_quickbooks__bill_double_entry.sql

@@ -18,9 +18,9 @@ bill_lines as (
 ),
 
 items as (
-    
-    select 
-        item.*, 
+
+    select
+        item.*,
         parent.expense_account_id as parent_expense_account_id,
         parent.income_account_id as parent_income_account_id
     from {{ ref('stg_quickbooks__item') }} item
@@ -40,20 +40,21 @@ bill_join as (
         bills.payable_account_id,
         coalesce(bill_lines.account_expense_customer_id, bill_lines.item_expense_customer_id) as customer_id,
         coalesce(bill_lines.item_expense_class_id, bill_lines.account_expense_class_id) as class_id,
-        bills.vendor_id
+        bills.vendor_id,
+        bills.department_id
     from bills
 
-    inner join bill_lines 
-        on bills.bill_id = bill_lines.bill_id  
-        and bills.source_relation = bill_lines.source_relation 
+    inner join bill_lines
+        on bills.bill_id = bill_lines.bill_id
+        and bills.source_relation = bill_lines.source_relation
 
     left join items
         on bill_lines.item_expense_item_id = items.item_id
         and bill_lines.source_relation = items.source_relation
 ),
 
 final as (
-    select 
+    select
         transaction_id,
         source_relation,
         index,
@@ -63,6 +64,7 @@ final as (
         amount,
         payed_to_account_id as account_id,
         class_id,
+        department_id,
         'debit' as transaction_type,
         'bill' as transaction_source
     from bill_join
@@ -79,10 +81,11 @@ final as (
         amount,
         payable_account_id as account_id,
         class_id,
+        department_id,
         'credit' as transaction_type,
         'bill' as transaction_source
     from bill_join
 )
 
 select *
-from final
+from final

models/double_entry_transactions/int_quickbooks__bill_payment_double_entry.sql

@@ -28,7 +28,7 @@ ap_accounts as (
     select
         account_id
     from accounts
-    
+
     where account_type = 'Accounts Payable'
         and is_active
         and not is_sub_account
@@ -43,15 +43,16 @@ bill_payment_join as (
         bill_payments.total_amount as amount,
         coalesce(bill_payments.credit_card_account_id,bill_payments.check_bank_account_id) as payment_account_id,
         ap_accounts.account_id,
-        bill_payments.vendor_id
+        bill_payments.vendor_id,
+        bill_payments.department_id
     from bill_payments
 
     cross join ap_accounts
 
 ),
 
 final as (
-    
+
     select
         transaction_id,
         source_relation,
@@ -62,6 +63,7 @@ final as (
         amount,
         payment_account_id as account_id,
         cast(null as {{ dbt.type_string() }}) as class_id,
+        department_id,
         'credit' as transaction_type,
         'bill payment' as transaction_source
     from bill_payment_join
@@ -78,10 +80,11 @@ final as (
         amount,
         account_id,
         cast(null as {{ dbt.type_string() }}) as class_id,
+        department_id,
         'debit' as transaction_type,
         'bill payment' as transaction_source
     from bill_payment_join
 )
 
 select *
-from final
+from final

models/double_entry_transactions/int_quickbooks__credit_memo_double_entry.sql

@@ -50,8 +50,9 @@ credit_memo_join as (
         credit_memo_lines.amount,
         coalesce(credit_memo_lines.sales_item_account_id, items.income_account_id, items.expense_account_id) as account_id,
         credit_memos.customer_id,
-        coalesce(credit_memo_lines.sales_item_class_id, credit_memo_lines.discount_class_id, credit_memos.class_id) as class_id
-    
+        coalesce(credit_memo_lines.sales_item_class_id, credit_memo_lines.discount_class_id, credit_memos.class_id) as class_id,
+        credit_memos.department_id
+
     from credit_memos
 
     inner join credit_memo_lines
@@ -77,13 +78,14 @@ final as (
         amount * -1 as amount,
         account_id,
         class_id,
+        department_id,
         'credit' as transaction_type,
         'credit_memo' as transaction_source
     from credit_memo_join
 
     union all
 
-    select 
+    select
         transaction_id,
         source_relation,
         index,
@@ -93,6 +95,7 @@ final as (
         amount * -1 as amount,
         df_accounts.account_id,
         class_id,
+        department_id,
         'debit' as transaction_type,
         'credit_memo' as transaction_source
     from credit_memo_join
@@ -101,4 +104,4 @@ final as (
 )
 
 select *
-from final
+from final

models/double_entry_transactions/int_quickbooks__deposit_double_entry.sql

@@ -1,5 +1,5 @@
 /*
-Table that creates a debit record to the specified cash account and a credit record to either undeposited funds or a 
+Table that creates a debit record to the specified cash account and a credit record to either undeposited funds or a
 specific other account indicated in the deposit line.
 */
 
@@ -10,7 +10,7 @@ with deposits as (
 
     select *
     from {{ ref('stg_quickbooks__deposit') }}
-), 
+),
 
 deposit_lines as (
 
@@ -46,14 +46,15 @@ deposit_join as (
         deposits.account_id as deposit_to_acct_id,
         coalesce(deposit_lines.deposit_account_id, uf_accounts.account_id) as deposit_from_acct_id,
         deposit_customer_id as customer_id,
-        deposit_lines.deposit_class_id as class_id
+        deposit_lines.deposit_class_id as class_id,
+        deposits.department_id
 
     from deposits
-    
-    inner join deposit_lines 
+
+    inner join deposit_lines
         on deposits.deposit_id = deposit_lines.deposit_id
         and deposits.source_relation = deposit_lines.source_relation
-    
+
     cross join uf_accounts
 
 ),
@@ -70,6 +71,7 @@ final as (
         amount,
         deposit_to_acct_id as account_id,
         class_id,
+        department_id,
         'debit' as transaction_type,
         'deposit' as transaction_source
     from deposit_join
@@ -86,10 +88,11 @@ final as (
         amount,
         deposit_from_acct_id as account_id,
         class_id,
+        department_id,
         'credit' as transaction_type,
         'deposit' as transaction_source
     from deposit_join
 )
 
 select *
-from final
+from final