Skip to content

Commit

Permalink
Merge pull request #53 from fivetran/feature/add-home-total-amount-to…
Browse files Browse the repository at this point in the history
…-deposit

Feature: Add `home_total_amount` to the `stg_quickbooks__deposit` model
  • Loading branch information
fivetran-avinash authored Jul 22, 2024
2 parents 7a2ef84 + 5fb0918 commit 6ea8f21
Show file tree
Hide file tree
Showing 19 changed files with 78 additions and 94 deletions.
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE/bug-report.yml
Original file line number Diff line number Diff line change
Expand Up @@ -83,6 +83,6 @@ body:
description: Our team will assess this issue and let you know if we will add it to a future sprint. However, if you would like to expedite the solution, we encourage you to contribute to the package via a PR. Our team will then work with you to approve and merge your contributions as soon as possible.
options:
- label: Yes.
- label: Yes, but I will need assistance and will schedule time during our [office hours](https://calendly.com/fivetran-solutions-team/fivetran-solutions-team-office-hours) for guidance
- label: Yes, but I will probably need assistance.
- label: No.
required: false
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE/feature-request.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ body:
description: Our team will assess this feature and let you know if we will add it to a future sprint. However, if you would like to expedite the feature, we encourage you to contribute to the package via a PR. Our team will then work with you to approve and merge your contributions as soon as possible.
options:
- label: Yes.
- label: Yes, but I will need assistance and will schedule time during your [office hours](https://calendly.com/fivetran-solutions-team/fivetran-solutions-team-office-hours) for guidance.
- label: Yes, but I will probably need assistance.
- label: No.
required: false
- type: textarea
Expand Down
43 changes: 11 additions & 32 deletions .github/PULL_REQUEST_TEMPLATE/maintainer_pull_request_template.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,48 +4,27 @@
**This PR will result in the following new package version:**
<!--- Please add details around your decision for breaking vs non-breaking version upgrade. If this is a breaking change, were backwards-compatible options explored? -->

**Please detail what change(s) this PR introduces and any additional information that should be known during the review of this PR:**
**Please provide the finalized CHANGELOG entry which details the relevant changes included in this PR:**
<!--- Copy/paste the CHANGELOG for this version below. -->

## PR Checklist
### Basic Validation
Please acknowledge that you have successfully performed the following commands locally:
- [ ] dbt compile
- [ ] dbt run –full-refresh
- [ ] dbt run
- [ ] dbt test
- [ ] dbt run –vars (if applicable)
- [ ] dbt run –full-refresh && dbt test
- [ ] dbt run (if incremental models are present) && dbt test

Before marking this PR as "ready for review" the following have been applied:
- [ ] The appropriate issue has been linked and tagged
- [ ] You are assigned to the corresponding issue and this PR
- [ ] The appropriate issue has been linked, tagged, and properly assigned
- [ ] All necessary documentation and version upgrades have been applied
<!--- Be sure to update the package version in the dbt_project.yml, integration_tests/dbt_project.yml, and README if necessary. -->
- [ ] docs were regenerated (unless this PR does not include any code or yml updates)
- [ ] BuildKite integration tests are passing
- [ ] Detailed validation steps have been provided below

### Detailed Validation
Please acknowledge that the following validation checks have been performed prior to marking this PR as "ready for review":
- [ ] You have validated these changes and assure this PR will address the respective Issue/Feature.
- [ ] You are reasonably confident these changes will not impact any other components of this package or any dependent packages.
- [ ] You have provided details below around the validation steps performed to gain confidence in these changes.
Please share any and all of your validation steps:
<!--- Provide the steps you took to validate your changes below. -->

### Standard Updates
Please acknowledge that your PR contains the following standard updates:
- Package versioning has been appropriately indexed in the following locations:
- [ ] indexed within dbt_project.yml
- [ ] indexed within integration_tests/dbt_project.yml
- [ ] CHANGELOG has individual entries for each respective change in this PR
<!--- If there is a parallel upstream change, remember to reference the corresponding CHANGELOG as an individual entry. -->
- [ ] README updates have been applied (if applicable)
<!--- Remember to check the following README locations for common updates. →
<!--- Suggested install range (needed for breaking changes) →
<!--- Dependency matrix is appropriately updated (if applicable) →
<!--- New variable documentation (if applicable) -->
- [ ] DECISIONLOG updates have been updated (if applicable)
- [ ] Appropriate yml documentation has been added (if applicable)

### dbt Docs
Please acknowledge that after the above were all completed the below were applied to your branch:
- [ ] docs were regenerated (unless this PR does not include any code or yml updates)

### If you had to summarize this PR in an emoji, which would it be?
<!--- For a complete list of markdown compatible emojis check our this git repo (https://gist.github.com/rxaviers/7360908) -->
:dancer:
:dancer:
13 changes: 13 additions & 0 deletions .github/workflows/auto-release.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
name: 'auto release'
on:
pull_request:
types:
- closed
branches:
- main

jobs:
call-workflow-passing-data:
if: github.event.pull_request.merged
uses: fivetran/dbt_package_automations/.github/workflows/auto-release.yml@main
secrets: inherit
35 changes: 0 additions & 35 deletions .github/workflows/check_docs.yml

This file was deleted.

4 changes: 3 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,6 @@ dbt_modules/
logs/
.DS_Store
integration_tests/.DS_Store
dbt_packages/
dbt_packages/
env/
package-lock.yml
16 changes: 16 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,19 @@
# dbt_quickbooks_source v0.10.1
[PR #53](https://github.com/fivetran/dbt_quickbooks_source/pull/53) introduces the following updates:

## 🎉 Feature Update 🎉
- Added the following fields to support the new multicurrency feature in the [v0.14.0 release of the `dbt_quickbooks` package](https://github.com/fivetran/dbt_quickbooks/releases/tag/v0.14.0):
- `home_total_amount`, into `stg_quickbooks__deposit`.
- `exchange_rate`, into `stg_quickbooks__estimate`.

## 🚘 Under the Hood 🚘
- Included auto-releaser GitHub Actions workflow to automate future releases.
- Updated the maintainer PR template to resemble the most up to date format.
- Removed the check docs GitHub Action as it is no longer necessary.

## Documentation Update
- Added `exchange_rate` and `home_total_amount` fields and descriptions into the relevant yml documents.

# dbt_quickbooks_source v0.10.0

## 🚨 Breaking Change 🚨 :
Expand Down
3 changes: 1 addition & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -157,5 +157,4 @@ We highly encourage and welcome contributions to this package. Check out [this d

# 🏪 Are there any resources available?
- If you have questions or want to reach out for help, please refer to the [GitHub Issue](https://github.com/fivetran/dbt_quickbooks_source/issues/new/choose) section to find the right avenue of support for you.
- If you would like to provide feedback to the dbt package team at Fivetran or would like to request a new dbt package, fill out our [Feedback Form](https://www.surveymonkey.com/r/DQ7K7WW).
- Have questions or want to be part of the community discourse? Create a post in the [Fivetran community](https://community.fivetran.com/t5/user-group-for-dbt/gh-p/dbt-user-group) and our team along with the community can join in on the discussion!
- If you would like to provide feedback to the dbt package team at Fivetran or would like to request a new dbt package, fill out our [Feedback Form](https://www.surveymonkey.com/r/DQ7K7WW).
2 changes: 1 addition & 1 deletion dbt_project.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
config-version: 2
name: 'quickbooks_source'

version: '0.10.0'
version: '0.10.1'

require-dbt-version: [">=1.3.0", "<2.0.0"]

Expand Down
2 changes: 1 addition & 1 deletion docs/catalog.json

Large diffs are not rendered by default.

24 changes: 12 additions & 12 deletions docs/index.html

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion docs/manifest.json

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion docs/run_results.json

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion integration_tests/dbt_project.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
name: 'quickbooks_source_integration_tests'
version: '0.10.0'
version: '0.10.1'


profile: 'integration_tests'
Expand Down
10 changes: 5 additions & 5 deletions integration_tests/seeds/deposit_data.csv
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
id,_fivetran_deleted,_fivetran_synced,account_id,cash_back_account_id,cash_back_amount,cash_back_memo,created_at,currency_id,department_id,global_tax_calculation,home_total_amount,private_note,sync_token,total_amount,transaction_date,transaction_source,transaction_status,updated_at
66,TRUE,2020-11-03 17:02:05,,,,,2020-07-15 20:03:21,USD,,,,,,,,,,2020-07-15 20:03:21
65,TRUE,2020-11-03 17:02:05,,,,,2020-07-15 20:03:20,USD,,,,,,,,,,2020-07-15 20:03:20
3,FALSE,2020-06-23 3:58:58,28,,,,2020-05-08 14:33:48,USD,,,,d55463e9a1eebb27bbf123906cd732d3,0,26867,2020-03-27,,,2020-05-08 14:33:48
2,FALSE,2020-06-23 3:58:58,28,,,,2020-05-08 14:33:20,USD,,,,7705f28cac4ed281fca93f2d6047ac67,0,96766,2020-03-27,,,2020-05-08 14:33:20
31,FALSE,2020-06-23 3:58:58,28,,,,2020-05-28 13:09:23,USD,,,,906b6741066b841342224242068cf2dc,0,23039,2020-04-20,,,2020-05-28 13:09:23
79,FALSE,2020-08-06 18:31:59,28,,,,2020-08-06 18:28:45,USD,,,,3ef789b0719133953ab39ea39c75ee7e,0,62931,2020-07-23,,,2020-08-06 18:28:45
137,FALSE,2020-11-10 21:02:04,28,,,,2020-11-03 16:57:25,USD,,,,714c8fcbb71513414ad57c0895031129,1,24943,2020-10-28,,,2020-11-10 20:52:40
3,FALSE,2020-06-23 3:58:58,28,,,,2020-05-08 14:33:48,USD,,,26867,d55463e9a1eebb27bbf123906cd732d3,0,26867,2020-03-27,,,2020-05-08 14:33:48
2,FALSE,2020-06-23 3:58:58,28,,,,2020-05-08 14:33:20,USD,,,96766,7705f28cac4ed281fca93f2d6047ac67,0,96766,2020-03-27,,,2020-05-08 14:33:20
31,FALSE,2020-06-23 3:58:58,28,,,,2020-05-28 13:09:23,USD,,,23039,906b6741066b841342224242068cf2dc,0,23039,2020-04-20,,,2020-05-28 13:09:23
79,FALSE,2020-08-06 18:31:59,28,,,,2020-08-06 18:28:45,USD,,,62931,3ef789b0719133953ab39ea39c75ee7e,0,62931,2020-07-23,,,2020-08-06 18:28:45
137,FALSE,2020-11-10 21:02:04,28,,,,2020-11-03 16:57:25,USD,,,24943,714c8fcbb71513414ad57c0895031129,1,24943,2020-10-28,,,2020-11-10 20:52:40
4 changes: 4 additions & 0 deletions models/src_quickbooks.yml
Original file line number Diff line number Diff line change
Expand Up @@ -380,6 +380,8 @@ sources:
description: Date of the day which the deposit transaction occurred.
- name: transaction_status
description: Status of the deposit transaction.
- name: home_total_amount
description: Indicates the total amount of the transaction in the home currency. This includes the total of all the charges, allowances, and taxes.
- name: _fivetran_deleted
description: "{{ doc('_fivetran_deleted') }}"

Expand Down Expand Up @@ -407,6 +409,8 @@ sources:
description: Date of the day which the estimate occurred.
- name: transaction_status
description: Current status of the estimate.
- name: exchange_rate
description: The number of home currency units it takes to equal one unit of currency specified by currency_id.
- name: _fivetran_deleted
description: "{{ doc('_fivetran_deleted') }}"

Expand Down
4 changes: 4 additions & 0 deletions models/stg_quickbooks.yml
Original file line number Diff line number Diff line change
Expand Up @@ -479,6 +479,8 @@ models:
description: Reference to the currency in which all amounts on the associated transaction are expressed.
- name: total_amount
description: Indicates the total amount of the transaction. This includes the total of all the charges, allowances, and taxes.
- name: home_total_amount
description: Indicates the total amount of the transaction in the home currency. This includes the total of all the charges, allowances, and taxes.
- name: transaction_date
description: Date which the deposit transaction occurred.
- name: transaction_status
Expand Down Expand Up @@ -518,6 +520,8 @@ models:
description: Date which the estimate occurred.
- name: transaction_status
description: Current status of the estimate.
- name: exchange_rate
description: The number of home currency units it takes to equal one unit of currency specified by currency_id.
- name: _fivetran_deleted
description: Boolean created by Fivetran to indicate whether the record has been deleted.

Expand Down
1 change: 1 addition & 0 deletions models/stg_quickbooks__deposit.sql
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@ final as (
currency_id,
cast(department_id as {{ dbt.type_string() }}) as department_id,
total_amount,
home_total_amount,
cast( {{ dbt.date_trunc('day', 'transaction_date') }} as date) as transaction_date,
transaction_status,
_fivetran_deleted,
Expand Down
1 change: 1 addition & 0 deletions models/stg_quickbooks__estimate.sql
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,7 @@ final as (
customer_id,
cast(department_id as {{ dbt.type_string() }}) as department_id,
cast( {{ dbt.date_trunc('day', 'due_date') }} as date) as due_date,
exchange_rate,
total_amount,
cast( {{ dbt.date_trunc('day', 'transaction_date') }} as date) as transaction_date,
transaction_status,
Expand Down

0 comments on commit 6ea8f21

Please sign in to comment.