From 915379f5cbca1521b14d6b0fa3b0f575f8b4b7eb Mon Sep 17 00:00:00 2001 From: Jan Bader Date: Tue, 7 Dec 2021 20:52:39 +0000 Subject: [PATCH] Make available balance date-dependent --- http/budgeting.go | 6 +++++- postgres/categories.sql.go | 11 +++++++++-- postgres/queries/categories.sql | 2 ++ 3 files changed, 16 insertions(+), 3 deletions(-) diff --git a/http/budgeting.go b/http/budgeting.go index 9c46969..458dde4 100644 --- a/http/budgeting.go +++ b/http/budgeting.go @@ -65,7 +65,11 @@ func (h *Handler) budgeting(c *gin.Context) { return } - availableBalance, err := h.Service.DB.GetAvailableBalance(c.Request.Context(), budgetUUID) + availableParams := postgres.GetAvailableBalanceParams{ + BudgetID: budgetUUID, + FromDate: firstOfNextMonth, + } + availableBalance, err := h.Service.DB.GetAvailableBalance(c.Request.Context(), availableParams) if err != nil { c.AbortWithError(http.StatusInternalServerError, err) return diff --git a/postgres/categories.sql.go b/postgres/categories.sql.go index a2bc73c..9e1c599 100644 --- a/postgres/categories.sql.go +++ b/postgres/categories.sql.go @@ -56,17 +56,24 @@ SELECT LEFT JOIN categories ON categories.id = transactions.category_id LEFT JOIN budgets ON budgets.income_category_id = categories.id WHERE budgets.id = $1 + AND transactions.date < $2 ) - ( SELECT SUM(assignments.amount) FROM assignments INNER JOIN categories ON categories.id = assignments.category_id INNER JOIN category_groups ON category_groups.id = categories.category_group_id WHERE category_groups.budget_id = $1 + AND assignments.date < $2 ))::decimal(12,2) ` -func (q *Queries) GetAvailableBalance(ctx context.Context, budgetID uuid.UUID) (Numeric, error) { - row := q.db.QueryRowContext(ctx, getAvailableBalance, budgetID) +type GetAvailableBalanceParams struct { + BudgetID uuid.UUID + FromDate time.Time +} + +func (q *Queries) GetAvailableBalance(ctx context.Context, arg GetAvailableBalanceParams) (Numeric, error) { + row := q.db.QueryRowContext(ctx, getAvailableBalance, arg.BudgetID, arg.FromDate) var column_1 Numeric err := row.Scan(&column_1) return column_1, err diff --git a/postgres/queries/categories.sql b/postgres/queries/categories.sql index d13a8d4..fd29a98 100644 --- a/postgres/queries/categories.sql +++ b/postgres/queries/categories.sql @@ -67,10 +67,12 @@ SELECT LEFT JOIN categories ON categories.id = transactions.category_id LEFT JOIN budgets ON budgets.income_category_id = categories.id WHERE budgets.id = @budget_id + AND transactions.date < @from_date ) - ( SELECT SUM(assignments.amount) FROM assignments INNER JOIN categories ON categories.id = assignments.category_id INNER JOIN category_groups ON category_groups.id = categories.category_group_id WHERE category_groups.budget_id = @budget_id + AND assignments.date < @from_date ))::decimal(12,2); \ No newline at end of file