Hide hidden categories from autocomplete results #42

Merged
jacob1123 merged 2 commits from hide-hidden-categories into master 2022-03-15 13:50:11 +01:00
6 changed files with 8 additions and 6 deletions

View File

@ -149,7 +149,7 @@ const searchAccounts = `-- name: SearchAccounts :many
SELECT accounts.id, accounts.budget_id, accounts.name, 'account' as type FROM accounts SELECT accounts.id, accounts.budget_id, accounts.name, 'account' as type FROM accounts
WHERE accounts.budget_id = $1 WHERE accounts.budget_id = $1
AND accounts.is_open = TRUE AND accounts.is_open = TRUE
AND accounts.name LIKE $2 AND accounts.name ILIKE $2
ORDER BY accounts.name ORDER BY accounts.name
` `

View File

@ -122,7 +122,8 @@ SELECT CONCAT(category_groups.name, ' : ', categories.name) as name, categories.
FROM categories FROM categories
INNER JOIN category_groups ON categories.category_group_id = category_groups.id INNER JOIN category_groups ON categories.category_group_id = category_groups.id
WHERE category_groups.budget_id = $1 WHERE category_groups.budget_id = $1
AND categories.name LIKE $2 AND categories.name ILIKE $2
AND category_groups.name != 'Hidden Categories'
ORDER BY category_groups.name, categories.name ORDER BY category_groups.name, categories.name
` `

View File

@ -60,7 +60,7 @@ func (q *Queries) GetPayees(ctx context.Context, budgetID uuid.UUID) ([]Payee, e
const searchPayees = `-- name: SearchPayees :many const searchPayees = `-- name: SearchPayees :many
SELECT payees.id, payees.budget_id, payees.name, 'payee' as type FROM payees SELECT payees.id, payees.budget_id, payees.name, 'payee' as type FROM payees
WHERE payees.budget_id = $1 WHERE payees.budget_id = $1
AND payees.name LIKE $2 AND payees.name ILIKE $2
ORDER BY payees.name ORDER BY payees.name
` `

View File

@ -29,7 +29,7 @@ ORDER BY accounts.name;
SELECT accounts.id, accounts.budget_id, accounts.name, 'account' as type FROM accounts SELECT accounts.id, accounts.budget_id, accounts.name, 'account' as type FROM accounts
WHERE accounts.budget_id = @budget_id WHERE accounts.budget_id = @budget_id
AND accounts.is_open = TRUE AND accounts.is_open = TRUE
AND accounts.name LIKE @search AND accounts.name ILIKE @search
ORDER BY accounts.name; ORDER BY accounts.name;
-- name: UpdateAccount :one -- name: UpdateAccount :one

View File

@ -25,6 +25,7 @@ SELECT CONCAT(category_groups.name, ' : ', categories.name) as name, categories.
FROM categories FROM categories
INNER JOIN category_groups ON categories.category_group_id = category_groups.id INNER JOIN category_groups ON categories.category_group_id = category_groups.id
WHERE category_groups.budget_id = @budget_id WHERE category_groups.budget_id = @budget_id
AND categories.name LIKE @search AND categories.name ILIKE @search
AND category_groups.name != 'Hidden Categories'
ORDER BY category_groups.name, categories.name; ORDER BY category_groups.name, categories.name;
--ORDER BY levenshtein(payees.name, $2); --ORDER BY levenshtein(payees.name, $2);

View File

@ -12,6 +12,6 @@ ORDER BY name;
-- name: SearchPayees :many -- name: SearchPayees :many
SELECT payees.*, 'payee' as type FROM payees SELECT payees.*, 'payee' as type FROM payees
WHERE payees.budget_id = @budget_id WHERE payees.budget_id = @budget_id
AND payees.name LIKE @search AND payees.name ILIKE @search
ORDER BY payees.name; ORDER BY payees.name;
--ORDER BY levenshtein(payees.name, $2); --ORDER BY levenshtein(payees.name, $2);