Modify class coalesce order, update CHANGELOG and yml

Author: fivetran-avinash

CHANGELOG.md

@@ -1,3 +1,5 @@
+# New feature
+- Addition of `class_id` to `quickbooks__general_ledger` and `quickbooks_general_ledger_by_period`, provide class values for all relevant models.
 # dbt_quickbooks_source v0.6.0
 ## 🚨 Breaking Changes 🚨:
 [PR #51](https://github.com/fivetran/dbt_quickbooks/pull/51) includes the following breaking changes:

models/double_entry_transactions/int_quickbooks__bill_double_entry.sql

@@ -20,9 +20,9 @@ items as (
         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
+    from {{ ref('stg_quickbooks__item') }} item
 
-    left join {{ref('stg_quickbooks__item')}} parent
+    left join {{ ref('stg_quickbooks__item') }} parent
         on item.parent_item_id = parent.item_id
 ),
 
@@ -35,7 +35,7 @@ bill_join as (
         coalesce(bill_lines.account_expense_account_id, items.expense_account_id, items.parent_expense_account_id, items.expense_account_id, items.parent_income_account_id, items.income_account_id) as payed_to_account_id,
         bills.payable_account_id,
         coalesce(bill_lines.account_expense_customer_id, bill_lines.item_expense_customer_id) as customer_id,
-        coalesce(bill_lines.account_expense_class_id, bill_lines.item_expense_class_id) as class_id,
+        coalesce(bill_lines.item_expense_class_id, bill_lines.account_expense_class_id) as class_id,
         bills.vendor_id
     from bills
 

models/double_entry_transactions/int_quickbooks__credit_card_pymt_double_entry.sql

@@ -7,7 +7,7 @@ Table that creates a debit record to the associated bank account and a credit re
 
 with credit_card_payments as (
     select *
-    from {{ref('stg_quickbooks__credit_card_payment_txn')}}
+    from {{ ref('stg_quickbooks__credit_card_payment_txn') }}
     where is_most_recent_record
 ),
 

models/double_entry_transactions/int_quickbooks__credit_memo_double_entry.sql

@@ -7,17 +7,17 @@ Table that creates a debit record to Discounts Refunds Given and a credit record
 
 with credit_memos as (
     select *
-    from {{ref('stg_quickbooks__credit_memo')}}
+    from {{ ref('stg_quickbooks__credit_memo') }}
 ),
 
 credit_memo_lines as (
     select *
-    from {{ref('stg_quickbooks__credit_memo_line')}}
+    from {{ ref('stg_quickbooks__credit_memo_line') }}
 ),
 
 items as (
     select *
-    from {{ref('stg_quickbooks__item')}}
+    from {{ ref('stg_quickbooks__item') }}
 ),
 
 accounts as (
@@ -43,7 +43,7 @@ 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_memos.class_id, credit_memo_lines.sales_item_class_id, credit_memo_lines.discount_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
 
     from credit_memos
 

models/double_entry_transactions/int_quickbooks__deposit_double_entry.sql

@@ -8,12 +8,12 @@ specific other account indicated in the deposit line.
 
 with deposits as (
     select *
-    from {{ref('stg_quickbooks__deposit')}}
+    from {{ ref('stg_quickbooks__deposit') }}
 ), 
 
 deposit_lines as (
     select *
-    from {{ref('stg_quickbooks__deposit_line')}}
+    from {{ ref('stg_quickbooks__deposit_line') }}
 ),
 
 accounts as (

models/double_entry_transactions/int_quickbooks__invoice_double_entry.sql

@@ -7,12 +7,12 @@ Table that creates a debit record to accounts receivable and a credit record to
 
 with invoices as (
     select *
-    from {{ref('stg_quickbooks__invoice')}}
+    from {{ ref('stg_quickbooks__invoice') }}
 ),
 
 invoice_lines as (
     select *
-    from {{ref('stg_quickbooks__invoice_line')}}
+    from {{ ref('stg_quickbooks__invoice_line') }}
 ),
 
 items as (
@@ -32,6 +32,7 @@ accounts as (
 
 
 {% if var('using_invoice_bundle', True) %}
+
 invoice_bundles as (
     select *
     from {{ref('stg_quickbooks__invoice_line_bundle')}}
@@ -57,8 +58,8 @@ income_accounts as (
 bundle_income_accounts as (
     select distinct
         coalesce(parent.income_account_id, income_accounts.account_id) as account_id,
-        bundle_items.bundle_id,
-        bundle_items.class_id
+        bundle_items.bundle_id 
+
     from items 
 
     left join items as parent
@@ -95,12 +96,7 @@ invoice_join as (
         coalesce(invoice_lines.account_id, items.income_account_id) as account_id,
         {% endif %}
 
-
-        {% if var('using_invoice_bundle', True) %}
-        coalesce(invoices.class_id, invoice_lines.sales_item_class_id, invoice_lines.discount_class_id, bundle_income_accounts.class_id) as class_id,
-        {% else %} 
-        coalesce(invoices.class_id, invoice_lines.sales_item_class_id, invoice_lines.discount_class_id) as class_id,
-        {% endif %}
+        coalesce(invoice_lines.sales_item_class_id, invoice_lines.discount_class_id, invoices.class_id) as class_id,
 
         invoices.customer_id
 

models/double_entry_transactions/int_quickbooks__journal_entry_double_entry.sql

@@ -7,12 +7,12 @@ Table that provides the debit and credit records of a journal entry transaction.
 
 with journal_entries as (
     select *
-    from {{ref('stg_quickbooks__journal_entry')}}
+    from {{ ref('stg_quickbooks__journal_entry') }}
 ),
 
 journal_entry_lines as (
     select *
-    from {{ref('stg_quickbooks__journal_entry_line')}}
+    from {{ ref('stg_quickbooks__journal_entry_line') }}
 ),
 
 final as (

models/double_entry_transactions/int_quickbooks__payment_double_entry.sql

@@ -7,12 +7,12 @@ Table that creates a debit record to either undeposited funds or a specified cas
 
 with payments as (
     select *
-    from {{ref('stg_quickbooks__payment')}}
+    from {{ ref('stg_quickbooks__payment') }}
 ),
 
 payment_lines as (
     select *
-    from {{ref('stg_quickbooks__payment_line')}}
+    from {{ ref('stg_quickbooks__payment_line') }}
 ),
 
 accounts as (

models/double_entry_transactions/int_quickbooks__purchase_double_entry.sql

@@ -3,21 +3,21 @@ Table that creates a debit record to a specified expense account and a credit re
 */
 with purchases as (
     select *
-    from {{ref('stg_quickbooks__purchase')}}
+    from {{ ref('stg_quickbooks__purchase') }}
 ),
 
 purchase_lines as (
     select *
-    from {{ref('stg_quickbooks__purchase_line')}}
+    from {{ ref('stg_quickbooks__purchase_line') }}
 ),
 
 items as (
     select 
         item.*, 
         parent.expense_account_id as parent_expense_account_id
-    from {{ref('stg_quickbooks__item')}} item
+    from {{ ref('stg_quickbooks__item') }} item
 
-    left join {{ref('stg_quickbooks__item')}} parent
+    left join {{ ref('stg_quickbooks__item') }} parent
         on item.parent_item_id = parent.item_id
 ),
 
@@ -32,7 +32,7 @@ purchase_join as (
         case when coalesce(purchases.credit, false) = true then 'debit' else 'credit' end as payed_from_transaction_type,
         case when coalesce(purchases.credit, false) = true then 'credit' else 'debit' end as payed_to_transaction_type,
         purchases.customer_id,
-        coalesce(purchase_lines.account_expense_class_id, purchase_lines.item_expense_class_id) as class_id,
+        coalesce(purchase_lines.item_expense_class_id, purchase_lines.account_expense_class_id) as class_id,
         purchases.vendor_id
     from purchases
 

models/double_entry_transactions/int_quickbooks__refund_receipt_double_entry.sql

@@ -7,21 +7,21 @@ Table that creates a debit record to the specified asset account and a credit re
 
 with refund_receipts as (
     select *
-    from {{ref('stg_quickbooks__refund_receipt')}}
+    from {{ ref('stg_quickbooks__refund_receipt') }}
 ),
 
 refund_receipt_lines as (
     select *
-    from {{ref('stg_quickbooks__refund_receipt_line')}}
+    from {{ ref('stg_quickbooks__refund_receipt_line') }}
 ),
 
 items as (
     select 
         item.*, 
         parent.income_account_id as parent_income_account_id
-    from {{ref('stg_quickbooks__item')}} item
+    from {{ ref('stg_quickbooks__item') }} item
 
-    left join {{ref('stg_quickbooks__item')}} parent
+    left join {{ ref('stg_quickbooks__item') }} parent
         on item.parent_item_id = parent.item_id
 ),
 
@@ -34,7 +34,7 @@ refund_receipt_join as (
         refund_receipts.deposit_to_account_id as credit_to_account_id,
         coalesce(refund_receipt_lines.discount_account_id, refund_receipt_lines.sales_item_account_id, items.parent_income_account_id, items.income_account_id) as debit_account_id,
         refund_receipts.customer_id,
-        coalesce(refund_receipts.class_id, refund_receipt_lines.sales_item_class_id, refund_receipt_lines.discount_class_id) as class_id
+        coalesce(refund_receipt_lines.sales_item_class_id, refund_receipt_lines.discount_class_id, refund_receipts.class_id) as class_id
     from refund_receipts
 
     inner join refund_receipt_lines

models/double_entry_transactions/int_quickbooks__sales_receipt_double_entry.sql

@@ -7,21 +7,21 @@ Table that creates a debit record to the specified cash account and a credit rec
 
 with sales_receipts as (
     select *
-    from {{ref('stg_quickbooks__sales_receipt')}}
+    from {{ ref('stg_quickbooks__sales_receipt') }}
 ),
 
 sales_receipt_lines as (
     select *
-    from {{ref('stg_quickbooks__sales_receipt_line')}}
+    from {{ ref('stg_quickbooks__sales_receipt_line') }}
 ),
 
 items as (
     select 
         item.*, 
         parent.income_account_id as parent_income_account_id
-    from {{ref('stg_quickbooks__item')}} item
+    from {{ ref('stg_quickbooks__item') }} item
 
-    left join {{ref('stg_quickbooks__item')}} parent
+    left join {{ ref('stg_quickbooks__item') }} parent
         on item.parent_item_id = parent.item_id
 ),
 
@@ -34,7 +34,7 @@ sales_receipt_join as (
         sales_receipts.deposit_to_account_id as debit_to_account_id,
         coalesce(sales_receipt_lines.discount_account_id, sales_receipt_lines.sales_item_account_id, items.parent_income_account_id, items.income_account_id) as credit_to_account_id,
         sales_receipts.customer_id,
-        coalesce(sales_receipts.class_id, sales_receipt_lines.sales_item_class_id, sales_receipt_lines.discount_class_id) as class_id
+        coalesce(sales_receipt_lines.sales_item_class_id, sales_receipt_lines.discount_class_id, sales_receipts.class_id) as class_id
     from sales_receipts
 
     inner join sales_receipt_lines

models/double_entry_transactions/int_quickbooks__transfer_double_entry.sql

@@ -7,7 +7,7 @@ Table that creates a debit record to the receiveing account and a credit record
 
 with transfers as (
     select *
-    from {{ref('stg_quickbooks__transfer')}}
+    from {{ ref('stg_quickbooks__transfer') }}
 ),
 
 transfer_body as (

models/double_entry_transactions/int_quickbooks__vendor_credit_double_entry.sql

@@ -7,21 +7,21 @@ Table that creates a debit record to payable account and a credit record to the
 
 with vendor_credits as (
     select *
-    from {{ref('stg_quickbooks__vendor_credit')}}
+    from {{ ref('stg_quickbooks__vendor_credit') }}
 ),
 
 vendor_credit_lines as (
     select *
-    from {{ref('stg_quickbooks__vendor_credit_line')}}
+    from {{ ref('stg_quickbooks__vendor_credit_line') }}
 ),
 
 items as (
     select 
         item.*, 
         parent.income_account_id as parent_income_account_id
-    from {{ref('stg_quickbooks__item')}} item
+    from {{ ref('stg_quickbooks__item') }} item
 
-    left join {{ref('stg_quickbooks__item')}} parent
+    left join {{ ref('stg_quickbooks__item') }} parent
         on item.parent_item_id = parent.item_id
 ),
 
@@ -34,7 +34,7 @@ vendor_credit_join as (
         vendor_credits.payable_account_id as debit_to_account_id,
         coalesce(vendor_credit_lines.account_expense_account_id, items.parent_income_account_id, items.income_account_id, items.expense_account_id) as credit_account_id,
         coalesce(account_expense_customer_id, item_expense_customer_id) as customer_id,
-        coalesce(account_expense_class_id, item_expense_class_id) as class_id,
+        coalesce(item_expense_class_id, account_expense_class_id) as class_id,
         vendor_credits.vendor_id
     from vendor_credits
 

models/intermediate/int_quickbooks__bill_join.sql

@@ -3,27 +3,27 @@
 
 with bills as (
     select *
-    from {{ref('stg_quickbooks__bill')}}
+    from {{ ref('stg_quickbooks__bill') }}
 ),
 
 bill_lines as (
     select *
-    from {{ref('stg_quickbooks__bill_line')}}
+    from {{ ref('stg_quickbooks__bill_line') }}
 ),
 
 bills_linked as (
     select *
-    from {{ref('stg_quickbooks__bill_linked_txn')}}
+    from {{ ref('stg_quickbooks__bill_linked_txn') }}
 ),
 
 bill_payments as (
     select *
-    from {{ref('stg_quickbooks__bill_payment')}}
+    from {{ ref('stg_quickbooks__bill_payment') }}
 ),
 
 bill_payment_lines as (
     select *
-    from {{ref('stg_quickbooks__bill_payment_line')}}
+    from {{ ref('stg_quickbooks__bill_payment_line') }}
 
     where bill_id is not null
 ),

models/intermediate/int_quickbooks__general_ledger_balances.sql

@@ -20,12 +20,13 @@ gl_period_balance as (
         account_sub_type,
         financial_statement_helper,
         account_class,
+        class_id,
         cast({{ dbt.date_trunc("year", "transaction_date") }} as date) as date_year,
         cast({{ dbt.date_trunc("month", "transaction_date") }} as date) as date_month,
         sum(adjusted_amount) as period_balance
     from general_ledger
 
-    {{ dbt_utils.group_by(12) }}
+    {{ dbt_utils.group_by(13) }}
 ),
 
 gl_cumulative_balance as (
@@ -50,6 +51,7 @@ gl_beginning_balance as (
         account_sub_type,
         financial_statement_helper,
         account_class,
+        class_id,
         date_year,
         date_month, 
         period_balance as period_net_change,
@@ -72,6 +74,7 @@ gl_patch as (
         coalesce(gl_beginning_balance.account_type, gl_accounting_periods.account_type) as account_type,
         coalesce(gl_beginning_balance.account_sub_type, gl_accounting_periods.account_sub_type) as account_sub_type,
         coalesce(gl_beginning_balance.account_class, gl_accounting_periods.account_class) as account_class,
+        coalesce(gl_beginning_balance.class_id, gl_accounting_periods.class_id) as class_id,
         coalesce(gl_beginning_balance.financial_statement_helper, gl_accounting_periods.financial_statement_helper) as financial_statement_helper,
         coalesce(gl_beginning_balance.date_year, gl_accounting_periods.date_year) as date_year,
         gl_accounting_periods.period_first_day,
@@ -118,6 +121,7 @@ final as (
         account_type,
         account_sub_type,
         account_class,
+        class_id,
         financial_statement_helper,
         date_year,
         period_first_day,

models/intermediate/int_quickbooks__general_ledger_date_spine.sql

@@ -78,6 +78,7 @@ final as (
         general_ledger.account_sub_type,
         general_ledger.account_class,
         general_ledger.financial_statement_helper,
+        general_ledger.class_id,
         date_spine.date_year,
         date_spine.period_first_day,
         date_spine.period_last_day,