Add column and use instead of last transactions date

postgres/accounts.sql.go

@@ -5,7 +5,7 @@ package postgres
 
 import (
 	"context"
-	"time"
+	"database/sql"
 
 	"git.javil.eu/jacob1123/budgeteer/postgres/numeric"
 	"github.com/google/uuid"
@@ -15,7 +15,7 @@ const createAccount = `-- name: CreateAccount :one
 INSERT INTO accounts
 (name, budget_id)
 VALUES ($1, $2)
-RETURNING id, budget_id, name, on_budget, is_open
+RETURNING id, budget_id, name, on_budget, is_open, last_reconciled
 `
 
 type CreateAccountParams struct {
@@ -32,12 +32,13 @@ func (q *Queries) CreateAccount(ctx context.Context, arg CreateAccountParams) (A
 		&i.Name,
 		&i.OnBudget,
 		&i.IsOpen,
+		&i.LastReconciled,
 	)
 	return i, err
 }
 
 const getAccount = `-- name: GetAccount :one
-SELECT accounts.id, accounts.budget_id, accounts.name, accounts.on_budget, accounts.is_open FROM accounts
+SELECT accounts.id, accounts.budget_id, accounts.name, accounts.on_budget, accounts.is_open, accounts.last_reconciled FROM accounts
 WHERE accounts.id = $1
 `
 
@@ -50,12 +51,13 @@ func (q *Queries) GetAccount(ctx context.Context, id uuid.UUID) (Account, error)
 		&i.Name,
 		&i.OnBudget,
 		&i.IsOpen,
+		&i.LastReconciled,
 	)
 	return i, err
 }
 
 const getAccounts = `-- name: GetAccounts :many
-SELECT accounts.id, accounts.budget_id, accounts.name, accounts.on_budget, accounts.is_open FROM accounts
+SELECT accounts.id, accounts.budget_id, accounts.name, accounts.on_budget, accounts.is_open, accounts.last_reconciled FROM accounts
 WHERE accounts.budget_id = $1
 AND accounts.is_open = TRUE
 ORDER BY accounts.name
@@ -76,6 +78,7 @@ func (q *Queries) GetAccounts(ctx context.Context, budgetID uuid.UUID) ([]Accoun
 			&i.Name,
 			&i.OnBudget,
 			&i.IsOpen,
+			&i.LastReconciled,
 		); err != nil {
 			return nil, err
 		}
@@ -91,8 +94,7 @@ func (q *Queries) GetAccounts(ctx context.Context, budgetID uuid.UUID) ([]Accoun
 }
 
 const getAccountsWithBalance = `-- name: GetAccountsWithBalance :many
-SELECT accounts.id, accounts.name, accounts.on_budget, accounts.is_open,
-        (SELECT MAX(transactions.date) FROM transactions WHERE transactions.account_id = accounts.id AND transactions.status = 'Reconciled')::date as last_reconciled,
+SELECT accounts.id, accounts.name, accounts.on_budget, accounts.is_open, accounts.last_reconciled,
         (SELECT SUM(transactions.amount) FROM transactions WHERE transactions.account_id = accounts.id AND transactions.date < NOW())::decimal(12,2) as working_balance,
         (SELECT SUM(transactions.amount) FROM transactions WHERE transactions.account_id = accounts.id AND transactions.date < NOW() AND transactions.status IN ('Cleared', 'Reconciled'))::decimal(12,2) as cleared_balance,
         (SELECT SUM(transactions.amount) FROM transactions WHERE transactions.account_id = accounts.id AND transactions.date < NOW() AND transactions.status = 'Reconciled')::decimal(12,2) as reconciled_balance
@@ -107,7 +109,7 @@ type GetAccountsWithBalanceRow struct {
 	Name              string
 	OnBudget          bool
 	IsOpen            bool
-	LastReconciled    time.Time
+	LastReconciled    sql.NullTime
 	WorkingBalance    numeric.Numeric
 	ClearedBalance    numeric.Numeric
 	ReconciledBalance numeric.Numeric
@@ -193,13 +195,24 @@ func (q *Queries) SearchAccounts(ctx context.Context, arg SearchAccountsParams)
 	return items, nil
 }
 
+const setLastReconciled = `-- name: SetLastReconciled :exec
+UPDATE accounts
+SET last_reconciled = NOW()
+WHERE accounts.id = $1
+`
+
+func (q *Queries) SetLastReconciled(ctx context.Context, id uuid.UUID) error {
+	_, err := q.db.ExecContext(ctx, setLastReconciled, id)
+	return err
+}
+
 const updateAccount = `-- name: UpdateAccount :one
 UPDATE accounts
 SET name = $1,
     on_budget = $2,
     is_open = $3
 WHERE accounts.id = $4
-RETURNING id, budget_id, name, on_budget, is_open
+RETURNING id, budget_id, name, on_budget, is_open, last_reconciled
 `
 
 type UpdateAccountParams struct {
@@ -223,6 +236,7 @@ func (q *Queries) UpdateAccount(ctx context.Context, arg UpdateAccountParams) (A
 		&i.Name,
 		&i.OnBudget,
 		&i.IsOpen,
+		&i.LastReconciled,
 	)
 	return i, err
 }

postgres/models.go

@@ -32,11 +32,12 @@ func (e *TransactionStatus) Scan(src interface{}) error {
 }
 
 type Account struct {
-	ID       uuid.UUID
-	BudgetID uuid.UUID
-	Name     string
-	OnBudget bool
-	IsOpen   bool
+	ID             uuid.UUID
+	BudgetID       uuid.UUID
+	Name           string
+	OnBudget       bool
+	IsOpen         bool
+	LastReconciled sql.NullTime
 }
 
 type Assignment struct {

postgres/queries/accounts.sql

@@ -15,8 +15,7 @@ AND accounts.is_open = TRUE
 ORDER BY accounts.name;
 
 -- name: GetAccountsWithBalance :many
-SELECT accounts.id, accounts.name, accounts.on_budget, accounts.is_open,
-        (SELECT MAX(transactions.date) FROM transactions WHERE transactions.account_id = accounts.id AND transactions.status = 'Reconciled')::date as last_reconciled,
+SELECT accounts.id, accounts.name, accounts.on_budget, accounts.is_open, accounts.last_reconciled,
         (SELECT SUM(transactions.amount) FROM transactions WHERE transactions.account_id = accounts.id AND transactions.date < NOW())::decimal(12,2) as working_balance,
         (SELECT SUM(transactions.amount) FROM transactions WHERE transactions.account_id = accounts.id AND transactions.date < NOW() AND transactions.status IN ('Cleared', 'Reconciled'))::decimal(12,2) as cleared_balance,
         (SELECT SUM(transactions.amount) FROM transactions WHERE transactions.account_id = accounts.id AND transactions.date < NOW() AND transactions.status = 'Reconciled')::decimal(12,2) as reconciled_balance
@@ -38,4 +37,9 @@ SET name = $1,
     on_budget = $2,
     is_open = $3
 WHERE accounts.id = $4
-RETURNING *;
+RETURNING *;
+
+-- name: SetLastReconciled :exec
+UPDATE accounts
+SET last_reconciled = NOW()
+WHERE accounts.id = $1;

postgres/schema/0018_reconciled-on.sql

@@ -0,0 +1,5 @@
+-- +goose Up
+ALTER TABLE accounts ADD COLUMN last_reconciled date NULL;
+
+-- +goose Down
+ALTER TABLE accounts DROP COLUMN last_reconciled;