Build image / build-and-push (push) Successful in 15s
- FillRegion: insert the whole batch in one transaction (store.CreatePlantings) instead of one round-trip per plop, and refuse fills over maxFillPlops (5000) so a max-sized bed with tiny spacing can't generate ~10^5 sequential writes. Guards the computed radius is finite/positive and clamps the region to the object's bounds before packing (bounds hexCenters). - FillNamedRegion + FillRegion share a fillLoaded body, so the object is loaded and authorized once (no double objectForRole). - Region is now rect-only — dropped the speculative circle fields/branch that NamedRegion never produced and hexCenters didn't pack (circles are post-v1). - NamedRegion guards a nil object and no longer maps a blank name to "all" (blank → ErrInvalidInput, matching the doc). - ClearObject documents why it deliberately doesn't require plantable. Tests: empty/nil region name → ErrInvalidInput; an oversized fill → ErrInvalidInput (over the cap). Tagged demo tidied (checked errors, domain.RoleViewer, t.Helper). GOWORK=off go build/vet/test ./internal/... green; tagged agent test green against majordomo (go.mod stays majordomo-free). Co-Authored-By: Claude Opus 4.8 (1M context) <[email protected]> Claude-Session: https://claude.ai/code/session_01JdQpdYYsTgtkJBxbcpAszi
210 lines
7.2 KiB
Go
210 lines
7.2 KiB
Go
package store
|
|
|
|
import (
|
|
"context"
|
|
"database/sql"
|
|
"errors"
|
|
"fmt"
|
|
|
|
"gitea.stevedudenhoeffer.com/steve/pansy/internal/domain"
|
|
)
|
|
|
|
// plantingColumns lists plantings columns in the order scanPlanting expects.
|
|
// Used unqualified for direct selects; the /full read below qualifies with pl.
|
|
const plantingColumns = `id, object_id, plant_id, x_cm, y_cm, radius_cm, count, label,
|
|
planted_at, removed_at, version, created_at, updated_at`
|
|
|
|
func scanPlanting(s scanner) (*domain.Planting, error) {
|
|
var p domain.Planting
|
|
if err := s.Scan(
|
|
&p.ID, &p.ObjectID, &p.PlantID, &p.XCM, &p.YCM, &p.RadiusCM,
|
|
&p.Count, &p.Label, &p.PlantedAt, &p.RemovedAt,
|
|
&p.Version, &p.CreatedAt, &p.UpdatedAt,
|
|
); err != nil {
|
|
return nil, err
|
|
}
|
|
return &p, nil
|
|
}
|
|
|
|
// ListActivePlantingsForGarden returns every currently-planted plop (removed_at
|
|
// IS NULL) across all objects in a garden — the editor's one-shot load. Always a
|
|
// non-nil slice. The service fills each row's DerivedCount; this is the raw read.
|
|
func (d *DB) ListActivePlantingsForGarden(ctx context.Context, gardenID int64) ([]domain.Planting, error) {
|
|
rows, err := d.sql.QueryContext(ctx,
|
|
`SELECT `+qualifyColumns("pl", plantingColumns)+` FROM plantings pl
|
|
JOIN garden_objects o ON o.id = pl.object_id
|
|
WHERE o.garden_id = ? AND pl.removed_at IS NULL
|
|
ORDER BY pl.id`,
|
|
gardenID,
|
|
)
|
|
if err != nil {
|
|
return nil, fmt.Errorf("store: list plantings: %w", err)
|
|
}
|
|
defer rows.Close()
|
|
|
|
plantings := []domain.Planting{}
|
|
for rows.Next() {
|
|
p, err := scanPlanting(rows)
|
|
if err != nil {
|
|
return nil, fmt.Errorf("store: scan planting: %w", err)
|
|
}
|
|
plantings = append(plantings, *p)
|
|
}
|
|
if err := rows.Err(); err != nil {
|
|
return nil, fmt.Errorf("store: iterate plantings: %w", err)
|
|
}
|
|
return plantings, nil
|
|
}
|
|
|
|
// ListActivePlantingsForObject returns an object's currently-planted plops
|
|
// (removed_at IS NULL). Always a non-nil slice. Used by FillRegion to avoid
|
|
// stacking new plops inside existing ones.
|
|
func (d *DB) ListActivePlantingsForObject(ctx context.Context, objectID int64) ([]domain.Planting, error) {
|
|
rows, err := d.sql.QueryContext(ctx,
|
|
`SELECT `+plantingColumns+` FROM plantings WHERE object_id = ? AND removed_at IS NULL ORDER BY id`,
|
|
objectID,
|
|
)
|
|
if err != nil {
|
|
return nil, fmt.Errorf("store: list object plantings: %w", err)
|
|
}
|
|
defer rows.Close()
|
|
|
|
plantings := []domain.Planting{}
|
|
for rows.Next() {
|
|
p, err := scanPlanting(rows)
|
|
if err != nil {
|
|
return nil, fmt.Errorf("store: scan planting: %w", err)
|
|
}
|
|
plantings = append(plantings, *p)
|
|
}
|
|
if err := rows.Err(); err != nil {
|
|
return nil, fmt.Errorf("store: iterate plantings: %w", err)
|
|
}
|
|
return plantings, nil
|
|
}
|
|
|
|
// ClearObjectPlantings soft-removes every active plop in an object in one UPDATE
|
|
// (sets removed_at=date, bumps version) and returns how many rows it affected.
|
|
func (d *DB) ClearObjectPlantings(ctx context.Context, objectID int64, date string) (int, error) {
|
|
res, err := d.sql.ExecContext(ctx,
|
|
`UPDATE plantings
|
|
SET removed_at = ?, version = version + 1,
|
|
updated_at = strftime('%Y-%m-%dT%H:%M:%SZ', 'now')
|
|
WHERE object_id = ? AND removed_at IS NULL`,
|
|
date, objectID,
|
|
)
|
|
if err != nil {
|
|
return 0, fmt.Errorf("store: clear object plantings: %w", err)
|
|
}
|
|
n, err := res.RowsAffected()
|
|
if err != nil {
|
|
return 0, fmt.Errorf("store: clear plantings rows: %w", err)
|
|
}
|
|
return int(n), nil
|
|
}
|
|
|
|
// GetPlanting returns the planting with the given id, or domain.ErrNotFound.
|
|
func (d *DB) GetPlanting(ctx context.Context, id int64) (*domain.Planting, error) {
|
|
p, err := scanPlanting(d.sql.QueryRowContext(ctx,
|
|
`SELECT `+plantingColumns+` FROM plantings WHERE id = ?`, id))
|
|
if errors.Is(err, sql.ErrNoRows) {
|
|
return nil, domain.ErrNotFound
|
|
}
|
|
if err != nil {
|
|
return nil, fmt.Errorf("store: get planting: %w", err)
|
|
}
|
|
return p, nil
|
|
}
|
|
|
|
// CreatePlanting inserts a plop (fields already validated by the service) and
|
|
// returns the stored row. removed_at is always NULL on create — a new plop is
|
|
// active; "clear bed" sets removed_at later via UpdatePlanting.
|
|
func (d *DB) CreatePlanting(ctx context.Context, p *domain.Planting) (*domain.Planting, error) {
|
|
created, err := scanPlanting(d.sql.QueryRowContext(ctx,
|
|
`INSERT INTO plantings (object_id, plant_id, x_cm, y_cm, radius_cm, count, label, planted_at)
|
|
VALUES (?, ?, ?, ?, ?, ?, ?, ?)
|
|
RETURNING `+plantingColumns,
|
|
p.ObjectID, p.PlantID, p.XCM, p.YCM, p.RadiusCM, p.Count, p.Label, p.PlantedAt,
|
|
))
|
|
if err != nil {
|
|
return nil, fmt.Errorf("store: insert planting: %w", err)
|
|
}
|
|
return created, nil
|
|
}
|
|
|
|
// CreatePlantings inserts many plops in a single transaction (one commit), for
|
|
// bulk fills. Returns the stored rows in order. An empty input is a no-op.
|
|
func (d *DB) CreatePlantings(ctx context.Context, plantings []*domain.Planting) ([]domain.Planting, error) {
|
|
if len(plantings) == 0 {
|
|
return []domain.Planting{}, nil
|
|
}
|
|
tx, err := d.sql.BeginTx(ctx, nil)
|
|
if err != nil {
|
|
return nil, fmt.Errorf("store: begin plantings tx: %w", err)
|
|
}
|
|
defer tx.Rollback() //nolint:errcheck // no-op after a successful commit
|
|
|
|
const stmt = `INSERT INTO plantings (object_id, plant_id, x_cm, y_cm, radius_cm, count, label, planted_at)
|
|
VALUES (?, ?, ?, ?, ?, ?, ?, ?)
|
|
RETURNING ` + plantingColumns
|
|
out := make([]domain.Planting, 0, len(plantings))
|
|
for _, p := range plantings {
|
|
created, err := scanPlanting(tx.QueryRowContext(ctx, stmt,
|
|
p.ObjectID, p.PlantID, p.XCM, p.YCM, p.RadiusCM, p.Count, p.Label, p.PlantedAt))
|
|
if err != nil {
|
|
return nil, fmt.Errorf("store: insert planting (batch): %w", err)
|
|
}
|
|
out = append(out, *created)
|
|
}
|
|
if err := tx.Commit(); err != nil {
|
|
return nil, fmt.Errorf("store: commit plantings: %w", err)
|
|
}
|
|
return out, nil
|
|
}
|
|
|
|
// UpdatePlanting applies a version-guarded update of all mutable columns (the
|
|
// service merges partial patches first). Returns the updated row, or
|
|
// (current row, ErrVersionConflict) / ErrNotFound — the same contract as the
|
|
// other mutable resources.
|
|
func (d *DB) UpdatePlanting(ctx context.Context, p *domain.Planting) (*domain.Planting, error) {
|
|
updated, err := scanPlanting(d.sql.QueryRowContext(ctx,
|
|
`UPDATE plantings
|
|
SET plant_id = ?, x_cm = ?, y_cm = ?, radius_cm = ?, count = ?, label = ?,
|
|
planted_at = ?, removed_at = ?,
|
|
version = version + 1,
|
|
updated_at = strftime('%Y-%m-%dT%H:%M:%SZ', 'now')
|
|
WHERE id = ? AND version = ?
|
|
RETURNING `+plantingColumns,
|
|
p.PlantID, p.XCM, p.YCM, p.RadiusCM, p.Count, p.Label, p.PlantedAt, p.RemovedAt,
|
|
p.ID, p.Version,
|
|
))
|
|
if errors.Is(err, sql.ErrNoRows) {
|
|
current, gerr := d.GetPlanting(ctx, p.ID)
|
|
if gerr != nil {
|
|
return nil, gerr
|
|
}
|
|
return current, domain.ErrVersionConflict
|
|
}
|
|
if err != nil {
|
|
return nil, fmt.Errorf("store: update planting: %w", err)
|
|
}
|
|
return updated, nil
|
|
}
|
|
|
|
// DeletePlanting hard-deletes a plop (for mistakes; "removed/harvested" flows set
|
|
// removed_at instead). Returns domain.ErrNotFound if no row was deleted.
|
|
func (d *DB) DeletePlanting(ctx context.Context, id int64) error {
|
|
res, err := d.sql.ExecContext(ctx, `DELETE FROM plantings WHERE id = ?`, id)
|
|
if err != nil {
|
|
return fmt.Errorf("store: delete planting: %w", err)
|
|
}
|
|
n, err := res.RowsAffected()
|
|
if err != nil {
|
|
return fmt.Errorf("store: planting delete rows: %w", err)
|
|
}
|
|
if n == 0 {
|
|
return domain.ErrNotFound
|
|
}
|
|
return nil
|
|
}
|