From 1e80ba6ca8bfdb08222271a604084ef08bc5b16a Mon Sep 17 00:00:00 2001 From: Jan Bader Date: Fri, 25 Feb 2022 20:36:24 +0000 Subject: [PATCH] Also return PayeeID and CategoryID from backend --- postgres/queries/transactions.sql | 4 ++-- postgres/transactions.sql.go | 12 ++++++++++-- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/postgres/queries/transactions.sql b/postgres/queries/transactions.sql index 8ad3504..95eb9a6 100644 --- a/postgres/queries/transactions.sql +++ b/postgres/queries/transactions.sql @@ -25,7 +25,7 @@ WHERE id = $1; -- name: GetAllTransactionsForBudget :many SELECT transactions.id, transactions.date, transactions.memo, transactions.amount, transactions.group_id, transactions.status, - accounts.name as account, + accounts.name as account, transactions.payee_id, transactions.category_id, COALESCE(payees.name, '') as payee, COALESCE(category_groups.name, '') as category_group, COALESCE(categories.name, '') as category, @@ -47,7 +47,7 @@ ORDER BY transactions.date DESC; -- name: GetTransactionsForAccount :many SELECT transactions.id, transactions.date, transactions.memo, transactions.amount, transactions.group_id, transactions.status, - accounts.name as account, + accounts.name as account, transactions.payee_id, transactions.category_id, COALESCE(payees.name, '') as payee, COALESCE(category_groups.name, '') as category_group, COALESCE(categories.name, '') as category, diff --git a/postgres/transactions.sql.go b/postgres/transactions.sql.go index e9bf8f8..2fbd0ee 100644 --- a/postgres/transactions.sql.go +++ b/postgres/transactions.sql.go @@ -83,7 +83,7 @@ func (q *Queries) DeleteTransaction(ctx context.Context, id uuid.UUID) error { const getAllTransactionsForBudget = `-- name: GetAllTransactionsForBudget :many SELECT transactions.id, transactions.date, transactions.memo, transactions.amount, transactions.group_id, transactions.status, - accounts.name as account, + accounts.name as account, transactions.payee_id, transactions.category_id, COALESCE(payees.name, '') as payee, COALESCE(category_groups.name, '') as category_group, COALESCE(categories.name, '') as category, @@ -111,6 +111,8 @@ type GetAllTransactionsForBudgetRow struct { GroupID uuid.NullUUID Status TransactionStatus Account string + PayeeID uuid.NullUUID + CategoryID uuid.NullUUID Payee string CategoryGroup string Category string @@ -134,6 +136,8 @@ func (q *Queries) GetAllTransactionsForBudget(ctx context.Context, budgetID uuid &i.GroupID, &i.Status, &i.Account, + &i.PayeeID, + &i.CategoryID, &i.Payee, &i.CategoryGroup, &i.Category, @@ -211,7 +215,7 @@ func (q *Queries) GetTransactionsByMonthAndCategory(ctx context.Context, budgetI const getTransactionsForAccount = `-- name: GetTransactionsForAccount :many SELECT transactions.id, transactions.date, transactions.memo, transactions.amount, transactions.group_id, transactions.status, - accounts.name as account, + accounts.name as account, transactions.payee_id, transactions.category_id, COALESCE(payees.name, '') as payee, COALESCE(category_groups.name, '') as category_group, COALESCE(categories.name, '') as category, @@ -240,6 +244,8 @@ type GetTransactionsForAccountRow struct { GroupID uuid.NullUUID Status TransactionStatus Account string + PayeeID uuid.NullUUID + CategoryID uuid.NullUUID Payee string CategoryGroup string Category string @@ -263,6 +269,8 @@ func (q *Queries) GetTransactionsForAccount(ctx context.Context, accountID uuid. &i.GroupID, &i.Status, &i.Account, + &i.PayeeID, + &i.CategoryID, &i.Payee, &i.CategoryGroup, &i.Category,