jacob1123/budgeteer
1
1
Fork 0
Code Issues 12 Pull Requests 1 Packages Releases 1 Wiki Activity

Include all accounts
All checks were successful
continuous-integration/drone/push Build is passing
Details

Browse Source 
Before this change, accounts without transactions in the specified timespan had not been included
This commit is contained in:
Jan Bader 2022-01-09 22:29:11 +00:00
parent d71eb17092
commit 337d588c3c
2 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
postgres/accounts.sql.go
View File

@ -87,9 +87,8 @@ func (q *Queries) GetAccounts(ctx context.Context, budgetID uuid.UUID) ([]Accoun
const getAccountsWithBalance = `-- name: GetAccountsWithBalance :many const getAccountsWithBalance = `-- name: GetAccountsWithBalance :many
SELECT accounts.id, accounts.name, accounts.on_budget, SUM(transactions.amount)::decimal(12,2) as balance SELECT accounts.id, accounts.name, accounts.on_budget, SUM(transactions.amount)::decimal(12,2) as balance
FROM accounts FROM accounts
LEFT JOIN transactions ON transactions.account_id = accounts.id LEFT JOIN transactions ON transactions.account_id = accounts.id AND transactions.date < NOW()
WHERE accounts.budget_id = $1 WHERE accounts.budget_id = $1
AND transactions.date < NOW()
GROUP BY accounts.id, accounts.name GROUP BY accounts.id, accounts.name
ORDER BY accounts.name ORDER BY accounts.name
` `

3
postgres/queries/accounts.sql
View File

@ -16,8 +16,7 @@ ORDER BY accounts.name;
-- name: GetAccountsWithBalance :many -- name: GetAccountsWithBalance :many
SELECT accounts.id, accounts.name, accounts.on_budget, SUM(transactions.amount)::decimal(12,2) as balance SELECT accounts.id, accounts.name, accounts.on_budget, SUM(transactions.amount)::decimal(12,2) as balance
FROM accounts FROM accounts
LEFT JOIN transactions ON transactions.account_id = accounts.id LEFT JOIN transactions ON transactions.account_id = accounts.id AND transactions.date < NOW()
WHERE accounts.budget_id = $1 WHERE accounts.budget_id = $1
AND transactions.date < NOW()
GROUP BY accounts.id, accounts.name GROUP BY accounts.id, accounts.name
ORDER BY accounts.name; ORDER BY accounts.name;