From 9641623a579c1ecb6a95254f5e6589e5114750a2 Mon Sep 17 00:00:00 2001 From: fivetran-joemarkiewicz Date: Wed, 23 Jun 2021 15:14:34 -0500 Subject: [PATCH 1/2] customer and vendor id additions to gl --- dbt_project.yml | 2 +- integration_tests/data/bill_line_data.csv | 2 +- integration_tests/data/bill_payment_line_data.csv | 2 +- integration_tests/dbt_project.yml | 2 +- models/stg_quickbooks__bill_line.sql | 6 +++--- models/stg_quickbooks__bill_payment.sql | 2 +- models/stg_quickbooks__credit_memo.sql | 2 +- models/stg_quickbooks__customer.sql | 2 +- models/stg_quickbooks__deposit_line.sql | 2 +- models/stg_quickbooks__invoice.sql | 2 +- models/stg_quickbooks__journal_entry_line.sql | 2 +- models/stg_quickbooks__payment.sql | 2 +- models/stg_quickbooks__purchase.sql | 2 +- models/stg_quickbooks__purchase_line.sql | 4 ++-- models/stg_quickbooks__purchase_order_line.sql | 4 ++-- models/stg_quickbooks__refund_receipt.sql | 2 +- models/stg_quickbooks__sales_receipt.sql | 2 +- models/stg_quickbooks__vendor_credit_line.sql | 4 ++-- 18 files changed, 23 insertions(+), 23 deletions(-) diff --git a/dbt_project.yml b/dbt_project.yml index dd136a1..4f556f5 100644 --- a/dbt_project.yml +++ b/dbt_project.yml @@ -1,7 +1,7 @@ config-version: 2 name: 'quickbooks_source' -version: '0.2.1' +version: '0.2.2' require-dbt-version: [">=0.18.0", "<0.20.0"] diff --git a/integration_tests/data/bill_line_data.csv b/integration_tests/data/bill_line_data.csv index 578a031..1997285 100644 --- a/integration_tests/data/bill_line_data.csv +++ b/integration_tests/data/bill_line_data.csv @@ -1,5 +1,5 @@ bill_id,index,_fivetran_synced,account_expense_account_id,account_expense_billable_status,account_expense_class_id,account_expense_customer_id,account_expense_tax_amount,account_expense_tax_code_id,amount,description,item_expense_billable_status,item_expense_class_id,item_expense_customer_id,item_expense_item_id,item_expense_quantity,item_expense_tax_code_id,item_expense_unit_price -126,0,2020-11-03 17:02:04,10,8f7d086bb399bd5291915511d499a09d,,,,7624ad70a400ab16bed0602ac396f02b,448,12464a83d7d20dc285c654396b6c6fd2,,,,,,, +126,0,2020-11-03 17:02:04,10,8f7d086bb399bd5291915511d499a09d,,,,7624ad70a400ab16bed0602ac396f02b,448.25,12464a83d7d20dc285c654396b6c6fd2,,,,,,, 401,0,2020-12-17 19:32:00,12,8f7d086bb399bd5291915511d499a09d,,,,7624ad70a400ab16bed0602ac396f02b,1386,57c19a9b03e7f423a52d9a298fb12b34,,,,,,, 400,0,2020-12-17 19:32:00,12,8f7d086bb399bd5291915511d499a09d,,,,7624ad70a400ab16bed0602ac396f02b,228,8fbf4eb7affb3dc89cc1427533d3075c,,,,,,, 410,0,2020-12-17 20:32:02,12,8f7d086bb399bd5291915511d499a09d,,,,7624ad70a400ab16bed0602ac396f02b,1477,6b80bbb500d5cddcd0d5cd64df631736,,,,,,, diff --git a/integration_tests/data/bill_payment_line_data.csv b/integration_tests/data/bill_payment_line_data.csv index f6b5669..9355c0c 100644 --- a/integration_tests/data/bill_payment_line_data.csv +++ b/integration_tests/data/bill_payment_line_data.csv @@ -1,5 +1,5 @@ bill_payment_id,index,_fivetran_synced,amount,bill_id,check_id,credit_card_charge_id,credit_card_credit_id,deposit_id,expense_id,journal_entry_id,linked_bill_payment_id,vendor_credit_id,bill_payment_credit_card_id -23,0,2020-05-20 14:03:30,38757,19,,,,,,,,, +23,0,2020-05-20 14:03:30,38757,19.25,,,,,,,,, 135,0,2020-11-01 16:02:01,79137,124,,,,,,,,, 90,0,2020-09-01 16:02:12,74592,89,,,,,,,,, 276,0,2020-12-01 16:02:03,88155,268,,,,,,,,, diff --git a/integration_tests/dbt_project.yml b/integration_tests/dbt_project.yml index a6f4208..a2ea72a 100644 --- a/integration_tests/dbt_project.yml +++ b/integration_tests/dbt_project.yml @@ -1,5 +1,5 @@ name: 'quickbooks_source_integration_tests' -version: '0.2.1' +version: '0.2.2' profile: 'integration_tests' config-version: 2 diff --git a/models/stg_quickbooks__bill_line.sql b/models/stg_quickbooks__bill_line.sql index 9a9775e..be8794f 100644 --- a/models/stg_quickbooks__bill_line.sql +++ b/models/stg_quickbooks__bill_line.sql @@ -37,11 +37,11 @@ final as ( account_expense_class_id, account_expense_billable_status, account_expense_tax_code_id, - account_expense_customer_id, + cast(account_expense_customer_id as {{ dbt_utils.type_int() }}) as account_expense_customer_id, cast(item_expense_item_id as {{ dbt_utils.type_int() }}) as item_expense_item_id, - item_expense_customer_id, + cast(item_expense_customer_id as {{ dbt_utils.type_int() }}) as item_expense_customer_id, item_expense_billable_status, - amount, + cast(amount as {{ dbt_utils.type_numeric() }}) as amount, description from fields ) diff --git a/models/stg_quickbooks__bill_payment.sql b/models/stg_quickbooks__bill_payment.sql index 3fe3fe8..4152825 100644 --- a/models/stg_quickbooks__bill_payment.sql +++ b/models/stg_quickbooks__bill_payment.sql @@ -41,7 +41,7 @@ final as ( pay_type, total_amount, transaction_date, - vendor_id, + cast(vendor_id as {{ dbt_utils.type_int() }}) as vendor_id, _fivetran_deleted from fields ) diff --git a/models/stg_quickbooks__credit_memo.sql b/models/stg_quickbooks__credit_memo.sql index d96f228..e929bdc 100644 --- a/models/stg_quickbooks__credit_memo.sql +++ b/models/stg_quickbooks__credit_memo.sql @@ -38,7 +38,7 @@ final as ( currency_id, class_id, department_id, - customer_id, + cast(customer_id as {{ dbt_utils.type_int() }}) as customer_id, exchange_rate, transaction_date, _fivetran_deleted diff --git a/models/stg_quickbooks__customer.sql b/models/stg_quickbooks__customer.sql index c813d1d..f9e2e0d 100644 --- a/models/stg_quickbooks__customer.sql +++ b/models/stg_quickbooks__customer.sql @@ -28,7 +28,7 @@ fields as ( final as ( select - id as customer_id, + cast(id as {{ dbt_utils.type_int() }}) as customer_id, active as is_active, balance, balance_with_jobs, diff --git a/models/stg_quickbooks__deposit_line.sql b/models/stg_quickbooks__deposit_line.sql index 0b6c084..aabc414 100644 --- a/models/stg_quickbooks__deposit_line.sql +++ b/models/stg_quickbooks__deposit_line.sql @@ -37,7 +37,7 @@ final as ( description, cast(deposit_account_id as {{ dbt_utils.type_int() }}) as deposit_account_id, deposit_class_id, - deposit_customer_id + cast(deposit_customer_id as {{ dbt_utils.type_int() }}) as deposit_customer_id from fields ) diff --git a/models/stg_quickbooks__invoice.sql b/models/stg_quickbooks__invoice.sql index afb50f2..21c4303 100644 --- a/models/stg_quickbooks__invoice.sql +++ b/models/stg_quickbooks__invoice.sql @@ -40,7 +40,7 @@ final as ( cast(deposit_to_account_id as {{ dbt_utils.type_int() }}) as deposit_to_account_id, exchange_rate, transaction_date, - customer_id, + cast(customer_id as {{ dbt_utils.type_int() }}) as customer_id, billing_address_id, shipping_address_id, delivery_type, diff --git a/models/stg_quickbooks__journal_entry_line.sql b/models/stg_quickbooks__journal_entry_line.sql index fab4a48..9c26acf 100644 --- a/models/stg_quickbooks__journal_entry_line.sql +++ b/models/stg_quickbooks__journal_entry_line.sql @@ -35,7 +35,7 @@ final as ( index, cast(account_id as {{ dbt_utils.type_int() }}) as account_id, amount, - customer_id, + cast(customer_id as {{ dbt_utils.type_int() }}) as customer_id, department_id, class_id, description, diff --git a/models/stg_quickbooks__payment.sql b/models/stg_quickbooks__payment.sql index ba6ed26..bcd0742 100644 --- a/models/stg_quickbooks__payment.sql +++ b/models/stg_quickbooks__payment.sql @@ -39,7 +39,7 @@ final as ( cast(deposit_to_account_id as {{ dbt_utils.type_int() }}) as deposit_to_account_id, exchange_rate, transaction_date, - customer_id, + cast(customer_id as {{ dbt_utils.type_int() }}) as customer_id, _fivetran_deleted from fields ) diff --git a/models/stg_quickbooks__purchase.sql b/models/stg_quickbooks__purchase.sql index 180f433..bbeb9f3 100644 --- a/models/stg_quickbooks__purchase.sql +++ b/models/stg_quickbooks__purchase.sql @@ -38,7 +38,7 @@ final as ( total_amount, payment_type, department_id, - customer_id, + cast(customer_id as {{ dbt_utils.type_int() }}) as customer_id, cast(vendor_id as {{ dbt_utils.type_int() }}) as vendor_id, transaction_date, _fivetran_deleted diff --git a/models/stg_quickbooks__purchase_line.sql b/models/stg_quickbooks__purchase_line.sql index c188241..be606cc 100644 --- a/models/stg_quickbooks__purchase_line.sql +++ b/models/stg_quickbooks__purchase_line.sql @@ -33,11 +33,11 @@ final as ( cast(account_expense_account_id as {{ dbt_utils.type_int() }}) as account_expense_account_id, account_expense_class_id, account_expense_billable_status, - account_expense_customer_id, + cast(account_expense_customer_id as {{ dbt_utils.type_int() }}) as account_expense_customer_id, account_expense_tax_code_id, cast(item_expense_item_id as {{ dbt_utils.type_int() }}) as item_expense_item_id, item_expense_billable_status, - item_expense_customer_id, + cast(item_expense_customer_id as {{ dbt_utils.type_int() }}) as item_expense_customer_id, amount, description from fields diff --git a/models/stg_quickbooks__purchase_order_line.sql b/models/stg_quickbooks__purchase_order_line.sql index 53deaa0..7c74306 100644 --- a/models/stg_quickbooks__purchase_order_line.sql +++ b/models/stg_quickbooks__purchase_order_line.sql @@ -36,11 +36,11 @@ final as ( cast(account_expense_account_id as {{ dbt_utils.type_int() }}) as account_expense_account_id, account_expense_class_id, account_expense_billable_status, - account_expense_customer_id, + cast(account_expense_customer_id as {{ dbt_utils.type_int() }}) as account_expense_customer_id, account_expense_tax_code_id, cast(item_expense_item_id as {{ dbt_utils.type_int() }}) as item_expense_item_id, item_expense_billable_status, - item_expense_customer_id, + cast(item_expense_customer_id as {{ dbt_utils.type_int() }}) as item_expense_customer_id, amount, description from fields diff --git a/models/stg_quickbooks__refund_receipt.sql b/models/stg_quickbooks__refund_receipt.sql index 9e42675..d5a82da 100644 --- a/models/stg_quickbooks__refund_receipt.sql +++ b/models/stg_quickbooks__refund_receipt.sql @@ -39,7 +39,7 @@ final as ( cast(deposit_to_account_id as {{ dbt_utils.type_int() }}) as deposit_to_account_id, created_at, department_id, - customer_id, + cast(customer_id as {{ dbt_utils.type_int() }}) as customer_id, currency_id, exchange_rate, transaction_date, diff --git a/models/stg_quickbooks__sales_receipt.sql b/models/stg_quickbooks__sales_receipt.sql index c1f5d1f..ead30fc 100644 --- a/models/stg_quickbooks__sales_receipt.sql +++ b/models/stg_quickbooks__sales_receipt.sql @@ -36,7 +36,7 @@ final as ( total_amount, cast(deposit_to_account_id as {{ dbt_utils.type_int() }}) as deposit_to_account_id, created_at, - customer_id, + cast(customer_id as {{ dbt_utils.type_int() }}) as customer_id, department_id, class_id, currency_id, diff --git a/models/stg_quickbooks__vendor_credit_line.sql b/models/stg_quickbooks__vendor_credit_line.sql index cd5ca3c..35d44c6 100644 --- a/models/stg_quickbooks__vendor_credit_line.sql +++ b/models/stg_quickbooks__vendor_credit_line.sql @@ -33,12 +33,12 @@ final as ( select cast(vendor_credit_id as {{ dbt_utils.type_int() }}) as vendor_credit_id, index, - account_expense_customer_id, + cast(account_expense_customer_id as {{ dbt_utils.type_int() }}) as account_expense_customer_id, cast(account_expense_account_id as {{ dbt_utils.type_int() }}) as account_expense_account_id, account_expense_billable_status, account_expense_tax_code_id, account_expense_class_id, - item_expense_customer_id, + cast(item_expense_customer_id as {{ dbt_utils.type_int() }}) as item_expense_customer_id, cast(item_expense_item_id as {{ dbt_utils.type_int() }}) as item_expense_item_id, item_expense_quantity, item_expense_unit_price, From a3f3e6bf76027b1360dd1a9cc36773fa32b889d5 Mon Sep 17 00:00:00 2001 From: fivetran-joemarkiewicz Date: Wed, 23 Jun 2021 15:16:40 -0500 Subject: [PATCH 2/2] cast not needed for amount --- models/stg_quickbooks__bill_line.sql | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/models/stg_quickbooks__bill_line.sql b/models/stg_quickbooks__bill_line.sql index be8794f..c638e0a 100644 --- a/models/stg_quickbooks__bill_line.sql +++ b/models/stg_quickbooks__bill_line.sql @@ -41,7 +41,7 @@ final as ( cast(item_expense_item_id as {{ dbt_utils.type_int() }}) as item_expense_item_id, cast(item_expense_customer_id as {{ dbt_utils.type_int() }}) as item_expense_customer_id, item_expense_billable_status, - cast(amount as {{ dbt_utils.type_numeric() }}) as amount, + amount, description from fields )