CUB-130: Build Add/Edit Filament form with backend endpoints for finishes and modifiers

backend/cmd/server/main.go

@@ -11,10 +11,8 @@ import (
 
 	"github.com/CubeCraft-Creations/Extrudex/backend/internal/config"
 	"github.com/CubeCraft-Creations/Extrudex/backend/internal/db"
-	"github.com/CubeCraft-Creations/Extrudex/backend/internal/repositories"
 	"github.com/CubeCraft-Creations/Extrudex/backend/internal/router"
 	"github.com/CubeCraft-Creations/Extrudex/backend/internal/sse"
-	"github.com/CubeCraft-Creations/Extrudex/backend/internal/workers"
 )
 
 func main() {
@@ -42,11 +40,6 @@ func main() {
 
 	slog.Info("database connected")
 
-	// Repositories (for background workers)
-	printerRepo := repositories.NewPrinterRepository(dbPool)
-	jobRepo := repositories.NewPrintJobRepository(dbPool)
-	usageLogRepo := repositories.NewUsageLogRepository(dbPool)
-
 	// Create SSE broadcaster and start it
 	sseBC := sse.NewBroadcaster(128)
 	sseBC.Start()
@@ -54,19 +47,6 @@ func main() {
 
 	slog.Info("sse broadcaster started")
 
-	// Start background workers
-	mrCfg := workers.DefaultMoonrakerPollerConfig()
-	mrPoller := workers.NewMoonrakerPoller(mrCfg, dbPool, printerRepo, jobRepo, usageLogRepo, sseBC)
-	mrPoller.Start()
-	defer mrPoller.Stop()
-
-	mqttCfg := workers.DefaultMQTTSubscriberConfig()
-	mqttSub := workers.NewMQTTSubscriber(mqttCfg, dbPool, printerRepo, usageLogRepo, sseBC)
-	mqttSub.Start()
-	defer mqttSub.Stop()
-
-	slog.Info("background workers started")
-
 	// Create router
 	r := router.New(cfg, dbPool, sseBC)
 

backend/internal/clients/moonraker.go

@@ -1,161 +0,0 @@
-// Package clients provides third-party printer integrations.
-package clients
-
-import (
-	"context"
-	"encoding/json"
-	"fmt"
-	"log/slog"
-	"net/http"
-	"time"
-)
-
-// MoonrakerPrinterInfo represents the response from /api/printer/info.
-type MoonrakerPrinterInfo struct {
-	State      string `json:"state"`
-	Hostname   string `json:"hostname,omitempty"`
-	SoftwareVersion string `json:"software_version,omitempty"`
-}
-
-// MoonrakerPrintStats represents the response from /api/printer/print_stats.
-type MoonrakerPrintStats struct {
-	State            string  `json:"state"`
-	Filename         string  `json:"filename,omitempty"`
-	FilamentUsedMm   float64 `json:"filament_used,omitempty"`
-	TotalDuration    float64 `json:"total_duration,omitempty"`
-	PrintDuration    float64 `json:"print_duration,omitempty"`
-	Message          string  `json:"message,omitempty"`
-}
-
-// MoonrakerPrintJob represents a single job from the history API.
-type MoonrakerPrintJob struct {
-	JobID          string    `json:"job_id,omitempty"`
-	Filename       string    `json:"filename"`
-	Status         string    `json:"status"`
-	StartTime      time.Time `json:"start_time"`
-	EndTime        time.Time `json:"end_time,omitempty"`
-	FilamentUsedMm float64   `json:"filament_used,omitempty"`
-	TotalDuration  float64   `json:"total_duration,omitempty"`
-}
-
-// MoonrakerHistoryResponse represents the response from /api/server/history/job.
-type MoonrakerHistoryResponse struct {
-	Items []MoonrakerPrintJob `json:"jobs"`
-}
-
-// MoonrakerClient is an HTTP client for the Moonraker API.
-type MoonrakerClient struct {
-	HTTPClient *http.Client
-}
-
-// NewMoonrakerClient creates a MoonrakerClient with the given request timeout.
-func NewMoonrakerClient(timeout time.Duration) *MoonrakerClient {
-	return &MoonrakerClient{
-		HTTPClient: &http.Client{Timeout: timeout},
-	}
-}
-
-// baseURL builds the Moonraker base URL from host and port.
-func (c *MoonrakerClient) baseURL(host string, port int) string {
-	if port == 0 {
-		port = 80
-	}
-	return fmt.Sprintf("http://%s:%d", host, port)
-}
-
-// GetPrinterInfo fetches printer info from Moonraker.
-func (c *MoonrakerClient) GetPrinterInfo(ctx context.Context, host string, port int, apiKey string) (*MoonrakerPrinterInfo, error) {
-	url := c.baseURL(host, port) + "/api/printer/info"
-	req, err := http.NewRequestWithContext(ctx, http.MethodGet, url, nil)
-	if err != nil {
-		return nil, err
-	}
-	if apiKey != "" {
-		req.Header.Set("X-Api-Key", apiKey)
-	}
-
-	resp, err := c.HTTPClient.Do(req)
-	if err != nil {
-		return nil, fmt.Errorf("moonraker getPrinterInfo request failed: %w", err)
-	}
-	defer resp.Body.Close()
-
-	if resp.StatusCode != http.StatusOK {
-		return nil, fmt.Errorf("moonraker getPrinterInfo returned status %d", resp.StatusCode)
-	}
-
-	var body struct {
-		Result MoonrakerPrinterInfo `json:"result"`
-	}
-	if err := json.NewDecoder(resp.Body).Decode(&body); err != nil {
-		return nil, fmt.Errorf("moonraker getPrinterInfo decode failed: %w", err)
-	}
-
-	slog.Debug("moonraker printer info", "host", host, "state", body.Result.State)
-	return &body.Result, nil
-}
-
-// GetPrintStats fetches current print statistics from Moonraker.
-func (c *MoonrakerClient) GetPrintStats(ctx context.Context, host string, port int, apiKey string) (*MoonrakerPrintStats, error) {
-	url := c.baseURL(host, port) + "/api/printer/print_stats"
-	req, err := http.NewRequestWithContext(ctx, http.MethodGet, url, nil)
-	if err != nil {
-		return nil, err
-	}
-	if apiKey != "" {
-		req.Header.Set("X-Api-Key", apiKey)
-	}
-
-	resp, err := c.HTTPClient.Do(req)
-	if err != nil {
-		return nil, fmt.Errorf("moonraker getPrintStats request failed: %w", err)
-	}
-	defer resp.Body.Close()
-
-	if resp.StatusCode != http.StatusOK {
-		return nil, fmt.Errorf("moonraker getPrintStats returned status %d", resp.StatusCode)
-	}
-
-	var body struct {
-		Result MoonrakerPrintStats `json:"result"`
-	}
-	if err := json.NewDecoder(resp.Body).Decode(&body); err != nil {
-		return nil, fmt.Errorf("moonraker getPrintStats decode failed: %w", err)
-	}
-
-	slog.Debug("moonraker print stats", "host", host, "state", body.Result.State, "filename", body.Result.Filename)
-	return &body.Result, nil
-}
-
-// GetPrintHistory fetches completed print job history from Moonraker.
-func (c *MoonrakerClient) GetPrintHistory(ctx context.Context, host string, port int, apiKey string, limit int) (*MoonrakerHistoryResponse, error) {
-	if limit <= 0 {
-		limit = 25
-	}
-	url := fmt.Sprintf("%s/api/server/history/job?limit=%d", c.baseURL(host, port), limit)
-	req, err := http.NewRequestWithContext(ctx, http.MethodGet, url, nil)
-	if err != nil {
-		return nil, err
-	}
-	if apiKey != "" {
-		req.Header.Set("X-Api-Key", apiKey)
-	}
-
-	resp, err := c.HTTPClient.Do(req)
-	if err != nil {
-		return nil, fmt.Errorf("moonraker getPrintHistory request failed: %w", err)
-	}
-	defer resp.Body.Close()
-
-	if resp.StatusCode != http.StatusOK {
-		return nil, fmt.Errorf("moonraker getPrintHistory returned status %d", resp.StatusCode)
-	}
-
-	var body MoonrakerHistoryResponse
-	if err := json.NewDecoder(resp.Body).Decode(&body); err != nil {
-		return nil, fmt.Errorf("moonraker getPrintHistory decode failed: %w", err)
-	}
-
-	slog.Debug("moonraker print history", "host", host, "count", len(body.Items))
-	return &body, nil
-}

backend/internal/clients/mqtt.go

@@ -1,119 +0,0 @@
-// Package clients provides third-party printer integrations.
-package clients
-
-import (
-	"context"
-	"crypto/tls"
-	"encoding/json"
-	"fmt"
-	"log/slog"
-	"time"
-
-	mqtt "github.com/eclipse/paho.mqtt.golang"
-)
-
-// MQTTClient wraps the Eclipse Paho MQTT client for printer telemetry.
-type MQTTClient struct {
-	client mqtt.Client
-}
-
-// MQTTConfig holds per-printer MQTT connection settings.
-type MQTTConfig struct {
-	BrokerHost  string
-	BrokerPort  int
-	TopicPrefix string
-	TLSEnabled  bool
-	ClientID    string
-}
-
-// BambuPrintStatus is the known Bambu Lab print-status payload shape.
-type BambuPrintStatus struct {
-	Print struct {
-		GcodeFile       string  `json:"gcode_file,omitempty"`
-		Stage           int     `json:"stage,omitempty"`
-		SubTaskName     string  `json:"subtask_name,omitempty"`
-		PrintType       string  `json:"print_type,omitempty"`
-		FilamentUsedMm  float64 `json:"mc_percent,omitempty"` // placeholder; real telemetry varies
-	} `json:"print,omitempty"`
-}
-
-// NewMQTTClient creates an MQTT client connected to the given broker.
-func NewMQTTClient(cfg MQTTConfig) (*MQTTClient, error) {
-	if cfg.BrokerPort == 0 {
-		if cfg.TLSEnabled {
-			cfg.BrokerPort = 8883
-		} else {
-			cfg.BrokerPort = 1883
-		}
-	}
-	if cfg.ClientID == "" {
-		cfg.ClientID = fmt.Sprintf("extrudex-%d", time.Now().Unix())
-	}
-
-	opts := mqtt.NewClientOptions().
-		AddBroker(fmt.Sprintf("tcp://%s:%d", cfg.BrokerHost, cfg.BrokerPort)).
-		SetClientID(cfg.ClientID).
-		SetAutoReconnect(true).
-		SetConnectTimeout(10 * time.Second).
-		SetOrderMatters(false)
-
-	if cfg.TLSEnabled {
-		opts = opts.SetTLSConfig(&tls.Config{InsecureSkipVerify: false})
-	}
-
-	client := mqtt.NewClient(opts)
-	token := client.Connect()
-	if token.Wait() && token.Error() != nil {
-		return nil, fmt.Errorf("mqtt connect failed: %w", token.Error())
-	}
-
-	slog.Info("mqtt client connected", "broker", cfg.BrokerHost, "port", cfg.BrokerPort, "tls", cfg.TLSEnabled)
-	return &MQTTClient{client: client}, nil
-}
-
-// Subscribe registers a callback for messages matching topic.
-func (c *MQTTClient) Subscribe(topic string, qos byte, callback func([]byte)) error {
-	token := c.client.Subscribe(topic, qos, func(_ mqtt.Client, msg mqtt.Message) {
-		callback(msg.Payload())
-	})
-	if token.Wait() && token.Error() != nil {
-		return fmt.Errorf("mqtt subscribe failed: %w", token.Error())
-	}
-	slog.Info("mqtt subscribed", "topic", topic, "qos", qos)
-	return nil
-}
-
-// Unsubscribe removes a subscription.
-func (c *MQTTClient) Unsubscribe(topics ...string) error {
-	token := c.client.Unsubscribe(topics...)
-	if token.Wait() && token.Error() != nil {
-		return fmt.Errorf("mqtt unsubscribe failed: %w", token.Error())
-	}
-	return nil
-}
-
-// Disconnect cleanly disconnects the MQTT client.
-func (c *MQTTClient) Disconnect(quiesceMs uint) {
-	c.client.Disconnect(quiesceMs)
-}
-
-// IsConnected returns whether the underlying client is connected.
-func (c *MQTTClient) IsConnected() bool {
-	return c.client.IsConnected()
-}
-
-// ParseBambuTelemetry attempts to parse a Bambu Lab telemetry JSON payload.
-func ParseBambuTelemetry(payload []byte) (*BambuPrintStatus, error) {
-	var msg BambuPrintStatus
-	if err := json.Unmarshal(payload, &msg); err != nil {
-		return nil, fmt.Errorf("parse bambu telemetry failed: %w", err)
-	}
-	return &msg, nil
-}
-
-// DefaultBambuTopics returns the default topic patterns for Bambu Lab printers.
-func DefaultBambuTopics(topicPrefix string) []string {
-	return []string{
-		topicPrefix + "/report",
-	}
-}

backend/internal/handlers/material_finish_handler.go

@@ -0,0 +1,34 @@
+package handlers
+
+import (
+	"log/slog"
+	"net/http"
+
+	"github.com/CubeCraft-Creations/Extrudex/backend/internal/dtos"
+	"github.com/CubeCraft-Creations/Extrudex/backend/internal/repositories"
+)
+
+// MaterialFinishHandler handles requests for material finish lookup data.
+type MaterialFinishHandler struct {
+	repo *repositories.MaterialFinishRepository
+}
+
+// NewMaterialFinishHandler creates a MaterialFinishHandler with the given repository.
+func NewMaterialFinishHandler(repo *repositories.MaterialFinishRepository) *MaterialFinishHandler {
+	return &MaterialFinishHandler{repo: repo}
+}
+
+// List handles GET /api/finishes — returns all material finishes.
+func (h *MaterialFinishHandler) List(w http.ResponseWriter, r *http.Request) {
+	finishes, err := h.repo.GetAll(r.Context())
+	if err != nil {
+		slog.Error("failed to list finishes", "error", err)
+		writeJSON(w, http.StatusInternalServerError, dtos.ErrorResponse{
+			Error: "internal server error",
+			Code:  http.StatusInternalServerError,
+		})
+		return
+	}
+
+	writeJSON(w, http.StatusOK, dtos.SingleResponse{Data: finishes})
+}

backend/internal/handlers/material_modifier_handler.go

@@ -0,0 +1,34 @@
+package handlers
+
+import (
+	"log/slog"
+	"net/http"
+
+	"github.com/CubeCraft-Creations/Extrudex/backend/internal/dtos"
+	"github.com/CubeCraft-Creations/Extrudex/backend/internal/repositories"
+)
+
+// MaterialModifierHandler handles requests for material modifier lookup data.
+type MaterialModifierHandler struct {
+	repo *repositories.MaterialModifierRepository
+}
+
+// NewMaterialModifierHandler creates a MaterialModifierHandler with the given repository.
+func NewMaterialModifierHandler(repo *repositories.MaterialModifierRepository) *MaterialModifierHandler {
+	return &MaterialModifierHandler{repo: repo}
+}
+
+// List handles GET /api/modifiers — returns all material modifiers.
+func (h *MaterialModifierHandler) List(w http.ResponseWriter, r *http.Request) {
+	modifiers, err := h.repo.GetAll(r.Context())
+	if err != nil {
+		slog.Error("failed to list modifiers", "error", err)
+		writeJSON(w, http.StatusInternalServerError, dtos.ErrorResponse{
+			Error: "internal server error",
+			Code:  http.StatusInternalServerError,
+		})
+		return
+	}
+
+	writeJSON(w, http.StatusOK, dtos.SingleResponse{Data: modifiers})
+}

backend/internal/repositories/material_finish_repository.go

@@ -0,0 +1,50 @@
+package repositories
+
+import (
+	"context"
+
+	"github.com/CubeCraft-Creations/Extrudex/backend/internal/models"
+	"github.com/jackc/pgx/v5/pgxpool"
+)
+
+// MaterialFinishRepository handles database queries for material finishes.
+type MaterialFinishRepository struct {
+	pool *pgxpool.Pool
+}
+
+// NewMaterialFinishRepository creates a MaterialFinishRepository backed by the given pool.
+func NewMaterialFinishRepository(pool *pgxpool.Pool) *MaterialFinishRepository {
+	return &MaterialFinishRepository{pool: pool}
+}
+
+// GetAll returns all material finishes ordered by name.
+func (r *MaterialFinishRepository) GetAll(ctx context.Context) ([]models.MaterialFinish, error) {
+	rows, err := r.pool.Query(ctx, `
+		SELECT id, name, description, created_at, updated_at
+		FROM material_finishes
+		ORDER BY name
+	`)
+	if err != nil {
+		return nil, err
+	}
+	defer rows.Close()
+
+	var finishes []models.MaterialFinish
+	for rows.Next() {
+		var f models.MaterialFinish
+		if err := rows.Scan(
+			&f.ID, &f.Name, &f.Description,
+			&f.CreatedAt, &f.UpdatedAt,
+		); err != nil {
+			return nil, err
+		}
+		finishes = append(finishes, f)
+	}
+	if err := rows.Err(); err != nil {
+		return nil, err
+	}
+	if finishes == nil {
+		finishes = []models.MaterialFinish{}
+	}
+	return finishes, nil
+}

backend/internal/repositories/material_modifier_repository.go

@@ -0,0 +1,50 @@
+package repositories
+
+import (
+	"context"
+
+	"github.com/CubeCraft-Creations/Extrudex/backend/internal/models"
+	"github.com/jackc/pgx/v5/pgxpool"
+)
+
+// MaterialModifierRepository handles database queries for material modifiers.
+type MaterialModifierRepository struct {
+	pool *pgxpool.Pool
+}
+
+// NewMaterialModifierRepository creates a MaterialModifierRepository backed by the given pool.
+func NewMaterialModifierRepository(pool *pgxpool.Pool) *MaterialModifierRepository {
+	return &MaterialModifierRepository{pool: pool}
+}
+
+// GetAll returns all material modifiers ordered by name.
+func (r *MaterialModifierRepository) GetAll(ctx context.Context) ([]models.MaterialModifier, error) {
+	rows, err := r.pool.Query(ctx, `
+		SELECT id, name, description, created_at, updated_at
+		FROM material_modifiers
+		ORDER BY name
+	`)
+	if err != nil {
+		return nil, err
+	}
+	defer rows.Close()
+
+	var modifiers []models.MaterialModifier
+	for rows.Next() {
+		var m models.MaterialModifier
+		if err := rows.Scan(
+			&m.ID, &m.Name, &m.Description,
+			&m.CreatedAt, &m.UpdatedAt,
+		); err != nil {
+			return nil, err
+		}
+		modifiers = append(modifiers, m)
+	}
+	if err := rows.Err(); err != nil {
+		return nil, err
+	}
+	if modifiers == nil {
+		modifiers = []models.MaterialModifier{}
+	}
+	return modifiers, nil
+}

backend/internal/router/router.go

@@ -45,6 +45,8 @@ func New(cfg *config.Config, dbPool *pgxpool.Pool, sseBC *sse.Broadcaster) chi.R
 
 	// ── Repositories ──────────────────────────────────────────────────────
 	materialRepo := repositories.NewMaterialRepository(dbPool)
+	finishRepo := repositories.NewMaterialFinishRepository(dbPool)
+	modifierRepo := repositories.NewMaterialModifierRepository(dbPool)
 	filamentRepo := repositories.NewFilamentRepository(dbPool)
 	printerRepo := repositories.NewPrinterRepository(dbPool)
 	printJobRepo := repositories.NewPrintJobRepository(dbPool)
@@ -57,6 +59,8 @@ func New(cfg *config.Config, dbPool *pgxpool.Pool, sseBC *sse.Broadcaster) chi.R
 
 	// ── Handlers ──────────────────────────────────────────────────────────
 	materialHandler := handlers.NewMaterialHandler(materialRepo)
+	finishHandler := handlers.NewMaterialFinishHandler(finishRepo)
+	modifierHandler := handlers.NewMaterialModifierHandler(modifierRepo)
 	filamentHandler := handlers.NewFilamentHandler(filamentService)
 	printerHandler := handlers.NewPrinterHandler(printerService)
 	printJobHandler := handlers.NewPrintJobHandler(printJobService)
@@ -66,6 +70,8 @@ func New(cfg *config.Config, dbPool *pgxpool.Pool, sseBC *sse.Broadcaster) chi.R
 	r.Route("/api", func(r chi.Router) {
 		r.Use(middleware.Timeout(60 * time.Second))
 		r.Get("/materials", materialHandler.List)
+		r.Get("/finishes", finishHandler.List)
+		r.Get("/modifiers", modifierHandler.List)
 
 		r.Route("/filaments", func(r chi.Router) {
 			r.Get("/", filamentHandler.List)

backend/internal/workers/moonraker_poller.go

@@ -1,321 +0,0 @@
-// Package workers provides background goroutines for printer telemetry.
-package workers
-
-import (
-	"context"
-	"fmt"
-	"log/slog"
-	"strconv"
-	"time"
-
-	"github.com/CubeCraft-Creations/Extrudex/backend/internal/clients"
-	"github.com/CubeCraft-Creations/Extrudex/backend/internal/models"
-	"github.com/CubeCraft-Creations/Extrudex/backend/internal/repositories"
-	"github.com/CubeCraft-Creations/Extrudex/backend/internal/sse"
-	"github.com/jackc/pgx/v5/pgxpool"
-)
-
-// MoonrakerPollerConfig controls the background polling behaviour.
-type MoonrakerPollerConfig struct {
-	PollInterval   time.Duration
-	RequestTimeout time.Duration
-}
-
-// DefaultMoonrakerPollerConfig returns sensible defaults.
-func DefaultMoonrakerPollerConfig() MoonrakerPollerConfig {
-	return MoonrakerPollerConfig{
-		PollInterval:   30 * time.Second,
-		RequestTimeout: 10 * time.Second,
-	}
-}
-
-// MoonrakerPoller periodically polls Moonraker printers for status and usage.
-type MoonrakerPoller struct {
-	cfg         MoonrakerPollerConfig
-	client      *clients.MoonrakerClient
-	printerRepo *repositories.PrinterRepository
-	jobRepo     *repositories.PrintJobRepository
-	usageRepo   *repositories.UsageLogRepository
-	sseBC       *sse.Broadcaster
-	pool        *pgxpool.Pool
-	stop        chan struct{}
-}
-
-// NewMoonrakerPoller creates a poller. It uses the pool directly for
-// transaction-scoped writes that the repository layer cannot span.
-func NewMoonrakerPoller(
-	cfg MoonrakerPollerConfig,
-	pool *pgxpool.Pool,
-	printerRepo *repositories.PrinterRepository,
-	jobRepo *repositories.PrintJobRepository,
-	usageRepo *repositories.UsageLogRepository,
-	sseBC *sse.Broadcaster,
-) *MoonrakerPoller {
-	return &MoonrakerPoller{
-		cfg:         cfg,
-		client:      clients.NewMoonrakerClient(cfg.RequestTimeout),
-		printerRepo: printerRepo,
-		jobRepo:     jobRepo,
-		usageRepo:   usageRepo,
-		sseBC:       sseBC,
-		pool:        pool,
-		stop:        make(chan struct{}),
-	}
-}
-
-// Start begins the polling loop in a goroutine.
-func (p *MoonrakerPoller) Start() {
-	go p.loop()
-}
-
-// Stop signals the loop to exit.
-func (p *MoonrakerPoller) Stop() {
-	close(p.stop)
-}
-
-func (p *MoonrakerPoller) loop() {
-	ticker := time.NewTicker(p.cfg.PollInterval)
-	defer ticker.Stop()
-
-	// Immediate first tick.
-	p.pollCycle()
-
-	for {
-		select {
-		case <-ticker.C:
-			p.pollCycle()
-		case <-p.stop:
-			slog.Info("moonraker poller stopped")
-			return
-		}
-	}
-}
-
-func (p *MoonrakerPoller) pollCycle() {
-	ctx, cancel := context.WithTimeout(context.Background(), 2*time.Minute)
-	defer cancel()
-
-	printers, err := p.printerRepo.GetAll(ctx)
-	if err != nil {
-		slog.Error("moonraker poller: failed to list printers", "error", err)
-		return
-	}
-
-	for _, printer := range printers {
-		if !printer.IsActive || printer.MoonrakerURL == nil || *printer.MoonrakerURL == "" {
-			continue
-		}
-
-		if err := p.pollPrinter(ctx, printer); err != nil {
-			slog.Warn("moonraker poller: poll failed",
-				"printer", printer.Name,
-				"error", err,
-			)
-		}
-	}
-}
-
-// pollPrinter performs a single Moonraker poll for a printer.
-func (p *MoonrakerPoller) pollPrinter(ctx context.Context, printer models.Printer) error {
-	host := *printer.MoonrakerURL
-	var apiKey string
-	if printer.MoonrakerAPIKey != nil {
-		apiKey = *printer.MoonrakerAPIKey
-	}
-
-	// Fetch printer info (status)
-	info, err := p.client.GetPrinterInfo(ctx, host, 80, apiKey)
-	if err != nil {
-		p.broadcastStatus(printer.ID, printer.Name, "offline")
-		return err
-	}
-
-	status := mapMoonrakerState(info.State)
-	p.broadcastStatus(printer.ID, printer.Name, status)
-
-	// Fetch print stats
-	stats, err := p.client.GetPrintStats(ctx, host, 80, apiKey)
-	if err != nil {
-		return fmt.Errorf("getPrintStats failed: %w", err)
-	}
-
-	if status == "printing" && stats.Filename != "" {
-		p.broadcastJobStarted(printer.ID, stats.Filename)
-	}
-
-	if isCompleteState(stats.State) && stats.FilamentUsedMm > 0 {
-		// Record usage
-		if err := p.recordUsage(ctx, printer, stats); err != nil {
-			slog.Error("moonraker poller: record usage failed",
-				"printer", printer.Name, "error", err)
-		} else {
-			p.broadcastJobCompleted(printer.ID, stats.Filename, stats.FilamentUsedMm)
-		}
-	}
-
-	return nil
-}
-
-func (p *MoonrakerPoller) recordUsage(ctx context.Context, printer models.Printer, stats *clients.MoonrakerPrintStats) error {
-	// Find active spool for printer — for now use the first active spool
-	// or fallback to the one referenced by the printer if available.
-	// In a real scenario we'd query AMS slots or fallback logic.
-	// Here we simply look for the most recently used spool in usage_logs.
-	var spoolID int
-	row := p.pool.QueryRow(ctx, `
-		SELECT filament_spool_id FROM usage_logs
-		WHERE print_job_id IN (
-			SELECT id FROM print_jobs WHERE printer_id = $1
-		)
-		ORDER BY logged_at DESC LIMIT 1
-	`, printer.ID)
-	_ = row.Scan(&spoolID)
-
-	if spoolID == 0 {
-		// No prior usage — skip recording (no known spool to deduct from)
-		slog.Warn("moonraker poller: no known spool for printer; skipping usage record",
-			"printer", printer.Name)
-		return nil
-	}
-
-	// Compute grams from mm extruded using defaults (1.75mm diameter, PLA density 1.24)
-	grams := calculateGrams(stats.FilamentUsedMm, 1.75, 1.24)
-
-	// Create a print job record
-	var jobID int
-	err := p.pool.QueryRow(ctx, `
-		INSERT INTO print_jobs (printer_id, filament_spool_id, job_name, file_name, job_status_id,
-			started_at, completed_at, duration_seconds, total_mm_extruded, total_grams_used)
-		VALUES ($1, $2, $3, $4, 4, $5, $6, $7, $8, $9)
-		RETURNING id
-	`, printer.ID, spoolID, stats.Filename, stats.Filename,
-		time.Now().Add(-time.Duration(stats.TotalDuration)*time.Second),
-		time.Now(),
-		int(stats.TotalDuration),
-		stats.FilamentUsedMm,
-		grams,
-	).Scan(&jobID)
-
-	if err != nil {
-		return fmt.Errorf("insert print_job failed: %w", err)
-	}
-
-	// Create usage_log
-	_, err = p.pool.Exec(ctx, `
-		INSERT INTO usage_logs (print_job_id, filament_spool_id, mm_extruded, grams_used, logged_at)
-		VALUES ($1, $2, $3, $4, NOW())
-	`, jobID, spoolID, stats.FilamentUsedMm, grams)
-
-	if err != nil {
-		return fmt.Errorf("insert usage_log failed: %w", err)
-	}
-
-	slog.Info("moonraker poller: recorded usage",
-		"printer", printer.Name,
-		"job", stats.Filename,
-		"mm", stats.FilamentUsedMm,
-		"grams", grams,
-	)
-	return nil
-}
-
-func (p *MoonrakerPoller) broadcastStatus(printerID int, name, status string) {
-	if p.sseBC == nil {
-		return
-	}
-	ev, err := sse.NewEvent(sse.EventPrinterStatus, sse.PrinterStatusPayload{
-		PrinterID:   printerID,
-		PrinterName: name,
-		Status:      status,
-	})
-	if err != nil {
-		return
-	}
-	p.sseBC.Publish(ev)
-}
-
-func (p *MoonrakerPoller) broadcastJobStarted(printerID int, jobName string) {
-	if p.sseBC == nil {
-		return
-	}
-	ev, err := sse.NewEvent(sse.EventJobStarted, sse.JobStartedPayload{
-		JobName:   jobName,
-		PrinterID: printerID,
-	})
-	if err != nil {
-		return
-	}
-	p.sseBC.Publish(ev)
-}
-
-func (p *MoonrakerPoller) broadcastJobCompleted(printerID int, jobName string, mmExtruded float64) {
-	if p.sseBC == nil {
-		return
-	}
-	grams := calculateGrams(mmExtruded, 1.75, 1.24)
-	gramsInt := int(grams)
-	ev, err := sse.NewEvent(sse.EventJobCompleted, sse.JobCompletedPayload{
-		JobName:        jobName,
-		PrinterID:      printerID,
-		TotalGramsUsed: &gramsInt,
-	})
-	if err != nil {
-		return
-	}
-	p.sseBC.Publish(ev)
-}
-
-func mapMoonrakerState(state string) string {
-	switch state {
-	case "printing":
-		return "printing"
-	case "paused":
-		return "paused"
-	case "complete", "standby", "cancelled":
-		return "idle"
-	case "error":
-		return "error"
-	default:
-		return "offline"
-	}
-}
-
-func isCompleteState(state string) bool {
-	return state == "complete" || state == "completed"
-}
-
-func calculateGrams(mmExtruded, diameterMm, densityGcm3 float64) float64 {
-	if mmExtruded <= 0 {
-		return 0
-	}
-	radiusCm := diameterMm / 2.0 / 10.0
-	crossSection := 3.141592653589793 * radiusCm * radiusCm
-	volumeCm3 := (mmExtruded / 10.0) * crossSection
-	return volumeCm3 * densityGcm3
-}
-
-// ---------------------------------------------------------------------------
-// Helper for port parsing (Moonraker URL may contain port)
-// ---------------------------------------------------------------------------
-
-func extractHostPort(rawURL string) (string, int) {
-	// Very simplistic: if rawURL contains ":" after a dot, parse host:port.
-	// Otherwise assume host only and return port 80.
-	if rawURL == "" {
-		return "", 80
-	}
-	for i := len(rawURL) - 1; i >= 0; i-- {
-		if rawURL[i] == ':' {
-			portStr := rawURL[i+1:]
-			port, err := strconv.Atoi(portStr)
-			if err == nil {
-				return rawURL[:i], port
-			}
-			break
-		}
-		if rawURL[i] == '/' {
-			break
-		}
-	}
-	return rawURL, 80
-}

backend/internal/workers/mqtt_subscriber.go

@@ -1,223 +0,0 @@
-// Package workers provides background goroutines for printer telemetry.
-package workers
-
-import (
-	"context"
-	"fmt"
-	"log/slog"
-	"time"
-
-	"github.com/CubeCraft-Creations/Extrudex/backend/internal/clients"
-	"github.com/CubeCraft-Creations/Extrudex/backend/internal/models"
-	"github.com/CubeCraft-Creations/Extrudex/backend/internal/repositories"
-	"github.com/CubeCraft-Creations/Extrudex/backend/internal/sse"
-	"github.com/jackc/pgx/v5/pgxpool"
-)
-
-// MQTTSubscriberConfig controls MQTT background worker behaviour.
-type MQTTSubscriberConfig struct {
-	ReconnectInterval time.Duration
-}
-
-// DefaultMQTTSubscriberConfig returns sensible defaults.
-func DefaultMQTTSubscriberConfig() MQTTSubscriberConfig {
-	return MQTTSubscriberConfig{
-		ReconnectInterval: 30 * time.Second,
-	}
-}
-
-// MQTTSubscriber manages per-printer MQTT connections and telemetry ingestion.
-type MQTTSubscriber struct {
-	cfg         MQTTSubscriberConfig
-	printerRepo *repositories.PrinterRepository
-	usageRepo   *repositories.UsageLogRepository
-	sseBC       *sse.Broadcaster
-	pool        *pgxpool.Pool
-	clients     map[int]*clients.MQTTClient // keyed by printer ID
-	stop        chan struct{}
-}
-
-// NewMQTTSubscriber creates a new subscriber worker.
-func NewMQTTSubscriber(
-	cfg MQTTSubscriberConfig,
-	pool *pgxpool.Pool,
-	printerRepo *repositories.PrinterRepository,
-	usageRepo *repositories.UsageLogRepository,
-	sseBC *sse.Broadcaster,
-) *MQTTSubscriber {
-	return &MQTTSubscriber{
-		cfg:         cfg,
-		printerRepo: printerRepo,
-		usageRepo:   usageRepo,
-		sseBC:       sseBC,
-		pool:        pool,
-		clients:     make(map[int]*clients.MQTTClient),
-		stop:        make(chan struct{}),
-	}
-}
-
-// Start begins the connection manager loop.
-func (s *MQTTSubscriber) Start() {
-	go s.loop()
-}
-
-// Stop signals the loop to exit and disconnects all clients.
-func (s *MQTTSubscriber) Stop() {
-	close(s.stop)
-}
-
-func (s *MQTTSubscriber) loop() {
-	// Initial connect attempt.
-	s.connectAll()
-
-	ticker := time.NewTicker(s.cfg.ReconnectInterval)
-	defer ticker.Stop()
-
-	for {
-		select {
-		case <-ticker.C:
-			s.connectAll()
-		case <-s.stop:
-			slog.Info("mqtt subscriber stopped")
-			for _, c := range s.clients {
-				c.Disconnect(1000)
-			}
-			return
-		}
-	}
-}
-
-func (s *MQTTSubscriber) connectAll() {
-	ctx, cancel := context.WithTimeout(context.Background(), 30*time.Second)
-	defer cancel()
-
-	printers, err := s.printerRepo.GetAll(ctx)
-	if err != nil {
-		slog.Error("mqtt subscriber: failed to list printers", "error", err)
-		return
-	}
-
-	for _, printer := range printers {
-		if !printer.IsActive || printer.MQTTBrokerHost == nil || *printer.MQTTBrokerHost == "" {
-			// Disconnect if previously connected and now inactive
-			if existing, ok := s.clients[printer.ID]; ok {
-				existing.Disconnect(1000)
-				delete(s.clients, printer.ID)
-			}
-			continue
-		}
-
-		if _, ok := s.clients[printer.ID]; ok {
-			// Already connected — skip
-			continue
-		}
-
-		topicPrefix := ""
-		if printer.MQTTTopicPrefix != nil {
-			topicPrefix = *printer.MQTTTopicPrefix
-		}
-
-		cfg := clients.MQTTConfig{
-			BrokerHost:  *printer.MQTTBrokerHost,
-			TopicPrefix: topicPrefix,
-			TLSEnabled:  printer.MQTTTLSEnabled,
-			ClientID:    fmt.Sprintf("extrudex-printer-%d", printer.ID),
-		}
-
-		c, err := clients.NewMQTTClient(cfg)
-		if err != nil {
-			slog.Warn("mqtt subscriber: connect failed",
-				"printer", printer.Name,
-				"broker", cfg.BrokerHost,
-				"error", err,
-			)
-			continue
-		}
-
-		s.clients[printer.ID] = c
-
-		// Subscribe to telemetry topics
-		topics := clients.DefaultBambuTopics(topicPrefix)
-		for _, topic := range topics {
-			if err := c.Subscribe(topic, 0, s.makeHandler(printer)); err != nil {
-				slog.Warn("mqtt subscriber: subscribe failed",
-					"printer", printer.Name,
-					"topic", topic,
-					"error", err,
-				)
-			}
-		}
-
-		slog.Info("mqtt subscriber: connected",
-			"printer", printer.Name,
-			"broker", cfg.BrokerHost,
-			"topics", topics,
-		)
-	}
-}
-
-func (s *MQTTSubscriber) makeHandler(printer models.Printer) func([]byte) {
-	return func(payload []byte) {
-		slog.Debug("mqtt subscriber: message received",
-			"printer", printer.Name,
-			"size", len(payload),
-		)
-
-		// Attempt Bambu Lab parse
-		telemetry, err := clients.ParseBambuTelemetry(payload)
-		if err != nil {
-			slog.Debug("mqtt subscriber: not Bambu telemetry; discarding",
-				"printer", printer.Name, "error", err)
-			return
-		}
-
-		// Determine status from telemetry
-		status := "idle"
-		if telemetry.Print.Stage > 0 {
-			status = "printing"
-		}
-		s.broadcastStatus(printer.ID, printer.Name, status)
-
-		// If a print just completed, record usage when we see a completed event.
-		// Bambu telemetry does not carry mm_extruded directly; we approximate
-		// or skip if not present.  Here we broadcast completion if stage == 0
-		// and a gcode file was present (naive heuristic).
-		if telemetry.Print.GcodeFile != "" && telemetry.Print.Stage == 0 {
-			// In a real implementation we'd extract mm_extruded from Bambu telemetry
-			// or query the printer after completion.  For now broadcast completion.
-			s.broadcastJobCompleted(printer.ID, telemetry.Print.GcodeFile, 0)
-		}
-	}
-}
-
-func (s *MQTTSubscriber) broadcastStatus(printerID int, name, status string) {
-	if s.sseBC == nil {
-		return
-	}
-	ev, err := sse.NewEvent(sse.EventPrinterStatus, sse.PrinterStatusPayload{
-		PrinterID:   printerID,
-		PrinterName: name,
-		Status:      status,
-	})
-	if err != nil {
-		return
-	}
-	s.sseBC.Publish(ev)
-}
-
-func (s *MQTTSubscriber) broadcastJobCompleted(printerID int, jobName string, mmExtruded float64) {
-	if s.sseBC == nil {
-		return
-	}
-	grams := calculateGrams(mmExtruded, 1.75, 1.24)
-	gramsInt := int(grams)
-	ev, err := sse.NewEvent(sse.EventJobCompleted, sse.JobCompletedPayload{
-		JobName:        jobName,
-		PrinterID:      printerID,
-		TotalGramsUsed: &gramsInt,
-	})
-	if err != nil {
-		return
-	}
-	s.sseBC.Publish(ev)
-}

frontend/src/components/FilamentForm.tsx

@@ -0,0 +1,360 @@
+import { useState, useEffect, useMemo } from 'react'
+import { X, Save, AlertCircle } from 'lucide-react'
+import ColorSwatch from './ColorSwatch'
+import { createFilament, updateFilament, fetchMaterialBases, fetchMaterialFinishes, fetchMaterialModifiers } from '../services/filamentService'
+import type { FilamentSpool, MaterialBase, MaterialFinish, MaterialModifier } from '../types/filament'
+import { useQuery } from '@tanstack/react-query'
+
+interface FilamentFormProps {
+  mode: 'create' | 'edit'
+  initialData?: FilamentSpool | null
+  onClose: () => void
+  onSuccess: () => void
+}
+
+interface FormErrors {
+  [key: string]: string
+}
+
+export default function FilamentForm({ mode, initialData, onClose, onSuccess }: FilamentFormProps) {
+  const [name, setName] = useState('')
+  const [materialBaseId, setMaterialBaseId] = useState('')
+  const [materialFinishId, setMaterialFinishId] = useState('1')
+  const [materialModifierId, setMaterialModifierId] = useState('')
+  const [colorHex, setColorHex] = useState('#3B82F6')
+  const [brand, setBrand] = useState('')
+  const [diameterMm, setDiameterMm] = useState('1.75')
+  const [initialGrams, setInitialGrams] = useState('')
+  const [remainingGrams, setRemainingGrams] = useState('')
+  const [costUsd, setCostUsd] = useState('')
+  const [lowStockThreshold, setLowStockThreshold] = useState('50')
+  const [notes, setNotes] = useState('')
+  const [barcode, setBarcode] = useState('')
+  const [errors, setErrors] = useState<FormErrors>({})
+  const [submitting, setSubmitting] = useState(false)
+  const [submitError, setSubmitError] = useState<string | null>(null)
+
+  const { data: materials } = useQuery({
+    queryKey: ['materials'],
+    queryFn: fetchMaterialBases,
+    staleTime: Infinity,
+  })
+  const { data: finishes } = useQuery({
+    queryKey: ['finishes'],
+    queryFn: fetchMaterialFinishes,
+    staleTime: Infinity,
+  })
+  const { data: modifiers } = useQuery({
+    queryKey: ['modifiers'],
+    queryFn: fetchMaterialModifiers,
+    staleTime: Infinity,
+  })
+
+  useEffect(() => {
+    if (mode === 'edit' && initialData) {
+      setName(initialData.name ?? '')
+      setMaterialBaseId(String(initialData.material_base_id ?? ''))
+      setMaterialFinishId(String(initialData.material_finish_id ?? '1'))
+      setMaterialModifierId(initialData.material_modifier_id ? String(initialData.material_modifier_id) : '')
+      setColorHex(initialData.color_hex ?? '#3B82F6')
+      setBrand(initialData.brand ?? '')
+      setDiameterMm(String(initialData.diameter_mm ?? 1.75))
+      setInitialGrams(String(initialData.initial_grams ?? ''))
+      setRemainingGrams(String(initialData.remaining_grams ?? ''))
+      setCostUsd(initialData.cost_usd != null ? String(initialData.cost_usd) : '')
+      setLowStockThreshold(String(initialData.low_stock_threshold_grams ?? 50))
+      setNotes(initialData.notes ?? '')
+      setBarcode(initialData.barcode ?? '')
+    }
+  }, [mode, initialData])
+
+  const colorHexValid = useMemo(() => {
+    return /^#[0-9A-Fa-f]{6}$/.test(colorHex)
+  }, [colorHex])
+
+  function validate(): FormErrors {
+    const e: FormErrors = {}
+    if (!name.trim()) e.name = 'Name is required'
+    if (!materialBaseId) e.material_base_id = 'Material Base is required'
+    if (!materialFinishId) e.material_finish_id = 'Material Finish is required'
+    if (!colorHexValid) e.color_hex = 'Enter a valid hex color (e.g., #FF0000)'
+    if (!initialGrams || Number(initialGrams) <= 0) e.initial_grams = 'Must be > 0'
+    if (remainingGrams === '' || Number(remainingGrams) < 0) e.remaining_grams = 'Must be >= 0'
+    if (Number(remainingGrams) > Number(initialGrams)) e.remaining_grams = 'Cannot exceed Initial Grams'
+    if (costUsd && Number(costUsd) < 0) e.cost_usd = 'Must be >= 0'
+    if (!diameterMm || Number(diameterMm) <= 0) e.diameter_mm = 'Must be > 0'
+    if (!lowStockThreshold || Number(lowStockThreshold) < 0) e.low_stock_threshold_grams = 'Must be >= 0'
+    return e
+  }
+
+  async function handleSubmit(e: React.FormEvent) {
+    e.preventDefault()
+    setSubmitError(null)
+    const validation = validate()
+    if (Object.keys(validation).length > 0) {
+      setErrors(validation)
+      return
+    }
+    setErrors({})
+    setSubmitting(true)
+
+    const payload: Record<string, unknown> = {
+      name: name.trim(),
+      material_base_id: Number(materialBaseId),
+      material_finish_id: Number(materialFinishId),
+      color_hex: colorHex,
+      initial_grams: Number(initialGrams),
+      remaining_grams: Number(remainingGrams),
+      diameter_mm: Number(diameterMm),
+      low_stock_threshold_grams: Number(lowStockThreshold),
+    }
+
+    if (materialModifierId) payload.material_modifier_id = Number(materialModifierId)
+    if (brand.trim()) payload.brand = brand.trim()
+    if (costUsd) payload.cost_usd = Number(costUsd)
+    if (notes.trim()) payload.notes = notes.trim()
+    if (barcode.trim()) payload.barcode = barcode.trim()
+
+    try {
+      if (mode === 'edit' && initialData) {
+        await updateFilament(initialData.id, payload)
+      } else {
+        await createFilament(payload)
+      }
+      onSuccess()
+      onClose()
+    } catch (err: any) {
+      setSubmitError(err?.response?.data?.error || 'Failed to save spool. Please try again.')
+    } finally {
+      setSubmitting(false)
+    }
+  }
+
+  return (
+    <div className="fixed inset-0 z-50 flex items-start justify-center sm:items-center bg-black/60 backdrop-blur-sm p-4 overflow-y-auto">
+      <div className="w-full max-w-2xl rounded-xl bg-slate-800 border border-slate-700 shadow-2xl overflow-hidden my-4">
+        {/* Header */}
+        <div className="flex items-center justify-between px-6 py-4 border-b border-slate-700">
+          <h3 className="text-lg font-semibold text-slate-100">
+            {mode === 'edit' ? 'Edit Filament Spool' : 'Add Filament Spool'}
+          </h3>
+          <button
+            onClick={onClose}
+            className="p-1.5 rounded-lg text-slate-400 hover:text-slate-100 hover:bg-slate-700 transition-colors"
+            type="button"
+            aria-label="Close"
+          >
+            <X size={18} />
+          </button>
+        </div>
+
+        {/* Error banner */}
+        {submitError && (
+          <div className="mx-6 mt-4 flex items-start gap-2 rounded-lg bg-red-900/30 border border-red-700 px-4 py-3 text-sm text-red-300">
+            <AlertCircle size={16} className="shrink-0 mt-0.5" />
+            <span>{submitError}</span>
+          </div>
+        )}
+
+        {/* Form */}
+        <form onSubmit={handleSubmit} className="px-6 py-4 space-y-5">
+          {/* Row 1: Name + Brand */}
+          <div className="grid grid-cols-1 sm:grid-cols-2 gap-4">
+            <div>
+              <label className="block text-sm font-medium text-slate-300 mb-1">Name <span className="text-red-400">*</span></label>
+              <input
+                type="text"
+                value={name}
+                onChange={e => setName(e.target.value)}
+                className={`w-full rounded-lg bg-slate-900 border px-3 py-2.5 text-sm text-slate-100 focus:outline-none focus:ring-2 ${errors.name ? 'border-red-500 focus:ring-red-500' : 'border-slate-600 focus:ring-emerald-500'}`}
+                placeholder="e.g. Sunlu PLA Silk Red"
+              />
+              {errors.name && <p className="mt-1 text-xs text-red-400">{errors.name}</p>}
+            </div>
+            <div>
+              <label className="block text-sm font-medium text-slate-300 mb-1">Brand</label>
+              <input
+                type="text"
+                value={brand}
+                onChange={e => setBrand(e.target.value)}
+                className="w-full rounded-lg bg-slate-900 border border-slate-600 px-3 py-2.5 text-sm text-slate-100 focus:outline-none focus:ring-2 focus:ring-emerald-500"
+                placeholder="e.g. Hatchbox"
+              />
+            </div>
+          </div>
+
+          {/* Row 2: Material Base + Finish + Modifier */}
+          <div className="grid grid-cols-1 sm:grid-cols-3 gap-4">
+            <div>
+              <label className="block text-sm font-medium text-slate-300 mb-1">Material Base <span className="text-red-400">*</span></label>
+              <select
+                value={materialBaseId}
+                onChange={e => setMaterialBaseId(e.target.value)}
+                className={`w-full rounded-lg bg-slate-900 border px-3 py-2.5 text-sm text-slate-100 focus:outline-none focus:ring-2 ${errors.material_base_id ? 'border-red-500 focus:ring-red-500' : 'border-slate-600 focus:ring-emerald-500'}`}
+              >
+                <option value="">Select…</option>
+                {materials?.map((m: MaterialBase) => (
+                  <option key={m.id} value={m.id}>{m.name}</option>
+                ))}
+              </select>
+              {errors.material_base_id && <p className="mt-1 text-xs text-red-400">{errors.material_base_id}</p>}
+            </div>
+            <div>
+              <label className="block text-sm font-medium text-slate-300 mb-1">Finish <span className="text-red-400">*</span></label>
+              <select
+                value={materialFinishId}
+                onChange={e => setMaterialFinishId(e.target.value)}
+                className={`w-full rounded-lg bg-slate-900 border px-3 py-2.5 text-sm text-slate-100 focus:outline-none focus:ring-2 ${errors.material_finish_id ? 'border-red-500 focus:ring-red-500' : 'border-slate-600 focus:ring-emerald-500'}`}
+              >
+                {finishes?.map((f: MaterialFinish) => (
+                  <option key={f.id} value={f.id}>{f.name}</option>
+                ))}
+              </select>
+              {errors.material_finish_id && <p className="mt-1 text-xs text-red-400">{errors.material_finish_id}</p>}
+            </div>
+            <div>
+              <label className="block text-sm font-medium text-slate-300 mb-1">Modifier</label>
+              <select
+                value={materialModifierId}
+                onChange={e => setMaterialModifierId(e.target.value)}
+                className="w-full rounded-lg bg-slate-900 border border-slate-600 px-3 py-2.5 text-sm text-slate-100 focus:outline-none focus:ring-2 focus:ring-emerald-500"
+              >
+                <option value="">None</option>
+                {modifiers?.map((m: MaterialModifier) => (
+                  <option key={m.id} value={m.id}>{m.name}</option>
+                ))}
+              </select>
+            </div>
+          </div>
+
+          {/* Row 3: Color + Diameter */}
+          <div className="grid grid-cols-1 sm:grid-cols-2 gap-4">
+            <div>
+              <label className="block text-sm font-medium text-slate-300 mb-1">Color <span className="text-red-400">*</span></label>
+              <div className="flex items-center gap-3">
+                <input
+                  type="color"
+                  value={colorHex}
+                  onChange={e => setColorHex(e.target.value)}
+                  className="h-10 w-14 rounded border border-slate-600 bg-slate-900 cursor-pointer"
+                />
+                <div className="flex-1">
+                  <input
+                    type="text"
+                    value={colorHex}
+                    onChange={e => setColorHex(e.target.value)}
+                    className={`w-full rounded-lg bg-slate-900 border px-3 py-2.5 text-sm text-slate-100 font-mono uppercase focus:outline-none focus:ring-2 ${errors.color_hex ? 'border-red-500 focus:ring-red-500' : 'border-slate-600 focus:ring-emerald-500'}`}
+                    placeholder="#FF0000"
+                    maxLength={7}
+                  />
+                </div>
+                <ColorSwatch colorHex={colorHex} size={32} />
+              </div>
+              {errors.color_hex && <p className="mt-1 text-xs text-red-400">{errors.color_hex}</p>}
+            </div>
+            <div>
+              <label className="block text-sm font-medium text-slate-300 mb-1">Diameter (mm) <span className="text-red-400">*</span></label>
+              <input
+                type="number"
+                step="0.01"
+                value={diameterMm}
+                onChange={e => setDiameterMm(e.target.value)}
+                className={`w-full rounded-lg bg-slate-900 border px-3 py-2.5 text-sm text-slate-100 focus:outline-none focus:ring-2 ${errors.diameter_mm ? 'border-red-500 focus:ring-red-500' : 'border-slate-600 focus:ring-emerald-500'}`}
+              />
+              {errors.diameter_mm && <p className="mt-1 text-xs text-red-400">{errors.diameter_mm}</p>}
+            </div>
+          </div>
+
+          {/* Row 4: Grams */}
+          <div className="grid grid-cols-1 sm:grid-cols-3 gap-4">
+            <div>
+              <label className="block text-sm font-medium text-slate-300 mb-1">Initial Grams <span className="text-red-400">*</span></label>
+              <input
+                type="number"
+                value={initialGrams}
+                onChange={e => setInitialGrams(e.target.value)}
+                className={`w-full rounded-lg bg-slate-900 border px-3 py-2.5 text-sm text-slate-100 focus:outline-none focus:ring-2 ${errors.initial_grams ? 'border-red-500 focus:ring-red-500' : 'border-slate-600 focus:ring-emerald-500'}`}
+              />
+              {errors.initial_grams && <p className="mt-1 text-xs text-red-400">{errors.initial_grams}</p>}
+            </div>
+            <div>
+              <label className="block text-sm font-medium text-slate-300 mb-1">Remaining Grams <span className="text-red-400">*</span></label>
+              <input
+                type="number"
+                value={remainingGrams}
+                onChange={e => setRemainingGrams(e.target.value)}
+                className={`w-full rounded-lg bg-slate-900 border px-3 py-2.5 text-sm text-slate-100 focus:outline-none focus:ring-2 ${errors.remaining_grams ? 'border-red-500 focus:ring-red-500' : 'border-slate-600 focus:ring-emerald-500'}`}
+              />
+              {errors.remaining_grams && <p className="mt-1 text-xs text-red-400">{errors.remaining_grams}</p>}
+            </div>
+            <div>
+              <label className="block text-sm font-medium text-slate-300 mb-1">Cost (USD)</label>
+              <input
+                type="number"
+                step="0.01"
+                value={costUsd}
+                onChange={e => setCostUsd(e.target.value)}
+                className={`w-full rounded-lg bg-slate-900 border px-3 py-2.5 text-sm text-slate-100 focus:outline-none focus:ring-2 ${errors.cost_usd ? 'border-red-500 focus:ring-red-500' : 'border-slate-600 focus:ring-emerald-500'}`}
+              />
+            </div>
+          </div>
+
+          {/* Row 5: Threshold + Barcode */}
+          <div className="grid grid-cols-1 sm:grid-cols-2 gap-4">
+            <div>
+              <label className="block text-sm font-medium text-slate-300 mb-1">Low Stock Threshold (g) <span className="text-red-400">*</span></label>
+              <input
+                type="number"
+                value={lowStockThreshold}
+                onChange={e => setLowStockThreshold(e.target.value)}
+                className={`w-full rounded-lg bg-slate-900 border px-3 py-2.5 text-sm text-slate-100 focus:outline-none focus:ring-2 ${errors.low_stock_threshold_grams ? 'border-red-500 focus:ring-red-500' : 'border-slate-600 focus:ring-emerald-500'}`}
+              />
+              {errors.low_stock_threshold_grams && <p className="mt-1 text-xs text-red-400">{errors.low_stock_threshold_grams}</p>}
+            </div>
+            <div>
+              <label className="block text-sm font-medium text-slate-300 mb-1">Barcode</label>
+              <input
+                type="text"
+                value={barcode}
+                onChange={e => setBarcode(e.target.value)}
+                className="w-full rounded-lg bg-slate-900 border border-slate-600 px-3 py-2.5 text-sm text-slate-100 focus:outline-none focus:ring-2 focus:ring-emerald-500"
+                placeholder="e.g. 123456789012"
+              />
+            </div>
+          </div>
+
+          {/* Notes */}
+          <div>
+            <label className="block text-sm font-medium text-slate-300 mb-1">Notes</label>
+            <textarea
+              rows={3}
+              value={notes}
+              onChange={e => setNotes(e.target.value)}
+              className="w-full rounded-lg bg-slate-900 border border-slate-600 px-3 py-2.5 text-sm text-slate-100 focus:outline-none focus:ring-2 focus:ring-emerald-500 resize-y"
+              placeholder="Print temperature tips, storage notes, etc."
+            />
+          </div>
+
+          {/* Footer actions */}
+          <div className="flex justify-end gap-3 pt-2">
+            <button
+              type="button"
+              onClick={onClose}
+              className="rounded-lg bg-slate-700 px-4 py-2.5 text-sm font-medium text-slate-200 hover:bg-slate-600 transition-colors"
+            >
+              Cancel
+            </button>
+            <button
+              type="submit"
+              disabled={submitting}
+              className="inline-flex items-center gap-2 rounded-lg bg-emerald-600 px-4 py-2.5 text-sm font-semibold text-white hover:bg-emerald-500 active:bg-emerald-700 disabled:opacity-50 transition-colors"
+            >
+              <Save size={16} />
+              {submitting ? 'Saving…' : mode === 'edit' ? 'Update Spool' : 'Create Spool'}
+            </button>
+          </div>
+        </form>
+      </div>
+    </div>
+  )
+}

frontend/src/pages/InventoryPage.tsx

@@ -2,6 +2,7 @@ import { useState, useMemo } from 'react'
 import { useQuery } from '@tanstack/react-query'
 import { Search, Filter, ChevronLeft, ChevronRight, Trash2, Pencil, Plus, AlertTriangle } from 'lucide-react'
 import ColorSwatch from '../components/ColorSwatch'
+import FilamentForm from '../components/FilamentForm'
 import { fetchFilaments, deleteFilament } from '../services/filamentService'
 import type { FilamentSpool, FilamentFilter } from '../types/filament'
 
@@ -19,6 +20,9 @@ export default function InventoryPage() {
   const [sortDir, setSortDir] = useState<SortDir>('asc')
   const [page, setPage] = useState(0)
   const [deleteId, setDeleteId] = useState<number | null>(null)
+  const [formOpen, setFormOpen] = useState(false)
+  const [formMode, setFormMode] = useState<'create' | 'edit'>('create')
+  const [formInitial, setFormInitial] = useState<FilamentSpool | null>(null)
 
   const filter: FilamentFilter = useMemo(() => ({
     material: material || undefined,
@@ -79,7 +83,10 @@ export default function InventoryPage() {
           <h2 className="text-xl font-bold text-slate-100">Filament Inventory</h2>
           <p className="text-sm text-slate-400">{total} spool(s) total</p>
         </div>
-        <button className="inline-flex items-center gap-2 rounded-lg bg-emerald-600 px-4 py-2 text-sm font-semibold text-white hover:bg-emerald-500 active:bg-emerald-700 transition-colors">
+        <button
+          onClick={() => { setFormMode('create'); setFormInitial(null); setFormOpen(true) }}
+          className="inline-flex items-center gap-2 rounded-lg bg-emerald-600 px-4 py-2 text-sm font-semibold text-white hover:bg-emerald-500 active:bg-emerald-700 transition-colors"
+        >
           <Plus size={16} /> Add Spool
         </button>
       </div>
@@ -208,7 +215,11 @@ export default function InventoryPage() {
                       </td>
                       <td className="px-4 py-3 text-right">
                         <div className="flex items-center justify-end gap-2">
-                          <button className="p-1.5 rounded hover:bg-slate-600 text-slate-400 hover:text-blue-400 transition-colors" title="Edit">
+                          <button
+                            onClick={() => { setFormMode('edit'); setFormInitial(spool); setFormOpen(true) }}
+                            className="p-1.5 rounded hover:bg-slate-600 text-slate-400 hover:text-blue-400 transition-colors"
+                            title="Edit"
+                          >
                             <Pencil size={14} />
                           </button>
                           <button
@@ -263,7 +274,10 @@ export default function InventoryPage() {
                   </div>
 
                   <div className="flex items-center justify-end gap-2 pt-1">
-                    <button className="flex items-center gap-1 rounded-md bg-slate-700 px-3 py-1.5 text-xs font-medium text-slate-200 hover:bg-slate-600">
+                    <button
+                      onClick={() => { setFormMode('edit'); setFormInitial(spool); setFormOpen(true) }}
+                      className="flex items-center gap-1 rounded-md bg-slate-700 px-3 py-1.5 text-xs font-medium text-slate-200 hover:bg-slate-600"
+                    >
                       <Pencil size={12} /> Edit
                     </button>
                     <button
@@ -304,6 +318,16 @@ export default function InventoryPage() {
         </>
       )}
 
+      {/* Add/Edit Form Modal */}
+      {formOpen && (
+        <FilamentForm
+          mode={formMode}
+          initialData={formInitial}
+          onClose={() => setFormOpen(false)}
+          onSuccess={() => refetch()}
+        />
+      )}
+
       {/* Delete confirmation modal */}
       {deleteId !== null && (
         <div className="fixed inset-0 z-50 flex items-center justify-center bg-black/60 backdrop-blur-sm p-4">

frontend/src/services/filamentService.ts

@@ -1,5 +1,5 @@
 import axios from 'axios'
-import type { FilamentSpool, ListResponse, FilamentFilter } from '../types/filament'
+import type { FilamentSpool, ListResponse, FilamentFilter, MaterialBase, MaterialFinish, MaterialModifier } from '../types/filament'
 
 const API_BASE = '/api'
 
@@ -19,6 +19,31 @@ export async function fetchFilaments(filter: FilamentFilter): Promise<ListRespon
   return res.data
 }
 
+export async function createFilament(payload: Partial<FilamentSpool>): Promise<FilamentSpool> {
+  const res = await axios.post<{ data: FilamentSpool }>(`${API_BASE}/filaments`, payload)
+  return res.data.data
+}
+
+export async function updateFilament(id: number, payload: Partial<FilamentSpool>): Promise<FilamentSpool> {
+  const res = await axios.put<{ data: FilamentSpool }>(`${API_BASE}/filaments/${id}`, payload)
+  return res.data.data
+}
+
 export async function deleteFilament(id: number): Promise<void> {
   await axios.delete(`${API_BASE}/filaments/${id}`)
 }
+
+export async function fetchMaterialBases(): Promise<MaterialBase[]> {
+  const res = await axios.get<{ data: MaterialBase[] }>(`${API_BASE}/materials`)
+  return res.data.data
+}
+
+export async function fetchMaterialFinishes(): Promise<MaterialFinish[]> {
+  const res = await axios.get<{ data: MaterialFinish[] }>(`${API_BASE}/finishes`)
+  return res.data.data
+}
+
+export async function fetchMaterialModifiers(): Promise<MaterialModifier[]> {
+  const res = await axios.get<{ data: MaterialModifier[] }>(`${API_BASE}/modifiers`)
+  return res.data.data
+}