feat: db store — frames + devices CRUD, project-scoped
Snapshot now populates frames + devices from the DB (slice 1 left them as empty arrays). Frame store: - CreateFrame requires positive width/height; rejects empty name; UNIQUE (project_id, name) collisions surface as ErrConflict via mapWriteErr. - GetFrame is project-scoped — wrong-project read returns ErrNotFound. - UpdateFrame applies a partial; project_id is not exposed (moving a frame across projects would orphan its devices). - DeleteFrame relies on the schema's ON DELETE SET NULL to drop devices' frame_id refs cleanly; verified by test. Device store: - CreateDevice defaults color to #1e1e1e if blank; rejects empty name, non-positive size; validates frame_id is in the same project (returns ErrInvalidInput on cross-project ref). - UpdateDevice uses a FrameRef tri-state for frame_id so callers can distinguish "leave alone" from "clear to NULL" from "move to frame X". - Cross-project frame_id on PATCH is rejected with ErrInvalidInput. - ListDevices supports an optional frame_id filter. 13 new table-driven tests, all green with -race.
This commit is contained in:
397
internal/db/frames_devices.go
Normal file
397
internal/db/frames_devices.go
Normal file
@@ -0,0 +1,397 @@
|
||||
package db
|
||||
|
||||
import (
|
||||
"database/sql"
|
||||
"errors"
|
||||
"fmt"
|
||||
"strings"
|
||||
)
|
||||
|
||||
// -----------------------------------------------------------------------------
|
||||
// Frames
|
||||
// -----------------------------------------------------------------------------
|
||||
|
||||
// FrameCreate is the create-shape; x/y/width/height carry full positions.
|
||||
type FrameCreate struct {
|
||||
Name string
|
||||
X float64
|
||||
Y float64
|
||||
Width float64
|
||||
Height float64
|
||||
}
|
||||
|
||||
// FrameUpdate is the partial-update shape for PATCH. project_id is
|
||||
// deliberately absent — moving a frame across projects would orphan its
|
||||
// devices' frame_id refs, so the API refuses to do it.
|
||||
type FrameUpdate struct {
|
||||
Name *string
|
||||
X *float64
|
||||
Y *float64
|
||||
Width *float64
|
||||
Height *float64
|
||||
}
|
||||
|
||||
// CreateFrame inserts a new frame inside a project.
|
||||
func (s *Store) CreateFrame(projectID int64, f FrameCreate) (*Frame, error) {
|
||||
name := strings.TrimSpace(f.Name)
|
||||
if name == "" {
|
||||
return nil, fmt.Errorf("%w: name is required", ErrInvalidInput)
|
||||
}
|
||||
if f.Width <= 0 || f.Height <= 0 {
|
||||
return nil, fmt.Errorf("%w: width and height must be positive", ErrInvalidInput)
|
||||
}
|
||||
if _, err := s.GetProject(projectID); err != nil {
|
||||
return nil, err
|
||||
}
|
||||
res, err := s.db.Exec(
|
||||
`INSERT INTO frames (project_id, name, x, y, width, height)
|
||||
VALUES (?, ?, ?, ?, ?, ?)`,
|
||||
projectID, name, f.X, f.Y, f.Width, f.Height,
|
||||
)
|
||||
if err != nil {
|
||||
return nil, mapWriteErr(err)
|
||||
}
|
||||
id, _ := res.LastInsertId()
|
||||
return s.GetFrame(projectID, id)
|
||||
}
|
||||
|
||||
// GetFrame loads a frame, enforcing project_id scoping.
|
||||
func (s *Store) GetFrame(projectID, id int64) (*Frame, error) {
|
||||
var f Frame
|
||||
var ex sql.NullString
|
||||
err := s.db.QueryRow(
|
||||
`SELECT id, project_id, name, x, y, width, height, excalidraw_id, created_at, updated_at
|
||||
FROM frames WHERE id = ? AND project_id = ?`, id, projectID,
|
||||
).Scan(&f.ID, &f.ProjectID, &f.Name, &f.X, &f.Y, &f.Width, &f.Height,
|
||||
&ex, &f.CreatedAt, &f.UpdatedAt)
|
||||
if errors.Is(err, sql.ErrNoRows) {
|
||||
return nil, ErrNotFound
|
||||
}
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
if ex.Valid {
|
||||
f.ExcalidrawID = &ex.String
|
||||
}
|
||||
return &f, nil
|
||||
}
|
||||
|
||||
// ListFrames returns every frame in a project, ordered by created_at so
|
||||
// the on-screen z-order is stable.
|
||||
func (s *Store) ListFrames(projectID int64) ([]Frame, error) {
|
||||
rows, err := s.db.Query(
|
||||
`SELECT id, project_id, name, x, y, width, height, excalidraw_id, created_at, updated_at
|
||||
FROM frames WHERE project_id = ? ORDER BY created_at, id`, projectID,
|
||||
)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
defer rows.Close()
|
||||
out := []Frame{}
|
||||
for rows.Next() {
|
||||
var f Frame
|
||||
var ex sql.NullString
|
||||
if err := rows.Scan(&f.ID, &f.ProjectID, &f.Name, &f.X, &f.Y, &f.Width, &f.Height,
|
||||
&ex, &f.CreatedAt, &f.UpdatedAt); err != nil {
|
||||
return nil, err
|
||||
}
|
||||
if ex.Valid {
|
||||
f.ExcalidrawID = &ex.String
|
||||
}
|
||||
out = append(out, f)
|
||||
}
|
||||
return out, rows.Err()
|
||||
}
|
||||
|
||||
// UpdateFrame applies a partial update. project_id stays the same — we
|
||||
// don't expose moving a frame across projects.
|
||||
func (s *Store) UpdateFrame(projectID, id int64, u FrameUpdate) (*Frame, error) {
|
||||
cur, err := s.GetFrame(projectID, id)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
if u.Name != nil {
|
||||
v := strings.TrimSpace(*u.Name)
|
||||
if v == "" {
|
||||
return nil, fmt.Errorf("%w: name cannot be empty", ErrInvalidInput)
|
||||
}
|
||||
cur.Name = v
|
||||
}
|
||||
if u.X != nil {
|
||||
cur.X = *u.X
|
||||
}
|
||||
if u.Y != nil {
|
||||
cur.Y = *u.Y
|
||||
}
|
||||
if u.Width != nil {
|
||||
if *u.Width <= 0 {
|
||||
return nil, fmt.Errorf("%w: width must be positive", ErrInvalidInput)
|
||||
}
|
||||
cur.Width = *u.Width
|
||||
}
|
||||
if u.Height != nil {
|
||||
if *u.Height <= 0 {
|
||||
return nil, fmt.Errorf("%w: height must be positive", ErrInvalidInput)
|
||||
}
|
||||
cur.Height = *u.Height
|
||||
}
|
||||
if _, err := s.db.Exec(
|
||||
`UPDATE frames
|
||||
SET name = ?, x = ?, y = ?, width = ?, height = ?, updated_at = datetime('now')
|
||||
WHERE id = ? AND project_id = ?`,
|
||||
cur.Name, cur.X, cur.Y, cur.Width, cur.Height, id, projectID,
|
||||
); err != nil {
|
||||
return nil, mapWriteErr(err)
|
||||
}
|
||||
return s.GetFrame(projectID, id)
|
||||
}
|
||||
|
||||
// DeleteFrame removes a frame. Devices with `frame_id = id` keep existing
|
||||
// — the schema's ON DELETE SET NULL drops their frame_id to NULL so they
|
||||
// stay in the project as "outside a frame".
|
||||
func (s *Store) DeleteFrame(projectID, id int64) error {
|
||||
if _, err := s.GetFrame(projectID, id); err != nil {
|
||||
return err
|
||||
}
|
||||
if _, err := s.db.Exec(
|
||||
`DELETE FROM frames WHERE id = ? AND project_id = ?`, id, projectID,
|
||||
); err != nil {
|
||||
return err
|
||||
}
|
||||
return nil
|
||||
}
|
||||
|
||||
// -----------------------------------------------------------------------------
|
||||
// Devices
|
||||
// -----------------------------------------------------------------------------
|
||||
|
||||
// DeviceCreate is the create-shape. FrameID may be nil ("outside any frame").
|
||||
type DeviceCreate struct {
|
||||
Name string
|
||||
FrameID *int64
|
||||
Color string
|
||||
X float64
|
||||
Y float64
|
||||
Width float64
|
||||
Height float64
|
||||
}
|
||||
|
||||
// DeviceUpdate is the partial-update shape. project_id deliberately not
|
||||
// settable. FrameID is *(*int64) so callers can distinguish "leave as-is"
|
||||
// (nil) from "set to NULL" (&nil) — Go syntax: pass a *(*int64) where the
|
||||
// inner pointer is nil to clear.
|
||||
type DeviceUpdate struct {
|
||||
Name *string
|
||||
FrameID FrameRef // see FrameRef below
|
||||
Color *string
|
||||
X *float64
|
||||
Y *float64
|
||||
Width *float64
|
||||
Height *float64
|
||||
}
|
||||
|
||||
// FrameRef encodes a tri-state for the FrameID PATCH:
|
||||
//
|
||||
// Set=false → leave the field untouched
|
||||
// Set=true, ID=nil → set to NULL (device leaves all frames)
|
||||
// Set=true, ID=&someInt → set to that frame id (must be in same project)
|
||||
type FrameRef struct {
|
||||
Set bool
|
||||
ID *int64
|
||||
}
|
||||
|
||||
// CreateDevice inserts a new device. FrameID, if provided, must reference
|
||||
// a frame in the same project.
|
||||
func (s *Store) CreateDevice(projectID int64, d DeviceCreate) (*Device, error) {
|
||||
name := strings.TrimSpace(d.Name)
|
||||
if name == "" {
|
||||
return nil, fmt.Errorf("%w: name is required", ErrInvalidInput)
|
||||
}
|
||||
if d.Width <= 0 || d.Height <= 0 {
|
||||
return nil, fmt.Errorf("%w: width and height must be positive", ErrInvalidInput)
|
||||
}
|
||||
if _, err := s.GetProject(projectID); err != nil {
|
||||
return nil, err
|
||||
}
|
||||
if d.FrameID != nil {
|
||||
if _, err := s.GetFrame(projectID, *d.FrameID); err != nil {
|
||||
if errors.Is(err, ErrNotFound) {
|
||||
return nil, fmt.Errorf("%w: frame_id %d not in project %d", ErrInvalidInput, *d.FrameID, projectID)
|
||||
}
|
||||
return nil, err
|
||||
}
|
||||
}
|
||||
color := strings.TrimSpace(d.Color)
|
||||
if color == "" {
|
||||
color = "#1e1e1e"
|
||||
}
|
||||
|
||||
res, err := s.db.Exec(
|
||||
`INSERT INTO devices (project_id, frame_id, name, color, x, y, width, height)
|
||||
VALUES (?, ?, ?, ?, ?, ?, ?, ?)`,
|
||||
projectID, nullableInt64(d.FrameID), name, color, d.X, d.Y, d.Width, d.Height,
|
||||
)
|
||||
if err != nil {
|
||||
return nil, mapWriteErr(err)
|
||||
}
|
||||
id, _ := res.LastInsertId()
|
||||
return s.GetDevice(projectID, id)
|
||||
}
|
||||
|
||||
// GetDevice loads a device, project-scoped.
|
||||
func (s *Store) GetDevice(projectID, id int64) (*Device, error) {
|
||||
var d Device
|
||||
var frame sql.NullInt64
|
||||
var ex sql.NullString
|
||||
err := s.db.QueryRow(
|
||||
`SELECT id, project_id, frame_id, name, color, x, y, width, height, excalidraw_id, created_at, updated_at
|
||||
FROM devices WHERE id = ? AND project_id = ?`, id, projectID,
|
||||
).Scan(&d.ID, &d.ProjectID, &frame, &d.Name, &d.Color, &d.X, &d.Y, &d.Width, &d.Height,
|
||||
&ex, &d.CreatedAt, &d.UpdatedAt)
|
||||
if errors.Is(err, sql.ErrNoRows) {
|
||||
return nil, ErrNotFound
|
||||
}
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
if frame.Valid {
|
||||
v := frame.Int64
|
||||
d.FrameID = &v
|
||||
}
|
||||
if ex.Valid {
|
||||
d.ExcalidrawID = &ex.String
|
||||
}
|
||||
return &d, nil
|
||||
}
|
||||
|
||||
// ListDevices returns devices in a project. If frameID is non-nil and
|
||||
// dereferences to a value, only devices with that frame_id are returned;
|
||||
// if frameID dereferences to nil (i.e. caller passed &FrameRef{Set:true,ID:nil})
|
||||
// — actually this signature uses *int64 directly: pass nil for "all
|
||||
// devices", or pass &someInt for "devices in that frame". The empty-
|
||||
// "outside-any-frame" filter isn't exposed yet — slice 2 doesn't need it.
|
||||
func (s *Store) ListDevices(projectID int64, frameID *int64) ([]Device, error) {
|
||||
var (
|
||||
rows *sql.Rows
|
||||
err error
|
||||
)
|
||||
if frameID != nil {
|
||||
rows, err = s.db.Query(
|
||||
`SELECT id, project_id, frame_id, name, color, x, y, width, height, excalidraw_id, created_at, updated_at
|
||||
FROM devices WHERE project_id = ? AND frame_id = ? ORDER BY created_at, id`,
|
||||
projectID, *frameID,
|
||||
)
|
||||
} else {
|
||||
rows, err = s.db.Query(
|
||||
`SELECT id, project_id, frame_id, name, color, x, y, width, height, excalidraw_id, created_at, updated_at
|
||||
FROM devices WHERE project_id = ? ORDER BY created_at, id`,
|
||||
projectID,
|
||||
)
|
||||
}
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
defer rows.Close()
|
||||
out := []Device{}
|
||||
for rows.Next() {
|
||||
var d Device
|
||||
var frame sql.NullInt64
|
||||
var ex sql.NullString
|
||||
if err := rows.Scan(&d.ID, &d.ProjectID, &frame, &d.Name, &d.Color, &d.X, &d.Y, &d.Width, &d.Height,
|
||||
&ex, &d.CreatedAt, &d.UpdatedAt); err != nil {
|
||||
return nil, err
|
||||
}
|
||||
if frame.Valid {
|
||||
v := frame.Int64
|
||||
d.FrameID = &v
|
||||
}
|
||||
if ex.Valid {
|
||||
d.ExcalidrawID = &ex.String
|
||||
}
|
||||
out = append(out, d)
|
||||
}
|
||||
return out, rows.Err()
|
||||
}
|
||||
|
||||
// UpdateDevice applies a partial update. FrameID is tri-state — see FrameRef.
|
||||
// A FrameID set to a non-nil ID must reference a frame in the same project.
|
||||
func (s *Store) UpdateDevice(projectID, id int64, u DeviceUpdate) (*Device, error) {
|
||||
cur, err := s.GetDevice(projectID, id)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
if u.Name != nil {
|
||||
v := strings.TrimSpace(*u.Name)
|
||||
if v == "" {
|
||||
return nil, fmt.Errorf("%w: name cannot be empty", ErrInvalidInput)
|
||||
}
|
||||
cur.Name = v
|
||||
}
|
||||
if u.Color != nil {
|
||||
v := strings.TrimSpace(*u.Color)
|
||||
if v == "" {
|
||||
return nil, fmt.Errorf("%w: color cannot be empty", ErrInvalidInput)
|
||||
}
|
||||
cur.Color = v
|
||||
}
|
||||
if u.X != nil {
|
||||
cur.X = *u.X
|
||||
}
|
||||
if u.Y != nil {
|
||||
cur.Y = *u.Y
|
||||
}
|
||||
if u.Width != nil {
|
||||
if *u.Width <= 0 {
|
||||
return nil, fmt.Errorf("%w: width must be positive", ErrInvalidInput)
|
||||
}
|
||||
cur.Width = *u.Width
|
||||
}
|
||||
if u.Height != nil {
|
||||
if *u.Height <= 0 {
|
||||
return nil, fmt.Errorf("%w: height must be positive", ErrInvalidInput)
|
||||
}
|
||||
cur.Height = *u.Height
|
||||
}
|
||||
if u.FrameID.Set {
|
||||
if u.FrameID.ID != nil {
|
||||
if _, err := s.GetFrame(projectID, *u.FrameID.ID); err != nil {
|
||||
if errors.Is(err, ErrNotFound) {
|
||||
return nil, fmt.Errorf("%w: frame_id %d not in project %d", ErrInvalidInput, *u.FrameID.ID, projectID)
|
||||
}
|
||||
return nil, err
|
||||
}
|
||||
}
|
||||
cur.FrameID = u.FrameID.ID
|
||||
}
|
||||
if _, err := s.db.Exec(
|
||||
`UPDATE devices
|
||||
SET frame_id = ?, name = ?, color = ?, x = ?, y = ?, width = ?, height = ?, updated_at = datetime('now')
|
||||
WHERE id = ? AND project_id = ?`,
|
||||
nullableInt64(cur.FrameID), cur.Name, cur.Color, cur.X, cur.Y, cur.Width, cur.Height, id, projectID,
|
||||
); err != nil {
|
||||
return nil, mapWriteErr(err)
|
||||
}
|
||||
return s.GetDevice(projectID, id)
|
||||
}
|
||||
|
||||
// DeleteDevice removes a device from a project.
|
||||
func (s *Store) DeleteDevice(projectID, id int64) error {
|
||||
if _, err := s.GetDevice(projectID, id); err != nil {
|
||||
return err
|
||||
}
|
||||
if _, err := s.db.Exec(
|
||||
`DELETE FROM devices WHERE id = ? AND project_id = ?`, id, projectID,
|
||||
); err != nil {
|
||||
return err
|
||||
}
|
||||
return nil
|
||||
}
|
||||
|
||||
// nullableInt64 converts a *int64 into a sql.NullInt64 so we can pass it
|
||||
// straight into a parameterised query.
|
||||
func nullableInt64(p *int64) any {
|
||||
if p == nil {
|
||||
return nil
|
||||
}
|
||||
return *p
|
||||
}
|
||||
235
internal/db/frames_devices_test.go
Normal file
235
internal/db/frames_devices_test.go
Normal file
@@ -0,0 +1,235 @@
|
||||
package db
|
||||
|
||||
import (
|
||||
"errors"
|
||||
"testing"
|
||||
)
|
||||
|
||||
// ----------------------------------------------------------------------- frames
|
||||
|
||||
func TestCreateFrame_Basics(t *testing.T) {
|
||||
s := newTestStore(t)
|
||||
p, _ := s.CreateProject("LOFT", "", "")
|
||||
f, err := s.CreateFrame(p.ID, FrameCreate{Name: "desk", X: 10, Y: 20, Width: 800, Height: 600})
|
||||
if err != nil {
|
||||
t.Fatalf("create: %v", err)
|
||||
}
|
||||
if f.ProjectID != p.ID || f.Name != "desk" || f.Width != 800 {
|
||||
t.Errorf("unexpected frame: %+v", f)
|
||||
}
|
||||
}
|
||||
|
||||
func TestCreateFrame_RejectsZeroSize(t *testing.T) {
|
||||
s := newTestStore(t)
|
||||
p, _ := s.CreateProject("LOFT", "", "")
|
||||
if _, err := s.CreateFrame(p.ID, FrameCreate{Name: "x", Width: 0, Height: 50}); !errors.Is(err, ErrInvalidInput) {
|
||||
t.Errorf("zero width should be ErrInvalidInput; got %v", err)
|
||||
}
|
||||
if _, err := s.CreateFrame(p.ID, FrameCreate{Name: "y", Width: 50, Height: 0}); !errors.Is(err, ErrInvalidInput) {
|
||||
t.Errorf("zero height should be ErrInvalidInput; got %v", err)
|
||||
}
|
||||
}
|
||||
|
||||
func TestCreateFrame_DuplicateNameInSameProject(t *testing.T) {
|
||||
s := newTestStore(t)
|
||||
p, _ := s.CreateProject("LOFT", "", "")
|
||||
if _, err := s.CreateFrame(p.ID, FrameCreate{Name: "desk", Width: 100, Height: 50}); err != nil {
|
||||
t.Fatalf("first: %v", err)
|
||||
}
|
||||
if _, err := s.CreateFrame(p.ID, FrameCreate{Name: "desk", Width: 200, Height: 70}); !errors.Is(err, ErrConflict) {
|
||||
t.Errorf("duplicate frame name should ErrConflict; got %v", err)
|
||||
}
|
||||
}
|
||||
|
||||
func TestCreateFrame_SameNameAcrossProjectsOK(t *testing.T) {
|
||||
s := newTestStore(t)
|
||||
p1, _ := s.CreateProject("LOFT", "", "")
|
||||
p2, _ := s.CreateProject("OFFICE", "", "")
|
||||
if _, err := s.CreateFrame(p1.ID, FrameCreate{Name: "desk", Width: 100, Height: 50}); err != nil {
|
||||
t.Fatalf("p1: %v", err)
|
||||
}
|
||||
if _, err := s.CreateFrame(p2.ID, FrameCreate{Name: "desk", Width: 100, Height: 50}); err != nil {
|
||||
t.Fatalf("p2: %v", err)
|
||||
}
|
||||
}
|
||||
|
||||
func TestGetFrame_WrongProjectIsNotFound(t *testing.T) {
|
||||
s := newTestStore(t)
|
||||
p1, _ := s.CreateProject("LOFT", "", "")
|
||||
p2, _ := s.CreateProject("OFFICE", "", "")
|
||||
f, _ := s.CreateFrame(p1.ID, FrameCreate{Name: "desk", Width: 100, Height: 50})
|
||||
if _, err := s.GetFrame(p2.ID, f.ID); !errors.Is(err, ErrNotFound) {
|
||||
t.Errorf("cross-project GetFrame should be ErrNotFound; got %v", err)
|
||||
}
|
||||
}
|
||||
|
||||
func TestListFrames_OrderedByCreation(t *testing.T) {
|
||||
s := newTestStore(t)
|
||||
p, _ := s.CreateProject("LOFT", "", "")
|
||||
for _, n := range []string{"rack", "desk", "media"} {
|
||||
if _, err := s.CreateFrame(p.ID, FrameCreate{Name: n, Width: 100, Height: 50}); err != nil {
|
||||
t.Fatalf("create %s: %v", n, err)
|
||||
}
|
||||
}
|
||||
got, _ := s.ListFrames(p.ID)
|
||||
if len(got) != 3 {
|
||||
t.Fatalf("len = %d", len(got))
|
||||
}
|
||||
if got[0].Name != "rack" || got[2].Name != "media" {
|
||||
t.Errorf("order = %v", []string{got[0].Name, got[1].Name, got[2].Name})
|
||||
}
|
||||
}
|
||||
|
||||
func TestUpdateFrame_PartialFields(t *testing.T) {
|
||||
s := newTestStore(t)
|
||||
p, _ := s.CreateProject("LOFT", "", "")
|
||||
f, _ := s.CreateFrame(p.ID, FrameCreate{Name: "desk", X: 0, Y: 0, Width: 100, Height: 50})
|
||||
nx := 42.0
|
||||
updated, err := s.UpdateFrame(p.ID, f.ID, FrameUpdate{X: &nx})
|
||||
if err != nil {
|
||||
t.Fatalf("update: %v", err)
|
||||
}
|
||||
if updated.X != 42 || updated.Name != "desk" || updated.Width != 100 {
|
||||
t.Errorf("got %+v", updated)
|
||||
}
|
||||
}
|
||||
|
||||
func TestDeleteFrame_SetsDeviceFrameIDToNull(t *testing.T) {
|
||||
s := newTestStore(t)
|
||||
p, _ := s.CreateProject("LOFT", "", "")
|
||||
f, _ := s.CreateFrame(p.ID, FrameCreate{Name: "desk", Width: 800, Height: 600})
|
||||
d, _ := s.CreateDevice(p.ID, DeviceCreate{Name: "Mac", FrameID: &f.ID, X: 10, Y: 20, Width: 100, Height: 35})
|
||||
if d.FrameID == nil || *d.FrameID != f.ID {
|
||||
t.Fatalf("device frame_id pre-delete = %v, want %d", d.FrameID, f.ID)
|
||||
}
|
||||
if err := s.DeleteFrame(p.ID, f.ID); err != nil {
|
||||
t.Fatalf("delete frame: %v", err)
|
||||
}
|
||||
d2, _ := s.GetDevice(p.ID, d.ID)
|
||||
if d2.FrameID != nil {
|
||||
t.Errorf("device frame_id post-delete = %v, want nil (SET NULL)", d2.FrameID)
|
||||
}
|
||||
}
|
||||
|
||||
// ---------------------------------------------------------------------- devices
|
||||
|
||||
func TestCreateDevice_DefaultsColor(t *testing.T) {
|
||||
s := newTestStore(t)
|
||||
p, _ := s.CreateProject("LOFT", "", "")
|
||||
d, err := s.CreateDevice(p.ID, DeviceCreate{Name: "Mac", X: 10, Y: 20, Width: 100, Height: 35})
|
||||
if err != nil {
|
||||
t.Fatalf("create: %v", err)
|
||||
}
|
||||
if d.Color != "#1e1e1e" {
|
||||
t.Errorf("default color = %q, want #1e1e1e", d.Color)
|
||||
}
|
||||
if d.FrameID != nil {
|
||||
t.Errorf("frame_id = %v, want nil for unframed device", d.FrameID)
|
||||
}
|
||||
}
|
||||
|
||||
func TestCreateDevice_DuplicateNameInProject(t *testing.T) {
|
||||
s := newTestStore(t)
|
||||
p, _ := s.CreateProject("LOFT", "", "")
|
||||
if _, err := s.CreateDevice(p.ID, DeviceCreate{Name: "Mac", X: 0, Y: 0, Width: 100, Height: 35}); err != nil {
|
||||
t.Fatalf("first: %v", err)
|
||||
}
|
||||
if _, err := s.CreateDevice(p.ID, DeviceCreate{Name: "Mac", X: 10, Y: 10, Width: 100, Height: 35}); !errors.Is(err, ErrConflict) {
|
||||
t.Errorf("dup device name should ErrConflict; got %v", err)
|
||||
}
|
||||
}
|
||||
|
||||
func TestCreateDevice_CrossProjectFrameRejected(t *testing.T) {
|
||||
s := newTestStore(t)
|
||||
p1, _ := s.CreateProject("LOFT", "", "")
|
||||
p2, _ := s.CreateProject("OFFICE", "", "")
|
||||
f2, _ := s.CreateFrame(p2.ID, FrameCreate{Name: "desk", Width: 100, Height: 50})
|
||||
// Try to put a LOFT device into an OFFICE frame.
|
||||
_, err := s.CreateDevice(p1.ID, DeviceCreate{Name: "Mac", FrameID: &f2.ID, X: 0, Y: 0, Width: 100, Height: 35})
|
||||
if !errors.Is(err, ErrInvalidInput) {
|
||||
t.Errorf("cross-project frame_id should ErrInvalidInput; got %v", err)
|
||||
}
|
||||
}
|
||||
|
||||
func TestUpdateDevice_FrameIDTriState(t *testing.T) {
|
||||
s := newTestStore(t)
|
||||
p, _ := s.CreateProject("LOFT", "", "")
|
||||
f1, _ := s.CreateFrame(p.ID, FrameCreate{Name: "desk", Width: 100, Height: 50})
|
||||
f2, _ := s.CreateFrame(p.ID, FrameCreate{Name: "rack", Width: 100, Height: 50})
|
||||
d, _ := s.CreateDevice(p.ID, DeviceCreate{Name: "Mac", FrameID: &f1.ID, X: 0, Y: 0, Width: 100, Height: 35})
|
||||
|
||||
// Leave alone (FrameID.Set=false) — even passing a different X.
|
||||
nx := 99.0
|
||||
u1, _ := s.UpdateDevice(p.ID, d.ID, DeviceUpdate{X: &nx})
|
||||
if u1.FrameID == nil || *u1.FrameID != f1.ID {
|
||||
t.Errorf("frame_id should be unchanged (f1); got %v", u1.FrameID)
|
||||
}
|
||||
|
||||
// Move to f2.
|
||||
u2, _ := s.UpdateDevice(p.ID, d.ID, DeviceUpdate{FrameID: FrameRef{Set: true, ID: &f2.ID}})
|
||||
if u2.FrameID == nil || *u2.FrameID != f2.ID {
|
||||
t.Errorf("frame_id should be f2; got %v", u2.FrameID)
|
||||
}
|
||||
|
||||
// Clear (move outside any frame).
|
||||
u3, _ := s.UpdateDevice(p.ID, d.ID, DeviceUpdate{FrameID: FrameRef{Set: true, ID: nil}})
|
||||
if u3.FrameID != nil {
|
||||
t.Errorf("frame_id should be nil after Set:true,ID:nil; got %v", *u3.FrameID)
|
||||
}
|
||||
}
|
||||
|
||||
func TestUpdateDevice_RejectsCrossProjectFrame(t *testing.T) {
|
||||
s := newTestStore(t)
|
||||
p1, _ := s.CreateProject("LOFT", "", "")
|
||||
p2, _ := s.CreateProject("OFFICE", "", "")
|
||||
d, _ := s.CreateDevice(p1.ID, DeviceCreate{Name: "Mac", X: 0, Y: 0, Width: 100, Height: 35})
|
||||
f2, _ := s.CreateFrame(p2.ID, FrameCreate{Name: "desk", Width: 100, Height: 50})
|
||||
_, err := s.UpdateDevice(p1.ID, d.ID, DeviceUpdate{FrameID: FrameRef{Set: true, ID: &f2.ID}})
|
||||
if !errors.Is(err, ErrInvalidInput) {
|
||||
t.Errorf("cross-project frame_id should ErrInvalidInput; got %v", err)
|
||||
}
|
||||
}
|
||||
|
||||
func TestListDevices_FilterByFrame(t *testing.T) {
|
||||
s := newTestStore(t)
|
||||
p, _ := s.CreateProject("LOFT", "", "")
|
||||
f1, _ := s.CreateFrame(p.ID, FrameCreate{Name: "desk", Width: 100, Height: 50})
|
||||
f2, _ := s.CreateFrame(p.ID, FrameCreate{Name: "rack", Width: 100, Height: 50})
|
||||
_, _ = s.CreateDevice(p.ID, DeviceCreate{Name: "A", FrameID: &f1.ID, Width: 100, Height: 35})
|
||||
_, _ = s.CreateDevice(p.ID, DeviceCreate{Name: "B", FrameID: &f2.ID, Width: 100, Height: 35})
|
||||
_, _ = s.CreateDevice(p.ID, DeviceCreate{Name: "C", Width: 100, Height: 35}) // outside
|
||||
|
||||
all, _ := s.ListDevices(p.ID, nil)
|
||||
if len(all) != 3 {
|
||||
t.Errorf("all len = %d, want 3", len(all))
|
||||
}
|
||||
inF1, _ := s.ListDevices(p.ID, &f1.ID)
|
||||
if len(inF1) != 1 || inF1[0].Name != "A" {
|
||||
t.Errorf("inF1 = %+v", inF1)
|
||||
}
|
||||
}
|
||||
|
||||
func TestSnapshot_PopulatesFramesAndDevices(t *testing.T) {
|
||||
s := newTestStore(t)
|
||||
p, _ := s.CreateProject("LOFT", "", "")
|
||||
f, _ := s.CreateFrame(p.ID, FrameCreate{Name: "desk", Width: 100, Height: 50})
|
||||
_, _ = s.CreateDevice(p.ID, DeviceCreate{Name: "Mac", FrameID: &f.ID, Width: 100, Height: 35})
|
||||
snap, err := s.Snapshot(p.ID)
|
||||
if err != nil {
|
||||
t.Fatalf("snapshot: %v", err)
|
||||
}
|
||||
if len(snap.Frames) != 1 || len(snap.Devices) != 1 {
|
||||
t.Errorf("snapshot frames=%d devices=%d", len(snap.Frames), len(snap.Devices))
|
||||
}
|
||||
if len(snap.CableTypes) != 5 {
|
||||
t.Errorf("cable_types = %d, want 5", len(snap.CableTypes))
|
||||
}
|
||||
}
|
||||
|
||||
func TestDeleteDevice_NotFoundIsNotFound(t *testing.T) {
|
||||
s := newTestStore(t)
|
||||
p, _ := s.CreateProject("LOFT", "", "")
|
||||
if err := s.DeleteDevice(p.ID, 999); !errors.Is(err, ErrNotFound) {
|
||||
t.Errorf("got %v, want ErrNotFound", err)
|
||||
}
|
||||
}
|
||||
@@ -19,13 +19,43 @@ type CableType struct {
|
||||
UpdatedAt string `json:"updated_at"`
|
||||
}
|
||||
|
||||
// Frame is a sub-zone inside a project (`desk`, `rack`, …).
|
||||
type Frame struct {
|
||||
ID int64 `json:"id"`
|
||||
ProjectID int64 `json:"project_id"`
|
||||
Name string `json:"name"`
|
||||
X float64 `json:"x"`
|
||||
Y float64 `json:"y"`
|
||||
Width float64 `json:"width"`
|
||||
Height float64 `json:"height"`
|
||||
ExcalidrawID *string `json:"excalidraw_id,omitempty"`
|
||||
CreatedAt string `json:"created_at"`
|
||||
UpdatedAt string `json:"updated_at"`
|
||||
}
|
||||
|
||||
// Device is a hardware item inside a project, optionally inside a frame.
|
||||
type Device struct {
|
||||
ID int64 `json:"id"`
|
||||
ProjectID int64 `json:"project_id"`
|
||||
FrameID *int64 `json:"frame_id"` // nullable: device "outside" any frame
|
||||
Name string `json:"name"`
|
||||
Color string `json:"color"`
|
||||
X float64 `json:"x"`
|
||||
Y float64 `json:"y"`
|
||||
Width float64 `json:"width"`
|
||||
Height float64 `json:"height"`
|
||||
ExcalidrawID *string `json:"excalidraw_id,omitempty"`
|
||||
CreatedAt string `json:"created_at"`
|
||||
UpdatedAt string `json:"updated_at"`
|
||||
}
|
||||
|
||||
// Snapshot is the editor's one-shot loader payload for a single project.
|
||||
// Slice 1 returns the project + the global cable_types; the other arrays
|
||||
// are present but empty until later slices ship their CRUD.
|
||||
// Arrays for collections still gated by future slices stay non-nil [] so
|
||||
// JSON encodes as [] not null.
|
||||
type Snapshot struct {
|
||||
Project Project `json:"project"`
|
||||
Frames []any `json:"frames"`
|
||||
Devices []any `json:"devices"`
|
||||
Frames []Frame `json:"frames"`
|
||||
Devices []Device `json:"devices"`
|
||||
Ports []any `json:"ports"`
|
||||
Cables []any `json:"cables"`
|
||||
IOMarkers []any `json:"io_markers"`
|
||||
|
||||
@@ -147,8 +147,9 @@ func (s *Store) DeleteProject(id int64, confirmName string) error {
|
||||
return nil
|
||||
}
|
||||
|
||||
// Snapshot loads the full editor-init payload for one project. In slice
|
||||
// 1 the project-scoped collections are still empty.
|
||||
// Snapshot loads the full editor-init payload for one project. Slice 2
|
||||
// populates frames + devices; ports / cables / io_markers / bundles
|
||||
// still ship empty until their slices land.
|
||||
func (s *Store) Snapshot(id int64) (*Snapshot, error) {
|
||||
p, err := s.GetProject(id)
|
||||
if err != nil {
|
||||
@@ -158,10 +159,18 @@ func (s *Store) Snapshot(id int64) (*Snapshot, error) {
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
frames, err := s.ListFrames(id)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
devices, err := s.ListDevices(id, nil)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
return &Snapshot{
|
||||
Project: *p,
|
||||
Frames: []any{},
|
||||
Devices: []any{},
|
||||
Frames: frames,
|
||||
Devices: devices,
|
||||
Ports: []any{},
|
||||
Cables: []any{},
|
||||
IOMarkers: []any{},
|
||||
|
||||
Reference in New Issue
Block a user