sam/where_woof
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

tag-registry-product-link: seed 100 real preset IDs (seed-registry cmd), products/orders schema + tag linkage, fix case-sensitive tag-code bind

Browse Source
This commit is contained in:
Sam Rolfe
2026-08-07 16:56:50 +10:00
parent 24c7728559
commit e3bcd2e6e0
9 changed files with 159 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

75
frontend/cmd/seed-registry/main.go Normal file
View File

@@ -0,0 +1,75 @@
// Command seed-registry inserts the real preset tag IDs from
// db/preset_tag_ids.txt into the tags table (the anti-scam registry).
// Idempotent: already-existing IDs are skipped.
// Usage: go run ./cmd/seed-registry -registry ../db/preset_tag_ids.txt
package main
import (
"bufio"
"context"
"errors"
"flag"
"fmt"
"os"
"strings"
"github.com/jackc/pgx/v5/pgconn"
"github.com/jackc/pgx/v5/pgxpool"
"wherewoof/frontend/internal/db"
)
func main() {
registryPath := flag.String("registry", "../db/preset_tag_ids.txt", "path to preset tag ID file")
flag.Parse()
dsn := os.Getenv("DATABASE_URL")
if dsn == "" {
fmt.Fprintln(os.Stderr, "error: DATABASE_URL not set")
os.Exit(1)
}
f, err := os.Open(*registryPath)
if err != nil {
fmt.Fprintln(os.Stderr, "error opening registry:", err)
os.Exit(1)
}
defer f.Close()
ctx := context.Background()
pool, err := pgxpool.New(ctx, dsn)
if err != nil {
fmt.Fprintln(os.Stderr, "connect:", err)
os.Exit(1)
}
defer pool.Close()
q := db.New(pool)
seeded, skipped, errs := 0, 0, 0
sc := bufio.NewScanner(f)
for sc.Scan() {
line := strings.TrimSpace(sc.Text())
if line == "" || strings.HasPrefix(line, "#") {
continue
}
if _, err := q.InsertTag(ctx, line); err != nil {
var pgErr *pgconn.PgError
if errors.As(err, &pgErr) && pgErr.Code == "23505" {
skipped++
continue
}
fmt.Fprintln(os.Stderr, "insert", line, ":", err)
errs++
continue
}
seeded++
}
if err := sc.Err(); err != nil {
fmt.Fprintln(os.Stderr, "read:", err)
os.Exit(1)
}
fmt.Printf("registry seed: %d inserted, %d already existed, %d errors\n", seeded, skipped, errs)
if errs > 0 {
os.Exit(1)
}
}

19
frontend/internal/db/models.go
View File

@@ -8,6 +8,23 @@ import (
"github.com/jackc/pgx/v5/pgtype"
)
type Order struct {
ID int64 `json:"id"`
AccountID pgtype.Int8 `json:"account_id"`
Status string `json:"status"`
CreatedAt pgtype.Timestamptz `json:"created_at"`
UpdatedAt pgtype.Timestamptz `json:"updated_at"`
}
type Product struct {
ID int64 `json:"id"`
Sku string `json:"sku"`
Name string `json:"name"`
ItemType pgtype.Text `json:"item_type"`
CreatedAt pgtype.Timestamptz `json:"created_at"`
UpdatedAt pgtype.Timestamptz `json:"updated_at"`
}
type Scan struct {
ID int64 `json:"id"`
TagID int64 `json:"tag_id"`
@@ -33,6 +50,8 @@ type Tag struct {
CreatedAt pgtype.Timestamptz `json:"created_at"`
UpdatedAt pgtype.Timestamptz `json:"updated_at"`
SmsEnabled bool `json:"sms_enabled"`
ProductID pgtype.Int8 `json:"product_id"`
OrderID pgtype.Int8 `json:"order_id"`
}
type User struct {

28
frontend/internal/db/queries.sql.go
View File

@@ -15,7 +15,7 @@ const bindTag = `-- name: BindTag :one
UPDATE tags
SET owner_id = $1, updated_at = now()
WHERE tag_code = $2 AND owner_id IS NULL AND status = 'unset'
RETURNING id, tag_code, owner_id, status, item_type, description, photo_url, phone, address, notes, created_at, updated_at, sms_enabled
RETURNING id, tag_code, owner_id, status, item_type, description, photo_url, phone, address, notes, created_at, updated_at, sms_enabled, product_id, order_id
`
type BindTagParams struct {
@@ -40,6 +40,8 @@ func (q *Queries) BindTag(ctx context.Context, arg BindTagParams) (Tag, error) {
&i.CreatedAt,
&i.UpdatedAt,
&i.SmsEnabled,
&i.ProductID,
&i.OrderID,
)
return i, err
}
@@ -48,7 +50,7 @@ const clearTagOwner = `-- name: ClearTagOwner :one
UPDATE tags
SET owner_id=NULL, status='unset', item_type=NULL, description=NULL, photo_url=NULL, phone=NULL, address=NULL, notes=NULL, updated_at=now()
WHERE id=$1
RETURNING id, tag_code, owner_id, status, item_type, description, photo_url, phone, address, notes, created_at, updated_at, sms_enabled
RETURNING id, tag_code, owner_id, status, item_type, description, photo_url, phone, address, notes, created_at, updated_at, sms_enabled, product_id, order_id
`
func (q *Queries) ClearTagOwner(ctx context.Context, id int64) (Tag, error) {
@@ -68,6 +70,8 @@ func (q *Queries) ClearTagOwner(ctx context.Context, id int64) (Tag, error) {
&i.CreatedAt,
&i.UpdatedAt,
&i.SmsEnabled,
&i.ProductID,
&i.OrderID,
)
return i, err
}
@@ -162,7 +166,7 @@ func (q *Queries) GetLatestScanByTag(ctx context.Context, tagID int64) (Scan, er
}
const getTagByCode = `-- name: GetTagByCode :one
SELECT id, tag_code, owner_id, status, item_type, description, photo_url, phone, address, notes, created_at, updated_at, sms_enabled FROM tags WHERE tag_code = $1
SELECT id, tag_code, owner_id, status, item_type, description, photo_url, phone, address, notes, created_at, updated_at, sms_enabled, product_id, order_id FROM tags WHERE tag_code = $1
`
func (q *Queries) GetTagByCode(ctx context.Context, tagCode string) (Tag, error) {
@@ -182,12 +186,14 @@ func (q *Queries) GetTagByCode(ctx context.Context, tagCode string) (Tag, error)
&i.CreatedAt,
&i.UpdatedAt,
&i.SmsEnabled,
&i.ProductID,
&i.OrderID,
)
return i, err
}
const getTagByID = `-- name: GetTagByID :one
SELECT id, tag_code, owner_id, status, item_type, description, photo_url, phone, address, notes, created_at, updated_at, sms_enabled FROM tags WHERE id = $1
SELECT id, tag_code, owner_id, status, item_type, description, photo_url, phone, address, notes, created_at, updated_at, sms_enabled, product_id, order_id FROM tags WHERE id = $1
`
func (q *Queries) GetTagByID(ctx context.Context, id int64) (Tag, error) {
@@ -207,6 +213,8 @@ func (q *Queries) GetTagByID(ctx context.Context, id int64) (Tag, error) {
&i.CreatedAt,
&i.UpdatedAt,
&i.SmsEnabled,
&i.ProductID,
&i.OrderID,
)
return i, err
}
@@ -285,7 +293,7 @@ func (q *Queries) InsertScan(ctx context.Context, arg InsertScanParams) (Scan, e
const insertTag = `-- name: InsertTag :one
INSERT INTO tags (tag_code) VALUES ($1)
RETURNING id, tag_code, owner_id, status, item_type, description, photo_url, phone, address, notes, created_at, updated_at, sms_enabled
RETURNING id, tag_code, owner_id, status, item_type, description, photo_url, phone, address, notes, created_at, updated_at, sms_enabled, product_id, order_id
`
func (q *Queries) InsertTag(ctx context.Context, tagCode string) (Tag, error) {
@@ -305,12 +313,14 @@ func (q *Queries) InsertTag(ctx context.Context, tagCode string) (Tag, error) {
&i.CreatedAt,
&i.UpdatedAt,
&i.SmsEnabled,
&i.ProductID,
&i.OrderID,
)
return i, err
}
const listTagsByOwner = `-- name: ListTagsByOwner :many
SELECT id, tag_code, owner_id, status, item_type, description, photo_url, phone, address, notes, created_at, updated_at, sms_enabled FROM tags WHERE owner_id = $1 ORDER BY created_at DESC
SELECT id, tag_code, owner_id, status, item_type, description, photo_url, phone, address, notes, created_at, updated_at, sms_enabled, product_id, order_id FROM tags WHERE owner_id = $1 ORDER BY created_at DESC
`
func (q *Queries) ListTagsByOwner(ctx context.Context, ownerID pgtype.Int8) ([]Tag, error) {
@@ -336,6 +346,8 @@ func (q *Queries) ListTagsByOwner(ctx context.Context, ownerID pgtype.Int8) ([]T
&i.CreatedAt,
&i.UpdatedAt,
&i.SmsEnabled,
&i.ProductID,
&i.OrderID,
); err != nil {
return nil, err
}
@@ -393,7 +405,7 @@ const updateTagDetails = `-- name: UpdateTagDetails :one
UPDATE tags
SET item_type=$2, description=$3, photo_url=$4, phone=$5, address=$6, notes=$7, sms_enabled=$8, status='active', updated_at=now()
WHERE id=$1
RETURNING id, tag_code, owner_id, status, item_type, description, photo_url, phone, address, notes, created_at, updated_at, sms_enabled
RETURNING id, tag_code, owner_id, status, item_type, description, photo_url, phone, address, notes, created_at, updated_at, sms_enabled, product_id, order_id
`
type UpdateTagDetailsParams struct {
@@ -433,6 +445,8 @@ func (q *Queries) UpdateTagDetails(ctx context.Context, arg UpdateTagDetailsPara
&i.CreatedAt,
&i.UpdatedAt,
&i.SmsEnabled,
&i.ProductID,
&i.OrderID,
)
return i, err
}

3
frontend/internal/handlers/tags.go
View File

@@ -37,7 +37,8 @@ func (a *App) Account(w http.ResponseWriter, r *http.Request) {
// AddTag binds a tag code to the current account (HTMX: returns account-panel).
func (a *App) AddTag(w http.ResponseWriter, r *http.Request) {
uid, _ := auth.GetUserID(r)
code := strings.ToUpper(strings.TrimSpace(r.FormValue("tag_code")))
// Tag codes are case-sensitive (preset base64 IDs) — trim only, never normalise case.
code := strings.TrimSpace(r.FormValue("tag_code"))
oid := ownerID(uid)
data := accountData{}