From beff7afcf701f7483674a22234a8193d7c583888 Mon Sep 17 00:00:00 2001 From: Jan Bader Date: Sun, 9 Jan 2022 22:29:47 +0000 Subject: [PATCH] Add group_id --- postgres/models.go | 2 +- postgres/queries/transactions.sql | 4 ++-- .../schema/20220109_212800_add-transfer-id.sql | 6 ------ postgres/schema/20220109_214000_add-group-id.sql | 6 ++++++ postgres/transactions.sql.go | 14 ++++++++------ 5 files changed, 17 insertions(+), 15 deletions(-) delete mode 100644 postgres/schema/20220109_212800_add-transfer-id.sql create mode 100644 postgres/schema/20220109_214000_add-group-id.sql diff --git a/postgres/models.go b/postgres/models.go index 00a569d..1e45f17 100644 --- a/postgres/models.go +++ b/postgres/models.go @@ -64,7 +64,7 @@ type Transaction struct { AccountID uuid.UUID CategoryID uuid.NullUUID PayeeID uuid.NullUUID - TransferID uuid.NullUUID + GroupID uuid.NullUUID } type TransactionsByMonth struct { diff --git a/postgres/queries/transactions.sql b/postgres/queries/transactions.sql index 2bef52a..3ea8ee8 100644 --- a/postgres/queries/transactions.sql +++ b/postgres/queries/transactions.sql @@ -4,8 +4,8 @@ WHERE id = $1; -- name: CreateTransaction :one INSERT INTO transactions -(date, memo, amount, account_id, payee_id, category_id) -VALUES ($1, $2, $3, $4, $5, $6) +(date, memo, amount, account_id, payee_id, category_id, group_id) +VALUES ($1, $2, $3, $4, $5, $6, $7) RETURNING *; -- name: UpdateTransaction :exec diff --git a/postgres/schema/20220109_212800_add-transfer-id.sql b/postgres/schema/20220109_212800_add-transfer-id.sql deleted file mode 100644 index 1f7af36..0000000 --- a/postgres/schema/20220109_212800_add-transfer-id.sql +++ /dev/null @@ -1,6 +0,0 @@ --- +goose Up -ALTER TABLE transactions ADD COLUMN - transfer_id uuid NULL REFERENCES transactions (id); - --- +goose Down -ALTER TABLE transactions DROP COLUMN transfer_id; \ No newline at end of file diff --git a/postgres/schema/20220109_214000_add-group-id.sql b/postgres/schema/20220109_214000_add-group-id.sql new file mode 100644 index 0000000..122eb02 --- /dev/null +++ b/postgres/schema/20220109_214000_add-group-id.sql @@ -0,0 +1,6 @@ +-- +goose Up +ALTER TABLE transactions ADD COLUMN + group_id uuid NULL; + +-- +goose Down +ALTER TABLE transactions DROP COLUMN group_id; \ No newline at end of file diff --git a/postgres/transactions.sql.go b/postgres/transactions.sql.go index ee110fa..b74d94b 100644 --- a/postgres/transactions.sql.go +++ b/postgres/transactions.sql.go @@ -12,9 +12,9 @@ import ( const createTransaction = `-- name: CreateTransaction :one INSERT INTO transactions -(date, memo, amount, account_id, payee_id, category_id) -VALUES ($1, $2, $3, $4, $5, $6) -RETURNING id, date, memo, amount, account_id, category_id, payee_id, transfer_id +(date, memo, amount, account_id, payee_id, category_id, group_id) +VALUES ($1, $2, $3, $4, $5, $6, $7) +RETURNING id, date, memo, amount, account_id, category_id, payee_id, group_id ` type CreateTransactionParams struct { @@ -24,6 +24,7 @@ type CreateTransactionParams struct { AccountID uuid.UUID PayeeID uuid.NullUUID CategoryID uuid.NullUUID + GroupID uuid.NullUUID } func (q *Queries) CreateTransaction(ctx context.Context, arg CreateTransactionParams) (Transaction, error) { @@ -34,6 +35,7 @@ func (q *Queries) CreateTransaction(ctx context.Context, arg CreateTransactionPa arg.AccountID, arg.PayeeID, arg.CategoryID, + arg.GroupID, ) var i Transaction err := row.Scan( @@ -44,7 +46,7 @@ func (q *Queries) CreateTransaction(ctx context.Context, arg CreateTransactionPa &i.AccountID, &i.CategoryID, &i.PayeeID, - &i.TransferID, + &i.GroupID, ) return i, err } @@ -75,7 +77,7 @@ func (q *Queries) DeleteTransaction(ctx context.Context, id uuid.UUID) error { } const getTransaction = `-- name: GetTransaction :one -SELECT id, date, memo, amount, account_id, category_id, payee_id, transfer_id FROM transactions +SELECT id, date, memo, amount, account_id, category_id, payee_id, group_id FROM transactions WHERE id = $1 ` @@ -90,7 +92,7 @@ func (q *Queries) GetTransaction(ctx context.Context, id uuid.UUID) (Transaction &i.AccountID, &i.CategoryID, &i.PayeeID, - &i.TransferID, + &i.GroupID, ) return i, err }