Build image / build-and-push (push) Successful in 5s
Fixes from the PR #26 adversarial review (graded 18 real / 0 false positive). Correctness / security - maxGardenCM fixed to 10_000 (100 m), matching its comment — it was 100_000 cm (1 km), 10x too lax (5 models flagged this). - Dimension validation now rejects NaN/Inf (which slip past naive comparisons) and subnormal-tiny positives, via a finite [1cm, 100m] check. Name (200) and notes (10_000) are length-capped so untrusted input can't balloon storage. - Update version binding is `required,min=1`, so a negative/zero version is a 400, not a 409. Maintainability / performance - One unified writeServiceError (new errors.go) maps every auth + resource sentinel; writeResourceError removed. writeVersionConflict and parseIDParam moved to errors.go (shared, not in the gardens feature file). - Request structs share an embedded gardenFields (one toInput). - CreateGarden uses INSERT ... RETURNING (one round-trip). - ListGardensForOwner has a defensive LIMIT (pagination is post-v1). Tests: name/notes length, NaN/Inf/subnormal dims, dimension-at-cap valid, negative/zero version -> 400. Co-Authored-By: Claude Opus 4.8 (1M context) <[email protected]> Claude-Session: https://claude.ai/code/session_01JdQpdYYsTgtkJBxbcpAszi
135 lines
4.5 KiB
Go
135 lines
4.5 KiB
Go
package store
|
|
|
|
import (
|
|
"context"
|
|
"database/sql"
|
|
"errors"
|
|
"fmt"
|
|
|
|
"gitea.stevedudenhoeffer.com/steve/pansy/internal/domain"
|
|
)
|
|
|
|
// gardenColumns lists the gardens columns in the fixed order scanGarden expects.
|
|
const gardenColumns = `id, owner_id, name, width_cm, height_cm, unit_pref, notes, version, created_at, updated_at`
|
|
|
|
func scanGarden(s scanner) (*domain.Garden, error) {
|
|
var g domain.Garden
|
|
if err := s.Scan(
|
|
&g.ID, &g.OwnerID, &g.Name, &g.WidthCM, &g.HeightCM,
|
|
&g.UnitPref, &g.Notes, &g.Version, &g.CreatedAt, &g.UpdatedAt,
|
|
); err != nil {
|
|
return nil, err
|
|
}
|
|
return &g, nil
|
|
}
|
|
|
|
// maxGardensListed caps ListGardensForOwner as a defensive backstop against a
|
|
// pathologically large result. At household scale a user has a handful of
|
|
// gardens, so this is never hit; genuine pagination is post-v1 if ever needed.
|
|
const maxGardensListed = 1000
|
|
|
|
// CreateGarden inserts a garden (owner_id, name, dimensions, unit, notes already
|
|
// set and validated by the service) and returns the stored row.
|
|
func (d *DB) CreateGarden(ctx context.Context, g *domain.Garden) (*domain.Garden, error) {
|
|
created, err := scanGarden(d.sql.QueryRowContext(ctx,
|
|
`INSERT INTO gardens (owner_id, name, width_cm, height_cm, unit_pref, notes)
|
|
VALUES (?, ?, ?, ?, ?, ?)
|
|
RETURNING `+gardenColumns,
|
|
g.OwnerID, g.Name, g.WidthCM, g.HeightCM, g.UnitPref, g.Notes,
|
|
))
|
|
if err != nil {
|
|
return nil, fmt.Errorf("store: insert garden: %w", err)
|
|
}
|
|
return created, nil
|
|
}
|
|
|
|
// GetGarden returns the garden with the given id, or domain.ErrNotFound.
|
|
func (d *DB) GetGarden(ctx context.Context, id int64) (*domain.Garden, error) {
|
|
g, err := scanGarden(d.sql.QueryRowContext(ctx,
|
|
`SELECT `+gardenColumns+` FROM gardens WHERE id = ?`, id))
|
|
if errors.Is(err, sql.ErrNoRows) {
|
|
return nil, domain.ErrNotFound
|
|
}
|
|
if err != nil {
|
|
return nil, fmt.Errorf("store: get garden: %w", err)
|
|
}
|
|
return g, nil
|
|
}
|
|
|
|
// ListGardensForOwner returns the gardens owned by ownerID, newest first. The
|
|
// slice is always non-nil (an empty list, not null). Shared-with-me gardens are
|
|
// added in #16.
|
|
func (d *DB) ListGardensForOwner(ctx context.Context, ownerID int64) ([]domain.Garden, error) {
|
|
rows, err := d.sql.QueryContext(ctx,
|
|
`SELECT `+gardenColumns+` FROM gardens WHERE owner_id = ? ORDER BY created_at DESC, id DESC LIMIT ?`,
|
|
ownerID, maxGardensListed,
|
|
)
|
|
if err != nil {
|
|
return nil, fmt.Errorf("store: list gardens: %w", err)
|
|
}
|
|
defer rows.Close()
|
|
|
|
gardens := []domain.Garden{}
|
|
for rows.Next() {
|
|
g, err := scanGarden(rows)
|
|
if err != nil {
|
|
return nil, fmt.Errorf("store: scan garden: %w", err)
|
|
}
|
|
gardens = append(gardens, *g)
|
|
}
|
|
if err := rows.Err(); err != nil {
|
|
return nil, fmt.Errorf("store: iterate gardens: %w", err)
|
|
}
|
|
return gardens, nil
|
|
}
|
|
|
|
// UpdateGarden applies a version-guarded update (optimistic concurrency): the row
|
|
// is written only if its stored version matches g.Version, and version is
|
|
// incremented on success. It returns:
|
|
// - the updated row, on success;
|
|
// - (current row, domain.ErrVersionConflict) when the version didn't match, so
|
|
// the caller can hand the fresh row back to the client to rebase;
|
|
// - (nil, domain.ErrNotFound) if the row no longer exists.
|
|
//
|
|
// This is the sync contract every mutable resource in pansy follows.
|
|
func (d *DB) UpdateGarden(ctx context.Context, g *domain.Garden) (*domain.Garden, error) {
|
|
updated, err := scanGarden(d.sql.QueryRowContext(ctx,
|
|
`UPDATE gardens
|
|
SET name = ?, width_cm = ?, height_cm = ?, unit_pref = ?, notes = ?,
|
|
version = version + 1,
|
|
updated_at = strftime('%Y-%m-%dT%H:%M:%SZ', 'now')
|
|
WHERE id = ? AND version = ?
|
|
RETURNING `+gardenColumns,
|
|
g.Name, g.WidthCM, g.HeightCM, g.UnitPref, g.Notes, g.ID, g.Version,
|
|
))
|
|
if errors.Is(err, sql.ErrNoRows) {
|
|
// No row matched: distinguish "gone" from "stale version".
|
|
current, gerr := d.GetGarden(ctx, g.ID)
|
|
if gerr != nil {
|
|
return nil, gerr // ErrNotFound (or a real error)
|
|
}
|
|
return current, domain.ErrVersionConflict
|
|
}
|
|
if err != nil {
|
|
return nil, fmt.Errorf("store: update garden: %w", err)
|
|
}
|
|
return updated, nil
|
|
}
|
|
|
|
// DeleteGarden removes a garden (and, via ON DELETE CASCADE, its objects/shares).
|
|
// Returns domain.ErrNotFound if no row was deleted.
|
|
func (d *DB) DeleteGarden(ctx context.Context, id int64) error {
|
|
res, err := d.sql.ExecContext(ctx, `DELETE FROM gardens WHERE id = ?`, id)
|
|
if err != nil {
|
|
return fmt.Errorf("store: delete garden: %w", err)
|
|
}
|
|
n, err := res.RowsAffected()
|
|
if err != nil {
|
|
return fmt.Errorf("store: garden delete rows: %w", err)
|
|
}
|
|
if n == 0 {
|
|
return domain.ErrNotFound
|
|
}
|
|
return nil
|
|
}
|