Feature 10: Recipe grounding and photos (#78)

Co-authored-by: dev_agent <dev_agent@cubecraftlabs.com>

internal/server/login_test.go

@@ -83,7 +83,7 @@ func newLoginRouter(t *testing.T, issuer string) http.Handler {
 		t.Fatal(err)
 	}
 	r, err := NewRouter(logger, "dev", trusted, flow, sessions, newTestSettings(t),
-		newTestRunner(t), fstest.MapFS{"index.html": {Data: []byte(fixtureIndex)}})
+		newTestSearch(t), newTestRunner(t), newTestPhotos(t), fstest.MapFS{"index.html": {Data: []byte(fixtureIndex)}})
 	if err != nil {
 		t.Fatal(err)
 	}

internal/server/media.go

@@ -0,0 +1,75 @@
+package server
+
+import (
+	"context"
+	"errors"
+	"io/fs"
+	"log/slog"
+	"net/http"
+	"os"
+	"strconv"
+	"strings"
+
+	"github.com/go-chi/chi/v5"
+)
+
+// photoCacheControl lets the browser keep a photo for a year without
+// revalidating: a photo's files never change once stored, and a new image
+// gets a new id.
+const photoCacheControl = "private, max-age=31536000, immutable"
+
+// PhotoFiles opens a cached photo's file at one of its stored sizes. An
+// unknown photo or size is an error matching fs.ErrNotExist.
+type PhotoFiles interface {
+	OpenPhoto(ctx context.Context, id string, size int) (*os.File, error)
+}
+
+// getPhoto answers GET /media/photos/{id}-{size}.jpg with the stored JPEG.
+func getPhoto(logger *slog.Logger, photos PhotoFiles) http.HandlerFunc {
+	notFound := apiErrorHandler(logger, http.StatusNotFound, "not_found", "not found")
+	return func(w http.ResponseWriter, r *http.Request) {
+		id, size, ok := parsePhotoName(chi.URLParam(r, "name"))
+		if !ok {
+			notFound(w, r)
+			return
+		}
+		f, err := photos.OpenPhoto(r.Context(), id, size)
+		if errors.Is(err, fs.ErrNotExist) {
+			notFound(w, r)
+			return
+		}
+		if err != nil {
+			logger.ErrorContext(r.Context(), "open photo", "id", id, "size", size, "error", err)
+			writeError(w, r, logger, http.StatusInternalServerError, "internal", "internal error")
+			return
+		}
+		defer f.Close()
+		info, err := f.Stat()
+		if err != nil {
+			logger.ErrorContext(r.Context(), "stat photo", "id", id, "size", size, "error", err)
+			writeError(w, r, logger, http.StatusInternalServerError, "internal", "internal error")
+			return
+		}
+		w.Header().Set("Content-Type", "image/jpeg")
+		w.Header().Set("Cache-Control", photoCacheControl)
+		http.ServeContent(w, r, "", info.ModTime(), f)
+	}
+}
+
+// parsePhotoName splits "{id}-{size}.jpg" into its id and size, refusing
+// a size not written in its canonical decimal form.
+func parsePhotoName(name string) (id string, size int, ok bool) {
+	stem, ok := strings.CutSuffix(name, ".jpg")
+	if !ok {
+		return "", 0, false
+	}
+	i := strings.LastIndexByte(stem, '-')
+	if i < 0 {
+		return "", 0, false
+	}
+	size, err := strconv.Atoi(stem[i+1:])
+	if err != nil || strconv.Itoa(size) != stem[i+1:] {
+		return "", 0, false
+	}
+	return stem[:i], size, true
+}

internal/server/media_test.go

@@ -0,0 +1,138 @@
+package server
+
+import (
+	"io"
+	"log/slog"
+	"net/http"
+	"net/http/httptest"
+	"os"
+	"path/filepath"
+	"testing"
+	"testing/fstest"
+
+	"code.cubecraftlabs.com/Maniacs_Mansion/Meal-Quest/internal/db"
+	"code.cubecraftlabs.com/Maniacs_Mansion/Meal-Quest/internal/recipes"
+	"code.cubecraftlabs.com/Maniacs_Mansion/Meal-Quest/internal/store"
+)
+
+// newMediaRouter returns a router over a photo cache whose data directory
+// holds both sizes of two photos, the id of the one with a photos row, and
+// the id of the orphan without one. Each size's file holds its size as
+// text.
+func newMediaRouter(t *testing.T) (r http.Handler, id, orphan string) {
+	t.Helper()
+	dataDir := t.TempDir()
+	st := newTestStore(t)
+	photos, err := recipes.NewPhotoCache(recipes.NewFetcher(), st, dataDir)
+	if err != nil {
+		t.Fatal(err)
+	}
+	id, orphan = store.NewID(), store.NewID()
+	for _, stem := range []string{id, orphan} {
+		for _, size := range []string{"400", "1200"} {
+			p := filepath.Join(dataDir, "media", "photos", stem+"-"+size+".jpg")
+			if err := os.WriteFile(p, []byte("jpeg "+size), 0o600); err != nil {
+				t.Fatal(err)
+			}
+		}
+	}
+	now := store.Now().String()
+	if _, err := db.New(st.Writer).CreatePhoto(t.Context(), db.CreatePhotoParams{
+		ID:        id,
+		SourceUrl: "https://example.com/a.jpg",
+		LocalPath: "media/photos/" + id + "-1200.jpg",
+		Width:     1600,
+		Height:    1200,
+		Sha256:    "sha",
+		FetchedAt: now,
+		CreatedAt: now,
+		UpdatedAt: now,
+	}); err != nil {
+		t.Fatal(err)
+	}
+	logger := slog.New(slog.NewTextHandler(io.Discard, nil))
+	r, err = NewRouter(logger, "dev", nil, stubAuth{}, stubSessions{}, newTestSettings(t), newTestSearch(t), newTestRunner(t),
+		photos, fstest.MapFS{"index.html": {Data: []byte(fixtureIndex)}})
+	if err != nil {
+		t.Fatal(err)
+	}
+	return r, id, orphan
+}
+
+func TestGetPhotoServesEachSize(t *testing.T) {
+	t.Parallel()
+	router, id, _ := newMediaRouter(t)
+	for _, size := range []string{"400", "1200"} {
+		req := httptest.NewRequest(http.MethodGet, "/media/photos/"+id+"-"+size+".jpg", nil)
+		req.AddCookie(validSessionCookie)
+		rec := httptest.NewRecorder()
+		router.ServeHTTP(rec, req)
+
+		if rec.Code != http.StatusOK {
+			t.Fatalf("size %s: status = %d, want 200", size, rec.Code)
+		}
+		if got := rec.Body.String(); got != "jpeg "+size {
+			t.Errorf("size %s: body = %q", size, got)
+		}
+		if got := rec.Header().Get("Content-Type"); got != "image/jpeg" {
+			t.Errorf("size %s: Content-Type = %q, want image/jpeg", size, got)
+		}
+		if got := rec.Header().Get("Cache-Control"); got != "private, max-age=31536000, immutable" {
+			t.Errorf("size %s: Cache-Control = %q", size, got)
+		}
+	}
+}
+
+func TestGetPhotoRequiresSession(t *testing.T) {
+	t.Parallel()
+	router, id, _ := newMediaRouter(t)
+	req := httptest.NewRequest(http.MethodGet, "/media/photos/"+id+"-400.jpg", nil)
+	rec := httptest.NewRecorder()
+	router.ServeHTTP(rec, req)
+
+	if rec.Code != http.StatusUnauthorized {
+		t.Fatalf("status = %d, want 401", rec.Code)
+	}
+	if got := rec.Body.String(); got != unauthenticatedJSON {
+		t.Errorf("body = %s, want %s", got, unauthenticatedJSON)
+	}
+	if got := rec.Header().Get("Cache-Control"); got != "" {
+		t.Errorf("Cache-Control = %q on a refused request", got)
+	}
+}
+
+func TestGetPhotoUnknownNotFound(t *testing.T) {
+	t.Parallel()
+	router, id, orphan := newMediaRouter(t)
+	for _, name := range []string{
+		store.NewID() + "-400.jpg", // no such photo
+		orphan + "-400.jpg",        // file stored, no photos row
+		id + "-800.jpg",            // size not stored
+		orphan + "-1200.jpg",
+		id + "-0400.jpg",
+		id + "-+400.jpg",
+		id + "-400.png",
+		id + ".jpg",
+		id + "-400",
+		"..%2F" + id + "-400.jpg",
+		"not-an-id-400.jpg",
+	} {
+		t.Run(name, func(t *testing.T) {
+			t.Parallel()
+			req := httptest.NewRequest(http.MethodGet, "/media/photos/"+name, nil)
+			req.AddCookie(validSessionCookie)
+			rec := httptest.NewRecorder()
+			router.ServeHTTP(rec, req)
+
+			if rec.Code != http.StatusNotFound {
+				t.Fatalf("status = %d, want 404", rec.Code)
+			}
+			if got := rec.Body.String(); got != notFoundJSON {
+				t.Errorf("body = %s, want %s", got, notFoundJSON)
+			}
+			if got := rec.Header().Get("Cache-Control"); got != "" {
+				t.Errorf("Cache-Control = %q on a 404", got)
+			}
+		})
+	}
+}

internal/server/origin_test.go

@@ -45,7 +45,7 @@ func newOriginRouter(t *testing.T, logs io.Writer) http.Handler {
 	}
 	logger := slog.New(forwarded.LogHandler(slog.NewJSONHandler(logs, nil)))
 	r, err := NewRouter(logger, "dev", trusted, probeAuth{}, stubSessions{}, newTestSettings(t),
-		newTestRunner(t), fstest.MapFS{"index.html": {Data: []byte(fixtureIndex)}})
+		newTestSearch(t), newTestRunner(t), newTestPhotos(t), fstest.MapFS{"index.html": {Data: []byte(fixtureIndex)}})
 	if err != nil {
 		t.Fatal(err)
 	}

internal/server/recipesearch.go

@@ -0,0 +1,70 @@
+package server
+
+import (
+	"errors"
+	"log/slog"
+	"net/http"
+
+	"code.cubecraftlabs.com/Maniacs_Mansion/Meal-Quest/internal/recipes"
+)
+
+// searchTestResponse is the POST /settings/recipe-search/test body.
+type searchTestResponse struct {
+	Query string `json:"query"`
+	Count int    `json:"count"`
+}
+
+func getRecipeSearchSettings(logger *slog.Logger, svc *recipes.SearchSettingsService) http.HandlerFunc {
+	return func(w http.ResponseWriter, r *http.Request) {
+		settings, err := svc.Get(r.Context())
+		if err != nil {
+			logger.ErrorContext(r.Context(), "get recipe search settings", "error", err)
+			writeError(w, r, logger, http.StatusInternalServerError, "internal", "internal error")
+			return
+		}
+		writeJSON(w, r, logger, http.StatusOK, settings)
+	}
+}
+
+// patchRecipeSearchSettings takes the Brave API key in api_key; the
+// response, like GET's, never holds it.
+func patchRecipeSearchSettings(logger *slog.Logger, svc *recipes.SearchSettingsService) http.HandlerFunc {
+	return func(w http.ResponseWriter, r *http.Request) {
+		patch, err := decodePatch[recipes.SearchSettingsPatch](http.MaxBytesReader(w, r.Body, maxSettingsBody))
+		if err != nil {
+			writeError(w, r, logger, http.StatusBadRequest, "invalid_request", err.Error())
+			return
+		}
+		settings, err := svc.Update(r.Context(), patch)
+		var invalid *recipes.SearchSettingsError
+		if errors.As(err, &invalid) {
+			writeError(w, r, logger, http.StatusBadRequest, "invalid_settings", invalid.Error())
+			return
+		}
+		if err != nil {
+			logger.ErrorContext(r.Context(), "update recipe search settings", "error", err)
+			writeError(w, r, logger, http.StatusInternalServerError, "internal", "internal error")
+			return
+		}
+		writeJSON(w, r, logger, http.StatusOK, settings)
+	}
+}
+
+// postRecipeSearchTest searches for recipes.SearchTestQuery with the saved
+// settings. Recipe search not configured is 409; a search that fails is
+// 502 with the provider's error, which never holds the API key.
+func postRecipeSearchTest(logger *slog.Logger, svc *recipes.SearchSettingsService) http.HandlerFunc {
+	return func(w http.ResponseWriter, r *http.Request) {
+		count, err := svc.TestSearch(r.Context())
+		if errors.Is(err, recipes.ErrSearchNotConfigured) {
+			writeError(w, r, logger, http.StatusConflict, "not_configured", "recipe search is not configured")
+			return
+		}
+		if err != nil {
+			logger.WarnContext(r.Context(), "recipe search test failed", "error", err)
+			writeError(w, r, logger, http.StatusBadGateway, "search_failed", err.Error())
+			return
+		}
+		writeJSON(w, r, logger, http.StatusOK, searchTestResponse{Query: recipes.SearchTestQuery, Count: count})
+	}
+}

internal/server/recipesearch_test.go

@@ -0,0 +1,124 @@
+package server
+
+import (
+	"io"
+	"log/slog"
+	"net/http"
+	"net/http/httptest"
+	"strings"
+	"testing"
+	"testing/fstest"
+
+	"code.cubecraftlabs.com/Maniacs_Mansion/Meal-Quest/internal/recipes"
+)
+
+const (
+	recipeSearchPath     = "/api/v1/settings/recipe-search"
+	recipeSearchTestPath = "/api/v1/settings/recipe-search/test"
+	testBraveKey         = "BSA-secret-brave-key-9f3c"
+)
+
+// newRecipeSearchRouter returns a router serving search.
+func newRecipeSearchRouter(t *testing.T, search *recipes.SearchSettingsService) http.Handler {
+	t.Helper()
+	logger := slog.New(slog.NewTextHandler(io.Discard, nil))
+	r, err := NewRouter(logger, "dev", nil, stubAuth{}, stubSessions{}, newTestSettings(t), search, newTestRunner(t),
+		newTestPhotos(t), fstest.MapFS{"index.html": {Data: []byte(fixtureIndex)}})
+	if err != nil {
+		t.Fatal(err)
+	}
+	return r
+}
+
+func TestRecipeSearchSettingsAPI(t *testing.T) {
+	t.Parallel()
+	router := newRecipeSearchRouter(t, newTestSearch(t))
+	var bodies []string
+	call := func(method, target, body string) (*httptest.ResponseRecorder, map[string]any) {
+		t.Helper()
+		var r io.Reader
+		if body != "" {
+			r = strings.NewReader(body)
+		}
+		rec, decoded := serve(t, router, signedIn(method, target, r))
+		bodies = append(bodies, rec.Body.String())
+		return rec, decoded
+	}
+
+	rec, body := call(http.MethodGet, recipeSearchPath, "")
+	if rec.Code != http.StatusOK || body["provider"] != nil || body["api_key_set"] != false {
+		t.Errorf("GET unconfigured = %d %v", rec.Code, body)
+	}
+	rec, body = call(http.MethodPost, recipeSearchTestPath, "")
+	if rec.Code != http.StatusConflict || body["error"].(map[string]any)["code"] != "not_configured" {
+		t.Errorf("POST test unconfigured = %d %v", rec.Code, body)
+	}
+
+	for _, bad := range []string{
+		`{"provider":"google"}`,
+		`{"provider":"brave"}`,
+		`{"provider":"searxng","base_url":"not a url"}`,
+		`{"provider":"brave","api_key":null}`,
+		`{"provider":"brave","apikey":"x"}`,
+	} {
+		if rec, _ := call(http.MethodPatch, recipeSearchPath, bad); rec.Code != http.StatusBadRequest {
+			t.Errorf("PATCH %s = %d, want 400", bad, rec.Code)
+		}
+	}
+
+	rec, body = call(http.MethodPatch, recipeSearchPath, `{"provider":"brave","api_key":"`+testBraveKey+`"}`)
+	if rec.Code != http.StatusOK || body["provider"] != "brave" || body["api_key_set"] != true || body["api_key_last4"] != "9f3c" {
+		t.Errorf("PATCH Brave = %d %v", rec.Code, body)
+	}
+	if _, ok := body["api_key"]; ok {
+		t.Errorf("PATCH response has an api_key field: %v", body)
+	}
+	rec, body = call(http.MethodGet, recipeSearchPath, "")
+	if rec.Code != http.StatusOK || body["provider"] != "brave" || body["api_key_last4"] != "9f3c" {
+		t.Errorf("GET Brave = %d %v", rec.Code, body)
+	}
+
+	// SearXNG keeps the stored key; the test search goes to the instance.
+	searx := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+		w.Write([]byte(`{"results":[{"url":"https://a.example/1"},{"url":"https://b.example/2"},{"url":"https://c.example/3"}]}`))
+	}))
+	t.Cleanup(searx.Close)
+	rec, body = call(http.MethodPatch, recipeSearchPath, `{"provider":"searxng","base_url":"`+searx.URL+`"}`)
+	if rec.Code != http.StatusOK || body["base_url"] != searx.URL || body["api_key_set"] != true {
+		t.Errorf("PATCH SearXNG = %d %v", rec.Code, body)
+	}
+	rec, body = call(http.MethodPost, recipeSearchTestPath, "")
+	if rec.Code != http.StatusOK || body["count"] != float64(3) || body["query"] != recipes.SearchTestQuery {
+		t.Errorf("POST test = %d %v, want count 3", rec.Code, body)
+	}
+
+	searx.Close()
+	rec, body = call(http.MethodPost, recipeSearchTestPath, "")
+	if rec.Code != http.StatusBadGateway || body["error"].(map[string]any)["code"] != "search_failed" {
+		t.Errorf("POST test against a stopped instance = %d %v, want 502 search_failed", rec.Code, body)
+	}
+
+	for _, b := range bodies {
+		if strings.Contains(b, testBraveKey) || strings.Contains(b, testBraveKey[:12]) {
+			t.Errorf("response holds the Brave key: %s", b)
+		}
+	}
+}
+
+func TestRecipeSearchSettingsNeedCSRF(t *testing.T) {
+	t.Parallel()
+	router := newRecipeSearchRouter(t, newTestSearch(t))
+	for _, method := range []string{http.MethodPatch, http.MethodPost} {
+		target := recipeSearchPath
+		if method == http.MethodPost {
+			target = recipeSearchTestPath
+		}
+		req := httptest.NewRequest(method, target, strings.NewReader(`{"provider":"brave","api_key":"`+testBraveKey+`"}`))
+		req.AddCookie(validSessionCookie)
+		rec := httptest.NewRecorder()
+		router.ServeHTTP(rec, req)
+		if rec.Code != http.StatusForbidden {
+			t.Errorf("%s %s without CSRF token = %d, want 403", method, target, rec.Code)
+		}
+	}
+}

internal/server/server.go

@@ -14,6 +14,7 @@ import (
 	"code.cubecraftlabs.com/Maniacs_Mansion/Meal-Quest/internal/frontend"
 	"code.cubecraftlabs.com/Maniacs_Mansion/Meal-Quest/internal/household"
 	"code.cubecraftlabs.com/Maniacs_Mansion/Meal-Quest/internal/jobs"
+	"code.cubecraftlabs.com/Maniacs_Mansion/Meal-Quest/internal/recipes"
 )
 
 // reservedPrefixes are owned by the API router and are never answered with the
@@ -29,17 +30,25 @@ type RouteMounter interface {
 // has its client address and scheme resolved, honouring forwarded headers
 // only from a peer in trusted (see resolveOrigin). version is reported by
 // GET /health; auth mounts the /auth routes; sessions guards /api/v1 and
-// /media; settings serves /api/v1/settings/household; runner serves
-// POST /api/v1/jobs and GET /api/v1/jobs/{id}; assets is the web build
+// /media; settings serves /api/v1/settings/household; search serves
+// /api/v1/settings/recipe-search and its /test; runner serves
+// POST /api/v1/jobs and GET /api/v1/jobs/{id}; photos serves
+// GET /media/photos/{id}-{size}.jpg; assets is the web build
 // served for every other GET. /health, /auth and the web build are public.
 // Requests to /api/v1 other than GET also need the session's CSRF token in CSRFHeader.
-func NewRouter(logger *slog.Logger, version string, trusted forwarded.Trusted, auth RouteMounter, sessions SessionLookup, settings *household.SettingsService, runner *jobs.Runner, assets fs.FS) (http.Handler, error) {
+func NewRouter(logger *slog.Logger, version string, trusted forwarded.Trusted, auth RouteMounter, sessions SessionLookup, settings *household.SettingsService, search *recipes.SearchSettingsService, runner *jobs.Runner, photos PhotoFiles, assets fs.FS) (http.Handler, error) {
 	if settings == nil {
 		return nil, errors.New("server: nil household settings service")
 	}
+	if search == nil {
+		return nil, errors.New("server: nil recipe search settings service")
+	}
 	if runner == nil {
 		return nil, errors.New("server: nil job runner")
 	}
+	if photos == nil {
+		return nil, errors.New("server: nil photo files")
+	}
 	notFound := apiErrorHandler(logger, http.StatusNotFound, "not_found", "not found")
 	methodNotAllowed := apiErrorHandler(logger, http.StatusMethodNotAllowed, "method_not_allowed", "method not allowed")
 
@@ -68,8 +77,12 @@ func NewRouter(logger *slog.Logger, version string, trusted forwarded.Trusted, a
 	apiV1.Get("/me", me(logger))
 	apiV1.Get("/settings/household", getHouseholdSettings(logger, settings))
 	apiV1.Patch("/settings/household", patchHouseholdSettings(logger, settings))
+	apiV1.Get("/settings/recipe-search", getRecipeSearchSettings(logger, search))
+	apiV1.Patch("/settings/recipe-search", patchRecipeSearchSettings(logger, search))
+	apiV1.Post("/settings/recipe-search/test", postRecipeSearchTest(logger, search))
 	apiV1.Post("/jobs", postJob(logger, runner))
 	apiV1.Get("/jobs/{id}", getJob(logger, runner))
+	media.Get("/photos/{name}", getPhoto(logger, photos))
 	r.Route("/api", func(r chi.Router) {
 		r.MethodNotAllowed(methodNotAllowed)
 		r.NotFound(notFound)

internal/server/server_test.go

@@ -2,6 +2,8 @@ package server
 
 import (
 	"context"
+	"crypto/rand"
+	"encoding/base64"
 	"encoding/json"
 	"io"
 	"log/slog"
@@ -16,6 +18,8 @@ import (
 
 	"code.cubecraftlabs.com/Maniacs_Mansion/Meal-Quest/internal/household"
 	"code.cubecraftlabs.com/Maniacs_Mansion/Meal-Quest/internal/jobs"
+	"code.cubecraftlabs.com/Maniacs_Mansion/Meal-Quest/internal/recipes"
+	"code.cubecraftlabs.com/Maniacs_Mansion/Meal-Quest/internal/secretbox"
 	"code.cubecraftlabs.com/Maniacs_Mansion/Meal-Quest/internal/store"
 	"code.cubecraftlabs.com/Maniacs_Mansion/Meal-Quest/migrations"
 )
@@ -38,7 +42,7 @@ func newTestRouterWith(t *testing.T, version string, settings *household.Setting
 		"index.html":             {Data: []byte(fixtureIndex)},
 		"assets/index-AbC123.js": {Data: []byte(fixtureAsset)},
 	}
-	r, err := NewRouter(logger, version, nil, stubAuth{}, stubSessions{}, settings, runner, assets)
+	r, err := NewRouter(logger, version, nil, stubAuth{}, stubSessions{}, settings, newTestSearch(t), runner, newTestPhotos(t), assets)
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -112,11 +116,57 @@ func newTestRunner(t *testing.T) *jobs.Runner {
 	return runner
 }
 
+// newTestPhotos returns a photo cache over a migrated temp database and an
+// empty temp data directory.
+func newTestPhotos(t *testing.T) *recipes.PhotoCache {
+	t.Helper()
+	photos, err := recipes.NewPhotoCache(recipes.NewFetcher(), newTestStore(t), t.TempDir())
+	if err != nil {
+		t.Fatal(err)
+	}
+	return photos
+}
+
+// newTestSearch returns a recipe search settings service, with nothing
+// configured, over a migrated temp database and a random secret box.
+func newTestSearch(t *testing.T) *recipes.SearchSettingsService {
+	t.Helper()
+	key := make([]byte, secretbox.KeySize)
+	rand.Read(key)
+	box, err := secretbox.New(base64.StdEncoding.EncodeToString(key))
+	if err != nil {
+		t.Fatal(err)
+	}
+	search, err := recipes.NewSearchSettingsService(newTestStore(t), box)
+	if err != nil {
+		t.Fatal(err)
+	}
+	return search
+}
+
+func TestNewRouterRequiresSearchSettings(t *testing.T) {
+	t.Parallel()
+
+	logger := slog.New(slog.NewTextHandler(io.Discard, nil))
+	if _, err := NewRouter(logger, "dev", nil, stubAuth{}, stubSessions{}, newTestSettings(t), nil, newTestRunner(t), newTestPhotos(t), fstest.MapFS{"index.html": {}}); err == nil {
+		t.Fatal("NewRouter accepted a nil recipe search settings service")
+	}
+}
+
+func TestNewRouterRequiresPhotoFiles(t *testing.T) {
+	t.Parallel()
+
+	logger := slog.New(slog.NewTextHandler(io.Discard, nil))
+	if _, err := NewRouter(logger, "dev", nil, stubAuth{}, stubSessions{}, newTestSettings(t), newTestSearch(t), newTestRunner(t), nil, fstest.MapFS{"index.html": {}}); err == nil {
+		t.Fatal("NewRouter accepted nil photo files")
+	}
+}
+
 func TestNewRouterRequiresSettings(t *testing.T) {
 	t.Parallel()
 
 	logger := slog.New(slog.NewTextHandler(io.Discard, nil))
-	if _, err := NewRouter(logger, "dev", nil, stubAuth{}, stubSessions{}, nil, newTestRunner(t), fstest.MapFS{"index.html": {}}); err == nil {
+	if _, err := NewRouter(logger, "dev", nil, stubAuth{}, stubSessions{}, nil, newTestSearch(t), newTestRunner(t), newTestPhotos(t), fstest.MapFS{"index.html": {}}); err == nil {
 		t.Fatal("NewRouter accepted a nil settings service")
 	}
 }
@@ -125,7 +175,7 @@ func TestNewRouterRequiresJobRunner(t *testing.T) {
 	t.Parallel()
 
 	logger := slog.New(slog.NewTextHandler(io.Discard, nil))
-	if _, err := NewRouter(logger, "dev", nil, stubAuth{}, stubSessions{}, newTestSettings(t), nil, fstest.MapFS{"index.html": {}}); err == nil {
+	if _, err := NewRouter(logger, "dev", nil, stubAuth{}, stubSessions{}, newTestSettings(t), newTestSearch(t), nil, newTestPhotos(t), fstest.MapFS{"index.html": {}}); err == nil {
 		t.Fatal("NewRouter accepted a nil job runner")
 	}
 }

internal/server/settings.go

@@ -13,7 +13,8 @@ import (
 	"code.cubecraftlabs.com/Maniacs_Mansion/Meal-Quest/internal/household"
 )
 
-// maxSettingsBody bounds a PATCH /settings/household request body.
+// maxSettingsBody bounds a PATCH /settings/household or
+// /settings/recipe-search request body.
 const maxSettingsBody = 16 << 10
 
 // settingsPatch is the PATCH /settings/household body. Every field is
@@ -52,7 +53,7 @@ func patchHouseholdSettings(logger *slog.Logger, svc *household.SettingsService)
 			writeError(w, r, logger, http.StatusInternalServerError, "internal", "internal error")
 			return
 		}
-		patch, err := decodeSettingsPatch(http.MaxBytesReader(w, r.Body, maxSettingsBody))
+		patch, err := decodePatch[settingsPatch](http.MaxBytesReader(w, r.Body, maxSettingsBody))
 		if err != nil {
 			writeError(w, r, logger, http.StatusBadRequest, "invalid_request", err.Error())
 			return
@@ -72,37 +73,37 @@ func patchHouseholdSettings(logger *slog.Logger, svc *household.SettingsService)
 	}
 }
 
-// decodeSettingsPatch reads a single JSON object, refusing unknown fields,
-// null values and trailing data.
-func decodeSettingsPatch(body io.Reader) (settingsPatch, error) {
+// decodePatch reads a single JSON object into a patch of type T, refusing
+// unknown fields, null values and trailing data.
+func decodePatch[T any](body io.Reader) (T, error) {
+	var patch T
 	data, err := io.ReadAll(body)
 	if err != nil {
 		var tooLarge *http.MaxBytesError
 		if errors.As(err, &tooLarge) {
-			return settingsPatch{}, fmt.Errorf("request body exceeds %d bytes", tooLarge.Limit)
+			return patch, fmt.Errorf("request body exceeds %d bytes", tooLarge.Limit)
 		}
-		return settingsPatch{}, errors.New("cannot read request body")
+		return patch, errors.New("cannot read request body")
 	}
 
 	var fields map[string]json.RawMessage
 	if err := json.Unmarshal(data, &fields); err != nil || fields == nil {
-		return settingsPatch{}, errors.New("request body must be a JSON object")
+		return patch, errors.New("request body must be a JSON object")
 	}
 	for name, raw := range fields {
 		if bytes.Equal(raw, []byte("null")) {
-			return settingsPatch{}, fmt.Errorf("%s: must not be null", name)
+			return patch, fmt.Errorf("%s: must not be null", name)
 		}
 	}
 
-	var patch settingsPatch
 	dec := json.NewDecoder(bytes.NewReader(data))
 	dec.DisallowUnknownFields()
 	if err := dec.Decode(&patch); err != nil {
 		var typeErr *json.UnmarshalTypeError
 		if errors.As(err, &typeErr) {
-			return settingsPatch{}, fmt.Errorf("%s: want a JSON %s", typeErr.Field, typeErr.Type)
+			return patch, fmt.Errorf("%s: want a JSON %s", typeErr.Field, typeErr.Type)
 		}
-		return settingsPatch{}, fmt.Errorf("invalid settings: %v", err)
+		return patch, fmt.Errorf("invalid settings: %v", err)
 	}
 	return patch, nil
 }

internal/server/settings_test.go

@@ -216,7 +216,7 @@ func TestHouseholdSettingsWithRealSession(t *testing.T) {
 	}
 	logger := slog.New(slog.NewTextHandler(io.Discard, nil))
 	router, err := NewRouter(logger, "dev", nil, stubAuth{}, sessions, household.NewSettingsService(st),
-		newTestRunner(t), fstest.MapFS{"index.html": {Data: []byte(fixtureIndex)}})
+		newTestSearch(t), newTestRunner(t), newTestPhotos(t), fstest.MapFS{"index.html": {Data: []byte(fixtureIndex)}})
 	if err != nil {
 		t.Fatal(err)
 	}