Compare commits

..

8 Commits

Author SHA1 Message Date
79bbda884c Save all unmatched transfers as regular transactions
Some checks failed
continuous-integration/drone/push Build is passing
continuous-integration/drone/pr Build is failing
2022-01-10 10:02:07 +00:00
0583d69c4a Fix logging wrong objects 2022-01-10 10:01:47 +00:00
2f75aae2a0 Also fetch GroupID and highlight groups in transactions-view 2022-01-10 10:01:35 +00:00
68a5153481 Fix migration 2022-01-09 22:31:18 +00:00
6dae0cfa4c Reword clear actions description 2022-01-09 22:30:06 +00:00
f0c3caaa79 Implement matching 2022-01-09 22:29:56 +00:00
0184cbd9cd Add group_id 2022-01-09 22:29:47 +00:00
332f587bcf Include all accounts
Before this change, accounts without transactions in the specified timespan had not been included
2022-01-09 22:29:11 +00:00
2 changed files with 2 additions and 4 deletions

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
` `

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;