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

Also load available last month

Browse Source
This commit is contained in:
Jan Bader 2021-12-08 15:15:47 +00:00
parent 7cb7527704
commit 11179a1593
2 changed files with 34 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
postgres/categories.sql.go
View File

@ -165,12 +165,13 @@ type GetCategoriesWithBalanceParams struct {
}
type GetCategoriesWithBalanceRow struct {
ID uuid.UUID
Name string
Group string
Available Numeric
Activity Numeric
Assigned Numeric
ID uuid.UUID
Name string
Group string
Available Numeric
AvailableLastMonth Numeric
Activity Numeric
Assigned Numeric
}
func (q *Queries) GetCategoriesWithBalance(ctx context.Context, arg GetCategoriesWithBalanceParams) ([]GetCategoriesWithBalanceRow, error) {
@ -187,6 +188,7 @@ func (q *Queries) GetCategoriesWithBalance(ctx context.Context, arg GetCategorie
&i.Name,
&i.Group,
&i.Available,
&i.AvailableLastMonth,
&i.Activity,
&i.Assigned,
); err != nil {

57
postgres/queries/categories.sql
View File

@ -21,37 +21,32 @@ WHERE category_groups.budget_id = $1;
-- name: GetCategoriesWithBalance :many
SELECT categories.id, categories.name, category_groups.name as group,
(COALESCE(
(
SELECT SUM(a_hist.amount)
FROM assignments a_hist
WHERE categories.id = a_hist.category_id
AND a_hist.date < @to_date
)
, 0)+COALESCE(
(
SELECT SUM(t_hist.amount)
FROM transactions t_hist
WHERE categories.id = t_hist.category_id
AND t_hist.date < @to_date
)
, 0))::decimal(12,2) as available,
COALESCE(
(
SELECT SUM(t_this.amount)
FROM transactions t_this
WHERE categories.id = t_this.category_id
AND t_this.date >= @from_date AND t_this.date < @to_date
)
, 0)::decimal(12,2) as activity,
COALESCE(
(
SELECT SUM(a_hist.amount)
FROM assignments a_hist
WHERE categories.id = a_hist.category_id
AND a_hist.date >= @from_date AND a_hist.date < @to_date
)
,0)::decimal(12,2) as assigned
(
COALESCE((
SELECT SUM(a_hist.amount) FROM assignments a_hist
WHERE categories.id = a_hist.category_id AND a_hist.date < @to_date
), 0)+COALESCE((
SELECT SUM(t_hist.amount) FROM transactions t_hist
WHERE categories.id = t_hist.category_id AND t_hist.date < @to_date
), 0)
)::decimal(12,2) as available,
(
COALESCE((
SELECT SUM(a_hist.amount) FROM assignments a_hist
WHERE categories.id = a_hist.category_id AND a_hist.date < @from_date
), 0)+COALESCE((
SELECT SUM(t_hist.amount) FROM transactions t_hist
WHERE categories.id = t_hist.category_id AND t_hist.date < @from_date
), 0)
)::decimal(12,2) as available_last_month,
COALESCE((
SELECT SUM(t_this.amount) FROM transactions t_this
WHERE categories.id = t_this.category_id AND t_this.date >= @from_date AND t_this.date < @to_date
), 0)::decimal(12,2) as activity,
COALESCE((
SELECT SUM(a_hist.amount) FROM assignments a_hist
WHERE categories.id = a_hist.category_id AND a_hist.date >= @from_date AND a_hist.date < @to_date
), 0)::decimal(12,2) as assigned
FROM categories
INNER JOIN category_groups ON categories.category_group_id = category_groups.id