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

Merge balance and balanceassignments

Browse Source
This commit is contained in:
Jan Bader
2021-12-07 15:33:08 +00:00
parent 0b0b20c5ec
commit 6bcf94661e
3 changed files with 19 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
postgres/categories.sql.go
View File

@ -91,22 +91,21 @@ func (q *Queries) GetCategories(ctx context.Context, budgetID uuid.UUID) ([]GetC
const getCategoriesWithBalance = `-- name: GetCategoriesWithBalance :many
SELECT categories.id, categories.name, category_groups.name as group,
COALESCE(
(COALESCE(
(
SELECT SUM(a_hist.amount)
FROM assignments a_hist
WHERE categories.id = a_hist.category_id
AND a_hist.date < $1
)
, 0)::decimal(12,2) as balance_assignments,
COALESCE(
, 0)+COALESCE(
(
SELECT SUM(t_hist.amount)
FROM transactions t_hist
WHERE categories.id = t_hist.category_id
AND t_hist.date < $1
)
, 0)::decimal(12,2) as balance,
, 0))::decimal(12,2) as balance,
COALESCE(
(
SELECT SUM(t_this.amount)
@ -129,12 +128,11 @@ type GetCategoriesWithBalanceParams struct {
}
type GetCategoriesWithBalanceRow struct {
ID uuid.UUID
Name string
Group string
BalanceAssignments Numeric
Balance Numeric
Activity Numeric
ID uuid.UUID
Name string
Group string
Balance Numeric
Activity Numeric
}
func (q *Queries) GetCategoriesWithBalance(ctx context.Context, arg GetCategoriesWithBalanceParams) ([]GetCategoriesWithBalanceRow, error) {
@ -150,7 +148,6 @@ func (q *Queries) GetCategoriesWithBalance(ctx context.Context, arg GetCategorie
&i.ID,
&i.Name,
&i.Group,
&i.BalanceAssignments,
&i.Balance,
&i.Activity,
); err != nil {

7
postgres/queries/categories.sql
View File

@ -21,22 +21,21 @@ WHERE category_groups.budget_id = $1;
-- name: GetCategoriesWithBalance :many
SELECT categories.id, categories.name, category_groups.name as group,
COALESCE(
(COALESCE(
(
SELECT SUM(a_hist.amount)
FROM assignments a_hist
WHERE categories.id = a_hist.category_id
AND a_hist.date < @from_date
)
, 0)::decimal(12,2) as balance_assignments,
COALESCE(
, 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 balance,
, 0))::decimal(12,2) as balance,
COALESCE(
(
SELECT SUM(t_this.amount)