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

Also return PayeeID and CategoryID from backend

Browse Source
This commit is contained in:
Jan Bader 2022-02-25 20:36:24 +00:00
parent 1331304639
commit 1e80ba6ca8
2 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
postgres/queries/transactions.sql
View File

@ -25,7 +25,7 @@ WHERE id = $1;
-- name: GetAllTransactionsForBudget :many -- name: GetAllTransactionsForBudget :many
SELECT transactions.id, transactions.date, transactions.memo, SELECT transactions.id, transactions.date, transactions.memo,
transactions.amount, transactions.group_id, transactions.status, 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(payees.name, '') as payee,
COALESCE(category_groups.name, '') as category_group, COALESCE(category_groups.name, '') as category_group,
COALESCE(categories.name, '') as category, COALESCE(categories.name, '') as category,
@ -47,7 +47,7 @@ ORDER BY transactions.date DESC;
-- name: GetTransactionsForAccount :many -- name: GetTransactionsForAccount :many
SELECT transactions.id, transactions.date, transactions.memo, SELECT transactions.id, transactions.date, transactions.memo,
transactions.amount, transactions.group_id, transactions.status, 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(payees.name, '') as payee,
COALESCE(category_groups.name, '') as category_group, COALESCE(category_groups.name, '') as category_group,
COALESCE(categories.name, '') as category, COALESCE(categories.name, '') as category,

12
postgres/transactions.sql.go
View File

@ -83,7 +83,7 @@ func (q *Queries) DeleteTransaction(ctx context.Context, id uuid.UUID) error {
const getAllTransactionsForBudget = `-- name: GetAllTransactionsForBudget :many const getAllTransactionsForBudget = `-- name: GetAllTransactionsForBudget :many
SELECT transactions.id, transactions.date, transactions.memo, SELECT transactions.id, transactions.date, transactions.memo,
transactions.amount, transactions.group_id, transactions.status, 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(payees.name, '') as payee,
COALESCE(category_groups.name, '') as category_group, COALESCE(category_groups.name, '') as category_group,
COALESCE(categories.name, '') as category, COALESCE(categories.name, '') as category,
@ -111,6 +111,8 @@ type GetAllTransactionsForBudgetRow struct {
GroupID uuid.NullUUID GroupID uuid.NullUUID
Status TransactionStatus Status TransactionStatus
Account string Account string
PayeeID uuid.NullUUID
CategoryID uuid.NullUUID
Payee string Payee string
CategoryGroup string CategoryGroup string
Category string Category string
@ -134,6 +136,8 @@ func (q *Queries) GetAllTransactionsForBudget(ctx context.Context, budgetID uuid
&i.GroupID, &i.GroupID,
&i.Status, &i.Status,
&i.Account, &i.Account,
&i.PayeeID,
&i.CategoryID,
&i.Payee, &i.Payee,
&i.CategoryGroup, &i.CategoryGroup,
&i.Category, &i.Category,
@ -211,7 +215,7 @@ func (q *Queries) GetTransactionsByMonthAndCategory(ctx context.Context, budgetI
const getTransactionsForAccount = `-- name: GetTransactionsForAccount :many const getTransactionsForAccount = `-- name: GetTransactionsForAccount :many
SELECT transactions.id, transactions.date, transactions.memo, SELECT transactions.id, transactions.date, transactions.memo,
transactions.amount, transactions.group_id, transactions.status, 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(payees.name, '') as payee,
COALESCE(category_groups.name, '') as category_group, COALESCE(category_groups.name, '') as category_group,
COALESCE(categories.name, '') as category, COALESCE(categories.name, '') as category,
@ -240,6 +244,8 @@ type GetTransactionsForAccountRow struct {
GroupID uuid.NullUUID GroupID uuid.NullUUID
Status TransactionStatus Status TransactionStatus
Account string Account string
PayeeID uuid.NullUUID
CategoryID uuid.NullUUID
Payee string Payee string
CategoryGroup string CategoryGroup string
Category string Category string
@ -263,6 +269,8 @@ func (q *Queries) GetTransactionsForAccount(ctx context.Context, accountID uuid.
&i.GroupID, &i.GroupID,
&i.Status, &i.Status,
&i.Account, &i.Account,
&i.PayeeID,
&i.CategoryID,
&i.Payee, &i.Payee,
&i.CategoryGroup, &i.CategoryGroup,
&i.Category, &i.Category,