Merge pull request #12 from fivetran/feature/customer-vendor-gl

customer and vendor id additions to gl
fivetran · Jul 1, 2021 · 00cfd60 · 00cfd60
2 parents 48e2fbf + a3f3e6b
commit 00cfd60
Show file tree

Hide file tree

Showing 18 changed files with 22 additions and 22 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -37,9 +37,9 @@ 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,
         description

diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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,