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

Handle on_budget in available balance

Browse Source
This commit is contained in:
Jan Bader 2021-12-07 21:00:14 +00:00
parent e3f3dc6748
commit cbda69e827
2 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
postgres/categories.sql.go
View File

@ -55,8 +55,10 @@ SELECT
FROM transactions FROM transactions
LEFT JOIN categories ON categories.id = transactions.category_id LEFT JOIN categories ON categories.id = transactions.category_id
LEFT JOIN budgets ON budgets.income_category_id = categories.id LEFT JOIN budgets ON budgets.income_category_id = categories.id
INNER JOIN accounts ON accounts.id = transactions.account_id
WHERE budgets.id = $1 WHERE budgets.id = $1
AND transactions.date < $2 AND transactions.date < $2
AND accounts.on_budget
) - ( ) - (
SELECT SUM(assignments.amount) SELECT SUM(assignments.amount)
FROM assignments FROM assignments

2
postgres/queries/categories.sql
View File

@ -66,8 +66,10 @@ SELECT
FROM transactions FROM transactions
LEFT JOIN categories ON categories.id = transactions.category_id LEFT JOIN categories ON categories.id = transactions.category_id
LEFT JOIN budgets ON budgets.income_category_id = categories.id LEFT JOIN budgets ON budgets.income_category_id = categories.id
INNER JOIN accounts ON accounts.id = transactions.account_id
WHERE budgets.id = @budget_id WHERE budgets.id = @budget_id
AND transactions.date < @from_date AND transactions.date < @from_date
AND accounts.on_budget
) - ( ) - (
SELECT SUM(assignments.amount) SELECT SUM(assignments.amount)
FROM assignments FROM assignments