Compare commits
230 commits
feat/admin
...
main
| Author | SHA1 | Date | |
|---|---|---|---|
| 1eb7308527 | |||
| 7d1ee934ca | |||
| 5a915a6cee | |||
| 9e847e15a1 | |||
| 0f8a640da2 | |||
| 9123f6358e | |||
| d1430498e0 | |||
| 429aa06ca6 | |||
| 26bd48bf4b | |||
| a02d289c92 | |||
| 09904cffc1 | |||
| 5a6ddfc287 | |||
| 16ceeda031 | |||
| 24bd2239fc | |||
| 0c4e8d089c | |||
| 51b7b8eec3 | |||
| 36d26c2739 | |||
| 2a3fb0434a | |||
| 61079b3a2a | |||
| 380f22d988 | |||
| b49ef5bb40 | |||
| 81b4a149ff | |||
| e8596a55bc | |||
| 019e3fb5e5 | |||
| ba030ec18c | |||
| c3560eccec | |||
| 8ae06f10c9 | |||
| 3dfed7e2e3 | |||
| 46069727ad | |||
| b20bcca07e | |||
| 7d20404b6f | |||
| 46c23c24ab | |||
| 30f975d29a | |||
| 71758e6d25 | |||
| 0c8cda7f3e | |||
| 9b6cee9950 | |||
| b873b70946 | |||
| a252640fe6 | |||
| 206ab6fa0c | |||
| e9040f93f4 | |||
| 22119adf07 | |||
| 592933b1ac | |||
| f68e8dbdc6 | |||
| ef8dbe8388 | |||
| f8b224dc8c | |||
| 8bcea74b56 | |||
| 1b96b891db | |||
| e702e21296 | |||
| 6828809081 | |||
| 126cd840f5 | |||
| 3d9f93e204 | |||
| a54cb85027 | |||
| c17b5b0060 | |||
| 3df24fe71c | |||
| 99d7badddf | |||
| b8cbf2d777 | |||
| d4d1b9eb3a | |||
| c4c2c2ae39 | |||
| b52586e076 | |||
| 642b37ebec | |||
| a87e3da025 | |||
| e62430ee5f | |||
| 4f553147ed | |||
| c82f0969a8 | |||
| 8d1c4a7f0b | |||
| f0f5e9f344 | |||
| e21c3f8255 | |||
| 8e3ec3ed12 | |||
| 615e320be1 | |||
| e1589e63d0 | |||
| 7d1a69cf12 | |||
| 2b5ae6722a | |||
| 964269d3f3 | |||
| 23bc19b482 | |||
| 0ff94c61ca | |||
| c39fbaeb13 | |||
| 33ffa810e3 | |||
| e45d92b333 | |||
| c520cfca09 | |||
| 1a5731bb79 | |||
| 0447c68b69 | |||
| f484465bee | |||
| f99bf46407 | |||
| 365e7b38b7 | |||
| 8d75462066 | |||
| 8f75a47b23 | |||
| 022b8ed4f9 | |||
| 80c5b957d6 | |||
| 3cdc863774 | |||
| cb3dd297a1 | |||
| 63615656cc | |||
| 952abe8dda | |||
| 8d3af76328 | |||
| 200e343cc7 | |||
| a3701acae4 | |||
| d0d66bbda5 | |||
| bb5fc825ae | |||
| 14690134f7 | |||
| 967be6df4a | |||
| 0ecd7c1c84 | |||
| d6cf4aa63d | |||
| 0fd4928efc | |||
| 94ef8b4133 | |||
| 5e478188a2 | |||
| 8315f737d4 | |||
| 21cd8f014d | |||
| 6d25faa633 | |||
| 3abb7217dd | |||
| 7cbd4944bd | |||
| 29bd413de3 | |||
| da3d080124 | |||
| 7d4e7efcce | |||
| f6e501d7b5 | |||
| 8693498373 | |||
| aeea0810cc | |||
| 6d868809ac | |||
| ce168a758c | |||
| 854d795c5d | |||
| 372988d734 | |||
| 998f0ac6bc | |||
| 27d82b49ca | |||
| 644164b25a | |||
| 966a0afa02 | |||
| 68216cf852 | |||
| 9c6feab064 | |||
| c0a07e8adc | |||
| 92f364bc1f | |||
| c662d02da6 | |||
| e9c0a61aaf | |||
| 7bafe39d72 | |||
| 907a68eb8a | |||
| b3581b2fb5 | |||
| cf7e519883 | |||
| 85dd1b6255 | |||
| 59352563c4 | |||
| 4f7a452924 | |||
| f37a61266f | |||
| 09f6d426d3 | |||
| 275cc2d500 | |||
| a3a949ce08 | |||
| bf994c396a | |||
| e90cadcc41 | |||
| 5d4d6be2dc | |||
| 548cee721f | |||
| 76a99f0e77 | |||
| 503781c95f | |||
| dcfb86d6c9 | |||
| fd5841d045 | |||
| ab1cf421d9 | |||
| 8e55f3d3f9 | |||
| 713d6c520d | |||
| b39105ac27 | |||
| d5ac6c4661 | |||
| 38fcf03417 | |||
| c21adeda72 | |||
| 2beff139a3 | |||
| d1948954a6 | |||
| cd8ce42df7 | |||
| 9174f80282 | |||
| da7b077098 | |||
| 961aa151d4 | |||
| 0ba6b2f687 | |||
| ff36cefcde | |||
| 5ad9d644bd | |||
| a8d86c7099 | |||
| b0ac42441f | |||
| 5d7e4d6f6a | |||
| 1d8c001035 | |||
| f8ec373691 | |||
| 802f3d251b | |||
| 2251aa93d7 | |||
| 8a29889175 | |||
| 4906accd85 | |||
| d1d68b0bf7 | |||
| 1bc9304cdc | |||
| 25b4fc97f0 | |||
| 8278878898 | |||
| f146e65348 | |||
| 1c62625c47 | |||
| 5e34a250df | |||
| eba0ea70bd | |||
| f01ac58fec | |||
| e64bbc37e9 | |||
| bc077b770e | |||
| ec26f32dd8 | |||
| 1cd886cb8a | |||
| c842fbb348 | |||
| c48625cb0c | |||
| 41031b4474 | |||
| 23be1e4d04 | |||
| 13d92f8fa8 | |||
| 71c409cf32 | |||
| ba131bd8c8 | |||
| 1ec846ed3d | |||
| 0569884ddc | |||
| c1aba1f18c | |||
| 3b78582d29 | |||
| bd607b17f3 | |||
| 81cdc55673 | |||
| df9693ffac | |||
| 6c5978dd1c | |||
| 5d4ed0dffb | |||
| cb43c9c6c5 | |||
| bdc1b4c9e9 | |||
| 9cde984543 | |||
| a24ef6a78b | |||
| 4c0a72a1e3 | |||
| ec01fc0107 | |||
| df0791a694 | |||
| dfd5a2f650 | |||
| 6324a87445 | |||
| b8411a2e91 | |||
| 393300205d | |||
| 39e748adc9 | |||
| 85268729e6 | |||
| 3d5998a535 | |||
| 81f7cb9972 | |||
| eb81d3f413 | |||
| dfe0310b63 | |||
| 29a5b301c3 | |||
| 89fedc93e2 | |||
| d5dca82af4 | |||
| ccec30b2e8 | |||
| fd62dbbabe | |||
| 189df73b4c | |||
| 1a28d67218 | |||
| bbd9afe8aa | |||
| 927051793c | |||
| 9532ea4e83 | |||
| a33f641dc7 |
406 changed files with 25785 additions and 4047 deletions
30
.env.example
30
.env.example
|
|
@ -15,26 +15,42 @@ JWT_SECRET=changeme-generate-a-real-random-secret-at-least-32-chars
|
||||||
# (docker-compose.yml), serving both the API and the built frontend.
|
# (docker-compose.yml), serving both the API and the built frontend.
|
||||||
# APP_PORT=3000
|
# APP_PORT=3000
|
||||||
|
|
||||||
# --- Admin application (apps/admin-web + the /admin/* API surface) ---------
|
# Optional — tag of the prebuilt images the release CI pushes to the Forgejo
|
||||||
|
# container registry (git.dev.kyuno.fr/kyuno/batchcooking-{app,intent-service,
|
||||||
|
# llm-worker}). Used by `docker compose pull` and a pull-based Portainer
|
||||||
|
# stack; leave it `latest` or pin a release tag (e.g. v0.2.4). Ignored when
|
||||||
|
# building locally instead (`docker compose build`, or `up` with no image
|
||||||
|
# present) — see docker-compose.yml's `image:`/`build:` comment.
|
||||||
|
# IMAGE_TAG=latest
|
||||||
|
|
||||||
|
# --- Admin surface (apps/web's /admin/* routes + the /admin/* API) --------
|
||||||
# All optional: an instance that doesn't run the admin app needs none of
|
# All optional: an instance that doesn't run the admin app needs none of
|
||||||
# these. `requireAdmin` fails closed when ADMIN_JWT_SECRET is unset, so
|
# these. `requireAdmin` fails closed when ADMIN_JWT_SECRET is unset, so
|
||||||
# leaving it out simply disables every /admin/* route.
|
# leaving it out simply disables every /admin/* route. The admin UI is
|
||||||
|
# served by the same app/container as the rest of the frontend — no
|
||||||
|
# separate origin, so no CORS entry of its own.
|
||||||
#
|
#
|
||||||
# Secret for the admin session JWT — MUST be different from JWT_SECRET so an
|
# Secret for the admin session JWT — MUST be different from JWT_SECRET so an
|
||||||
# end-user token can never be replayed against /admin/*. Generate your own
|
# end-user token can never be replayed against /admin/*. Generate your own
|
||||||
# the same way as JWT_SECRET above.
|
# the same way as JWT_SECRET above.
|
||||||
# ADMIN_JWT_SECRET=changeme-generate-a-real-random-secret-at-least-32-chars
|
# ADMIN_JWT_SECRET=changeme-generate-a-real-random-secret-at-least-32-chars
|
||||||
# Origin apps/admin-web is served from, added to the CORS allow-list.
|
|
||||||
# ADMIN_CORS_ORIGIN=http://localhost:5174
|
|
||||||
# Host port for the Docker `admin-web` service (static nginx serving the
|
|
||||||
# built admin frontend).
|
|
||||||
# ADMIN_WEB_PORT=3001
|
|
||||||
# Optional — read only by `src/scripts/create-admin.ts` when its --email /
|
# Optional — read only by `src/scripts/create-admin.ts` when its --email /
|
||||||
# --password / --name flags are omitted (e.g. to bootstrap the first admin
|
# --password / --name flags are omitted (e.g. to bootstrap the first admin
|
||||||
# from inside the container). Never read by the running server.
|
# from inside the container). Never read by the running server.
|
||||||
# ADMIN_INITIAL_EMAIL=ops@example.com
|
# ADMIN_INITIAL_EMAIL=ops@example.com
|
||||||
# ADMIN_INITIAL_PASSWORD=changeme-at-least-8-chars
|
# ADMIN_INITIAL_PASSWORD=changeme-at-least-8-chars
|
||||||
# ADMIN_INITIAL_NAME=Ops
|
# ADMIN_INITIAL_NAME=Ops
|
||||||
|
#
|
||||||
|
# Optional — lets an admin open a Forgejo ticket from a contact message
|
||||||
|
# (apps/web's /admin/messages, issue #81). All three needed together: the
|
||||||
|
# button stays hidden and the endpoint answers 503 unless all are set to a
|
||||||
|
# non-empty value. docker-compose.yml forwards these into the "app"
|
||||||
|
# container, so setting them here is enough (a blank value counts as
|
||||||
|
# unset). FORGEJO_TOKEN is a personal access token with the write:issue
|
||||||
|
# scope — generate it in Forgejo, never commit the real value.
|
||||||
|
# FORGEJO_BASE_URL=https://git.example.com
|
||||||
|
# FORGEJO_TOKEN=changeme-a-forgejo-personal-access-token
|
||||||
|
# FORGEJO_REPO=owner/repo
|
||||||
|
|
||||||
# Optional — only set this to false if THIS deployment is served over
|
# Optional — only set this to false if THIS deployment is served over
|
||||||
# plain HTTP (no TLS in front of it). Left unset, the session cookie
|
# plain HTTP (no TLS in front of it). Left unset, the session cookie
|
||||||
|
|
|
||||||
247
.github/workflows/ci.yml
vendored
247
.github/workflows/ci.yml
vendored
|
|
@ -12,6 +12,15 @@ on:
|
||||||
push:
|
push:
|
||||||
|
|
||||||
env:
|
env:
|
||||||
|
# Hostname `postgres` = the container the `test` job starts itself (see
|
||||||
|
# that job's "Start Postgres" step) — a plain `docker run`, not a
|
||||||
|
# `services:` block, for the same reason the intent-service below can't be
|
||||||
|
# one: this repo's Forgejo `act` runner does not keep a `services:`
|
||||||
|
# container as the *same* instance across a job's steps, so `migrate
|
||||||
|
# deploy` would land the schema in one Postgres and `pnpm --filter api
|
||||||
|
# test`'s `beforeAll` would then hit an empty one ("table … does not
|
||||||
|
# exist" right after "migrations successfully applied"). One long-lived
|
||||||
|
# container in the job, shared by every step, removes that failure mode.
|
||||||
DATABASE_URL: "postgresql://ci:ci@postgres:5432/batchcooking_ci?schema=public"
|
DATABASE_URL: "postgresql://ci:ci@postgres:5432/batchcooking_ci?schema=public"
|
||||||
# Test-only secret, never used outside CI — real deployments must set their own.
|
# Test-only secret, never used outside CI — real deployments must set their own.
|
||||||
JWT_SECRET: "ci-only-secret-not-used-anywhere-else-32chars+"
|
JWT_SECRET: "ci-only-secret-not-used-anywhere-else-32chars+"
|
||||||
|
|
@ -24,11 +33,19 @@ env:
|
||||||
# secret configured -> 401" path.
|
# secret configured -> 401" path.
|
||||||
ADMIN_JWT_SECRET: "ci-only-admin-secret-not-used-anywhere-else-32chars+"
|
ADMIN_JWT_SECRET: "ci-only-admin-secret-not-used-anywhere-else-32chars+"
|
||||||
# Shared between the `test` job's own uvicorn step (below) and apps/api's
|
# Shared between the `test` job's own uvicorn step (below) and apps/api's
|
||||||
# IntentServiceClient — see the `test` job for why this can't be a
|
# IntentServiceClient — that step runs `uvicorn` as a plain background
|
||||||
# `services:` container like postgres above (GitHub Actions can only pull
|
# process (not a `services:` block or even a container) because CI can
|
||||||
# a published image, not build services/tech-step-intent-service/Dockerfile).
|
# only pull a published image, not build
|
||||||
|
# services/tech-step-intent-service/Dockerfile from this checkout.
|
||||||
INTENT_SERVICE_BASE_URL: "http://localhost:8000"
|
INTENT_SERVICE_BASE_URL: "http://localhost:8000"
|
||||||
INTENT_SERVICE_SECRET: "ci-only-intent-secret-not-used-anywhere-else-32chars+"
|
INTENT_SERVICE_SECRET: "ci-only-intent-secret-not-used-anywhere-else-32chars+"
|
||||||
|
# Same reasoning — lets forgejo.service.test.ts / admin-contact.test.ts
|
||||||
|
# exercise the "configured" path (issue #81). `globalThis.fetch` is stubbed
|
||||||
|
# in those tests, so no real request ever leaves CI; these values only need
|
||||||
|
# to parse (a valid URL and an `owner/repo`).
|
||||||
|
FORGEJO_BASE_URL: "https://forgejo.ci.invalid"
|
||||||
|
FORGEJO_TOKEN: "ci-only-forgejo-token-not-used-anywhere-else"
|
||||||
|
FORGEJO_REPO: "ci/batchcooking"
|
||||||
|
|
||||||
jobs:
|
jobs:
|
||||||
# Five independent jobs, no needs: between them — each starts in parallel
|
# Five independent jobs, no needs: between them — each starts in parallel
|
||||||
|
|
@ -51,22 +68,96 @@ jobs:
|
||||||
|
|
||||||
test:
|
test:
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
services:
|
# ~16-19 min of actual work (runs 117-124); the extra budget covers time
|
||||||
postgres:
|
# spent queued in "Wait for any earlier test job" below. Also a runaway
|
||||||
image: postgres:16-alpine
|
# ceiling — Mocha has no `--exit` (`apps/api/.mocharc.json`), so one
|
||||||
env:
|
# leaked handle would otherwise hang the job until the runner's global
|
||||||
POSTGRES_USER: ci
|
# timeout (a `test` job zombied ~1h once). If a hung job hits this
|
||||||
POSTGRES_PASSWORD: ci
|
# ceiling the runner removes its container, which unblocks the queue.
|
||||||
POSTGRES_DB: batchcooking_ci
|
timeout-minutes: 45
|
||||||
options: >-
|
|
||||||
--health-cmd pg_isready
|
|
||||||
--health-interval 5s
|
|
||||||
--health-timeout 5s
|
|
||||||
--health-retries 10
|
|
||||||
steps:
|
steps:
|
||||||
- name: Install curl and dependencies
|
- name: Install curl and the docker CLI
|
||||||
run: |
|
run: |
|
||||||
apt-get update && apt-get install -y curl
|
apt-get update && apt-get install -y curl docker.io
|
||||||
|
|
||||||
|
# Serialize `test` across every concurrent run. Two `test` jobs must
|
||||||
|
# never overlap: they share one `--name postgres` container on the
|
||||||
|
# runner's shared docker network (next step), so their `prisma migrate
|
||||||
|
# deploy` + `seedReferenceData` (root Mocha `beforeAll`) race —
|
||||||
|
# `Unique constraint failed on (key)` in `seedReferenceData`, "No
|
||||||
|
# pending migrations" when there should be some, `tech_step`/`diet` id
|
||||||
|
# shifts breaking unrelated assertions; and even past that they starve
|
||||||
|
# each other's RAM/CPU (each also trains a spaCy model) until
|
||||||
|
# `resetDatabase()` overruns Mocha's 10s hook timeout and cascades.
|
||||||
|
# Hit repeatedly (PRs #47, #53, #54), each needing an empty-commit
|
||||||
|
# re-trigger once the runner was idle.
|
||||||
|
#
|
||||||
|
# GitHub's `concurrency:` is the native fix but this Forgejo (9.0.3)
|
||||||
|
# predates Actions `concurrency` — it arrived in Forgejo v14 / Gitea
|
||||||
|
# 1.26 and is silently ignored here. A lock object (network, container,
|
||||||
|
# file) would leak: this runner (forgejo-runner v3.5.0) does NOT run a
|
||||||
|
# trailing `if: always()` step after an earlier step fails, so there is
|
||||||
|
# no reliable in-job release. Instead, key off the one thing the runner
|
||||||
|
# *does* always clean up — the job container itself (removed on pass,
|
||||||
|
# fail, and cancel alike): wait while any lower-numbered `test` job's
|
||||||
|
# container is still running. Lower task id goes first, so two jobs
|
||||||
|
# that start together can't deadlock; nothing to release.
|
||||||
|
- name: Wait for any earlier test job
|
||||||
|
run: |
|
||||||
|
my_id="$(printf '%s\n' "${JOB_CONTAINER_NAME:-}" | sed -n 's/.*TASK-\([0-9]\{1,\}\).*/\1/p')"
|
||||||
|
echo "this test job is task ${my_id:-<unknown, not serializing>}"
|
||||||
|
# ~25 min cap (75 * 20s): comfortably covers one earlier run
|
||||||
|
# (the realistic overlap is two runs); a rarer 3-way pile-up whose
|
||||||
|
# wait exceeds this just fails and gets an empty-commit re-run.
|
||||||
|
for attempt in $(seq 1 75); do
|
||||||
|
earlier="$(docker ps --format '{{.Names}}' 2>/dev/null \
|
||||||
|
| sed -n 's/.*TASK-\([0-9]\{1,\}\)_.*_JOB-test$/\1/p' \
|
||||||
|
| awk -v me="${my_id:-0}" 'NF && ($1 + 0) < (me + 0)')"
|
||||||
|
if [ -z "$earlier" ]; then
|
||||||
|
[ "$attempt" -gt 1 ] && echo "earlier test job(s) finished — proceeding"
|
||||||
|
exit 0
|
||||||
|
fi
|
||||||
|
echo "waiting for earlier test job(s): $(printf '%s ' $earlier)(attempt ${attempt})"
|
||||||
|
sleep 20
|
||||||
|
done
|
||||||
|
echo "still blocked by an earlier test job after ~25 min — giving up; a re-run should get through" >&2
|
||||||
|
exit 1
|
||||||
|
|
||||||
|
# Postgres as a plain background container instead of a `services:`
|
||||||
|
# block — see this workflow's top-level `env.DATABASE_URL` comment for
|
||||||
|
# why. Reachable as `postgres` from this job (the runner mounts the
|
||||||
|
# docker socket and runs jobs on a shared user-defined network, so a
|
||||||
|
# `--name postgres` sibling resolves by name); the network is
|
||||||
|
# discovered from the job container itself rather than hardcoded. The
|
||||||
|
# `docker rm -f postgres` below also clears a container left behind by
|
||||||
|
# the previous run (this runner has no reliable post-job cleanup), and
|
||||||
|
# the serialization step above means no other run is using it now.
|
||||||
|
- name: Start Postgres in the background
|
||||||
|
run: |
|
||||||
|
net="$(docker inspect "$(hostname)" \
|
||||||
|
--format '{{range $k, $_ := .NetworkSettings.Networks}}{{$k}} {{end}}' \
|
||||||
|
| awk '{print $1}')"
|
||||||
|
echo "job network: ${net:?could not determine the job container network}"
|
||||||
|
docker rm -f postgres >/dev/null 2>&1 || true
|
||||||
|
# Also drop any `postgres-<suffix>` container. A since-reverted
|
||||||
|
# attempt at per-run Postgres naming on this branch left some
|
||||||
|
# running on this persistent runner (their `if: always()` teardown
|
||||||
|
# never fired — this runner skips trailing steps after a failure),
|
||||||
|
# and nothing else removes them. A second idle Postgres here starves
|
||||||
|
# the runner's RAM and slows every query ~5x → `resetDatabase()`
|
||||||
|
# blows Mocha's 10s hook timeout. Nothing creates `postgres-*` any
|
||||||
|
# more, so this only ever clears that debris.
|
||||||
|
docker ps -aq --filter 'name=^postgres-' | xargs -r docker rm -f >/dev/null 2>&1 || true
|
||||||
|
docker run -d --name postgres --network "$net" \
|
||||||
|
-e POSTGRES_USER=ci -e POSTGRES_PASSWORD=ci -e POSTGRES_DB=batchcooking_ci \
|
||||||
|
postgres:16-alpine
|
||||||
|
for _ in $(seq 1 60); do
|
||||||
|
docker exec postgres pg_isready -U ci -d batchcooking_ci && exit 0
|
||||||
|
sleep 2
|
||||||
|
done
|
||||||
|
echo "Postgres did not become ready in time" >&2
|
||||||
|
docker logs postgres || true
|
||||||
|
exit 1
|
||||||
|
|
||||||
- uses: https://github.com/actions/checkout@v4
|
- uses: https://github.com/actions/checkout@v4
|
||||||
|
|
||||||
|
|
@ -82,15 +173,14 @@ jobs:
|
||||||
python-version: "3.12"
|
python-version: "3.12"
|
||||||
enable-cache: true
|
enable-cache: true
|
||||||
|
|
||||||
# `services:` (like the `postgres` container above) can only pull an
|
# A `services:` block can only pull an already-published image — it
|
||||||
# already-published image — it can't build
|
# can't build services/tech-step-intent-service/Dockerfile from this
|
||||||
# services/tech-step-intent-service/Dockerfile from this checkout.
|
# checkout. Running `uvicorn` as a plain background step instead: it
|
||||||
# Running `uvicorn` as a plain background step instead: it keeps
|
# keeps running for the rest of this job (steps in one job share the
|
||||||
# running for the rest of this job (GitHub Actions steps in one job
|
# same process tree), and `pnpm --filter api test` below needs a real
|
||||||
# share the same runner process tree), and `pnpm --filter api test`
|
# instance to talk to per this repo's "never mock an internal service"
|
||||||
# below needs a real instance to talk to per this repo's "never mock
|
# test convention — same "real dependency, started by the job itself"
|
||||||
# an internal service" test convention — same reasoning as the real
|
# posture as the Postgres step above, not a mock HTTP server.
|
||||||
# `postgres` container just above, not a mock HTTP server.
|
|
||||||
- name: Install services/tech-step-intent-service
|
- name: Install services/tech-step-intent-service
|
||||||
working-directory: services/tech-step-intent-service
|
working-directory: services/tech-step-intent-service
|
||||||
run: uv sync --frozen
|
run: uv sync --frozen
|
||||||
|
|
@ -100,11 +190,14 @@ jobs:
|
||||||
uv run uvicorn intent_service.main:app --host 0.0.0.0 --port 8000 &
|
uv run uvicorn intent_service.main:app --host 0.0.0.0 --port 8000 &
|
||||||
# `/health` only returns 200 once this service has finished
|
# `/health` only returns 200 once this service has finished
|
||||||
# training itself from scratch (no model ever persisted to disk —
|
# training itself from scratch (no model ever persisted to disk —
|
||||||
# see its own README) — measured at ~540s (fr) / ~390s (en),
|
# see its own README) — measured at ~3min combined (fr+en) against
|
||||||
# ~930s combined, against the current ~74-technique corpus (see
|
# the current ~74-technique corpus, down from ~930s once
|
||||||
# docker-compose.yml's healthcheck for the same reasoning and why
|
# `spacy.TextCatBOW.v3`'s `length` stopped being left at its
|
||||||
# this grew slightly from the original ~670s).
|
# 262144 default (see `_TEXTCAT_MODEL_LENGTH` in
|
||||||
timeout 1200 bash -c 'until curl -sf http://localhost:8000/health > /dev/null; do sleep 2; done'
|
# `locale_pipeline.py`, and docker-compose.yml's healthcheck for
|
||||||
|
# the same reasoning). The timeout stays well above that: it's a
|
||||||
|
# ceiling for a slow/contended runner, not a target.
|
||||||
|
timeout 600 bash -c 'until curl -sf http://localhost:8000/health > /dev/null; do sleep 2; done'
|
||||||
|
|
||||||
- run: pnpm install --frozen-lockfile
|
- run: pnpm install --frozen-lockfile
|
||||||
- run: pnpm --filter api exec prisma migrate deploy
|
- run: pnpm --filter api exec prisma migrate deploy
|
||||||
|
|
@ -179,10 +272,90 @@ jobs:
|
||||||
# `component.devServer`), unlike `e2e` above which needs the real app
|
# `component.devServer`), unlike `e2e` above which needs the real app
|
||||||
# running first.
|
# running first.
|
||||||
- run: pnpm --filter web cy:run:component
|
- run: pnpm --filter web cy:run:component
|
||||||
# The admin app's own Cypress suite (`apps/admin-web`) — its own dev
|
|
||||||
# server on :5174, all `/admin/*` calls mocked via `cy.intercept`
|
# Builds and packages a signed, downloadable Android APK on every push to
|
||||||
# (no live backend needed), same as the `web` e2e run above.
|
# `main` — issue #64. `needs:` on every other job is what actually makes
|
||||||
- name: Run admin-web E2E tests
|
# this "build, TEST, and package" rather than just "build and package in
|
||||||
|
# parallel with tests that might still be failing": Forgejo/GitHub Actions
|
||||||
|
# has no native way for a job in a *different* workflow file to block on
|
||||||
|
# one here, so this has to live in this same file to get a real dependency
|
||||||
|
# rather than a same-push coincidence. `if:` (not a separate trigger) keeps
|
||||||
|
# every other job running on every branch as today — only this one is
|
||||||
|
# main-only.
|
||||||
|
#
|
||||||
|
# No dedicated Android test suite exists (zero native code beyond the
|
||||||
|
# Capacitor-generated shell) — "testée" is satisfied by gating on the 5
|
||||||
|
# existing jobs, not by inventing an instrumented test suite for this.
|
||||||
|
#
|
||||||
|
# Unverified on this runner as of writing: no Android build has ever run
|
||||||
|
# on this self-hosted Forgejo `act` runner (unlike lint/test/build/e2e,
|
||||||
|
# exercised for months). If SDK installation turns out too slow/heavy here,
|
||||||
|
# cache `~/.android/sdk`/`~/.gradle` (same idea as the Cypress binary cache
|
||||||
|
# in `e2e` above) rather than accepting a slow job on every push.
|
||||||
|
build-android:
|
||||||
|
runs-on: ubuntu-latest
|
||||||
|
needs: [lint, test, intent-service-test, build, e2e]
|
||||||
|
if: github.ref == 'refs/heads/main'
|
||||||
|
steps:
|
||||||
|
- uses: https://github.com/actions/checkout@v4
|
||||||
|
|
||||||
|
- uses: pnpm/action-setup@v4
|
||||||
|
|
||||||
|
- uses: https://github.com/actions/setup-node@v4
|
||||||
|
with:
|
||||||
|
node-version: 22
|
||||||
|
cache: pnpm
|
||||||
|
|
||||||
|
- uses: https://github.com/actions/setup-java@v4
|
||||||
|
with:
|
||||||
|
distribution: temurin
|
||||||
|
# Matches what Android Gradle Plugin 8.x (bundled with the
|
||||||
|
# Capacitor-generated project, see apps/web/android/build.gradle)
|
||||||
|
# expects — bump alongside AGP if that version ever moves.
|
||||||
|
java-version: "21"
|
||||||
|
|
||||||
|
- uses: https://github.com/android-actions/setup-android@v3
|
||||||
|
|
||||||
|
- run: pnpm install --frozen-lockfile
|
||||||
|
|
||||||
|
# Unlike the normal web build (served same-origin as the API), a
|
||||||
|
# packaged Capacitor build runs from the WebView's own local origin and
|
||||||
|
# needs an absolute, public HTTPS URL baked in at build time — see
|
||||||
|
# apps/web/.env.capacitor.example's own comment on this.
|
||||||
|
- name: Build le bundle web pour Capacitor
|
||||||
env:
|
env:
|
||||||
HOST: "0.0.0.0"
|
VITE_API_URL: ${{ secrets.MOBILE_API_URL }}
|
||||||
run: pnpm --filter admin-web e2e
|
run: pnpm --filter web build:capacitor
|
||||||
|
- run: pnpm --filter web exec cap sync android
|
||||||
|
|
||||||
|
# Le keystore de release est un secret généré une fois à la main (voir
|
||||||
|
# le README, section "Application mobile") — jamais régénéré ici, un
|
||||||
|
# nouveau keystore casserait la mise à jour de l'appli déjà installée
|
||||||
|
# (Android refuse une signature différente de celle déjà installée).
|
||||||
|
- name: Décode le keystore de release
|
||||||
|
env:
|
||||||
|
ANDROID_KEYSTORE_BASE64: ${{ secrets.ANDROID_KEYSTORE_BASE64 }}
|
||||||
|
run: echo "$ANDROID_KEYSTORE_BASE64" | base64 -d > apps/web/android/app/release.keystore
|
||||||
|
|
||||||
|
- name: Build l'APK signé
|
||||||
|
working-directory: apps/web/android
|
||||||
|
env:
|
||||||
|
ANDROID_KEYSTORE_PATH: release.keystore
|
||||||
|
ANDROID_KEYSTORE_PASSWORD: ${{ secrets.ANDROID_KEYSTORE_PASSWORD }}
|
||||||
|
ANDROID_KEY_ALIAS: ${{ secrets.ANDROID_KEY_ALIAS }}
|
||||||
|
ANDROID_KEY_PASSWORD: ${{ secrets.ANDROID_KEY_PASSWORD }}
|
||||||
|
# chmod défensif : le dev de ce repo se fait sous Windows, où le bit
|
||||||
|
# exécutable git de gradlew ne veut rien dire et peut être reperdu
|
||||||
|
# silencieusement par un futur commit — ne pas dépendre uniquement
|
||||||
|
# du mode suivi par git (voir aussi le fix de ce mode lui-même).
|
||||||
|
run: |
|
||||||
|
chmod +x ./gradlew
|
||||||
|
./gradlew assembleRelease
|
||||||
|
|
||||||
|
# v4+ exige l'API "Results" de GitHub, que ce runner Forgejo self-hosted
|
||||||
|
# ne supporte pas ("GHESNotSupportedError") — v3 utilise encore
|
||||||
|
# l'ancienne API Artifacts (compatible), seule version utilisable ici.
|
||||||
|
- uses: https://github.com/actions/upload-artifact@v3
|
||||||
|
with:
|
||||||
|
name: batchcooking-release.apk
|
||||||
|
path: apps/web/android/app/build/outputs/apk/release/app-release.apk
|
||||||
|
|
|
||||||
239
.github/workflows/release.yml
vendored
239
.github/workflows/release.yml
vendored
|
|
@ -1,44 +1,243 @@
|
||||||
name: Release
|
name: Release
|
||||||
|
|
||||||
# No image registry involved: Portainer is wired to this repo's Git remote
|
# On a `vX.Y.Z` tag: build the three service images and push them to this
|
||||||
# and builds/redeploys apps/api/Dockerfile itself. This workflow sanity-checks
|
# Forgejo instance's built-in container registry (git.dev.kyuno.fr/<owner>/
|
||||||
# that the image actually builds at the tagged commit, publishes a GitHub
|
# batchcooking-{app,intent-service,llm-worker}, tagged with the release tag
|
||||||
# Release, then (best-effort) pings Portainer's deploy webhook so it doesn't
|
# and `latest`), build+attach a signed Android APK, publish a Forgejo
|
||||||
# have to wait for its own polling interval.
|
# Release, then (best-effort) ping Portainer's deploy webhook. Portainer can
|
||||||
|
# pull those prebuilt images (docker-compose.yml references them via
|
||||||
|
# ${IMAGE_TAG}) or keep building from the Git remote — `docker-compose.yml`
|
||||||
|
# keeps a `build:` fallback next to every `image:`.
|
||||||
on:
|
on:
|
||||||
push:
|
push:
|
||||||
tags: ["v*.*.*"]
|
tags: ["v*.*.*"]
|
||||||
|
|
||||||
permissions:
|
permissions:
|
||||||
contents: write
|
contents: write
|
||||||
|
# Lets this workflow's GITHUB_TOKEN push to the Forgejo container registry
|
||||||
|
# (the `build-and-push-images` job below `docker login`s with it). If a
|
||||||
|
# future instance policy scopes the run token tighter, swap that login's
|
||||||
|
# password for a `write:package` PAT added as a repo secret.
|
||||||
|
packages: write
|
||||||
|
|
||||||
jobs:
|
jobs:
|
||||||
sanity-build:
|
# Build the three service images at the tagged commit and push them to the
|
||||||
|
# Forgejo container registry. A successful push also *is* the "does it
|
||||||
|
# still build" check the old `sanity-build` job did (which only covered
|
||||||
|
# apps/api). One sequential job, not a per-image matrix: three concurrent
|
||||||
|
# `docker build`s hammer this single persistent runner's Docker daemon
|
||||||
|
# (the contended resource per project memory `ci-forgejo-runner-constraints`)
|
||||||
|
# for no real gain on a release, which is rare and usually runs alone.
|
||||||
|
build-and-push-images:
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@v4
|
# This runner's job containers don't come with docker preinstalled —
|
||||||
|
# same reason ci.yml's `test` job has to do this before its own
|
||||||
|
# `docker run` calls.
|
||||||
|
- name: Install docker
|
||||||
|
run: apt-get update && apt-get install -y docker.io
|
||||||
|
|
||||||
# Build only, no push, no registry — just confirms Portainer will be
|
- uses: https://github.com/actions/checkout@v4
|
||||||
# able to build this same Dockerfile successfully at this tag before
|
|
||||||
# anyone points it at this ref.
|
|
||||||
- run: docker build -f apps/api/Dockerfile .
|
|
||||||
|
|
||||||
github-release:
|
- name: Build et push des 3 images vers le registre Forgejo
|
||||||
|
env:
|
||||||
|
# The per-run token Forgejo Actions mints — has `packages: write`
|
||||||
|
# via this workflow's `permissions:` block. `docker login` accepts
|
||||||
|
# it as the password for the actor who pushed the tag.
|
||||||
|
REGISTRY_TOKEN: ${{ secrets.GITHUB_TOKEN }}
|
||||||
|
run: |
|
||||||
|
set -eu
|
||||||
|
# $GITHUB_SERVER_URL is "https://git.dev.kyuno.fr" — the registry
|
||||||
|
# is that same host. $GITHUB_REPOSITORY is "<owner>/<repo>"; the
|
||||||
|
# registry namespace is the owner, lower-cased (Forgejo package
|
||||||
|
# names are case-insensitive but the CLI wants a stable form).
|
||||||
|
registry="${GITHUB_SERVER_URL#http*://}"
|
||||||
|
owner="$(printf '%s' "${GITHUB_REPOSITORY%%/*}" | tr '[:upper:]' '[:lower:]')"
|
||||||
|
tag="$GITHUB_REF_NAME"
|
||||||
|
echo "$REGISTRY_TOKEN" | docker login "$registry" -u "$GITHUB_ACTOR" --password-stdin
|
||||||
|
|
||||||
|
# Every Dockerfile's build context is the repo root (see
|
||||||
|
# docker-compose.yml's `build.context: .`), hence the trailing `.`.
|
||||||
|
build_push() {
|
||||||
|
image="$registry/$owner/$1"
|
||||||
|
echo "::group::$1"
|
||||||
|
docker build -f "$2" -t "$image:$tag" -t "$image:latest" .
|
||||||
|
docker push "$image:$tag"
|
||||||
|
docker push "$image:latest"
|
||||||
|
echo "::endgroup::"
|
||||||
|
}
|
||||||
|
build_push batchcooking-app apps/api/Dockerfile
|
||||||
|
build_push batchcooking-intent-service services/tech-step-intent-service/Dockerfile
|
||||||
|
build_push batchcooking-llm-worker services/tech-step-llm-worker/Dockerfile
|
||||||
|
|
||||||
|
# Builds the same signed APK as ci.yml's build-android job (issue #64),
|
||||||
|
# with one difference: the version baked into the APK is derived from the
|
||||||
|
# tag itself rather than left at build.gradle's default. Duplicated here
|
||||||
|
# rather than factored into a shared `workflow_call` reusable workflow —
|
||||||
|
# deliberate: reusable-workflow support on this self-hosted Forgejo/act
|
||||||
|
# runner is unverified, and this ~15-line recipe is proven working as-is
|
||||||
|
# in ci.yml; not worth risking a new class of runner-compatibility surprise
|
||||||
|
# (this repo has already hit several — see ci-forgejo-runner-constraints
|
||||||
|
# in project memory) to save a little duplication. Keep both copies in
|
||||||
|
# sync if the Android build steps ever change.
|
||||||
|
build-android-apk:
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
needs: sanity-build
|
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@v4
|
- uses: https://github.com/actions/checkout@v4
|
||||||
|
|
||||||
- uses: softprops/action-gh-release@v2
|
- uses: pnpm/action-setup@v4
|
||||||
|
|
||||||
|
- uses: https://github.com/actions/setup-node@v4
|
||||||
with:
|
with:
|
||||||
# Auto-generated from merged PRs since the previous tag — no
|
node-version: 22
|
||||||
# changelog tooling to maintain, consistent with there being no
|
cache: pnpm
|
||||||
# versioning tooling elsewhere in the repo yet.
|
|
||||||
generate_release_notes: true
|
- uses: https://github.com/actions/setup-java@v4
|
||||||
|
with:
|
||||||
|
distribution: temurin
|
||||||
|
java-version: "21"
|
||||||
|
|
||||||
|
- uses: https://github.com/android-actions/setup-android@v3
|
||||||
|
|
||||||
|
- run: pnpm install --frozen-lockfile
|
||||||
|
|
||||||
|
- name: Build le bundle web pour Capacitor
|
||||||
|
env:
|
||||||
|
VITE_API_URL: ${{ secrets.MOBILE_API_URL }}
|
||||||
|
run: pnpm --filter web build:capacitor
|
||||||
|
- run: pnpm --filter web exec cap sync android
|
||||||
|
|
||||||
|
- name: Décode le keystore de release
|
||||||
|
env:
|
||||||
|
ANDROID_KEYSTORE_BASE64: ${{ secrets.ANDROID_KEYSTORE_BASE64 }}
|
||||||
|
run: echo "$ANDROID_KEYSTORE_BASE64" | base64 -d > apps/web/android/app/release.keystore
|
||||||
|
|
||||||
|
- name: Dérive versionName/versionCode depuis le tag
|
||||||
|
# GITHUB_REF_NAME = "v1.4.2" pour un tag `v1.4.2` — versionName =
|
||||||
|
# "1.4.2" (sans le `v`), versionCode = majeur*10000 + mineur*100 +
|
||||||
|
# correctif (ex. 1.4.2 -> 10402), un entier strictement croissant à
|
||||||
|
# chaque release comme Android l'exige (jamais réutilisé, jamais
|
||||||
|
# décroissant) tant que chaque partie reste sous 100 (largement
|
||||||
|
# suffisant ici). Exposé aux steps suivants via $GITHUB_ENV plutôt
|
||||||
|
# que recalculé.
|
||||||
|
run: |
|
||||||
|
tag="${GITHUB_REF_NAME#v}"
|
||||||
|
major="$(echo "$tag" | cut -d. -f1)"
|
||||||
|
minor="$(echo "$tag" | cut -d. -f2)"
|
||||||
|
patch="$(echo "$tag" | cut -d. -f3)"
|
||||||
|
# Préfixe 10# : force une lecture en base 10, sinon bash lirait
|
||||||
|
# un composant à zéro non significatif (ex. "08") comme de
|
||||||
|
# l'octal invalide et échouerait.
|
||||||
|
code=$((10#$major * 10000 + 10#$minor * 100 + 10#$patch))
|
||||||
|
echo "Version dérivée du tag $GITHUB_REF_NAME : versionName=$tag versionCode=$code"
|
||||||
|
echo "ANDROID_VERSION_NAME=$tag" >> "$GITHUB_ENV"
|
||||||
|
echo "ANDROID_VERSION_CODE=$code" >> "$GITHUB_ENV"
|
||||||
|
|
||||||
|
- name: Build l'APK signé
|
||||||
|
working-directory: apps/web/android
|
||||||
|
env:
|
||||||
|
ANDROID_KEYSTORE_PATH: release.keystore
|
||||||
|
ANDROID_KEYSTORE_PASSWORD: ${{ secrets.ANDROID_KEYSTORE_PASSWORD }}
|
||||||
|
ANDROID_KEY_ALIAS: ${{ secrets.ANDROID_KEY_ALIAS }}
|
||||||
|
ANDROID_KEY_PASSWORD: ${{ secrets.ANDROID_KEY_PASSWORD }}
|
||||||
|
run: |
|
||||||
|
chmod +x ./gradlew
|
||||||
|
./gradlew assembleRelease -PandroidVersionName="$ANDROID_VERSION_NAME" -PandroidVersionCode="$ANDROID_VERSION_CODE"
|
||||||
|
|
||||||
|
# Nom de fichier stable, jamais versionné : la page d'accueil (#65)
|
||||||
|
# pointe vers /releases/latest (Forgejo n'a pas l'équivalent du
|
||||||
|
# raccourci GitHub /releases/latest/download/<fichier>, seul
|
||||||
|
# /releases/latest lui-même résout) — un nom stable évite au moins que
|
||||||
|
# l'utilisateur voie un nom de fichier différent à chaque release une
|
||||||
|
# fois sur la page.
|
||||||
|
- name: Renomme l'APK sous un nom stable
|
||||||
|
run: cp apps/web/android/app/build/outputs/apk/release/app-release.apk batchcooking.apk
|
||||||
|
|
||||||
|
# v4+ exige l'API "Results" de GitHub, non supportée par ce Forgejo
|
||||||
|
# self-hosted ("GHESNotSupportedError") — v3 (ancienne API Artifacts)
|
||||||
|
# est la seule utilisable ici, voir ci.yml's build-android pour la
|
||||||
|
# même contrainte déjà rencontrée.
|
||||||
|
- uses: https://github.com/actions/upload-artifact@v3
|
||||||
|
with:
|
||||||
|
name: batchcooking.apk
|
||||||
|
path: batchcooking.apk
|
||||||
|
|
||||||
|
forgejo-release:
|
||||||
|
runs-on: ubuntu-latest
|
||||||
|
needs: [build-and-push-images, build-android-apk]
|
||||||
|
steps:
|
||||||
|
# Ce runner ne fournit ni docker ni curl par défaut dans ses
|
||||||
|
# conteneurs de job — même constat déjà fait pour docker (voir
|
||||||
|
# build-and-push-images) et pour curl dans ci.yml's test job.
|
||||||
|
- name: Install curl
|
||||||
|
run: apt-get update && apt-get install -y curl
|
||||||
|
|
||||||
|
- uses: https://github.com/actions/checkout@v4
|
||||||
|
|
||||||
|
- uses: https://github.com/actions/download-artifact@v3
|
||||||
|
with:
|
||||||
|
name: batchcooking.apk
|
||||||
|
|
||||||
|
# softprops/action-gh-release (l'action GitHub habituelle pour ça)
|
||||||
|
# échoue systématiquement contre ce Forgejo : sa requête de création
|
||||||
|
# de release répond 405 (vérifié en conditions réelles, tag v0.2.0 —
|
||||||
|
# pas un souci de ref bare comme les autres actions de ce fichier,
|
||||||
|
# une vraie incompatibilité d'API entre les deux plateformes qui n'a
|
||||||
|
# pas de contournement connu côté configuration de l'action). Appelle
|
||||||
|
# directement l'API native de Forgejo plutôt qu'une action tierce
|
||||||
|
# dont la compatibilité GitHub-Forgejo n'est pas garantie.
|
||||||
|
#
|
||||||
|
# Pas d'équivalent à `generate_release_notes` ici (fonctionnalité
|
||||||
|
# propre à GitHub, pas répliquée par l'API Forgejo) — le corps de la
|
||||||
|
# release reste minimal, cohérent avec l'absence d'outillage de
|
||||||
|
# changelog ailleurs dans le repo.
|
||||||
|
- name: Crée (ou récupère) la Release Forgejo
|
||||||
|
id: create-release
|
||||||
|
env:
|
||||||
|
FORGEJO_TOKEN: ${{ secrets.GITHUB_TOKEN }}
|
||||||
|
run: |
|
||||||
|
api="$GITHUB_API_URL/repos/$GITHUB_REPOSITORY/releases"
|
||||||
|
body="$(printf '{"tag_name":"%s","name":"%s","draft":false,"prerelease":false}' "$GITHUB_REF_NAME" "$GITHUB_REF_NAME")"
|
||||||
|
|
||||||
|
# POST pour créer la release, code HTTP capturé à part. Si le tag est
|
||||||
|
# déjà connu de Forgejo (tag poussé à la main avant ce workflow, ou
|
||||||
|
# ré-exécution du job), l'API répond 409 : on réutilise alors la
|
||||||
|
# release existante au lieu d'échouer — idempotence, cf. l'incident
|
||||||
|
# du tag v0.2.2 poussé en avance qui a fait tomber ce job sur un 409.
|
||||||
|
code="$(curl -sS -o /tmp/release.json -w '%{http_code}' -X POST "$api" \
|
||||||
|
-H "Authorization: token $FORGEJO_TOKEN" \
|
||||||
|
-H "Content-Type: application/json" \
|
||||||
|
-d "$body")"
|
||||||
|
|
||||||
|
if [ "$code" = "409" ]; then
|
||||||
|
echo "Release $GITHUB_REF_NAME déjà existante (HTTP 409) — récupération de son id."
|
||||||
|
curl -fsS "$api/tags/$GITHUB_REF_NAME" \
|
||||||
|
-H "Authorization: token $FORGEJO_TOKEN" -o /tmp/release.json
|
||||||
|
elif [ "$code" -lt 200 ] || [ "$code" -ge 300 ]; then
|
||||||
|
echo "Échec de création de la Release (HTTP $code) : $(cat /tmp/release.json)" >&2
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
|
||||||
|
id="$(grep -o '"id":[0-9]*' /tmp/release.json | head -1 | cut -d: -f2)"
|
||||||
|
if [ -z "$id" ]; then
|
||||||
|
echo "Pas d'id de release trouvé : $(cat /tmp/release.json)" >&2
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
echo "Release $GITHUB_REF_NAME prête (id=$id)"
|
||||||
|
echo "release-id=$id" >> "$GITHUB_OUTPUT"
|
||||||
|
|
||||||
|
- name: Attache l'APK à la Release
|
||||||
|
env:
|
||||||
|
FORGEJO_TOKEN: ${{ secrets.GITHUB_TOKEN }}
|
||||||
|
run: |
|
||||||
|
api="$GITHUB_API_URL/repos/$GITHUB_REPOSITORY/releases/${{ steps.create-release.outputs.release-id }}/assets"
|
||||||
|
curl -fsS -X POST "$api?name=batchcooking.apk" \
|
||||||
|
-H "Authorization: token $FORGEJO_TOKEN" \
|
||||||
|
-F "attachment=@batchcooking.apk"
|
||||||
|
|
||||||
notify-portainer:
|
notify-portainer:
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
needs: github-release
|
needs: forgejo-release
|
||||||
steps:
|
steps:
|
||||||
- name: Trigger Portainer redeploy
|
- name: Trigger Portainer redeploy
|
||||||
# Best-effort: does nothing (and doesn't fail the workflow) until
|
# Best-effort: does nothing (and doesn't fail the workflow) until
|
||||||
|
|
|
||||||
6
.gitignore
vendored
6
.gitignore
vendored
|
|
@ -70,6 +70,7 @@ web_modules/
|
||||||
.env.*
|
.env.*
|
||||||
!.env.example
|
!.env.example
|
||||||
!.env.test.example
|
!.env.test.example
|
||||||
|
!.env.capacitor.example
|
||||||
|
|
||||||
# Python virtualenvs/caches for services/tech-step-intent-service (this repo
|
# Python virtualenvs/caches for services/tech-step-intent-service (this repo
|
||||||
# is otherwise all-Node — see that service's own .gitignore for the rest;
|
# is otherwise all-Node — see that service's own .gitignore for the rest;
|
||||||
|
|
@ -133,6 +134,11 @@ dist
|
||||||
# Stores VSCode versions used for testing VSCode extensions
|
# Stores VSCode versions used for testing VSCode extensions
|
||||||
.vscode-test
|
.vscode-test
|
||||||
|
|
||||||
|
# JetBrains IDEs (Android Studio opens this repo as a project once the
|
||||||
|
# Capacitor Android app exists under apps/web/android — see that folder's own
|
||||||
|
# .gitignore for the generated native project's build artefacts).
|
||||||
|
/.idea/
|
||||||
|
|
||||||
# pnpm
|
# pnpm
|
||||||
.pnpm-store
|
.pnpm-store
|
||||||
|
|
||||||
|
|
|
||||||
98
README.md
98
README.md
|
|
@ -207,10 +207,18 @@ depuis la même origine. Les deux autres services du fichier
|
||||||
(`tech-step-intent-service`, `tech-step-llm-worker`) n'exposent eux aucun port
|
(`tech-step-intent-service`, `tech-step-llm-worker`) n'exposent eux aucun port
|
||||||
au host — voir leurs propres README pour leur rôle.
|
au host — voir leurs propres README pour leur rôle.
|
||||||
|
|
||||||
**Pas de registre d'image** dans cette configuration : l'instance **Portainer** de
|
**Registre d'image** : la CI de release (voir plus bas) construit et pousse les
|
||||||
production est reliée directement au dépôt Git et reconstruit elle-même
|
trois images de service — `batchcooking-app`, `batchcooking-intent-service`,
|
||||||
`docker-compose.yml`/`apps/api/Dockerfile` à chaque déploiement — la CI ne pousse
|
`batchcooking-llm-worker` — sur le **registre de conteneurs intégré à Forgejo**
|
||||||
donc aucune image nulle part.
|
(`git.dev.kyuno.fr/kyuno/…`), taguées à la fois avec le tag de release (`vX.Y.Z`)
|
||||||
|
et `latest`. `docker-compose.yml` référence ces images via `IMAGE_TAG` (variable
|
||||||
|
d'environnement, défaut `latest` — voir `.env.example`), tout en gardant un bloc
|
||||||
|
`build:` local à côté de chaque `image:` : `docker compose pull` récupère les
|
||||||
|
images pré-construites, `docker compose up`/`build` retombe sur un build local si
|
||||||
|
elles sont absentes. L'instance **Portainer** de production peut donc désormais
|
||||||
|
tirer les images pré-construites (stack en mode *pull*, `IMAGE_TAG` pinné sur la
|
||||||
|
release voulue) **ou** continuer à builder elle-même depuis le dépôt Git — les
|
||||||
|
deux modes fonctionnent avec le même `docker-compose.yml`.
|
||||||
|
|
||||||
### Release (`.github/workflows/release.yml`)
|
### Release (`.github/workflows/release.yml`)
|
||||||
|
|
||||||
|
|
@ -221,14 +229,80 @@ git tag vX.Y.Z
|
||||||
git push --tags
|
git push --tags
|
||||||
```
|
```
|
||||||
|
|
||||||
Le pipeline enchaîne trois jobs : `sanity-build` (build de l'image Docker sans
|
Le pipeline enchaîne quatre jobs : `build-and-push-images` (build des 3 images à
|
||||||
push, juste pour vérifier qu'elle build encore à ce tag avant de laisser Portainer
|
ce tag + push sur le registre Forgejo sous `vX.Y.Z` et `latest` — un push
|
||||||
redéployer dessus), `github-release` (crée une Release GitHub avec changelog
|
réussi vaut aussi vérification que tout build encore à ce commit),
|
||||||
auto-généré à partir des PRs mergées), puis `notify-portainer` — envoie une requête
|
`build-android-apk` (APK signé, `versionName` dérivé du tag), `forgejo-release`
|
||||||
au webhook de redeploy de Portainer si le secret de dépôt `PORTAINER_WEBHOOK_URL`
|
(crée la Release Forgejo `vX.Y.Z` et y attache `batchcooking.apk`), puis
|
||||||
est configuré (sinon Portainer se resynchronise simplement à son prochain
|
`notify-portainer` — envoie une requête au webhook de redeploy de Portainer si
|
||||||
polling Git). Pour l'activer : récupérer l'URL du webhook depuis les réglages du
|
le secret de dépôt `PORTAINER_WEBHOOK_URL` est configuré (sinon Portainer se
|
||||||
stack Portainer, puis l'ajouter comme secret GitHub `PORTAINER_WEBHOOK_URL`.
|
resynchronise à son prochain polling). Pour l'activer : récupérer l'URL du
|
||||||
|
webhook depuis les réglages du stack Portainer, puis l'ajouter comme secret de
|
||||||
|
dépôt `PORTAINER_WEBHOOK_URL`.
|
||||||
|
|
||||||
|
## Application mobile (Android)
|
||||||
|
|
||||||
|
`apps/web` est empaqueté dans une coquille [Capacitor](https://capacitorjs.com/)
|
||||||
|
pour Android — le projet natif est versionné dans `apps/web/android/` (issue
|
||||||
|
\#39). L'authentification passe par un jeton Bearer stocké dans le stockage
|
||||||
|
sécurisé de Capacitor (le cookie de session `SameSite=Lax` ne part pas depuis
|
||||||
|
l'origine interne d'une WebView), et `main.tsx` bascule sur `HashRouter` quand
|
||||||
|
`Capacitor.isNativePlatform()` est vrai.
|
||||||
|
|
||||||
|
**Prérequis** : Android Studio (SDK Android + un JDK ; le JBR fourni avec
|
||||||
|
Android Studio suffit). Aucun serveur Postgres/Docker local n'est nécessaire —
|
||||||
|
l'appli parle à l'API HTTPS publique.
|
||||||
|
|
||||||
|
**Build** — depuis `apps/web/` :
|
||||||
|
|
||||||
|
```bash
|
||||||
|
# 1. URL publique de l'API, gravée dans le bundle empaqueté (le build web
|
||||||
|
# normal utilise une URL relative « même origine », impossible ici).
|
||||||
|
cp .env.capacitor.example .env.capacitor # puis renseigner VITE_API_URL
|
||||||
|
|
||||||
|
# 2. Build web en mode capacitor + synchronisation dans le projet natif.
|
||||||
|
pnpm build:capacitor
|
||||||
|
npx cap sync android
|
||||||
|
|
||||||
|
# 3. Ouvrir dans Android Studio (build/run/émulateur depuis l'IDE)…
|
||||||
|
npx cap open android
|
||||||
|
# …ou build/run en ligne de commande si un appareil/émulateur est prêt :
|
||||||
|
npx cap run android
|
||||||
|
```
|
||||||
|
|
||||||
|
Le bundle web copié (`apps/web/android/app/src/main/assets/public/`) est
|
||||||
|
git-ignoré : il est régénéré par `pnpm build:capacitor && npx cap sync android`.
|
||||||
|
Les icônes et le splash sont générés depuis `apps/web/assets/logo.svg` (voir
|
||||||
|
`apps/web/assets/README.md`). iOS est hors périmètre pour l'instant (nécessite
|
||||||
|
Xcode/macOS).
|
||||||
|
|
||||||
|
**CI — build automatique d'un APK signé** (`.github/workflows/ci.yml`, job
|
||||||
|
`build-android`, issue #64) : à chaque push sur `main`, une fois les 5 autres
|
||||||
|
jobs verts, un APK release signé est construit et déposé comme artefact de
|
||||||
|
run téléchargeable. Secrets du dépôt Forgejo requis (Réglages du dépôt →
|
||||||
|
Secrets) :
|
||||||
|
|
||||||
|
| Secret | Contenu |
|
||||||
|
|---|---|
|
||||||
|
| `MOBILE_API_URL` | URL HTTPS publique de l'API — même valeur que `VITE_API_URL` dans `.env.capacitor` |
|
||||||
|
| `ANDROID_KEYSTORE_BASE64` | Le keystore de release (`.jks`) encodé en base64 |
|
||||||
|
| `ANDROID_KEYSTORE_PASSWORD` | Mot de passe du keystore |
|
||||||
|
| `ANDROID_KEY_ALIAS` | Alias de la clé dans le keystore |
|
||||||
|
| `ANDROID_KEY_PASSWORD` | Mot de passe de la clé |
|
||||||
|
|
||||||
|
Le keystore doit être généré **une seule fois**, à la main, et rester stable
|
||||||
|
pour toujours : Android refuse d'installer la mise à jour d'une appli signée
|
||||||
|
par une clé différente de celle déjà installée.
|
||||||
|
|
||||||
|
```bash
|
||||||
|
keytool -genkeypair -v -keystore batchcooking-release.jks \
|
||||||
|
-alias batchcooking -keyalg RSA -keysize 2048 -validity 10000
|
||||||
|
base64 -w0 batchcooking-release.jks # → coller comme secret ANDROID_KEYSTORE_BASE64
|
||||||
|
```
|
||||||
|
|
||||||
|
Conserver le fichier `.jks` et ses mots de passe en lieu sûr en dehors du
|
||||||
|
dépôt (jamais commité — voir `apps/web/android/.gitignore`) : le perdre
|
||||||
|
empêche de publier toute future mise à jour de l'appli.
|
||||||
|
|
||||||
## Auth (apps/api)
|
## Auth (apps/api)
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -1,6 +0,0 @@
|
||||||
# Vite only exposes vars prefixed with VITE_ to client code.
|
|
||||||
# Base URL of the API's /admin/* surface. Empty string = same origin as the
|
|
||||||
# page (correct behind a shared reverse proxy). Native dev overrides it in
|
|
||||||
# apps/admin-web/.env since the Vite dev server (5174) and the API (3000)
|
|
||||||
# are different origins.
|
|
||||||
VITE_ADMIN_API_URL=http://localhost:3000
|
|
||||||
|
|
@ -1,25 +0,0 @@
|
||||||
# Its own image (not built into apps/api's) — the admin app is deployed
|
|
||||||
# independently of the main app. Build stage compiles the Vite bundle from
|
|
||||||
# the monorepo; runtime is a plain static nginx serving that bundle.
|
|
||||||
#
|
|
||||||
# Build context is the repo root (like apps/api/Dockerfile) — the workspace
|
|
||||||
# packages (@batch-cooking/shared, @batch-cooking/date-tools) must resolve.
|
|
||||||
FROM node:22-slim AS build
|
|
||||||
RUN corepack enable
|
|
||||||
WORKDIR /repo
|
|
||||||
# Skip Cypress's Electron binary download — this image never runs it.
|
|
||||||
ENV CYPRESS_INSTALL_BINARY=0
|
|
||||||
COPY . .
|
|
||||||
RUN pnpm install --frozen-lockfile
|
|
||||||
# The admin bundle bakes in VITE_ADMIN_API_URL at build time. Default ""
|
|
||||||
# (same-origin — correct behind a shared reverse proxy); override with
|
|
||||||
# `--build-arg VITE_ADMIN_API_URL=https://api.example.com` when the admin
|
|
||||||
# app is served from a different origin than the API.
|
|
||||||
ARG VITE_ADMIN_API_URL=""
|
|
||||||
ENV VITE_ADMIN_API_URL=$VITE_ADMIN_API_URL
|
|
||||||
RUN pnpm --filter admin-web build
|
|
||||||
|
|
||||||
FROM nginx:alpine AS runtime
|
|
||||||
COPY apps/admin-web/nginx.conf /etc/nginx/conf.d/default.conf
|
|
||||||
COPY --from=build /repo/apps/admin-web/dist /usr/share/nginx/html
|
|
||||||
EXPOSE 80
|
|
||||||
|
|
@ -1,28 +0,0 @@
|
||||||
import { addCucumberPreprocessorPlugin } from "@badeball/cypress-cucumber-preprocessor";
|
|
||||||
import { createEsbuildPlugin } from "@badeball/cypress-cucumber-preprocessor/esbuild";
|
|
||||||
import createBundler from "@bahmutov/cypress-esbuild-preprocessor";
|
|
||||||
import { defineConfig } from "cypress";
|
|
||||||
|
|
||||||
// Disable GPU for headless/sandboxed environments where no GPU device is
|
|
||||||
// available — same helper as apps/web's cypress.config.ts.
|
|
||||||
function disableGpu(on: Cypress.PluginEvents) {
|
|
||||||
on("before:browser:launch", (browser, launchOptions) => {
|
|
||||||
if (browser.family === "chromium") {
|
|
||||||
launchOptions.args.push("--disable-gpu", "--no-sandbox");
|
|
||||||
}
|
|
||||||
return launchOptions;
|
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
export default defineConfig({
|
|
||||||
e2e: {
|
|
||||||
baseUrl: "http://localhost:5174",
|
|
||||||
specPattern: ["cypress/e2e/**/*.cy.ts", "cypress/e2e/**/*.feature"],
|
|
||||||
async setupNodeEvents(on, config) {
|
|
||||||
disableGpu(on);
|
|
||||||
await addCucumberPreprocessorPlugin(on, config);
|
|
||||||
on("file:preprocessor", createBundler({ plugins: [createEsbuildPlugin(config)] }));
|
|
||||||
return config;
|
|
||||||
},
|
|
||||||
},
|
|
||||||
});
|
|
||||||
|
|
@ -1,24 +0,0 @@
|
||||||
import { Given } from "@badeball/cypress-cucumber-preprocessor";
|
|
||||||
|
|
||||||
const adminBody = {
|
|
||||||
id: 1,
|
|
||||||
email: "ops@example.com",
|
|
||||||
name: "Ops",
|
|
||||||
createdAt: "2026-08-01T00:00:00.000Z",
|
|
||||||
lastLoginAt: "2026-08-28T09:00:00.000Z",
|
|
||||||
};
|
|
||||||
|
|
||||||
Given("admin login fails with invalid credentials", () => {
|
|
||||||
cy.intercept("POST", "**/admin/auth/login", {
|
|
||||||
statusCode: 401,
|
|
||||||
body: { code: 4010, message: "Invalid email or password" },
|
|
||||||
});
|
|
||||||
});
|
|
||||||
|
|
||||||
Given("admin login succeeds as {string}", (name: string) => {
|
|
||||||
const body = { ...adminBody, name, email: `${name.toLowerCase()}@example.com` };
|
|
||||||
cy.intercept("POST", "**/admin/auth/login", { statusCode: 200, body });
|
|
||||||
// After navigate("/"), RequireAdmin re-checks the session — from now on it
|
|
||||||
// must report authenticated (last matching intercept wins).
|
|
||||||
cy.intercept("GET", "**/admin/auth/me", { statusCode: 200, body });
|
|
||||||
});
|
|
||||||
|
|
@ -1,83 +0,0 @@
|
||||||
// Mocks the admin API via cy.intercept — no live backend.
|
|
||||||
|
|
||||||
const adminBody = {
|
|
||||||
id: 1,
|
|
||||||
email: "ops@example.com",
|
|
||||||
name: "Ops",
|
|
||||||
createdAt: "2026-08-01T00:00:00.000Z",
|
|
||||||
lastLoginAt: "2026-08-28T09:00:00.000Z",
|
|
||||||
};
|
|
||||||
|
|
||||||
function monitoringFixture() {
|
|
||||||
return {
|
|
||||||
generatedAt: "2026-08-28T09:15:00.000Z",
|
|
||||||
services: [
|
|
||||||
{
|
|
||||||
key: "postgres",
|
|
||||||
status: "up",
|
|
||||||
latencyMs: 3.2,
|
|
||||||
detail: null,
|
|
||||||
checkedAt: "2026-08-28T09:15:00.000Z",
|
|
||||||
},
|
|
||||||
{
|
|
||||||
key: "api",
|
|
||||||
status: "up",
|
|
||||||
latencyMs: 0,
|
|
||||||
detail: "uptime 3 h 12 min · RSS 120 Mo",
|
|
||||||
checkedAt: "2026-08-28T09:15:00.000Z",
|
|
||||||
},
|
|
||||||
{
|
|
||||||
key: "intent-service",
|
|
||||||
status: "down",
|
|
||||||
latencyMs: null,
|
|
||||||
detail: "fetch failed",
|
|
||||||
checkedAt: "2026-08-28T09:15:00.000Z",
|
|
||||||
},
|
|
||||||
{
|
|
||||||
key: "tech-step-llm-worker",
|
|
||||||
status: "degraded",
|
|
||||||
latencyMs: null,
|
|
||||||
detail: "dernier battement il y a 9 j",
|
|
||||||
checkedAt: "2026-08-28T09:15:00.000Z",
|
|
||||||
lastRunAt: "2026-08-19T03:00:00.000Z",
|
|
||||||
lastResult: { job: "audit-low-confidence", ok: true, counts: { suggestions: 2 } },
|
|
||||||
},
|
|
||||||
],
|
|
||||||
};
|
|
||||||
}
|
|
||||||
|
|
||||||
describe("Admin monitoring", () => {
|
|
||||||
beforeEach(() => {
|
|
||||||
cy.viewport(1400, 900);
|
|
||||||
cy.intercept("GET", "**/admin/auth/me", { statusCode: 200, body: adminBody });
|
|
||||||
});
|
|
||||||
|
|
||||||
it("renders one card per service with its status and details", () => {
|
|
||||||
cy.intercept("GET", "**/admin/monitoring", { statusCode: 200, body: monitoringFixture() }).as(
|
|
||||||
"getMonitoring",
|
|
||||||
);
|
|
||||||
cy.visit("/monitoring");
|
|
||||||
cy.wait("@getMonitoring");
|
|
||||||
|
|
||||||
cy.get(".monitoring-card").should("have.length", 4);
|
|
||||||
|
|
||||||
cy.contains(".monitoring-card", "Base de données")
|
|
||||||
.should("have.class", "monitoring-card--up")
|
|
||||||
.and("contain.text", "3.2 ms");
|
|
||||||
cy.contains(".monitoring-card", "Service NLP (spaCy)")
|
|
||||||
.should("have.class", "monitoring-card--down")
|
|
||||||
.and("contain.text", "Hors service");
|
|
||||||
cy.contains(".monitoring-card", "Worker LLM")
|
|
||||||
.should("have.class", "monitoring-card--degraded")
|
|
||||||
.and("contain.text", "audit-low-confidence");
|
|
||||||
});
|
|
||||||
|
|
||||||
it("shows an error state when the request fails", () => {
|
|
||||||
cy.intercept("GET", "**/admin/monitoring", {
|
|
||||||
statusCode: 500,
|
|
||||||
body: { code: 5000, message: "x" },
|
|
||||||
});
|
|
||||||
cy.visit("/monitoring");
|
|
||||||
cy.contains("Impossible de charger").should("be.visible");
|
|
||||||
});
|
|
||||||
});
|
|
||||||
|
|
@ -1,3 +0,0 @@
|
||||||
// Cypress support file — global config and custom commands go here as the
|
|
||||||
// admin app grows. Same minimal starting point as apps/web's e2e.ts.
|
|
||||||
export {};
|
|
||||||
|
|
@ -1,54 +0,0 @@
|
||||||
import { Given, Then, When } from "@badeball/cypress-cucumber-preprocessor";
|
|
||||||
|
|
||||||
// Steps shared across admin feature specs — navigation and generic UI
|
|
||||||
// assertions. Anything specific to one feature (its own API mocks, its own
|
|
||||||
// DOM structure) lives in that feature's own `<name>.ts` step file.
|
|
||||||
//
|
|
||||||
// Every admin API call is mocked via `cy.intercept` — the Cypress suite
|
|
||||||
// never runs a live backend; apps/api's own Mocha suite covers real
|
|
||||||
// `/admin/*` behaviour.
|
|
||||||
|
|
||||||
Given("the admin session check returns unauthenticated", () => {
|
|
||||||
cy.intercept("GET", "**/admin/auth/me", { statusCode: 401, body: { code: 4011, message: "no" } });
|
|
||||||
});
|
|
||||||
|
|
||||||
Given("I am signed in as admin {string}", (name: string) => {
|
|
||||||
cy.intercept("GET", "**/admin/auth/me", {
|
|
||||||
statusCode: 200,
|
|
||||||
body: {
|
|
||||||
id: 1,
|
|
||||||
email: `${name.toLowerCase()}@example.com`,
|
|
||||||
name,
|
|
||||||
createdAt: "2026-08-01T00:00:00.000Z",
|
|
||||||
lastLoginAt: "2026-08-28T09:00:00.000Z",
|
|
||||||
},
|
|
||||||
});
|
|
||||||
});
|
|
||||||
|
|
||||||
When("I visit {string}", (path: string) => {
|
|
||||||
cy.visit(path);
|
|
||||||
});
|
|
||||||
|
|
||||||
When("I fill in the {string} field with {string}", (fieldId: string, value: string) => {
|
|
||||||
cy.get(`#${fieldId}`).clear().type(value);
|
|
||||||
});
|
|
||||||
|
|
||||||
When("I click the button {string}", (text: string) => {
|
|
||||||
cy.contains("button", text).click();
|
|
||||||
});
|
|
||||||
|
|
||||||
Then("the URL should include {string}", (fragment: string) => {
|
|
||||||
cy.url().should("include", fragment);
|
|
||||||
});
|
|
||||||
|
|
||||||
Then("the URL should not include {string}", (fragment: string) => {
|
|
||||||
cy.url().should("not.include", fragment);
|
|
||||||
});
|
|
||||||
|
|
||||||
Then("I should see {string}", (text: string) => {
|
|
||||||
cy.contains(text).should("be.visible");
|
|
||||||
});
|
|
||||||
|
|
||||||
Then("I should see the heading {string}", (text: string) => {
|
|
||||||
cy.contains("h1", text).should("be.visible");
|
|
||||||
});
|
|
||||||
|
|
@ -1,12 +0,0 @@
|
||||||
<!doctype html>
|
|
||||||
<html lang="fr">
|
|
||||||
<head>
|
|
||||||
<meta charset="UTF-8" />
|
|
||||||
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
|
|
||||||
<title>batchCooking — Admin</title>
|
|
||||||
</head>
|
|
||||||
<body>
|
|
||||||
<div id="root"></div>
|
|
||||||
<script type="module" src="/src/main.tsx"></script>
|
|
||||||
</body>
|
|
||||||
</html>
|
|
||||||
|
|
@ -1,20 +0,0 @@
|
||||||
# Static host for the built admin SPA. Client-side routing (react-router)
|
|
||||||
# means any unknown path must fall back to index.html rather than 404 —
|
|
||||||
# same reason apps/api serves its own SPA that way.
|
|
||||||
server {
|
|
||||||
listen 80;
|
|
||||||
server_name _;
|
|
||||||
root /usr/share/nginx/html;
|
|
||||||
index index.html;
|
|
||||||
|
|
||||||
location / {
|
|
||||||
try_files $uri $uri/ /index.html;
|
|
||||||
}
|
|
||||||
|
|
||||||
# Long-cache the fingerprinted assets Vite emits; never cache the HTML
|
|
||||||
# entry point so a new deploy is picked up immediately.
|
|
||||||
location /assets/ {
|
|
||||||
expires 1y;
|
|
||||||
add_header Cache-Control "public, immutable";
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
@ -1,42 +0,0 @@
|
||||||
{
|
|
||||||
"name": "admin-web",
|
|
||||||
"version": "0.1.0",
|
|
||||||
"private": true,
|
|
||||||
"type": "module",
|
|
||||||
"scripts": {
|
|
||||||
"dev": "vite --host 0.0.0.0 --port 5174",
|
|
||||||
"build": "tsc -b && vite build",
|
|
||||||
"preview": "vite preview --port 5174",
|
|
||||||
"test": "echo \"no unit tests yet\" && exit 0",
|
|
||||||
"cy:open": "cypress open",
|
|
||||||
"cy:run": "cypress run",
|
|
||||||
"e2e": "start-server-and-test dev http://localhost:5174 cy:run"
|
|
||||||
},
|
|
||||||
"dependencies": {
|
|
||||||
"@batch-cooking/date-tools": "workspace:*",
|
|
||||||
"@batch-cooking/shared": "workspace:*",
|
|
||||||
"i18next": "^26.3.6",
|
|
||||||
"lucide-react": "^1.32.0",
|
|
||||||
"react": "^18.3.1",
|
|
||||||
"react-dom": "^18.3.1",
|
|
||||||
"react-i18next": "^17.0.11",
|
|
||||||
"react-router-dom": "^7.18.2",
|
|
||||||
"recharts": "^2.15.0",
|
|
||||||
"zod": "^3.25.76"
|
|
||||||
},
|
|
||||||
"devDependencies": {
|
|
||||||
"@badeball/cypress-cucumber-preprocessor": "22.2.0",
|
|
||||||
"@bahmutov/cypress-esbuild-preprocessor": "2.2.8",
|
|
||||||
"@cypress/vite-dev-server": "5.2.1",
|
|
||||||
"@types/node": "^22.9.0",
|
|
||||||
"@types/react": "^18.3.12",
|
|
||||||
"@types/react-dom": "^18.3.1",
|
|
||||||
"@vitejs/plugin-react": "^4.3.3",
|
|
||||||
"cypress": "13.17.0",
|
|
||||||
"esbuild": "0.21.5",
|
|
||||||
"sass": "^1.102.0",
|
|
||||||
"start-server-and-test": "^2.0.8",
|
|
||||||
"typescript": "^5.7.2",
|
|
||||||
"vite": "^5.4.11"
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
@ -1,36 +0,0 @@
|
||||||
import { Navigate, Route, Routes } from "react-router-dom";
|
|
||||||
import { RequireAdmin } from "./features/auth/RequireAdmin";
|
|
||||||
import { AdminLayout } from "./layouts/AdminLayout";
|
|
||||||
import { CatalogPage } from "./pages/catalog/CatalogPage";
|
|
||||||
import { CorrectionsPage } from "./pages/corrections/CorrectionsPage";
|
|
||||||
import { DashboardPage } from "./pages/dashboard/DashboardPage";
|
|
||||||
import { LoginPage } from "./pages/login/LoginPage";
|
|
||||||
import { MonitoringPage } from "./pages/monitoring/MonitoringPage";
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Admin app route table. `/login` is the only unauthenticated route;
|
|
||||||
* everything else is nested under one `RequireAdmin` + `AdminLayout` parent
|
|
||||||
* (the guard + sidebar chrome applied once), same shape as apps/web's
|
|
||||||
* `App.tsx`. Unknown paths fall back to `/`, which redirects to `/login`
|
|
||||||
* when there's no admin session.
|
|
||||||
*/
|
|
||||||
export function App() {
|
|
||||||
return (
|
|
||||||
<Routes>
|
|
||||||
<Route path="/login" element={<LoginPage />} />
|
|
||||||
<Route
|
|
||||||
element={
|
|
||||||
<RequireAdmin>
|
|
||||||
<AdminLayout />
|
|
||||||
</RequireAdmin>
|
|
||||||
}
|
|
||||||
>
|
|
||||||
<Route path="/" element={<DashboardPage />} />
|
|
||||||
<Route path="/monitoring" element={<MonitoringPage />} />
|
|
||||||
<Route path="/corrections" element={<CorrectionsPage />} />
|
|
||||||
<Route path="/catalogue" element={<CatalogPage />} />
|
|
||||||
</Route>
|
|
||||||
<Route path="*" element={<Navigate to="/" replace />} />
|
|
||||||
</Routes>
|
|
||||||
);
|
|
||||||
}
|
|
||||||
|
|
@ -1,192 +0,0 @@
|
||||||
import {
|
|
||||||
type AdminLoginInput,
|
|
||||||
type AdminUserView,
|
|
||||||
type ApiErrorResponse,
|
|
||||||
type CatalogPlaceholderGroupView,
|
|
||||||
type CorrectionAdminView,
|
|
||||||
ErrorCode,
|
|
||||||
type MarkPlaceholdersReviewedInput,
|
|
||||||
type MetricsView,
|
|
||||||
type MonitoringView,
|
|
||||||
type PruneOrphansResultView,
|
|
||||||
type RetrainRequestInput,
|
|
||||||
type RetrainResultView,
|
|
||||||
type TrainingDataSnippetView,
|
|
||||||
type TrainingSuggestionAdminView,
|
|
||||||
type TrainingSuggestionGroupView,
|
|
||||||
type UpdateTrainingSuggestionInput,
|
|
||||||
} from "@batch-cooking/shared";
|
|
||||||
|
|
||||||
/** Builds a `?a=b&c=d` string from defined values only. */
|
|
||||||
function query(params: Record<string, string | undefined>): string {
|
|
||||||
const entries = Object.entries(params).filter(
|
|
||||||
(entry): entry is [string, string] => entry[1] !== undefined && entry[1] !== "",
|
|
||||||
);
|
|
||||||
return entries.length === 0 ? "" : `?${new URLSearchParams(entries).toString()}`;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Base URL of the admin API surface, configurable via `VITE_ADMIN_API_URL`
|
|
||||||
* (see `.env.example`). Defaults to `""` (same origin) — correct behind a
|
|
||||||
* shared reverse proxy; native dev overrides it to `http://localhost:3000`
|
|
||||||
* in `apps/admin-web/.env` since the Vite dev server (5174) and the API
|
|
||||||
* (3000) are different origins.
|
|
||||||
*/
|
|
||||||
const ADMIN_API_BASE_URL: string = import.meta.env.VITE_ADMIN_API_URL ?? "";
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Thrown by {@link AdminApiClient} on any non-2xx response — carries the
|
|
||||||
* same {@link ErrorCode} the API returned. Same shape as apps/web's
|
|
||||||
* `ApiError`; kept separate rather than shared so the two apps' transport
|
|
||||||
* layers stay independent.
|
|
||||||
*/
|
|
||||||
export class ApiError extends Error {
|
|
||||||
public readonly status: number;
|
|
||||||
public readonly code: ErrorCode;
|
|
||||||
public readonly fieldErrors?: Record<string, string[] | undefined>;
|
|
||||||
|
|
||||||
public constructor(status: number, body: ApiErrorResponse) {
|
|
||||||
super(body.message);
|
|
||||||
this.name = "ApiError";
|
|
||||||
this.status = status;
|
|
||||||
this.code = body.code;
|
|
||||||
this.fieldErrors = body.details;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Thin fetch wrapper around the `/admin/*` endpoints — same design as
|
|
||||||
* apps/web's `ApiClient` (a class for cohesion/extensibility, one shared
|
|
||||||
* stateless instance). Every request sends credentials so the
|
|
||||||
* `admin_session` httpOnly cookie round-trips.
|
|
||||||
*/
|
|
||||||
export class AdminApiClient {
|
|
||||||
/**
|
|
||||||
* Performs a JSON request against the admin API and returns the parsed body.
|
|
||||||
*
|
|
||||||
* @throws {ApiError} if the response status is not in the 2xx range.
|
|
||||||
*/
|
|
||||||
private async _request<TResponseBody>(
|
|
||||||
path: string,
|
|
||||||
options: RequestInit = {},
|
|
||||||
): Promise<TResponseBody> {
|
|
||||||
try {
|
|
||||||
const response = await fetch(`${ADMIN_API_BASE_URL}${path}`, {
|
|
||||||
...options,
|
|
||||||
credentials: "include",
|
|
||||||
headers: { "Content-Type": "application/json", ...options.headers },
|
|
||||||
});
|
|
||||||
|
|
||||||
if (!response.ok) {
|
|
||||||
const body = (await response.json().catch(() => null)) as ApiErrorResponse | null;
|
|
||||||
throw new ApiError(
|
|
||||||
response.status,
|
|
||||||
body ?? { code: ErrorCode.INTERNAL_ERROR, message: "Something went wrong" },
|
|
||||||
);
|
|
||||||
}
|
|
||||||
|
|
||||||
if (response.status === 204) {
|
|
||||||
return undefined as TResponseBody;
|
|
||||||
}
|
|
||||||
return (await response.json()) as TResponseBody;
|
|
||||||
} catch (err) {
|
|
||||||
// Rethrown as-is — callers surface it their own way; this is just the
|
|
||||||
// one place the fetch/`await` sits in a try/catch per the repo's rule.
|
|
||||||
throw err;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/** Verifies admin credentials and starts an admin session. */
|
|
||||||
public login(input: AdminLoginInput): Promise<AdminUserView> {
|
|
||||||
return this._request("/admin/auth/login", { method: "POST", body: JSON.stringify(input) });
|
|
||||||
}
|
|
||||||
|
|
||||||
/** Ends the current admin session. */
|
|
||||||
public logout(): Promise<void> {
|
|
||||||
return this._request("/admin/auth/logout", { method: "POST" });
|
|
||||||
}
|
|
||||||
|
|
||||||
/** Fetches the currently authenticated admin — rejects with `NOT_AUTHENTICATED` if there's no session. */
|
|
||||||
public me(): Promise<AdminUserView> {
|
|
||||||
return this._request("/admin/auth/me");
|
|
||||||
}
|
|
||||||
|
|
||||||
/** Usage metrics for the dashboard — snapshot totals + `days` (7–365) of daily time series. */
|
|
||||||
public getMetrics(days: number): Promise<MetricsView> {
|
|
||||||
return this._request(`/admin/metrics?days=${days}`);
|
|
||||||
}
|
|
||||||
|
|
||||||
/** Live health of Postgres, the API, the intent-service and the LLM worker — polled by the monitoring board. */
|
|
||||||
public getMonitoring(): Promise<MonitoringView> {
|
|
||||||
return this._request("/admin/monitoring");
|
|
||||||
}
|
|
||||||
|
|
||||||
/** Training suggestions, grouped by technique, filtered by the given (all-optional) criteria. */
|
|
||||||
public getSuggestions(filters: {
|
|
||||||
status?: string;
|
|
||||||
sourceType?: string;
|
|
||||||
techStepKey?: string;
|
|
||||||
locale?: string;
|
|
||||||
}): Promise<TrainingSuggestionGroupView[]> {
|
|
||||||
return this._request(`/admin/tech-steps/suggestions${query(filters)}`);
|
|
||||||
}
|
|
||||||
|
|
||||||
/** Raw user corrections, including the "no technique here" removals. */
|
|
||||||
public getCorrections(filters: {
|
|
||||||
consumed?: string;
|
|
||||||
hasCorrectedTechStep?: string;
|
|
||||||
}): Promise<CorrectionAdminView[]> {
|
|
||||||
return this._request(`/admin/tech-steps/corrections${query(filters)}`);
|
|
||||||
}
|
|
||||||
|
|
||||||
/** Edits a suggestion's proposed synonyms/utterances and/or its status. */
|
|
||||||
public updateSuggestion(
|
|
||||||
id: number,
|
|
||||||
body: UpdateTrainingSuggestionInput,
|
|
||||||
): Promise<TrainingSuggestionAdminView> {
|
|
||||||
return this._request(`/admin/tech-steps/suggestions/${id}`, {
|
|
||||||
method: "PATCH",
|
|
||||||
body: JSON.stringify(body),
|
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
/** The ready-to-paste `training_data.py` block aggregating suggestions for one technique/locale/status. */
|
|
||||||
public getTrainingDataSnippet(params: {
|
|
||||||
techStepKey: string;
|
|
||||||
locale?: string;
|
|
||||||
status?: string;
|
|
||||||
}): Promise<TrainingDataSnippetView> {
|
|
||||||
return this._request(`/admin/tech-steps/training-data-snippet${query(params)}`);
|
|
||||||
}
|
|
||||||
|
|
||||||
/** Runs the F1 gate + backfill (+ marks suggestion ids). Rejects with `RETRAIN_ALREADY_RUNNING` if one is in flight. */
|
|
||||||
public retrain(body: RetrainRequestInput): Promise<RetrainResultView> {
|
|
||||||
return this._request("/admin/tech-steps/retrain", {
|
|
||||||
method: "POST",
|
|
||||||
body: JSON.stringify(body),
|
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
/** Off-catalog ingredient "placeholders" users typed, grouped by normalized name. `reviewed` omitted/`"false"` = the still-to-triage list, `"true"` = the archive. */
|
|
||||||
public getPlaceholders(reviewed?: "true" | "false"): Promise<CatalogPlaceholderGroupView[]> {
|
|
||||||
return this._request(`/admin/catalog/placeholders${query({ reviewed })}`);
|
|
||||||
}
|
|
||||||
|
|
||||||
/** Marks the given placeholder ingredient ids as triaged (`reviewedAt`). */
|
|
||||||
public markPlaceholdersReviewed(
|
|
||||||
body: MarkPlaceholdersReviewedInput,
|
|
||||||
): Promise<{ reviewed: number }> {
|
|
||||||
return this._request("/admin/catalog/placeholders/mark-reviewed", {
|
|
||||||
method: "PATCH",
|
|
||||||
body: JSON.stringify(body),
|
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
/** Deletes placeholder rows no recipe references any more. */
|
|
||||||
public pruneOrphanPlaceholders(): Promise<PruneOrphansResultView> {
|
|
||||||
return this._request("/admin/catalog/placeholders/prune-orphans", { method: "POST" });
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/** Single shared instance — stateless, same reasoning as apps/web's `apiClient`. */
|
|
||||||
export const adminApiClient = new AdminApiClient();
|
|
||||||
|
|
@ -1,22 +0,0 @@
|
||||||
import i18next from "i18next";
|
|
||||||
import { initReactI18next } from "react-i18next";
|
|
||||||
import fr from "../locales/fr/translation.json";
|
|
||||||
|
|
||||||
/**
|
|
||||||
* i18next instance for the admin app, imported once for its side effect
|
|
||||||
* (`main.tsx`) before anything renders. Only French exists today — same
|
|
||||||
* setup as apps/web's `i18n/i18n.ts`, its own separate locale file so the
|
|
||||||
* two apps' copy never has to be kept identical. `packages/shared`'s
|
|
||||||
* `ErrorCode` member names double as keys under the `errors` namespace
|
|
||||||
* (see `services/error-message.service.ts`).
|
|
||||||
*/
|
|
||||||
void i18next.use(initReactI18next).init({
|
|
||||||
resources: {
|
|
||||||
fr: { translation: fr },
|
|
||||||
},
|
|
||||||
lng: "fr",
|
|
||||||
fallbackLng: "fr",
|
|
||||||
interpolation: { escapeValue: false },
|
|
||||||
});
|
|
||||||
|
|
||||||
export default i18next;
|
|
||||||
|
|
@ -1,18 +0,0 @@
|
||||||
import type { ZodError } from "zod";
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Flattens a zod validation error into `{ fieldName: firstMessage }` for
|
|
||||||
* inline display under each form field — verbatim copy of apps/web's
|
|
||||||
* `lib/zod-errors.ts` (only the first message per field, enough for the
|
|
||||||
* single-rule-per-field schemas used here).
|
|
||||||
*/
|
|
||||||
export function fieldErrorsFrom(error: ZodError): Record<string, string> {
|
|
||||||
const fieldErrors = error.flatten().fieldErrors;
|
|
||||||
const firstMessagePerField: Record<string, string> = {};
|
|
||||||
for (const [field, messages] of Object.entries(fieldErrors)) {
|
|
||||||
if (messages?.[0]) {
|
|
||||||
firstMessagePerField[field] = messages[0];
|
|
||||||
}
|
|
||||||
}
|
|
||||||
return firstMessagePerField;
|
|
||||||
}
|
|
||||||
|
|
@ -1,148 +0,0 @@
|
||||||
{
|
|
||||||
"errors": {
|
|
||||||
"VALIDATION_ERROR": "Erreur de validation",
|
|
||||||
"INVALID_CREDENTIALS": "Email ou mot de passe incorrect",
|
|
||||||
"NOT_AUTHENTICATED": "Vous devez être connecté",
|
|
||||||
"NOT_FOUND": "Ressource introuvable",
|
|
||||||
"TECH_STEP_NOT_FOUND": "Cette technique n'existe pas",
|
|
||||||
"RETRAIN_ALREADY_RUNNING": "Un ré-entraînement est déjà en cours",
|
|
||||||
"INTERNAL_ERROR": "Une erreur est survenue, réessayez plus tard"
|
|
||||||
},
|
|
||||||
"admin": {
|
|
||||||
"common": {
|
|
||||||
"comingSoon": "Section à venir.",
|
|
||||||
"loading": "Chargement…",
|
|
||||||
"loadError": "Impossible de charger les données, réessayez plus tard."
|
|
||||||
},
|
|
||||||
"login": {
|
|
||||||
"title": "Administration",
|
|
||||||
"emailLabel": "Email",
|
|
||||||
"passwordLabel": "Mot de passe",
|
|
||||||
"submit": "Se connecter",
|
|
||||||
"submitting": "Connexion…"
|
|
||||||
},
|
|
||||||
"nav": {
|
|
||||||
"dashboard": "Tableau de bord",
|
|
||||||
"monitoring": "Monitoring",
|
|
||||||
"corrections": "Corrections",
|
|
||||||
"catalog": "Catalogue"
|
|
||||||
},
|
|
||||||
"layout": {
|
|
||||||
"logout": "Se déconnecter"
|
|
||||||
},
|
|
||||||
"dashboard": {
|
|
||||||
"title": "Tableau de bord",
|
|
||||||
"lead": "Métriques d'utilisation de l'application.",
|
|
||||||
"windowTotal": "{{n}} sur 30 j",
|
|
||||||
"recipesBySource": "Recettes importées par source",
|
|
||||||
"noImports": "Aucune recette importée.",
|
|
||||||
"events": "Évènements enregistrés (30 j)",
|
|
||||||
"kpi": {
|
|
||||||
"users": "Utilisateurs",
|
|
||||||
"households": "Foyers",
|
|
||||||
"activeHouseholds": "Foyers actifs",
|
|
||||||
"recipes": "Recettes",
|
|
||||||
"recipesImported": "Recettes importées",
|
|
||||||
"plannings": "Plannings",
|
|
||||||
"planningItems": "Créneaux planifiés",
|
|
||||||
"favorites": "Favoris",
|
|
||||||
"corrections": "Corrections",
|
|
||||||
"correctionsUnconsumed": "Corrections à traiter",
|
|
||||||
"trainingSuggestions": "Suggestions d'entraînement",
|
|
||||||
"admins": "Administrateurs"
|
|
||||||
},
|
|
||||||
"series": {
|
|
||||||
"signups": "Inscriptions",
|
|
||||||
"recipesCreated": "Recettes créées",
|
|
||||||
"planningItemsAdded": "Ajouts au planning",
|
|
||||||
"correctionsSubmitted": "Corrections soumises",
|
|
||||||
"trainingSuggestions": "Suggestions générées"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"monitoring": {
|
|
||||||
"title": "Monitoring",
|
|
||||||
"lead": "Santé des microservices et de la base de données.",
|
|
||||||
"lastChecked": "Dernière vérification à {{time}}",
|
|
||||||
"latency": "Latence",
|
|
||||||
"detail": "Détail",
|
|
||||||
"lastRun": "Dernier job",
|
|
||||||
"never": "jamais",
|
|
||||||
"jobFailed": "échec",
|
|
||||||
"status": {
|
|
||||||
"up": "OK",
|
|
||||||
"degraded": "Dégradé",
|
|
||||||
"down": "Hors service",
|
|
||||||
"unknown": "Inconnu"
|
|
||||||
},
|
|
||||||
"service": {
|
|
||||||
"postgres": "Base de données",
|
|
||||||
"api": "API",
|
|
||||||
"intent-service": "Service NLP (spaCy)",
|
|
||||||
"tech-step-llm-worker": "Worker LLM"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"corrections": {
|
|
||||||
"title": "Corrections",
|
|
||||||
"lead": "Tri des corrections utilisateur pour le ré-entraînement NLP.",
|
|
||||||
"caveat": "Le gate F1 + backfill n'a de sens qu'APRÈS avoir édité training_data.py à la main et redémarré le service NLP (il ne s'entraîne qu'au démarrage). Cet écran ne peut faire ni l'un ni l'autre.",
|
|
||||||
"noSuggestions": "Aucune suggestion pour ces filtres.",
|
|
||||||
"synonyms": "Synonymes proposés (un par ligne)",
|
|
||||||
"utterances": "Phrases proposées (une par ligne)",
|
|
||||||
"save": "Enregistrer",
|
|
||||||
"apply": "Appliquer",
|
|
||||||
"reject": "Rejeter",
|
|
||||||
"tab": {
|
|
||||||
"suggestions": "Suggestions",
|
|
||||||
"corrections": "Corrections brutes"
|
|
||||||
},
|
|
||||||
"filter": {
|
|
||||||
"status": "Statut",
|
|
||||||
"source": "Source",
|
|
||||||
"consumed": "Consommée",
|
|
||||||
"hasCorrected": "Technique corrigée",
|
|
||||||
"any": "Toutes",
|
|
||||||
"yes": "Oui",
|
|
||||||
"no": "Non"
|
|
||||||
},
|
|
||||||
"snippet": {
|
|
||||||
"title": "Snippet training_data.py",
|
|
||||||
"help": "Agrège les synonymes/phrases des suggestions « applied » d'une technique, au format à coller dans training_data.py.",
|
|
||||||
"keyPlaceholder": "clé de technique (ex. simmer)",
|
|
||||||
"generate": "Générer"
|
|
||||||
},
|
|
||||||
"retrain": {
|
|
||||||
"title": "Gate F1 + backfill",
|
|
||||||
"help": "Lance l'évaluation de régression F1 puis, si elle passe, recalcule les techniques de toutes les étapes.",
|
|
||||||
"run": "Lancer",
|
|
||||||
"running": "En cours…",
|
|
||||||
"passed": "OK — {{changed}}/{{total}} étape(s) recalculée(s)",
|
|
||||||
"failed": "Échec du gate — aucun backfill"
|
|
||||||
},
|
|
||||||
"col": {
|
|
||||||
"clause": "Clause",
|
|
||||||
"change": "Changement",
|
|
||||||
"created": "Créée",
|
|
||||||
"consumed": "Consommée"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"catalog": {
|
|
||||||
"title": "Ingrédients hors-catalogue",
|
|
||||||
"lead": "Ingrédients saisis en texte libre par les utilisateurs parce que le catalogue ne les couvrait pas. Regroupés par nom normalisé — à promouvoir dans reference-seed-data.ts + les locales, à la main.",
|
|
||||||
"empty": "Aucun ingrédient hors-catalogue.",
|
|
||||||
"tab": {
|
|
||||||
"pending": "À traiter",
|
|
||||||
"reviewed": "Traités"
|
|
||||||
},
|
|
||||||
"recipeCount": "{{count}} recette(s)",
|
|
||||||
"alsoWritten": "Aussi écrit : {{variants}}",
|
|
||||||
"seenIn": "Vu dans :",
|
|
||||||
"firstSeen": "Première fois le {{date}}",
|
|
||||||
"markReviewed": "Marquer comme traité",
|
|
||||||
"marking": "…",
|
|
||||||
"pruneOrphans": "Purger les orphelins",
|
|
||||||
"pruning": "Purge…",
|
|
||||||
"prunedNone": "Aucun placeholder orphelin à purger.",
|
|
||||||
"pruned": "{{count}} placeholder(s) orphelin(s) supprimé(s)."
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
@ -1,24 +0,0 @@
|
||||||
import { StrictMode } from "react";
|
|
||||||
import { createRoot } from "react-dom/client";
|
|
||||||
import { BrowserRouter } from "react-router-dom";
|
|
||||||
import { App } from "./App";
|
|
||||||
import { AdminAuthProvider } from "./features/auth/AdminAuthContext";
|
|
||||||
// Side-effect import: initializes i18next before anything renders.
|
|
||||||
import "./i18n/i18n";
|
|
||||||
// Global stylesheet (theme tokens + minimal reset) — the only non-colocated .scss import.
|
|
||||||
import "./styles/global.scss";
|
|
||||||
|
|
||||||
const rootElement = document.getElementById("root");
|
|
||||||
if (!rootElement) {
|
|
||||||
throw new Error("Root element not found");
|
|
||||||
}
|
|
||||||
|
|
||||||
createRoot(rootElement).render(
|
|
||||||
<StrictMode>
|
|
||||||
<BrowserRouter>
|
|
||||||
<AdminAuthProvider>
|
|
||||||
<App />
|
|
||||||
</AdminAuthProvider>
|
|
||||||
</BrowserRouter>
|
|
||||||
</StrictMode>,
|
|
||||||
);
|
|
||||||
|
|
@ -1,169 +0,0 @@
|
||||||
import type { CatalogPlaceholderGroupView } from "@batch-cooking/shared";
|
|
||||||
import { useCallback, useEffect, useState } from "react";
|
|
||||||
import { useTranslation } from "react-i18next";
|
|
||||||
import { adminApiClient } from "../../api/client";
|
|
||||||
import "../admin-page.scss";
|
|
||||||
import "./catalog-page.scss";
|
|
||||||
import { type CatalogTab, formatDate, reviewedParam, splitSpellings } from "./catalog";
|
|
||||||
|
|
||||||
type CatalogState =
|
|
||||||
| { status: "loading" }
|
|
||||||
| { status: "loaded"; groups: CatalogPlaceholderGroupView[] }
|
|
||||||
| { status: "error" };
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Off-catalog ingredient review. Lists every placeholder `Ingredient` (the
|
|
||||||
* free text users typed when the seeded catalog fell short — see
|
|
||||||
* `Ingredient.isPlaceholder` in the API schema), grouped by normalized
|
|
||||||
* name, so a maintainer sees what the catalog is missing and how many
|
|
||||||
* recipes are waiting on it. Actions are deliberately minimal: mark a gap
|
|
||||||
* as handled, or purge rows no recipe references any more. Actually adding
|
|
||||||
* the catalog entry stays a manual edit of `reference-seed-data.ts` + the
|
|
||||||
* locale files.
|
|
||||||
*/
|
|
||||||
export function CatalogPage() {
|
|
||||||
const { t } = useTranslation();
|
|
||||||
const [tab, setTab] = useState<CatalogTab>("pending");
|
|
||||||
const [state, setState] = useState<CatalogState>({ status: "loading" });
|
|
||||||
const [pendingIds, setPendingIds] = useState<number[] | null>(null);
|
|
||||||
const [pruneMessage, setPruneMessage] = useState<string | null>(null);
|
|
||||||
const [isPruning, setIsPruning] = useState(false);
|
|
||||||
|
|
||||||
const load = useCallback((forTab: CatalogTab) => {
|
|
||||||
setState({ status: "loading" });
|
|
||||||
adminApiClient
|
|
||||||
.getPlaceholders(reviewedParam(forTab))
|
|
||||||
.then((groups) => setState({ status: "loaded", groups }))
|
|
||||||
.catch(() => setState({ status: "error" }));
|
|
||||||
}, []);
|
|
||||||
|
|
||||||
useEffect(() => {
|
|
||||||
load(tab);
|
|
||||||
}, [tab, load]);
|
|
||||||
|
|
||||||
function markReviewed(group: CatalogPlaceholderGroupView) {
|
|
||||||
setPendingIds(group.ingredientIds);
|
|
||||||
adminApiClient
|
|
||||||
.markPlaceholdersReviewed({ ingredientIds: group.ingredientIds })
|
|
||||||
.then(() => load(tab))
|
|
||||||
.catch(() => load(tab))
|
|
||||||
.finally(() => setPendingIds(null));
|
|
||||||
}
|
|
||||||
|
|
||||||
function pruneOrphans() {
|
|
||||||
setIsPruning(true);
|
|
||||||
setPruneMessage(null);
|
|
||||||
adminApiClient
|
|
||||||
.pruneOrphanPlaceholders()
|
|
||||||
.then(({ deleted }) => {
|
|
||||||
setPruneMessage(
|
|
||||||
deleted === 0
|
|
||||||
? t("admin.catalog.prunedNone")
|
|
||||||
: t("admin.catalog.pruned", { count: deleted }),
|
|
||||||
);
|
|
||||||
load(tab);
|
|
||||||
})
|
|
||||||
.catch(() => setPruneMessage(t("admin.common.loadError")))
|
|
||||||
.finally(() => setIsPruning(false));
|
|
||||||
}
|
|
||||||
|
|
||||||
return (
|
|
||||||
<div className="admin-page">
|
|
||||||
<h1 className="admin-page__title">{t("admin.catalog.title")}</h1>
|
|
||||||
<p className="admin-page__lead">{t("admin.catalog.lead")}</p>
|
|
||||||
|
|
||||||
<div className="catalog-toolbar">
|
|
||||||
<div className="catalog-tabs" role="tablist">
|
|
||||||
{(["pending", "reviewed"] as const).map((value) => (
|
|
||||||
<button
|
|
||||||
key={value}
|
|
||||||
type="button"
|
|
||||||
role="tab"
|
|
||||||
aria-selected={tab === value}
|
|
||||||
className={tab === value ? "active" : undefined}
|
|
||||||
onClick={() => setTab(value)}
|
|
||||||
>
|
|
||||||
{t(`admin.catalog.tab.${value}`)}
|
|
||||||
</button>
|
|
||||||
))}
|
|
||||||
</div>
|
|
||||||
<button type="button" onClick={pruneOrphans} disabled={isPruning}>
|
|
||||||
{isPruning ? t("admin.catalog.pruning") : t("admin.catalog.pruneOrphans")}
|
|
||||||
</button>
|
|
||||||
</div>
|
|
||||||
{pruneMessage && <p className="catalog-prune-message">{pruneMessage}</p>}
|
|
||||||
|
|
||||||
{state.status === "loading" && (
|
|
||||||
<p className="admin-page__placeholder">{t("admin.common.loading")}</p>
|
|
||||||
)}
|
|
||||||
{state.status === "error" && (
|
|
||||||
<p className="admin-page__placeholder">{t("admin.common.loadError")}</p>
|
|
||||||
)}
|
|
||||||
{state.status === "loaded" &&
|
|
||||||
(state.groups.length === 0 ? (
|
|
||||||
<p className="admin-page__placeholder">{t("admin.catalog.empty")}</p>
|
|
||||||
) : (
|
|
||||||
<ul className="catalog-list">
|
|
||||||
{state.groups.map((group) => (
|
|
||||||
<PlaceholderGroupCard
|
|
||||||
key={group.normalizedName}
|
|
||||||
group={group}
|
|
||||||
busy={pendingIds === group.ingredientIds}
|
|
||||||
onMarkReviewed={() => markReviewed(group)}
|
|
||||||
/>
|
|
||||||
))}
|
|
||||||
</ul>
|
|
||||||
))}
|
|
||||||
</div>
|
|
||||||
);
|
|
||||||
}
|
|
||||||
|
|
||||||
function PlaceholderGroupCard({
|
|
||||||
group,
|
|
||||||
busy,
|
|
||||||
onMarkReviewed,
|
|
||||||
}: {
|
|
||||||
group: CatalogPlaceholderGroupView;
|
|
||||||
busy: boolean;
|
|
||||||
onMarkReviewed: () => void;
|
|
||||||
}) {
|
|
||||||
const { t } = useTranslation();
|
|
||||||
const { headline, variants } = splitSpellings(group);
|
|
||||||
const firstSeen = formatDate(group.firstSeenAt);
|
|
||||||
|
|
||||||
return (
|
|
||||||
<li className="catalog-card">
|
|
||||||
<div className="catalog-card__head">
|
|
||||||
<h2 className="catalog-card__name">{headline}</h2>
|
|
||||||
<span className="catalog-card__count">
|
|
||||||
{t("admin.catalog.recipeCount", { count: group.recipeCount })}
|
|
||||||
</span>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
{variants.length > 0 && (
|
|
||||||
<p className="catalog-card__variants">
|
|
||||||
{t("admin.catalog.alsoWritten", { variants: variants.join(" · ") })}
|
|
||||||
</p>
|
|
||||||
)}
|
|
||||||
|
|
||||||
{group.sampleRecipes.length > 0 && (
|
|
||||||
<p className="catalog-card__recipes">
|
|
||||||
{t("admin.catalog.seenIn")} {group.sampleRecipes.map((recipe) => recipe.name).join(", ")}
|
|
||||||
</p>
|
|
||||||
)}
|
|
||||||
|
|
||||||
<div className="catalog-card__foot">
|
|
||||||
{firstSeen && (
|
|
||||||
<span className="catalog-card__seen">
|
|
||||||
{t("admin.catalog.firstSeen", { date: firstSeen })}
|
|
||||||
</span>
|
|
||||||
)}
|
|
||||||
{!group.allReviewed && (
|
|
||||||
<button type="button" onClick={onMarkReviewed} disabled={busy}>
|
|
||||||
{busy ? t("admin.catalog.marking") : t("admin.catalog.markReviewed")}
|
|
||||||
</button>
|
|
||||||
)}
|
|
||||||
</div>
|
|
||||||
</li>
|
|
||||||
);
|
|
||||||
}
|
|
||||||
|
|
@ -1,110 +0,0 @@
|
||||||
import type { MonitoringView, ServiceHealthView } from "@batch-cooking/shared";
|
|
||||||
import { useEffect, useState } from "react";
|
|
||||||
import { useTranslation } from "react-i18next";
|
|
||||||
import { adminApiClient } from "../../api/client";
|
|
||||||
import "../admin-page.scss";
|
|
||||||
import "./monitoring-page.scss";
|
|
||||||
import { clockTime, POLL_INTERVAL_MS, statusModifier } from "./monitoring";
|
|
||||||
|
|
||||||
type MonitoringState =
|
|
||||||
| { status: "loading" }
|
|
||||||
| { status: "loaded"; data: MonitoringView }
|
|
||||||
| { status: "error" };
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Microservice health board. Fetches `GET /admin/monitoring` on mount and
|
|
||||||
* re-polls every {@link POLL_INTERVAL_MS} ms. One card per probed target
|
|
||||||
* (Postgres, API, intent-service, LLM worker), coloured by status.
|
|
||||||
*/
|
|
||||||
export function MonitoringPage() {
|
|
||||||
const { t } = useTranslation();
|
|
||||||
const [state, setState] = useState<MonitoringState>({ status: "loading" });
|
|
||||||
|
|
||||||
useEffect(() => {
|
|
||||||
let cancelled = false;
|
|
||||||
|
|
||||||
function load() {
|
|
||||||
adminApiClient
|
|
||||||
.getMonitoring()
|
|
||||||
.then((data) => {
|
|
||||||
if (!cancelled) setState({ status: "loaded", data });
|
|
||||||
})
|
|
||||||
.catch(() => {
|
|
||||||
if (!cancelled)
|
|
||||||
setState((prev) => (prev.status === "loaded" ? prev : { status: "error" }));
|
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
load();
|
|
||||||
const timer = setInterval(load, POLL_INTERVAL_MS);
|
|
||||||
return () => {
|
|
||||||
cancelled = true;
|
|
||||||
clearInterval(timer);
|
|
||||||
};
|
|
||||||
}, []);
|
|
||||||
|
|
||||||
return (
|
|
||||||
<div className="admin-page">
|
|
||||||
<h1 className="admin-page__title">{t("admin.monitoring.title")}</h1>
|
|
||||||
<p className="admin-page__lead">{t("admin.monitoring.lead")}</p>
|
|
||||||
|
|
||||||
{state.status === "loading" && (
|
|
||||||
<p className="admin-page__placeholder">{t("admin.common.loading")}</p>
|
|
||||||
)}
|
|
||||||
{state.status === "error" && (
|
|
||||||
<p className="admin-page__placeholder">{t("admin.common.loadError")}</p>
|
|
||||||
)}
|
|
||||||
{state.status === "loaded" && (
|
|
||||||
<>
|
|
||||||
<p className="monitoring-checked">
|
|
||||||
{t("admin.monitoring.lastChecked", { time: clockTime(state.data.generatedAt) })}
|
|
||||||
</p>
|
|
||||||
<div className="monitoring-grid">
|
|
||||||
{state.data.services.map((service) => (
|
|
||||||
<ServiceCard key={service.key} service={service} />
|
|
||||||
))}
|
|
||||||
</div>
|
|
||||||
</>
|
|
||||||
)}
|
|
||||||
</div>
|
|
||||||
);
|
|
||||||
}
|
|
||||||
|
|
||||||
function ServiceCard({ service }: { service: ServiceHealthView }) {
|
|
||||||
const { t } = useTranslation();
|
|
||||||
return (
|
|
||||||
<article className={`monitoring-card monitoring-card--${statusModifier(service.status)}`}>
|
|
||||||
<header className="monitoring-card__head">
|
|
||||||
<span className="monitoring-card__dot" aria-hidden="true" />
|
|
||||||
<h2>{t(`admin.monitoring.service.${service.key}`, { defaultValue: service.key })}</h2>
|
|
||||||
<span className="monitoring-card__status">
|
|
||||||
{t(`admin.monitoring.status.${service.status}`)}
|
|
||||||
</span>
|
|
||||||
</header>
|
|
||||||
<dl className="monitoring-card__meta">
|
|
||||||
{service.latencyMs !== null && (
|
|
||||||
<div>
|
|
||||||
<dt>{t("admin.monitoring.latency")}</dt>
|
|
||||||
<dd>{service.latencyMs} ms</dd>
|
|
||||||
</div>
|
|
||||||
)}
|
|
||||||
{service.detail && (
|
|
||||||
<div>
|
|
||||||
<dt>{t("admin.monitoring.detail")}</dt>
|
|
||||||
<dd>{service.detail}</dd>
|
|
||||||
</div>
|
|
||||||
)}
|
|
||||||
{service.lastRunAt !== undefined && (
|
|
||||||
<div>
|
|
||||||
<dt>{t("admin.monitoring.lastRun")}</dt>
|
|
||||||
<dd>
|
|
||||||
{service.lastRunAt ? clockTime(service.lastRunAt) : t("admin.monitoring.never")}
|
|
||||||
{service.lastResult?.job ? ` · ${service.lastResult.job}` : ""}
|
|
||||||
{service.lastResult?.ok === false ? ` · ${t("admin.monitoring.jobFailed")}` : ""}
|
|
||||||
</dd>
|
|
||||||
</div>
|
|
||||||
)}
|
|
||||||
</dl>
|
|
||||||
</article>
|
|
||||||
);
|
|
||||||
}
|
|
||||||
|
|
@ -1,19 +0,0 @@
|
||||||
import { ErrorCode } from "@batch-cooking/shared";
|
|
||||||
import i18n from "../i18n/i18n";
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Localized label for an {@link ErrorCode} returned by the admin API —
|
|
||||||
* verbatim behaviour of apps/web's `ErrorMessageService`: reverse-maps the
|
|
||||||
* numeric enum value to its member name (`4010` → `"INVALID_CREDENTIALS"`)
|
|
||||||
* and looks it up under the `errors` namespace, falling back to
|
|
||||||
* `INTERNAL_ERROR` for a code this client doesn't recognise.
|
|
||||||
*/
|
|
||||||
export class ErrorMessageService {
|
|
||||||
public getLabel(code: ErrorCode): string {
|
|
||||||
const memberName = ErrorCode[code] ?? ErrorCode[ErrorCode.INTERNAL_ERROR];
|
|
||||||
return i18n.t(`errors.${memberName}`);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/** Single shared instance — stateless. */
|
|
||||||
export const errorMessageService = new ErrorMessageService();
|
|
||||||
|
|
@ -1,171 +0,0 @@
|
||||||
// NOTE: verbatim copy of apps/web/src/styles/_theme.scss. Extracting these
|
|
||||||
// tokens into a shared package (consumed by both apps) is tracked separately
|
|
||||||
// — keep the two files in sync by hand until then.
|
|
||||||
// =============================================================================
|
|
||||||
// Design tokens — the single source of truth for colors, spacing, typography
|
|
||||||
// and other reusable values across the whole app.
|
|
||||||
//
|
|
||||||
// Exposed as CSS custom properties on :root (not plain SCSS variables) so
|
|
||||||
// they're available at *runtime*, not just compile time — this is what lets
|
|
||||||
// dark mode work below by simply redefining these variables instead of
|
|
||||||
// rebuilding the stylesheet. Every other .scss file should reference
|
|
||||||
// `var(--token-name)`, never a hardcoded color/size.
|
|
||||||
//
|
|
||||||
// Palette name: "Mise en Place" — a kitchen-operations identity (batch
|
|
||||||
// cooking as logistics: everything labeled and in its place before you
|
|
||||||
// start) rather than a food-blog one. See the design proposal for the full
|
|
||||||
// rationale: https://claude.ai/code/artifact/1db63af0-cfd1-4f77-9369-71ca6accd06f
|
|
||||||
//
|
|
||||||
// Import this partial once, globally (see global.scss) — never re-import it
|
|
||||||
// from a component-level .scss file, `:root` only needs to be declared once.
|
|
||||||
// =============================================================================
|
|
||||||
|
|
||||||
:root {
|
|
||||||
// --- Surfaces & ink ---------------------------------------------------
|
|
||||||
// Neutral surface: page background ("porcelaine") vs. the card surface
|
|
||||||
// content sits on, plus a recessed variant for panels/table headers.
|
|
||||||
--color-background: #eef2ed;
|
|
||||||
--color-surface: #ffffff;
|
|
||||||
--color-surface-alt: #e2e8e0;
|
|
||||||
// Text.
|
|
||||||
--color-text: #1f2a22;
|
|
||||||
--color-text-muted: #57685a;
|
|
||||||
--color-border: #c7d0c4;
|
|
||||||
|
|
||||||
// --- Brand accents, each with one job --------------------------------
|
|
||||||
// Basil — primary actions, links, brand presence.
|
|
||||||
--color-primary: #2e6b4a;
|
|
||||||
--color-primary-hover: #244f38;
|
|
||||||
// Vermillion — secondary accent for urgency/strong calls to action
|
|
||||||
// (e.g. a timer, "start session"). Never reused for allergen alerts
|
|
||||||
// below — those need their own, unambiguous color.
|
|
||||||
--color-accent: #cc4b26;
|
|
||||||
--color-accent-hover: #a83c1c;
|
|
||||||
// Turmeric — category/classification tags.
|
|
||||||
--color-tag: #c98a1b;
|
|
||||||
--color-tag-ink: #3a2c05; // pairs with a solid --color-tag fill only.
|
|
||||||
|
|
||||||
// --- Feedback -----------------------------------------------------------
|
|
||||||
--color-success: #2e6b4a;
|
|
||||||
--color-warning: #c98a1b;
|
|
||||||
--color-error: #b3271e;
|
|
||||||
|
|
||||||
// --- Allergens / intolerances --------------------------------------------
|
|
||||||
// A 3-tier food-safety scale, kept distinct from --color-error so an
|
|
||||||
// allergen warning is never confused with a form validation error:
|
|
||||||
// - critical (declared allergen): its own color, solid/inverted fill
|
|
||||||
// - moderate (intolerance): reuses --color-warning, tinted fill
|
|
||||||
// - trace ("may contain traces of…"): neutral, dashed outline
|
|
||||||
// The severity is carried by the FILL TREATMENT, not the hue alone, so
|
|
||||||
// it stays legible for color-blind users. See the design proposal's
|
|
||||||
// "Alertes & allergènes" section for the full component set.
|
|
||||||
--color-allergen: #a8123f;
|
|
||||||
--color-allergen-ink: #ffe9ef; // pairs with a solid --color-allergen fill only.
|
|
||||||
|
|
||||||
// --- Spacing scale ---------------------------------------------------------
|
|
||||||
// Multiples of a 4px base unit — use these instead of ad hoc px values so
|
|
||||||
// spacing stays visually consistent as the app grows.
|
|
||||||
--space-xs: 0.25rem; // 4px
|
|
||||||
--space-sm: 0.5rem; // 8px
|
|
||||||
--space-md: 1rem; // 16px
|
|
||||||
--space-lg: 1.5rem; // 24px
|
|
||||||
--space-xl: 2rem; // 32px
|
|
||||||
--space-2xl: 3rem; // 48px — inter-section spacing
|
|
||||||
|
|
||||||
// --- Typography --------------------------------------------------------
|
|
||||||
// System font stacks only — no remote webfont, so there's zero loading
|
|
||||||
// latency and no flash of unstyled text, which fits an app meant to be
|
|
||||||
// used quickly under time pressure. Three roles: a condensed "label"
|
|
||||||
// face for headings/eyebrows, a humanist face for body copy, and a
|
|
||||||
// monospace for anything that lines up in columns (times, quantities).
|
|
||||||
--font-display: "Bahnschrift", "Arial Narrow", "Segoe UI", sans-serif;
|
|
||||||
--font-body: "Segoe UI", "Helvetica Neue", Arial, sans-serif;
|
|
||||||
--font-mono: "Cascadia Mono", Consolas, "SF Mono", "Liberation Mono", monospace;
|
|
||||||
|
|
||||||
--font-size-xs: 0.75rem; // 12px — captions, meta
|
|
||||||
--font-size-sm: 0.875rem; // 14px — labels, secondary text
|
|
||||||
--font-size-base: 1rem; // 16px — body
|
|
||||||
--font-size-md: 1.125rem; // 18px — lead paragraph
|
|
||||||
--font-size-lg: 1.375rem; // 22px — H3 / card titles
|
|
||||||
--font-size-xl: 1.75rem; // 28px — H2 / section titles
|
|
||||||
--font-size-2xl: 2.25rem; // 36px — H1 / page titles
|
|
||||||
--font-size-3xl: 3rem; // 48px — display, exceptional use only
|
|
||||||
|
|
||||||
// --- Shape / elevation --------------------------------------------------
|
|
||||||
--radius-base: 4px; // controls (inputs, buttons) — deliberately flat
|
|
||||||
--radius-md: 10px; // cards
|
|
||||||
--radius-lg: 18px; // panels, modals
|
|
||||||
--radius-pill: 999px; // tags, badges
|
|
||||||
--max-width-form: 22rem;
|
|
||||||
|
|
||||||
--shadow-sm: 0 1px 2px rgba(31, 42, 34, 0.08), 0 1px 1px rgba(31, 42, 34, 0.06);
|
|
||||||
--shadow-md: 0 6px 16px rgba(31, 42, 34, 0.12), 0 2px 6px rgba(31, 42, 34, 0.08);
|
|
||||||
}
|
|
||||||
|
|
||||||
// Lets the browser pick sensible default colors (form controls, scrollbars)
|
|
||||||
// for whichever mode the user ends up in.
|
|
||||||
:root {
|
|
||||||
color-scheme: light dark;
|
|
||||||
}
|
|
||||||
|
|
||||||
// --- Dark mode ---------------------------------------------------------
|
|
||||||
// Follows the OS/browser preference by default. Guarded with
|
|
||||||
// `:root:not([data-theme="light"])` so an explicit "light" choice (see
|
|
||||||
// apps/web's `ThemeContext`, `SYSTEM` = no `data-theme` attribute at all —
|
|
||||||
// this block then decides) can override a dark OS setting.
|
|
||||||
@media (prefers-color-scheme: dark) {
|
|
||||||
:root:not([data-theme="light"]) {
|
|
||||||
--color-background: #14181a;
|
|
||||||
--color-surface: #1c221e;
|
|
||||||
--color-surface-alt: #262e27;
|
|
||||||
--color-text: #edf1ea;
|
|
||||||
--color-text-muted: #a9b5a6;
|
|
||||||
--color-border: #384038;
|
|
||||||
|
|
||||||
--color-primary: #5fae7e;
|
|
||||||
--color-primary-hover: #7cc496;
|
|
||||||
--color-accent: #ea7a48;
|
|
||||||
--color-accent-hover: #f0946c;
|
|
||||||
--color-tag: #e8b84b;
|
|
||||||
--color-tag-ink: #2a2005;
|
|
||||||
|
|
||||||
--color-success: #5fae7e;
|
|
||||||
--color-warning: #e8b84b;
|
|
||||||
--color-error: #e5675a;
|
|
||||||
|
|
||||||
--color-allergen: #e2547b;
|
|
||||||
--color-allergen-ink: #3a0416;
|
|
||||||
|
|
||||||
--shadow-sm: 0 1px 2px rgba(0, 0, 0, 0.35);
|
|
||||||
--shadow-md: 0 8px 20px rgba(0, 0, 0, 0.45);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// Mirrors the block above for an explicit "dark" choice (`ThemeContext`
|
|
||||||
// sets `data-theme="dark"` on `<html>`), so it wins over the OS setting in
|
|
||||||
// both directions.
|
|
||||||
:root[data-theme="dark"] {
|
|
||||||
--color-background: #14181a;
|
|
||||||
--color-surface: #1c221e;
|
|
||||||
--color-surface-alt: #262e27;
|
|
||||||
--color-text: #edf1ea;
|
|
||||||
--color-text-muted: #a9b5a6;
|
|
||||||
--color-border: #384038;
|
|
||||||
|
|
||||||
--color-primary: #5fae7e;
|
|
||||||
--color-primary-hover: #7cc496;
|
|
||||||
--color-accent: #ea7a48;
|
|
||||||
--color-accent-hover: #f0946c;
|
|
||||||
--color-tag: #e8b84b;
|
|
||||||
--color-tag-ink: #2a2005;
|
|
||||||
|
|
||||||
--color-success: #5fae7e;
|
|
||||||
--color-warning: #e8b84b;
|
|
||||||
--color-error: #e5675a;
|
|
||||||
|
|
||||||
--color-allergen: #e2547b;
|
|
||||||
--color-allergen-ink: #3a0416;
|
|
||||||
|
|
||||||
--shadow-sm: 0 1px 2px rgba(0, 0, 0, 0.35);
|
|
||||||
--shadow-md: 0 8px 20px rgba(0, 0, 0, 0.45);
|
|
||||||
}
|
|
||||||
|
|
@ -1,149 +0,0 @@
|
||||||
// =============================================================================
|
|
||||||
// Global stylesheet — imported exactly once, in main.tsx. Contains only
|
|
||||||
// truly app-wide rules: the theme tokens and a minimal reset/base styling
|
|
||||||
// that every page inherits. Anything specific to one component or page
|
|
||||||
// belongs in a .scss file colocated next to that component/page instead.
|
|
||||||
// =============================================================================
|
|
||||||
|
|
||||||
@use "./theme";
|
|
||||||
|
|
||||||
// Include borders/padding in an element's declared width/height everywhere,
|
|
||||||
// rather than the browser default of adding them on top.
|
|
||||||
*,
|
|
||||||
*::before,
|
|
||||||
*::after {
|
|
||||||
box-sizing: border-box;
|
|
||||||
}
|
|
||||||
|
|
||||||
// Minimal reset: remove the default body margin so pages can control their
|
|
||||||
// own layout without fighting the browser's default 8px margin.
|
|
||||||
body {
|
|
||||||
margin: 0;
|
|
||||||
font-family: var(--font-body);
|
|
||||||
font-size: var(--font-size-base);
|
|
||||||
line-height: 1.55;
|
|
||||||
color: var(--color-text);
|
|
||||||
background: var(--color-background);
|
|
||||||
}
|
|
||||||
|
|
||||||
// Headings use the condensed "label" face app-wide — see _theme.scss for
|
|
||||||
// the rationale. `text-wrap: balance` avoids a lone short word wrapping
|
|
||||||
// onto its own line in multi-line titles.
|
|
||||||
h1,
|
|
||||||
h2,
|
|
||||||
h3,
|
|
||||||
h4,
|
|
||||||
h5,
|
|
||||||
h6 {
|
|
||||||
margin: 0;
|
|
||||||
font-family: var(--font-display);
|
|
||||||
font-weight: 700;
|
|
||||||
text-wrap: balance;
|
|
||||||
}
|
|
||||||
|
|
||||||
// Default to the page-title size; a heading used as a smaller component
|
|
||||||
// title (e.g. the auth card's <h1>) overrides this in its own stylesheet.
|
|
||||||
h1 {
|
|
||||||
font-size: var(--font-size-2xl);
|
|
||||||
}
|
|
||||||
|
|
||||||
// A visible, consistent focus ring for keyboard navigation — the browser
|
|
||||||
// default varies a lot between elements and browsers.
|
|
||||||
:focus-visible {
|
|
||||||
outline: 2px solid var(--color-accent);
|
|
||||||
outline-offset: 2px;
|
|
||||||
}
|
|
||||||
|
|
||||||
// Checkbox/radio appearance, app-wide — "selectable card" style: the native
|
|
||||||
// control itself is visually hidden (still real, focusable and
|
|
||||||
// screen-reader-visible — see the `input[type=...]` rule below, not
|
|
||||||
// `display: none`) and the whole label row it lives in becomes the
|
|
||||||
// interactive surface instead: a flat bordered box that fills in with a
|
|
||||||
// tinted background + primary border once selected, with a checkmark
|
|
||||||
// fading in on the leading edge.
|
|
||||||
//
|
|
||||||
// The base (unselected) look below is detected structurally with `:has()`
|
|
||||||
// — safe, since "does this label contain a checkbox/radio" never changes
|
|
||||||
// after mount. The *selected* look is instead driven by the `is-selected`
|
|
||||||
// class {@link CheckboxOption}/{@link RadioOption} (components/ui/) toggle
|
|
||||||
// in JS from the same boolean their caller already passes to `checked` —
|
|
||||||
// chaining a second `:has(:checked)` to react to that live state turned
|
|
||||||
// out to be unreliable across browsers, so this only needs one
|
|
||||||
// always-true `:has()`.
|
|
||||||
//
|
|
||||||
// Every checkbox/radio in the app goes through this one place (the allergy
|
|
||||||
// grid, the theme picker, anywhere future) rather than each feature styling
|
|
||||||
// its own — see profile-forms.scss / settings-pages.scss, which only
|
|
||||||
// arrange these within their own layout (grid vs. stacked list) and
|
|
||||||
// intentionally don't re-style the control/label look itself.
|
|
||||||
label:has(> input[type="checkbox"]),
|
|
||||||
label:has(> input[type="radio"]) {
|
|
||||||
position: relative;
|
|
||||||
display: flex;
|
|
||||||
align-items: center;
|
|
||||||
gap: var(--space-xs);
|
|
||||||
padding: var(--space-xs) var(--space-sm);
|
|
||||||
// Overrides the generic `label { font-weight: 600 }` base rule
|
|
||||||
// (profile-forms.scss) — without this, an *unselected* row reads just as
|
|
||||||
// bold as a selected one (only `.allergy-select__option` happened to set
|
|
||||||
// its own 400 already; `.theme-select__option` didn't, so its rows were
|
|
||||||
// all permanently bold until this was centralized here).
|
|
||||||
font-weight: 400;
|
|
||||||
border: 1.5px solid var(--color-border);
|
|
||||||
border-radius: var(--radius-base);
|
|
||||||
background: var(--color-surface);
|
|
||||||
cursor: pointer;
|
|
||||||
transition:
|
|
||||||
background-color 0.15s ease,
|
|
||||||
border-color 0.15s ease;
|
|
||||||
|
|
||||||
&:hover {
|
|
||||||
border-color: var(--color-primary);
|
|
||||||
}
|
|
||||||
|
|
||||||
&.is-selected {
|
|
||||||
border-color: var(--color-primary);
|
|
||||||
background: color-mix(in srgb, var(--color-primary) 12%, var(--color-surface));
|
|
||||||
color: var(--color-primary);
|
|
||||||
font-weight: 600;
|
|
||||||
}
|
|
||||||
|
|
||||||
&:has(:focus-visible) {
|
|
||||||
outline: 2px solid var(--color-accent);
|
|
||||||
outline-offset: 2px;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// The control itself is removed from the visual flow — hidden the
|
|
||||||
// "sr-only" way (not `display: none`) so it stays focusable/tabbable and
|
|
||||||
// announced correctly by screen readers; the label above carries the
|
|
||||||
// entire visible selected/unchecked look.
|
|
||||||
input[type="checkbox"],
|
|
||||||
input[type="radio"] {
|
|
||||||
position: absolute;
|
|
||||||
width: 1px;
|
|
||||||
height: 1px;
|
|
||||||
margin: 0;
|
|
||||||
opacity: 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
// The checkmark — a real element (see components/ui/Checkbox.tsx /
|
|
||||||
// Radio.tsx) shown via the same `is-selected` class as the label's own
|
|
||||||
// look above, not a separate CSS-only trigger. Scaled in from nothing so
|
|
||||||
// toggling has a bit of motion. Same mark for both checkbox and radio: one
|
|
||||||
// consistent "selected" language app-wide rather than a checkmark here and
|
|
||||||
// a dot there. Sits first in the row (before the label text, per DOM
|
|
||||||
// order) — a classic "control on the left" layout rather than trailing.
|
|
||||||
.check-mark {
|
|
||||||
flex: none;
|
|
||||||
width: 0.9rem;
|
|
||||||
height: 0.9rem;
|
|
||||||
background: var(--color-primary);
|
|
||||||
clip-path: polygon(14% 44%, 0 65%, 50% 100%, 100% 16%, 80% 0%, 43% 62%);
|
|
||||||
transform: scale(0);
|
|
||||||
transition: transform 0.1s ease;
|
|
||||||
}
|
|
||||||
|
|
||||||
.is-selected .check-mark {
|
|
||||||
transform: scale(1);
|
|
||||||
}
|
|
||||||
5
apps/admin-web/src/vite-env.d.ts
vendored
5
apps/admin-web/src/vite-env.d.ts
vendored
|
|
@ -1,5 +0,0 @@
|
||||||
/// <reference types="vite/client" />
|
|
||||||
|
|
||||||
// Injected by `define` in vite.config.ts, sourced from package.json's
|
|
||||||
// version field — rendered in AdminLayout.tsx.
|
|
||||||
declare const __APP_VERSION__: string;
|
|
||||||
|
|
@ -1,14 +0,0 @@
|
||||||
{
|
|
||||||
"extends": "../../tsconfig.base.json",
|
|
||||||
"compilerOptions": {
|
|
||||||
"module": "ESNext",
|
|
||||||
"moduleResolution": "Bundler",
|
|
||||||
"lib": ["ES2022", "DOM", "DOM.Iterable"],
|
|
||||||
"jsx": "react-jsx",
|
|
||||||
"types": ["vite/client"],
|
|
||||||
"noEmit": true,
|
|
||||||
"composite": true,
|
|
||||||
"tsBuildInfoFile": "./node_modules/.tmp/tsconfig.app.tsbuildinfo"
|
|
||||||
},
|
|
||||||
"include": ["src"]
|
|
||||||
}
|
|
||||||
|
|
@ -1,8 +0,0 @@
|
||||||
{
|
|
||||||
"compilerOptions": {
|
|
||||||
"module": "ESNext",
|
|
||||||
"moduleResolution": "Bundler"
|
|
||||||
},
|
|
||||||
"files": [],
|
|
||||||
"references": [{ "path": "./tsconfig.app.json" }, { "path": "./tsconfig.node.json" }]
|
|
||||||
}
|
|
||||||
|
|
@ -1,12 +0,0 @@
|
||||||
{
|
|
||||||
"compilerOptions": {
|
|
||||||
"target": "ES2022",
|
|
||||||
"module": "ESNext",
|
|
||||||
"moduleResolution": "Bundler",
|
|
||||||
"composite": true,
|
|
||||||
"noEmit": true,
|
|
||||||
"skipLibCheck": true,
|
|
||||||
"types": ["node"]
|
|
||||||
},
|
|
||||||
"include": ["vite.config.ts"]
|
|
||||||
}
|
|
||||||
|
|
@ -1,19 +0,0 @@
|
||||||
import { readFileSync } from "node:fs";
|
|
||||||
import react from "@vitejs/plugin-react";
|
|
||||||
import { defineConfig } from "vite";
|
|
||||||
|
|
||||||
// Read once at config-eval time — same trick as apps/web's vite.config.ts.
|
|
||||||
const pkg = JSON.parse(readFileSync(new URL("./package.json", import.meta.url), "utf-8"));
|
|
||||||
|
|
||||||
export default defineConfig({
|
|
||||||
plugins: [react()],
|
|
||||||
server: { port: 5174 },
|
|
||||||
css: {
|
|
||||||
preprocessorOptions: {
|
|
||||||
scss: { api: "modern-compiler" },
|
|
||||||
},
|
|
||||||
},
|
|
||||||
define: {
|
|
||||||
__APP_VERSION__: JSON.stringify(pkg.version),
|
|
||||||
},
|
|
||||||
});
|
|
||||||
|
|
@ -11,7 +11,7 @@ JWT_SECRET=changeme-generate-a-real-random-secret-at-least-32-chars
|
||||||
# Optional — defaults shown (see src/config/env.ts)
|
# Optional — defaults shown (see src/config/env.ts)
|
||||||
# JWT_EXPIRES_IN=7d
|
# JWT_EXPIRES_IN=7d
|
||||||
# AUTH_COOKIE_NAME=session
|
# AUTH_COOKIE_NAME=session
|
||||||
# CORS_ORIGIN=http://localhost:5173
|
# CORS_ORIGIN=http://localhost:5173,https://localhost
|
||||||
# INTENT_SERVICE_BASE_URL=http://localhost:8000
|
# INTENT_SERVICE_BASE_URL=http://localhost:8000
|
||||||
|
|
||||||
# Required — services/tech-step-intent-service must be running locally (see
|
# Required — services/tech-step-intent-service must be running locally (see
|
||||||
|
|
@ -25,3 +25,22 @@ INTENT_SERVICE_SECRET=changeme-generate-a-real-random-secret-at-least-32-chars
|
||||||
# Generate your own the same way as JWT_SECRET above; must match the
|
# Generate your own the same way as JWT_SECRET above; must match the
|
||||||
# worker's own INTERNAL_WORKER_SECRET.
|
# worker's own INTERNAL_WORKER_SECRET.
|
||||||
# INTERNAL_WORKER_SECRET=changeme-generate-a-real-random-secret-at-least-32-chars
|
# INTERNAL_WORKER_SECRET=changeme-generate-a-real-random-secret-at-least-32-chars
|
||||||
|
|
||||||
|
# Only needed to use the admin surface (apps/web's /admin/* routes) — every
|
||||||
|
# /admin/* request 401s while unset (`requireAdmin` fails closed). MUST be a
|
||||||
|
# different value than JWT_SECRET. Generate your own the same way.
|
||||||
|
# ADMIN_JWT_SECRET=changeme-a-different-random-secret-at-least-32-chars
|
||||||
|
# Read only by `src/scripts/create-admin.ts` when its --email/--password/
|
||||||
|
# --name flags are omitted — never by the running server.
|
||||||
|
# ADMIN_INITIAL_EMAIL=ops@example.com
|
||||||
|
# ADMIN_INITIAL_PASSWORD=changeme-at-least-8-chars
|
||||||
|
# ADMIN_INITIAL_NAME=Ops
|
||||||
|
|
||||||
|
# Only needed to create a Forgejo issue from a contact message
|
||||||
|
# (apps/web's /admin/messages, issue #81). The button is hidden and the
|
||||||
|
# endpoint answers 503 while any of the three is unset. FORGEJO_TOKEN is a
|
||||||
|
# personal access token with the write:issue scope — generate it in Forgejo,
|
||||||
|
# never commit the real value.
|
||||||
|
# FORGEJO_BASE_URL=https://git.example.com
|
||||||
|
# FORGEJO_TOKEN=changeme-a-forgejo-personal-access-token
|
||||||
|
# FORGEJO_REPO=owner/repo
|
||||||
|
|
|
||||||
|
|
@ -60,8 +60,11 @@ COPY --from=build /repo/apps/web/dist ./apps/web/dist
|
||||||
|
|
||||||
WORKDIR /repo/apps/api
|
WORKDIR /repo/apps/api
|
||||||
EXPOSE 3000
|
EXPOSE 3000
|
||||||
# Applies pending migrations, then seeds the reference data (Diet/Category/
|
# Applies pending migrations, seeds the reference data (Diet/Category/
|
||||||
# Allergy — see src/scripts/seed-runtime.ts) before starting. Both steps are
|
# Allergy — see src/scripts/seed-runtime.ts), then runs any pending one-time
|
||||||
# safe to repeat on every container start: migrate deploy only applies
|
# data backfill (src/scripts/backfill-runtime.ts) before starting. migrate
|
||||||
# pending migrations, and the seed upserts by unique name.
|
# deploy only applies pending migrations and the seed upserts by unique
|
||||||
CMD ["sh", "-c", "node_modules/.bin/prisma migrate deploy && node dist/scripts/seed-runtime.js && node dist/server.js"]
|
# name, so both are safe to repeat every start; the backfill step gates
|
||||||
|
# itself on a `backfill_state` row (no-op once done) and is written never to
|
||||||
|
# fail the boot — see its doc comment.
|
||||||
|
CMD ["sh", "-c", "node_modules/.bin/prisma migrate deploy && node dist/scripts/seed-runtime.js && node dist/scripts/backfill-runtime.js && node dist/server.js"]
|
||||||
|
|
|
||||||
|
|
@ -23,10 +23,12 @@
|
||||||
"@batch-cooking/shared": "workspace:*",
|
"@batch-cooking/shared": "workspace:*",
|
||||||
"@prisma/client": "^5.22.0",
|
"@prisma/client": "^5.22.0",
|
||||||
"argon2": "0.31.2",
|
"argon2": "0.31.2",
|
||||||
|
"cookie": "^2.0.1",
|
||||||
"dotenv": "^16.4.5",
|
"dotenv": "^16.4.5",
|
||||||
"express": "^4.21.1",
|
"express": "^4.21.1",
|
||||||
"jsonwebtoken": "^9.0.3",
|
"jsonwebtoken": "^9.0.3",
|
||||||
"prisma": "^5.22.0",
|
"prisma": "^5.22.0",
|
||||||
|
"socket.io": "^4.8.3",
|
||||||
"zod": "^3.23.8"
|
"zod": "^3.23.8"
|
||||||
},
|
},
|
||||||
"devDependencies": {
|
"devDependencies": {
|
||||||
|
|
@ -38,6 +40,7 @@
|
||||||
"chai": "^5.1.2",
|
"chai": "^5.1.2",
|
||||||
"cross-env": "^10.1.0",
|
"cross-env": "^10.1.0",
|
||||||
"mocha": "^10.8.2",
|
"mocha": "^10.8.2",
|
||||||
|
"socket.io-client": "^4.8.3",
|
||||||
"supertest": "^7.0.0",
|
"supertest": "^7.0.0",
|
||||||
"tsx": "^4.19.2",
|
"tsx": "^4.19.2",
|
||||||
"typescript": "^5.7.2"
|
"typescript": "^5.7.2"
|
||||||
|
|
|
||||||
|
|
@ -0,0 +1,22 @@
|
||||||
|
-- CreateTable: temperatures mentioned in the same clause as a detected
|
||||||
|
-- technique — regex-extracted (services/tech-step-intent-service), no
|
||||||
|
-- foreign key of its own (the structured value is the data). Same
|
||||||
|
-- composite FK + ON DELETE CASCADE shape as step_tech_step_ingredient /
|
||||||
|
-- step_tech_step_utensil (see 20260826121000_step_tech_step_metadata).
|
||||||
|
CREATE TABLE "step_tech_step_temperature" (
|
||||||
|
"id" SERIAL NOT NULL,
|
||||||
|
"step_id" INTEGER NOT NULL,
|
||||||
|
"tech_step_order" INTEGER NOT NULL,
|
||||||
|
"start" INTEGER NOT NULL,
|
||||||
|
"end" INTEGER NOT NULL,
|
||||||
|
"celsius" DECIMAL(6,2),
|
||||||
|
"gas_mark" INTEGER,
|
||||||
|
"qualitative" TEXT,
|
||||||
|
"raw" TEXT NOT NULL,
|
||||||
|
"source" TEXT NOT NULL DEFAULT 'auto',
|
||||||
|
|
||||||
|
CONSTRAINT "step_tech_step_temperature_pkey" PRIMARY KEY ("id")
|
||||||
|
);
|
||||||
|
|
||||||
|
-- AddForeignKey
|
||||||
|
ALTER TABLE "step_tech_step_temperature" ADD CONSTRAINT "step_tech_step_temperature_step_id_tech_step_order_fkey" FOREIGN KEY ("step_id", "tech_step_order") REFERENCES "step_tech_step"("step_id", "order") ON DELETE CASCADE ON UPDATE CASCADE;
|
||||||
|
|
@ -0,0 +1,11 @@
|
||||||
|
-- CreateTable: idempotency ledger for one-time data backfills run from the
|
||||||
|
-- production image's start command (apps/api/Dockerfile CMD ->
|
||||||
|
-- src/scripts/backfill-runtime.ts). One row per completed backfill, keyed
|
||||||
|
-- by an opaque backfill name; presence of the row is the "already done,
|
||||||
|
-- don't repeat" signal. See the `BackfillState` model doc comment.
|
||||||
|
CREATE TABLE "backfill_state" (
|
||||||
|
"key" TEXT NOT NULL,
|
||||||
|
"completed_at" TIMESTAMP(3) NOT NULL DEFAULT CURRENT_TIMESTAMP,
|
||||||
|
|
||||||
|
CONSTRAINT "backfill_state_pkey" PRIMARY KEY ("key")
|
||||||
|
);
|
||||||
|
|
@ -0,0 +1,27 @@
|
||||||
|
-- Splits "portions to prepare" from "portions actually needed" on a
|
||||||
|
-- planning slot, and adds the two columns a leftovers-serving item needs
|
||||||
|
-- (its source item + how much of its own pool was thrown away). Purely
|
||||||
|
-- additive — no existing column renamed. See the `PlanningItem` model doc
|
||||||
|
-- comments and issue #34.
|
||||||
|
|
||||||
|
-- `discarded_portions` and `source_planning_item_id` are trivial adds.
|
||||||
|
ALTER TABLE "planning_item"
|
||||||
|
ADD COLUMN "discarded_portions" INTEGER NOT NULL DEFAULT 0,
|
||||||
|
ADD COLUMN "source_planning_item_id" INTEGER;
|
||||||
|
|
||||||
|
-- `portions_requested` is NOT NULL but the table may have rows already:
|
||||||
|
-- add it nullable, backfill, then lock it down — same discipline as the
|
||||||
|
-- `ingredient_unit_catalog` / `planning_item_portions` migrations. Every
|
||||||
|
-- pre-existing row predates this feature, so it had no leftovers:
|
||||||
|
-- requested == prepared at the time it was added.
|
||||||
|
ALTER TABLE "planning_item" ADD COLUMN "portions_requested" INTEGER;
|
||||||
|
UPDATE "planning_item" SET "portions_requested" = "portions";
|
||||||
|
ALTER TABLE "planning_item" ALTER COLUMN "portions_requested" SET NOT NULL;
|
||||||
|
|
||||||
|
-- Self-FK for a "leftovers" item pointing back at the item it draws from.
|
||||||
|
-- ON DELETE CASCADE: removing the source item removes everything served
|
||||||
|
-- from its pool too (same as the Planning -> PlanningItem cascade).
|
||||||
|
ALTER TABLE "planning_item"
|
||||||
|
ADD CONSTRAINT "planning_item_source_planning_item_id_fkey"
|
||||||
|
FOREIGN KEY ("source_planning_item_id") REFERENCES "planning_item"("id")
|
||||||
|
ON DELETE CASCADE ON UPDATE CASCADE;
|
||||||
|
|
@ -0,0 +1,65 @@
|
||||||
|
-- Guided-tour scenarios, their steps, the catalogue of valid highlight
|
||||||
|
-- targets, and per-user "seen" progress. All four tables are new — plain
|
||||||
|
-- CREATEs, nothing to backfill. See issues #42 (the tour engine) and #44
|
||||||
|
-- (admin CRUD + the DB-backed model this migration implements, which
|
||||||
|
-- revises #42's originally-planned in-code registry).
|
||||||
|
|
||||||
|
-- CreateTable
|
||||||
|
CREATE TABLE "tour_target" (
|
||||||
|
"key" TEXT NOT NULL,
|
||||||
|
"description" TEXT NOT NULL,
|
||||||
|
|
||||||
|
CONSTRAINT "tour_target_pkey" PRIMARY KEY ("key")
|
||||||
|
);
|
||||||
|
|
||||||
|
-- CreateTable
|
||||||
|
CREATE TABLE "tour_scenario" (
|
||||||
|
"id" SERIAL NOT NULL,
|
||||||
|
"key" TEXT NOT NULL,
|
||||||
|
"name" TEXT NOT NULL,
|
||||||
|
"enabled" BOOLEAN NOT NULL DEFAULT true,
|
||||||
|
"created_at" TIMESTAMP(3) NOT NULL DEFAULT CURRENT_TIMESTAMP,
|
||||||
|
"updated_at" TIMESTAMP(3) NOT NULL,
|
||||||
|
|
||||||
|
CONSTRAINT "tour_scenario_pkey" PRIMARY KEY ("id")
|
||||||
|
);
|
||||||
|
|
||||||
|
-- CreateTable
|
||||||
|
CREATE TABLE "tour_scenario_step" (
|
||||||
|
"id" SERIAL NOT NULL,
|
||||||
|
"scenario_id" INTEGER NOT NULL,
|
||||||
|
"order" INTEGER NOT NULL,
|
||||||
|
"route" TEXT,
|
||||||
|
"target_key" TEXT NOT NULL,
|
||||||
|
"title" TEXT NOT NULL,
|
||||||
|
"content" TEXT NOT NULL,
|
||||||
|
|
||||||
|
CONSTRAINT "tour_scenario_step_pkey" PRIMARY KEY ("id")
|
||||||
|
);
|
||||||
|
|
||||||
|
-- CreateTable
|
||||||
|
CREATE TABLE "tour_progress" (
|
||||||
|
"user_profile_id" INTEGER NOT NULL,
|
||||||
|
"scenario_id" INTEGER NOT NULL,
|
||||||
|
"completed_at" TIMESTAMP(3) NOT NULL DEFAULT CURRENT_TIMESTAMP,
|
||||||
|
|
||||||
|
CONSTRAINT "tour_progress_pkey" PRIMARY KEY ("user_profile_id","scenario_id")
|
||||||
|
);
|
||||||
|
|
||||||
|
-- CreateIndex
|
||||||
|
CREATE UNIQUE INDEX "tour_scenario_key_key" ON "tour_scenario"("key");
|
||||||
|
|
||||||
|
-- CreateIndex
|
||||||
|
CREATE UNIQUE INDEX "tour_scenario_step_scenario_id_order_key" ON "tour_scenario_step"("scenario_id", "order");
|
||||||
|
|
||||||
|
-- AddForeignKey
|
||||||
|
ALTER TABLE "tour_scenario_step" ADD CONSTRAINT "tour_scenario_step_scenario_id_fkey" FOREIGN KEY ("scenario_id") REFERENCES "tour_scenario"("id") ON DELETE CASCADE ON UPDATE CASCADE;
|
||||||
|
|
||||||
|
-- AddForeignKey
|
||||||
|
ALTER TABLE "tour_scenario_step" ADD CONSTRAINT "tour_scenario_step_target_key_fkey" FOREIGN KEY ("target_key") REFERENCES "tour_target"("key") ON DELETE RESTRICT ON UPDATE CASCADE;
|
||||||
|
|
||||||
|
-- AddForeignKey
|
||||||
|
ALTER TABLE "tour_progress" ADD CONSTRAINT "tour_progress_user_profile_id_fkey" FOREIGN KEY ("user_profile_id") REFERENCES "user_profiles"("id") ON DELETE CASCADE ON UPDATE CASCADE;
|
||||||
|
|
||||||
|
-- AddForeignKey
|
||||||
|
ALTER TABLE "tour_progress" ADD CONSTRAINT "tour_progress_scenario_id_fkey" FOREIGN KEY ("scenario_id") REFERENCES "tour_scenario"("id") ON DELETE CASCADE ON UPDATE CASCADE;
|
||||||
|
|
@ -0,0 +1,23 @@
|
||||||
|
-- Contact-form messages (issue #80). New table only — nothing to backfill.
|
||||||
|
-- `author_id` is nullable with ON DELETE SET NULL so a report survives its
|
||||||
|
-- sender's account deletion (same as ingredients.created_by_id).
|
||||||
|
|
||||||
|
-- CreateTable
|
||||||
|
CREATE TABLE "contact_message" (
|
||||||
|
"id" SERIAL NOT NULL,
|
||||||
|
"author_id" INTEGER,
|
||||||
|
"type" TEXT NOT NULL,
|
||||||
|
"message" TEXT NOT NULL,
|
||||||
|
"page_url" TEXT,
|
||||||
|
"user_agent" TEXT,
|
||||||
|
"app_version" TEXT,
|
||||||
|
"created_at" TIMESTAMP(3) NOT NULL DEFAULT CURRENT_TIMESTAMP,
|
||||||
|
|
||||||
|
CONSTRAINT "contact_message_pkey" PRIMARY KEY ("id")
|
||||||
|
);
|
||||||
|
|
||||||
|
-- CreateIndex
|
||||||
|
CREATE INDEX "contact_message_created_at_idx" ON "contact_message"("created_at");
|
||||||
|
|
||||||
|
-- AddForeignKey
|
||||||
|
ALTER TABLE "contact_message" ADD CONSTRAINT "contact_message_author_id_fkey" FOREIGN KEY ("author_id") REFERENCES "user_profiles"("id") ON DELETE SET NULL ON UPDATE CASCADE;
|
||||||
|
|
@ -0,0 +1,8 @@
|
||||||
|
-- Link a contact message to the Forgejo issue an admin created from it
|
||||||
|
-- (issue #81). Two nullable columns, no backfill — existing rows have no
|
||||||
|
-- linked issue.
|
||||||
|
|
||||||
|
-- AlterTable
|
||||||
|
ALTER TABLE "contact_message"
|
||||||
|
ADD COLUMN "forgejo_issue_number" INTEGER,
|
||||||
|
ADD COLUMN "forgejo_issue_url" TEXT;
|
||||||
|
|
@ -0,0 +1,8 @@
|
||||||
|
-- Ingrédients d'assaisonnement « selon le goût » (issue #128, puce 1 de #3) :
|
||||||
|
-- une ligne de recette peut désormais n'avoir ni quantité ni unité. Purement
|
||||||
|
-- additif — toutes les lignes existantes gardent leurs valeurs, aucune n'est
|
||||||
|
-- réécrite.
|
||||||
|
|
||||||
|
-- AlterTable
|
||||||
|
ALTER TABLE "recipe_ingredient" ALTER COLUMN "quantity" DROP NOT NULL;
|
||||||
|
ALTER TABLE "recipe_ingredient" ALTER COLUMN "unit_id" DROP NOT NULL;
|
||||||
|
|
@ -0,0 +1,7 @@
|
||||||
|
-- Régimes d'une recette calculés depuis ses ingrédients (issue #131, puce 4
|
||||||
|
-- de #3) — `RecipeDiet` (tag manuel) est supprimé : `RecipeSummaryView.diets`
|
||||||
|
-- est désormais dérivé de `IngredientDiet` + de l'allergène `gluten` côté
|
||||||
|
-- lecture (voir `computeRecipeDietViews`). Aucune donnée à conserver.
|
||||||
|
|
||||||
|
-- DropTable
|
||||||
|
DROP TABLE "recipe_diet";
|
||||||
|
|
@ -0,0 +1,16 @@
|
||||||
|
-- AlterTable: off-catalog technique "placeholder" rows (issue #130, puce 3
|
||||||
|
-- de #3) — a user names a technique the catalog is missing while correcting a
|
||||||
|
-- step. Every existing row is a real seeded catalog entry, so the flag
|
||||||
|
-- defaults to false and the four new nullable columns stay NULL for them —
|
||||||
|
-- no backfill needed. Mirrors the `ingredients` placeholder migration.
|
||||||
|
ALTER TABLE "tech_step" ADD COLUMN "is_placeholder" BOOLEAN NOT NULL DEFAULT false;
|
||||||
|
ALTER TABLE "tech_step" ADD COLUMN "display_name" TEXT;
|
||||||
|
ALTER TABLE "tech_step" ADD COLUMN "created_by_id" INTEGER;
|
||||||
|
ALTER TABLE "tech_step" ADD COLUMN "created_at" TIMESTAMP(3);
|
||||||
|
ALTER TABLE "tech_step" ADD COLUMN "reviewed_at" TIMESTAMP(3);
|
||||||
|
|
||||||
|
-- CreateIndex
|
||||||
|
CREATE INDEX "tech_step_is_placeholder_idx" ON "tech_step"("is_placeholder");
|
||||||
|
|
||||||
|
-- AddForeignKey
|
||||||
|
ALTER TABLE "tech_step" ADD CONSTRAINT "tech_step_created_by_id_fkey" FOREIGN KEY ("created_by_id") REFERENCES "user_profiles"("id") ON DELETE SET NULL ON UPDATE CASCADE;
|
||||||
|
|
@ -49,7 +49,6 @@ model Diet {
|
||||||
key String @unique
|
key String @unique
|
||||||
|
|
||||||
users UserProfile[]
|
users UserProfile[]
|
||||||
recipes RecipeDiet[]
|
|
||||||
ingredients IngredientDiet[]
|
ingredients IngredientDiet[]
|
||||||
|
|
||||||
@@map("diet")
|
@@map("diet")
|
||||||
|
|
@ -125,6 +124,9 @@ model UserProfile {
|
||||||
/// list regardless of that real-world cardinality.
|
/// list regardless of that real-world cardinality.
|
||||||
administeredHouses House[] @relation("HouseAdmin")
|
administeredHouses House[] @relation("HouseAdmin")
|
||||||
preferences UserPreference?
|
preferences UserPreference?
|
||||||
|
/// Guided-tour scenarios this profile has seen (completed or skipped) —
|
||||||
|
/// see {@link TourProgress} and issues #42 / #44.
|
||||||
|
tourProgress TourProgress[]
|
||||||
/// Tech-step corrections this profile has submitted (any profile that can
|
/// Tech-step corrections this profile has submitted (any profile that can
|
||||||
/// view a recipe may correct its tech-step matches, not just its author —
|
/// view a recipe may correct its tech-step matches, not just its author —
|
||||||
/// see `StepTechStepCorrection.correctorId`).
|
/// see `StepTechStepCorrection.correctorId`).
|
||||||
|
|
@ -132,6 +134,11 @@ model UserProfile {
|
||||||
/// Placeholder `Ingredient` rows this profile created by typing a free-text
|
/// Placeholder `Ingredient` rows this profile created by typing a free-text
|
||||||
/// ingredient the catalog didn't cover — see `Ingredient.isPlaceholder`.
|
/// ingredient the catalog didn't cover — see `Ingredient.isPlaceholder`.
|
||||||
createdIngredientPlaceholders Ingredient[] @relation("PlaceholderCreator")
|
createdIngredientPlaceholders Ingredient[] @relation("PlaceholderCreator")
|
||||||
|
/// Placeholder `TechStep` rows this profile proposed while correcting a step
|
||||||
|
/// — see `TechStep.isPlaceholder`.
|
||||||
|
createdTechStepPlaceholders TechStep[] @relation("TechStepPlaceholderCreator")
|
||||||
|
/// Contact-form messages this profile has sent — see {@link ContactMessage}.
|
||||||
|
contactMessages ContactMessage[]
|
||||||
|
|
||||||
@@map("user_profiles")
|
@@map("user_profiles")
|
||||||
}
|
}
|
||||||
|
|
@ -213,17 +220,41 @@ model Planning {
|
||||||
}
|
}
|
||||||
|
|
||||||
model PlanningItem {
|
model PlanningItem {
|
||||||
id Int @id @default(autoincrement())
|
id Int @id @default(autoincrement())
|
||||||
planningId Int @map("planning_id")
|
planningId Int @map("planning_id")
|
||||||
weekDay String @map("week_day")
|
weekDay String @map("week_day")
|
||||||
meal String
|
meal String
|
||||||
recipeId Int @map("recipe_id")
|
recipeId Int @map("recipe_id")
|
||||||
|
/// Portions actually *prepared* for this slot — always a whole multiple
|
||||||
|
/// of `recipe.portions` (a dish is cooked in whole batches). Derived from
|
||||||
|
/// `portionsRequested` + the recipe's yield via `computeBatchedPortions`
|
||||||
|
/// (`@batch-cooking/shared`) in `addPlanningItem`, never sent raw by the
|
||||||
|
/// client. On a "leftovers" item (`sourcePlanningItemId` set) it always
|
||||||
|
/// equals `portionsRequested`.
|
||||||
portions Int
|
portions Int
|
||||||
|
/// How many portions this slot must actually feed. For a fresh item
|
||||||
|
/// (`sourcePlanningItemId` null), `<= portions` — the gap is this item's
|
||||||
|
/// leftover pool. For a "leftovers" item, always `== portions` (serving
|
||||||
|
/// leftovers prepares nothing new, so it can't generate more — no
|
||||||
|
/// leftovers-on-leftovers).
|
||||||
|
portionsRequested Int @map("portions_requested")
|
||||||
|
/// Non-null only on a "leftovers" item: the item whose leftover pool it
|
||||||
|
/// draws from. `onDelete: Cascade` — deleting the source item also
|
||||||
|
/// deletes everything served from its leftovers (same reasoning as the
|
||||||
|
/// existing `Planning` -> `PlanningItem` cascade).
|
||||||
|
sourcePlanningItemId Int? @map("source_planning_item_id")
|
||||||
|
/// Portions of *this* item's leftover pool explicitly thrown away (the
|
||||||
|
/// basket's "jeter" button). Always 0 on a "leftovers" item (its own
|
||||||
|
/// pool is null by construction).
|
||||||
|
discardedPortions Int @default(0) @map("discarded_portions")
|
||||||
/// See `Planning.createdAt` — same admin-metrics-only timestamp.
|
/// See `Planning.createdAt` — same admin-metrics-only timestamp.
|
||||||
createdAt DateTime @default(now()) @map("created_at")
|
createdAt DateTime @default(now()) @map("created_at")
|
||||||
|
|
||||||
planning Planning @relation(fields: [planningId], references: [id], onDelete: Cascade)
|
planning Planning @relation(fields: [planningId], references: [id], onDelete: Cascade)
|
||||||
recipe Recipe @relation(fields: [recipeId], references: [id])
|
recipe Recipe @relation(fields: [recipeId], references: [id])
|
||||||
|
sourcePlanningItem PlanningItem? @relation("PlanningItemLeftoverSource", fields: [sourcePlanningItemId], references: [id], onDelete: Cascade)
|
||||||
|
/// The "leftovers" items served from this item's own pool — inverse of `sourcePlanningItem`.
|
||||||
|
leftoverUses PlanningItem[] @relation("PlanningItemLeftoverSource")
|
||||||
|
|
||||||
@@map("planning_item")
|
@@map("planning_item")
|
||||||
}
|
}
|
||||||
|
|
@ -346,7 +377,6 @@ model Recipe {
|
||||||
steps Step[]
|
steps Step[]
|
||||||
planningItems PlanningItem[]
|
planningItems PlanningItem[]
|
||||||
favoritedBy RecipeFavorite[]
|
favoritedBy RecipeFavorite[]
|
||||||
diets RecipeDiet[]
|
|
||||||
|
|
||||||
@@unique([sourceId, externalId])
|
@@unique([sourceId, externalId])
|
||||||
@@map("recipe")
|
@@map("recipe")
|
||||||
|
|
@ -367,21 +397,6 @@ model RecipeFavorite {
|
||||||
@@map("recipe_favorite")
|
@@map("recipe_favorite")
|
||||||
}
|
}
|
||||||
|
|
||||||
/// Explicit join table for the recipe <-> diet "associated regime" tags
|
|
||||||
/// (e.g. a recipe can be tagged both `Végétarien` and `Sans gluten`) — a
|
|
||||||
/// manual reminder set by whoever creates/edits the recipe, not computed
|
|
||||||
/// from its ingredients.
|
|
||||||
model RecipeDiet {
|
|
||||||
recipeId Int @map("recipe_id")
|
|
||||||
dietId Int @map("diet_id")
|
|
||||||
|
|
||||||
recipe Recipe @relation(fields: [recipeId], references: [id], onDelete: Cascade)
|
|
||||||
diet Diet @relation(fields: [dietId], references: [id], onDelete: Cascade)
|
|
||||||
|
|
||||||
@@id([recipeId, dietId])
|
|
||||||
@@map("recipe_diet")
|
|
||||||
}
|
|
||||||
|
|
||||||
/// `key` is `@unique` — not in the original spec doc, added so the seed
|
/// `key` is `@unique` — not in the original spec doc, added so the seed
|
||||||
/// script (reference-seed-data.ts) can `upsert` by key and stay
|
/// script (reference-seed-data.ts) can `upsert` by key and stay
|
||||||
/// idempotent/safe to re-run, same reason as `Diet.key`/`Category.key`. A
|
/// idempotent/safe to re-run, same reason as `Diet.key`/`Category.key`. A
|
||||||
|
|
@ -669,14 +684,19 @@ model Unit {
|
||||||
/// quantity per recipe, so this join table carries quantity + unit
|
/// quantity per recipe, so this join table carries quantity + unit
|
||||||
/// (project decision, not in the original spec doc).
|
/// (project decision, not in the original spec doc).
|
||||||
model RecipeIngredient {
|
model RecipeIngredient {
|
||||||
recipeId Int @map("recipe_id")
|
recipeId Int @map("recipe_id")
|
||||||
ingredientId Int @map("ingredient_id")
|
ingredientId Int @map("ingredient_id")
|
||||||
quantity Decimal @db.Decimal(10, 2)
|
/// `null` (with `unitId` also `null`) = a "selon le goût" seasoning line —
|
||||||
unitId Int @map("unit_id")
|
/// salt, pepper… added to taste, with nothing to scale by portions or to
|
||||||
|
/// aggregate on a shopping list. The "both null or neither" invariant is
|
||||||
|
/// enforced service-side (and by `recipeIngredientInputSchema`), not by
|
||||||
|
/// the schema — same posture as this file's other cross-field invariants.
|
||||||
|
quantity Decimal? @db.Decimal(10, 2)
|
||||||
|
unitId Int? @map("unit_id")
|
||||||
|
|
||||||
recipe Recipe @relation(fields: [recipeId], references: [id], onDelete: Cascade)
|
recipe Recipe @relation(fields: [recipeId], references: [id], onDelete: Cascade)
|
||||||
ingredient Ingredient @relation(fields: [ingredientId], references: [id], onDelete: Cascade)
|
ingredient Ingredient @relation(fields: [ingredientId], references: [id], onDelete: Cascade)
|
||||||
unit Unit @relation(fields: [unitId], references: [id])
|
unit Unit? @relation(fields: [unitId], references: [id])
|
||||||
|
|
||||||
@@id([recipeId, ingredientId])
|
@@id([recipeId, ingredientId])
|
||||||
@@map("recipe_ingredient")
|
@@map("recipe_ingredient")
|
||||||
|
|
@ -701,6 +721,33 @@ model TechStep {
|
||||||
id Int @id @default(autoincrement())
|
id Int @id @default(autoincrement())
|
||||||
key String @unique
|
key String @unique
|
||||||
|
|
||||||
|
/// `true` = a "placeholder" technique: a free-text technique a user typed
|
||||||
|
/// while correcting a step, because nothing in the seeded catalog matched
|
||||||
|
/// (issue #131 for the ingredient precedent this mirrors — see
|
||||||
|
/// `Ingredient.isPlaceholder`). Such a row has `displayName` non-null, a
|
||||||
|
/// generated `key` (`placeholder:<uuid>`, never an i18n label), no
|
||||||
|
/// training data of its own, and is excluded from
|
||||||
|
/// `GET /reference/tech-steps`. It is still referenced by `StepTechStep`
|
||||||
|
/// like any other technique (the correction that created it applies
|
||||||
|
/// immediately), but a maintainer reviews it at
|
||||||
|
/// `/admin/catalogue` (Techniques tab) and promotes it into the real
|
||||||
|
/// catalog by hand (`reference-seed-data.ts` + `tech-step-training-data.ts`).
|
||||||
|
isPlaceholder Boolean @default(false) @map("is_placeholder")
|
||||||
|
/// The exact text the user typed — `null` for a real catalog row (whose
|
||||||
|
/// label lives in i18n under `catalog.techSteps.<key>`). Non-null iff
|
||||||
|
/// `isPlaceholder`, enforced service-side.
|
||||||
|
displayName String? @map("display_name")
|
||||||
|
/// Profile that first proposed this technique — context for the admin
|
||||||
|
/// review. `onDelete: SetNull` so deleting an account never blocks on the
|
||||||
|
/// recipes still using its placeholder. `null` for a real catalog row.
|
||||||
|
createdById Int? @map("created_by_id")
|
||||||
|
/// When this placeholder was proposed. `null` for a real catalog row.
|
||||||
|
createdAt DateTime? @map("created_at")
|
||||||
|
/// Stamped once a maintainer has triaged this proposal
|
||||||
|
/// (`PATCH /admin/api/catalog/tech-step-placeholders/mark-reviewed`).
|
||||||
|
/// `null` while pending / for a real catalog row.
|
||||||
|
reviewedAt DateTime? @map("reviewed_at")
|
||||||
|
|
||||||
steps StepTechStep[]
|
steps StepTechStep[]
|
||||||
/// Corrections where this technique was the *previous* (possibly wrong)
|
/// Corrections where this technique was the *previous* (possibly wrong)
|
||||||
/// match — see `StepTechStepCorrection.previousTechStepId`.
|
/// match — see `StepTechStepCorrection.previousTechStepId`.
|
||||||
|
|
@ -711,7 +758,10 @@ model TechStep {
|
||||||
/// Training-corpus suggestions targeting this technique — see
|
/// Training-corpus suggestions targeting this technique — see
|
||||||
/// `TechStepTrainingSuggestion`.
|
/// `TechStepTrainingSuggestion`.
|
||||||
trainingSuggestions TechStepTrainingSuggestion[]
|
trainingSuggestions TechStepTrainingSuggestion[]
|
||||||
|
/// The profile that proposed this row when it is a placeholder — see `createdById`.
|
||||||
|
createdBy UserProfile? @relation("TechStepPlaceholderCreator", fields: [createdById], references: [id], onDelete: SetNull)
|
||||||
|
|
||||||
|
@@index([isPlaceholder])
|
||||||
@@map("tech_step")
|
@@map("tech_step")
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -810,6 +860,9 @@ model StepTechStep {
|
||||||
/// Utensils mentioned in the same clause as this technique occurrence —
|
/// Utensils mentioned in the same clause as this technique occurrence —
|
||||||
/// see `StepTechStepUtensil`.
|
/// see `StepTechStepUtensil`.
|
||||||
utensils StepTechStepUtensil[]
|
utensils StepTechStepUtensil[]
|
||||||
|
/// Temperatures mentioned in the same clause as this technique occurrence
|
||||||
|
/// — see `StepTechStepTemperature`.
|
||||||
|
temperatures StepTechStepTemperature[]
|
||||||
|
|
||||||
@@id([stepId, order])
|
@@id([stepId, order])
|
||||||
@@map("step_tech_step")
|
@@map("step_tech_step")
|
||||||
|
|
@ -868,6 +921,38 @@ model StepTechStepUtensil {
|
||||||
@@map("step_tech_step_utensil")
|
@@map("step_tech_step_utensil")
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// A temperature mention found in the same *clause* as one `StepTechStep`
|
||||||
|
/// occurrence — same association rule as `StepTechStepIngredient` /
|
||||||
|
/// `StepTechStepUtensil` (see their doc comments). Detected by
|
||||||
|
/// `services/tech-step-intent-service`'s regex pass (`temperature_extraction.py`),
|
||||||
|
/// not a `PhraseMatcher` — a temperature is numeric/pattern, not a word from
|
||||||
|
/// a finite vocabulary. Carries no foreign key: the structured value *is*
|
||||||
|
/// the data. At least one of `celsius` / `gasMark` / `qualitative` is
|
||||||
|
/// non-null:
|
||||||
|
/// - `celsius` — an oven/pan temperature in °C (a °F mention is
|
||||||
|
/// converted + rounded upstream).
|
||||||
|
/// - `gasMark` — a gas-mark / thermostat number ("th. 6").
|
||||||
|
/// - `qualitative` — "low" | "medium" | "high" ("feu doux/moyen/vif").
|
||||||
|
/// `raw` is the exact recognized fragment, `start`/`end` its span in
|
||||||
|
/// `Step.description` ([start, end), same as `StepTechStep.start`/`end`).
|
||||||
|
/// `source` mirrors the others (`"auto"` only today — no correction UI).
|
||||||
|
model StepTechStepTemperature {
|
||||||
|
id Int @id @default(autoincrement())
|
||||||
|
stepId Int @map("step_id")
|
||||||
|
techStepOrder Int @map("tech_step_order")
|
||||||
|
start Int
|
||||||
|
end Int
|
||||||
|
celsius Decimal? @db.Decimal(6, 2)
|
||||||
|
gasMark Int? @map("gas_mark")
|
||||||
|
qualitative String?
|
||||||
|
raw String
|
||||||
|
source String @default("auto")
|
||||||
|
|
||||||
|
stepTechStep StepTechStep @relation(fields: [stepId, techStepOrder], references: [stepId, order], onDelete: Cascade)
|
||||||
|
|
||||||
|
@@map("step_tech_step_temperature")
|
||||||
|
}
|
||||||
|
|
||||||
/// One user-submitted correction to a `Step`'s detected techniques —
|
/// One user-submitted correction to a `Step`'s detected techniques —
|
||||||
/// captures ADD (a missing technique the classifier didn't find),
|
/// captures ADD (a missing technique the classifier didn't find),
|
||||||
/// REMOVE (a wrong technique it did), or RELABEL (both) as a single shape:
|
/// REMOVE (a wrong technique it did), or RELABEL (both) as a single shape:
|
||||||
|
|
@ -932,7 +1017,7 @@ model StepTechStepCorrection {
|
||||||
///
|
///
|
||||||
/// `suggestedSynonyms`/`suggestedUtterances` are native Postgres arrays
|
/// `suggestedSynonyms`/`suggestedUtterances` are native Postgres arrays
|
||||||
/// (`String[]`), not a join table — unlike this schema's other list-shaped
|
/// (`String[]`), not a join table — unlike this schema's other list-shaped
|
||||||
/// data (`RecipeDiet`, `UserProfileAllergy`...), these strings are free text
|
/// data (`RecipeIngredient`, `UserProfileAllergy`...), these strings are free text
|
||||||
/// proposed once for a human to read, not ids referencing another catalog
|
/// proposed once for a human to read, not ids referencing another catalog
|
||||||
/// table, so there's nothing for a join table to normalize against.
|
/// table, so there's nothing for a join table to normalize against.
|
||||||
model TechStepTrainingSuggestion {
|
model TechStepTrainingSuggestion {
|
||||||
|
|
@ -1029,3 +1114,145 @@ model WorkerHeartbeat {
|
||||||
|
|
||||||
@@map("worker_heartbeats")
|
@@map("worker_heartbeats")
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// Idempotency ledger for one-time data backfills run from the production
|
||||||
|
/// image's start command (`src/scripts/backfill-runtime.ts`, invoked in
|
||||||
|
/// apps/api/Dockerfile's CMD after `prisma migrate deploy` + `seed-runtime`).
|
||||||
|
///
|
||||||
|
/// The CMD re-runs on every container start, but a backfill here *rewrites*
|
||||||
|
/// existing rows (unlike `seed-runtime`, which only upserts and is safe to
|
||||||
|
/// repeat) — e.g. `step_tech_step_metadata_20260904` recomputes every
|
||||||
|
/// `StepTechStep` sequence against the intent service. So each backfill
|
||||||
|
/// gates itself on a row in this table: `key` present → already done, skip;
|
||||||
|
/// absent → run it, then insert the row. A schema migration only ever
|
||||||
|
/// creates the table structure; it can't run TypeScript against the intent
|
||||||
|
/// service, which is why this is a start-command step and not a migration.
|
||||||
|
model BackfillState {
|
||||||
|
key String @id
|
||||||
|
completedAt DateTime @default(now()) @map("completed_at")
|
||||||
|
|
||||||
|
@@map("backfill_state")
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Catalogue des cibles de surlignage valides pour un didacticiel guidé —
|
||||||
|
/// même esprit que `TechStep`/`Unit`/`Diet` : une valeur de référence
|
||||||
|
/// maintenue par le code, seedée (`reference-seed-data.ts`). Chaque `key`
|
||||||
|
/// correspond à un attribut `data-tour-<key>` réellement posé quelque part
|
||||||
|
/// dans le frontend ; un admin choisit parmi ces cibles en construisant un
|
||||||
|
/// scénario, il ne peut pas en inventer une (poser un nouveau `data-tour-*`
|
||||||
|
/// reste un changement de code + une ligne seedée ici). Voir issues #42/#44.
|
||||||
|
model TourTarget {
|
||||||
|
key String @id
|
||||||
|
/// Libellé pour aider l'admin à choisir dans le formulaire, ex.
|
||||||
|
/// "Bouton + d'un créneau du planning".
|
||||||
|
description String
|
||||||
|
|
||||||
|
steps TourScenarioStep[]
|
||||||
|
|
||||||
|
@@map("tour_target")
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Un scénario de didacticiel — une séquence d'étapes surlignées, rejouable
|
||||||
|
/// et éditable depuis l'admin (#44). `key` est une clé stable (comme
|
||||||
|
/// `Diet.key`/`Source.key`) : `"general"` / `"techStepMetadata"` pour les
|
||||||
|
/// deux scénarios seedés, libre pour un scénario créé par un admin.
|
||||||
|
model TourScenario {
|
||||||
|
id Int @id @default(autoincrement())
|
||||||
|
key String @unique
|
||||||
|
/// Libellé admin, ex. "Tour d'orientation".
|
||||||
|
name String
|
||||||
|
/// Désactiver sans supprimer — `GET /reference/tours` ne renvoie que les
|
||||||
|
/// scénarios activés.
|
||||||
|
enabled Boolean @default(true)
|
||||||
|
createdAt DateTime @default(now()) @map("created_at")
|
||||||
|
updatedAt DateTime @updatedAt @map("updated_at")
|
||||||
|
|
||||||
|
steps TourScenarioStep[]
|
||||||
|
progress TourProgress[]
|
||||||
|
|
||||||
|
@@map("tour_scenario")
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Une étape d'un scénario : (si `route` est défini) navigue vers cette
|
||||||
|
/// route, puis surligne l'élément portant `data-tour-<targetKey>` avec un
|
||||||
|
/// popover `title`/`content`. `title`/`content` sont du **texte libre**
|
||||||
|
/// saisi par l'admin, pas des clés i18n (#44 : le chrome de l'UI vient
|
||||||
|
/// d'i18next, le contenu administré dynamiquement est du texte, comme le
|
||||||
|
/// nom d'une recette).
|
||||||
|
model TourScenarioStep {
|
||||||
|
id Int @id @default(autoincrement())
|
||||||
|
scenarioId Int @map("scenario_id")
|
||||||
|
order Int
|
||||||
|
/// Route React Router à ouvrir avant cette étape ; `null` = rester sur la
|
||||||
|
/// route de l'étape précédente.
|
||||||
|
route String?
|
||||||
|
targetKey String @map("target_key")
|
||||||
|
title String
|
||||||
|
content String
|
||||||
|
|
||||||
|
scenario TourScenario @relation(fields: [scenarioId], references: [id], onDelete: Cascade)
|
||||||
|
target TourTarget @relation(fields: [targetKey], references: [key])
|
||||||
|
|
||||||
|
@@unique([scenarioId, order])
|
||||||
|
@@map("tour_scenario_step")
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Présence d'une ligne = ce profil a *vu* ce scénario. Le terminer **ou**
|
||||||
|
/// le passer volontairement crée la ligne (pas de re-nag après un skip
|
||||||
|
/// délibéré). Révise la version de #42 (`tourKey: String` libre) en une
|
||||||
|
/// vraie FK vers `TourScenario` (#44).
|
||||||
|
model TourProgress {
|
||||||
|
userProfileId Int @map("user_profile_id")
|
||||||
|
scenarioId Int @map("scenario_id")
|
||||||
|
completedAt DateTime @default(now()) @map("completed_at")
|
||||||
|
|
||||||
|
userProfile UserProfile @relation(fields: [userProfileId], references: [id], onDelete: Cascade)
|
||||||
|
scenario TourScenario @relation(fields: [scenarioId], references: [id], onDelete: Cascade)
|
||||||
|
|
||||||
|
@@id([userProfileId, scenarioId])
|
||||||
|
@@map("tour_progress")
|
||||||
|
}
|
||||||
|
|
||||||
|
// -----------------------------------------------------------------------------
|
||||||
|
// Contact
|
||||||
|
// In-app "report a bug / suggestion" form — user-submitted, read-only for
|
||||||
|
// admins at /admin/messages. See issues #80 (this) and #81 (turn a message
|
||||||
|
// into a Forgejo issue).
|
||||||
|
// -----------------------------------------------------------------------------
|
||||||
|
|
||||||
|
/// A message sent via the app's contact form (bug, suggestion, other).
|
||||||
|
/// Written once by a signed-in user, never edited afterwards — consulted
|
||||||
|
/// read-only from the admin app. `authorId` is nullable + `onDelete: SetNull`
|
||||||
|
/// (same choice as `Ingredient.createdById`): a bug report keeps its value
|
||||||
|
/// even if the account that sent it is deleted in the meantime.
|
||||||
|
model ContactMessage {
|
||||||
|
id Int @id @default(autoincrement())
|
||||||
|
authorId Int? @map("author_id")
|
||||||
|
/// "bug" | "suggestion" | "other" — a plain `String` backed by the shared
|
||||||
|
/// `CONTACT_MESSAGE_TYPES` const (same approach as
|
||||||
|
/// `TechStepTrainingSuggestion.status` / `AnalyticsEvent.type`): adding a
|
||||||
|
/// value is one line, no Postgres enum migration.
|
||||||
|
type String
|
||||||
|
message String
|
||||||
|
/// Technical context captured automatically at submit time, for triage —
|
||||||
|
/// all nullable (an older client, or a direct API call, can omit them).
|
||||||
|
pageUrl String? @map("page_url")
|
||||||
|
userAgent String? @map("user_agent")
|
||||||
|
appVersion String? @map("app_version")
|
||||||
|
createdAt DateTime @default(now()) @map("created_at")
|
||||||
|
|
||||||
|
/// Number of the Forgejo issue an admin created from this message via
|
||||||
|
/// `/admin/messages` (issue #81). `null` = no ticket yet. Non-null ⇒ the
|
||||||
|
/// "Créer un ticket" button disappears (one message links to at most one
|
||||||
|
/// issue).
|
||||||
|
forgejoIssueNumber Int? @map("forgejo_issue_number")
|
||||||
|
/// The issue's html URL (`<base>/<owner>/<repo>/issues/<n>`) — stored
|
||||||
|
/// as-is rather than rebuilt from `FORGEJO_*` config, so the link stays
|
||||||
|
/// correct even if that config changes later.
|
||||||
|
forgejoIssueUrl String? @map("forgejo_issue_url")
|
||||||
|
|
||||||
|
author UserProfile? @relation(fields: [authorId], references: [id], onDelete: SetNull)
|
||||||
|
|
||||||
|
@@index([createdAt])
|
||||||
|
@@map("contact_message")
|
||||||
|
}
|
||||||
|
|
|
||||||
|
|
@ -7,9 +7,11 @@ import { errorLogger } from "./middlewares/error-logger.js";
|
||||||
import { requestLogger } from "./middlewares/request-logger.js";
|
import { requestLogger } from "./middlewares/request-logger.js";
|
||||||
import { adminRouter } from "./modules/admin/admin.routes.js";
|
import { adminRouter } from "./modules/admin/admin.routes.js";
|
||||||
import { authRouter } from "./modules/auth/auth.routes.js";
|
import { authRouter } from "./modules/auth/auth.routes.js";
|
||||||
|
import { contactRouter } from "./modules/contact/contact.routes.js";
|
||||||
import { cookingSessionRouter } from "./modules/cooking-session/cooking-session.routes.js";
|
import { cookingSessionRouter } from "./modules/cooking-session/cooking-session.routes.js";
|
||||||
import { houseRouter } from "./modules/house/house.routes.js";
|
import { houseRouter } from "./modules/house/house.routes.js";
|
||||||
import { techStepWorkerRouter } from "./modules/internal/tech-step-worker.routes.js";
|
import { techStepWorkerRouter } from "./modules/internal/tech-step-worker.routes.js";
|
||||||
|
import { mobileRouter } from "./modules/mobile/mobile.routes.js";
|
||||||
import { planningRouter } from "./modules/planning/planning.routes.js";
|
import { planningRouter } from "./modules/planning/planning.routes.js";
|
||||||
import { preferencesRouter } from "./modules/preferences/preferences.routes.js";
|
import { preferencesRouter } from "./modules/preferences/preferences.routes.js";
|
||||||
import { profileRouter } from "./modules/profile/profile.routes.js";
|
import { profileRouter } from "./modules/profile/profile.routes.js";
|
||||||
|
|
@ -34,26 +36,45 @@ export function createServer(): ExpressServer {
|
||||||
// pipeline (its "finish" listener still fires for a request that never
|
// pipeline (its "finish" listener still fires for a request that never
|
||||||
// makes it past CORS/body-parsing, not just ones that reach a route).
|
// makes it past CORS/body-parsing, not just ones that reach a route).
|
||||||
server.addMiddleware(requestLogger);
|
server.addMiddleware(requestLogger);
|
||||||
// Two allowed origins: the main app (`CORS_ORIGIN`) and the separate
|
// Allowed origin(s) come from `CORS_ORIGIN` (see its own doc comment in
|
||||||
// admin app (`ADMIN_CORS_ORIGIN`). The `cors` package matches an incoming
|
// config/env.ts for why the packaged Android app's origin must always be
|
||||||
// `Origin` against any entry of the list.
|
// one of them). The admin surface (`/admin/*`) is served by this same API
|
||||||
server.setupCore({ corsOrigin: [env.CORS_ORIGIN, env.ADMIN_CORS_ORIGIN] });
|
// and consumed by `apps/web`'s own `/admin/*` routes — same origin as the
|
||||||
|
// rest of the app, so no extra CORS entry.
|
||||||
|
server.setupCore({ corsOrigin: env.CORS_ORIGIN });
|
||||||
|
|
||||||
server.addRoute("get", "/health", (_req: Request, res: Response) => {
|
server.addRoute("get", "/health", (_req: Request, res: Response) => {
|
||||||
res.status(200).json({ status: "ok" });
|
res.status(200).json({ status: "ok" });
|
||||||
});
|
});
|
||||||
|
|
||||||
server.mountRouter("/auth", authRouter);
|
server.mountRouter("/auth", authRouter);
|
||||||
// Admin application surface (`apps/admin-web`) — its own auth
|
// Admin application surface — its own auth (`requireAdmin`, distinct
|
||||||
// (`requireAdmin`, distinct cookie/secret), never the end-user session.
|
// cookie/secret), never the end-user session. Mounted at `/admin/api`,
|
||||||
server.mountRouter("/admin", adminRouter);
|
// *not* bare `/admin`: apps/web's own admin pages live at `/admin/*` too
|
||||||
|
// (`/admin/monitoring`, `/admin/login`...), and this API is served from
|
||||||
|
// the same origin/process as that frontend (see `serveStaticFrontend`
|
||||||
|
// below). A bare `/admin` mount put `GET /admin/monitoring` (API) and the
|
||||||
|
// page route `/admin/monitoring` in direct conflict — Express matches by
|
||||||
|
// path alone, so a hard navigation/refresh on that page was answered by
|
||||||
|
// this router's own handler (raw JSON) instead of falling through to the
|
||||||
|
// SPA's `index.html`. The `/api` segment guarantees no current or future
|
||||||
|
// admin page path can ever collide with an admin API path again.
|
||||||
|
server.mountRouter("/admin/api", adminRouter);
|
||||||
server.mountRouter("/house", houseRouter);
|
server.mountRouter("/house", houseRouter);
|
||||||
|
// In-app "signaler un bug / suggestion" form (issue #80) — session
|
||||||
|
// required, one POST. Admins read these rows via `/admin/api/contact`,
|
||||||
|
// never this router.
|
||||||
|
server.mountRouter("/contact", contactRouter);
|
||||||
// Not user-facing — `services/tech-step-llm-worker` only, guarded by
|
// Not user-facing — `services/tech-step-llm-worker` only, guarded by
|
||||||
// `requireInternalWorker` on every route within (see that router's own
|
// `requireInternalWorker` on every route within (see that router's own
|
||||||
// doc comment), never `requireAuth`. Mounted alongside the other routers
|
// doc comment), never `requireAuth`. Mounted alongside the other routers
|
||||||
// rather than nested under one of them since it isn't scoped to a single
|
// rather than nested under one of them since it isn't scoped to a single
|
||||||
// recipe/step the way `recipeRouter`'s own correction routes are.
|
// recipe/step the way `recipeRouter`'s own correction routes are.
|
||||||
server.mountRouter("/internal/tech-steps", techStepWorkerRouter);
|
server.mountRouter("/internal/tech-steps", techStepWorkerRouter);
|
||||||
|
// Public proxy for Forgejo's Releases API (issues #65/#66) — see
|
||||||
|
// mobile.service.ts's doc comment for why this can't just be called
|
||||||
|
// directly from the browser.
|
||||||
|
server.mountRouter("/mobile", mobileRouter);
|
||||||
server.mountRouter("/planning", planningRouter);
|
server.mountRouter("/planning", planningRouter);
|
||||||
server.mountRouter("/preferences", preferencesRouter);
|
server.mountRouter("/preferences", preferencesRouter);
|
||||||
server.mountRouter("/profile", profileRouter);
|
server.mountRouter("/profile", profileRouter);
|
||||||
|
|
|
||||||
|
|
@ -13,12 +13,26 @@ import { z } from "zod";
|
||||||
// separate test database this now requires.
|
// separate test database this now requires.
|
||||||
dotenv.config({ path: process.env.NODE_ENV === "test" ? ".env.test" : ".env" });
|
dotenv.config({ path: process.env.NODE_ENV === "test" ? ".env.test" : ".env" });
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Treats a blank env var (`FOO=`) as unset. `docker-compose.yml` passes
|
||||||
|
* every optional var through as `${FOO:-}`, which resolves to `""` (not an
|
||||||
|
* absent key) when the stack's `.env` leaves it empty — and a `.env` file
|
||||||
|
* is `.dockerignore`d, so that passthrough is the container's only source
|
||||||
|
* of these. Fields that must *fail closed* on a blank value rather than run
|
||||||
|
* their own format check against `""` (and crash `parse()` at boot) wrap
|
||||||
|
* their schema in this. Used for the `FORGEJO_*` trio below; `COOKIE_SECURE`
|
||||||
|
* folds the same `"" -> undefined` step into its own `.transform`.
|
||||||
|
*/
|
||||||
|
const blankAsUnset = (value: unknown): unknown => (value === "" ? undefined : value);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Schema for every environment variable the API reads. Parsing (below)
|
* Schema for every environment variable the API reads. Parsing (below)
|
||||||
* fails fast at startup if something required is missing/invalid, instead
|
* fails fast at startup if something required is missing/invalid, instead
|
||||||
* of surfacing as a confusing runtime error later.
|
* of surfacing as a confusing runtime error later. Exported so the parsing
|
||||||
|
* rules (e.g. `blankAsUnset` on the `FORGEJO_*` trio) can be unit-tested
|
||||||
|
* without the process-wide `process.env` the singleton below parses.
|
||||||
*/
|
*/
|
||||||
const envSchema = z.object({
|
export const envSchema = z.object({
|
||||||
/** Runtime mode — also toggles test-only behavior (e.g. cheaper argon2 cost, see auth.service.ts). */
|
/** Runtime mode — also toggles test-only behavior (e.g. cheaper argon2 cost, see auth.service.ts). */
|
||||||
NODE_ENV: z.enum(["development", "test", "production"]).default("development"),
|
NODE_ENV: z.enum(["development", "test", "production"]).default("development"),
|
||||||
/** Port the HTTP server listens on. */
|
/** Port the HTTP server listens on. */
|
||||||
|
|
@ -34,8 +48,42 @@ const envSchema = z.object({
|
||||||
JWT_EXPIRES_IN: z.string().default("7d"),
|
JWT_EXPIRES_IN: z.string().default("7d"),
|
||||||
/** Name of the httpOnly cookie carrying the session JWT. */
|
/** Name of the httpOnly cookie carrying the session JWT. */
|
||||||
AUTH_COOKIE_NAME: z.string().default("session"),
|
AUTH_COOKIE_NAME: z.string().default("session"),
|
||||||
/** Origin allowed by CORS — must match wherever apps/web is served from. */
|
/**
|
||||||
CORS_ORIGIN: z.string().default("http://localhost:5173"),
|
* Origin(s) allowed by CORS, comma-separated — parsed below into a
|
||||||
|
* `string[]` for `ExpressServerCoreOptions.corsOrigin`
|
||||||
|
* (`app.ts`/`express-server.ts`, which passes it straight to the `cors`
|
||||||
|
* package) and reused as-is for the Socket.IO handshake's own CORS config
|
||||||
|
* (`server.ts`, which needs its own since the WS upgrade never runs
|
||||||
|
* through `setupCore`'s middleware).
|
||||||
|
*
|
||||||
|
* Must always include `https://localhost`: the packaged Android app's
|
||||||
|
* WebView is served from exactly that fixed origin (Capacitor's default
|
||||||
|
* for `androidScheme`/hostname — see `apps/web/capacitor.config.ts`'s own
|
||||||
|
* doc comment), and every request it makes to this API — `/auth/login`
|
||||||
|
* and `/auth/signup` included — is genuinely cross-origin, unlike
|
||||||
|
* apps/web's *browser* build, which is served from the very same origin
|
||||||
|
* as this API in production (see docker-compose.yml's `app` service) and
|
||||||
|
* so never needs an entry here at all. Missing this origin doesn't fail
|
||||||
|
* loudly: the `cors` package still answers a preflight `OPTIONS` with 204
|
||||||
|
* for an origin it's about to reject (it only *omits*
|
||||||
|
* `Access-Control-Allow-Origin`), so the request the app's WebView logs
|
||||||
|
* looks identical to a normal one right up until the browser silently
|
||||||
|
* drops the real `POST` — surfacing client-side as a generic "unexpected
|
||||||
|
* error" with no 401/403 anywhere to point at the actual cause. Default
|
||||||
|
* covers both the Vite dev server and the packaged app out of the box; a
|
||||||
|
* real deployment's own web origin (e.g. a production domain) never needs
|
||||||
|
* adding here for the reason above, but the env var still allows
|
||||||
|
* extending/overriding this list (comma-separated) if that ever changes.
|
||||||
|
*/
|
||||||
|
CORS_ORIGIN: z
|
||||||
|
.string()
|
||||||
|
.default("http://localhost:5173,https://localhost")
|
||||||
|
.transform((value) =>
|
||||||
|
value
|
||||||
|
.split(",")
|
||||||
|
.map((origin) => origin.trim())
|
||||||
|
.filter((origin) => origin.length > 0),
|
||||||
|
),
|
||||||
/**
|
/**
|
||||||
* Absolute path to the built frontend (`apps/web/dist`), to serve
|
* Absolute path to the built frontend (`apps/web/dist`), to serve
|
||||||
* alongside the API. Optional, no default — only set inside the
|
* alongside the API. Optional, no default — only set inside the
|
||||||
|
|
@ -105,12 +153,30 @@ const envSchema = z.object({
|
||||||
.optional(),
|
.optional(),
|
||||||
/** Name of the httpOnly cookie carrying the admin session JWT — must differ from `AUTH_COOKIE_NAME` so the two sessions coexist in one browser. */
|
/** Name of the httpOnly cookie carrying the admin session JWT — must differ from `AUTH_COOKIE_NAME` so the two sessions coexist in one browser. */
|
||||||
ADMIN_COOKIE_NAME: z.string().default("admin_session"),
|
ADMIN_COOKIE_NAME: z.string().default("admin_session"),
|
||||||
/** Origin `apps/admin-web` is served from — added to the CORS allow-list alongside `CORS_ORIGIN`. */
|
|
||||||
ADMIN_CORS_ORIGIN: z.string().default("http://localhost:5174"),
|
|
||||||
/** Optional seed values read by `src/scripts/create-admin.ts` when its `--email`/`--password`/`--name` flags are omitted — never used by the running server. */
|
/** Optional seed values read by `src/scripts/create-admin.ts` when its `--email`/`--password`/`--name` flags are omitted — never used by the running server. */
|
||||||
ADMIN_INITIAL_EMAIL: z.string().optional(),
|
ADMIN_INITIAL_EMAIL: z.string().optional(),
|
||||||
ADMIN_INITIAL_PASSWORD: z.string().optional(),
|
ADMIN_INITIAL_PASSWORD: z.string().optional(),
|
||||||
ADMIN_INITIAL_NAME: z.string().optional(),
|
ADMIN_INITIAL_NAME: z.string().optional(),
|
||||||
|
/**
|
||||||
|
* Forgejo instance + credentials for "create an issue from a contact
|
||||||
|
* message" (`/admin/messages`, issue #81). All three `.optional()` and
|
||||||
|
* checked together by `ForgejoService.isConfigured()` — the feature
|
||||||
|
* **fails closed** when any is missing: the endpoint answers `503` and
|
||||||
|
* the admin UI hides the button (same posture as `ADMIN_JWT_SECRET` /
|
||||||
|
* `INTERNAL_WORKER_SECRET`). Only this one admin action reads them; the
|
||||||
|
* rest of the app never talks to Forgejo.
|
||||||
|
*/
|
||||||
|
FORGEJO_BASE_URL: z.preprocess(blankAsUnset, z.string().url().optional()),
|
||||||
|
/** Forgejo personal access token with the `write:issue` (or `issue`) scope. Secret — `.env.example` shows only a `changeme`. */
|
||||||
|
FORGEJO_TOKEN: z.preprocess(blankAsUnset, z.string().optional()),
|
||||||
|
/** Target repo as `owner/repo` (e.g. `kyuno/batchCooking`) — issues are always created here, never a repo chosen at call time. */
|
||||||
|
FORGEJO_REPO: z.preprocess(
|
||||||
|
blankAsUnset,
|
||||||
|
z
|
||||||
|
.string()
|
||||||
|
.regex(/^[^/\s]+\/[^/\s]+$/, "FORGEJO_REPO must look like 'owner/repo'")
|
||||||
|
.optional(),
|
||||||
|
),
|
||||||
});
|
});
|
||||||
|
|
||||||
/** Parsed, validated environment — import this instead of reading `process.env` directly anywhere else. */
|
/** Parsed, validated environment — import this instead of reading `process.env` directly anywhere else. */
|
||||||
|
|
|
||||||
|
|
@ -191,6 +191,114 @@ export const UTENSILS: string[] = [
|
||||||
"mandoline",
|
"mandoline",
|
||||||
];
|
];
|
||||||
|
|
||||||
|
// Guided-tour highlight targets (issues #42/#44). Each `key` is the suffix
|
||||||
|
// of a `data-tour-<key>` attribute the frontend puts on the element the
|
||||||
|
// tour points at; `description` is the hint an admin sees when picking a
|
||||||
|
// target in the scenario editor. Reference data maintained here, like
|
||||||
|
// `TECH_STEPS`/`UTENSILS` — adding a real new target needs a frontend
|
||||||
|
// `data-tour-*` *and* a line here.
|
||||||
|
export const TOUR_TARGETS: Array<{ key: string; description: string }> = [
|
||||||
|
{ key: "nav-planning", description: "Lien « Planning » de la barre latérale" },
|
||||||
|
{ key: "nav-recipes", description: "Lien « Recettes » de la barre latérale" },
|
||||||
|
{ key: "nav-shopping-list", description: "Lien « Liste de courses » de la barre latérale" },
|
||||||
|
{ key: "planning-grid", description: "La grille du planning de la semaine" },
|
||||||
|
{ key: "planning-add-recipe", description: "Bouton « + » d'un créneau du planning" },
|
||||||
|
{ key: "planning-cook-button", description: "Bouton « Cuisiner » de l'en-tête du planning" },
|
||||||
|
{ key: "shopping-list-summary", description: "La liste de courses générée pour la semaine" },
|
||||||
|
{
|
||||||
|
key: "techstep-description",
|
||||||
|
description: "Le texte d'une étape de recette, avec les techniques surlignées",
|
||||||
|
},
|
||||||
|
{
|
||||||
|
key: "techstep-technique-picker",
|
||||||
|
description: "Le sélecteur de technique du popover de correction",
|
||||||
|
},
|
||||||
|
];
|
||||||
|
|
||||||
|
// The two tours filed in issue #42, as the DB-backed scenarios #44 defines.
|
||||||
|
// Only *created* if absent (an admin owns name/enabled/steps afterwards —
|
||||||
|
// see `seedTourScenarios`); `content`/`title` are plain French text, not
|
||||||
|
// i18n keys (#44). The second tour is deliberately short for now — issue
|
||||||
|
// #36 (correction popover closes mid-selection) is still open, so v1 only
|
||||||
|
// covers the gestures that already work (select text, pick a technique).
|
||||||
|
export const TOUR_SCENARIOS: Array<{
|
||||||
|
key: string;
|
||||||
|
name: string;
|
||||||
|
steps: Array<{ route: string | null; targetKey: string; title: string; content: string }>;
|
||||||
|
}> = [
|
||||||
|
{
|
||||||
|
key: "general",
|
||||||
|
name: "Tour d'orientation",
|
||||||
|
steps: [
|
||||||
|
{
|
||||||
|
route: "/",
|
||||||
|
targetKey: "nav-planning",
|
||||||
|
title: "Votre semaine, ici",
|
||||||
|
content: "Le planning est votre point de départ : ce que vous mangez, jour par jour.",
|
||||||
|
},
|
||||||
|
{
|
||||||
|
route: null,
|
||||||
|
targetKey: "nav-recipes",
|
||||||
|
title: "Vos recettes",
|
||||||
|
content:
|
||||||
|
"Retrouvez vos recettes, importez-en depuis d'autres sites, et filtrez selon vos préférences.",
|
||||||
|
},
|
||||||
|
{
|
||||||
|
route: null,
|
||||||
|
targetKey: "nav-shopping-list",
|
||||||
|
title: "La liste de courses",
|
||||||
|
content:
|
||||||
|
"Générée automatiquement à partir de tout ce que vous avez planifié pour la semaine.",
|
||||||
|
},
|
||||||
|
{
|
||||||
|
route: null,
|
||||||
|
targetKey: "planning-grid",
|
||||||
|
title: "Sept jours, cinq repas",
|
||||||
|
content: "Chaque case est un créneau. Ajoutez-y des recettes, ajustez les portions.",
|
||||||
|
},
|
||||||
|
{
|
||||||
|
route: null,
|
||||||
|
targetKey: "planning-add-recipe",
|
||||||
|
title: "Ajouter une recette",
|
||||||
|
content: "Ce bouton ouvre le sélecteur de recettes pour remplir un créneau.",
|
||||||
|
},
|
||||||
|
{
|
||||||
|
route: null,
|
||||||
|
targetKey: "planning-cook-button",
|
||||||
|
title: "Passer en cuisine",
|
||||||
|
content:
|
||||||
|
"Une fois la semaine planifiée, ce bouton réorganise tout en une séance de cuisine optimisée.",
|
||||||
|
},
|
||||||
|
{
|
||||||
|
route: "/liste-de-courses",
|
||||||
|
targetKey: "shopping-list-summary",
|
||||||
|
title: "Tout ce qu'il vous faut",
|
||||||
|
content: "Les ingrédients de toutes vos recettes de la semaine, regroupés et additionnés.",
|
||||||
|
},
|
||||||
|
],
|
||||||
|
},
|
||||||
|
{
|
||||||
|
key: "techStepMetadata",
|
||||||
|
name: "Corriger les techniques d'une recette",
|
||||||
|
steps: [
|
||||||
|
{
|
||||||
|
route: null,
|
||||||
|
targetKey: "techstep-description",
|
||||||
|
title: "Les techniques repérées",
|
||||||
|
content:
|
||||||
|
"Les mots surlignés sont des techniques de cuisson détectées automatiquement. Sélectionnez un passage pour le corriger.",
|
||||||
|
},
|
||||||
|
{
|
||||||
|
route: null,
|
||||||
|
targetKey: "techstep-technique-picker",
|
||||||
|
title: "Choisir la bonne technique",
|
||||||
|
content:
|
||||||
|
"Indiquez la technique correcte pour le passage sélectionné — la correction est immédiate.",
|
||||||
|
},
|
||||||
|
],
|
||||||
|
},
|
||||||
|
];
|
||||||
|
|
||||||
// The 14 allergens EU Regulation 1169/2011 (Annex II) requires food
|
// The 14 allergens EU Regulation 1169/2011 (Annex II) requires food
|
||||||
// businesses to declare — a standard, defensible reference list rather than
|
// businesses to declare — a standard, defensible reference list rather than
|
||||||
// an invented one. Split into ALLERGY (classic IgE-mediated immune
|
// an invented one. Split into ALLERGY (classic IgE-mediated immune
|
||||||
|
|
@ -1416,4 +1524,47 @@ export async function seedReferenceData(prisma: PrismaClient): Promise<void> {
|
||||||
if (dietLinks.length > 0) {
|
if (dietLinks.length > 0) {
|
||||||
await prisma.ingredientDiet.createMany({ data: dietLinks, skipDuplicates: true });
|
await prisma.ingredientDiet.createMany({ data: dietLinks, skipDuplicates: true });
|
||||||
}
|
}
|
||||||
|
|
||||||
|
await seedTourScenarios(prisma);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Seeds the guided-tour reference data (issues #42/#44):
|
||||||
|
*
|
||||||
|
* - `TourTarget` rows — upserted by key with `update: { description }`, same
|
||||||
|
* as `Unit` above: a reseed must correct an edited hint, not just skip.
|
||||||
|
* - `TourScenario` + its steps — **create-if-absent only**. Once a scenario
|
||||||
|
* exists, an admin owns its `name`/`enabled`/steps (that's the whole
|
||||||
|
* point of #44's CRUD), so a later deploy's reseed must never clobber
|
||||||
|
* those. In the test suite every `resetDatabase()` truncates first, so
|
||||||
|
* the defaults are always recreated fresh there.
|
||||||
|
*/
|
||||||
|
async function seedTourScenarios(prisma: PrismaClient): Promise<void> {
|
||||||
|
for (const { key, description } of TOUR_TARGETS) {
|
||||||
|
await prisma.tourTarget.upsert({
|
||||||
|
where: { key },
|
||||||
|
update: { description },
|
||||||
|
create: { key, description },
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
for (const { key, name, steps } of TOUR_SCENARIOS) {
|
||||||
|
const existing = await prisma.tourScenario.findUnique({ where: { key } });
|
||||||
|
if (existing) continue;
|
||||||
|
await prisma.tourScenario.create({
|
||||||
|
data: {
|
||||||
|
key,
|
||||||
|
name,
|
||||||
|
steps: {
|
||||||
|
create: steps.map((step, index) => ({
|
||||||
|
order: index,
|
||||||
|
route: step.route,
|
||||||
|
targetKey: step.targetKey,
|
||||||
|
title: step.title,
|
||||||
|
content: step.content,
|
||||||
|
})),
|
||||||
|
},
|
||||||
|
},
|
||||||
|
});
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
102
apps/api/src/lib/forgejo/forgejo.service.ts
Normal file
102
apps/api/src/lib/forgejo/forgejo.service.ts
Normal file
|
|
@ -0,0 +1,102 @@
|
||||||
|
import { HttpError } from "@batch-cooking/error-tools";
|
||||||
|
import { ErrorCode } from "@batch-cooking/shared";
|
||||||
|
import { env } from "../../config/env.js";
|
||||||
|
import { logger } from "../logger.service.js";
|
||||||
|
|
||||||
|
/** The slice of Forgejo's `POST .../issues` response this integration reads. */
|
||||||
|
interface ForgejoIssueResponse {
|
||||||
|
number: number;
|
||||||
|
html_url: string;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* The one place `apps/api` talks to Forgejo — creating an issue from a
|
||||||
|
* contact message (`/admin/messages`, issue #81). A class + singleton
|
||||||
|
* (`forgejo` below), same convention as `logger` / `analytics`.
|
||||||
|
*
|
||||||
|
* **Fail-closed**: every method is a no-op / typed error unless all three
|
||||||
|
* `FORGEJO_*` env vars are set (see `config/env.ts`). Callers check
|
||||||
|
* {@link isConfigured} first and answer `503` themselves; {@link createIssue}
|
||||||
|
* re-checks as a backstop.
|
||||||
|
*/
|
||||||
|
export class ForgejoService {
|
||||||
|
/** True once `FORGEJO_BASE_URL`, `FORGEJO_TOKEN` and `FORGEJO_REPO` are all set. */
|
||||||
|
public isConfigured(): boolean {
|
||||||
|
return (
|
||||||
|
env.FORGEJO_BASE_URL !== undefined &&
|
||||||
|
env.FORGEJO_TOKEN !== undefined &&
|
||||||
|
env.FORGEJO_REPO !== undefined
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Creates an issue in `FORGEJO_REPO` with the given title/body (no labels
|
||||||
|
* — a deliberate #81 decision, the admin adds them in Forgejo). Returns
|
||||||
|
* the new issue's number and html URL.
|
||||||
|
*
|
||||||
|
* @throws {HttpError} `503 FORGEJO_NOT_CONFIGURED` if the env isn't set,
|
||||||
|
* `502 FORGEJO_REQUEST_FAILED` on a network error or any non-2xx / non-JSON
|
||||||
|
* response — the caller leaves the database untouched in that case.
|
||||||
|
*/
|
||||||
|
public async createIssue(input: {
|
||||||
|
title: string;
|
||||||
|
body: string;
|
||||||
|
}): Promise<{ number: number; htmlUrl: string }> {
|
||||||
|
if (!this.isConfigured()) {
|
||||||
|
throw new HttpError(
|
||||||
|
503,
|
||||||
|
ErrorCode.FORGEJO_NOT_CONFIGURED,
|
||||||
|
"Forgejo integration is not configured",
|
||||||
|
);
|
||||||
|
}
|
||||||
|
const url = `${env.FORGEJO_BASE_URL}/api/v1/repos/${env.FORGEJO_REPO}/issues`;
|
||||||
|
|
||||||
|
let response: Response;
|
||||||
|
try {
|
||||||
|
response = await fetch(url, {
|
||||||
|
method: "POST",
|
||||||
|
headers: {
|
||||||
|
"Content-Type": "application/json",
|
||||||
|
// Forgejo/Gitea's PAT scheme — `token <pat>`, not `Bearer`.
|
||||||
|
Authorization: `token ${env.FORGEJO_TOKEN}`,
|
||||||
|
},
|
||||||
|
body: JSON.stringify({ title: input.title, body: input.body }),
|
||||||
|
});
|
||||||
|
} catch (err) {
|
||||||
|
logger.warn("Forgejo issue creation failed (network)", {
|
||||||
|
error: err instanceof Error ? err.message : String(err),
|
||||||
|
});
|
||||||
|
throw new HttpError(502, ErrorCode.FORGEJO_REQUEST_FAILED, "Forgejo request failed");
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!response.ok) {
|
||||||
|
const detail = await response.text().catch(() => "");
|
||||||
|
logger.warn("Forgejo issue creation failed", {
|
||||||
|
status: response.status,
|
||||||
|
detail: detail.slice(0, 500),
|
||||||
|
});
|
||||||
|
throw new HttpError(
|
||||||
|
502,
|
||||||
|
ErrorCode.FORGEJO_REQUEST_FAILED,
|
||||||
|
`Forgejo issues API responded ${response.status}`,
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
try {
|
||||||
|
const data = (await response.json()) as ForgejoIssueResponse;
|
||||||
|
return { number: data.number, htmlUrl: data.html_url };
|
||||||
|
} catch (err) {
|
||||||
|
logger.warn("Forgejo issue creation failed (bad response)", {
|
||||||
|
error: err instanceof Error ? err.message : String(err),
|
||||||
|
});
|
||||||
|
throw new HttpError(
|
||||||
|
502,
|
||||||
|
ErrorCode.FORGEJO_REQUEST_FAILED,
|
||||||
|
"Forgejo response was not valid JSON",
|
||||||
|
);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/** Single shared instance — stateless, same reasoning as `logger` / `analytics`. */
|
||||||
|
export const forgejo = new ForgejoService();
|
||||||
95
apps/api/src/lib/monitoring-broadcast.service.ts
Normal file
95
apps/api/src/lib/monitoring-broadcast.service.ts
Normal file
|
|
@ -0,0 +1,95 @@
|
||||||
|
import type { MonitoringView } from "@batch-cooking/shared";
|
||||||
|
import type { Server as SocketIoServer } from "socket.io";
|
||||||
|
import { requireAdminSocket } from "../middlewares/require-admin-socket.js";
|
||||||
|
import { getMonitoring } from "../modules/admin/admin-monitoring.service.js";
|
||||||
|
import { logger } from "./logger.service.js";
|
||||||
|
|
||||||
|
/** How often the server re-probes every dependency, in ms — see `MonitoringBroadcastService`. */
|
||||||
|
const PROBE_INTERVAL_MS = 60_000;
|
||||||
|
|
||||||
|
/** Every authenticated admin socket joins this one room — a single probe loop serves every open tab, instead of each polling independently. */
|
||||||
|
const MONITORING_ROOM = "monitoring";
|
||||||
|
|
||||||
|
/** Event name every `monitoring:update` push carries — the sole message this service ever emits. */
|
||||||
|
const UPDATE_EVENT = "monitoring:update";
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Pushes the admin monitoring status board to every connected admin over
|
||||||
|
* WebSocket, replacing the old `GET /admin/api/monitoring` polling
|
||||||
|
* endpoint entirely (removed — see `admin.routes.ts`'s doc comment): one
|
||||||
|
* server-side probe loop, shared by every viewer, instead of each browser
|
||||||
|
* tab re-probing Postgres/the API/the intent-service/the LLM worker on its
|
||||||
|
* own timer.
|
||||||
|
*
|
||||||
|
* Owns the *whole* `socket.io` server passed to it (`io.use`, top-level
|
||||||
|
* `"connection"` handler) — fine while this is the server's only
|
||||||
|
* real-time feature; a second one added later should likely get its own
|
||||||
|
* namespace rather than share this room's connection handler.
|
||||||
|
*/
|
||||||
|
export class MonitoringBroadcastService {
|
||||||
|
private readonly _io: SocketIoServer;
|
||||||
|
/**
|
||||||
|
* Most recent probe result — replayed to a newly-joined admin
|
||||||
|
* immediately (see the `"connection"` handler below), so a freshly
|
||||||
|
* opened tab isn't left blank for up to a minute waiting for the next
|
||||||
|
* scheduled tick. `null` until the very first probe (kicked off by
|
||||||
|
* {@link start}) completes.
|
||||||
|
*/
|
||||||
|
private _lastSnapshot: MonitoringView | null = null;
|
||||||
|
/** Handle for the running probe loop, or `null` before {@link start}/after {@link stop}. */
|
||||||
|
private _intervalHandle: NodeJS.Timeout | null = null;
|
||||||
|
|
||||||
|
public constructor(io: SocketIoServer) {
|
||||||
|
this._io = io;
|
||||||
|
this._io.use(requireAdminSocket);
|
||||||
|
this._io.on("connection", (socket) => {
|
||||||
|
void socket.join(MONITORING_ROOM);
|
||||||
|
if (this._lastSnapshot) {
|
||||||
|
socket.emit(UPDATE_EVENT, this._lastSnapshot);
|
||||||
|
}
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Starts the probe loop: one immediate probe (so the very first admin
|
||||||
|
* to connect after a server restart doesn't wait a full minute), then
|
||||||
|
* every {@link PROBE_INTERVAL_MS}. Call once, at server boot
|
||||||
|
* (`server.ts`) — meant to run for the lifetime of the process, same
|
||||||
|
* posture as the tech-step worker's own cron (`server.ts` never calls
|
||||||
|
* {@link stop} today; the process exiting takes the interval with it).
|
||||||
|
*/
|
||||||
|
public start(): void {
|
||||||
|
void this._tick();
|
||||||
|
this._intervalHandle = setInterval(() => void this._tick(), PROBE_INTERVAL_MS);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Stops the probe loop. Nothing in production calls this today — it
|
||||||
|
* exists so a graceful-shutdown hook could use it later, and so tests
|
||||||
|
* can tear an instance down cleanly instead of leaking a live
|
||||||
|
* `setInterval` past their own lifetime (which would otherwise hold the
|
||||||
|
* whole Mocha process open).
|
||||||
|
*/
|
||||||
|
public stop(): void {
|
||||||
|
if (this._intervalHandle) {
|
||||||
|
clearInterval(this._intervalHandle);
|
||||||
|
this._intervalHandle = null;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/** Probes every dependency, caches the result, and broadcasts it to {@link MONITORING_ROOM}. */
|
||||||
|
private async _tick(): Promise<void> {
|
||||||
|
try {
|
||||||
|
this._lastSnapshot = await getMonitoring();
|
||||||
|
this._io.to(MONITORING_ROOM).emit(UPDATE_EVENT, this._lastSnapshot);
|
||||||
|
} catch (err) {
|
||||||
|
// getMonitoring() itself never rejects — every individual probe is
|
||||||
|
// already bounded/caught (see its own doc comment) — so this is
|
||||||
|
// purely defensive, per the repo's await-in-try/catch rule; not
|
||||||
|
// expected to actually fire.
|
||||||
|
logger.error("Monitoring probe tick failed unexpectedly", {
|
||||||
|
error: err instanceof Error ? err.message : String(err),
|
||||||
|
});
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
@ -1,10 +1,12 @@
|
||||||
import type {
|
import type {
|
||||||
CookingBackgroundTaskView,
|
CookingBackgroundTaskView,
|
||||||
CookingPhaseKind,
|
CookingPhaseKind,
|
||||||
|
CookingPhaseNoteView,
|
||||||
CookingPhaseView,
|
CookingPhaseView,
|
||||||
CookingSessionRecipeRef,
|
CookingSessionRecipeRef,
|
||||||
CookingTaskIngredientView,
|
CookingTaskIngredientView,
|
||||||
CookingTaskView,
|
CookingTaskView,
|
||||||
|
CookingTemperatureView,
|
||||||
TechStepView,
|
TechStepView,
|
||||||
UtensilView,
|
UtensilView,
|
||||||
} from "@batch-cooking/shared";
|
} from "@batch-cooking/shared";
|
||||||
|
|
@ -23,12 +25,22 @@ import type {
|
||||||
* `aggregateShoppingList`, so the whole optimization is unit-testable
|
* `aggregateShoppingList`, so the whole optimization is unit-testable
|
||||||
* without a Postgres round-trip.
|
* without a Postgres round-trip.
|
||||||
*
|
*
|
||||||
* v1 scope (see the plan / spec): preparation is the only thing *merged*
|
* Two families of work are *merged* across recipes:
|
||||||
* across recipes — a `chop`/`peel`/… technique applied to the same
|
* - **Preparation** — a `chop`/`peel`/… technique applied to the same
|
||||||
* ingredient by two or more recipes, in a step that does nothing but prep,
|
* ingredient by two or more recipes, in a step that does nothing but
|
||||||
* collapses into a single {@link CookingTaskView} of `kind: "merged-prep"`.
|
* prep, collapses into one {@link CookingTaskView} of `kind:
|
||||||
* Cooking steps themselves are never merged (no "same oven, same
|
* "merged-prep"`.
|
||||||
* temperature" reasoning yet); they're only *reordered* for parallelism.
|
* - **Setup** — the same `preheat`/`boil`/`bainMarie` action shared across
|
||||||
|
* recipes collapses into one `kind: "merged-setup"` task, but *only when
|
||||||
|
* the action metadata is compatible*: two recipes that both preheat the
|
||||||
|
* oven merge only when they preheat it to the **same temperature**.
|
||||||
|
* Two preheats at different temperatures stay separate (you cannot heat
|
||||||
|
* one oven to two temperatures at once), are ordered coolest-first, and
|
||||||
|
* the mise-en-place phase carries a {@link CookingPhaseNoteView} telling
|
||||||
|
* the cook to run them in sequence.
|
||||||
|
*
|
||||||
|
* Cooking steps themselves are still never merged (no shared-oven bake
|
||||||
|
* batching yet); they're only *reordered* for parallelism.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
@ -66,7 +78,8 @@ const PREP_TECHNIQUES: ReadonlySet<string> = new Set([
|
||||||
*
|
*
|
||||||
* - `"SETUP"` — a short active trigger, then it looks after itself: preheat
|
* - `"SETUP"` — a short active trigger, then it looks after itself: preheat
|
||||||
* the oven, bring a pot of water to the boil. Pooled into the first
|
* the oven, bring a pot of water to the boil. Pooled into the first
|
||||||
* ("mise en place") phase so it's running before it's needed.
|
* ("mise en place") phase so it's running before it's needed, and merged
|
||||||
|
* across recipes when compatible (see {@link extractMergedSetup}).
|
||||||
* - `"PASSIVE"` — unattended once started (simmer, braise, bake, marinate,
|
* - `"PASSIVE"` — unattended once started (simmer, braise, bake, marinate,
|
||||||
* rest…). Scheduled, then floated into every following phase's
|
* rest…). Scheduled, then floated into every following phase's
|
||||||
* `background` until the step that consumes it comes up.
|
* `background` until the step that consumes it comes up.
|
||||||
|
|
@ -106,6 +119,13 @@ interface OptimizerTechStepInput {
|
||||||
order: number;
|
order: number;
|
||||||
ingredients: CookingTaskIngredientView[];
|
ingredients: CookingTaskIngredientView[];
|
||||||
utensils: UtensilView[];
|
utensils: UtensilView[];
|
||||||
|
/**
|
||||||
|
* Target temperature(s) named in this same clause (`preheat` → "à 180 °C").
|
||||||
|
* The structured subset only — see {@link CookingTemperatureView}. Not
|
||||||
|
* scaled (a temperature doesn't grow with the portion count). `[]` when
|
||||||
|
* the clause named no temperature.
|
||||||
|
*/
|
||||||
|
temperatures: CookingTemperatureView[];
|
||||||
}
|
}
|
||||||
|
|
||||||
/** One recipe step, as handed to {@link optimizeCookingPlan}. */
|
/** One recipe step, as handed to {@link optimizeCookingPlan}. */
|
||||||
|
|
@ -152,7 +172,7 @@ function scaleOf(recipe: OptimizerRecipeInput): number {
|
||||||
return recipe.portions / recipe.recipePortions;
|
return recipe.portions / recipe.recipePortions;
|
||||||
}
|
}
|
||||||
|
|
||||||
/** A step normalized for scheduling — techniques scaled, attention resolved, ingredients/utensils unioned across its technique clauses. */
|
/** A step normalized for scheduling — techniques scaled, attention resolved, ingredients/utensils/temperatures unioned across its technique clauses. */
|
||||||
interface NormalizedStep {
|
interface NormalizedStep {
|
||||||
/** Stable within one response: `step:<recipeIndex>:<stepId>` (the index disambiguates the same recipe planned twice). */
|
/** Stable within one response: `step:<recipeIndex>:<stepId>` (the index disambiguates the same recipe planned twice). */
|
||||||
taskId: string;
|
taskId: string;
|
||||||
|
|
@ -164,10 +184,14 @@ interface NormalizedStep {
|
||||||
techSteps: OptimizerTechStepInput[];
|
techSteps: OptimizerTechStepInput[];
|
||||||
attention: Attention;
|
attention: Attention;
|
||||||
isPurePrep: boolean;
|
isPurePrep: boolean;
|
||||||
|
/** Every technique in the step is a {@link SETUP_TECHNIQUES} one — eligible to pool via {@link extractMergedSetup}. */
|
||||||
|
isPureSetup: boolean;
|
||||||
dominantTechnique: TechStepView | null;
|
dominantTechnique: TechStepView | null;
|
||||||
ingredients: CookingTaskIngredientView[];
|
ingredients: CookingTaskIngredientView[];
|
||||||
utensils: UtensilView[];
|
utensils: UtensilView[];
|
||||||
/** Set once merged-prep extraction absorbs this step wholesale (all its prep pooled elsewhere) — it then produces no standalone task. */
|
/** Distinct target temperatures across the step's clauses (see {@link unionTemperatures}) — drives setup pooling and the coolest-first ordering. */
|
||||||
|
temperatures: CookingTemperatureView[];
|
||||||
|
/** Set once merged-prep/merged-setup extraction absorbs this step wholesale — it then produces no standalone task. */
|
||||||
absorbed: boolean;
|
absorbed: boolean;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -215,11 +239,62 @@ function unionUtensils(utensils: UtensilView[]): UtensilView[] {
|
||||||
return [...byId.values()].sort((a, b) => a.key.localeCompare(b.key));
|
return [...byId.values()].sort((a, b) => a.key.localeCompare(b.key));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* A stable canonical string for one temperature — `c<°C>` / `g<gasMark>` /
|
||||||
|
* `q<level>`, or `""` when every field is null (shouldn't happen — the
|
||||||
|
* upstream extractor guarantees one non-null — but stays total). Two
|
||||||
|
* temperatures are "the same" iff their keys are equal: **no conversion**
|
||||||
|
* between °C, gas marks and qualitative levels is guessed for a merge
|
||||||
|
* decision (same "don't invent a conversion" stance as `ShoppingListItemView`
|
||||||
|
* on units). °C is rounded to the nearest degree so `180` and `180.00`
|
||||||
|
* (a `Decimal` artefact) collapse.
|
||||||
|
*/
|
||||||
|
function temperatureKey(temperature: CookingTemperatureView): string {
|
||||||
|
if (temperature.celsius !== null) return `c${Math.round(temperature.celsius)}`;
|
||||||
|
if (temperature.gasMark !== null) return `g${temperature.gasMark}`;
|
||||||
|
if (temperature.qualitative !== null) return `q${temperature.qualitative}`;
|
||||||
|
return "";
|
||||||
|
}
|
||||||
|
|
||||||
|
/** Unions temperatures by {@link temperatureKey}, keeping a stable order by that key. */
|
||||||
|
function unionTemperatures(temperatures: CookingTemperatureView[]): CookingTemperatureView[] {
|
||||||
|
const byKey = new Map<string, CookingTemperatureView>();
|
||||||
|
for (const temperature of temperatures) byKey.set(temperatureKey(temperature), temperature);
|
||||||
|
return [...byKey.entries()].sort(([a], [b]) => a.localeCompare(b)).map(([, value]) => value);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* A single number to *order* temperatures by (coolest first) — **never** used
|
||||||
|
* to decide a merge (that's {@link temperatureKey}, exact-match only). Gas
|
||||||
|
* marks map via the French `th × 30 ≈ °C` convention and qualitative levels
|
||||||
|
* via rough midpoints, purely so a mixed list still sorts sensibly; a
|
||||||
|
* temperature-less task sorts first.
|
||||||
|
*/
|
||||||
|
function comparableTemp(temperature: CookingTemperatureView): number {
|
||||||
|
if (temperature.celsius !== null) return temperature.celsius;
|
||||||
|
if (temperature.gasMark !== null) return temperature.gasMark * 30;
|
||||||
|
if (temperature.qualitative !== null) {
|
||||||
|
return { low: 120, medium: 180, high: 240 }[temperature.qualitative];
|
||||||
|
}
|
||||||
|
return Number.NEGATIVE_INFINITY;
|
||||||
|
}
|
||||||
|
|
||||||
|
/** A setup task's sort position (coolest first) — its lowest target, or "before everything" when it has no detected temperature. */
|
||||||
|
function setupTaskTemp(task: CookingTaskView): number {
|
||||||
|
if (task.temperatures.length === 0) return Number.NEGATIVE_INFINITY;
|
||||||
|
return Math.min(...task.temperatures.map(comparableTemp));
|
||||||
|
}
|
||||||
|
|
||||||
/** A step is pure prep only if it has techniques and every one of them is in {@link PREP_TECHNIQUES}. */
|
/** A step is pure prep only if it has techniques and every one of them is in {@link PREP_TECHNIQUES}. */
|
||||||
function isPurePrepStep(techSteps: OptimizerTechStepInput[]): boolean {
|
function isPurePrepStep(techSteps: OptimizerTechStepInput[]): boolean {
|
||||||
return techSteps.length > 0 && techSteps.every((ts) => PREP_TECHNIQUES.has(ts.techStep.key));
|
return techSteps.length > 0 && techSteps.every((ts) => PREP_TECHNIQUES.has(ts.techStep.key));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/** A step is pure setup only if it has techniques and every one is in {@link SETUP_TECHNIQUES} — mirror of {@link isPurePrepStep}. */
|
||||||
|
function isPureSetupStep(techSteps: OptimizerTechStepInput[]): boolean {
|
||||||
|
return techSteps.length > 0 && techSteps.every((ts) => SETUP_TECHNIQUES.has(ts.techStep.key));
|
||||||
|
}
|
||||||
|
|
||||||
/** Resolves a step's {@link Attention} — SETUP wins, then a *trailing* passive technique, else ACTIVE (see {@link SETUP_TECHNIQUES}). */
|
/** Resolves a step's {@link Attention} — SETUP wins, then a *trailing* passive technique, else ACTIVE (see {@link SETUP_TECHNIQUES}). */
|
||||||
function attentionOf(techSteps: OptimizerTechStepInput[]): Attention {
|
function attentionOf(techSteps: OptimizerTechStepInput[]): Attention {
|
||||||
if (techSteps.some((ts) => SETUP_TECHNIQUES.has(ts.techStep.key))) return "SETUP";
|
if (techSteps.some((ts) => SETUP_TECHNIQUES.has(ts.techStep.key))) return "SETUP";
|
||||||
|
|
@ -251,6 +326,9 @@ function normalizeRecipe(recipe: OptimizerRecipeInput, recipeIndex: number): Nor
|
||||||
unit: line.unit,
|
unit: line.unit,
|
||||||
})),
|
})),
|
||||||
utensils: ts.utensils,
|
utensils: ts.utensils,
|
||||||
|
// Temperatures are not scaled — an oven set to 180 °C for 4
|
||||||
|
// portions is still 180 °C for 8.
|
||||||
|
temperatures: ts.temperatures,
|
||||||
}));
|
}));
|
||||||
|
|
||||||
const lastTech = techSteps[techSteps.length - 1];
|
const lastTech = techSteps[techSteps.length - 1];
|
||||||
|
|
@ -264,9 +342,11 @@ function normalizeRecipe(recipe: OptimizerRecipeInput, recipeIndex: number): Nor
|
||||||
techSteps,
|
techSteps,
|
||||||
attention: attentionOf(techSteps),
|
attention: attentionOf(techSteps),
|
||||||
isPurePrep: isPurePrepStep(techSteps),
|
isPurePrep: isPurePrepStep(techSteps),
|
||||||
|
isPureSetup: isPureSetupStep(techSteps),
|
||||||
dominantTechnique: lastTech ? lastTech.techStep : null,
|
dominantTechnique: lastTech ? lastTech.techStep : null,
|
||||||
ingredients: unionIngredients(techSteps.flatMap((ts) => ts.ingredients)),
|
ingredients: unionIngredients(techSteps.flatMap((ts) => ts.ingredients)),
|
||||||
utensils: unionUtensils(techSteps.flatMap((ts) => ts.utensils)),
|
utensils: unionUtensils(techSteps.flatMap((ts) => ts.utensils)),
|
||||||
|
temperatures: unionTemperatures(techSteps.flatMap((ts) => ts.temperatures)),
|
||||||
absorbed: false,
|
absorbed: false,
|
||||||
} satisfies NormalizedStep;
|
} satisfies NormalizedStep;
|
||||||
});
|
});
|
||||||
|
|
@ -283,6 +363,26 @@ function prepSignature(step: NormalizedStep): string {
|
||||||
return [...new Set(pairs)].sort().join("+");
|
return [...new Set(pairs)].sort().join("+");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* The setup signature of a pure-setup step — `<sorted technique keys>|<sorted
|
||||||
|
* temperature keys>`. Two steps with the same signature start the *same*
|
||||||
|
* appliance in the *same* state and can be pooled. The temperature part is
|
||||||
|
* `""` when no temperature was detected, which is a valid signature: two
|
||||||
|
* bare "préchauffer le four" steps then share it and merge (the optimistic
|
||||||
|
* default — an unknown temperature is assumed compatible). The appliance
|
||||||
|
* itself is deliberately not in the key (a `preheat` is the oven either
|
||||||
|
* way); its utensils are still unioned onto the pooled task.
|
||||||
|
*/
|
||||||
|
function setupSignature(step: NormalizedStep): string {
|
||||||
|
const techKeys = [...new Set(step.techSteps.map((ts) => ts.techStep.key))].sort().join("+");
|
||||||
|
const tempKeys = step.temperatures
|
||||||
|
.map(temperatureKey)
|
||||||
|
.filter((key) => key !== "")
|
||||||
|
.sort()
|
||||||
|
.join("+");
|
||||||
|
return `${techKeys}|${tempKeys}`;
|
||||||
|
}
|
||||||
|
|
||||||
/** Builds one {@link CookingTaskView} from a normalized step run as written. */
|
/** Builds one {@link CookingTaskView} from a normalized step run as written. */
|
||||||
function stepToTask(step: NormalizedStep): CookingTaskView {
|
function stepToTask(step: NormalizedStep): CookingTaskView {
|
||||||
return {
|
return {
|
||||||
|
|
@ -292,6 +392,10 @@ function stepToTask(step: NormalizedStep): CookingTaskView {
|
||||||
description: step.description,
|
description: step.description,
|
||||||
ingredients: step.ingredients,
|
ingredients: step.ingredients,
|
||||||
utensils: step.utensils,
|
utensils: step.utensils,
|
||||||
|
// Only a setup step (preheat/boil/…) carries a target temperature the
|
||||||
|
// plan should reason about; every other step leaves it `[]` even if its
|
||||||
|
// text happens to mention degrees.
|
||||||
|
temperatures: step.attention === "SETUP" ? step.temperatures : [],
|
||||||
sourceRecipes: [step.recipe],
|
sourceRecipes: [step.recipe],
|
||||||
originalSteps: [
|
originalSteps: [
|
||||||
{
|
{
|
||||||
|
|
@ -376,6 +480,7 @@ function extractMergedPrep(steps: NormalizedStep[]): CookingTaskView[] {
|
||||||
description: null,
|
description: null,
|
||||||
ingredients,
|
ingredients,
|
||||||
utensils,
|
utensils,
|
||||||
|
temperatures: [],
|
||||||
sourceRecipes,
|
sourceRecipes,
|
||||||
originalSteps,
|
originalSteps,
|
||||||
});
|
});
|
||||||
|
|
@ -384,6 +489,99 @@ function extractMergedPrep(steps: NormalizedStep[]): CookingTaskView[] {
|
||||||
return merged.sort((a, b) => a.id.localeCompare(b.id));
|
return merged.sort((a, b) => a.id.localeCompare(b.id));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Pools pure-setup steps with the same {@link setupSignature} (same action,
|
||||||
|
* same detected temperature) across two or more distinct recipes into one
|
||||||
|
* `merged-setup` {@link CookingTaskView}, marking each contributing step
|
||||||
|
* `absorbed`. Two `preheat` steps at *different* temperatures have different
|
||||||
|
* signatures and are therefore never pooled — {@link detectApplianceTemperatureConflicts}
|
||||||
|
* turns that into a phase note. A signature only one recipe needs is left
|
||||||
|
* untouched (still lands in mise-en-place as its own step task).
|
||||||
|
*
|
||||||
|
* Returns the merged tasks sorted by id.
|
||||||
|
*/
|
||||||
|
function extractMergedSetup(steps: NormalizedStep[]): CookingTaskView[] {
|
||||||
|
const bySignature = new Map<string, NormalizedStep[]>();
|
||||||
|
for (const step of steps) {
|
||||||
|
if (!step.isPureSetup) continue;
|
||||||
|
const signature = setupSignature(step);
|
||||||
|
const group = bySignature.get(signature);
|
||||||
|
if (group) group.push(step);
|
||||||
|
else bySignature.set(signature, [step]);
|
||||||
|
}
|
||||||
|
|
||||||
|
const merged: CookingTaskView[] = [];
|
||||||
|
for (const group of bySignature.values()) {
|
||||||
|
const recipeIndexes = new Set(group.map((s) => s.recipeIndex));
|
||||||
|
if (recipeIndexes.size < 2) continue;
|
||||||
|
|
||||||
|
for (const step of group) step.absorbed = true;
|
||||||
|
|
||||||
|
const firstTech = group[0]?.techSteps[0]?.techStep ?? null;
|
||||||
|
const ingredients = unionIngredients(
|
||||||
|
group.flatMap((s) => s.techSteps.flatMap((ts) => ts.ingredients)),
|
||||||
|
);
|
||||||
|
const utensils = unionUtensils(group.flatMap((s) => s.utensils));
|
||||||
|
const temperatures = unionTemperatures(group.flatMap((s) => s.temperatures)).sort(
|
||||||
|
(a, b) => comparableTemp(a) - comparableTemp(b),
|
||||||
|
);
|
||||||
|
|
||||||
|
// Distinct source recipes / original step texts, in input order.
|
||||||
|
const sourceRecipes: CookingSessionRecipeRef[] = [];
|
||||||
|
const seenRecipe = new Set<number>();
|
||||||
|
const originalSteps: CookingTaskView["originalSteps"] = [];
|
||||||
|
for (const step of [...group].sort((a, b) => a.recipeIndex - b.recipeIndex)) {
|
||||||
|
if (!seenRecipe.has(step.recipeIndex)) {
|
||||||
|
seenRecipe.add(step.recipeIndex);
|
||||||
|
sourceRecipes.push(step.recipe);
|
||||||
|
}
|
||||||
|
originalSteps.push({
|
||||||
|
recipeId: step.recipe.recipeId,
|
||||||
|
recipeName: step.recipe.name,
|
||||||
|
description: step.description,
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
const tempKey = temperatures.map(temperatureKey).join("+");
|
||||||
|
merged.push({
|
||||||
|
id: `setup:${firstTech ? firstTech.key : "setup"}:${tempKey || "any"}`,
|
||||||
|
kind: "merged-setup",
|
||||||
|
technique: firstTech,
|
||||||
|
description: null,
|
||||||
|
ingredients,
|
||||||
|
utensils,
|
||||||
|
temperatures,
|
||||||
|
sourceRecipes,
|
||||||
|
originalSteps,
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
return merged.sort((a, b) => a.id.localeCompare(b.id));
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* The kitchen has one oven: if the mise-en-place ends up with two or more
|
||||||
|
* `preheat` tasks at *distinct known* temperatures, they cannot run at once.
|
||||||
|
* Emits a single {@link CookingPhaseNoteView} listing those temperatures
|
||||||
|
* coolest-first so the web layer can say "enchaîner 180 °C puis 210 °C".
|
||||||
|
* A `preheat` with no detected temperature contributes nothing to the note
|
||||||
|
* (it merged optimistically with the other unknowns and we've no number to
|
||||||
|
* show).
|
||||||
|
*/
|
||||||
|
function detectApplianceTemperatureConflicts(
|
||||||
|
setupTasks: CookingTaskView[],
|
||||||
|
): CookingPhaseNoteView[] {
|
||||||
|
const preheats = setupTasks.filter((task) => task.technique?.key === "preheat");
|
||||||
|
const distinct = unionTemperatures(preheats.flatMap((task) => task.temperatures))
|
||||||
|
.filter((temperature) => temperatureKey(temperature) !== "")
|
||||||
|
.sort((a, b) => comparableTemp(a) - comparableTemp(b));
|
||||||
|
|
||||||
|
const technique = preheats.find((task) => task.technique !== null)?.technique;
|
||||||
|
if (distinct.length < 2 || !technique) return [];
|
||||||
|
|
||||||
|
return [{ kind: "appliance-temperature-conflict", technique, temperatures: distinct }];
|
||||||
|
}
|
||||||
|
|
||||||
/** Maps the input recipe list to its display legend, de-duplicating an exact `(recipeId, portions)` repeat. */
|
/** Maps the input recipe list to its display legend, de-duplicating an exact `(recipeId, portions)` repeat. */
|
||||||
function toRecipeLegend(recipes: OptimizerRecipeInput[]): CookingSessionRecipeRef[] {
|
function toRecipeLegend(recipes: OptimizerRecipeInput[]): CookingSessionRecipeRef[] {
|
||||||
const seen = new Set<string>();
|
const seen = new Set<string>();
|
||||||
|
|
@ -406,9 +604,11 @@ function cookingPhaseKind(tasks: CookingTaskView[]): CookingPhaseKind {
|
||||||
* See the file header. Given the week's planned recipes (already resolved
|
* See the file header. Given the week's planned recipes (already resolved
|
||||||
* to reference views), returns the display legend plus the ordered phases:
|
* to reference views), returns the display legend plus the ordered phases:
|
||||||
*
|
*
|
||||||
* 1. **Mise en place** (`"mise-en-place"`) — every `merged-prep` task, then
|
* 1. **Mise en place** (`"mise-en-place"`) — all prep first (`merged-prep`
|
||||||
* every leftover pure-prep step, then every `SETUP` step. Omitted
|
* tasks, then leftover pure-prep steps), then all setup (`merged-setup`
|
||||||
* entirely if it would be empty.
|
* tasks and leftover `SETUP` steps, ordered coolest-first). Carries an
|
||||||
|
* `appliance-temperature-conflict` note when the week needs the oven at
|
||||||
|
* two or more temperatures. Omitted entirely if it would be empty.
|
||||||
* 2. **Cooking** (`"cooking"` / `"finishing"`) — the recipes interleaved:
|
* 2. **Cooking** (`"cooking"` / `"finishing"`) — the recipes interleaved:
|
||||||
* each phase pops the next remaining step of every recipe that still has
|
* each phase pops the next remaining step of every recipe that still has
|
||||||
* one (passive-cook steps first, so long cooks start early). A passive
|
* one (passive-cook steps first, so long cooks start early). A passive
|
||||||
|
|
@ -420,21 +620,41 @@ export function optimizeCookingPlan(recipes: OptimizerRecipeInput[]): OptimizeCo
|
||||||
const normalized = recipes.map((recipe, index) => normalizeRecipe(recipe, index));
|
const normalized = recipes.map((recipe, index) => normalizeRecipe(recipe, index));
|
||||||
const allSteps = normalized.flat();
|
const allSteps = normalized.flat();
|
||||||
|
|
||||||
|
// Merged-prep first, then merged-setup — each marks its contributing
|
||||||
|
// steps `absorbed`, so the leftover loop below only sees the solo ones.
|
||||||
const mergedPrep = extractMergedPrep(allSteps);
|
const mergedPrep = extractMergedPrep(allSteps);
|
||||||
|
const mergedSetup = extractMergedSetup(allSteps);
|
||||||
|
|
||||||
const phases: CookingPhaseView[] = [];
|
const phases: CookingPhaseView[] = [];
|
||||||
|
|
||||||
// Phase 0 — mise en place.
|
// Phase 0 — mise en place: all prep, then all setup. Keeping the two
|
||||||
const miseTasks: CookingTaskView[] = [...mergedPrep];
|
// groups apart (rather than input order) lets the setup group be ordered
|
||||||
|
// coolest-first without disturbing the prep order.
|
||||||
|
const prepTasks: CookingTaskView[] = [...mergedPrep];
|
||||||
|
const setupTasks: CookingTaskView[] = [...mergedSetup];
|
||||||
for (const step of allSteps) {
|
for (const step of allSteps) {
|
||||||
if (step.absorbed) continue;
|
if (step.absorbed) continue;
|
||||||
if (step.isPurePrep || step.attention === "SETUP") {
|
if (step.isPurePrep) {
|
||||||
miseTasks.push(stepToTask(step));
|
prepTasks.push(stepToTask(step));
|
||||||
step.absorbed = true; // consumed here, not again in the cooking loop
|
step.absorbed = true; // consumed here, not again in the cooking loop
|
||||||
|
} else if (step.attention === "SETUP") {
|
||||||
|
setupTasks.push(stepToTask(step));
|
||||||
|
step.absorbed = true;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
// Coolest oven first, so a temperature conflict reads "180 °C puis 210 °C";
|
||||||
|
// `id` as a stable tiebreaker keeps the plan deterministic.
|
||||||
|
setupTasks.sort((a, b) => setupTaskTemp(a) - setupTaskTemp(b) || a.id.localeCompare(b.id));
|
||||||
|
|
||||||
|
const miseTasks = [...prepTasks, ...setupTasks];
|
||||||
if (miseTasks.length > 0) {
|
if (miseTasks.length > 0) {
|
||||||
phases.push({ index: 0, kind: "mise-en-place", tasks: miseTasks, background: [] });
|
phases.push({
|
||||||
|
index: 0,
|
||||||
|
kind: "mise-en-place",
|
||||||
|
tasks: miseTasks,
|
||||||
|
background: [],
|
||||||
|
notes: detectApplianceTemperatureConflicts(setupTasks),
|
||||||
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
// Cooking phases — one "next step of each recipe" per phase. `hold` keeps
|
// Cooking phases — one "next step of each recipe" per phase. `hold` keeps
|
||||||
|
|
@ -490,6 +710,9 @@ export function optimizeCookingPlan(recipes: OptimizerRecipeInput[]): OptimizeCo
|
||||||
kind: cookingPhaseKind(tasks),
|
kind: cookingPhaseKind(tasks),
|
||||||
tasks,
|
tasks,
|
||||||
background,
|
background,
|
||||||
|
// Temperature conflicts only matter in mise-en-place, where all the
|
||||||
|
// preheats live; a cooking phase never carries a note today.
|
||||||
|
notes: [],
|
||||||
});
|
});
|
||||||
|
|
||||||
for (const step of phaseSteps) {
|
for (const step of phaseSteps) {
|
||||||
|
|
|
||||||
|
|
@ -25,11 +25,28 @@ export interface IntentServiceEntity {
|
||||||
kind: "technique" | "utensil";
|
kind: "technique" | "utensil";
|
||||||
}
|
}
|
||||||
|
|
||||||
/** The full result of a `POST /v1/process` call — mirrors `ProcessResponse` (Python `schemas.py`). `intent` is `null` only when `locale` isn't one this service trains for, or `text` is blank; otherwise always a real `uid` (the Python service's `textcat` has no "None" sentinel, unlike node-nlp — see that service's README). */
|
/**
|
||||||
|
* A temperature the service recognized in the text — mirrors
|
||||||
|
* `TemperaturePayload` (Python `schemas.py`), `gas_mark` camelCased to
|
||||||
|
* `gasMark`. A separate list from {@link IntentServiceEntity} (not another
|
||||||
|
* `kind`) because it carries structured fields that don't fit an entity's
|
||||||
|
* `uid`. At least one of `celsius` / `gasMark` / `qualitative` is non-null.
|
||||||
|
*/
|
||||||
|
export interface IntentServiceTemperature {
|
||||||
|
start: number;
|
||||||
|
end: number;
|
||||||
|
celsius: number | null;
|
||||||
|
gasMark: number | null;
|
||||||
|
qualitative: "low" | "medium" | "high" | null;
|
||||||
|
raw: string;
|
||||||
|
}
|
||||||
|
|
||||||
|
/** The full result of a `POST /v1/process` call — mirrors `ProcessResponse` (Python `schemas.py`). `intent` is `null` only when `locale` isn't one this service trains for, or `text` is blank; otherwise always a real `uid` (the Python service's `textcat` has no "None" sentinel, unlike node-nlp — see that service's README). `temperatures` is regex-extracted and independent of the model/training (empty when none, not omitted). */
|
||||||
export interface IntentServiceProcessResult {
|
export interface IntentServiceProcessResult {
|
||||||
entities: IntentServiceEntity[];
|
entities: IntentServiceEntity[];
|
||||||
intent: string | null;
|
intent: string | null;
|
||||||
score: number;
|
score: number;
|
||||||
|
temperatures: IntentServiceTemperature[];
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
@ -88,10 +105,26 @@ export class IntentServiceClient {
|
||||||
*/
|
*/
|
||||||
public async process(locale: string, text: string): Promise<IntentServiceProcessResult> {
|
public async process(locale: string, text: string): Promise<IntentServiceProcessResult> {
|
||||||
try {
|
try {
|
||||||
return await this._request("/v1/process", {
|
// The wire shape uses `gas_mark` (Python field name); everything else
|
||||||
|
// is already camelCase / single-word. Map that one key at the
|
||||||
|
// boundary so the rest of `apps/api` only ever sees `gasMark`.
|
||||||
|
const wire = await this._request<
|
||||||
|
Omit<IntentServiceProcessResult, "temperatures"> & {
|
||||||
|
temperatures: (Omit<IntentServiceTemperature, "gasMark"> & { gas_mark: number | null })[];
|
||||||
|
}
|
||||||
|
>("/v1/process", {
|
||||||
method: "POST",
|
method: "POST",
|
||||||
body: JSON.stringify({ locale, text }),
|
body: JSON.stringify({ locale, text }),
|
||||||
});
|
});
|
||||||
|
return {
|
||||||
|
entities: wire.entities,
|
||||||
|
intent: wire.intent,
|
||||||
|
score: wire.score,
|
||||||
|
temperatures: (wire.temperatures ?? []).map(({ gas_mark, ...rest }) => ({
|
||||||
|
...rest,
|
||||||
|
gasMark: gas_mark,
|
||||||
|
})),
|
||||||
|
};
|
||||||
} catch (err) {
|
} catch (err) {
|
||||||
throw err;
|
throw err;
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -5,7 +5,7 @@ import {
|
||||||
loadIngredientCatalog,
|
loadIngredientCatalog,
|
||||||
loadUnitCatalog,
|
loadUnitCatalog,
|
||||||
} from "./ingredient-matcher.js";
|
} from "./ingredient-matcher.js";
|
||||||
import { intentServiceClient } from "./intent-service-client.js";
|
import { type IntentServiceTemperature, intentServiceClient } from "./intent-service-client.js";
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Auto-detects which cooking techniques (`TechStep`) a free-text recipe
|
* Auto-detects which cooking techniques (`TechStep`) a free-text recipe
|
||||||
|
|
@ -114,6 +114,7 @@ export interface TechStepMatch {
|
||||||
contextEnd: number;
|
contextEnd: number;
|
||||||
ingredients: IngredientMention[];
|
ingredients: IngredientMention[];
|
||||||
utensils: UtensilMention[];
|
utensils: UtensilMention[];
|
||||||
|
temperatures: TemperatureMention[];
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
@ -129,6 +130,15 @@ export interface UtensilMention {
|
||||||
end: number;
|
end: number;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* A temperature the intent service's regex pass found (`temperatures` in
|
||||||
|
* `IntentServiceProcessResult`), attributed to whichever clause its span
|
||||||
|
* falls inside — same rule as {@link UtensilMention}. No DB id to resolve
|
||||||
|
* (unlike a technique/ingredient/utensil): the structured value *is* the
|
||||||
|
* data. Persisted verbatim as a `StepTechStepTemperature` row.
|
||||||
|
*/
|
||||||
|
export type TemperatureMention = IntentServiceTemperature;
|
||||||
|
|
||||||
/** A candidate technique mention found by NER — the raw material {@link splitIntoClauses} cuts a description around. */
|
/** A candidate technique mention found by NER — the raw material {@link splitIntoClauses} cuts a description around. */
|
||||||
export interface TechniqueCandidate {
|
export interface TechniqueCandidate {
|
||||||
/** Training-data `uid` this candidate's synonym belongs to (e.g. `"melt"`) — not yet resolved to a DB id at this stage. */
|
/** Training-data `uid` this candidate's synonym belongs to (e.g. `"melt"`) — not yet resolved to a DB id at this stage. */
|
||||||
|
|
@ -408,6 +418,7 @@ export class TechStepClassifierService {
|
||||||
.filter((entity) => entity.kind === "technique")
|
.filter((entity) => entity.kind === "technique")
|
||||||
.map((entity) => ({ uid: entity.uid, start: entity.start, end: entity.end }));
|
.map((entity) => ({ uid: entity.uid, start: entity.start, end: entity.end }));
|
||||||
const utensilEntities = nerResult.entities.filter((entity) => entity.kind === "utensil");
|
const utensilEntities = nerResult.entities.filter((entity) => entity.kind === "utensil");
|
||||||
|
const temperatureMentions = nerResult.temperatures;
|
||||||
|
|
||||||
const clauses = splitIntoClauses(description, candidates);
|
const clauses = splitIntoClauses(description, candidates);
|
||||||
const matches: TechStepMatch[] = [];
|
const matches: TechStepMatch[] = [];
|
||||||
|
|
@ -442,6 +453,12 @@ export class TechStepClassifierService {
|
||||||
: [{ utensilId, start: entity.start, end: entity.end }];
|
: [{ utensilId, start: entity.start, end: entity.end }];
|
||||||
});
|
});
|
||||||
|
|
||||||
|
// Temperatures carry no id to resolve — kept as-is, just attributed
|
||||||
|
// to the clause whose span contains them (same rule as utensils).
|
||||||
|
const temperatures: TemperatureMention[] = temperatureMentions.filter(
|
||||||
|
(temp) => temp.start >= clause.start && temp.end <= clause.end,
|
||||||
|
);
|
||||||
|
|
||||||
matches.push({
|
matches.push({
|
||||||
techStepId,
|
techStepId,
|
||||||
start: span.start,
|
start: span.start,
|
||||||
|
|
@ -450,6 +467,7 @@ export class TechStepClassifierService {
|
||||||
contextEnd: clause.end,
|
contextEnd: clause.end,
|
||||||
ingredients,
|
ingredients,
|
||||||
utensils,
|
utensils,
|
||||||
|
temperatures,
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
64
apps/api/src/lib/recipe-matching/tech-step-persistence.ts
Normal file
64
apps/api/src/lib/recipe-matching/tech-step-persistence.ts
Normal file
|
|
@ -0,0 +1,64 @@
|
||||||
|
import type { Prisma } from "@prisma/client";
|
||||||
|
import type { TechStepMatch } from "./tech-step-matcher.js";
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Turns one step's {@link TechStepMatch}es into the Prisma nested-`create`
|
||||||
|
* payload for its `techSteps` relation — the technique row **and** all three
|
||||||
|
* of its clause-metadata child sets (`ingredients` / `utensils` /
|
||||||
|
* `temperatures`).
|
||||||
|
*
|
||||||
|
* The single source of truth for that shape. It used to be written out by
|
||||||
|
* hand in three places — `recipe.service.ts`'s `createRecipeInternal` and
|
||||||
|
* `updateRecipe`, plus `src/scripts/backfill-tech-steps.ts` — and they had
|
||||||
|
* drifted: only the create path wrote the metadata children, so **every
|
||||||
|
* recipe resaved through the UI, and every recipe the backfill touched,
|
||||||
|
* silently lost every ingredient / utensil / temperature the classifier had
|
||||||
|
* attributed to its steps**. That left `cooking-optimizer.ts`'s
|
||||||
|
* temperature-aware `preheat` grouping (the "don't preheat to 150 °C and
|
||||||
|
* 200 °C at once" note) with no data to work from on any recipe that wasn't
|
||||||
|
* a pristine, never-edited import. Building the payload once, here, is what
|
||||||
|
* stops the three call sites diverging again.
|
||||||
|
*
|
||||||
|
* `order` is each match's index in `matches` (0-based). Callers pass matches
|
||||||
|
* in reading order already; a caller that needs a different base (the
|
||||||
|
* backfill, which offsets past untouched `"manual"` rows) overrides `order`
|
||||||
|
* on the returned objects before handing them to Prisma.
|
||||||
|
*/
|
||||||
|
export function toStepTechStepCreateInputs(
|
||||||
|
matches: TechStepMatch[],
|
||||||
|
): Prisma.StepTechStepUncheckedCreateWithoutStepInput[] {
|
||||||
|
return matches.map((match, order) => ({
|
||||||
|
techStepId: match.techStepId,
|
||||||
|
start: match.start,
|
||||||
|
end: match.end,
|
||||||
|
contextStart: match.contextStart,
|
||||||
|
contextEnd: match.contextEnd,
|
||||||
|
order,
|
||||||
|
ingredients: {
|
||||||
|
create: match.ingredients.map((ingredient) => ({
|
||||||
|
ingredientId: ingredient.ingredientId,
|
||||||
|
quantity: ingredient.quantity,
|
||||||
|
unitId: ingredient.unitId,
|
||||||
|
start: ingredient.start,
|
||||||
|
end: ingredient.end,
|
||||||
|
})),
|
||||||
|
},
|
||||||
|
utensils: {
|
||||||
|
create: match.utensils.map((utensil) => ({
|
||||||
|
utensilId: utensil.utensilId,
|
||||||
|
start: utensil.start,
|
||||||
|
end: utensil.end,
|
||||||
|
})),
|
||||||
|
},
|
||||||
|
temperatures: {
|
||||||
|
create: match.temperatures.map((temperature) => ({
|
||||||
|
start: temperature.start,
|
||||||
|
end: temperature.end,
|
||||||
|
celsius: temperature.celsius,
|
||||||
|
gasMark: temperature.gasMark,
|
||||||
|
qualitative: temperature.qualitative,
|
||||||
|
raw: temperature.raw,
|
||||||
|
})),
|
||||||
|
},
|
||||||
|
}));
|
||||||
|
}
|
||||||
43
apps/api/src/middlewares/require-admin-socket.ts
Normal file
43
apps/api/src/middlewares/require-admin-socket.ts
Normal file
|
|
@ -0,0 +1,43 @@
|
||||||
|
import { parseCookie } from "cookie";
|
||||||
|
import type { Socket } from "socket.io";
|
||||||
|
import { env } from "../config/env.js";
|
||||||
|
import { resolveAdminFromToken } from "./require-admin.js";
|
||||||
|
|
||||||
|
/**
|
||||||
|
* `socket.io` handshake middleware guarding the admin WebSocket surface —
|
||||||
|
* the connection-level equivalent of {@link requireAdmin} (`require-
|
||||||
|
* admin.ts`). A `socket.io` handshake is a plain HTTP request that never
|
||||||
|
* runs through Express's own middleware stack (`cookie-parser` included),
|
||||||
|
* so the raw `Cookie` header has to be parsed by hand here with the
|
||||||
|
* `cookie` package (the same one `cookie-parser` itself wraps).
|
||||||
|
*
|
||||||
|
* Registered via `io.use(requireAdminSocket)` — `socket.io` calls every
|
||||||
|
* `io.use` middleware once per connection attempt, before `"connection"`
|
||||||
|
* fires, exactly like Express's per-request middleware chain. Calling
|
||||||
|
* `next()` with no argument admits the connection; calling it with an
|
||||||
|
* `Error` rejects it, which the client sees as a `connect_error` event
|
||||||
|
* (`socket.io-client` never even fires `"connect"` for it).
|
||||||
|
*
|
||||||
|
* On success, stashes the resolved admin on `socket.data.adminUser` —
|
||||||
|
* `socket.io`'s per-connection storage bag, the WebSocket equivalent of
|
||||||
|
* `res.locals` — for any handler that ends up needing it later.
|
||||||
|
*/
|
||||||
|
export async function requireAdminSocket(
|
||||||
|
socket: Socket,
|
||||||
|
next: (err?: Error) => void,
|
||||||
|
): Promise<void> {
|
||||||
|
try {
|
||||||
|
const cookieHeader = socket.handshake.headers.cookie;
|
||||||
|
const token = cookieHeader ? parseCookie(cookieHeader)[env.ADMIN_COOKIE_NAME] : undefined;
|
||||||
|
if (typeof token !== "string") {
|
||||||
|
throw new Error("Not authenticated");
|
||||||
|
}
|
||||||
|
|
||||||
|
socket.data.adminUser = await resolveAdminFromToken(token);
|
||||||
|
next();
|
||||||
|
} catch {
|
||||||
|
// Covers everything resolveAdminFromToken can throw, plus a missing
|
||||||
|
// cookie — same "never distinguish the reason" posture as requireAdmin.
|
||||||
|
next(new Error("Not authenticated"));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
@ -19,26 +19,50 @@ export interface AdminLocals {
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Express middleware guarding every `/admin/*` route — the operations app
|
* Verifies an admin session JWT and resolves the `AdminUser` it belongs
|
||||||
* (`apps/admin-web`) authenticating as an `AdminUser`. Reads the admin
|
* to — the transport-agnostic core both {@link requireAdmin} (HTTP) and
|
||||||
* session cookie (`ADMIN_COOKIE_NAME`, deliberately **not** the same cookie
|
* `requireAdminSocket` (`require-admin-socket.ts`, the WebSocket handshake
|
||||||
* as end-user sessions), verifies the JWT against `ADMIN_JWT_SECRET`
|
* equivalent) build on; they only differ in *where* they read the raw
|
||||||
* (a different secret than `JWT_SECRET`), and re-checks `tokenVersion`
|
* cookie value from (`req.cookies`, already parsed by `cookie-parser`, vs
|
||||||
* against the database so a stateless JWT can still be invalidated
|
* a `socket.io` handshake's raw `Cookie` header, which isn't). Kept here
|
||||||
* server-side.
|
* rather than in `lib/admin-jwt.ts`, since it also does the DB
|
||||||
|
* `tokenVersion` re-check that file deliberately doesn't know about.
|
||||||
|
*
|
||||||
|
* @throws {Error} for any failure — malformed/expired JWT, unknown admin,
|
||||||
|
* stale `tokenVersion`, or no `ADMIN_JWT_SECRET` configured (from
|
||||||
|
* {@link verifyAdminToken}). Always the same generic message; callers
|
||||||
|
* map it to their own transport's "unauthenticated" shape.
|
||||||
|
*/
|
||||||
|
export async function resolveAdminFromToken(token: string): Promise<AdminUserView> {
|
||||||
|
const payload = verifyAdminToken(token);
|
||||||
|
const admin = await prisma.adminUser.findUnique({ where: { id: payload.adminUserId } });
|
||||||
|
|
||||||
|
if (!admin || admin.tokenVersion !== payload.tokenVersion) {
|
||||||
|
throw new Error("Not authenticated");
|
||||||
|
}
|
||||||
|
|
||||||
|
return toSafeAdmin(admin);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Express middleware guarding every `/admin/api/*` route — the operations
|
||||||
|
* UI (`apps/web`'s `/admin/*` pages) authenticating as an `AdminUser`.
|
||||||
|
* Reads the admin session cookie (`ADMIN_COOKIE_NAME`, deliberately
|
||||||
|
* **not** the same cookie as end-user sessions) and resolves it via
|
||||||
|
* {@link resolveAdminFromToken}.
|
||||||
*
|
*
|
||||||
* A completely separate mechanism from {@link requireAuth}, not layered on
|
* A completely separate mechanism from {@link requireAuth}, not layered on
|
||||||
* it: an end-user session token and an admin session token are never
|
* it: an end-user session token and an admin session token are never
|
||||||
* interchangeable in either direction.
|
* interchangeable in either direction.
|
||||||
*
|
*
|
||||||
* Fails closed: an unset `ADMIN_JWT_SECRET` (the default for any instance
|
* Fails closed: an unset `ADMIN_JWT_SECRET` (the default for any instance
|
||||||
* that doesn't run the admin app) makes {@link verifyAdminToken} throw, so
|
* that doesn't run the admin app) makes {@link resolveAdminFromToken}
|
||||||
* every request is rejected rather than the surface left open — same
|
* throw, so every request is rejected rather than the surface left open —
|
||||||
* posture as `requireInternalWorker`.
|
* same posture as `requireInternalWorker`.
|
||||||
*
|
*
|
||||||
* @throws {HttpError} `401 NOT_AUTHENTICATED` for any failure — missing
|
* @throws {HttpError} `401 NOT_AUTHENTICATED` for any failure — missing
|
||||||
* cookie, malformed/expired JWT, unknown admin, stale tokenVersion, or
|
* cookie or anything {@link resolveAdminFromToken} rejects on. Never
|
||||||
* no secret configured. Never distinguishes the reason.
|
* distinguishes the reason.
|
||||||
*/
|
*/
|
||||||
export async function requireAdmin(
|
export async function requireAdmin(
|
||||||
req: Request,
|
req: Request,
|
||||||
|
|
@ -51,20 +75,13 @@ export async function requireAdmin(
|
||||||
throw new HttpError(401, ErrorCode.NOT_AUTHENTICATED, "Not authenticated");
|
throw new HttpError(401, ErrorCode.NOT_AUTHENTICATED, "Not authenticated");
|
||||||
}
|
}
|
||||||
|
|
||||||
const payload = verifyAdminToken(token);
|
res.locals.adminUser = await resolveAdminFromToken(token);
|
||||||
const admin = await prisma.adminUser.findUnique({ where: { id: payload.adminUserId } });
|
|
||||||
|
|
||||||
if (!admin || admin.tokenVersion !== payload.tokenVersion) {
|
|
||||||
throw new HttpError(401, ErrorCode.NOT_AUTHENTICATED, "Not authenticated");
|
|
||||||
}
|
|
||||||
|
|
||||||
res.locals.adminUser = toSafeAdmin(admin);
|
|
||||||
next();
|
next();
|
||||||
} catch (err) {
|
} catch (err) {
|
||||||
if (err instanceof HttpError) {
|
if (err instanceof HttpError) {
|
||||||
next(err);
|
next(err);
|
||||||
} else {
|
} else {
|
||||||
// Covers jwt.verify failures and the unset-secret throw from verifyAdminToken.
|
// Covers everything resolveAdminFromToken can throw.
|
||||||
next(new HttpError(401, ErrorCode.NOT_AUTHENTICATED, "Not authenticated"));
|
next(new HttpError(401, ErrorCode.NOT_AUTHENTICATED, "Not authenticated"));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -13,16 +13,34 @@ import { toSafeProfile } from "../lib/safe-profile.js";
|
||||||
* typed, no cast needed.
|
* typed, no cast needed.
|
||||||
*/
|
*/
|
||||||
export interface AuthLocals {
|
export interface AuthLocals {
|
||||||
/** The authenticated profile, resolved from the session cookie's JWT. */
|
/** The authenticated profile, resolved from the session cookie's JWT (or an `Authorization: Bearer` one, for cookie-less clients). */
|
||||||
userProfile: SafeUserProfile;
|
userProfile: SafeUserProfile;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Pulls the raw JWT out of an `Authorization: Bearer <jwt>` header, or
|
||||||
|
* returns `null` if it's absent or malformed. This is the fallback path for
|
||||||
|
* clients that can't rely on the `session` cookie — a Capacitor WebView,
|
||||||
|
* whose origin never receives a `SameSite=Lax` cookie (see `AuthResponse`
|
||||||
|
* in packages/shared). The cookie remains the primary mechanism; this only
|
||||||
|
* kicks in when the cookie isn't there.
|
||||||
|
*/
|
||||||
|
function readBearerToken(header: string | undefined): string | null {
|
||||||
|
if (!header?.startsWith("Bearer ")) {
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
const token = header.slice("Bearer ".length).trim();
|
||||||
|
return token.length > 0 ? token : null;
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Express middleware guarding routes that require an authenticated
|
* Express middleware guarding routes that require an authenticated
|
||||||
* profile. Reads the session cookie, verifies the JWT, and re-checks
|
* profile. Reads the session cookie (falling back to an `Authorization:
|
||||||
* `tokenVersion` against the database — so a stateless JWT can still be
|
* Bearer <jwt>` header when there's no cookie — see {@link readBearerToken}),
|
||||||
* invalidated server-side (e.g. on password change / logout-everywhere,
|
* verifies the JWT, and re-checks `tokenVersion` against the database — so a
|
||||||
* once that feature exists) despite carrying no server-side session.
|
* stateless JWT can still be invalidated server-side (e.g. on password
|
||||||
|
* change / logout-everywhere, once that feature exists) despite carrying no
|
||||||
|
* server-side session.
|
||||||
*
|
*
|
||||||
* On success, attaches the resolved profile to `res.locals.userProfile`
|
* On success, attaches the resolved profile to `res.locals.userProfile`
|
||||||
* (typed via {@link AuthLocals}) for downstream handlers to use.
|
* (typed via {@link AuthLocals}) for downstream handlers to use.
|
||||||
|
|
@ -33,9 +51,9 @@ export interface AuthLocals {
|
||||||
* project-wide ambient augmentation silently changing every `Request` in
|
* project-wide ambient augmentation silently changing every `Request` in
|
||||||
* the codebase, whether or not it went through this middleware.
|
* the codebase, whether or not it went through this middleware.
|
||||||
*
|
*
|
||||||
* @throws {HttpError} `401 NOT_AUTHENTICATED` for any failure — missing
|
* @throws {HttpError} `401 NOT_AUTHENTICATED` for any failure — no cookie
|
||||||
* cookie, malformed/expired JWT, unknown profile, or stale tokenVersion.
|
* and no usable Bearer header, malformed/expired JWT, unknown profile, or
|
||||||
* Never distinguishes the reason to the client.
|
* stale tokenVersion. Never distinguishes the reason to the client.
|
||||||
*/
|
*/
|
||||||
export async function requireAuth(
|
export async function requireAuth(
|
||||||
req: Request,
|
req: Request,
|
||||||
|
|
@ -43,7 +61,11 @@ export async function requireAuth(
|
||||||
next: NextFunction,
|
next: NextFunction,
|
||||||
) {
|
) {
|
||||||
try {
|
try {
|
||||||
const token = req.cookies?.[env.AUTH_COOKIE_NAME];
|
const cookieToken = req.cookies?.[env.AUTH_COOKIE_NAME];
|
||||||
|
// Cookie first (the browser's mechanism, unchanged); `Authorization:
|
||||||
|
// Bearer` as a fallback for cookie-less clients — see readBearerToken.
|
||||||
|
const token =
|
||||||
|
typeof cookieToken === "string" ? cookieToken : readBearerToken(req.headers.authorization);
|
||||||
if (typeof token !== "string") {
|
if (typeof token !== "string") {
|
||||||
throw new HttpError(401, ErrorCode.NOT_AUTHENTICATED, "Not authenticated");
|
throw new HttpError(401, ErrorCode.NOT_AUTHENTICATED, "Not authenticated");
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -5,7 +5,7 @@ import { env } from "../../config/env.js";
|
||||||
import { type AdminLocals, requireAdmin } from "../../middlewares/require-admin.js";
|
import { type AdminLocals, requireAdmin } from "../../middlewares/require-admin.js";
|
||||||
import { adminLogin } from "./admin-auth.service.js";
|
import { adminLogin } from "./admin-auth.service.js";
|
||||||
|
|
||||||
/** Router mounted at `/admin/auth` (via `admin.routes.ts`) — admin login, logout, current-admin. No signup: admins are created out-of-band (`src/scripts/create-admin.ts`). */
|
/** Router mounted at `/admin/api/auth` (via `admin.routes.ts`) — admin login, logout, current-admin. No signup: admins are created out-of-band (`src/scripts/create-admin.ts`). */
|
||||||
export const adminAuthRouter = Router();
|
export const adminAuthRouter = Router();
|
||||||
|
|
||||||
const SEVEN_DAYS_MS = 7 * 24 * 60 * 60 * 1000;
|
const SEVEN_DAYS_MS = 7 * 24 * 60 * 60 * 1000;
|
||||||
|
|
|
||||||
|
|
@ -1,5 +1,10 @@
|
||||||
import { wrapAsyncHandler } from "@batch-cooking/express-tools";
|
import { wrapAsyncHandler } from "@batch-cooking/express-tools";
|
||||||
import { listPlaceholdersQuerySchema, markPlaceholdersReviewedSchema } from "@batch-cooking/shared";
|
import {
|
||||||
|
listPlaceholdersQuerySchema,
|
||||||
|
listTechStepPlaceholdersQuerySchema,
|
||||||
|
markPlaceholdersReviewedSchema,
|
||||||
|
markTechStepPlaceholdersReviewedSchema,
|
||||||
|
} from "@batch-cooking/shared";
|
||||||
import { Router } from "express";
|
import { Router } from "express";
|
||||||
import { requireAdmin } from "../../middlewares/require-admin.js";
|
import { requireAdmin } from "../../middlewares/require-admin.js";
|
||||||
import {
|
import {
|
||||||
|
|
@ -7,12 +12,17 @@ import {
|
||||||
markPlaceholdersReviewed,
|
markPlaceholdersReviewed,
|
||||||
pruneOrphanPlaceholders,
|
pruneOrphanPlaceholders,
|
||||||
} from "./admin-catalog.service.js";
|
} from "./admin-catalog.service.js";
|
||||||
|
import {
|
||||||
|
listTechStepPlaceholders,
|
||||||
|
markTechStepPlaceholdersReviewed,
|
||||||
|
} from "./admin-tech-step-catalog.service.js";
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Router mounted at `/admin/catalog` (via `admin.routes.ts`) — every route
|
* Router mounted at `/admin/api/catalog` (via `admin.routes.ts`) — every route
|
||||||
* behind {@link requireAdmin}. Surfaces the off-catalog ingredient
|
* behind {@link requireAdmin}. Surfaces the off-catalog "placeholders" users
|
||||||
* "placeholders" users typed when the seeded catalog fell short, so a
|
* typed when the seeded catalog fell short — free-text ingredients on a
|
||||||
* maintainer can see what's missing and mark gaps as handled.
|
* recipe line, and free-text techniques while correcting a step (issue #130)
|
||||||
|
* — so a maintainer can see what's missing and mark gaps as handled.
|
||||||
*/
|
*/
|
||||||
export const adminCatalogRouter = Router();
|
export const adminCatalogRouter = Router();
|
||||||
|
|
||||||
|
|
@ -42,3 +52,29 @@ adminCatalogRouter.post(
|
||||||
res.status(200).json(await pruneOrphanPlaceholders());
|
res.status(200).json(await pruneOrphanPlaceholders());
|
||||||
}),
|
}),
|
||||||
);
|
);
|
||||||
|
|
||||||
|
// --- Missing techniques (issue #130) --------------------------------------
|
||||||
|
|
||||||
|
adminCatalogRouter.get(
|
||||||
|
"/tech-step-placeholders",
|
||||||
|
requireAdmin,
|
||||||
|
wrapAsyncHandler(async (req, res) => {
|
||||||
|
res
|
||||||
|
.status(200)
|
||||||
|
.json(await listTechStepPlaceholders(listTechStepPlaceholdersQuerySchema.parse(req.query)));
|
||||||
|
}),
|
||||||
|
);
|
||||||
|
|
||||||
|
adminCatalogRouter.patch(
|
||||||
|
"/tech-step-placeholders/mark-reviewed",
|
||||||
|
requireAdmin,
|
||||||
|
wrapAsyncHandler(async (req, res) => {
|
||||||
|
res
|
||||||
|
.status(200)
|
||||||
|
.json(
|
||||||
|
await markTechStepPlaceholdersReviewed(
|
||||||
|
markTechStepPlaceholdersReviewedSchema.parse(req.body),
|
||||||
|
),
|
||||||
|
);
|
||||||
|
}),
|
||||||
|
);
|
||||||
|
|
|
||||||
59
apps/api/src/modules/admin/admin-contact.routes.ts
Normal file
59
apps/api/src/modules/admin/admin-contact.routes.ts
Normal file
|
|
@ -0,0 +1,59 @@
|
||||||
|
import { HttpError } from "@batch-cooking/error-tools";
|
||||||
|
import { wrapAsyncHandler } from "@batch-cooking/express-tools";
|
||||||
|
import {
|
||||||
|
createForgejoIssueSchema,
|
||||||
|
ErrorCode,
|
||||||
|
listContactMessagesQuerySchema,
|
||||||
|
} from "@batch-cooking/shared";
|
||||||
|
import { Router } from "express";
|
||||||
|
import { requireAdmin } from "../../middlewares/require-admin.js";
|
||||||
|
import {
|
||||||
|
createForgejoIssueFromMessage,
|
||||||
|
getForgejoStatus,
|
||||||
|
listContactMessages,
|
||||||
|
} from "./admin-contact.service.js";
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Router mounted at `/admin/api/contact` (via `admin.routes.ts`) — behind
|
||||||
|
* {@link requireAdmin}. Backs the `/admin/messages` page: the read-only list
|
||||||
|
* of contact-form messages (issue #80), plus "create a Forgejo issue from
|
||||||
|
* this message" (issue #81). Still no message-mutation routes — the message
|
||||||
|
* itself stays read-only.
|
||||||
|
*/
|
||||||
|
export const adminContactRouter = Router();
|
||||||
|
|
||||||
|
adminContactRouter.get(
|
||||||
|
"/",
|
||||||
|
requireAdmin,
|
||||||
|
wrapAsyncHandler(async (req, res) => {
|
||||||
|
res
|
||||||
|
.status(200)
|
||||||
|
.json(await listContactMessages(listContactMessagesQuerySchema.parse(req.query)));
|
||||||
|
}),
|
||||||
|
);
|
||||||
|
|
||||||
|
// Static path — declared before `/:id/...` so it's never parsed as an id.
|
||||||
|
adminContactRouter.get(
|
||||||
|
"/forgejo/status",
|
||||||
|
requireAdmin,
|
||||||
|
wrapAsyncHandler(async (_req, res) => {
|
||||||
|
res.status(200).json(getForgejoStatus());
|
||||||
|
}),
|
||||||
|
);
|
||||||
|
|
||||||
|
adminContactRouter.post(
|
||||||
|
"/:id/forgejo-issue",
|
||||||
|
requireAdmin,
|
||||||
|
wrapAsyncHandler(async (req, res) => {
|
||||||
|
const id = Number(req.params.id);
|
||||||
|
if (!Number.isInteger(id) || id <= 0) {
|
||||||
|
throw new HttpError(
|
||||||
|
400,
|
||||||
|
ErrorCode.VALIDATION_ERROR,
|
||||||
|
`Not a valid contact message id: ${req.params.id}`,
|
||||||
|
);
|
||||||
|
}
|
||||||
|
const input = createForgejoIssueSchema.parse(req.body);
|
||||||
|
res.status(200).json(await createForgejoIssueFromMessage(id, input));
|
||||||
|
}),
|
||||||
|
);
|
||||||
133
apps/api/src/modules/admin/admin-contact.service.ts
Normal file
133
apps/api/src/modules/admin/admin-contact.service.ts
Normal file
|
|
@ -0,0 +1,133 @@
|
||||||
|
import { HttpError } from "@batch-cooking/error-tools";
|
||||||
|
import {
|
||||||
|
type ContactMessageAdminView,
|
||||||
|
type ContactMessageType,
|
||||||
|
type CreateForgejoIssueInput,
|
||||||
|
ErrorCode,
|
||||||
|
type ForgejoIntegrationStatus,
|
||||||
|
type ListContactMessagesQuery,
|
||||||
|
} from "@batch-cooking/shared";
|
||||||
|
import { prisma } from "../../db/prisma.js";
|
||||||
|
import { forgejo } from "../../lib/forgejo/forgejo.service.js";
|
||||||
|
|
||||||
|
/** How many messages `listContactMessages` returns per call — the page is a triage view, not an export (same cap/rationale as `CORRECTIONS_PAGE_SIZE`). */
|
||||||
|
const CONTACT_MESSAGES_PAGE_SIZE = 200;
|
||||||
|
|
||||||
|
const contactMessageInclude = {
|
||||||
|
author: { select: { id: true, firstName: true, lastName: true, email: true } },
|
||||||
|
} as const;
|
||||||
|
|
||||||
|
type ContactMessageRow = Awaited<
|
||||||
|
ReturnType<
|
||||||
|
typeof prisma.contactMessage.findFirstOrThrow<{ include: typeof contactMessageInclude }>
|
||||||
|
>
|
||||||
|
>;
|
||||||
|
|
||||||
|
/** Shapes one Prisma `ContactMessage` row (with {@link contactMessageInclude}) into its admin view. */
|
||||||
|
function toContactMessageAdminView(row: ContactMessageRow): ContactMessageAdminView {
|
||||||
|
return {
|
||||||
|
id: row.id,
|
||||||
|
// Safe cast: `POST /contact` validates `type` against
|
||||||
|
// `CONTACT_MESSAGE_TYPES` before insert, so the column only ever holds
|
||||||
|
// one of those values.
|
||||||
|
type: row.type as ContactMessageType,
|
||||||
|
message: row.message,
|
||||||
|
pageUrl: row.pageUrl,
|
||||||
|
userAgent: row.userAgent,
|
||||||
|
appVersion: row.appVersion,
|
||||||
|
createdAt: row.createdAt.toISOString(),
|
||||||
|
// `null` when the sender's account was deleted after sending
|
||||||
|
// (`authorId` is `onDelete: SetNull`).
|
||||||
|
author: row.author,
|
||||||
|
forgejoIssueNumber: row.forgejoIssueNumber,
|
||||||
|
forgejoIssueUrl: row.forgejoIssueUrl,
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Every `ContactMessage` for the admin read view (`/admin/messages`, issue
|
||||||
|
* #80) — newest first, capped at {@link CONTACT_MESSAGES_PAGE_SIZE}, with an
|
||||||
|
* optional single-`type` filter. Read-only: this first version has no
|
||||||
|
* triage workflow (status / assignment / notes), so there's no update
|
||||||
|
* counterpart.
|
||||||
|
*/
|
||||||
|
export async function listContactMessages(
|
||||||
|
query: ListContactMessagesQuery,
|
||||||
|
): Promise<ContactMessageAdminView[]> {
|
||||||
|
try {
|
||||||
|
const rows = await prisma.contactMessage.findMany({
|
||||||
|
where: query.type ? { type: query.type } : {},
|
||||||
|
orderBy: { createdAt: "desc" },
|
||||||
|
take: CONTACT_MESSAGES_PAGE_SIZE,
|
||||||
|
include: contactMessageInclude,
|
||||||
|
});
|
||||||
|
return rows.map(toContactMessageAdminView);
|
||||||
|
} catch (err) {
|
||||||
|
// Rethrown as-is — see `admin-tech-steps.service.ts`'s equivalent catch.
|
||||||
|
throw err;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/** Whether the "create a Forgejo issue from a message" feature is usable (issue #81) — drives whether the admin UI shows the button. */
|
||||||
|
export function getForgejoStatus(): ForgejoIntegrationStatus {
|
||||||
|
return { enabled: forgejo.isConfigured() };
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Creates a Forgejo issue from contact message `messageId` and records the
|
||||||
|
* link on the row (issue #81). The `title`/`body` come from the admin's
|
||||||
|
* pre-filled, edited modal.
|
||||||
|
*
|
||||||
|
* Order matters: every precondition is checked before Forgejo is called,
|
||||||
|
* and the row is only touched *after* Forgejo succeeds — a failed call
|
||||||
|
* leaves no partial state (no linked issue, button still shown).
|
||||||
|
*
|
||||||
|
* @throws {HttpError} `503 FORGEJO_NOT_CONFIGURED` (env not set),
|
||||||
|
* `404 CONTACT_MESSAGE_NOT_FOUND`, `409 CONTACT_MESSAGE_ALREADY_LINKED`
|
||||||
|
* (already has an issue), or `502 FORGEJO_REQUEST_FAILED` (the Forgejo
|
||||||
|
* call failed — DB untouched).
|
||||||
|
*/
|
||||||
|
export async function createForgejoIssueFromMessage(
|
||||||
|
messageId: number,
|
||||||
|
input: CreateForgejoIssueInput,
|
||||||
|
): Promise<ContactMessageAdminView> {
|
||||||
|
try {
|
||||||
|
if (!forgejo.isConfigured()) {
|
||||||
|
throw new HttpError(
|
||||||
|
503,
|
||||||
|
ErrorCode.FORGEJO_NOT_CONFIGURED,
|
||||||
|
"Forgejo integration is not configured",
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
const existing = await prisma.contactMessage.findUnique({ where: { id: messageId } });
|
||||||
|
if (!existing) {
|
||||||
|
throw new HttpError(
|
||||||
|
404,
|
||||||
|
ErrorCode.CONTACT_MESSAGE_NOT_FOUND,
|
||||||
|
`Contact message ${messageId} not found`,
|
||||||
|
);
|
||||||
|
}
|
||||||
|
if (existing.forgejoIssueNumber !== null) {
|
||||||
|
throw new HttpError(
|
||||||
|
409,
|
||||||
|
ErrorCode.CONTACT_MESSAGE_ALREADY_LINKED,
|
||||||
|
`Contact message ${messageId} already links to Forgejo issue #${existing.forgejoIssueNumber}`,
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
// Throws `502 FORGEJO_REQUEST_FAILED` on any failure — propagated below,
|
||||||
|
// before the row is touched.
|
||||||
|
const issue = await forgejo.createIssue({ title: input.title, body: input.body });
|
||||||
|
|
||||||
|
const updated = await prisma.contactMessage.update({
|
||||||
|
where: { id: messageId },
|
||||||
|
data: { forgejoIssueNumber: issue.number, forgejoIssueUrl: issue.htmlUrl },
|
||||||
|
include: contactMessageInclude,
|
||||||
|
});
|
||||||
|
return toContactMessageAdminView(updated);
|
||||||
|
} catch (err) {
|
||||||
|
// Rethrown as-is — see `admin-tech-steps.service.ts`'s equivalent catch.
|
||||||
|
throw err;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
@ -4,7 +4,7 @@ import { Router } from "express";
|
||||||
import { requireAdmin } from "../../middlewares/require-admin.js";
|
import { requireAdmin } from "../../middlewares/require-admin.js";
|
||||||
import { getMetrics } from "./admin-metrics.service.js";
|
import { getMetrics } from "./admin-metrics.service.js";
|
||||||
|
|
||||||
/** Router mounted at `/admin/metrics` (via `admin.routes.ts`) — every route behind {@link requireAdmin}. */
|
/** Router mounted at `/admin/api/metrics` (via `admin.routes.ts`) — every route behind {@link requireAdmin}. */
|
||||||
export const adminMetricsRouter = Router();
|
export const adminMetricsRouter = Router();
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
|
||||||
|
|
@ -1,20 +0,0 @@
|
||||||
import { wrapAsyncHandler } from "@batch-cooking/express-tools";
|
|
||||||
import { Router } from "express";
|
|
||||||
import { requireAdmin } from "../../middlewares/require-admin.js";
|
|
||||||
import { getMonitoring } from "./admin-monitoring.service.js";
|
|
||||||
|
|
||||||
/** Router mounted at `/admin/monitoring` (via `admin.routes.ts`) — behind {@link requireAdmin}. */
|
|
||||||
export const adminMonitoringRouter = Router();
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Actively probes Postgres, the API, `tech-step-intent-service` and the LLM
|
|
||||||
* worker's heartbeat, returning a {@link MonitoringView} status board (see
|
|
||||||
* {@link getMonitoring}). No params; the admin UI polls it on an interval.
|
|
||||||
*/
|
|
||||||
adminMonitoringRouter.get(
|
|
||||||
"/",
|
|
||||||
requireAdmin,
|
|
||||||
wrapAsyncHandler(async (_req, res) => {
|
|
||||||
res.status(200).json(await getMonitoring());
|
|
||||||
}),
|
|
||||||
);
|
|
||||||
|
|
@ -155,7 +155,13 @@ async function probeWorker(): Promise<ServiceHealthView> {
|
||||||
* Postgres, the API itself, `tech-step-intent-service` (`/health`), and the
|
* Postgres, the API itself, `tech-step-intent-service` (`/health`), and the
|
||||||
* LLM worker (via its stored heartbeat). Each probe is independent and
|
* LLM worker (via its stored heartbeat). Each probe is independent and
|
||||||
* bounded ({@link PROBE_TIMEOUT_MS}); one being `down` never fails the
|
* bounded ({@link PROBE_TIMEOUT_MS}); one being `down` never fails the
|
||||||
* others or the endpoint.
|
* others or this call as a whole.
|
||||||
|
*
|
||||||
|
* No HTTP route calls this directly (there was one, `GET
|
||||||
|
* /admin/api/monitoring` — removed) — `MonitoringBroadcastService`
|
||||||
|
* (`lib/monitoring-broadcast.service.ts`) is the only caller now, on a
|
||||||
|
* server-side timer, broadcasting the result over WebSocket instead of
|
||||||
|
* each admin's browser polling this on its own.
|
||||||
*/
|
*/
|
||||||
export async function getMonitoring(): Promise<MonitoringView> {
|
export async function getMonitoring(): Promise<MonitoringView> {
|
||||||
try {
|
try {
|
||||||
|
|
|
||||||
|
|
@ -0,0 +1,87 @@
|
||||||
|
import type {
|
||||||
|
ListTechStepPlaceholdersQuery,
|
||||||
|
MarkTechStepPlaceholdersReviewedInput,
|
||||||
|
TechStepPlaceholderView,
|
||||||
|
} from "@batch-cooking/shared";
|
||||||
|
import { prisma } from "../../db/prisma.js";
|
||||||
|
|
||||||
|
/**
|
||||||
|
* The missing-technique review (issue #130) — the tech-step counterpart of
|
||||||
|
* `admin-catalog.service.ts`'s off-catalog *ingredient* review. Kept a flat
|
||||||
|
* list rather than grouping near-duplicate spellings the way that one does:
|
||||||
|
* correcting a technique — let alone typing one the catalog is missing — is
|
||||||
|
* rare enough that a handful of raw rows is all a maintainer ever sees here.
|
||||||
|
*/
|
||||||
|
|
||||||
|
/** Prisma `include` for the placeholder query — a bounded set of the `StepTechStep` rows pointing at this technique, each resolved to just its recipe id/name for the count + "seen in…" preview. */
|
||||||
|
const placeholderInclude = {
|
||||||
|
steps: {
|
||||||
|
take: 50,
|
||||||
|
include: { step: { select: { recipe: { select: { id: true, name: true } } } } },
|
||||||
|
},
|
||||||
|
} as const;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Every placeholder `TechStep` (see `TechStep.isPlaceholder` in
|
||||||
|
* schema.prisma), most-impactful first (most distinct recipes, then name).
|
||||||
|
*
|
||||||
|
* `query.reviewed` selects which side to show: omitted / `"false"` drops
|
||||||
|
* rows already triaged (`reviewedAt` set) — the default working list;
|
||||||
|
* `"true"` keeps only those.
|
||||||
|
*/
|
||||||
|
export async function listTechStepPlaceholders(
|
||||||
|
query: ListTechStepPlaceholdersQuery,
|
||||||
|
): Promise<TechStepPlaceholderView[]> {
|
||||||
|
try {
|
||||||
|
const rows = await prisma.techStep.findMany({
|
||||||
|
where: { isPlaceholder: true },
|
||||||
|
include: placeholderInclude,
|
||||||
|
orderBy: { createdAt: "asc" },
|
||||||
|
});
|
||||||
|
|
||||||
|
const wantReviewed = query.reviewed === "true";
|
||||||
|
return rows
|
||||||
|
.filter((row) => (row.reviewedAt !== null) === wantReviewed)
|
||||||
|
.map((row) => {
|
||||||
|
const recipeById = new Map<number, string>();
|
||||||
|
for (const link of row.steps) {
|
||||||
|
recipeById.set(link.step.recipe.id, link.step.recipe.name);
|
||||||
|
}
|
||||||
|
return {
|
||||||
|
id: row.id,
|
||||||
|
displayName: row.displayName ?? "",
|
||||||
|
createdAt: row.createdAt?.toISOString() ?? null,
|
||||||
|
reviewedAt: row.reviewedAt?.toISOString() ?? null,
|
||||||
|
recipeCount: recipeById.size,
|
||||||
|
sampleRecipes: [...recipeById.entries()].slice(0, 5).map(([id, name]) => ({ id, name })),
|
||||||
|
};
|
||||||
|
})
|
||||||
|
.sort(
|
||||||
|
(a, b) => b.recipeCount - a.recipeCount || a.displayName.localeCompare(b.displayName, "fr"),
|
||||||
|
);
|
||||||
|
} catch (err) {
|
||||||
|
throw err; // see recipe.service.ts's equivalent catch comment
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Stamps `reviewedAt` on the given placeholder `TechStep` ids — a
|
||||||
|
* maintainer has seen this proposal (and, if it warranted it, promoted it
|
||||||
|
* into `reference-seed-data.ts` + `tech-step-training-data.ts` by hand; this
|
||||||
|
* endpoint never touches the catalog itself). Scoped to
|
||||||
|
* `isPlaceholder: true` so a stray real id is a silent no-op. Returns how
|
||||||
|
* many rows were actually stamped.
|
||||||
|
*/
|
||||||
|
export async function markTechStepPlaceholdersReviewed(
|
||||||
|
input: MarkTechStepPlaceholdersReviewedInput,
|
||||||
|
): Promise<{ reviewed: number }> {
|
||||||
|
try {
|
||||||
|
const { count } = await prisma.techStep.updateMany({
|
||||||
|
where: { id: { in: input.techStepIds }, isPlaceholder: true },
|
||||||
|
data: { reviewedAt: new Date() },
|
||||||
|
});
|
||||||
|
return { reviewed: count };
|
||||||
|
} catch (err) {
|
||||||
|
throw err; // see recipe.service.ts's equivalent catch comment
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
@ -18,7 +18,7 @@ import {
|
||||||
updateSuggestion,
|
updateSuggestion,
|
||||||
} from "./admin-tech-steps.service.js";
|
} from "./admin-tech-steps.service.js";
|
||||||
|
|
||||||
/** Router mounted at `/admin/tech-steps` (via `admin.routes.ts`) — every route behind {@link requireAdmin}. Correction/suggestion triage + the retrain trigger. */
|
/** Router mounted at `/admin/api/tech-steps` (via `admin.routes.ts`) — every route behind {@link requireAdmin}. Correction/suggestion triage + the retrain trigger. */
|
||||||
export const adminTechStepsRouter = Router();
|
export const adminTechStepsRouter = Router();
|
||||||
|
|
||||||
adminTechStepsRouter.get(
|
adminTechStepsRouter.get(
|
||||||
|
|
|
||||||
80
apps/api/src/modules/admin/admin-tours.routes.ts
Normal file
80
apps/api/src/modules/admin/admin-tours.routes.ts
Normal file
|
|
@ -0,0 +1,80 @@
|
||||||
|
import { HttpError } from "@batch-cooking/error-tools";
|
||||||
|
import { wrapAsyncHandler } from "@batch-cooking/express-tools";
|
||||||
|
import {
|
||||||
|
createTourScenarioSchema,
|
||||||
|
ErrorCode,
|
||||||
|
updateTourScenarioSchema,
|
||||||
|
} from "@batch-cooking/shared";
|
||||||
|
import { Router } from "express";
|
||||||
|
import { requireAdmin } from "../../middlewares/require-admin.js";
|
||||||
|
import {
|
||||||
|
createTourScenario,
|
||||||
|
deleteTourScenario,
|
||||||
|
listTourScenarios,
|
||||||
|
listTourTargets,
|
||||||
|
updateTourScenario,
|
||||||
|
} from "./admin-tours.service.js";
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Router mounted at `/admin/api/tours` (via `admin.routes.ts`) — every
|
||||||
|
* route behind {@link requireAdmin}. Full CRUD over the guided-tour
|
||||||
|
* scenarios the public `GET /reference/tours` serves to the web tour
|
||||||
|
* engine (issues #42/#44).
|
||||||
|
*/
|
||||||
|
export const adminToursRouter = Router();
|
||||||
|
|
||||||
|
/** Express types a numeric route param `string | undefined`; parse + validate here. */
|
||||||
|
function parseId(value: string | undefined): number {
|
||||||
|
const id = Number(value);
|
||||||
|
if (!Number.isInteger(id) || id <= 0) {
|
||||||
|
throw new HttpError(400, ErrorCode.VALIDATION_ERROR, `Invalid tour scenario id "${value}"`);
|
||||||
|
}
|
||||||
|
return id;
|
||||||
|
}
|
||||||
|
|
||||||
|
adminToursRouter.get(
|
||||||
|
"/",
|
||||||
|
requireAdmin,
|
||||||
|
wrapAsyncHandler(async (_req, res) => {
|
||||||
|
res.status(200).json(await listTourScenarios());
|
||||||
|
}),
|
||||||
|
);
|
||||||
|
|
||||||
|
/** The catalogue of valid highlight targets — for the editor's per-step target picker. */
|
||||||
|
adminToursRouter.get(
|
||||||
|
"/targets",
|
||||||
|
requireAdmin,
|
||||||
|
wrapAsyncHandler(async (_req, res) => {
|
||||||
|
res.status(200).json(await listTourTargets());
|
||||||
|
}),
|
||||||
|
);
|
||||||
|
|
||||||
|
adminToursRouter.post(
|
||||||
|
"/",
|
||||||
|
requireAdmin,
|
||||||
|
wrapAsyncHandler(async (req, res) => {
|
||||||
|
const scenario = await createTourScenario(createTourScenarioSchema.parse(req.body));
|
||||||
|
res.status(201).json(scenario);
|
||||||
|
}),
|
||||||
|
);
|
||||||
|
|
||||||
|
adminToursRouter.patch(
|
||||||
|
"/:id",
|
||||||
|
requireAdmin,
|
||||||
|
wrapAsyncHandler(async (req, res) => {
|
||||||
|
const scenario = await updateTourScenario(
|
||||||
|
parseId(req.params.id),
|
||||||
|
updateTourScenarioSchema.parse(req.body),
|
||||||
|
);
|
||||||
|
res.status(200).json(scenario);
|
||||||
|
}),
|
||||||
|
);
|
||||||
|
|
||||||
|
adminToursRouter.delete(
|
||||||
|
"/:id",
|
||||||
|
requireAdmin,
|
||||||
|
wrapAsyncHandler(async (req, res) => {
|
||||||
|
await deleteTourScenario(parseId(req.params.id));
|
||||||
|
res.status(204).end();
|
||||||
|
}),
|
||||||
|
);
|
||||||
175
apps/api/src/modules/admin/admin-tours.service.ts
Normal file
175
apps/api/src/modules/admin/admin-tours.service.ts
Normal file
|
|
@ -0,0 +1,175 @@
|
||||||
|
import { HttpError } from "@batch-cooking/error-tools";
|
||||||
|
import {
|
||||||
|
type AdminTourScenarioView,
|
||||||
|
type CreateTourScenarioInput,
|
||||||
|
ErrorCode,
|
||||||
|
type TourTargetView,
|
||||||
|
type UpdateTourScenarioInput,
|
||||||
|
} from "@batch-cooking/shared";
|
||||||
|
import { Prisma } from "@prisma/client";
|
||||||
|
import { prisma } from "../../db/prisma.js";
|
||||||
|
|
||||||
|
/** Shapes one Prisma `TourScenario` (with its steps) into the admin view. */
|
||||||
|
function toAdminView(scenario: {
|
||||||
|
id: number;
|
||||||
|
key: string;
|
||||||
|
name: string;
|
||||||
|
enabled: boolean;
|
||||||
|
steps: Array<{
|
||||||
|
order: number;
|
||||||
|
route: string | null;
|
||||||
|
targetKey: string;
|
||||||
|
title: string;
|
||||||
|
content: string;
|
||||||
|
}>;
|
||||||
|
}): AdminTourScenarioView {
|
||||||
|
return {
|
||||||
|
id: scenario.id,
|
||||||
|
key: scenario.key,
|
||||||
|
name: scenario.name,
|
||||||
|
enabled: scenario.enabled,
|
||||||
|
steps: scenario.steps
|
||||||
|
.slice()
|
||||||
|
.sort((a, b) => a.order - b.order)
|
||||||
|
.map((step) => ({
|
||||||
|
order: step.order,
|
||||||
|
route: step.route,
|
||||||
|
targetKey: step.targetKey,
|
||||||
|
title: step.title,
|
||||||
|
content: step.content,
|
||||||
|
})),
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
/** Every tour scenario — enabled *and* disabled — with its ordered steps. */
|
||||||
|
export async function listTourScenarios(): Promise<AdminTourScenarioView[]> {
|
||||||
|
try {
|
||||||
|
const scenarios = await prisma.tourScenario.findMany({
|
||||||
|
orderBy: { key: "asc" },
|
||||||
|
include: { steps: { orderBy: { order: "asc" } } },
|
||||||
|
});
|
||||||
|
return scenarios.map(toAdminView);
|
||||||
|
} catch (err) {
|
||||||
|
throw err; // see the repo's service-layer try/catch convention
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/** The catalogue of valid highlight targets, for the editor's target picker. */
|
||||||
|
export async function listTourTargets(): Promise<TourTargetView[]> {
|
||||||
|
try {
|
||||||
|
return await prisma.tourTarget.findMany({ orderBy: { key: "asc" } });
|
||||||
|
} catch (err) {
|
||||||
|
throw err;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Creates an empty scenario (no steps yet — the editor adds them via
|
||||||
|
* {@link updateTourScenario}).
|
||||||
|
*
|
||||||
|
* @throws {HttpError} `409 TOUR_KEY_ALREADY_IN_USE` if `key` is taken.
|
||||||
|
*/
|
||||||
|
export async function createTourScenario(
|
||||||
|
input: CreateTourScenarioInput,
|
||||||
|
): Promise<AdminTourScenarioView> {
|
||||||
|
try {
|
||||||
|
const scenario = await prisma.tourScenario.create({
|
||||||
|
data: { key: input.key, name: input.name },
|
||||||
|
include: { steps: true },
|
||||||
|
});
|
||||||
|
return toAdminView(scenario);
|
||||||
|
} catch (err) {
|
||||||
|
if (err instanceof Prisma.PrismaClientKnownRequestError && err.code === "P2002") {
|
||||||
|
throw new HttpError(
|
||||||
|
409,
|
||||||
|
ErrorCode.TOUR_KEY_ALREADY_IN_USE,
|
||||||
|
`A tour scenario with key "${input.key}" already exists`,
|
||||||
|
);
|
||||||
|
}
|
||||||
|
throw err;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Updates a scenario's `name`/`enabled` and **replaces its entire step
|
||||||
|
* list** (delete-all then recreate with `order` = array index) — the same
|
||||||
|
* block-replace `updateRecipe` uses for a recipe's steps, not a partial
|
||||||
|
* patch. `key` is immutable.
|
||||||
|
*
|
||||||
|
* @throws {HttpError} `404 TOUR_NOT_FOUND` if `id` matches no scenario.
|
||||||
|
* @throws {HttpError} `404 TOUR_TARGET_NOT_FOUND` if a step's `targetKey`
|
||||||
|
* isn't a seeded `TourTarget`.
|
||||||
|
*/
|
||||||
|
export async function updateTourScenario(
|
||||||
|
id: number,
|
||||||
|
input: UpdateTourScenarioInput,
|
||||||
|
): Promise<AdminTourScenarioView> {
|
||||||
|
try {
|
||||||
|
const existing = await prisma.tourScenario.findUnique({ where: { id } });
|
||||||
|
if (!existing) {
|
||||||
|
throw new HttpError(404, ErrorCode.TOUR_NOT_FOUND, `No tour scenario with id ${id}`);
|
||||||
|
}
|
||||||
|
|
||||||
|
const targetKeys = [...new Set(input.steps.map((step) => step.targetKey))];
|
||||||
|
if (targetKeys.length > 0) {
|
||||||
|
const known = await prisma.tourTarget.findMany({
|
||||||
|
where: { key: { in: targetKeys } },
|
||||||
|
select: { key: true },
|
||||||
|
});
|
||||||
|
const knownKeys = new Set(known.map((target) => target.key));
|
||||||
|
const unknown = targetKeys.find((key) => !knownKeys.has(key));
|
||||||
|
if (unknown !== undefined) {
|
||||||
|
throw new HttpError(
|
||||||
|
404,
|
||||||
|
ErrorCode.TOUR_TARGET_NOT_FOUND,
|
||||||
|
`No tour target with key "${unknown}"`,
|
||||||
|
);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
const [, , scenario] = await prisma.$transaction([
|
||||||
|
prisma.tourScenario.update({
|
||||||
|
where: { id },
|
||||||
|
data: { name: input.name, enabled: input.enabled },
|
||||||
|
}),
|
||||||
|
prisma.tourScenarioStep.deleteMany({ where: { scenarioId: id } }),
|
||||||
|
prisma.tourScenario.update({
|
||||||
|
where: { id },
|
||||||
|
data: {
|
||||||
|
steps: {
|
||||||
|
create: input.steps.map((step, index) => ({
|
||||||
|
order: index,
|
||||||
|
route: step.route,
|
||||||
|
targetKey: step.targetKey,
|
||||||
|
title: step.title,
|
||||||
|
content: step.content,
|
||||||
|
})),
|
||||||
|
},
|
||||||
|
},
|
||||||
|
include: { steps: { orderBy: { order: "asc" } } },
|
||||||
|
}),
|
||||||
|
]);
|
||||||
|
return toAdminView(scenario);
|
||||||
|
} catch (err) {
|
||||||
|
throw err;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Deletes a scenario. Its steps and every user's `TourProgress` row for it
|
||||||
|
* cascade away (a scenario that no longer exists has no "seen" state worth
|
||||||
|
* keeping).
|
||||||
|
*
|
||||||
|
* @throws {HttpError} `404 TOUR_NOT_FOUND` if `id` matches no scenario.
|
||||||
|
*/
|
||||||
|
export async function deleteTourScenario(id: number): Promise<void> {
|
||||||
|
try {
|
||||||
|
const existing = await prisma.tourScenario.findUnique({ where: { id } });
|
||||||
|
if (!existing) {
|
||||||
|
throw new HttpError(404, ErrorCode.TOUR_NOT_FOUND, `No tour scenario with id ${id}`);
|
||||||
|
}
|
||||||
|
await prisma.tourScenario.delete({ where: { id } });
|
||||||
|
} catch (err) {
|
||||||
|
throw err;
|
||||||
|
}
|
||||||
|
}
|
||||||
31
apps/api/src/modules/admin/admin-users.routes.ts
Normal file
31
apps/api/src/modules/admin/admin-users.routes.ts
Normal file
|
|
@ -0,0 +1,31 @@
|
||||||
|
import { wrapAsyncHandler } from "@batch-cooking/express-tools";
|
||||||
|
import { adminCreateUserSchema } from "@batch-cooking/shared";
|
||||||
|
import { Router } from "express";
|
||||||
|
import { requireAdmin } from "../../middlewares/require-admin.js";
|
||||||
|
import { createUserProfile, listUsers } from "./admin-users.service.js";
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Router mounted at `/admin/api/users` (via `admin.routes.ts`) — every route
|
||||||
|
* behind {@link requireAdmin}. Backs the `/admin/utilisateurs` page: a
|
||||||
|
* read-only list of end-user accounts and a "create an account by hand"
|
||||||
|
* form. The server generates a one-time temporary password on create and
|
||||||
|
* returns it in the response (see `admin-users.service.ts`).
|
||||||
|
*/
|
||||||
|
export const adminUsersRouter = Router();
|
||||||
|
|
||||||
|
adminUsersRouter.get(
|
||||||
|
"/",
|
||||||
|
requireAdmin,
|
||||||
|
wrapAsyncHandler(async (_req, res) => {
|
||||||
|
res.status(200).json(await listUsers());
|
||||||
|
}),
|
||||||
|
);
|
||||||
|
|
||||||
|
adminUsersRouter.post(
|
||||||
|
"/",
|
||||||
|
requireAdmin,
|
||||||
|
wrapAsyncHandler(async (req, res) => {
|
||||||
|
const input = adminCreateUserSchema.parse(req.body);
|
||||||
|
res.status(201).json(await createUserProfile(input));
|
||||||
|
}),
|
||||||
|
);
|
||||||
145
apps/api/src/modules/admin/admin-users.service.ts
Normal file
145
apps/api/src/modules/admin/admin-users.service.ts
Normal file
|
|
@ -0,0 +1,145 @@
|
||||||
|
import { randomInt } from "node:crypto";
|
||||||
|
import { HttpError } from "@batch-cooking/error-tools";
|
||||||
|
import {
|
||||||
|
type AdminCreateUserInput,
|
||||||
|
type AdminUserCreatedView,
|
||||||
|
type AdminUserListItemView,
|
||||||
|
ErrorCode,
|
||||||
|
} from "@batch-cooking/shared";
|
||||||
|
import argon2 from "argon2";
|
||||||
|
import { env } from "../../config/env.js";
|
||||||
|
import { prisma } from "../../db/prisma.js";
|
||||||
|
import { analytics } from "../../lib/analytics.service.js";
|
||||||
|
|
||||||
|
/**
|
||||||
|
* How many accounts `listUsers` returns per call. Like `CONTACT_MESSAGES_PAGE_SIZE`
|
||||||
|
* this is a triage view, not an export — the admin creates/looks up a handful
|
||||||
|
* of accounts, it never needs the whole table paginated.
|
||||||
|
*/
|
||||||
|
const USERS_PAGE_SIZE = 200;
|
||||||
|
|
||||||
|
// Same reasoning as `admin-auth.service.ts`'s / `auth.service.ts`'s `hashOptions`:
|
||||||
|
// argon2's real defaults are deliberately expensive; the test suite hashes
|
||||||
|
// against throwaway data many times per run, so a cheaper cost keeps it fast
|
||||||
|
// without weakening anything real. Never applies outside NODE_ENV=test.
|
||||||
|
const testHashOptions = { memoryCost: 8192, timeCost: 2, parallelism: 1 };
|
||||||
|
const hashOptions = env.NODE_ENV === "test" ? testHashOptions : undefined;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Charset for {@link generateTemporaryPassword} — upper/lower letters + digits,
|
||||||
|
* minus the visually ambiguous ones (`0`/`O`/`1`/`l`/`I`), same spirit as
|
||||||
|
* `house.service.ts`'s `INVITE_CODE_CHARS`: this string is read off one screen
|
||||||
|
* and typed into another (or pasted, but not always).
|
||||||
|
*/
|
||||||
|
const TEMP_PASSWORD_CHARS = "ABCDEFGHJKLMNPQRSTUVWXYZabcdefghijkmnpqrstuvwxyz23456789";
|
||||||
|
|
||||||
|
/** Length of a generated temporary password — comfortably above `signupSchema`'s 8-char floor. */
|
||||||
|
const TEMP_PASSWORD_LENGTH = 16;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* A fresh random temporary password for an admin-created account. Uses
|
||||||
|
* `node:crypto`'s `randomInt` (not `Math.random`) exactly like
|
||||||
|
* `generateInviteCode()` — this value guards a real account until its owner
|
||||||
|
* changes it. Returned to the operator once and never stored in plain text.
|
||||||
|
*/
|
||||||
|
function generateTemporaryPassword(): string {
|
||||||
|
let password = "";
|
||||||
|
for (let i = 0; i < TEMP_PASSWORD_LENGTH; i++) {
|
||||||
|
password += TEMP_PASSWORD_CHARS[randomInt(TEMP_PASSWORD_CHARS.length)];
|
||||||
|
}
|
||||||
|
return password;
|
||||||
|
}
|
||||||
|
|
||||||
|
/** A `UserProfile` row with its household name joined in — the shape {@link toListItem} maps from. */
|
||||||
|
type UserRow = Awaited<
|
||||||
|
ReturnType<
|
||||||
|
typeof prisma.userProfile.findFirstOrThrow<{
|
||||||
|
include: { house: { select: { name: true } } };
|
||||||
|
}>
|
||||||
|
>
|
||||||
|
>;
|
||||||
|
|
||||||
|
/** Shapes one Prisma `UserProfile` row (with its `house` name) into the admin list view — drops `passwordHash`/`tokenVersion`, resolves the household name. */
|
||||||
|
function toListItem(row: UserRow): AdminUserListItemView {
|
||||||
|
return {
|
||||||
|
id: row.id,
|
||||||
|
firstName: row.firstName,
|
||||||
|
lastName: row.lastName,
|
||||||
|
email: row.email,
|
||||||
|
householdName: row.house?.name ?? null,
|
||||||
|
createdAt: row.createdAt.toISOString(),
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Every end-user account for the admin `/admin/utilisateurs` list — newest
|
||||||
|
* first, capped at {@link USERS_PAGE_SIZE}. Read-only: this first version has
|
||||||
|
* no edit/disable/delete (deleting an account is irreversible and stays a
|
||||||
|
* deliberate self-service action in `AccountSettingsPage`).
|
||||||
|
*/
|
||||||
|
export async function listUsers(): Promise<AdminUserListItemView[]> {
|
||||||
|
try {
|
||||||
|
const rows = await prisma.userProfile.findMany({
|
||||||
|
// `id` as a tiebreaker so the order is total even if two accounts share
|
||||||
|
// a `createdAt` (bulk-provisioned in the same tick) — `id` ascends with
|
||||||
|
// `createdAt` anyway.
|
||||||
|
orderBy: [{ createdAt: "desc" }, { id: "desc" }],
|
||||||
|
take: USERS_PAGE_SIZE,
|
||||||
|
include: { house: { select: { name: true } } },
|
||||||
|
});
|
||||||
|
return rows.map(toListItem);
|
||||||
|
} catch (err) {
|
||||||
|
// Rethrown as-is — `wrapAsyncHandler`/the error middleware handles it,
|
||||||
|
// this layer just isn't allowed a bare `await`. Same as `admin-contact.service.ts`.
|
||||||
|
throw err;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Provisions a new end-user account by hand and returns it together with the
|
||||||
|
* one-time temporary password the caller must relay to the user. Mirrors
|
||||||
|
* `auth.service.ts`'s `signup` for the parts that matter (email-uniqueness
|
||||||
|
* check, argon2 hash, `UserProfile` row with `houseId`/`dietId` left `null`)
|
||||||
|
* but issues **no session token** — the operator isn't logging in as this
|
||||||
|
* user — and generates the password instead of accepting one.
|
||||||
|
*
|
||||||
|
* @throws {HttpError} `409 EMAIL_ALREADY_IN_USE` if the email is already taken.
|
||||||
|
*/
|
||||||
|
export async function createUserProfile(
|
||||||
|
input: AdminCreateUserInput,
|
||||||
|
): Promise<AdminUserCreatedView> {
|
||||||
|
try {
|
||||||
|
const existing = await prisma.userProfile.findUnique({ where: { email: input.email } });
|
||||||
|
if (existing) {
|
||||||
|
throw new HttpError(409, ErrorCode.EMAIL_ALREADY_IN_USE, "Email already in use");
|
||||||
|
}
|
||||||
|
|
||||||
|
const temporaryPassword = generateTemporaryPassword();
|
||||||
|
const passwordHash = await argon2.hash(temporaryPassword, hashOptions);
|
||||||
|
|
||||||
|
const profile = await prisma.userProfile.create({
|
||||||
|
// No household/diet here, same as `signup` — the user picks those in the
|
||||||
|
// onboarding wizard after their first login.
|
||||||
|
data: {
|
||||||
|
firstName: input.firstName,
|
||||||
|
lastName: input.lastName,
|
||||||
|
email: input.email,
|
||||||
|
passwordHash,
|
||||||
|
},
|
||||||
|
include: { house: { select: { name: true } } },
|
||||||
|
});
|
||||||
|
|
||||||
|
// Fire-and-forget, one line, no migration (see `analytics.service.ts`). A
|
||||||
|
// distinct type from `user.signup` so the dashboard can tell hand-provisioned
|
||||||
|
// accounts apart; `actorType: "system"` because the actor is an operator, not
|
||||||
|
// the new user (and `AnalyticsEvent.actorId` only ever means a `UserProfile.id`).
|
||||||
|
analytics.recordEvent("admin.user_created", {
|
||||||
|
actorType: "system",
|
||||||
|
context: { userId: profile.id },
|
||||||
|
});
|
||||||
|
|
||||||
|
return { user: toListItem(profile), temporaryPassword };
|
||||||
|
} catch (err) {
|
||||||
|
throw err; // see listUsers()'s catch comment
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
@ -1,22 +1,32 @@
|
||||||
import { Router } from "express";
|
import { Router } from "express";
|
||||||
import { adminAuthRouter } from "./admin-auth.routes.js";
|
import { adminAuthRouter } from "./admin-auth.routes.js";
|
||||||
import { adminCatalogRouter } from "./admin-catalog.routes.js";
|
import { adminCatalogRouter } from "./admin-catalog.routes.js";
|
||||||
|
import { adminContactRouter } from "./admin-contact.routes.js";
|
||||||
import { adminMetricsRouter } from "./admin-metrics.routes.js";
|
import { adminMetricsRouter } from "./admin-metrics.routes.js";
|
||||||
import { adminMonitoringRouter } from "./admin-monitoring.routes.js";
|
|
||||||
import { adminTechStepsRouter } from "./admin-tech-steps.routes.js";
|
import { adminTechStepsRouter } from "./admin-tech-steps.routes.js";
|
||||||
|
import { adminToursRouter } from "./admin-tours.routes.js";
|
||||||
|
import { adminUsersRouter } from "./admin-users.routes.js";
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Aggregator for the admin application's API surface, mounted at `/admin`
|
* Aggregator for the admin application's API surface, mounted at
|
||||||
* in `app.ts`. Every sub-router here is for `apps/admin-web` only —
|
* `/admin/api` in `app.ts` (not bare `/admin` — see that mount point's own
|
||||||
* `/admin/auth` is public (login), everything added later
|
* comment for why: it would collide with apps/web's `/admin/*` page
|
||||||
* (`/admin/metrics`, `/admin/monitoring`, `/admin/tech-steps/*`,
|
* routes). Every sub-router here backs one of those pages —
|
||||||
* `/admin/catalog/*`) sits behind `requireAdmin`
|
* `/admin/api/auth` is public (login), everything added later
|
||||||
* (`middlewares/require-admin.ts`).
|
* (`/admin/api/metrics`, `/admin/api/tech-steps/*`, `/admin/api/catalog/*`)
|
||||||
|
* sits behind `requireAdmin` (`middlewares/require-admin.ts`).
|
||||||
|
*
|
||||||
|
* Monitoring has **no** REST route here on purpose — it's pushed over
|
||||||
|
* WebSocket instead (`lib/monitoring-broadcast.service.ts`, wired in
|
||||||
|
* `server.ts`), not requested per-page-load. See that service's doc
|
||||||
|
* comment for the full mechanism.
|
||||||
*/
|
*/
|
||||||
export const adminRouter = Router();
|
export const adminRouter = Router();
|
||||||
|
|
||||||
adminRouter.use("/auth", adminAuthRouter);
|
adminRouter.use("/auth", adminAuthRouter);
|
||||||
adminRouter.use("/metrics", adminMetricsRouter);
|
adminRouter.use("/metrics", adminMetricsRouter);
|
||||||
adminRouter.use("/monitoring", adminMonitoringRouter);
|
|
||||||
adminRouter.use("/tech-steps", adminTechStepsRouter);
|
adminRouter.use("/tech-steps", adminTechStepsRouter);
|
||||||
adminRouter.use("/catalog", adminCatalogRouter);
|
adminRouter.use("/catalog", adminCatalogRouter);
|
||||||
|
adminRouter.use("/tours", adminToursRouter);
|
||||||
|
adminRouter.use("/contact", adminContactRouter);
|
||||||
|
adminRouter.use("/users", adminUsersRouter);
|
||||||
|
|
|
||||||
|
|
@ -1,5 +1,10 @@
|
||||||
import { wrapAsyncHandler } from "@batch-cooking/express-tools";
|
import { wrapAsyncHandler } from "@batch-cooking/express-tools";
|
||||||
import { deleteAccountSchema, loginSchema, signupSchema } from "@batch-cooking/shared";
|
import {
|
||||||
|
type AuthResponse,
|
||||||
|
deleteAccountSchema,
|
||||||
|
loginSchema,
|
||||||
|
signupSchema,
|
||||||
|
} from "@batch-cooking/shared";
|
||||||
import type { CookieOptions, Response } from "express";
|
import type { CookieOptions, Response } from "express";
|
||||||
import { Router } from "express";
|
import { Router } from "express";
|
||||||
import { env } from "../../config/env.js";
|
import { env } from "../../config/env.js";
|
||||||
|
|
@ -43,7 +48,11 @@ authRouter.post(
|
||||||
const input = signupSchema.parse(req.body);
|
const input = signupSchema.parse(req.body);
|
||||||
const { profile, token } = await signup(input);
|
const { profile, token } = await signup(input);
|
||||||
res.cookie(env.AUTH_COOKIE_NAME, token, cookieOptions);
|
res.cookie(env.AUTH_COOKIE_NAME, token, cookieOptions);
|
||||||
res.status(201).json(profile);
|
// Token is echoed in the body too, not just the cookie — see
|
||||||
|
// `AuthResponse` (packages/shared) for why (Capacitor WebView origin
|
||||||
|
// can't receive a SameSite cookie). Purely additive: every existing
|
||||||
|
// profile field stays exactly where it was.
|
||||||
|
res.status(201).json({ ...profile, token } satisfies AuthResponse);
|
||||||
}),
|
}),
|
||||||
);
|
);
|
||||||
|
|
||||||
|
|
@ -54,7 +63,7 @@ authRouter.post(
|
||||||
const input = loginSchema.parse(req.body);
|
const input = loginSchema.parse(req.body);
|
||||||
const { profile, token } = await login(input);
|
const { profile, token } = await login(input);
|
||||||
res.cookie(env.AUTH_COOKIE_NAME, token, cookieOptions);
|
res.cookie(env.AUTH_COOKIE_NAME, token, cookieOptions);
|
||||||
res.status(200).json(profile);
|
res.status(200).json({ ...profile, token } satisfies AuthResponse);
|
||||||
}),
|
}),
|
||||||
);
|
);
|
||||||
|
|
||||||
|
|
|
||||||
34
apps/api/src/modules/contact/contact.routes.ts
Normal file
34
apps/api/src/modules/contact/contact.routes.ts
Normal file
|
|
@ -0,0 +1,34 @@
|
||||||
|
import { wrapAsyncHandler } from "@batch-cooking/express-tools";
|
||||||
|
import { submitContactMessageSchema } from "@batch-cooking/shared";
|
||||||
|
import { Router } from "express";
|
||||||
|
import { type AuthLocals, requireAuth } from "../../middlewares/require-auth.js";
|
||||||
|
import { submitContactMessage } from "./contact.service.js";
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Router mounted at `/contact` in app.ts (issue #80). A single endpoint —
|
||||||
|
* `POST /` — for the in-app "signaler un bug / suggestion" form. Requires a
|
||||||
|
* session: only signed-in users can send a message, so every report is
|
||||||
|
* attributable (see `ContactMessage.authorId`). The admin-side read of
|
||||||
|
* these rows lives entirely in the admin router, not here.
|
||||||
|
*/
|
||||||
|
export const contactRouter = Router();
|
||||||
|
|
||||||
|
contactRouter.post(
|
||||||
|
"/",
|
||||||
|
requireAuth,
|
||||||
|
wrapAsyncHandler<unknown, AuthLocals>(async (req, res) => {
|
||||||
|
const input = submitContactMessageSchema.parse(req.body);
|
||||||
|
// Read the UA from the request, never from the body — the schema omits
|
||||||
|
// it on purpose so it can't be spoofed. Header can be an array or
|
||||||
|
// absent; normalize to `string | null`.
|
||||||
|
const rawUserAgent = req.headers["user-agent"];
|
||||||
|
const userAgent =
|
||||||
|
typeof rawUserAgent === "string" && rawUserAgent.length > 0 ? rawUserAgent : null;
|
||||||
|
await submitContactMessage(res.locals.userProfile.id, input, userAgent);
|
||||||
|
// 204, not 201-with-a-body: the form has nothing to do with the stored
|
||||||
|
// row, and the shared `ApiClient._request` treats only 204 as bodyless
|
||||||
|
// (a 201 with an empty body makes its `response.json()` throw). Same
|
||||||
|
// "mutation returns nothing" shape as `POST /auth/logout`.
|
||||||
|
res.status(204).end();
|
||||||
|
}),
|
||||||
|
);
|
||||||
50
apps/api/src/modules/contact/contact.service.ts
Normal file
50
apps/api/src/modules/contact/contact.service.ts
Normal file
|
|
@ -0,0 +1,50 @@
|
||||||
|
import type { SubmitContactMessageInput } from "@batch-cooking/shared";
|
||||||
|
import { prisma } from "../../db/prisma.js";
|
||||||
|
import { analytics } from "../../lib/analytics.service.js";
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Persists one contact-form submission (issue #80). Write-only from the
|
||||||
|
* user's side — there is no read/update/delete counterpart here: admins
|
||||||
|
* consult these rows through the admin app (`admin-contact.service.ts`, PR
|
||||||
|
* 2), never this module.
|
||||||
|
*
|
||||||
|
* `userAgent` comes straight from the request header, never the body — the
|
||||||
|
* shared `submitContactMessageSchema` deliberately omits it so the client
|
||||||
|
* can't spoof it. `pageUrl` / `appVersion` are client-supplied context and
|
||||||
|
* default to `null` when the (older, or non-web) client didn't send them.
|
||||||
|
*
|
||||||
|
* Returns nothing: the form only needs to know the write succeeded (a
|
||||||
|
* `201`), not the stored row.
|
||||||
|
*/
|
||||||
|
export async function submitContactMessage(
|
||||||
|
authorId: number,
|
||||||
|
input: SubmitContactMessageInput,
|
||||||
|
userAgent: string | null,
|
||||||
|
): Promise<void> {
|
||||||
|
try {
|
||||||
|
await prisma.contactMessage.create({
|
||||||
|
data: {
|
||||||
|
authorId,
|
||||||
|
type: input.type,
|
||||||
|
message: input.message,
|
||||||
|
pageUrl: input.pageUrl ?? null,
|
||||||
|
userAgent,
|
||||||
|
appVersion: input.appVersion ?? null,
|
||||||
|
},
|
||||||
|
});
|
||||||
|
// Fire-and-forget (see AnalyticsService's contract) — `admin-metrics`
|
||||||
|
// aggregates `AnalyticsEvent` by `type` generically, so this shows up in
|
||||||
|
// the dashboard series with no extra code; `context.type` lets it be
|
||||||
|
// broken down by bug/suggestion/other.
|
||||||
|
analytics.recordEvent("contact.submitted", {
|
||||||
|
actorType: "user",
|
||||||
|
actorId: authorId,
|
||||||
|
context: { type: input.type },
|
||||||
|
});
|
||||||
|
} catch (err) {
|
||||||
|
// Rethrown as-is — `wrapAsyncHandler` / the error middleware (which
|
||||||
|
// already logs it) handles it; this service layer just isn't allowed a
|
||||||
|
// bare `await` per the repo's async/try-catch convention.
|
||||||
|
throw err;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
@ -22,6 +22,11 @@ import { toIngredientView, toUnitView } from "../recipe/recipe.service.js";
|
||||||
function cookingSessionPlanningInclude() {
|
function cookingSessionPlanningInclude() {
|
||||||
return {
|
return {
|
||||||
items: {
|
items: {
|
||||||
|
// A "leftovers" item (`sourcePlanningItemId` set) reserves part of an
|
||||||
|
// already-cooked batch — it has nothing to cook, so it must not enter
|
||||||
|
// the optimized cooking plan (issue #34). Excluded at the query so it
|
||||||
|
// never reaches `toOptimizerRecipe`.
|
||||||
|
where: { sourcePlanningItemId: null },
|
||||||
include: {
|
include: {
|
||||||
recipe: {
|
recipe: {
|
||||||
select: {
|
select: {
|
||||||
|
|
@ -47,6 +52,7 @@ function cookingSessionPlanningInclude() {
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
utensils: { include: { utensil: true } },
|
utensils: { include: { utensil: true } },
|
||||||
|
temperatures: true,
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
|
|
@ -83,10 +89,28 @@ function toOptimizerRecipe(item: PlanningItemWithSteps): OptimizerRecipeInput {
|
||||||
unit: line.unit === null ? null : toUnitView(line.unit),
|
unit: line.unit === null ? null : toUnitView(line.unit),
|
||||||
}));
|
}));
|
||||||
return {
|
return {
|
||||||
techStep: { id: techStep.techStep.id, key: techStep.techStep.key },
|
techStep: {
|
||||||
|
id: techStep.techStep.id,
|
||||||
|
key: techStep.techStep.key,
|
||||||
|
isPlaceholder: techStep.techStep.isPlaceholder,
|
||||||
|
displayName: techStep.techStep.displayName,
|
||||||
|
},
|
||||||
order: techStep.order,
|
order: techStep.order,
|
||||||
ingredients,
|
ingredients,
|
||||||
utensils: techStep.utensils.map(({ utensil }) => ({ id: utensil.id, key: utensil.key })),
|
utensils: techStep.utensils.map(({ utensil }) => ({ id: utensil.id, key: utensil.key })),
|
||||||
|
// Structured value only — `Decimal` °C → plain number, `qualitative`
|
||||||
|
// re-narrowed to the literal union (same posture as
|
||||||
|
// `recipe.service.ts`'s `toStepTechStepViews`).
|
||||||
|
temperatures: techStep.temperatures.map((temperature) => ({
|
||||||
|
celsius: temperature.celsius === null ? null : Number(temperature.celsius),
|
||||||
|
gasMark: temperature.gasMark,
|
||||||
|
qualitative:
|
||||||
|
temperature.qualitative === "low" ||
|
||||||
|
temperature.qualitative === "medium" ||
|
||||||
|
temperature.qualitative === "high"
|
||||||
|
? temperature.qualitative
|
||||||
|
: null,
|
||||||
|
})),
|
||||||
};
|
};
|
||||||
}),
|
}),
|
||||||
}));
|
}));
|
||||||
|
|
|
||||||
31
apps/api/src/modules/mobile/mobile.routes.ts
Normal file
31
apps/api/src/modules/mobile/mobile.routes.ts
Normal file
|
|
@ -0,0 +1,31 @@
|
||||||
|
import { wrapAsyncHandler } from "@batch-cooking/express-tools";
|
||||||
|
import { Router } from "express";
|
||||||
|
import { getLatestApkUrl, getLatestVersion } from "./mobile.service.js";
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Router mounted at `/mobile` in app.ts. Both routes are deliberately
|
||||||
|
* public (no `requireAuth`): the landing page's download link is shown to
|
||||||
|
* logged-out visitors, and the native update check (issue #66) runs on
|
||||||
|
* every app start, session or not. Both exist purely to work around
|
||||||
|
* Forgejo's Releases API sending no CORS headers — see `mobile.service.ts`'s
|
||||||
|
* own doc comment for the full story.
|
||||||
|
*/
|
||||||
|
export const mobileRouter = Router();
|
||||||
|
|
||||||
|
mobileRouter.get(
|
||||||
|
"/latest-release",
|
||||||
|
wrapAsyncHandler(async (_req, res) => {
|
||||||
|
res.status(200).json({ version: await getLatestVersion() });
|
||||||
|
}),
|
||||||
|
);
|
||||||
|
|
||||||
|
// A plain redirect, not JSON — lets any caller (the landing page's `<a>`,
|
||||||
|
// the update banner's "Mettre à jour" link) use a static href with zero
|
||||||
|
// client-side fetch, and always resolves to something useful even if
|
||||||
|
// Forgejo is briefly unreachable (see getLatestApkUrl's fallback).
|
||||||
|
mobileRouter.get(
|
||||||
|
"/download",
|
||||||
|
wrapAsyncHandler(async (_req, res) => {
|
||||||
|
res.redirect(302, await getLatestApkUrl());
|
||||||
|
}),
|
||||||
|
);
|
||||||
75
apps/api/src/modules/mobile/mobile.service.ts
Normal file
75
apps/api/src/modules/mobile/mobile.service.ts
Normal file
|
|
@ -0,0 +1,75 @@
|
||||||
|
import { HttpError } from "@batch-cooking/error-tools";
|
||||||
|
import { ErrorCode } from "@batch-cooking/shared";
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Forgejo's own Releases API for this repo — public, unauthenticated (the
|
||||||
|
* same fact `local-verification-while-ci-disabled` already leans on for
|
||||||
|
* CI-status checks without a token). **Must be called server-side, not
|
||||||
|
* from the browser**: verified live that Forgejo sends no
|
||||||
|
* `Access-Control-Allow-Origin` header on it, so a direct `fetch()` from
|
||||||
|
* `apps/web` fails with an opaque CORS error even though the endpoint
|
||||||
|
* itself is perfectly reachable — this whole module exists to proxy it
|
||||||
|
* from a context CORS doesn't apply to.
|
||||||
|
*/
|
||||||
|
const LATEST_RELEASE_API_URL =
|
||||||
|
"https://git.dev.kyuno.fr/api/v1/repos/kyuno/batchCooking/releases/latest";
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Human-facing Forgejo release page — safe fallback for {@link getLatestApkUrl}
|
||||||
|
* when no matching asset is found (a release with nothing attached yet,
|
||||||
|
* Forgejo briefly unreachable, ...). Never a dead link, just a slightly
|
||||||
|
* less direct one: the visitor lands on the release itself and can find
|
||||||
|
* the asset from there.
|
||||||
|
*/
|
||||||
|
const LATEST_RELEASE_PAGE_URL = "https://git.dev.kyuno.fr/kyuno/batchCooking/releases/latest";
|
||||||
|
|
||||||
|
/** Stable filename `release.yml` always attaches the signed APK under — see that workflow's own comment. */
|
||||||
|
const APK_ASSET_NAME = "batchcooking.apk";
|
||||||
|
|
||||||
|
interface ForgejoReleaseAsset {
|
||||||
|
name: string;
|
||||||
|
browser_download_url: string;
|
||||||
|
}
|
||||||
|
|
||||||
|
interface ForgejoRelease {
|
||||||
|
tag_name: string;
|
||||||
|
assets: ForgejoReleaseAsset[];
|
||||||
|
}
|
||||||
|
|
||||||
|
async function fetchLatestRelease(): Promise<ForgejoRelease> {
|
||||||
|
const response = await fetch(LATEST_RELEASE_API_URL);
|
||||||
|
if (!response.ok) {
|
||||||
|
throw new HttpError(
|
||||||
|
502,
|
||||||
|
ErrorCode.INTERNAL_ERROR,
|
||||||
|
`Forgejo releases API responded ${response.status}`,
|
||||||
|
);
|
||||||
|
}
|
||||||
|
return (await response.json()) as ForgejoRelease;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* The latest tagged Android build's version (e.g. `"v1.4.2"`) — used by the
|
||||||
|
* native app's update check (issue #66, `useAppUpdateCheck.ts`).
|
||||||
|
*/
|
||||||
|
export async function getLatestVersion(): Promise<string> {
|
||||||
|
const release = await fetchLatestRelease();
|
||||||
|
return release.tag_name;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Where a "download the app" click should end up right now: the actual
|
||||||
|
* signed-APK asset of the latest release if one is attached, else
|
||||||
|
* {@link LATEST_RELEASE_PAGE_URL} as a safe fallback. Never throws — a
|
||||||
|
* download link must always go *somewhere* useful, even when Forgejo is
|
||||||
|
* briefly unreachable.
|
||||||
|
*/
|
||||||
|
export async function getLatestApkUrl(): Promise<string> {
|
||||||
|
try {
|
||||||
|
const release = await fetchLatestRelease();
|
||||||
|
const apk = release.assets.find((asset) => asset.name === APK_ASSET_NAME);
|
||||||
|
return apk?.browser_download_url ?? LATEST_RELEASE_PAGE_URL;
|
||||||
|
} catch {
|
||||||
|
return LATEST_RELEASE_PAGE_URL;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
@ -1,10 +1,21 @@
|
||||||
import { parseDateOnly } from "@batch-cooking/date-tools";
|
import { parseDateOnly } from "@batch-cooking/date-tools";
|
||||||
import { HttpError } from "@batch-cooking/error-tools";
|
import { HttpError } from "@batch-cooking/error-tools";
|
||||||
import { wrapAsyncHandler } from "@batch-cooking/express-tools";
|
import { wrapAsyncHandler } from "@batch-cooking/express-tools";
|
||||||
import { addPlanningItemSchema, ErrorCode, getPlanningByDateSchema } from "@batch-cooking/shared";
|
import {
|
||||||
|
addPlanningItemSchema,
|
||||||
|
assignLeftoverSchema,
|
||||||
|
ErrorCode,
|
||||||
|
getPlanningByDateSchema,
|
||||||
|
} from "@batch-cooking/shared";
|
||||||
import { Router } from "express";
|
import { Router } from "express";
|
||||||
import { type AuthLocals, requireAuth } from "../../middlewares/require-auth.js";
|
import { type AuthLocals, requireAuth } from "../../middlewares/require-auth.js";
|
||||||
import { addPlanningItem, getPlanningForDate, removePlanningItem } from "./planning.service.js";
|
import {
|
||||||
|
addPlanningItem,
|
||||||
|
assignLeftoverPlanningItem,
|
||||||
|
discardLeftover,
|
||||||
|
getPlanningForDate,
|
||||||
|
removePlanningItem,
|
||||||
|
} from "./planning.service.js";
|
||||||
|
|
||||||
/** Router mounted at `/planning` in app.ts. */
|
/** Router mounted at `/planning` in app.ts. */
|
||||||
export const planningRouter = Router();
|
export const planningRouter = Router();
|
||||||
|
|
@ -69,6 +80,44 @@ planningRouter.post(
|
||||||
}),
|
}),
|
||||||
);
|
);
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Serves part of another planning item's leftover pool on a slot — creates
|
||||||
|
* a "leftovers" `PlanningItem` (see {@link assignLeftoverPlanningItem}).
|
||||||
|
* `POST /items/leftover`, not `/items/:id/...`: the `:id` here would be the
|
||||||
|
* *target* slot, which doesn't exist yet — the source is in the body.
|
||||||
|
*/
|
||||||
|
planningRouter.post(
|
||||||
|
"/items/leftover",
|
||||||
|
requireAuth,
|
||||||
|
wrapAsyncHandler<unknown, AuthLocals>(async (req, res) => {
|
||||||
|
const input = assignLeftoverSchema.parse(req.body);
|
||||||
|
const date = parseDateOnly(input.date);
|
||||||
|
if (date === null) {
|
||||||
|
throw new HttpError(
|
||||||
|
400,
|
||||||
|
ErrorCode.VALIDATION_ERROR,
|
||||||
|
`Not a real calendar date: ${input.date}`,
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
const { id: viewerId, houseId } = res.locals.userProfile;
|
||||||
|
const item = await assignLeftoverPlanningItem(houseId, viewerId, date, input);
|
||||||
|
res.status(201).json(item);
|
||||||
|
}),
|
||||||
|
);
|
||||||
|
|
||||||
|
/** Throws away item `:id`'s whole remaining leftover pool (idempotent — see {@link discardLeftover}). */
|
||||||
|
planningRouter.patch(
|
||||||
|
"/items/:id/discard-leftover",
|
||||||
|
requireAuth,
|
||||||
|
wrapAsyncHandler<unknown, AuthLocals>(async (req, res) => {
|
||||||
|
const id = parsePlanningItemId(req.params.id);
|
||||||
|
const { id: viewerId, houseId } = res.locals.userProfile;
|
||||||
|
const item = await discardLeftover(id, viewerId, houseId);
|
||||||
|
res.status(200).json(item);
|
||||||
|
}),
|
||||||
|
);
|
||||||
|
|
||||||
/** Removes one recipe from a planning slot. */
|
/** Removes one recipe from a planning slot. */
|
||||||
planningRouter.delete(
|
planningRouter.delete(
|
||||||
"/items/:id",
|
"/items/:id",
|
||||||
|
|
|
||||||
|
|
@ -2,6 +2,9 @@ import { type DateTime, getWeekStart, toDateOnly } from "@batch-cooking/date-too
|
||||||
import { HttpError } from "@batch-cooking/error-tools";
|
import { HttpError } from "@batch-cooking/error-tools";
|
||||||
import {
|
import {
|
||||||
type AddPlanningItemInput,
|
type AddPlanningItemInput,
|
||||||
|
type AssignLeftoverInput,
|
||||||
|
computeAvailableLeftover,
|
||||||
|
computeBatchedPortions,
|
||||||
ErrorCode,
|
ErrorCode,
|
||||||
type PlanningItemView,
|
type PlanningItemView,
|
||||||
type PlanningView,
|
type PlanningView,
|
||||||
|
|
@ -10,6 +13,35 @@ import { prisma } from "../../db/prisma.js";
|
||||||
import { analytics } from "../../lib/analytics.service.js";
|
import { analytics } from "../../lib/analytics.service.js";
|
||||||
import { assertRecipeVisible } from "../recipe/recipe.service.js";
|
import { assertRecipeVisible } from "../recipe/recipe.service.js";
|
||||||
|
|
||||||
|
/**
|
||||||
|
* One `PlanningItem` row (with its recipe resolved to `{id, name}`) shaped
|
||||||
|
* into the wire {@link PlanningItemView}. The three read/write paths below
|
||||||
|
* that return an item — `getPlanningForDate`, `addPlanningItem`,
|
||||||
|
* `assignLeftoverPlanningItem`, `discardLeftover` — all go through this so
|
||||||
|
* the shape is defined once.
|
||||||
|
*/
|
||||||
|
function toPlanningItemView(item: {
|
||||||
|
id: number;
|
||||||
|
weekDay: string;
|
||||||
|
meal: string;
|
||||||
|
portions: number;
|
||||||
|
portionsRequested: number;
|
||||||
|
discardedPortions: number;
|
||||||
|
sourcePlanningItemId: number | null;
|
||||||
|
recipe: { id: number; name: string };
|
||||||
|
}): PlanningItemView {
|
||||||
|
return {
|
||||||
|
id: item.id,
|
||||||
|
weekDay: item.weekDay,
|
||||||
|
meal: item.meal,
|
||||||
|
portions: item.portions,
|
||||||
|
portionsRequested: item.portionsRequested,
|
||||||
|
discardedPortions: item.discardedPortions,
|
||||||
|
sourceItem: item.sourcePlanningItemId !== null ? { id: item.sourcePlanningItemId } : null,
|
||||||
|
recipe: item.recipe,
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Finds the household's planning that covers `date` and shapes it into a
|
* Finds the household's planning that covers `date` and shapes it into a
|
||||||
* {@link PlanningView} (recipes resolved to `{id, name}`). `date` is
|
* {@link PlanningView} (recipes resolved to `{id, name}`). `date` is
|
||||||
|
|
@ -64,13 +96,7 @@ export async function getPlanningForDate(
|
||||||
id: planning.id,
|
id: planning.id,
|
||||||
startDate: planning.startDate.toISOString(),
|
startDate: planning.startDate.toISOString(),
|
||||||
finishDate: planning.finishDate.toISOString(),
|
finishDate: planning.finishDate.toISOString(),
|
||||||
items: planning.items.map((item) => ({
|
items: planning.items.map(toPlanningItemView),
|
||||||
id: item.id,
|
|
||||||
weekDay: item.weekDay,
|
|
||||||
meal: item.meal,
|
|
||||||
portions: item.portions,
|
|
||||||
recipe: item.recipe,
|
|
||||||
})),
|
|
||||||
};
|
};
|
||||||
} catch (err) {
|
} catch (err) {
|
||||||
// Rethrown as-is — `wrapAsyncHandler`/the error middleware (which
|
// Rethrown as-is — `wrapAsyncHandler`/the error middleware (which
|
||||||
|
|
@ -144,6 +170,18 @@ export async function addPlanningItem(
|
||||||
}
|
}
|
||||||
await assertRecipeVisible(input.recipeId, viewerId, viewerHouseId);
|
await assertRecipeVisible(input.recipeId, viewerId, viewerHouseId);
|
||||||
|
|
||||||
|
// `assertRecipeVisible` already guaranteed the recipe exists and is
|
||||||
|
// visible — this second read just pulls its written yield, needed to
|
||||||
|
// turn "portions requested" into "portions to actually prepare"
|
||||||
|
// (a whole number of batches, see `computeBatchedPortions`). The
|
||||||
|
// `?? 1` never triggers in practice (the assert above threw otherwise);
|
||||||
|
// it only keeps TypeScript happy about `findUnique`'s `| null`.
|
||||||
|
const recipe = await prisma.recipe.findUnique({
|
||||||
|
where: { id: input.recipeId },
|
||||||
|
select: { portions: true },
|
||||||
|
});
|
||||||
|
const { portions } = computeBatchedPortions(recipe?.portions ?? 1, input.portionsRequested);
|
||||||
|
|
||||||
const weekStart = getWeekStart(toDateOnly(date));
|
const weekStart = getWeekStart(toDateOnly(date));
|
||||||
const planning = await findOrCreatePlanningForWeek(houseId, weekStart);
|
const planning = await findOrCreatePlanningForWeek(houseId, weekStart);
|
||||||
|
|
||||||
|
|
@ -153,23 +191,22 @@ export async function addPlanningItem(
|
||||||
weekDay: input.weekDay,
|
weekDay: input.weekDay,
|
||||||
meal: input.meal,
|
meal: input.meal,
|
||||||
recipeId: input.recipeId,
|
recipeId: input.recipeId,
|
||||||
portions: input.portions,
|
portions,
|
||||||
|
portionsRequested: input.portionsRequested,
|
||||||
},
|
},
|
||||||
include: { recipe: { select: { id: true, name: true } } },
|
include: { recipe: { select: { id: true, name: true } } },
|
||||||
});
|
});
|
||||||
|
|
||||||
analytics.recordEvent("planning.item_added", {
|
analytics.recordEvent("planning.item_added", {
|
||||||
actorId: viewerId,
|
actorId: viewerId,
|
||||||
context: { recipeId: input.recipeId, portions: input.portions },
|
context: {
|
||||||
|
recipeId: input.recipeId,
|
||||||
|
portions,
|
||||||
|
portionsRequested: input.portionsRequested,
|
||||||
|
},
|
||||||
});
|
});
|
||||||
|
|
||||||
return {
|
return toPlanningItemView(item);
|
||||||
id: item.id,
|
|
||||||
weekDay: item.weekDay,
|
|
||||||
meal: item.meal,
|
|
||||||
portions: item.portions,
|
|
||||||
recipe: item.recipe,
|
|
||||||
};
|
|
||||||
} catch (err) {
|
} catch (err) {
|
||||||
throw err; // see getPlanningForDate()'s catch comment above
|
throw err; // see getPlanningForDate()'s catch comment above
|
||||||
}
|
}
|
||||||
|
|
@ -197,3 +234,139 @@ export async function removePlanningItem(id: number, houseId: number | null): Pr
|
||||||
throw err; // see getPlanningForDate()'s catch comment above
|
throw err; // see getPlanningForDate()'s catch comment above
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Loads a `PlanningItem` (scoped to `houseId`) with everything
|
||||||
|
* {@link computeAvailableLeftover} needs — its own portion fields plus how
|
||||||
|
* much of its pool has already been served elsewhere (`leftoverUses`) — or
|
||||||
|
* throws `404 PLANNING_ITEM_NOT_FOUND` (same "don't confirm what exists"
|
||||||
|
* posture as `removePlanningItem`). Shared by
|
||||||
|
* {@link assignLeftoverPlanningItem} and {@link discardLeftover}.
|
||||||
|
*/
|
||||||
|
async function loadItemWithLeftoverPool(id: number, houseId: number | null) {
|
||||||
|
const item = await prisma.planningItem.findUnique({
|
||||||
|
where: { id },
|
||||||
|
include: {
|
||||||
|
planning: { select: { houseId: true } },
|
||||||
|
leftoverUses: { select: { portions: true } },
|
||||||
|
recipe: { select: { id: true, name: true } },
|
||||||
|
},
|
||||||
|
});
|
||||||
|
if (!item || houseId === null || item.planning.houseId !== houseId) {
|
||||||
|
throw new HttpError(404, ErrorCode.PLANNING_ITEM_NOT_FOUND, `Planning item ${id} not found`);
|
||||||
|
}
|
||||||
|
return item;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Serves `input.portions` of another item's leftover pool on the
|
||||||
|
* `(date, weekDay, meal)` slot — creates a "leftovers" `PlanningItem`
|
||||||
|
* (`sourcePlanningItemId` set) on the same recipe as its source. Nothing
|
||||||
|
* new is cooked for it, so `portions === portionsRequested` and it excludes
|
||||||
|
* itself from the shopping list / cooking session (see those services'
|
||||||
|
* `where: { sourcePlanningItemId: null }`).
|
||||||
|
*
|
||||||
|
* The source's `recipeId` is copied, never taken from the client (a
|
||||||
|
* leftovers item can only be its source's recipe). `input.portions` is
|
||||||
|
* re-checked against the pool actually still available
|
||||||
|
* ({@link computeAvailableLeftover}) — trusting a client value here would
|
||||||
|
* let a household conjure portions it never cooked.
|
||||||
|
*
|
||||||
|
* @throws {HttpError} `404 HOUSE_NOT_FOUND` if `houseId` is `null`.
|
||||||
|
* @throws {HttpError} `404 PLANNING_ITEM_NOT_FOUND` if `sourceItemId` doesn't exist, belongs to another household, or is itself a leftovers item (no leftovers-on-leftovers).
|
||||||
|
* @throws {HttpError} `409 LEFTOVER_QUANTITY_EXCEEDED` if `portions` exceeds the source's still-available pool.
|
||||||
|
*/
|
||||||
|
export async function assignLeftoverPlanningItem(
|
||||||
|
houseId: number | null,
|
||||||
|
viewerId: number,
|
||||||
|
date: DateTime,
|
||||||
|
input: AssignLeftoverInput,
|
||||||
|
): Promise<PlanningItemView> {
|
||||||
|
try {
|
||||||
|
if (houseId === null) {
|
||||||
|
throw new HttpError(404, ErrorCode.HOUSE_NOT_FOUND, "Profile has no household");
|
||||||
|
}
|
||||||
|
|
||||||
|
const source = await loadItemWithLeftoverPool(input.sourceItemId, houseId);
|
||||||
|
if (source.sourcePlanningItemId !== null) {
|
||||||
|
// A leftovers item has no pool of its own — serving leftovers cooks
|
||||||
|
// nothing, so it can't be a source for more.
|
||||||
|
throw new HttpError(
|
||||||
|
404,
|
||||||
|
ErrorCode.PLANNING_ITEM_NOT_FOUND,
|
||||||
|
`Planning item ${input.sourceItemId} is not a leftovers source`,
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
const available = computeAvailableLeftover(source);
|
||||||
|
if (input.portions > available) {
|
||||||
|
throw new HttpError(
|
||||||
|
409,
|
||||||
|
ErrorCode.LEFTOVER_QUANTITY_EXCEEDED,
|
||||||
|
`Item ${source.id} has ${available} leftover portion(s) available, asked for ${input.portions}`,
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
const weekStart = getWeekStart(toDateOnly(date));
|
||||||
|
const planning = await findOrCreatePlanningForWeek(houseId, weekStart);
|
||||||
|
|
||||||
|
const item = await prisma.planningItem.create({
|
||||||
|
data: {
|
||||||
|
planningId: planning.id,
|
||||||
|
weekDay: input.weekDay,
|
||||||
|
meal: input.meal,
|
||||||
|
recipeId: source.recipeId,
|
||||||
|
portions: input.portions,
|
||||||
|
portionsRequested: input.portions,
|
||||||
|
sourcePlanningItemId: source.id,
|
||||||
|
},
|
||||||
|
include: { recipe: { select: { id: true, name: true } } },
|
||||||
|
});
|
||||||
|
|
||||||
|
analytics.recordEvent("planning.leftover_assigned", {
|
||||||
|
actorId: viewerId,
|
||||||
|
context: { recipeId: source.recipeId, portions: input.portions, sourceItemId: source.id },
|
||||||
|
});
|
||||||
|
|
||||||
|
return toPlanningItemView(item);
|
||||||
|
} catch (err) {
|
||||||
|
throw err; // see getPlanningForDate()'s catch comment above
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Throws away the whole still-available leftover pool of item `id`
|
||||||
|
* (`discardedPortions += available`) — the basket's "jeter" button.
|
||||||
|
* Idempotent: an item with nothing left to discard is returned unchanged,
|
||||||
|
* no event recorded.
|
||||||
|
*
|
||||||
|
* @throws {HttpError} `404 PLANNING_ITEM_NOT_FOUND` — same guard as `removePlanningItem`.
|
||||||
|
*/
|
||||||
|
export async function discardLeftover(
|
||||||
|
id: number,
|
||||||
|
viewerId: number,
|
||||||
|
houseId: number | null,
|
||||||
|
): Promise<PlanningItemView> {
|
||||||
|
try {
|
||||||
|
const item = await loadItemWithLeftoverPool(id, houseId);
|
||||||
|
const available = computeAvailableLeftover(item);
|
||||||
|
if (available === 0) {
|
||||||
|
return toPlanningItemView(item);
|
||||||
|
}
|
||||||
|
|
||||||
|
const updated = await prisma.planningItem.update({
|
||||||
|
where: { id },
|
||||||
|
data: { discardedPortions: item.discardedPortions + available },
|
||||||
|
include: { recipe: { select: { id: true, name: true } } },
|
||||||
|
});
|
||||||
|
|
||||||
|
analytics.recordEvent("planning.leftover_discarded", {
|
||||||
|
actorId: viewerId,
|
||||||
|
context: { recipeId: item.recipe.id, portions: available },
|
||||||
|
});
|
||||||
|
|
||||||
|
return toPlanningItemView(updated);
|
||||||
|
} catch (err) {
|
||||||
|
throw err; // see getPlanningForDate()'s catch comment above
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
|
||||||
|
|
@ -1,5 +1,9 @@
|
||||||
|
import { HttpError } from "@batch-cooking/error-tools";
|
||||||
import { wrapAsyncHandler } from "@batch-cooking/express-tools";
|
import { wrapAsyncHandler } from "@batch-cooking/express-tools";
|
||||||
import {
|
import {
|
||||||
|
type CompletedToursView,
|
||||||
|
completeTourSchema,
|
||||||
|
ErrorCode,
|
||||||
updateAllergiesSchema,
|
updateAllergiesSchema,
|
||||||
updateDietSchema,
|
updateDietSchema,
|
||||||
updateDislikedIngredientsSchema,
|
updateDislikedIngredientsSchema,
|
||||||
|
|
@ -8,7 +12,9 @@ import { Router } from "express";
|
||||||
import { type AuthLocals, requireAuth } from "../../middlewares/require-auth.js";
|
import { type AuthLocals, requireAuth } from "../../middlewares/require-auth.js";
|
||||||
import {
|
import {
|
||||||
getAllergyIds,
|
getAllergyIds,
|
||||||
|
getCompletedTourKeys,
|
||||||
getDislikedIngredientIds,
|
getDislikedIngredientIds,
|
||||||
|
markTourSeen,
|
||||||
updateAllergies,
|
updateAllergies,
|
||||||
updateDiet,
|
updateDiet,
|
||||||
updateDislikedIngredients,
|
updateDislikedIngredients,
|
||||||
|
|
@ -17,6 +23,14 @@ import {
|
||||||
/** Router mounted at `/profile` in app.ts. Every route requires a session — this is the authenticated user's own profile. */
|
/** Router mounted at `/profile` in app.ts. Every route requires a session — this is the authenticated user's own profile. */
|
||||||
export const profileRouter = Router();
|
export const profileRouter = Router();
|
||||||
|
|
||||||
|
/** Express types a route param `string | undefined` even for a segment that always matches when the route does — satisfies TS, unreachable in practice. */
|
||||||
|
function requireParam(value: string | undefined): string {
|
||||||
|
if (value === undefined) {
|
||||||
|
throw new HttpError(400, ErrorCode.VALIDATION_ERROR, "Missing route parameter");
|
||||||
|
}
|
||||||
|
return value;
|
||||||
|
}
|
||||||
|
|
||||||
/** The regime step of the profile journey (signup wizard and the `/foyer` settings page both call this). */
|
/** The regime step of the profile journey (signup wizard and the `/foyer` settings page both call this). */
|
||||||
profileRouter.patch(
|
profileRouter.patch(
|
||||||
"/diet",
|
"/diet",
|
||||||
|
|
@ -70,3 +84,29 @@ profileRouter.patch(
|
||||||
res.status(200).json(ids);
|
res.status(200).json(ids);
|
||||||
}),
|
}),
|
||||||
);
|
);
|
||||||
|
|
||||||
|
/** Which guided-tour scenarios this profile has already seen — the web tour engine reads this once per session (issues #42/#44). */
|
||||||
|
profileRouter.get(
|
||||||
|
"/tours",
|
||||||
|
requireAuth,
|
||||||
|
wrapAsyncHandler<unknown, AuthLocals>(async (_req, res) => {
|
||||||
|
const completedTourKeys = await getCompletedTourKeys(res.locals.userProfile.id);
|
||||||
|
res.status(200).json({ completedTourKeys } satisfies CompletedToursView);
|
||||||
|
}),
|
||||||
|
);
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Marks a guided-tour scenario as seen — idempotent. An empty body means
|
||||||
|
* "completed"; `{ "skipped": true }` means the user dismissed it (different
|
||||||
|
* analytics event, same "don't re-nag" effect). 404s on an unknown/disabled
|
||||||
|
* tour key.
|
||||||
|
*/
|
||||||
|
profileRouter.post(
|
||||||
|
"/tours/:tourKey/complete",
|
||||||
|
requireAuth,
|
||||||
|
wrapAsyncHandler<unknown, AuthLocals>(async (req, res) => {
|
||||||
|
const { skipped } = completeTourSchema.parse(req.body ?? {});
|
||||||
|
await markTourSeen(res.locals.userProfile.id, requireParam(req.params.tourKey), skipped);
|
||||||
|
res.status(204).end();
|
||||||
|
}),
|
||||||
|
);
|
||||||
|
|
|
||||||
|
|
@ -1,6 +1,7 @@
|
||||||
import { HttpError } from "@batch-cooking/error-tools";
|
import { HttpError } from "@batch-cooking/error-tools";
|
||||||
import { ErrorCode, type SafeUserProfile } from "@batch-cooking/shared";
|
import { ErrorCode, type SafeUserProfile } from "@batch-cooking/shared";
|
||||||
import { prisma } from "../../db/prisma.js";
|
import { prisma } from "../../db/prisma.js";
|
||||||
|
import { analytics } from "../../lib/analytics.service.js";
|
||||||
import { toSafeProfile } from "../../lib/safe-profile.js";
|
import { toSafeProfile } from "../../lib/safe-profile.js";
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
@ -149,3 +150,57 @@ export async function updateDislikedIngredients(
|
||||||
throw err; // see updateDiet()'s catch comment above
|
throw err; // see updateDiet()'s catch comment above
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* The `key`s of every guided-tour scenario this profile has already seen
|
||||||
|
* (completed or skipped — both leave a `TourProgress` row). The web tour
|
||||||
|
* engine reads this once per session to decide which tours to auto-start
|
||||||
|
* (issues #42/#44).
|
||||||
|
*/
|
||||||
|
export async function getCompletedTourKeys(userProfileId: number): Promise<string[]> {
|
||||||
|
try {
|
||||||
|
const rows = await prisma.tourProgress.findMany({
|
||||||
|
where: { userProfileId },
|
||||||
|
select: { scenario: { select: { key: true } } },
|
||||||
|
});
|
||||||
|
return rows.map((row) => row.scenario.key);
|
||||||
|
} catch (err) {
|
||||||
|
throw err; // see updateDiet()'s catch comment above
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Marks a guided-tour scenario as seen by this profile — idempotent upsert,
|
||||||
|
* safe to call again (e.g. the engine retries after a flaky network). Emits
|
||||||
|
* `tour.completed` or `tour.skipped` for the admin dashboard (issue #44's
|
||||||
|
* analytics — the dashboard renders any new `AnalyticsEvent` type
|
||||||
|
* generically, no frontend change needed).
|
||||||
|
*
|
||||||
|
* @throws {HttpError} `404 TOUR_NOT_FOUND` if `tourKey` doesn't match an
|
||||||
|
* **enabled** `TourScenario` (a disabled tour can't be completed).
|
||||||
|
*/
|
||||||
|
export async function markTourSeen(
|
||||||
|
userProfileId: number,
|
||||||
|
tourKey: string,
|
||||||
|
skipped: boolean,
|
||||||
|
): Promise<void> {
|
||||||
|
try {
|
||||||
|
const scenario = await prisma.tourScenario.findUnique({ where: { key: tourKey } });
|
||||||
|
if (!scenario?.enabled) {
|
||||||
|
throw new HttpError(404, ErrorCode.TOUR_NOT_FOUND, `No enabled tour with key ${tourKey}`);
|
||||||
|
}
|
||||||
|
|
||||||
|
await prisma.tourProgress.upsert({
|
||||||
|
where: { userProfileId_scenarioId: { userProfileId, scenarioId: scenario.id } },
|
||||||
|
update: {},
|
||||||
|
create: { userProfileId, scenarioId: scenario.id },
|
||||||
|
});
|
||||||
|
|
||||||
|
analytics.recordEvent(skipped ? "tour.skipped" : "tour.completed", {
|
||||||
|
actorId: userProfileId,
|
||||||
|
context: { tourKey },
|
||||||
|
});
|
||||||
|
} catch (err) {
|
||||||
|
throw err; // see updateDiet()'s catch comment above
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
|
||||||
|
|
@ -1,3 +1,4 @@
|
||||||
|
import { randomUUID } from "node:crypto";
|
||||||
import { HttpError } from "@batch-cooking/error-tools";
|
import { HttpError } from "@batch-cooking/error-tools";
|
||||||
import {
|
import {
|
||||||
ErrorCode,
|
ErrorCode,
|
||||||
|
|
@ -32,22 +33,24 @@ const correctionInclude = {
|
||||||
} satisfies Prisma.StepTechStepCorrectionInclude;
|
} satisfies Prisma.StepTechStepCorrectionInclude;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Loads `stepId`'s current `description` length (the only thing a
|
* Loads `stepId`'s current `description` (a correction needs its full text
|
||||||
* correction needs from the step itself), or throws — `404 STEP_NOT_FOUND`
|
* now, not just its length — see {@link submitTechStepCorrection}'s
|
||||||
* if no such step exists, or if it exists but doesn't belong to `recipeId`
|
* `raw` derivation for a manual temperature mention), or throws —
|
||||||
* (the route's own `:id`/`:stepId` nesting is meaningless otherwise — a
|
* `404 STEP_NOT_FOUND` if no such step exists, or if it exists but doesn't
|
||||||
* request naming a real step under the wrong recipe should look identical
|
* belong to `recipeId` (the route's own `:id`/`:stepId` nesting is
|
||||||
* to naming one that doesn't exist, same "don't leak which part was wrong"
|
* meaningless otherwise — a request naming a real step under the wrong
|
||||||
* posture `assertRecipeVisible` already has for visibility). Otherwise
|
* recipe should look identical to naming one that doesn't exist, same
|
||||||
* whatever {@link assertRecipeVisible} throws (`404 RECIPE_NOT_FOUND`,
|
* "don't leak which part was wrong" posture `assertRecipeVisible` already
|
||||||
* never `403`) if the recipe exists but isn't visible to the viewer.
|
* has for visibility). Otherwise whatever {@link assertRecipeVisible}
|
||||||
|
* throws (`404 RECIPE_NOT_FOUND`, never `403`) if the recipe exists but
|
||||||
|
* isn't visible to the viewer.
|
||||||
*/
|
*/
|
||||||
async function loadVisibleStepOrThrow(
|
async function loadVisibleStepOrThrow(
|
||||||
recipeId: number,
|
recipeId: number,
|
||||||
stepId: number,
|
stepId: number,
|
||||||
viewerId: number,
|
viewerId: number,
|
||||||
viewerHouseId: number | null,
|
viewerHouseId: number | null,
|
||||||
): Promise<{ id: number; descriptionLength: number }> {
|
): Promise<{ id: number; description: string }> {
|
||||||
try {
|
try {
|
||||||
const step = await prisma.step.findUnique({
|
const step = await prisma.step.findUnique({
|
||||||
where: { id: stepId },
|
where: { id: stepId },
|
||||||
|
|
@ -57,7 +60,7 @@ async function loadVisibleStepOrThrow(
|
||||||
throw new HttpError(404, ErrorCode.STEP_NOT_FOUND, `Step ${stepId} not found`);
|
throw new HttpError(404, ErrorCode.STEP_NOT_FOUND, `Step ${stepId} not found`);
|
||||||
}
|
}
|
||||||
await assertRecipeVisible(step.recipeId, viewerId, viewerHouseId);
|
await assertRecipeVisible(step.recipeId, viewerId, viewerHouseId);
|
||||||
return { id: step.id, descriptionLength: step.description.length };
|
return { id: step.id, description: step.description };
|
||||||
} catch (err) {
|
} catch (err) {
|
||||||
throw err; // see recipe.service.ts's equivalent catch comment
|
throw err; // see recipe.service.ts's equivalent catch comment
|
||||||
}
|
}
|
||||||
|
|
@ -208,6 +211,21 @@ interface ManualUtensilMention {
|
||||||
start: number;
|
start: number;
|
||||||
end: number;
|
end: number;
|
||||||
}
|
}
|
||||||
|
/**
|
||||||
|
* Same as {@link ManualIngredientMention}, for a temperature — `raw` is
|
||||||
|
* already resolved by the caller ({@link submitTechStepCorrection}, which
|
||||||
|
* has the step's full `description` text to slice) rather than trusted
|
||||||
|
* from the client; see `manualStepTechStepTemperatureInputSchema`'s own
|
||||||
|
* doc comment (`packages/shared`) for why.
|
||||||
|
*/
|
||||||
|
interface ManualTemperatureMention {
|
||||||
|
celsius: number | null;
|
||||||
|
gasMark: number | null;
|
||||||
|
qualitative: "low" | "medium" | "high" | null;
|
||||||
|
raw: string;
|
||||||
|
start: number;
|
||||||
|
end: number;
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Applies a correction's *effect* on `stepId`'s real `StepTechStep`
|
* Applies a correction's *effect* on `stepId`'s real `StepTechStep`
|
||||||
|
|
@ -233,16 +251,16 @@ interface ManualUtensilMention {
|
||||||
*
|
*
|
||||||
* `metadata`, when given (only ever alongside a real `correctedTechStepId`
|
* `metadata`, when given (only ever alongside a real `correctedTechStepId`
|
||||||
* — enforced by `submitTechStepCorrectionSchema`, not re-checked here),
|
* — enforced by `submitTechStepCorrectionSchema`, not re-checked here),
|
||||||
* replaces *every* `StepTechStepIngredient`/`StepTechStepUtensil` row on
|
* replaces *every* `StepTechStepIngredient`/`StepTechStepUtensil`/
|
||||||
* this occurrence — `source: "auto"` (the classifier's own detection) and
|
* `StepTechStepTemperature` row on this occurrence — `source: "auto"` (the
|
||||||
* any earlier `"manual"` set alike — with the newly-submitted one. This is
|
* classifier's own detection) and any earlier `"manual"` set alike — with
|
||||||
* "le manuel remplace tout" (confirmed with the user): the resolved
|
* the newly-submitted one. This is "le manuel remplace tout" (confirmed
|
||||||
* `order` this technique ends up at (whichever branch above produced it)
|
* with the user): the resolved `order` this technique ends up at
|
||||||
* is the same `techStepOrder` both metadata tables key on, so the same
|
* (whichever branch above produced it) is the same `techStepOrder` all
|
||||||
* `deleteMany` + `createMany` pair below is correct whether this call just
|
* three metadata tables key on, so the same `deleteMany` + `createMany`
|
||||||
* updated an existing row (which may already carry auto-detected
|
* pair below is correct whether this call just updated an existing row
|
||||||
* metadata) or created a brand new one (nothing to delete yet — a no-op
|
* (which may already carry auto-detected metadata) or created a brand new
|
||||||
* `deleteMany`, not a special case).
|
* one (nothing to delete yet — a no-op `deleteMany`, not a special case).
|
||||||
*
|
*
|
||||||
* Runs inside the same transaction {@link submitTechStepCorrection} uses
|
* Runs inside the same transaction {@link submitTechStepCorrection} uses
|
||||||
* for the audit-trail insert, so a request never leaves any of these
|
* for the audit-trail insert, so a request never leaves any of these
|
||||||
|
|
@ -255,7 +273,11 @@ async function applyManualCorrection(
|
||||||
span: { start: number; end: number },
|
span: { start: number; end: number },
|
||||||
previousTechStepId: number | null,
|
previousTechStepId: number | null,
|
||||||
correctedTechStepId: number | null,
|
correctedTechStepId: number | null,
|
||||||
metadata?: { ingredients: ManualIngredientMention[]; utensils: ManualUtensilMention[] },
|
metadata?: {
|
||||||
|
ingredients: ManualIngredientMention[];
|
||||||
|
utensils: ManualUtensilMention[];
|
||||||
|
temperatures: ManualTemperatureMention[];
|
||||||
|
},
|
||||||
): Promise<void> {
|
): Promise<void> {
|
||||||
const existing = await tx.stepTechStep.findMany({ where: { stepId } });
|
const existing = await tx.stepTechStep.findMany({ where: { stepId } });
|
||||||
|
|
||||||
|
|
@ -329,6 +351,22 @@ async function applyManualCorrection(
|
||||||
})),
|
})),
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
await tx.stepTechStepTemperature.deleteMany({ where: { stepId, techStepOrder: order } });
|
||||||
|
if (metadata.temperatures.length > 0) {
|
||||||
|
await tx.stepTechStepTemperature.createMany({
|
||||||
|
data: metadata.temperatures.map((temperature) => ({
|
||||||
|
stepId,
|
||||||
|
techStepOrder: order,
|
||||||
|
celsius: temperature.celsius,
|
||||||
|
gasMark: temperature.gasMark,
|
||||||
|
qualitative: temperature.qualitative,
|
||||||
|
raw: temperature.raw,
|
||||||
|
start: temperature.start,
|
||||||
|
end: temperature.end,
|
||||||
|
source: "manual",
|
||||||
|
})),
|
||||||
|
});
|
||||||
|
}
|
||||||
}
|
}
|
||||||
} else if (target) {
|
} else if (target) {
|
||||||
await tx.stepTechStep.delete({ where: { stepId_order: { stepId, order: target.order } } });
|
await tx.stepTechStep.delete({ where: { stepId_order: { stepId, order: target.order } } });
|
||||||
|
|
@ -343,10 +381,20 @@ function toCorrectionView(correction: CorrectionWithTechSteps): StepTechStepCorr
|
||||||
start: correction.start,
|
start: correction.start,
|
||||||
end: correction.end,
|
end: correction.end,
|
||||||
previousTechStep: correction.previousTechStep
|
previousTechStep: correction.previousTechStep
|
||||||
? { id: correction.previousTechStep.id, key: correction.previousTechStep.key }
|
? {
|
||||||
|
id: correction.previousTechStep.id,
|
||||||
|
key: correction.previousTechStep.key,
|
||||||
|
isPlaceholder: correction.previousTechStep.isPlaceholder,
|
||||||
|
displayName: correction.previousTechStep.displayName,
|
||||||
|
}
|
||||||
: null,
|
: null,
|
||||||
correctedTechStep: correction.correctedTechStep
|
correctedTechStep: correction.correctedTechStep
|
||||||
? { id: correction.correctedTechStep.id, key: correction.correctedTechStep.key }
|
? {
|
||||||
|
id: correction.correctedTechStep.id,
|
||||||
|
key: correction.correctedTechStep.key,
|
||||||
|
isPlaceholder: correction.correctedTechStep.isPlaceholder,
|
||||||
|
displayName: correction.correctedTechStep.displayName,
|
||||||
|
}
|
||||||
: null,
|
: null,
|
||||||
createdAt: correction.createdAt.toISOString(),
|
createdAt: correction.createdAt.toISOString(),
|
||||||
};
|
};
|
||||||
|
|
@ -366,10 +414,11 @@ function toCorrectionView(correction: CorrectionWithTechSteps): StepTechStepCorr
|
||||||
* @throws {HttpError} `404 STEP_NOT_FOUND`/`404 RECIPE_NOT_FOUND` — see
|
* @throws {HttpError} `404 STEP_NOT_FOUND`/`404 RECIPE_NOT_FOUND` — see
|
||||||
* {@link loadVisibleStepOrThrow}. `400 INVALID_CORRECTION_SPAN` if
|
* {@link loadVisibleStepOrThrow}. `400 INVALID_CORRECTION_SPAN` if
|
||||||
* `start`/`end` (the correction's own span, or any of
|
* `start`/`end` (the correction's own span, or any of
|
||||||
* `input.ingredients`/`input.utensils`' own spans) fall outside the
|
* `input.ingredients`/`input.utensils`/`input.temperatures`' own spans)
|
||||||
* step's current `description` (it may have been edited since the user
|
* fall outside the step's current `description` (it may have been
|
||||||
* last saw it). `404 TECH_STEP_NOT_FOUND`/`404 INGREDIENT_NOT_FOUND`/
|
* edited since the user last saw it). `404 TECH_STEP_NOT_FOUND`/
|
||||||
* `404 UNIT_NOT_FOUND`/`404 UTENSIL_NOT_FOUND` if any referenced id
|
* `404 INGREDIENT_NOT_FOUND`/`404 UNIT_NOT_FOUND`/`404 UTENSIL_NOT_FOUND`
|
||||||
|
* if any referenced id
|
||||||
* doesn't exist.
|
* doesn't exist.
|
||||||
*/
|
*/
|
||||||
export async function submitTechStepCorrection(
|
export async function submitTechStepCorrection(
|
||||||
|
|
@ -381,18 +430,20 @@ export async function submitTechStepCorrection(
|
||||||
): Promise<SubmitTechStepCorrectionResult> {
|
): Promise<SubmitTechStepCorrectionResult> {
|
||||||
try {
|
try {
|
||||||
const step = await loadVisibleStepOrThrow(recipeId, stepId, correctorId, viewerHouseId);
|
const step = await loadVisibleStepOrThrow(recipeId, stepId, correctorId, viewerHouseId);
|
||||||
|
const descriptionLength = step.description.length;
|
||||||
|
|
||||||
const spans = [
|
const spans = [
|
||||||
{ start: input.start, end: input.end },
|
{ start: input.start, end: input.end },
|
||||||
...(input.ingredients ?? []),
|
...(input.ingredients ?? []),
|
||||||
...(input.utensils ?? []),
|
...(input.utensils ?? []),
|
||||||
|
...(input.temperatures ?? []),
|
||||||
];
|
];
|
||||||
for (const span of spans) {
|
for (const span of spans) {
|
||||||
if (span.start >= step.descriptionLength || span.end > step.descriptionLength) {
|
if (span.start >= descriptionLength || span.end > descriptionLength) {
|
||||||
throw new HttpError(
|
throw new HttpError(
|
||||||
400,
|
400,
|
||||||
ErrorCode.INVALID_CORRECTION_SPAN,
|
ErrorCode.INVALID_CORRECTION_SPAN,
|
||||||
`Span [${span.start}, ${span.end}) falls outside step ${stepId}'s description (length ${step.descriptionLength})`,
|
`Span [${span.start}, ${span.end}) falls outside step ${stepId}'s description (length ${descriptionLength})`,
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
@ -409,69 +460,109 @@ export async function submitTechStepCorrection(
|
||||||
);
|
);
|
||||||
await assertUtensilsExist((input.utensils ?? []).map((u) => u.utensilId));
|
await assertUtensilsExist((input.utensils ?? []).map((u) => u.utensilId));
|
||||||
|
|
||||||
const { correction, techSteps } = await prisma.$transaction(async (tx) => {
|
const { correction, techSteps, placeholderTechStepId } = await prisma.$transaction(
|
||||||
const createdCorrection = await tx.stepTechStepCorrection.create({
|
async (tx) => {
|
||||||
data: {
|
// A technique the catalog doesn't have (issue #130) — mint a
|
||||||
stepId: step.id,
|
// placeholder `TechStep` for it, in the same transaction as the
|
||||||
correctorId,
|
// correction that references it, then proceed exactly as if its id had
|
||||||
start: input.start,
|
// been sent as `correctedTechStepId`. Same shape as
|
||||||
end: input.end,
|
// `recipe.service.ts`'s `resolveIngredientLines` does for a
|
||||||
previousTechStepId: input.previousTechStepId ?? null,
|
// free-text ingredient.
|
||||||
correctedTechStepId: input.correctedTechStepId ?? null,
|
const placeholderTechStepId =
|
||||||
},
|
input.correctedTechStepName !== undefined
|
||||||
include: correctionInclude,
|
? (
|
||||||
});
|
await tx.techStep.create({
|
||||||
|
data: {
|
||||||
|
key: `placeholder:${randomUUID()}`,
|
||||||
|
isPlaceholder: true,
|
||||||
|
displayName: input.correctedTechStepName,
|
||||||
|
createdById: correctorId,
|
||||||
|
createdAt: new Date(),
|
||||||
|
},
|
||||||
|
select: { id: true },
|
||||||
|
})
|
||||||
|
).id
|
||||||
|
: null;
|
||||||
|
const effectiveCorrectedTechStepId =
|
||||||
|
placeholderTechStepId ?? input.correctedTechStepId ?? null;
|
||||||
|
|
||||||
await applyManualCorrection(
|
const createdCorrection = await tx.stepTechStepCorrection.create({
|
||||||
tx,
|
data: {
|
||||||
step.id,
|
stepId: step.id,
|
||||||
{ start: input.start, end: input.end },
|
correctorId,
|
||||||
input.previousTechStepId ?? null,
|
start: input.start,
|
||||||
input.correctedTechStepId ?? null,
|
end: input.end,
|
||||||
input.ingredients === undefined && input.utensils === undefined
|
previousTechStepId: input.previousTechStepId ?? null,
|
||||||
? undefined
|
correctedTechStepId: effectiveCorrectedTechStepId,
|
||||||
: {
|
|
||||||
ingredients: (input.ingredients ?? []).map((ingredient) => ({
|
|
||||||
ingredientId: ingredient.ingredientId,
|
|
||||||
quantity: ingredient.quantity ?? null,
|
|
||||||
unitId: ingredient.unitId ?? null,
|
|
||||||
start: ingredient.start,
|
|
||||||
end: ingredient.end,
|
|
||||||
})),
|
|
||||||
utensils: (input.utensils ?? []).map((utensil) => ({
|
|
||||||
utensilId: utensil.utensilId,
|
|
||||||
start: utensil.start,
|
|
||||||
end: utensil.end,
|
|
||||||
})),
|
|
||||||
},
|
|
||||||
);
|
|
||||||
|
|
||||||
// Same nested `ingredients`/`utensils` include as `recipe.service.ts`'s
|
|
||||||
// `recipeInclude` — `toStepTechStepViews` (reused below) expects it,
|
|
||||||
// so the fresh sequence read right after a manual correction resolves
|
|
||||||
// exactly the same way a normal `GET /recipes/:id` would.
|
|
||||||
const freshTechSteps = await tx.stepTechStep.findMany({
|
|
||||||
where: { stepId: step.id },
|
|
||||||
orderBy: { order: "asc" },
|
|
||||||
include: {
|
|
||||||
techStep: true,
|
|
||||||
ingredients: {
|
|
||||||
include: {
|
|
||||||
ingredient: {
|
|
||||||
include: {
|
|
||||||
allergies: { include: { allergy: { include: { category: true } } } },
|
|
||||||
diets: { include: { diet: true } },
|
|
||||||
},
|
|
||||||
},
|
|
||||||
unit: true,
|
|
||||||
},
|
|
||||||
},
|
},
|
||||||
utensils: { include: { utensil: true } },
|
include: correctionInclude,
|
||||||
},
|
});
|
||||||
});
|
|
||||||
|
|
||||||
return { correction: createdCorrection, techSteps: freshTechSteps };
|
await applyManualCorrection(
|
||||||
});
|
tx,
|
||||||
|
step.id,
|
||||||
|
{ start: input.start, end: input.end },
|
||||||
|
input.previousTechStepId ?? null,
|
||||||
|
effectiveCorrectedTechStepId,
|
||||||
|
input.ingredients === undefined &&
|
||||||
|
input.utensils === undefined &&
|
||||||
|
input.temperatures === undefined
|
||||||
|
? undefined
|
||||||
|
: {
|
||||||
|
ingredients: (input.ingredients ?? []).map((ingredient) => ({
|
||||||
|
ingredientId: ingredient.ingredientId,
|
||||||
|
quantity: ingredient.quantity ?? null,
|
||||||
|
unitId: ingredient.unitId ?? null,
|
||||||
|
start: ingredient.start,
|
||||||
|
end: ingredient.end,
|
||||||
|
})),
|
||||||
|
utensils: (input.utensils ?? []).map((utensil) => ({
|
||||||
|
utensilId: utensil.utensilId,
|
||||||
|
start: utensil.start,
|
||||||
|
end: utensil.end,
|
||||||
|
})),
|
||||||
|
// `raw` is derived here (not sent by the client) — see
|
||||||
|
// `ManualTemperatureMention`'s own doc comment.
|
||||||
|
temperatures: (input.temperatures ?? []).map((temperature) => ({
|
||||||
|
celsius: temperature.celsius ?? null,
|
||||||
|
gasMark: temperature.gasMark ?? null,
|
||||||
|
qualitative: temperature.qualitative ?? null,
|
||||||
|
raw: step.description.slice(temperature.start, temperature.end),
|
||||||
|
start: temperature.start,
|
||||||
|
end: temperature.end,
|
||||||
|
})),
|
||||||
|
},
|
||||||
|
);
|
||||||
|
|
||||||
|
// Same nested `ingredients`/`utensils`/`temperatures` include as
|
||||||
|
// `recipe.service.ts`'s `recipeInclude` — `toStepTechStepViews`
|
||||||
|
// (reused below) expects it, so the fresh sequence read right after a
|
||||||
|
// manual correction resolves exactly the same way a normal
|
||||||
|
// `GET /recipes/:id` would.
|
||||||
|
const freshTechSteps = await tx.stepTechStep.findMany({
|
||||||
|
where: { stepId: step.id },
|
||||||
|
orderBy: { order: "asc" },
|
||||||
|
include: {
|
||||||
|
techStep: true,
|
||||||
|
ingredients: {
|
||||||
|
include: {
|
||||||
|
ingredient: {
|
||||||
|
include: {
|
||||||
|
allergies: { include: { allergy: { include: { category: true } } } },
|
||||||
|
diets: { include: { diet: true } },
|
||||||
|
},
|
||||||
|
},
|
||||||
|
unit: true,
|
||||||
|
},
|
||||||
|
},
|
||||||
|
utensils: { include: { utensil: true } },
|
||||||
|
temperatures: true,
|
||||||
|
},
|
||||||
|
});
|
||||||
|
|
||||||
|
return { correction: createdCorrection, techSteps: freshTechSteps, placeholderTechStepId };
|
||||||
|
},
|
||||||
|
);
|
||||||
|
|
||||||
analytics.recordEvent("tech_step.correction_submitted", {
|
analytics.recordEvent("tech_step.correction_submitted", {
|
||||||
actorId: correctorId,
|
actorId: correctorId,
|
||||||
|
|
@ -479,9 +570,20 @@ export async function submitTechStepCorrection(
|
||||||
recipeId,
|
recipeId,
|
||||||
stepId,
|
stepId,
|
||||||
previousTechStepId: input.previousTechStepId ?? null,
|
previousTechStepId: input.previousTechStepId ?? null,
|
||||||
correctedTechStepId: input.correctedTechStepId ?? null,
|
correctedTechStepId: correction.correctedTechStepId,
|
||||||
},
|
},
|
||||||
});
|
});
|
||||||
|
if (placeholderTechStepId !== null) {
|
||||||
|
analytics.recordEvent("tech_step.placeholder_proposed", {
|
||||||
|
actorId: correctorId,
|
||||||
|
context: {
|
||||||
|
recipeId,
|
||||||
|
stepId,
|
||||||
|
techStepId: placeholderTechStepId,
|
||||||
|
name: input.correctedTechStepName ?? "",
|
||||||
|
},
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
return { correction: toCorrectionView(correction), techSteps: toStepTechStepViews(techSteps) };
|
return { correction: toCorrectionView(correction), techSteps: toStepTechStepViews(techSteps) };
|
||||||
} catch (err) {
|
} catch (err) {
|
||||||
|
|
|
||||||
|
|
@ -3,6 +3,7 @@ import { HttpError } from "@batch-cooking/error-tools";
|
||||||
import {
|
import {
|
||||||
type AllergyView,
|
type AllergyView,
|
||||||
type CreateRecipeInput,
|
type CreateRecipeInput,
|
||||||
|
computeRecipeDietViews,
|
||||||
type DietView,
|
type DietView,
|
||||||
ErrorCode,
|
ErrorCode,
|
||||||
type IngredientView,
|
type IngredientView,
|
||||||
|
|
@ -20,6 +21,7 @@ import {
|
||||||
type TechStepMatch,
|
type TechStepMatch,
|
||||||
techStepClassifier,
|
techStepClassifier,
|
||||||
} from "../../lib/recipe-matching/tech-step-matcher.js";
|
} from "../../lib/recipe-matching/tech-step-matcher.js";
|
||||||
|
import { toStepTechStepCreateInputs } from "../../lib/recipe-matching/tech-step-persistence.js";
|
||||||
|
|
||||||
// No user-language preference exists anywhere in the app yet (a single
|
// No user-language preference exists anywhere in the app yet (a single
|
||||||
// "fr" translation file, no locale field on User/UserProfile) — steps are
|
// "fr" translation file, no locale field on User/UserProfile) — steps are
|
||||||
|
|
@ -28,7 +30,7 @@ import {
|
||||||
// is a parameter rather than baked into that module.
|
// is a parameter rather than baked into that module.
|
||||||
const DEFAULT_TECH_STEP_LOCALE = "fr";
|
const DEFAULT_TECH_STEP_LOCALE = "fr";
|
||||||
|
|
||||||
/** Prisma `include` for every query that needs a full {@link RecipeView} — ingredients resolved to their reference data + allergens, steps in order, diet tags, and whether `viewerId` has favorited it. Parameterized by viewer since `favoritedBy` is per-viewer, not a static shape. */
|
/** Prisma `include` for every query that needs a full {@link RecipeView} — ingredients resolved to their reference data (name, allergens, diet compatibilities), steps in order, and whether `viewerId` has favorited it. Parameterized by viewer since `favoritedBy` is per-viewer, not a static shape. A recipe's own regimes are no longer stored (issue #131 dropped `RecipeDiet`) — they're computed from the ingredient views by {@link computeRecipeDietViews}. */
|
||||||
function recipeInclude(viewerId: number) {
|
function recipeInclude(viewerId: number) {
|
||||||
return {
|
return {
|
||||||
ingredients: {
|
ingredients: {
|
||||||
|
|
@ -68,22 +70,43 @@ function recipeInclude(viewerId: number) {
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
utensils: { include: { utensil: true } },
|
utensils: { include: { utensil: true } },
|
||||||
|
temperatures: true,
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
diets: { include: { diet: true } },
|
|
||||||
favoritedBy: { where: { userProfileId: viewerId } },
|
favoritedBy: { where: { userProfileId: viewerId } },
|
||||||
} satisfies Prisma.RecipeInclude;
|
} satisfies Prisma.RecipeInclude;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Every reference `Diet` row (`{ id, key }`), loaded once and memoized —
|
||||||
|
* `Diet` is seeded reference data that never changes at runtime, so caching
|
||||||
|
* it for the process's lifetime is safe. Used to attach a real `DietView` to
|
||||||
|
* the derived gluten-free regime (see {@link loadGlutenFreeDiet}) and to
|
||||||
|
* resolve the planning picker's `dietIds` filter / a household's members'
|
||||||
|
* regimes for the post-filter in {@link listRecipes}.
|
||||||
|
*/
|
||||||
|
let referenceDietsPromise: Promise<DietView[]> | null = null;
|
||||||
|
function loadReferenceDiets(): Promise<DietView[]> {
|
||||||
|
if (referenceDietsPromise === null) {
|
||||||
|
referenceDietsPromise = prisma.diet.findMany({ select: { id: true, key: true } });
|
||||||
|
}
|
||||||
|
return referenceDietsPromise;
|
||||||
|
}
|
||||||
|
|
||||||
|
/** The reference `glutenFree` {@link DietView} — {@link computeRecipeDietViews} needs it to give the derived gluten-free regime a real `{ id, key }` (no `IngredientDiet` row references it, unlike the other regimes). `undefined` only if the seed somehow lacks the row, in which case gluten-free is simply omitted. */
|
||||||
|
async function loadGlutenFreeDiet(): Promise<DietView | undefined> {
|
||||||
|
return (await loadReferenceDiets()).find((diet) => diet.key === "glutenFree");
|
||||||
|
}
|
||||||
|
|
||||||
type RecipeWithDetails = Prisma.RecipeGetPayload<{
|
type RecipeWithDetails = Prisma.RecipeGetPayload<{
|
||||||
include: ReturnType<typeof recipeInclude>;
|
include: ReturnType<typeof recipeInclude>;
|
||||||
}>;
|
}>;
|
||||||
/** Exported — `shopping-list.service.ts` fetches its own, narrower ingredient include (no need for a whole `RecipeWithDetails`) but shapes the same `allergies`/`diets` nesting, so it reuses {@link toIngredientView} directly instead of re-deriving this type. */
|
/** Exported — `shopping-list.service.ts` fetches its own, narrower ingredient include (no need for a whole `RecipeWithDetails`) but shapes the same `allergies`/`diets` nesting, so it reuses {@link toIngredientView} directly instead of re-deriving this type. */
|
||||||
export type IngredientWithDetails = RecipeWithDetails["ingredients"][number]["ingredient"];
|
export type IngredientWithDetails = RecipeWithDetails["ingredients"][number]["ingredient"];
|
||||||
/** Exported — see {@link IngredientWithDetails}, same reuse by `shopping-list.service.ts`. */
|
/** Exported — see {@link IngredientWithDetails}, same reuse by `shopping-list.service.ts`. `NonNullable` since a `RecipeIngredient.unit` is now `null` on a "selon le goût" line — callers guard that before calling {@link toUnitView}. */
|
||||||
export type UnitWithDetails = RecipeWithDetails["ingredients"][number]["unit"];
|
export type UnitWithDetails = NonNullable<RecipeWithDetails["ingredients"][number]["unit"]>;
|
||||||
|
|
||||||
/** Shapes a Prisma `Unit` row into the public {@link UnitView} — same "Decimal → number" conversion `reference.service.ts`'s `getUnits` does. Exported — reused as-is by `shopping-list.service.ts` (a shopping list resolves the same reference data, no need for a second copy of this mapping). */
|
/** Shapes a Prisma `Unit` row into the public {@link UnitView} — same "Decimal → number" conversion `reference.service.ts`'s `getUnits` does. Exported — reused as-is by `shopping-list.service.ts` (a shopping list resolves the same reference data, no need for a second copy of this mapping). */
|
||||||
export function toUnitView(unit: UnitWithDetails): UnitView {
|
export function toUnitView(unit: UnitWithDetails): UnitView {
|
||||||
|
|
@ -119,10 +142,6 @@ export function toIngredientView(ingredient: IngredientWithDetails): IngredientV
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
function toDietView(diet: { id: number; key: string }): DietView {
|
|
||||||
return { id: diet.id, key: diet.key };
|
|
||||||
}
|
|
||||||
|
|
||||||
/** Deduplicates allergens (by id) across every ingredient of a recipe, for the aggregated "contains" badge — see {@link RecipeSummaryView.allergens}. */
|
/** Deduplicates allergens (by id) across every ingredient of a recipe, for the aggregated "contains" badge — see {@link RecipeSummaryView.allergens}. */
|
||||||
function aggregateAllergens(ingredients: IngredientView[]): AllergyView[] {
|
function aggregateAllergens(ingredients: IngredientView[]): AllergyView[] {
|
||||||
const byId = new Map<number, AllergyView>();
|
const byId = new Map<number, AllergyView>();
|
||||||
|
|
@ -134,10 +153,13 @@ function aggregateAllergens(ingredients: IngredientView[]): AllergyView[] {
|
||||||
return [...byId.values()];
|
return [...byId.values()];
|
||||||
}
|
}
|
||||||
|
|
||||||
/** Shapes a Prisma `Recipe` (with {@link recipeInclude} included) into the lighter {@link RecipeSummaryView} used by the catalog table — everything `toRecipeView` also needs, factored out since the full detail view is a strict superset. */
|
/** Shapes a Prisma `Recipe` (with {@link recipeInclude} included) into the lighter {@link RecipeSummaryView} used by the catalog table — everything `toRecipeView` also needs, factored out since the full detail view is a strict superset. `glutenFreeDiet` (see {@link loadGlutenFreeDiet}) is threaded through only so {@link computeRecipeDietViews} can attach a real `DietView` to the derived gluten-free regime. */
|
||||||
function toRecipeSummaryView(recipe: RecipeWithDetails): RecipeSummaryView {
|
function toRecipeSummaryView(
|
||||||
const allergens = aggregateAllergens(
|
recipe: RecipeWithDetails,
|
||||||
recipe.ingredients.map((recipeIngredient) => toIngredientView(recipeIngredient.ingredient)),
|
glutenFreeDiet: DietView | undefined,
|
||||||
|
): RecipeSummaryView {
|
||||||
|
const ingredientViews = recipe.ingredients.map((recipeIngredient) =>
|
||||||
|
toIngredientView(recipeIngredient.ingredient),
|
||||||
);
|
);
|
||||||
return {
|
return {
|
||||||
id: recipe.id,
|
id: recipe.id,
|
||||||
|
|
@ -147,8 +169,9 @@ function toRecipeSummaryView(recipe: RecipeWithDetails): RecipeSummaryView {
|
||||||
portions: recipe.portions,
|
portions: recipe.portions,
|
||||||
authorId: recipe.authorId,
|
authorId: recipe.authorId,
|
||||||
visibility: recipe.visibility,
|
visibility: recipe.visibility,
|
||||||
allergens,
|
allergens: aggregateAllergens(ingredientViews),
|
||||||
diets: recipe.diets.map((recipeDiet) => toDietView(recipeDiet.diet)),
|
// Computed from the ingredients, not stored — see `RecipeSummaryView.diets`.
|
||||||
|
diets: computeRecipeDietViews(ingredientViews, glutenFreeDiet),
|
||||||
isFavorite: recipe.favoritedBy.length > 0,
|
isFavorite: recipe.favoritedBy.length > 0,
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
@ -175,11 +198,25 @@ export function toStepTechStepViews(
|
||||||
): StepTechStepView[] {
|
): StepTechStepView[] {
|
||||||
const views: StepTechStepView[] = [];
|
const views: StepTechStepView[] = [];
|
||||||
for (const stepTechStep of techSteps) {
|
for (const stepTechStep of techSteps) {
|
||||||
const { start, end, contextStart, contextEnd, techStep, source, ingredients, utensils } =
|
const {
|
||||||
stepTechStep;
|
start,
|
||||||
|
end,
|
||||||
|
contextStart,
|
||||||
|
contextEnd,
|
||||||
|
techStep,
|
||||||
|
source,
|
||||||
|
ingredients,
|
||||||
|
utensils,
|
||||||
|
temperatures,
|
||||||
|
} = stepTechStep;
|
||||||
if (start === null || end === null) continue;
|
if (start === null || end === null) continue;
|
||||||
views.push({
|
views.push({
|
||||||
techStep: { id: techStep.id, key: techStep.key },
|
techStep: {
|
||||||
|
id: techStep.id,
|
||||||
|
key: techStep.key,
|
||||||
|
isPlaceholder: techStep.isPlaceholder,
|
||||||
|
displayName: techStep.displayName,
|
||||||
|
},
|
||||||
start,
|
start,
|
||||||
end,
|
end,
|
||||||
// `source` is a plain DB `String`, not a Prisma enum (see
|
// `source` is a plain DB `String`, not a Prisma enum (see
|
||||||
|
|
@ -206,20 +243,39 @@ export function toStepTechStepViews(
|
||||||
end: stepTechStepUtensil.end,
|
end: stepTechStepUtensil.end,
|
||||||
source: stepTechStepUtensil.source === "manual" ? "manual" : "auto",
|
source: stepTechStepUtensil.source === "manual" ? "manual" : "auto",
|
||||||
})),
|
})),
|
||||||
|
temperatures: temperatures.map((stepTechStepTemperature) => ({
|
||||||
|
// `celsius` comes back as a Prisma `Decimal` — plain `number` here,
|
||||||
|
// same treatment as `StepTechStepIngredient.quantity` above.
|
||||||
|
celsius:
|
||||||
|
stepTechStepTemperature.celsius === null ? null : Number(stepTechStepTemperature.celsius),
|
||||||
|
gasMark: stepTechStepTemperature.gasMark,
|
||||||
|
qualitative:
|
||||||
|
stepTechStepTemperature.qualitative === "low" ||
|
||||||
|
stepTechStepTemperature.qualitative === "medium" ||
|
||||||
|
stepTechStepTemperature.qualitative === "high"
|
||||||
|
? stepTechStepTemperature.qualitative
|
||||||
|
: null,
|
||||||
|
raw: stepTechStepTemperature.raw,
|
||||||
|
start: stepTechStepTemperature.start,
|
||||||
|
end: stepTechStepTemperature.end,
|
||||||
|
// Same narrowing posture as the technique's own `source` above.
|
||||||
|
source: stepTechStepTemperature.source === "manual" ? "manual" : "auto",
|
||||||
|
})),
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
return views;
|
return views;
|
||||||
}
|
}
|
||||||
|
|
||||||
/** Shapes a Prisma `Recipe` (with {@link recipeInclude} included) into the public {@link RecipeView}. */
|
/** Shapes a Prisma `Recipe` (with {@link recipeInclude} included) into the public {@link RecipeView}. `glutenFreeDiet` — see {@link toRecipeSummaryView}. */
|
||||||
function toRecipeView(recipe: RecipeWithDetails): RecipeView {
|
function toRecipeView(recipe: RecipeWithDetails, glutenFreeDiet: DietView | undefined): RecipeView {
|
||||||
const ingredients = recipe.ingredients.map((recipeIngredient) => ({
|
const ingredients = recipe.ingredients.map((recipeIngredient) => ({
|
||||||
ingredient: toIngredientView(recipeIngredient.ingredient),
|
ingredient: toIngredientView(recipeIngredient.ingredient),
|
||||||
quantity: Number(recipeIngredient.quantity),
|
// Both `null` on a "selon le goût" seasoning line — see `RecipeIngredientView`.
|
||||||
unit: toUnitView(recipeIngredient.unit),
|
quantity: recipeIngredient.quantity === null ? null : Number(recipeIngredient.quantity),
|
||||||
|
unit: recipeIngredient.unit === null ? null : toUnitView(recipeIngredient.unit),
|
||||||
}));
|
}));
|
||||||
return {
|
return {
|
||||||
...toRecipeSummaryView(recipe),
|
...toRecipeSummaryView(recipe, glutenFreeDiet),
|
||||||
ingredients,
|
ingredients,
|
||||||
steps: recipe.steps.map((step) => ({
|
steps: recipe.steps.map((step) => ({
|
||||||
id: step.id,
|
id: step.id,
|
||||||
|
|
@ -272,54 +328,57 @@ function visibleToViewerWhere(
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* `Recipe` rows that avoid every member of `houseId`'s declared allergens
|
* The two halves of the planning recipe picker's "convient à tout le foyer"
|
||||||
* and, for every member with a declared regime, are tagged with that
|
* toggle (`suitableForHousehold` on `listRecipes`):
|
||||||
* regime — the planning recipe picker's "convient à tout le foyer" toggle
|
* - `allergenWhere` — a `Prisma.RecipeWhereInput` excluding any recipe that
|
||||||
* (`suitableForHousehold` on `listRecipes`). Computed server-side (a small
|
* contains an allergen declared by a member (still expressible in SQL).
|
||||||
* extra query to gather the household's members' allergy/regime ids)
|
* - `requiredDietKeys` — every regime declared by a member (`omnivore`
|
||||||
* rather than exposed to the client as raw per-member data: a member's
|
* dropped: it constrains nothing). A recipe must satisfy *all* of them —
|
||||||
* allergies/regime are private the same way visibility already keeps a
|
* a recipe suiting a vegetarian member doesn't automatically suit a
|
||||||
* recipe's existence private (404, never 403) — nothing here should let
|
* gluten-free one. Applied as a post-filter in {@link listRecipes} on the
|
||||||
* one member infer another's medical/dietary info from the shape of a
|
* *computed* `RecipeSummaryView.diets`, since regimes are no longer a
|
||||||
* filtered list. Deliberately excludes `UserProfileDislikedIngredient` —
|
* stored column to query (issue #131).
|
||||||
* the schema already treats disliked ingredients as a taste preference,
|
*
|
||||||
* not a safety constraint (see that model's doc comment), so it doesn't
|
* Computed server-side (a small extra query for the members' allergy/regime
|
||||||
* belong in a filter framed around what's safe/appropriate to serve.
|
* data) rather than exposed to the client as raw per-member data: a
|
||||||
|
* member's allergies/regime are private the same way visibility already
|
||||||
|
* keeps a recipe's existence private. Deliberately excludes
|
||||||
|
* `UserProfileDislikedIngredient` — a taste preference, not a safety
|
||||||
|
* constraint (see that model's doc comment).
|
||||||
*/
|
*/
|
||||||
async function suitableForHouseholdWhere(houseId: number): Promise<Prisma.RecipeWhereInput> {
|
async function suitableForHousehold(
|
||||||
|
houseId: number,
|
||||||
|
): Promise<{ allergenWhere: Prisma.RecipeWhereInput; requiredDietKeys: string[] }> {
|
||||||
try {
|
try {
|
||||||
const members = await prisma.userProfile.findMany({
|
const members = await prisma.userProfile.findMany({
|
||||||
where: { houseId },
|
where: { houseId },
|
||||||
select: { dietId: true, allergies: { select: { allergyId: true } } },
|
select: {
|
||||||
|
diet: { select: { key: true } },
|
||||||
|
allergies: { select: { allergyId: true } },
|
||||||
|
},
|
||||||
});
|
});
|
||||||
const requiredDietIds = [
|
const requiredDietKeys = [
|
||||||
...new Set(members.map((m) => m.dietId).filter((id): id is number => id !== null)),
|
...new Set(
|
||||||
|
members
|
||||||
|
.map((member) => member.diet?.key)
|
||||||
|
.filter((key): key is string => key !== undefined && key !== "omnivore"),
|
||||||
|
),
|
||||||
];
|
];
|
||||||
const excludedAllergyIds = [
|
const excludedAllergyIds = [
|
||||||
...new Set(members.flatMap((m) => m.allergies.map((a) => a.allergyId))),
|
...new Set(members.flatMap((member) => member.allergies.map((allergy) => allergy.allergyId))),
|
||||||
];
|
];
|
||||||
|
|
||||||
const conditions: Prisma.RecipeWhereInput[] = [];
|
const allergenWhere: Prisma.RecipeWhereInput =
|
||||||
if (requiredDietIds.length > 0) {
|
excludedAllergyIds.length > 0
|
||||||
// Every diet declared by a member must be among this recipe's tags —
|
? {
|
||||||
// not "at least one", since a recipe suiting a vegetarian member
|
ingredients: {
|
||||||
// doesn't automatically suit a gluten-free one too.
|
none: {
|
||||||
conditions.push({
|
ingredient: { allergies: { some: { allergyId: { in: excludedAllergyIds } } } },
|
||||||
AND: requiredDietIds.map((dietId) => ({ diets: { some: { dietId } } })),
|
},
|
||||||
});
|
|
||||||
}
|
|
||||||
if (excludedAllergyIds.length > 0) {
|
|
||||||
conditions.push({
|
|
||||||
ingredients: {
|
|
||||||
none: {
|
|
||||||
ingredient: {
|
|
||||||
allergies: { some: { allergyId: { in: excludedAllergyIds } } },
|
|
||||||
},
|
},
|
||||||
},
|
}
|
||||||
},
|
: {};
|
||||||
});
|
return { allergenWhere, requiredDietKeys };
|
||||||
}
|
|
||||||
return { AND: conditions };
|
|
||||||
} catch (err) {
|
} catch (err) {
|
||||||
// Rethrown as-is — `wrapAsyncHandler`/the error middleware (which
|
// Rethrown as-is — `wrapAsyncHandler`/the error middleware (which
|
||||||
// already logs it, see `error-logger.ts`) is what actually handles it,
|
// already logs it, see `error-logger.ts`) is what actually handles it,
|
||||||
|
|
@ -353,7 +412,7 @@ async function sourceVisibilityWhere(houseId: number | null): Promise<Prisma.Rec
|
||||||
).map((row) => row.sourceId);
|
).map((row) => row.sourceId);
|
||||||
return { OR: [{ sourceId: null }, { sourceId: { in: enabledSourceIds } }] };
|
return { OR: [{ sourceId: null }, { sourceId: { in: enabledSourceIds } }] };
|
||||||
} catch (err) {
|
} catch (err) {
|
||||||
throw err; // see suitableForHouseholdWhere()'s catch comment above
|
throw err; // see suitableForHousehold()'s catch comment above
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -367,11 +426,11 @@ async function sourceVisibilityWhere(houseId: number | null): Promise<Prisma.Rec
|
||||||
export interface ListRecipesFilters {
|
export interface ListRecipesFilters {
|
||||||
/** Case-insensitive name substring. */
|
/** Case-insensitive name substring. */
|
||||||
search?: string;
|
search?: string;
|
||||||
/** The planning recipe picker's "convient à tout le foyer" toggle — see {@link suitableForHouseholdWhere}. */
|
/** The planning recipe picker's "convient à tout le foyer" toggle — see {@link suitableForHousehold}. */
|
||||||
suitableForHousehold?: boolean;
|
suitableForHousehold?: boolean;
|
||||||
/** Recipe must carry *every* one of these ingredient ids (AND, not "any of") — the planning recipe picker's ingredient filter. */
|
/** Recipe must carry *every* one of these ingredient ids (AND, not "any of") — the planning recipe picker's ingredient filter. */
|
||||||
ingredientIds?: number[];
|
ingredientIds?: number[];
|
||||||
/** Recipe must be tagged with *every* one of these diet ids (AND, same reasoning) — the planning recipe picker's regime filter. */
|
/** Recipe's *computed* regimes must include *every* one of these diet ids (AND, same reasoning) — the planning recipe picker's regime filter. Applied as a post-filter now that regimes aren't a stored column (issue #131). */
|
||||||
dietIds?: number[];
|
dietIds?: number[];
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -391,31 +450,32 @@ export async function listRecipes(
|
||||||
filters: ListRecipesFilters = {},
|
filters: ListRecipesFilters = {},
|
||||||
): Promise<RecipeSummaryView[]> {
|
): Promise<RecipeSummaryView[]> {
|
||||||
try {
|
try {
|
||||||
const { search, suitableForHousehold, ingredientIds, dietIds } = filters;
|
const { search, suitableForHousehold: suitable, ingredientIds, dietIds } = filters;
|
||||||
const conditions: Prisma.RecipeWhereInput[] = [await sourceVisibilityWhere(viewerHouseId)];
|
const conditions: Prisma.RecipeWhereInput[] = [await sourceVisibilityWhere(viewerHouseId)];
|
||||||
if (search) {
|
if (search) {
|
||||||
conditions.push({ name: { contains: search, mode: "insensitive" } });
|
conditions.push({ name: { contains: search, mode: "insensitive" } });
|
||||||
}
|
}
|
||||||
|
// Regimes are computed from ingredients, not a stored column (issue
|
||||||
|
// #131), so the household-regime and `dietIds` filters can't be SQL
|
||||||
|
// anymore — they run as post-filters on the mapped summaries below.
|
||||||
|
// Everything that still *can* be a `where` stays one.
|
||||||
|
let requiredDietKeys: string[] = [];
|
||||||
// No-op without a household — nothing to filter against, same posture as
|
// No-op without a household — nothing to filter against, same posture as
|
||||||
// the `foyer` tab returning everything it can rather than throwing.
|
// the `foyer` tab returning everything it can rather than throwing.
|
||||||
if (suitableForHousehold && viewerHouseId !== null) {
|
if (suitable && viewerHouseId !== null) {
|
||||||
conditions.push(await suitableForHouseholdWhere(viewerHouseId));
|
const household = await suitableForHousehold(viewerHouseId);
|
||||||
|
conditions.push(household.allergenWhere);
|
||||||
|
requiredDietKeys = household.requiredDietKeys;
|
||||||
}
|
}
|
||||||
if (ingredientIds && ingredientIds.length > 0) {
|
if (ingredientIds && ingredientIds.length > 0) {
|
||||||
// One condition per required id (AND) — a recipe must carry all of
|
// One condition per required id (AND) — a recipe must carry all of
|
||||||
// them, not just one, same "every one, not any one" posture as
|
// them, not just one.
|
||||||
// suitableForHouseholdWhere's requiredDietIds.
|
|
||||||
conditions.push({
|
conditions.push({
|
||||||
AND: ingredientIds.map((ingredientId) => ({
|
AND: ingredientIds.map((ingredientId) => ({
|
||||||
ingredients: { some: { ingredientId } },
|
ingredients: { some: { ingredientId } },
|
||||||
})),
|
})),
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
if (dietIds && dietIds.length > 0) {
|
|
||||||
conditions.push({
|
|
||||||
AND: dietIds.map((dietId) => ({ diets: { some: { dietId } } })),
|
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
switch (tab) {
|
switch (tab) {
|
||||||
case "favoris":
|
case "favoris":
|
||||||
|
|
@ -435,14 +495,38 @@ export async function listRecipes(
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
const recipes = await prisma.recipe.findMany({
|
const [recipes, referenceDiets] = await Promise.all([
|
||||||
where: { AND: conditions },
|
prisma.recipe.findMany({
|
||||||
include: recipeInclude(viewerId),
|
where: { AND: conditions },
|
||||||
orderBy: { name: "asc" },
|
include: recipeInclude(viewerId),
|
||||||
});
|
orderBy: { name: "asc" },
|
||||||
return recipes.map(toRecipeSummaryView);
|
}),
|
||||||
|
loadReferenceDiets(),
|
||||||
|
]);
|
||||||
|
const glutenFreeDiet = referenceDiets.find((diet) => diet.key === "glutenFree");
|
||||||
|
|
||||||
|
let summaries = recipes.map((recipe) => toRecipeSummaryView(recipe, glutenFreeDiet));
|
||||||
|
|
||||||
|
// Post-filters on the *computed* `diets` (see the comment where the SQL
|
||||||
|
// conditions are built). "Every one, not any one" for both.
|
||||||
|
if (requiredDietKeys.length > 0) {
|
||||||
|
summaries = summaries.filter((summary) =>
|
||||||
|
requiredDietKeys.every((key) => summary.diets.some((diet) => diet.key === key)),
|
||||||
|
);
|
||||||
|
}
|
||||||
|
if (dietIds && dietIds.length > 0) {
|
||||||
|
// `omnivore` in the filter would match nothing (it's never emitted) —
|
||||||
|
// treat it as "no constraint" rather than silently returning an empty list.
|
||||||
|
const requiredIds = dietIds.filter(
|
||||||
|
(id) => referenceDiets.find((diet) => diet.id === id)?.key !== "omnivore",
|
||||||
|
);
|
||||||
|
summaries = summaries.filter((summary) =>
|
||||||
|
requiredIds.every((id) => summary.diets.some((diet) => diet.id === id)),
|
||||||
|
);
|
||||||
|
}
|
||||||
|
return summaries;
|
||||||
} catch (err) {
|
} catch (err) {
|
||||||
throw err; // see suitableForHouseholdWhere()'s catch comment above
|
throw err; // see suitableForHousehold()'s catch comment above
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -461,23 +545,23 @@ export async function getRecipe(
|
||||||
if (!canView(recipe, viewerId, viewerHouseId)) {
|
if (!canView(recipe, viewerId, viewerHouseId)) {
|
||||||
throw new HttpError(404, ErrorCode.RECIPE_NOT_FOUND, `Recipe ${id} not found`);
|
throw new HttpError(404, ErrorCode.RECIPE_NOT_FOUND, `Recipe ${id} not found`);
|
||||||
}
|
}
|
||||||
return toRecipeView(recipe);
|
return toRecipeView(recipe, await loadGlutenFreeDiet());
|
||||||
} catch (err) {
|
} catch (err) {
|
||||||
throw err; // see suitableForHouseholdWhere()'s catch comment above
|
throw err; // see suitableForHousehold()'s catch comment above
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Creates a recipe with its ingredients, ordered steps and diet tags in one
|
* Creates a recipe with its ingredients and ordered steps in one go —
|
||||||
* go — steps' `order` is derived from their position in `input.steps`,
|
* steps' `order` is derived from their position in `input.steps`,
|
||||||
* ingredients reference existing reference `Ingredient` rows by id (see
|
* ingredients reference existing reference `Ingredient` rows by id (see
|
||||||
* `GET /reference/ingredients`; there's no way to create one here).
|
* `GET /reference/ingredients`; there's no way to create one here). Its
|
||||||
* `authorId`/`authorHouseId` are fixed at creation and never change on
|
* regimes aren't stored — they're computed from the ingredients on read
|
||||||
* later edits (see {@link updateRecipe}).
|
* (issue #131). `authorId`/`authorHouseId` are fixed at creation and never
|
||||||
|
* change on later edits (see {@link updateRecipe}).
|
||||||
*
|
*
|
||||||
* @throws {HttpError} `404 INGREDIENT_NOT_FOUND` if any `ingredientId` doesn't match a reference ingredient.
|
* @throws {HttpError} `404 INGREDIENT_NOT_FOUND` if any `ingredientId` doesn't match a reference ingredient.
|
||||||
* @throws {HttpError} `404 UNIT_NOT_FOUND` if any `unitId` doesn't match a reference unit.
|
* @throws {HttpError} `404 UNIT_NOT_FOUND` if any `unitId` doesn't match a reference unit.
|
||||||
* @throws {HttpError} `404 DIET_NOT_FOUND` if any `dietId` doesn't match a reference diet.
|
|
||||||
*/
|
*/
|
||||||
export async function createRecipe(
|
export async function createRecipe(
|
||||||
input: CreateRecipeInput,
|
input: CreateRecipeInput,
|
||||||
|
|
@ -487,7 +571,7 @@ export async function createRecipe(
|
||||||
try {
|
try {
|
||||||
return await createRecipeInternal(input, authorId, authorHouseId, null);
|
return await createRecipeInternal(input, authorId, authorHouseId, null);
|
||||||
} catch (err) {
|
} catch (err) {
|
||||||
throw err; // see suitableForHouseholdWhere()'s catch comment above
|
throw err; // see suitableForHousehold()'s catch comment above
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -504,7 +588,6 @@ export async function createRecipe(
|
||||||
*
|
*
|
||||||
* @throws {HttpError} `404 INGREDIENT_NOT_FOUND` if any `ingredientId` doesn't match a reference ingredient.
|
* @throws {HttpError} `404 INGREDIENT_NOT_FOUND` if any `ingredientId` doesn't match a reference ingredient.
|
||||||
* @throws {HttpError} `404 UNIT_NOT_FOUND` if any `unitId` doesn't match a reference unit.
|
* @throws {HttpError} `404 UNIT_NOT_FOUND` if any `unitId` doesn't match a reference unit.
|
||||||
* @throws {HttpError} `404 DIET_NOT_FOUND` if any `dietId` doesn't match a reference diet.
|
|
||||||
*/
|
*/
|
||||||
export async function createImportedRecipe(
|
export async function createImportedRecipe(
|
||||||
input: CreateRecipeInput,
|
input: CreateRecipeInput,
|
||||||
|
|
@ -515,7 +598,7 @@ export async function createImportedRecipe(
|
||||||
try {
|
try {
|
||||||
return await createRecipeInternal(input, authorId, authorHouseId, source);
|
return await createRecipeInternal(input, authorId, authorHouseId, source);
|
||||||
} catch (err) {
|
} catch (err) {
|
||||||
throw err; // see suitableForHouseholdWhere()'s catch comment above
|
throw err; // see suitableForHousehold()'s catch comment above
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -549,11 +632,11 @@ async function matchStepsTechSteps<T extends { description: string }>(
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
/** One resolved ingredient line — every `placeholderName` has been turned into a real (placeholder) `ingredientId`, ready for a `RecipeIngredient` create. */
|
/** One resolved ingredient line — every `placeholderName` has been turned into a real (placeholder) `ingredientId`, ready for a `RecipeIngredient` create. `quantity`/`unitId` are both `null` for a "selon le goût" seasoning line. */
|
||||||
interface ResolvedIngredientLine {
|
interface ResolvedIngredientLine {
|
||||||
ingredientId: number;
|
ingredientId: number;
|
||||||
quantity: number;
|
quantity: number | null;
|
||||||
unitId: number;
|
unitId: number | null;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
@ -586,8 +669,8 @@ async function resolveIngredientLines(
|
||||||
if (line.ingredientId !== undefined) {
|
if (line.ingredientId !== undefined) {
|
||||||
resolved.push({
|
resolved.push({
|
||||||
ingredientId: line.ingredientId,
|
ingredientId: line.ingredientId,
|
||||||
quantity: line.quantity,
|
quantity: line.quantity ?? null,
|
||||||
unitId: line.unitId,
|
unitId: line.unitId ?? null,
|
||||||
});
|
});
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
|
@ -603,12 +686,16 @@ async function resolveIngredientLines(
|
||||||
},
|
},
|
||||||
select: { id: true },
|
select: { id: true },
|
||||||
});
|
});
|
||||||
resolved.push({ ingredientId: placeholder.id, quantity: line.quantity, unitId: line.unitId });
|
resolved.push({
|
||||||
|
ingredientId: placeholder.id,
|
||||||
|
quantity: line.quantity ?? null,
|
||||||
|
unitId: line.unitId ?? null,
|
||||||
|
});
|
||||||
createdPlaceholders.push({ id: placeholder.id, name });
|
createdPlaceholders.push({ id: placeholder.id, name });
|
||||||
}
|
}
|
||||||
return { resolved, createdPlaceholders };
|
return { resolved, createdPlaceholders };
|
||||||
} catch (err) {
|
} catch (err) {
|
||||||
throw err; // see suitableForHouseholdWhere()'s catch comment above
|
throw err; // see suitableForHousehold()'s catch comment above
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -622,8 +709,9 @@ async function createRecipeInternal(
|
||||||
await assertIngredientsExist(
|
await assertIngredientsExist(
|
||||||
input.ingredients.map((i) => i.ingredientId).filter((id): id is number => id !== undefined),
|
input.ingredients.map((i) => i.ingredientId).filter((id): id is number => id !== undefined),
|
||||||
);
|
);
|
||||||
await assertUnitsExist(input.ingredients.map((i) => i.unitId));
|
await assertUnitsExist(
|
||||||
await assertDietsExist(input.dietIds);
|
input.ingredients.flatMap((i) => (i.unitId === undefined ? [] : [i.unitId])),
|
||||||
|
);
|
||||||
// Matched up front (one call per step, in parallel) rather than inline
|
// Matched up front (one call per step, in parallel) rather than inline
|
||||||
// inside the `steps.create` map below — `techStepClassifier` is async
|
// inside the `steps.create` map below — `techStepClassifier` is async
|
||||||
// (a trained model, not a pure regex test), so its result has to
|
// (a trained model, not a pure regex test), so its result has to
|
||||||
|
|
@ -666,35 +754,13 @@ async function createRecipeInternal(
|
||||||
description: step.description,
|
description: step.description,
|
||||||
picture: step.picture ?? null,
|
picture: step.picture ?? null,
|
||||||
order: index,
|
order: index,
|
||||||
techSteps: {
|
// Technique rows + their clause metadata (ingredients /
|
||||||
create: matches.map((match, order) => ({
|
// utensils / temperatures) — see `toStepTechStepCreateInputs`.
|
||||||
techStepId: match.techStepId,
|
// `updateRecipe` below builds the exact same payload from the
|
||||||
start: match.start,
|
// same helper so a resave never drops what a create persisted.
|
||||||
end: match.end,
|
techSteps: { create: toStepTechStepCreateInputs(matches) },
|
||||||
contextStart: match.contextStart,
|
|
||||||
contextEnd: match.contextEnd,
|
|
||||||
order,
|
|
||||||
ingredients: {
|
|
||||||
create: match.ingredients.map((ingredient) => ({
|
|
||||||
ingredientId: ingredient.ingredientId,
|
|
||||||
quantity: ingredient.quantity,
|
|
||||||
unitId: ingredient.unitId,
|
|
||||||
start: ingredient.start,
|
|
||||||
end: ingredient.end,
|
|
||||||
})),
|
|
||||||
},
|
|
||||||
utensils: {
|
|
||||||
create: match.utensils.map((utensil) => ({
|
|
||||||
utensilId: utensil.utensilId,
|
|
||||||
start: utensil.start,
|
|
||||||
end: utensil.end,
|
|
||||||
})),
|
|
||||||
},
|
|
||||||
})),
|
|
||||||
},
|
|
||||||
})),
|
})),
|
||||||
},
|
},
|
||||||
diets: { create: input.dietIds.map((dietId) => ({ dietId })) },
|
|
||||||
},
|
},
|
||||||
include: recipeInclude(authorId),
|
include: recipeInclude(authorId),
|
||||||
});
|
});
|
||||||
|
|
@ -712,24 +778,25 @@ async function createRecipeInternal(
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
return toRecipeView(created);
|
return toRecipeView(created, await loadGlutenFreeDiet());
|
||||||
} catch (err) {
|
} catch (err) {
|
||||||
throw err; // see suitableForHouseholdWhere()'s catch comment above
|
throw err; // see suitableForHousehold()'s catch comment above
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Replaces a recipe's whole content — name/description/picture/visibility
|
* Replaces a recipe's whole content — name/description/picture/visibility
|
||||||
* and the complete ingredient/step/diet lists (not a partial merge: a line
|
* and the complete ingredient/step lists (not a partial merge: a line
|
||||||
* missing from `input` is removed, same contract as `PATCH
|
* missing from `input` is removed, same contract as `PATCH
|
||||||
* /profile/allergies`). `authorId`/`authorHouseId` are untouched — editing
|
* /profile/allergies`). Regimes aren't part of the payload — they're
|
||||||
* never transfers ownership.
|
* recomputed from the ingredients on the next read (issue #131).
|
||||||
|
* `authorId`/`authorHouseId` are untouched — editing never transfers
|
||||||
|
* ownership.
|
||||||
*
|
*
|
||||||
* @throws {HttpError} `404 RECIPE_NOT_FOUND` if `id` doesn't match any recipe visible to `viewerId`.
|
* @throws {HttpError} `404 RECIPE_NOT_FOUND` if `id` doesn't match any recipe visible to `viewerId`.
|
||||||
* @throws {HttpError} `403 NOT_RECIPE_AUTHOR` if `viewerId` isn't this recipe's author.
|
* @throws {HttpError} `403 NOT_RECIPE_AUTHOR` if `viewerId` isn't this recipe's author.
|
||||||
* @throws {HttpError} `404 INGREDIENT_NOT_FOUND` if any `ingredientId` doesn't match a reference ingredient.
|
* @throws {HttpError} `404 INGREDIENT_NOT_FOUND` if any `ingredientId` doesn't match a reference ingredient.
|
||||||
* @throws {HttpError} `404 UNIT_NOT_FOUND` if any `unitId` doesn't match a reference unit.
|
* @throws {HttpError} `404 UNIT_NOT_FOUND` if any `unitId` doesn't match a reference unit.
|
||||||
* @throws {HttpError} `404 DIET_NOT_FOUND` if any `dietId` doesn't match a reference diet.
|
|
||||||
*/
|
*/
|
||||||
export async function updateRecipe(
|
export async function updateRecipe(
|
||||||
id: number,
|
id: number,
|
||||||
|
|
@ -744,8 +811,9 @@ export async function updateRecipe(
|
||||||
.map((i) => i.ingredientId)
|
.map((i) => i.ingredientId)
|
||||||
.filter((ingredientId): ingredientId is number => ingredientId !== undefined),
|
.filter((ingredientId): ingredientId is number => ingredientId !== undefined),
|
||||||
);
|
);
|
||||||
await assertUnitsExist(input.ingredients.map((i) => i.unitId));
|
await assertUnitsExist(
|
||||||
await assertDietsExist(input.dietIds);
|
input.ingredients.flatMap((i) => (i.unitId === undefined ? [] : [i.unitId])),
|
||||||
|
);
|
||||||
const stepsWithTechSteps = await matchStepsTechSteps(input.steps, DEFAULT_TECH_STEP_LOCALE);
|
const stepsWithTechSteps = await matchStepsTechSteps(input.steps, DEFAULT_TECH_STEP_LOCALE);
|
||||||
|
|
||||||
// Interactive transaction (not the array form) so any new free-text
|
// Interactive transaction (not the array form) so any new free-text
|
||||||
|
|
@ -756,7 +824,6 @@ export async function updateRecipe(
|
||||||
const createdPlaceholders = await prisma.$transaction(async (tx) => {
|
const createdPlaceholders = await prisma.$transaction(async (tx) => {
|
||||||
await tx.recipeIngredient.deleteMany({ where: { recipeId: id } });
|
await tx.recipeIngredient.deleteMany({ where: { recipeId: id } });
|
||||||
await tx.step.deleteMany({ where: { recipeId: id } });
|
await tx.step.deleteMany({ where: { recipeId: id } });
|
||||||
await tx.recipeDiet.deleteMany({ where: { recipeId: id } });
|
|
||||||
const { resolved, createdPlaceholders } = await resolveIngredientLines(
|
const { resolved, createdPlaceholders } = await resolveIngredientLines(
|
||||||
input.ingredients,
|
input.ingredients,
|
||||||
viewerId,
|
viewerId,
|
||||||
|
|
@ -782,19 +849,15 @@ export async function updateRecipe(
|
||||||
description: step.description,
|
description: step.description,
|
||||||
picture: step.picture ?? null,
|
picture: step.picture ?? null,
|
||||||
order: index,
|
order: index,
|
||||||
techSteps: {
|
// Same builder as `createRecipeInternal` — a resave must
|
||||||
create: matches.map((match, order) => ({
|
// persist the clause metadata (ingredients / utensils /
|
||||||
techStepId: match.techStepId,
|
// temperatures), not just the technique span. Omitting it
|
||||||
start: match.start,
|
// here is what left every edited recipe with temperature-less
|
||||||
end: match.end,
|
// `preheat` steps, so `cooking-optimizer.ts` could never spot
|
||||||
contextStart: match.contextStart,
|
// an oven-temperature conflict between two of them.
|
||||||
contextEnd: match.contextEnd,
|
techSteps: { create: toStepTechStepCreateInputs(matches) },
|
||||||
order,
|
|
||||||
})),
|
|
||||||
},
|
|
||||||
})),
|
})),
|
||||||
},
|
},
|
||||||
diets: { create: input.dietIds.map((dietId) => ({ dietId })) },
|
|
||||||
},
|
},
|
||||||
});
|
});
|
||||||
return createdPlaceholders;
|
return createdPlaceholders;
|
||||||
|
|
@ -807,9 +870,9 @@ export async function updateRecipe(
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
return toRecipeView(await findRecipeOrThrow(id, viewerId));
|
return toRecipeView(await findRecipeOrThrow(id, viewerId), await loadGlutenFreeDiet());
|
||||||
} catch (err) {
|
} catch (err) {
|
||||||
throw err; // see suitableForHouseholdWhere()'s catch comment above
|
throw err; // see suitableForHousehold()'s catch comment above
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -842,7 +905,7 @@ export async function deleteRecipe(
|
||||||
|
|
||||||
await prisma.recipe.delete({ where: { id } });
|
await prisma.recipe.delete({ where: { id } });
|
||||||
} catch (err) {
|
} catch (err) {
|
||||||
throw err; // see suitableForHouseholdWhere()'s catch comment above
|
throw err; // see suitableForHousehold()'s catch comment above
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -870,7 +933,7 @@ export async function addFavorite(
|
||||||
create: { userProfileId: viewerId, recipeId: id },
|
create: { userProfileId: viewerId, recipeId: id },
|
||||||
});
|
});
|
||||||
} catch (err) {
|
} catch (err) {
|
||||||
throw err; // see suitableForHouseholdWhere()'s catch comment above
|
throw err; // see suitableForHousehold()'s catch comment above
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -881,7 +944,7 @@ export async function removeFavorite(id: number, viewerId: number): Promise<void
|
||||||
where: { userProfileId: viewerId, recipeId: id },
|
where: { userProfileId: viewerId, recipeId: id },
|
||||||
});
|
});
|
||||||
} catch (err) {
|
} catch (err) {
|
||||||
throw err; // see suitableForHouseholdWhere()'s catch comment above
|
throw err; // see suitableForHousehold()'s catch comment above
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -904,7 +967,7 @@ export async function assertRecipeVisible(
|
||||||
throw new HttpError(404, ErrorCode.RECIPE_NOT_FOUND, `Recipe ${id} not found`);
|
throw new HttpError(404, ErrorCode.RECIPE_NOT_FOUND, `Recipe ${id} not found`);
|
||||||
}
|
}
|
||||||
} catch (err) {
|
} catch (err) {
|
||||||
throw err; // see suitableForHouseholdWhere()'s catch comment above
|
throw err; // see suitableForHousehold()'s catch comment above
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -920,7 +983,7 @@ async function findRecipeOrThrow(id: number, viewerId: number): Promise<RecipeWi
|
||||||
}
|
}
|
||||||
return recipe;
|
return recipe;
|
||||||
} catch (err) {
|
} catch (err) {
|
||||||
throw err; // see suitableForHouseholdWhere()'s catch comment above
|
throw err; // see suitableForHousehold()'s catch comment above
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -939,7 +1002,7 @@ async function assertIsAuthor(
|
||||||
throw new HttpError(403, ErrorCode.NOT_RECIPE_AUTHOR, "Only the recipe's author can do this");
|
throw new HttpError(403, ErrorCode.NOT_RECIPE_AUTHOR, "Only the recipe's author can do this");
|
||||||
}
|
}
|
||||||
} catch (err) {
|
} catch (err) {
|
||||||
throw err; // see suitableForHouseholdWhere()'s catch comment above
|
throw err; // see suitableForHousehold()'s catch comment above
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -961,7 +1024,7 @@ async function assertIngredientsExist(ingredientIds: number[]): Promise<void> {
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
} catch (err) {
|
} catch (err) {
|
||||||
throw err; // see suitableForHouseholdWhere()'s catch comment above
|
throw err; // see suitableForHousehold()'s catch comment above
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -983,29 +1046,6 @@ async function assertUnitsExist(unitIds: number[]): Promise<void> {
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
} catch (err) {
|
} catch (err) {
|
||||||
throw err; // see suitableForHouseholdWhere()'s catch comment above
|
throw err; // see suitableForHousehold()'s catch comment above
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/** Throws `404 DIET_NOT_FOUND` if any of `dietIds` doesn't match a reference `Diet` row. */
|
|
||||||
async function assertDietsExist(dietIds: number[]): Promise<void> {
|
|
||||||
try {
|
|
||||||
const uniqueIds = [...new Set(dietIds)];
|
|
||||||
if (uniqueIds.length === 0) return;
|
|
||||||
const found = await prisma.diet.findMany({
|
|
||||||
where: { id: { in: uniqueIds } },
|
|
||||||
select: { id: true },
|
|
||||||
});
|
|
||||||
if (found.length !== uniqueIds.length) {
|
|
||||||
const foundIds = new Set(found.map((diet) => diet.id));
|
|
||||||
const missing = uniqueIds.filter((id) => !foundIds.has(id));
|
|
||||||
throw new HttpError(
|
|
||||||
404,
|
|
||||||
ErrorCode.DIET_NOT_FOUND,
|
|
||||||
`Diet(s) not found: ${missing.join(", ")}`,
|
|
||||||
);
|
|
||||||
}
|
|
||||||
} catch (err) {
|
|
||||||
throw err; // see suitableForHouseholdWhere()'s catch comment above
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -6,6 +6,7 @@ import {
|
||||||
getIngredients,
|
getIngredients,
|
||||||
getSources,
|
getSources,
|
||||||
getTechSteps,
|
getTechSteps,
|
||||||
|
getTours,
|
||||||
getUnits,
|
getUnits,
|
||||||
getUtensils,
|
getUtensils,
|
||||||
} from "./reference.service.js";
|
} from "./reference.service.js";
|
||||||
|
|
@ -69,3 +70,14 @@ referenceRouter.get(
|
||||||
res.status(200).json(await getSources());
|
res.status(200).json(await getSources());
|
||||||
}),
|
}),
|
||||||
);
|
);
|
||||||
|
|
||||||
|
// Enabled guided-tour scenarios + their steps — read by the web tour
|
||||||
|
// engine (issue #42). Public like every route here: the general tour can
|
||||||
|
// start right after signup, before onboarding finishes. Admin CRUD of
|
||||||
|
// these lives under `/admin/api/tours` (issue #44).
|
||||||
|
referenceRouter.get(
|
||||||
|
"/tours",
|
||||||
|
wrapAsyncHandler(async (_req, res) => {
|
||||||
|
res.status(200).json(await getTours());
|
||||||
|
}),
|
||||||
|
);
|
||||||
|
|
|
||||||
|
|
@ -4,6 +4,7 @@ import type {
|
||||||
IngredientView,
|
IngredientView,
|
||||||
SourceView,
|
SourceView,
|
||||||
TechStepView,
|
TechStepView,
|
||||||
|
TourScenarioView,
|
||||||
UnitView,
|
UnitView,
|
||||||
UtensilView,
|
UtensilView,
|
||||||
} from "@batch-cooking/shared";
|
} from "@batch-cooking/shared";
|
||||||
|
|
@ -76,11 +77,21 @@ export async function getUnits(): Promise<UnitView[]> {
|
||||||
/**
|
/**
|
||||||
* All reference cooking techniques, ordered by key (see {@link getDiets}
|
* All reference cooking techniques, ordered by key (see {@link getDiets}
|
||||||
* for why) — small, static list (see `reference-seed-data.ts`'s
|
* for why) — small, static list (see `reference-seed-data.ts`'s
|
||||||
* `TECH_STEPS`). Not consumed by the recipe UI yet — see {@link TechStepView}.
|
* `TECH_STEPS`).
|
||||||
|
*
|
||||||
|
* Excludes placeholder rows (`TechStep.isPlaceholder` — the free-text
|
||||||
|
* techniques users propose when the catalog falls short, issue #130): this
|
||||||
|
* is the *browsable* catalog, and a placeholder is a per-correction
|
||||||
|
* stand-in, not a real entry anyone should pick again.
|
||||||
*/
|
*/
|
||||||
export async function getTechSteps(): Promise<TechStepView[]> {
|
export async function getTechSteps(): Promise<TechStepView[]> {
|
||||||
try {
|
try {
|
||||||
return await prisma.techStep.findMany({ orderBy: { key: "asc" } });
|
const techSteps = await prisma.techStep.findMany({
|
||||||
|
where: { isPlaceholder: false },
|
||||||
|
select: { id: true, key: true },
|
||||||
|
orderBy: { key: "asc" },
|
||||||
|
});
|
||||||
|
return techSteps.map((techStep) => ({ ...techStep, isPlaceholder: false, displayName: null }));
|
||||||
} catch (err) {
|
} catch (err) {
|
||||||
throw err; // see getDiets()'s catch comment above
|
throw err; // see getDiets()'s catch comment above
|
||||||
}
|
}
|
||||||
|
|
@ -173,3 +184,32 @@ export async function getIngredients(): Promise<IngredientView[]> {
|
||||||
throw err; // see getDiets()'s catch comment above
|
throw err; // see getDiets()'s catch comment above
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Every **enabled** guided-tour scenario with its ordered steps, for the
|
||||||
|
* web tour engine (issues #42/#44). A disabled scenario is hidden here
|
||||||
|
* without being deleted (an admin can toggle it back on). Steps come back
|
||||||
|
* ordered; `route`/`title`/`content` pass straight through.
|
||||||
|
*/
|
||||||
|
export async function getTours(): Promise<TourScenarioView[]> {
|
||||||
|
try {
|
||||||
|
const scenarios = await prisma.tourScenario.findMany({
|
||||||
|
where: { enabled: true },
|
||||||
|
orderBy: { key: "asc" },
|
||||||
|
include: { steps: { orderBy: { order: "asc" } } },
|
||||||
|
});
|
||||||
|
return scenarios.map((scenario) => ({
|
||||||
|
key: scenario.key,
|
||||||
|
name: scenario.name,
|
||||||
|
steps: scenario.steps.map((step) => ({
|
||||||
|
order: step.order,
|
||||||
|
route: step.route,
|
||||||
|
targetKey: step.targetKey,
|
||||||
|
title: step.title,
|
||||||
|
content: step.content,
|
||||||
|
})),
|
||||||
|
}));
|
||||||
|
} catch (err) {
|
||||||
|
throw err; // see getDiets()'s catch comment above
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
|
||||||
|
|
@ -13,6 +13,11 @@ import { toIngredientView, toUnitView } from "../recipe/recipe.service.js";
|
||||||
function shoppingListPlanningInclude() {
|
function shoppingListPlanningInclude() {
|
||||||
return {
|
return {
|
||||||
items: {
|
items: {
|
||||||
|
// "Leftovers" items (`sourcePlanningItemId` set) reserve a portion of
|
||||||
|
// an already-cooked batch — nothing new to buy for them. Excluded
|
||||||
|
// here so they never reach `aggregateShoppingList`; counting them
|
||||||
|
// would double up the source recipe's ingredients (issue #34).
|
||||||
|
where: { sourcePlanningItemId: null },
|
||||||
include: {
|
include: {
|
||||||
recipe: {
|
recipe: {
|
||||||
select: {
|
select: {
|
||||||
|
|
@ -39,11 +44,11 @@ type PlanningWithIngredients = Prisma.PlanningGetPayload<{
|
||||||
include: ReturnType<typeof shoppingListPlanningInclude>;
|
include: ReturnType<typeof shoppingListPlanningInclude>;
|
||||||
}>;
|
}>;
|
||||||
|
|
||||||
/** Accumulates a running sum per `(ingredientId, unitId)` pair while walking every planning item's ingredient lines — see {@link aggregateShoppingList}. */
|
/** Accumulates a running sum per `(ingredientId, unitId)` pair while walking every planning item's ingredient lines — see {@link aggregateShoppingList}. `unit`/`quantity` are both `null` for a "selon le goût" seasoning line: nothing to sum, surfaced once. */
|
||||||
interface RunningTotal {
|
interface RunningTotal {
|
||||||
ingredient: IngredientView;
|
ingredient: IngredientView;
|
||||||
unit: UnitView;
|
unit: UnitView | null;
|
||||||
quantity: number;
|
quantity: number | null;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
@ -65,16 +70,31 @@ function aggregateShoppingList(items: PlanningWithIngredients["items"]): Shoppin
|
||||||
for (const item of items) {
|
for (const item of items) {
|
||||||
const scale = item.portions / item.recipe.portions;
|
const scale = item.portions / item.recipe.portions;
|
||||||
for (const recipeIngredient of item.recipe.ingredients) {
|
for (const recipeIngredient of item.recipe.ingredients) {
|
||||||
|
// A "selon le goût" seasoning line (no quantity/unit) — surfaced once
|
||||||
|
// per ingredient, never scaled or summed. Its key can't collide with a
|
||||||
|
// real `(ingredient, unit)` line for the same ingredient.
|
||||||
|
if (recipeIngredient.quantity === null) {
|
||||||
|
const seasoningKey = `${recipeIngredient.ingredientId}:toTaste`;
|
||||||
|
if (!totals.has(seasoningKey)) {
|
||||||
|
totals.set(seasoningKey, {
|
||||||
|
ingredient: toIngredientView(recipeIngredient.ingredient),
|
||||||
|
unit: null,
|
||||||
|
quantity: null,
|
||||||
|
});
|
||||||
|
}
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
const key = `${recipeIngredient.ingredientId}:${recipeIngredient.unitId}`;
|
const key = `${recipeIngredient.ingredientId}:${recipeIngredient.unitId}`;
|
||||||
const addedQuantity = Number(recipeIngredient.quantity) * scale;
|
const addedQuantity = Number(recipeIngredient.quantity) * scale;
|
||||||
|
|
||||||
const existing = totals.get(key);
|
const existing = totals.get(key);
|
||||||
if (existing) {
|
if (existing && existing.quantity !== null) {
|
||||||
existing.quantity += addedQuantity;
|
existing.quantity += addedQuantity;
|
||||||
} else {
|
} else {
|
||||||
totals.set(key, {
|
totals.set(key, {
|
||||||
ingredient: toIngredientView(recipeIngredient.ingredient),
|
ingredient: toIngredientView(recipeIngredient.ingredient),
|
||||||
unit: toUnitView(recipeIngredient.unit),
|
unit: recipeIngredient.unit === null ? null : toUnitView(recipeIngredient.unit),
|
||||||
quantity: addedQuantity,
|
quantity: addedQuantity,
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -180,9 +180,20 @@ export async function previewSourceItem(
|
||||||
),
|
),
|
||||||
loadIngredientCatalog(adapter.locale),
|
loadIngredientCatalog(adapter.locale),
|
||||||
loadUnitCatalog(adapter.locale),
|
loadUnitCatalog(adapter.locale),
|
||||||
prisma.techStep.findMany({ select: { id: true, key: true } }),
|
// Real catalog techniques only — a draft preview is never a saved
|
||||||
|
// recipe, so it can't carry a user-proposed placeholder technique
|
||||||
|
// (issue #130); `isPlaceholder`/`displayName` are the neutral values.
|
||||||
|
prisma.techStep.findMany({
|
||||||
|
where: { isPlaceholder: false },
|
||||||
|
select: { id: true, key: true },
|
||||||
|
}),
|
||||||
]);
|
]);
|
||||||
const techStepById = new Map(techStepsByKey.map((techStep) => [techStep.id, techStep]));
|
const techStepById = new Map(
|
||||||
|
techStepsByKey.map((techStep) => [
|
||||||
|
techStep.id,
|
||||||
|
{ ...techStep, isPlaceholder: false, displayName: null },
|
||||||
|
]),
|
||||||
|
);
|
||||||
|
|
||||||
const translatedIngredients = translateRecipeIngredients(
|
const translatedIngredients = translateRecipeIngredients(
|
||||||
parsed.ingredients,
|
parsed.ingredients,
|
||||||
|
|
@ -260,6 +271,12 @@ export async function previewSourceItem(
|
||||||
? [{ utensil, start: mention.start, end: mention.end, source: "auto" as const }]
|
? [{ utensil, start: mention.start, end: mention.end, source: "auto" as const }]
|
||||||
: [];
|
: [];
|
||||||
}),
|
}),
|
||||||
|
// Regex-extracted, no id to resolve — carried through as-is
|
||||||
|
// (same `source: "auto"` reasoning as this match above).
|
||||||
|
temperatures: match.temperatures.map((mention) => ({
|
||||||
|
...mention,
|
||||||
|
source: "auto" as const,
|
||||||
|
})),
|
||||||
},
|
},
|
||||||
]
|
]
|
||||||
: [];
|
: [];
|
||||||
|
|
|
||||||
72
apps/api/src/scripts/backfill-runtime.ts
Normal file
72
apps/api/src/scripts/backfill-runtime.ts
Normal file
|
|
@ -0,0 +1,72 @@
|
||||||
|
import { prisma } from "../db/prisma.js";
|
||||||
|
import { backfillTechSteps } from "./backfill-tech-steps.js";
|
||||||
|
|
||||||
|
/**
|
||||||
|
* `backfill_state.key` for the tech-step clause-metadata backfill. Opaque,
|
||||||
|
* dated so a future metadata rework can add a second key rather than
|
||||||
|
* re-using this one.
|
||||||
|
*
|
||||||
|
* Why it's needed: `updateRecipe` and `backfill-tech-steps.ts` used to
|
||||||
|
* persist only a detected technique's span, never its ingredient / utensil /
|
||||||
|
* temperature children (only `createRecipeInternal` did). So every recipe
|
||||||
|
* ever edited through the UI, and every recipe imported before the create
|
||||||
|
* path learned temperatures, is missing the clause metadata that
|
||||||
|
* `cooking-optimizer.ts` needs to spot an oven-temperature conflict between
|
||||||
|
* two `preheat` steps. {@link backfillTechSteps} recomputes the whole
|
||||||
|
* `StepTechStep` sequence with the now-complete writer.
|
||||||
|
*/
|
||||||
|
const TECH_STEP_METADATA_BACKFILL_KEY = "step_tech_step_metadata_20260904";
|
||||||
|
|
||||||
|
/**
|
||||||
|
* One-time data backfills for the production image — run via
|
||||||
|
* `node dist/scripts/backfill-runtime.js` in apps/api/Dockerfile's CMD,
|
||||||
|
* after `seed-runtime` and before the server starts.
|
||||||
|
*
|
||||||
|
* Unlike `seed-runtime` (idempotent by construction — it only upserts, so
|
||||||
|
* repeating it every container start is free), a backfill here *rewrites*
|
||||||
|
* existing rows and would be wasteful-to-harmful to repeat: the tech-step
|
||||||
|
* one re-hits `services/tech-step-intent-service` once per `Step`. So each
|
||||||
|
* backfill gates itself on a `backfill_state` row — present means "done,
|
||||||
|
* skip"; absent means "run it, then record it".
|
||||||
|
*
|
||||||
|
* A backfill failing must **not** keep the API down: it's a data-quality
|
||||||
|
* catch-up, not a correctness prerequisite (contrast `seed-runtime`, whose
|
||||||
|
* failure genuinely means missing reference data). So a failure here is
|
||||||
|
* logged, the marker is left unwritten (the next container start retries),
|
||||||
|
* and the process still exits 0 so the CMD chain reaches `node dist/server.js`.
|
||||||
|
* Only a failure to even read `backfill_state` propagates — at that point
|
||||||
|
* the database is unreachable and the server wouldn't start anyway.
|
||||||
|
*/
|
||||||
|
async function runOneTimeBackfills(): Promise<void> {
|
||||||
|
const alreadyDone = await prisma.backfillState.findUnique({
|
||||||
|
where: { key: TECH_STEP_METADATA_BACKFILL_KEY },
|
||||||
|
});
|
||||||
|
if (alreadyDone !== null) {
|
||||||
|
console.info(
|
||||||
|
`Backfill "${TECH_STEP_METADATA_BACKFILL_KEY}" already completed at ${alreadyDone.completedAt.toISOString()} — skipping.`,
|
||||||
|
);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
console.info(`Running one-time backfill "${TECH_STEP_METADATA_BACKFILL_KEY}"...`);
|
||||||
|
try {
|
||||||
|
const { total, changed } = await backfillTechSteps();
|
||||||
|
await prisma.backfillState.create({ data: { key: TECH_STEP_METADATA_BACKFILL_KEY } });
|
||||||
|
console.info(
|
||||||
|
`Backfill "${TECH_STEP_METADATA_BACKFILL_KEY}" done — ${changed}/${total} step(s) recomputed.`,
|
||||||
|
);
|
||||||
|
} catch (err) {
|
||||||
|
console.error(
|
||||||
|
`Backfill "${TECH_STEP_METADATA_BACKFILL_KEY}" failed — leaving it unrecorded so the next start retries. The API will still start.`,
|
||||||
|
err,
|
||||||
|
);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
runOneTimeBackfills()
|
||||||
|
.then(() => prisma.$disconnect())
|
||||||
|
.catch(async (err) => {
|
||||||
|
console.error(err);
|
||||||
|
await prisma.$disconnect();
|
||||||
|
process.exit(1);
|
||||||
|
});
|
||||||
|
|
@ -1,23 +1,27 @@
|
||||||
import { pathToFileURL } from "node:url";
|
import { pathToFileURL } from "node:url";
|
||||||
import { prisma } from "../db/prisma.js";
|
import { prisma } from "../db/prisma.js";
|
||||||
import { techStepClassifier } from "../lib/recipe-matching/tech-step-matcher.js";
|
import { techStepClassifier } from "../lib/recipe-matching/tech-step-matcher.js";
|
||||||
|
import { toStepTechStepCreateInputs } from "../lib/recipe-matching/tech-step-persistence.js";
|
||||||
import { renumberStepTechSteps } from "../modules/recipe/recipe-tech-step-correction.service.js";
|
import { renumberStepTechSteps } from "../modules/recipe/recipe-tech-step-correction.service.js";
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Recomputes every existing `Step`'s `"auto"`-sourced `StepTechStep`
|
* Recomputes every existing `Step`'s `"auto"`-sourced `StepTechStep`
|
||||||
* entries against the *current* classifier
|
* entries — technique spans **and** their clause metadata (ingredients,
|
||||||
|
* utensils, temperatures) — against the *current* classifier
|
||||||
* (`tech-step-matcher.ts`, delegating to `services/tech-step-intent-service`),
|
* (`tech-step-matcher.ts`, delegating to `services/tech-step-intent-service`),
|
||||||
* the same way `updateRecipe` does when a user resaves a recipe through the UI —
|
* the same way `updateRecipe` does when a user resaves a recipe through the
|
||||||
* always `"fr"` (`DEFAULT_TECH_STEP_LOCALE` in `recipe.service.ts`; there's
|
* UI: both build the row payload from the shared
|
||||||
* no persisted per-recipe locale to recover for a step that already
|
* {@link toStepTechStepCreateInputs}. Always `"fr"`
|
||||||
* exists, so this matches real resave behavior exactly rather than
|
* (`DEFAULT_TECH_STEP_LOCALE` in `recipe.service.ts`; there's no persisted
|
||||||
* guessing).
|
* per-recipe locale to recover for a step that already exists, so this
|
||||||
|
* matches real resave behavior exactly rather than guessing).
|
||||||
*
|
*
|
||||||
* Needed because tech-step detection only ever runs at create/update time
|
* Needed because tech-step detection only ever runs at create/update time
|
||||||
* (`recipe.service.ts`'s `matchStepsTechSteps`), never retroactively — a
|
* (`recipe.service.ts`'s `matchStepsTechSteps`), never retroactively — a
|
||||||
* step saved before a classifier/corpus change (new vocabulary, or the
|
* step saved before a classifier/corpus change (new vocabulary, or the
|
||||||
* `contextStart`/`contextEnd` columns a previous session added) keeps
|
* `contextStart`/`contextEnd` columns a previous session added), or before
|
||||||
* whatever it was matched with at the time until it's next resaved.
|
* the clause-metadata writers were wired into the *update* path at all,
|
||||||
|
* keeps whatever it was matched with at the time until it's next resaved.
|
||||||
*
|
*
|
||||||
* `"manual"`-sourced entries (a viewer's correction, applied immediately —
|
* `"manual"`-sourced entries (a viewer's correction, applied immediately —
|
||||||
* see `recipe-tech-step-correction.service.ts`'s `applyManualCorrection`)
|
* see `recipe-tech-step-correction.service.ts`'s `applyManualCorrection`)
|
||||||
|
|
@ -72,18 +76,19 @@ export async function backfillTechSteps(): Promise<{ total: number; changed: num
|
||||||
// into a clean 0..N-1 sequence right after — these just need to
|
// into a clean 0..N-1 sequence right after — these just need to
|
||||||
// not collide with `@@id([stepId, order])` for this insert).
|
// not collide with `@@id([stepId, order])` for this insert).
|
||||||
const startOrder = manualRows.reduce((max, row) => Math.max(max, row.order), -1) + 1;
|
const startOrder = manualRows.reduce((max, row) => Math.max(max, row.order), -1) + 1;
|
||||||
await tx.stepTechStep.createMany({
|
// One `create` per row rather than a single `createMany`:
|
||||||
data: nonOverlappingMatches.map((match, index) => ({
|
// `createMany` cannot write the nested `ingredients` / `utensils` /
|
||||||
stepId: step.id,
|
// `temperatures` children, and silently dropping those is exactly
|
||||||
techStepId: match.techStepId,
|
// the bug this script shared with the old `updateRecipe` — see
|
||||||
order: startOrder + index,
|
// `toStepTechStepCreateInputs`. A backfill that leaves recipes
|
||||||
start: match.start,
|
// without their clause temperatures defeats the whole point of
|
||||||
end: match.end,
|
// running it (`cooking-optimizer.ts` needs them).
|
||||||
contextStart: match.contextStart,
|
const inputs = toStepTechStepCreateInputs(nonOverlappingMatches);
|
||||||
contextEnd: match.contextEnd,
|
for (const [index, input] of inputs.entries()) {
|
||||||
source: "auto",
|
await tx.stepTechStep.create({
|
||||||
})),
|
data: { ...input, stepId: step.id, order: startOrder + index, source: "auto" },
|
||||||
});
|
});
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
await renumberStepTechSteps(tx, step.id);
|
await renumberStepTechSteps(tx, step.id);
|
||||||
|
|
|
||||||
|
|
@ -1,6 +1,8 @@
|
||||||
|
import { Server as SocketIoServer } from "socket.io";
|
||||||
import { createServer } from "./app.js";
|
import { createServer } from "./app.js";
|
||||||
import { env } from "./config/env.js";
|
import { env } from "./config/env.js";
|
||||||
import { logger } from "./lib/logger.service.js";
|
import { logger } from "./lib/logger.service.js";
|
||||||
|
import { MonitoringBroadcastService } from "./lib/monitoring-broadcast.service.js";
|
||||||
import { techStepClassifier } from "./lib/recipe-matching/tech-step-matcher.js";
|
import { techStepClassifier } from "./lib/recipe-matching/tech-step-matcher.js";
|
||||||
import { registerAllRecipeSources } from "./sources/index.js";
|
import { registerAllRecipeSources } from "./sources/index.js";
|
||||||
|
|
||||||
|
|
@ -50,6 +52,17 @@ await warmUpTechStepClassifier();
|
||||||
|
|
||||||
const server = createServer();
|
const server = createServer();
|
||||||
|
|
||||||
|
// Attaches to the same underlying `http.Server` `server.listen()` below
|
||||||
|
// will start — `socket.io` binds to the HTTP server itself, not to
|
||||||
|
// Express or a port, hence `ExpressServer.httpServer` (packages/express-
|
||||||
|
// tools) rather than going through `server.instance` (the Express app).
|
||||||
|
// Own CORS config: the WebSocket handshake is a separate HTTP upgrade
|
||||||
|
// request that never runs through `setupCore`'s `cors()` middleware.
|
||||||
|
const io = new SocketIoServer(server.httpServer, {
|
||||||
|
cors: { origin: env.CORS_ORIGIN, credentials: true },
|
||||||
|
});
|
||||||
|
new MonitoringBroadcastService(io).start();
|
||||||
|
|
||||||
server.listen(env.PORT, () => {
|
server.listen(env.PORT, () => {
|
||||||
logger.info("API listening", { port: env.PORT, nodeEnv: env.NODE_ENV });
|
logger.info("API listening", { port: env.PORT, nodeEnv: env.NODE_ENV });
|
||||||
});
|
});
|
||||||
|
|
|
||||||
|
|
@ -2,14 +2,17 @@ import { registerRecipeSource } from "../lib/recipe-sources/recipe-source-regist
|
||||||
import { sevenFiftyGAdapter } from "./750g.js";
|
import { sevenFiftyGAdapter } from "./750g.js";
|
||||||
import { mangerBougerAdapter } from "./manger-bouger.js";
|
import { mangerBougerAdapter } from "./manger-bouger.js";
|
||||||
import { marmitonAdapter } from "./marmiton.js";
|
import { marmitonAdapter } from "./marmiton.js";
|
||||||
|
import { ohMonBentoAdapter } from "./ohmonbento.js";
|
||||||
|
import { quitoqueAdapter } from "./quitoque.js";
|
||||||
import { theMealDbAdapter } from "./the-meal-db.js";
|
import { theMealDbAdapter } from "./the-meal-db.js";
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Registers every concrete, *browsable* `RecipeSourceAdapter` this app
|
* Registers every concrete, *browsable* `RecipeSourceAdapter` this app
|
||||||
* ships with into the shared in-memory registry (`recipe-source-registry.ts`)
|
* ships with into the shared in-memory registry (`recipe-source-registry.ts`)
|
||||||
* — `theMealDbAdapter`, `marmitonAdapter`, `sevenFiftyGAdapter` and
|
* — `theMealDbAdapter`, `marmitonAdapter`, `sevenFiftyGAdapter`,
|
||||||
* `mangerBougerAdapter`. Called once, explicitly, by the two real entry
|
* `mangerBougerAdapter`, `quitoqueAdapter` and `ohMonBentoAdapter`. Called
|
||||||
* points that need the registry populated:
|
* once, explicitly, by the two real entry points that need the registry
|
||||||
|
* populated:
|
||||||
*
|
*
|
||||||
* - `server.ts` — the running API process, before it starts listening.
|
* - `server.ts` — the running API process, before it starts listening.
|
||||||
* - `prisma/seed.ts` — so `syncRecipeSources` has something to mirror into
|
* - `prisma/seed.ts` — so `syncRecipeSources` has something to mirror into
|
||||||
|
|
@ -39,4 +42,6 @@ export function registerAllRecipeSources(): void {
|
||||||
registerRecipeSource(marmitonAdapter);
|
registerRecipeSource(marmitonAdapter);
|
||||||
registerRecipeSource(sevenFiftyGAdapter);
|
registerRecipeSource(sevenFiftyGAdapter);
|
||||||
registerRecipeSource(mangerBougerAdapter);
|
registerRecipeSource(mangerBougerAdapter);
|
||||||
|
registerRecipeSource(quitoqueAdapter);
|
||||||
|
registerRecipeSource(ohMonBentoAdapter);
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -18,11 +18,13 @@ const SOURCE_KEY = "mangerBouger";
|
||||||
// all (unlike marmiton.ts's search page) — but it's server-rendered, and a
|
// all (unlike marmiton.ts's search page) — but it's server-rendered, and a
|
||||||
// plain GET carries the exact same Redux state the client hydrates from as
|
// plain GET carries the exact same Redux state the client hydrates from as
|
||||||
// a `__NEXT_DATA__` script tag (see `extractNextData` below), which already
|
// a `__NEXT_DATA__` script tag (see `extractNextData` below), which already
|
||||||
// has everything `list()` needs. Verified live: `?query=<free text>` really
|
// has everything `list()` needs. Verified live for the *search* path
|
||||||
// filters server-side (not just a client-side URL update over an
|
// (`?diet=ALL&page=N&query=<free text>`): `query` really filters
|
||||||
// already-fetched page), and `page`/`hasMorePages` behave as real,
|
// server-side (not just a client-side URL update over an already-fetched
|
||||||
// consistent pagination — the best-behaved of this adapter family's three
|
// page), and `page`/`hasMorePages` behave as real, consistent pagination.
|
||||||
// sources on that front.
|
// The *catalogue browse* path (no `query` term) must be the bare
|
||||||
|
// `?diet=ALL&page=N` — a trailing empty `&query=` made the deployed server
|
||||||
|
// repeat page 1 for every page (issue #78); `list()` below now omits it.
|
||||||
const LIST_URL = "https://www.mangerbouger.fr/manger-mieux/la-fabrique-a-menus/recettes";
|
const LIST_URL = "https://www.mangerbouger.fr/manger-mieux/la-fabrique-a-menus/recettes";
|
||||||
const DETAIL_BASE_URL = "https://www.mangerbouger.fr/manger-mieux/la-fabrique-a-menus/recettes/";
|
const DETAIL_BASE_URL = "https://www.mangerbouger.fr/manger-mieux/la-fabrique-a-menus/recettes/";
|
||||||
|
|
||||||
|
|
@ -42,7 +44,7 @@ interface MangerBougerListPageData {
|
||||||
initialState?: {
|
initialState?: {
|
||||||
recipes?: {
|
recipes?: {
|
||||||
list?: MangerBougerListEntry[];
|
list?: MangerBougerListEntry[];
|
||||||
/** Whether a further page exists for the current `page`/`query`/`diet` combination — verified live: an out-of-range page comes back `false` with an empty `list` rather than repeating the last page or erroring, a cleaner end-of-results signal than either `marmiton.ts` (infers it from a 404) or `750g.ts` (this search has no real pagination at all). */
|
/** Whether a further page exists for the current `page`/`query`/`diet` combination — verified live on the `query`-term path: an out-of-range page comes back `false` with an empty `list` rather than repeating the last page or erroring, a cleaner end-of-results signal than either `marmiton.ts` (infers it from a 404) or `750g.ts` (this search has no real pagination at all). The catalogue-browse path (no `query`) only paginates when the request URL omits `&query=` entirely — see `LIST_URL` and issue #78. */
|
||||||
hasMorePages?: boolean;
|
hasMorePages?: boolean;
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
@ -284,8 +286,18 @@ export const mangerBougerAdapter: RecipeSourceAdapter<{ html: string; url: strin
|
||||||
async list(params: RecipeSourceListParams): Promise<RecipeSourceListResult> {
|
async list(params: RecipeSourceListParams): Promise<RecipeSourceListResult> {
|
||||||
try {
|
try {
|
||||||
const page = params.cursor ? Number(params.cursor) : 1;
|
const page = params.cursor ? Number(params.cursor) : 1;
|
||||||
const query = params.query ?? "";
|
// Only append `&query=` when there's an actual search term. A trailing
|
||||||
const listUrl = `${LIST_URL}?diet=ALL&page=${page}&query=${encodeURIComponent(query)}`;
|
// empty `&query=` on the "browse everything" path (filter absent) made
|
||||||
|
// the *deployed* server serve page 1 for every `page=N` — the
|
||||||
|
// infinite scroll then stopped after 9 recipes (issue #38's
|
||||||
|
// "0 new externalIds ⇒ end of list" guard cutting in). The bare
|
||||||
|
// `?diet=ALL&page=N` catalogue request paginates correctly. The
|
||||||
|
// sibling adapters (marmiton/quitoque/ohmonbento) already make their
|
||||||
|
// search param conditional; this one didn't.
|
||||||
|
const query = (params.query ?? "").trim();
|
||||||
|
const listUrl = `${LIST_URL}?diet=ALL&page=${page}${
|
||||||
|
query ? `&query=${encodeURIComponent(query)}` : ""
|
||||||
|
}`;
|
||||||
|
|
||||||
let response: Response;
|
let response: Response;
|
||||||
try {
|
try {
|
||||||
|
|
|
||||||
170
apps/api/src/sources/ohmonbento.ts
Normal file
170
apps/api/src/sources/ohmonbento.ts
Normal file
|
|
@ -0,0 +1,170 @@
|
||||||
|
import type {
|
||||||
|
ParsedRecipe,
|
||||||
|
RecipeSourceAdapter,
|
||||||
|
RecipeSourceListItem,
|
||||||
|
RecipeSourceListParams,
|
||||||
|
RecipeSourceListResult,
|
||||||
|
} from "../lib/recipe-sources/recipe-source-adapter.js";
|
||||||
|
import {
|
||||||
|
RecipeSourceFetchError,
|
||||||
|
RecipeSourceParseError,
|
||||||
|
} from "../lib/recipe-sources/recipe-source-errors.js";
|
||||||
|
import { jsonLdRecipeAdapter } from "./json-ld-recipe.js";
|
||||||
|
|
||||||
|
const SOURCE_KEY = "ohMonBento";
|
||||||
|
const SITE_ORIGIN = "https://ohmonbento.com";
|
||||||
|
|
||||||
|
/** One recipe card scraped off an ohmonbento.com search page — see {@link extractRecipeCards}. */
|
||||||
|
interface OhMonBentoCard {
|
||||||
|
url: string;
|
||||||
|
title: string;
|
||||||
|
image: string | null;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Scrapes every recipe card out of an ohmonbento.com search results page.
|
||||||
|
* Each card is a `<div class="entry-thumb">` wrapping a single
|
||||||
|
* `<a href="/<slug>/">` with one `<img>` inside — no `ItemList` JSON-LD
|
||||||
|
* (unlike marmiton.ts) and no lazy-load `data-src` dance (unlike
|
||||||
|
* quitoque.ts): the real image is just the `<img>`'s `src`. `href` is a
|
||||||
|
* root-relative path, resolved against {@link SITE_ORIGIN} here.
|
||||||
|
* Attribute-order-agnostic.
|
||||||
|
*/
|
||||||
|
function extractRecipeCards(html: string): OhMonBentoCard[] {
|
||||||
|
const cards: OhMonBentoCard[] = [];
|
||||||
|
const thumbPattern = /<div\s+[^>]*class="[^"]*\bentry-thumb\b[^"]*"[^>]*>([\s\S]*?)<\/div>/g;
|
||||||
|
for (const match of html.matchAll(thumbPattern)) {
|
||||||
|
const block = match[1] ?? "";
|
||||||
|
const href = /<a\s+[^>]*\bhref="([^"]+)"/.exec(block)?.[1];
|
||||||
|
if (href === undefined) continue;
|
||||||
|
const title = /\balt="([^"]*)"/.exec(block)?.[1] ?? "";
|
||||||
|
if (title.length === 0) continue;
|
||||||
|
const url = href.startsWith("http") ? href : `${SITE_ORIGIN}${href}`;
|
||||||
|
cards.push({ url, title, image: /\bsrc="([^"]+)"/.exec(block)?.[1] ?? null });
|
||||||
|
}
|
||||||
|
return cards;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Re-labels a `RecipeSourceFetchError`/`RecipeSourceParseError` thrown by
|
||||||
|
* the generic `jsonLdRecipeAdapter` (`sourceKey` `"jsonLdRecipe"`) as this
|
||||||
|
* adapter's (`sourceKey` `"ohMonBento"`) — same reasoning as marmiton.ts's
|
||||||
|
* identically-named helper. (Not factored out into a shared helper —
|
||||||
|
* marmiton/750g/manger-bouger/quitoque each keep their own copy; the
|
||||||
|
* near-identical five-liner isn't worth a module.)
|
||||||
|
*/
|
||||||
|
function rekeySourceError(err: unknown): unknown {
|
||||||
|
if (err instanceof RecipeSourceFetchError) {
|
||||||
|
return new RecipeSourceFetchError(SOURCE_KEY, err.message, { cause: err.cause });
|
||||||
|
}
|
||||||
|
if (err instanceof RecipeSourceParseError) {
|
||||||
|
return new RecipeSourceParseError(SOURCE_KEY, err.message, { cause: err.cause });
|
||||||
|
}
|
||||||
|
return err;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* ohmonbento.com — a French Japanese-cuisine / bento cooking blog
|
||||||
|
* (WordPress). Unofficial (`official: false`, same reasoning as every
|
||||||
|
* other scraped adapter): no published API, this reads ordinary pages and
|
||||||
|
* the schema.org JSON-LD they embed. `robots.txt` allows everything except
|
||||||
|
* `/wp-admin/`.
|
||||||
|
*
|
||||||
|
* The simplest of the scraped adapters: like marmiton.ts, `fetchDetail`/
|
||||||
|
* `parse` delegate straight to {@link jsonLdRecipeAdapter} — a recipe page
|
||||||
|
* carries a WP Recipe Maker `Recipe` inside a Yoast `@graph`, which
|
||||||
|
* `findRecipeNode` already handles (recurses into the array). Only `list()`
|
||||||
|
* is site-specific: WordPress search at `/?s={query}&paged={page}` — the
|
||||||
|
* **same URL whether `query` is empty (whole catalogue) or not** (no
|
||||||
|
* branching, unlike 750g.ts) — with a `<div class="entry-thumb">` card
|
||||||
|
* scrape (see {@link extractRecipeCards}). A page past the last one 404s,
|
||||||
|
* the same clean end-of-list signal as marmiton.ts.
|
||||||
|
*/
|
||||||
|
export const ohMonBentoAdapter: RecipeSourceAdapter<{ html: string; url: string }> = {
|
||||||
|
key: SOURCE_KEY,
|
||||||
|
name: "Oh mon Bento",
|
||||||
|
official: false,
|
||||||
|
iconUrl: `${SITE_ORIGIN}/favicon.ico`,
|
||||||
|
// Le contenu d'ohmonbento.com (noms, ingrédients, instructions) est en
|
||||||
|
// français — détermine contre quel modèle/locale d'étiquettes
|
||||||
|
// d'ingrédients translateRecipe (recipe-translation.ts) résout les
|
||||||
|
// recettes de cette source lors d'une prévisualisation/d'un import.
|
||||||
|
locale: "fr",
|
||||||
|
|
||||||
|
async list(params: RecipeSourceListParams): Promise<RecipeSourceListResult> {
|
||||||
|
try {
|
||||||
|
// Curseur opaque = numéro de page suivant ; WordPress pagine via
|
||||||
|
// `&paged=N` (page 1 implicite quand le paramètre est absent). Le
|
||||||
|
// paramètre `?s=` est toujours présent, même vide — c'est ce qui
|
||||||
|
// liste tout le catalogue (vérifié sur le ticket).
|
||||||
|
const page = params.cursor ? Number(params.cursor) : 1;
|
||||||
|
const query = params.query ?? "";
|
||||||
|
const listUrl = `${SITE_ORIGIN}/?s=${encodeURIComponent(query)}${
|
||||||
|
page > 1 ? `&paged=${page}` : ""
|
||||||
|
}`;
|
||||||
|
|
||||||
|
let response: Response;
|
||||||
|
try {
|
||||||
|
response = await fetch(listUrl);
|
||||||
|
} catch (cause) {
|
||||||
|
throw new RecipeSourceFetchError(
|
||||||
|
SOURCE_KEY,
|
||||||
|
`Network error listing Oh mon Bento recipes (${listUrl})`,
|
||||||
|
{ cause },
|
||||||
|
);
|
||||||
|
}
|
||||||
|
// Une page au-delà de la dernière renvoie une vraie 404 — pas un
|
||||||
|
// échec, juste « il n'y a plus rien » (même signal que marmiton.ts).
|
||||||
|
if (response.status === 404) {
|
||||||
|
return { items: [], nextCursor: null };
|
||||||
|
}
|
||||||
|
if (!response.ok) {
|
||||||
|
throw new RecipeSourceFetchError(
|
||||||
|
SOURCE_KEY,
|
||||||
|
`Oh mon Bento responded ${response.status} (${listUrl})`,
|
||||||
|
);
|
||||||
|
}
|
||||||
|
const html = await response.text();
|
||||||
|
|
||||||
|
const items: RecipeSourceListItem[] = extractRecipeCards(html).map((card) => ({
|
||||||
|
externalId: card.url,
|
||||||
|
title: card.title,
|
||||||
|
picture: card.image,
|
||||||
|
url: card.url,
|
||||||
|
}));
|
||||||
|
|
||||||
|
// La 404 ci-dessus est le vrai signal de fin ; on ne propose une page
|
||||||
|
// suivante que si celle-ci a renvoyé au moins une carte (même logique
|
||||||
|
// que marmiton.ts).
|
||||||
|
const nextCursor = items.length > 0 ? String(page + 1) : null;
|
||||||
|
|
||||||
|
return { items, nextCursor };
|
||||||
|
} catch (err) {
|
||||||
|
// Rethrown as-is (already keyed "ohMonBento" by whichever branch
|
||||||
|
// above threw it) — same reasoning as `marmiton.ts`/`quitoque.ts`.
|
||||||
|
throw err;
|
||||||
|
}
|
||||||
|
},
|
||||||
|
|
||||||
|
// `externalId` est directement l'URL canonique de la recette sur
|
||||||
|
// ohmonbento.com (renvoyée telle quelle par `list()` ci-dessus) — même
|
||||||
|
// convention que `jsonLdRecipeAdapter.fetchDetail`, à qui cette méthode
|
||||||
|
// délègue entièrement.
|
||||||
|
async fetchDetail(externalId: string): Promise<{ html: string; url: string }> {
|
||||||
|
try {
|
||||||
|
return await jsonLdRecipeAdapter.fetchDetail(externalId);
|
||||||
|
} catch (err) {
|
||||||
|
// `rekeySourceError` est le traitement utile de l'erreur à ce point
|
||||||
|
// d'appel (relabelliser sa `sourceKey`), pas un simple re-throw.
|
||||||
|
throw rekeySourceError(err);
|
||||||
|
}
|
||||||
|
},
|
||||||
|
|
||||||
|
parse(raw: { html: string; url: string }): ParsedRecipe {
|
||||||
|
try {
|
||||||
|
return jsonLdRecipeAdapter.parse(raw);
|
||||||
|
} catch (err) {
|
||||||
|
throw rekeySourceError(err);
|
||||||
|
}
|
||||||
|
},
|
||||||
|
};
|
||||||
188
apps/api/src/sources/quitoque.ts
Normal file
188
apps/api/src/sources/quitoque.ts
Normal file
|
|
@ -0,0 +1,188 @@
|
||||||
|
import type {
|
||||||
|
ParsedRecipe,
|
||||||
|
RecipeSourceAdapter,
|
||||||
|
RecipeSourceListItem,
|
||||||
|
RecipeSourceListParams,
|
||||||
|
RecipeSourceListResult,
|
||||||
|
} from "../lib/recipe-sources/recipe-source-adapter.js";
|
||||||
|
import {
|
||||||
|
RecipeSourceFetchError,
|
||||||
|
RecipeSourceParseError,
|
||||||
|
} from "../lib/recipe-sources/recipe-source-errors.js";
|
||||||
|
import { jsonLdRecipeAdapter } from "./json-ld-recipe.js";
|
||||||
|
|
||||||
|
const SOURCE_KEY = "quitoque";
|
||||||
|
const SITE_ORIGIN = "https://www.quitoque.fr";
|
||||||
|
const LIST_URL = `${SITE_ORIGIN}/recettes`;
|
||||||
|
|
||||||
|
/** One recipe card scraped off a quitoque.fr `/recettes` listing page — see {@link extractRecipeCards}. */
|
||||||
|
interface QuitoqueCard {
|
||||||
|
url: string;
|
||||||
|
title: string;
|
||||||
|
image: string | null;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Scrapes every recipe card out of a quitoque.fr `/recettes` listing page.
|
||||||
|
* There's no `ItemList` JSON-LD to lean on (unlike marmiton.ts) — but each
|
||||||
|
* card is a single `<a class="card__content_header" href="/recettes/…">`
|
||||||
|
* wrapping its own `<img>`, so no "nearest preceding image" pairing is
|
||||||
|
* needed (unlike 750g.ts). The real image URL is the `<img>`'s `data-src`
|
||||||
|
* (a lazy-load attribute); its `src` is only a placeholder. `href` is a
|
||||||
|
* root-relative path, resolved against {@link SITE_ORIGIN} here so callers
|
||||||
|
* get a canonical absolute URL.
|
||||||
|
*
|
||||||
|
* Attribute-order-agnostic: matches every `<a>…</a>`, keeps the ones whose
|
||||||
|
* `class` contains `card__content_header`, and reads `href`/`alt`/`data-src`
|
||||||
|
* wherever they sit.
|
||||||
|
*/
|
||||||
|
function extractRecipeCards(html: string): QuitoqueCard[] {
|
||||||
|
const cards: QuitoqueCard[] = [];
|
||||||
|
const anchorPattern = /<a\s+([^>]*?)>([\s\S]*?)<\/a>/g;
|
||||||
|
for (const match of html.matchAll(anchorPattern)) {
|
||||||
|
const attrs = match[1] ?? "";
|
||||||
|
if (!/class="[^"]*\bcard__content_header\b[^"]*"/.test(attrs)) continue;
|
||||||
|
const href = /\bhref="(\/recettes\/[^"]+)"/.exec(attrs)?.[1];
|
||||||
|
if (href === undefined) continue;
|
||||||
|
const inner = match[2] ?? "";
|
||||||
|
const title = /\balt="([^"]*)"/.exec(inner)?.[1] ?? "";
|
||||||
|
if (title.length === 0) continue;
|
||||||
|
cards.push({
|
||||||
|
url: `${SITE_ORIGIN}${href}`,
|
||||||
|
title,
|
||||||
|
image: /\bdata-src="([^"]+)"/.exec(inner)?.[1] ?? null,
|
||||||
|
});
|
||||||
|
}
|
||||||
|
return cards;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Re-labels a `RecipeSourceFetchError`/`RecipeSourceParseError` thrown by
|
||||||
|
* the generic `jsonLdRecipeAdapter` (`sourceKey` `"jsonLdRecipe"`) as having
|
||||||
|
* come from this adapter (`sourceKey` `"quitoque"`) — same reasoning as
|
||||||
|
* marmiton.ts's identically-named helper: `fetchDetail`/`parse` are thin
|
||||||
|
* wrappers around the generic adapter, but a caller reading `.sourceKey`
|
||||||
|
* off a caught `RecipeSourceError` should see the source it asked about.
|
||||||
|
* (Not factored out into a shared helper — 750g/manger-bouger each keep
|
||||||
|
* their own copy too; three near-identical five-liners aren't worth a
|
||||||
|
* module.)
|
||||||
|
*/
|
||||||
|
function rekeySourceError(err: unknown): unknown {
|
||||||
|
if (err instanceof RecipeSourceFetchError) {
|
||||||
|
return new RecipeSourceFetchError(SOURCE_KEY, err.message, { cause: err.cause });
|
||||||
|
}
|
||||||
|
if (err instanceof RecipeSourceParseError) {
|
||||||
|
return new RecipeSourceParseError(SOURCE_KEY, err.message, { cause: err.cause });
|
||||||
|
}
|
||||||
|
return err;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* quitoque.fr — a French meal-kit company whose site publishes a large
|
||||||
|
* browsable recipe catalogue (`/recettes`, ~2700 recipes). Unofficial
|
||||||
|
* (`official: false`, same reasoning as jsonLdRecipeAdapter/marmiton/750g/
|
||||||
|
* mangerBouger): no published API, this reads ordinary pages and the
|
||||||
|
* schema.org JSON-LD they embed for search engines. `robots.txt` allows
|
||||||
|
* `/recettes` (and lists `ClaudeBot`/`GPTBot`/`Google-Extended` explicitly
|
||||||
|
* under `allow: /`).
|
||||||
|
*
|
||||||
|
* The thinnest kind of wrapper — like marmiton.ts, `fetchDetail`/`parse`
|
||||||
|
* delegate straight to {@link jsonLdRecipeAdapter} (a quitoque.fr recipe
|
||||||
|
* page's JSON-LD is a plain schema.org `Recipe`, the sole element of a
|
||||||
|
* top-level array, which `findRecipeNode` already handles). Only `list()`
|
||||||
|
* is site-specific: `/recettes?page=N` with a card scrape (see
|
||||||
|
* {@link extractRecipeCards}). The site has no real free-text search, so a
|
||||||
|
* `query` is a best-effort substring filter over each page's card titles
|
||||||
|
* (same accepted gap 750g.ts documents for its own search).
|
||||||
|
*/
|
||||||
|
export const quitoqueAdapter: RecipeSourceAdapter<{ html: string; url: string }> = {
|
||||||
|
key: SOURCE_KEY,
|
||||||
|
name: "Quitoque",
|
||||||
|
official: false,
|
||||||
|
iconUrl: `${SITE_ORIGIN}/favicon.ico`,
|
||||||
|
// Le contenu de quitoque.fr (noms, ingrédients, instructions) est en
|
||||||
|
// français — détermine contre quel modèle/locale d'étiquettes
|
||||||
|
// d'ingrédients translateRecipe (recipe-translation.ts) résout les
|
||||||
|
// recettes de cette source lors d'une prévisualisation/d'un import.
|
||||||
|
locale: "fr",
|
||||||
|
|
||||||
|
async list(params: RecipeSourceListParams): Promise<RecipeSourceListResult> {
|
||||||
|
try {
|
||||||
|
// Curseur opaque = numéro de page suivant ; quitoque.fr pagine via
|
||||||
|
// `?page=N` (page 1 implicite quand le paramètre est absent), même
|
||||||
|
// esprit que marmiton.ts/750g.ts.
|
||||||
|
const page = params.cursor ? Number(params.cursor) : 1;
|
||||||
|
const query = (params.query ?? "").trim().toLowerCase();
|
||||||
|
const listUrl = `${LIST_URL}${page > 1 ? `?page=${page}` : ""}`;
|
||||||
|
|
||||||
|
let response: Response;
|
||||||
|
try {
|
||||||
|
response = await fetch(listUrl);
|
||||||
|
} catch (cause) {
|
||||||
|
throw new RecipeSourceFetchError(
|
||||||
|
SOURCE_KEY,
|
||||||
|
`Network error listing Quitoque recipes (${listUrl})`,
|
||||||
|
{ cause },
|
||||||
|
);
|
||||||
|
}
|
||||||
|
if (!response.ok) {
|
||||||
|
throw new RecipeSourceFetchError(
|
||||||
|
SOURCE_KEY,
|
||||||
|
`Quitoque responded ${response.status} (${listUrl})`,
|
||||||
|
);
|
||||||
|
}
|
||||||
|
const html = await response.text();
|
||||||
|
|
||||||
|
const rawCards = extractRecipeCards(html);
|
||||||
|
const cards =
|
||||||
|
query.length > 0
|
||||||
|
? rawCards.filter((card) => card.title.toLowerCase().includes(query))
|
||||||
|
: rawCards;
|
||||||
|
|
||||||
|
const items: RecipeSourceListItem[] = cards.map((card) => ({
|
||||||
|
externalId: card.url,
|
||||||
|
title: card.title,
|
||||||
|
picture: card.image,
|
||||||
|
url: card.url,
|
||||||
|
}));
|
||||||
|
|
||||||
|
// Une page qui ne renvoie **aucune** carte est le signal de fin
|
||||||
|
// (même logique que marmiton.ts). Basé sur le nombre de cartes
|
||||||
|
// brutes, pas filtrées : une page qui a des cartes mais dont aucune
|
||||||
|
// ne matche `query` peut quand même avoir une suite qui matche.
|
||||||
|
const nextCursor = rawCards.length > 0 ? String(page + 1) : null;
|
||||||
|
|
||||||
|
return { items, nextCursor };
|
||||||
|
} catch (err) {
|
||||||
|
// Rethrown as-is (already keyed "quitoque" by whichever branch above
|
||||||
|
// threw it) — this adapter's only caller (`sources.service.ts`)
|
||||||
|
// already handles/logs failures centrally; this method just isn't
|
||||||
|
// allowed a bare `async` body without a try/catch per the repo's
|
||||||
|
// convention. Same reasoning as `marmiton.ts`/`750g.ts`.
|
||||||
|
throw err;
|
||||||
|
}
|
||||||
|
},
|
||||||
|
|
||||||
|
// `externalId` est directement l'URL canonique de la recette sur
|
||||||
|
// quitoque.fr (renvoyée telle quelle par `list()` ci-dessus) — même
|
||||||
|
// convention que `jsonLdRecipeAdapter.fetchDetail`, à qui cette méthode
|
||||||
|
// délègue entièrement.
|
||||||
|
async fetchDetail(externalId: string): Promise<{ html: string; url: string }> {
|
||||||
|
try {
|
||||||
|
return await jsonLdRecipeAdapter.fetchDetail(externalId);
|
||||||
|
} catch (err) {
|
||||||
|
// Pas un simple re-throw : `rekeySourceError` est le traitement utile
|
||||||
|
// que ce point d'appel doit faire de l'erreur (relabelliser sa
|
||||||
|
// `sourceKey`), conformément à la convention await/try-catch du repo.
|
||||||
|
throw rekeySourceError(err);
|
||||||
|
}
|
||||||
|
},
|
||||||
|
|
||||||
|
parse(raw: { html: string; url: string }): ParsedRecipe {
|
||||||
|
try {
|
||||||
|
return jsonLdRecipeAdapter.parse(raw);
|
||||||
|
} catch (err) {
|
||||||
|
throw rekeySourceError(err);
|
||||||
|
}
|
||||||
|
},
|
||||||
|
};
|
||||||
|
|
@ -66,20 +66,91 @@ function detailUrl(idMeal: string): string {
|
||||||
return `https://www.themealdb.com/meal/${idMeal}`;
|
return `https://www.themealdb.com/meal/${idMeal}`;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/** Category-list response shape (`/list.php?c=list`) — same `meals` envelope as everything else, but each row only carries `strCategory`. */
|
||||||
|
interface TheMealDbCategoryListResponse {
|
||||||
|
meals: { strCategory: string | null }[] | null;
|
||||||
|
}
|
||||||
|
|
||||||
|
/** Narrows to meals that actually carry a name — a titleless row isn't worth surfacing in a browse list. */
|
||||||
|
function hasName(meal: TheMealDbMeal): meal is TheMealDbMeal & { strMeal: string } {
|
||||||
|
return Boolean(meal.strMeal);
|
||||||
|
}
|
||||||
|
|
||||||
|
/** Maps one raw meal (from `/search.php` or `/filter.php`) into the generic list-item shape. */
|
||||||
|
function toListItem(meal: TheMealDbMeal & { strMeal: string }) {
|
||||||
|
return {
|
||||||
|
externalId: meal.idMeal,
|
||||||
|
title: meal.strMeal,
|
||||||
|
picture: meal.strMealThumb,
|
||||||
|
url: detailUrl(meal.idMeal),
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Name search (`/search.php?s=`) — the only mode TheMealDB's free tier
|
||||||
|
* offers for a non-empty query. One response holds every match, so there's
|
||||||
|
* never a next page.
|
||||||
|
*/
|
||||||
|
async function searchByName(query: string): Promise<RecipeSourceListResult> {
|
||||||
|
try {
|
||||||
|
const data = await fetchTheMealDb<TheMealDbMealsResponse>(
|
||||||
|
`/search.php?s=${encodeURIComponent(query)}`,
|
||||||
|
);
|
||||||
|
return { items: (data.meals ?? []).filter(hasName).map(toListItem), nextCursor: null };
|
||||||
|
} catch (err) {
|
||||||
|
throw err; // see fetchTheMealDb()'s catch comment above
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* "Browse everything" (an empty/omitted query). TheMealDB's free tier has
|
||||||
|
* no catalog-wide listing endpoint — `/search.php?s=` only answers with a
|
||||||
|
* fixed ~25-meal sample — so this walks the category list instead:
|
||||||
|
* `/list.php?c=list` for the categories, then `/filter.php?c={category}`
|
||||||
|
* for one category at a time, exposing **one category per cursor step** so
|
||||||
|
* the infinite scroll keeps pulling real, distinct pages instead of
|
||||||
|
* stalling on that sample (issue #38). The category list is re-fetched on
|
||||||
|
* each step rather than cached in module state — it's a single small
|
||||||
|
* request, it keeps this adapter stateless like the others, and the walk
|
||||||
|
* is paced one step per scroll anyway.
|
||||||
|
*/
|
||||||
|
async function listByCategory(cursor: string | null | undefined): Promise<RecipeSourceListResult> {
|
||||||
|
try {
|
||||||
|
const parsed = Number.parseInt(cursor ?? "0", 10);
|
||||||
|
const startAt = Number.isNaN(parsed) || parsed < 0 ? 0 : parsed;
|
||||||
|
|
||||||
|
const categoryList = await fetchTheMealDb<TheMealDbCategoryListResponse>("/list.php?c=list");
|
||||||
|
const categories = (categoryList.meals ?? [])
|
||||||
|
.map((row) => row.strCategory)
|
||||||
|
.filter((name): name is string => Boolean(name));
|
||||||
|
|
||||||
|
const category = categories[startAt];
|
||||||
|
if (category === undefined) {
|
||||||
|
// Cursor has walked past the last category — the clean end of the list.
|
||||||
|
return { items: [], nextCursor: null };
|
||||||
|
}
|
||||||
|
|
||||||
|
const data = await fetchTheMealDb<TheMealDbMealsResponse>(
|
||||||
|
`/filter.php?c=${encodeURIComponent(category)}`,
|
||||||
|
);
|
||||||
|
const nextCursor = startAt + 1 < categories.length ? String(startAt + 1) : null;
|
||||||
|
return { items: (data.meals ?? []).filter(hasName).map(toListItem), nextCursor };
|
||||||
|
} catch (err) {
|
||||||
|
throw err; // see fetchTheMealDb()'s catch comment above
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* TheMealDB (themealdb.com) — a free, public recipe API (no scraping: the
|
* TheMealDB (themealdb.com) — a free, public recipe API (no scraping: the
|
||||||
* publisher's own structured JSON, hence `official: true`). The first real
|
* publisher's own structured JSON, hence `official: true`). The first real
|
||||||
* `RecipeSourceAdapter` implementation, proving the generic contract
|
* `RecipeSourceAdapter` implementation, proving the generic contract
|
||||||
* (recipe-source-adapter.ts) end to end against a live source.
|
* (recipe-source-adapter.ts) end to end against a live source.
|
||||||
*
|
*
|
||||||
* `list()` is search-only — TheMealDB has no dedicated "browse everything"
|
* `list()` has two modes (see the helpers above): a non-empty `query` is a
|
||||||
* endpoint on its free tier. An omitted `query` searches for an empty
|
* name search (`/search.php?s=`, single unpaginated response,
|
||||||
* string, which TheMealDB happens to answer with a small default sample
|
* `nextCursor: null`); an empty/omitted `query` — this contract's "browse
|
||||||
* (~25 meals) rather than nothing — close enough to this contract's
|
* everything" — walks the category list one category per cursor step,
|
||||||
* "omitted `query` means browse everything" convention
|
* since the free tier has no real catalog-wide endpoint.
|
||||||
* (`RecipeSourceListParams.query`) to lean on as-is, though it's a fixed
|
|
||||||
* sample, not the whole catalog. Search isn't paginated either — one
|
|
||||||
* response holds every match, so `nextCursor` is always `null`.
|
|
||||||
*/
|
*/
|
||||||
export const theMealDbAdapter: RecipeSourceAdapter<TheMealDbMeal> = {
|
export const theMealDbAdapter: RecipeSourceAdapter<TheMealDbMeal> = {
|
||||||
key: SOURCE_KEY,
|
key: SOURCE_KEY,
|
||||||
|
|
@ -93,22 +164,8 @@ export const theMealDbAdapter: RecipeSourceAdapter<TheMealDbMeal> = {
|
||||||
|
|
||||||
async list(params: RecipeSourceListParams): Promise<RecipeSourceListResult> {
|
async list(params: RecipeSourceListParams): Promise<RecipeSourceListResult> {
|
||||||
try {
|
try {
|
||||||
const query = params.query ?? "";
|
const query = (params.query ?? "").trim();
|
||||||
const data = await fetchTheMealDb<TheMealDbMealsResponse>(
|
return query.length > 0 ? await searchByName(query) : await listByCategory(params.cursor);
|
||||||
`/search.php?s=${encodeURIComponent(query)}`,
|
|
||||||
);
|
|
||||||
const meals = data.meals ?? [];
|
|
||||||
return {
|
|
||||||
items: meals
|
|
||||||
.filter((meal): meal is TheMealDbMeal & { strMeal: string } => Boolean(meal.strMeal))
|
|
||||||
.map((meal) => ({
|
|
||||||
externalId: meal.idMeal,
|
|
||||||
title: meal.strMeal,
|
|
||||||
picture: meal.strMealThumb,
|
|
||||||
url: detailUrl(meal.idMeal),
|
|
||||||
})),
|
|
||||||
nextCursor: null,
|
|
||||||
};
|
|
||||||
} catch (err) {
|
} catch (err) {
|
||||||
throw err; // see fetchTheMealDb()'s catch comment above
|
throw err; // see fetchTheMealDb()'s catch comment above
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -48,7 +48,9 @@ export async function resetDatabase() {
|
||||||
"recipe_ingredient", "step_tech_step", "step", "tech_step",
|
"recipe_ingredient", "step_tech_step", "step", "tech_step",
|
||||||
"recipe", "ingredients", "sources", "unit",
|
"recipe", "ingredients", "sources", "unit",
|
||||||
"user_profiles", "diet", "house",
|
"user_profiles", "diet", "house",
|
||||||
"admin_users", "analytics_events", "worker_heartbeats"
|
"tour_progress", "tour_scenario_step", "tour_scenario", "tour_target",
|
||||||
|
"contact_message",
|
||||||
|
"admin_users", "analytics_events", "worker_heartbeats", "backfill_state"
|
||||||
RESTART IDENTITY CASCADE;
|
RESTART IDENTITY CASCADE;
|
||||||
`);
|
`);
|
||||||
await seedReferenceData(prisma);
|
await seedReferenceData(prisma);
|
||||||
|
|
|
||||||
|
|
@ -44,16 +44,16 @@ describe("Admin auth", () => {
|
||||||
await prisma.$disconnect();
|
await prisma.$disconnect();
|
||||||
});
|
});
|
||||||
|
|
||||||
describe("POST /admin/auth/login", () => {
|
describe("POST /admin/api/auth/login", () => {
|
||||||
it("rejects a missing body with 400 VALIDATION_ERROR", async () => {
|
it("rejects a missing body with 400 VALIDATION_ERROR", async () => {
|
||||||
const res = await request(app).post("/admin/auth/login").send({});
|
const res = await request(app).post("/admin/api/auth/login").send({});
|
||||||
expect(res.status).to.equal(400);
|
expect(res.status).to.equal(400);
|
||||||
expect(res.body.code).to.equal(ErrorCode.VALIDATION_ERROR);
|
expect(res.body.code).to.equal(ErrorCode.VALIDATION_ERROR);
|
||||||
});
|
});
|
||||||
|
|
||||||
it("rejects an unknown email with 401 INVALID_CREDENTIALS", async () => {
|
it("rejects an unknown email with 401 INVALID_CREDENTIALS", async () => {
|
||||||
const res = await request(app)
|
const res = await request(app)
|
||||||
.post("/admin/auth/login")
|
.post("/admin/api/auth/login")
|
||||||
.send({ email: "nobody@example.com", password: "whatever" });
|
.send({ email: "nobody@example.com", password: "whatever" });
|
||||||
expect(res.status).to.equal(401);
|
expect(res.status).to.equal(401);
|
||||||
expect(res.body.code).to.equal(ErrorCode.INVALID_CREDENTIALS);
|
expect(res.body.code).to.equal(ErrorCode.INVALID_CREDENTIALS);
|
||||||
|
|
@ -62,7 +62,7 @@ describe("Admin auth", () => {
|
||||||
it("rejects a wrong password with 401 INVALID_CREDENTIALS", async () => {
|
it("rejects a wrong password with 401 INVALID_CREDENTIALS", async () => {
|
||||||
const { email } = await seedAdmin();
|
const { email } = await seedAdmin();
|
||||||
const res = await request(app)
|
const res = await request(app)
|
||||||
.post("/admin/auth/login")
|
.post("/admin/api/auth/login")
|
||||||
.send({ email, password: "not-the-password" });
|
.send({ email, password: "not-the-password" });
|
||||||
expect(res.status).to.equal(401);
|
expect(res.status).to.equal(401);
|
||||||
expect(res.body.code).to.equal(ErrorCode.INVALID_CREDENTIALS);
|
expect(res.body.code).to.equal(ErrorCode.INVALID_CREDENTIALS);
|
||||||
|
|
@ -76,7 +76,7 @@ describe("Admin auth", () => {
|
||||||
}
|
}
|
||||||
const { email, password } = await seedAdmin();
|
const { email, password } = await seedAdmin();
|
||||||
|
|
||||||
const res = await request(app).post("/admin/auth/login").send({ email, password });
|
const res = await request(app).post("/admin/api/auth/login").send({ email, password });
|
||||||
|
|
||||||
expect(res.status).to.equal(200);
|
expect(res.status).to.equal(200);
|
||||||
expect(res.body.email).to.equal(email);
|
expect(res.body.email).to.equal(email);
|
||||||
|
|
@ -94,9 +94,9 @@ describe("Admin auth", () => {
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|
||||||
describe("GET /admin/auth/me", () => {
|
describe("GET /admin/api/auth/me", () => {
|
||||||
it("rejects a request with no admin cookie with 401 NOT_AUTHENTICATED", async () => {
|
it("rejects a request with no admin cookie with 401 NOT_AUTHENTICATED", async () => {
|
||||||
const res = await request(app).get("/admin/auth/me");
|
const res = await request(app).get("/admin/api/auth/me");
|
||||||
expect(res.status).to.equal(401);
|
expect(res.status).to.equal(401);
|
||||||
expect(res.body.code).to.equal(ErrorCode.NOT_AUTHENTICATED);
|
expect(res.body.code).to.equal(ErrorCode.NOT_AUTHENTICATED);
|
||||||
});
|
});
|
||||||
|
|
@ -109,9 +109,9 @@ describe("Admin auth", () => {
|
||||||
}
|
}
|
||||||
const { email, password } = await seedAdmin();
|
const { email, password } = await seedAdmin();
|
||||||
const agent = request.agent(app);
|
const agent = request.agent(app);
|
||||||
await agent.post("/admin/auth/login").send({ email, password });
|
await agent.post("/admin/api/auth/login").send({ email, password });
|
||||||
|
|
||||||
const res = await agent.get("/admin/auth/me");
|
const res = await agent.get("/admin/api/auth/me");
|
||||||
expect(res.status).to.equal(200);
|
expect(res.status).to.equal(200);
|
||||||
expect(res.body.email).to.equal(email);
|
expect(res.body.email).to.equal(email);
|
||||||
});
|
});
|
||||||
|
|
@ -124,12 +124,12 @@ describe("Admin auth", () => {
|
||||||
}
|
}
|
||||||
const { email, password } = await seedAdmin();
|
const { email, password } = await seedAdmin();
|
||||||
const agent = request.agent(app);
|
const agent = request.agent(app);
|
||||||
await agent.post("/admin/auth/login").send({ email, password });
|
await agent.post("/admin/api/auth/login").send({ email, password });
|
||||||
|
|
||||||
const logoutRes = await agent.post("/admin/auth/logout");
|
const logoutRes = await agent.post("/admin/api/auth/logout");
|
||||||
expect(logoutRes.status).to.equal(204);
|
expect(logoutRes.status).to.equal(204);
|
||||||
|
|
||||||
const meRes = await agent.get("/admin/auth/me");
|
const meRes = await agent.get("/admin/api/auth/me");
|
||||||
expect(meRes.status).to.equal(401);
|
expect(meRes.status).to.equal(401);
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|
@ -141,7 +141,7 @@ describe("Admin auth", () => {
|
||||||
const agent = request.agent(app);
|
const agent = request.agent(app);
|
||||||
await agent.post("/auth/signup").send(buildSignupPayload());
|
await agent.post("/auth/signup").send(buildSignupPayload());
|
||||||
|
|
||||||
const res = await agent.get("/admin/auth/me");
|
const res = await agent.get("/admin/api/auth/me");
|
||||||
expect(res.status).to.equal(401);
|
expect(res.status).to.equal(401);
|
||||||
expect(res.body.code).to.equal(ErrorCode.NOT_AUTHENTICATED);
|
expect(res.body.code).to.equal(ErrorCode.NOT_AUTHENTICATED);
|
||||||
});
|
});
|
||||||
|
|
|
||||||
|
|
@ -47,7 +47,7 @@ async function seedPlaceholderRecipe(name: string): Promise<number> {
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* `/admin/catalog/*` — the off-catalog ingredient review. Every route is
|
* `/admin/api/catalog/*` — the off-catalog ingredient review. Every route is
|
||||||
* behind `requireAdmin`; the list groups placeholder rows by normalized
|
* behind `requireAdmin`; the list groups placeholder rows by normalized
|
||||||
* name, `mark-reviewed` stamps `reviewedAt`, `prune-orphans` deletes rows
|
* name, `mark-reviewed` stamps `reviewedAt`, `prune-orphans` deletes rows
|
||||||
* no recipe references any more.
|
* no recipe references any more.
|
||||||
|
|
@ -66,18 +66,18 @@ describe("Admin catalog — off-catalog ingredients", () => {
|
||||||
async function adminAgent() {
|
async function adminAgent() {
|
||||||
const { email, password } = await seedAdmin();
|
const { email, password } = await seedAdmin();
|
||||||
const agent = request.agent(app);
|
const agent = request.agent(app);
|
||||||
await agent.post("/admin/auth/login").send({ email, password });
|
await agent.post("/admin/api/auth/login").send({ email, password });
|
||||||
return agent;
|
return agent;
|
||||||
}
|
}
|
||||||
|
|
||||||
it("rejects every route without an admin session", async () => {
|
it("rejects every route without an admin session", async () => {
|
||||||
const get = await request(app).get("/admin/catalog/placeholders");
|
const get = await request(app).get("/admin/api/catalog/placeholders");
|
||||||
expect(get.status).to.equal(401);
|
expect(get.status).to.equal(401);
|
||||||
const patch = await request(app)
|
const patch = await request(app)
|
||||||
.patch("/admin/catalog/placeholders/mark-reviewed")
|
.patch("/admin/api/catalog/placeholders/mark-reviewed")
|
||||||
.send({ ingredientIds: [1] });
|
.send({ ingredientIds: [1] });
|
||||||
expect(patch.status).to.equal(401);
|
expect(patch.status).to.equal(401);
|
||||||
const post = await request(app).post("/admin/catalog/placeholders/prune-orphans");
|
const post = await request(app).post("/admin/api/catalog/placeholders/prune-orphans");
|
||||||
expect(post.status).to.equal(401);
|
expect(post.status).to.equal(401);
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|
@ -87,7 +87,7 @@ describe("Admin catalog — off-catalog ingredients", () => {
|
||||||
await seedPlaceholderRecipe("Sumac");
|
await seedPlaceholderRecipe("Sumac");
|
||||||
|
|
||||||
const agent = await adminAgent();
|
const agent = await adminAgent();
|
||||||
const res = await agent.get("/admin/catalog/placeholders");
|
const res = await agent.get("/admin/api/catalog/placeholders");
|
||||||
expect(res.status).to.equal(200);
|
expect(res.status).to.equal(200);
|
||||||
expect(res.body).to.have.length(2);
|
expect(res.body).to.have.length(2);
|
||||||
|
|
||||||
|
|
@ -106,7 +106,7 @@ describe("Admin catalog — off-catalog ingredients", () => {
|
||||||
const agent = await adminAgent();
|
const agent = await adminAgent();
|
||||||
|
|
||||||
const patched = await agent
|
const patched = await agent
|
||||||
.patch("/admin/catalog/placeholders/mark-reviewed")
|
.patch("/admin/api/catalog/placeholders/mark-reviewed")
|
||||||
.send({ ingredientIds: [id] });
|
.send({ ingredientIds: [id] });
|
||||||
expect(patched.status).to.equal(200);
|
expect(patched.status).to.equal(200);
|
||||||
expect(patched.body.reviewed).to.equal(1);
|
expect(patched.body.reviewed).to.equal(1);
|
||||||
|
|
@ -114,9 +114,9 @@ describe("Admin catalog — off-catalog ingredients", () => {
|
||||||
(await prisma.ingredient.findUniqueOrThrow({ where: { id } })).reviewedAt,
|
(await prisma.ingredient.findUniqueOrThrow({ where: { id } })).reviewedAt,
|
||||||
).to.be.an.instanceOf(Date);
|
).to.be.an.instanceOf(Date);
|
||||||
|
|
||||||
const pending = await agent.get("/admin/catalog/placeholders");
|
const pending = await agent.get("/admin/api/catalog/placeholders");
|
||||||
expect(pending.body).to.have.length(0);
|
expect(pending.body).to.have.length(0);
|
||||||
const reviewed = await agent.get("/admin/catalog/placeholders").query({ reviewed: "true" });
|
const reviewed = await agent.get("/admin/api/catalog/placeholders").query({ reviewed: "true" });
|
||||||
expect(reviewed.body).to.have.length(1);
|
expect(reviewed.body).to.have.length(1);
|
||||||
expect(reviewed.body[0].allReviewed).to.equal(true);
|
expect(reviewed.body[0].allReviewed).to.equal(true);
|
||||||
});
|
});
|
||||||
|
|
@ -133,9 +133,124 @@ describe("Admin catalog — off-catalog ingredients", () => {
|
||||||
});
|
});
|
||||||
|
|
||||||
const agent = await adminAgent();
|
const agent = await adminAgent();
|
||||||
const res = await agent.post("/admin/catalog/placeholders/prune-orphans");
|
const res = await agent.post("/admin/api/catalog/placeholders/prune-orphans");
|
||||||
expect(res.status).to.equal(200);
|
expect(res.status).to.equal(200);
|
||||||
expect(res.body.deleted).to.equal(1);
|
expect(res.body.deleted).to.equal(1);
|
||||||
expect(await prisma.ingredient.count({ where: { isPlaceholder: true } })).to.equal(1);
|
expect(await prisma.ingredient.count({ where: { isPlaceholder: true } })).to.equal(1);
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|
||||||
|
/**
|
||||||
|
* `/admin/api/catalog/tech-step-placeholders` — the missing-technique review
|
||||||
|
* (issue #130). Flat list, `mark-reviewed` stamps `reviewedAt`; every route
|
||||||
|
* behind `requireAdmin`.
|
||||||
|
*/
|
||||||
|
describe("Admin catalog — missing techniques", () => {
|
||||||
|
const app = createApp();
|
||||||
|
|
||||||
|
beforeEach(async () => {
|
||||||
|
await resetDatabase();
|
||||||
|
});
|
||||||
|
|
||||||
|
after(async () => {
|
||||||
|
await prisma.$disconnect();
|
||||||
|
});
|
||||||
|
|
||||||
|
async function adminAgent() {
|
||||||
|
const { email, password } = await seedAdmin();
|
||||||
|
const agent = request.agent(app);
|
||||||
|
await agent.post("/admin/api/auth/login").send({ email, password });
|
||||||
|
return agent;
|
||||||
|
}
|
||||||
|
|
||||||
|
/** A `PUBLIC` recipe whose single step carries a placeholder technique named `name`. Returns the placeholder `TechStep` id. */
|
||||||
|
async function seedPlaceholderTechnique(name: string): Promise<number> {
|
||||||
|
const author = await prisma.userProfile.create({
|
||||||
|
data: {
|
||||||
|
firstName: "T",
|
||||||
|
lastName: "A",
|
||||||
|
email: `${faker.string.uuid()}@example.test`,
|
||||||
|
passwordHash: "x",
|
||||||
|
},
|
||||||
|
});
|
||||||
|
const techStep = await prisma.techStep.create({
|
||||||
|
data: {
|
||||||
|
key: `placeholder:${faker.string.uuid()}`,
|
||||||
|
isPlaceholder: true,
|
||||||
|
displayName: name,
|
||||||
|
createdById: author.id,
|
||||||
|
createdAt: new Date(),
|
||||||
|
},
|
||||||
|
});
|
||||||
|
await prisma.recipe.create({
|
||||||
|
data: {
|
||||||
|
name: faker.lorem.words(3),
|
||||||
|
authorId: author.id,
|
||||||
|
portions: 2,
|
||||||
|
visibility: "PUBLIC",
|
||||||
|
steps: {
|
||||||
|
create: [
|
||||||
|
{
|
||||||
|
description: "Une étape.",
|
||||||
|
order: 0,
|
||||||
|
techSteps: {
|
||||||
|
create: [{ techStepId: techStep.id, order: 0, start: 0, end: 4, source: "manual" }],
|
||||||
|
},
|
||||||
|
},
|
||||||
|
],
|
||||||
|
},
|
||||||
|
},
|
||||||
|
});
|
||||||
|
return techStep.id;
|
||||||
|
}
|
||||||
|
|
||||||
|
it("rejects both routes without an admin session", async () => {
|
||||||
|
expect((await request(app).get("/admin/api/catalog/tech-step-placeholders")).status).to.equal(
|
||||||
|
401,
|
||||||
|
);
|
||||||
|
expect(
|
||||||
|
(
|
||||||
|
await request(app)
|
||||||
|
.patch("/admin/api/catalog/tech-step-placeholders/mark-reviewed")
|
||||||
|
.send({ techStepIds: [1] })
|
||||||
|
).status,
|
||||||
|
).to.equal(401);
|
||||||
|
});
|
||||||
|
|
||||||
|
it("lists proposed techniques with their recipe count, impact-ordered", async () => {
|
||||||
|
await seedPlaceholderTechnique("Flamber au chalumeau");
|
||||||
|
await seedPlaceholderTechnique("Confire à basse température");
|
||||||
|
|
||||||
|
const agent = await adminAgent();
|
||||||
|
const res = await agent.get("/admin/api/catalog/tech-step-placeholders");
|
||||||
|
|
||||||
|
expect(res.status).to.equal(200);
|
||||||
|
expect(res.body).to.have.length(2);
|
||||||
|
expect(res.body.map((r: { displayName: string }) => r.displayName)).to.have.members([
|
||||||
|
"Flamber au chalumeau",
|
||||||
|
"Confire à basse température",
|
||||||
|
]);
|
||||||
|
expect(res.body[0].recipeCount).to.equal(1);
|
||||||
|
expect(res.body[0].reviewedAt).to.equal(null);
|
||||||
|
});
|
||||||
|
|
||||||
|
it("mark-reviewed stamps reviewedAt and moves the row to the reviewed list", async () => {
|
||||||
|
const id = await seedPlaceholderTechnique("Snacker à la plancha");
|
||||||
|
const agent = await adminAgent();
|
||||||
|
|
||||||
|
const patched = await agent
|
||||||
|
.patch("/admin/api/catalog/tech-step-placeholders/mark-reviewed")
|
||||||
|
.send({ techStepIds: [id] });
|
||||||
|
expect(patched.status).to.equal(200);
|
||||||
|
expect(patched.body.reviewed).to.equal(1);
|
||||||
|
expect(
|
||||||
|
(await prisma.techStep.findUniqueOrThrow({ where: { id } })).reviewedAt,
|
||||||
|
).to.be.an.instanceOf(Date);
|
||||||
|
|
||||||
|
expect((await agent.get("/admin/api/catalog/tech-step-placeholders")).body).to.have.length(0);
|
||||||
|
const reviewed = await agent
|
||||||
|
.get("/admin/api/catalog/tech-step-placeholders")
|
||||||
|
.query({ reviewed: "true" });
|
||||||
|
expect(reviewed.body).to.have.length(1);
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
|
||||||
346
apps/api/test/admin-contact.test.ts
Normal file
346
apps/api/test/admin-contact.test.ts
Normal file
|
|
@ -0,0 +1,346 @@
|
||||||
|
import { ErrorCode } from "@batch-cooking/shared";
|
||||||
|
import { faker } from "@faker-js/faker";
|
||||||
|
import { expect } from "chai";
|
||||||
|
import request from "supertest";
|
||||||
|
import { createApp } from "../src/app.js";
|
||||||
|
import { env } from "../src/config/env.js";
|
||||||
|
import { prisma } from "../src/db/prisma.js";
|
||||||
|
import { hashAdminPassword } from "../src/modules/admin/admin-auth.service.js";
|
||||||
|
import { resetDatabase } from "../test-support/reset-db.js";
|
||||||
|
|
||||||
|
async function seedAdmin(): Promise<{ email: string; password: string }> {
|
||||||
|
const email = faker.internet.email().toLowerCase();
|
||||||
|
const password = faker.internet.password({ length: 16 });
|
||||||
|
await prisma.adminUser.create({
|
||||||
|
data: { email, name: faker.person.fullName(), passwordHash: await hashAdminPassword(password) },
|
||||||
|
});
|
||||||
|
return { email, password };
|
||||||
|
}
|
||||||
|
|
||||||
|
/** Creates a `UserProfile` to attribute contact messages to. */
|
||||||
|
async function seedUser() {
|
||||||
|
return prisma.userProfile.create({
|
||||||
|
data: {
|
||||||
|
firstName: faker.person.firstName(),
|
||||||
|
lastName: faker.person.lastName(),
|
||||||
|
email: `${faker.string.uuid()}@example.test`,
|
||||||
|
passwordHash: "x",
|
||||||
|
},
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
/** One `ContactMessage`, `createdAt` overridable so ordering is deterministic. */
|
||||||
|
async function seedMessage(overrides: {
|
||||||
|
authorId: number | null;
|
||||||
|
type?: string;
|
||||||
|
message?: string;
|
||||||
|
createdAt?: Date;
|
||||||
|
}) {
|
||||||
|
return prisma.contactMessage.create({
|
||||||
|
data: {
|
||||||
|
authorId: overrides.authorId,
|
||||||
|
type: overrides.type ?? "bug",
|
||||||
|
message: overrides.message ?? faker.lorem.sentence(),
|
||||||
|
pageUrl: "/",
|
||||||
|
userAgent: "test-agent/1.0",
|
||||||
|
appVersion: "0.2.1",
|
||||||
|
...(overrides.createdAt ? { createdAt: overrides.createdAt } : {}),
|
||||||
|
},
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
const adminSecretConfigured = env.ADMIN_JWT_SECRET !== undefined;
|
||||||
|
const forgejoConfigured =
|
||||||
|
env.FORGEJO_BASE_URL !== undefined &&
|
||||||
|
env.FORGEJO_TOKEN !== undefined &&
|
||||||
|
env.FORGEJO_REPO !== undefined;
|
||||||
|
|
||||||
|
describe("Admin contact messages", () => {
|
||||||
|
const app = createApp();
|
||||||
|
|
||||||
|
beforeEach(async () => {
|
||||||
|
await resetDatabase();
|
||||||
|
});
|
||||||
|
|
||||||
|
after(async () => {
|
||||||
|
await prisma.$disconnect();
|
||||||
|
});
|
||||||
|
|
||||||
|
async function adminAgent() {
|
||||||
|
const { email, password } = await seedAdmin();
|
||||||
|
const agent = request.agent(app);
|
||||||
|
await agent.post("/admin/api/auth/login").send({ email, password });
|
||||||
|
return agent;
|
||||||
|
}
|
||||||
|
|
||||||
|
it("rejects the route without an admin session", async () => {
|
||||||
|
const res = await request(app).get("/admin/api/contact");
|
||||||
|
expect(res.status).to.equal(401);
|
||||||
|
});
|
||||||
|
|
||||||
|
it("returns messages newest first, with the author resolved", async function () {
|
||||||
|
if (!adminSecretConfigured) {
|
||||||
|
// biome-ignore lint/suspicious/noExplicitAny: mocha's `this.skip()` isn't typed here.
|
||||||
|
(this as any).skip();
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
const user = await seedUser();
|
||||||
|
await seedMessage({
|
||||||
|
authorId: user.id,
|
||||||
|
message: "le plus ancien",
|
||||||
|
createdAt: new Date("2026-01-01T00:00:00.000Z"),
|
||||||
|
});
|
||||||
|
await seedMessage({
|
||||||
|
authorId: user.id,
|
||||||
|
message: "le plus récent",
|
||||||
|
createdAt: new Date("2026-06-01T00:00:00.000Z"),
|
||||||
|
});
|
||||||
|
|
||||||
|
const agent = await adminAgent();
|
||||||
|
const res = await agent.get("/admin/api/contact");
|
||||||
|
|
||||||
|
expect(res.status).to.equal(200);
|
||||||
|
expect(res.body.map((row: { message: string }) => row.message)).to.deep.equal([
|
||||||
|
"le plus récent",
|
||||||
|
"le plus ancien",
|
||||||
|
]);
|
||||||
|
expect(res.body[0].author).to.deep.equal({
|
||||||
|
id: user.id,
|
||||||
|
firstName: user.firstName,
|
||||||
|
lastName: user.lastName,
|
||||||
|
email: user.email,
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
||||||
|
it("filters by type", async function () {
|
||||||
|
if (!adminSecretConfigured) {
|
||||||
|
// biome-ignore lint/suspicious/noExplicitAny: mocha's `this.skip()` isn't typed here.
|
||||||
|
(this as any).skip();
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
const user = await seedUser();
|
||||||
|
await seedMessage({ authorId: user.id, type: "bug" });
|
||||||
|
await seedMessage({ authorId: user.id, type: "suggestion" });
|
||||||
|
await seedMessage({ authorId: user.id, type: "suggestion" });
|
||||||
|
|
||||||
|
const agent = await adminAgent();
|
||||||
|
const res = await agent.get("/admin/api/contact").query({ type: "suggestion" });
|
||||||
|
|
||||||
|
expect(res.status).to.equal(200);
|
||||||
|
expect(res.body).to.have.lengthOf(2);
|
||||||
|
expect(res.body.every((row: { type: string }) => row.type === "suggestion")).to.equal(true);
|
||||||
|
});
|
||||||
|
|
||||||
|
it("rejects an unknown type filter with 400", async function () {
|
||||||
|
if (!adminSecretConfigured) {
|
||||||
|
// biome-ignore lint/suspicious/noExplicitAny: mocha's `this.skip()` isn't typed here.
|
||||||
|
(this as any).skip();
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
const agent = await adminAgent();
|
||||||
|
const res = await agent.get("/admin/api/contact").query({ type: "complaint" });
|
||||||
|
expect(res.status).to.equal(400);
|
||||||
|
});
|
||||||
|
|
||||||
|
it("caps the page at 200 rows", async function () {
|
||||||
|
if (!adminSecretConfigured) {
|
||||||
|
// biome-ignore lint/suspicious/noExplicitAny: mocha's `this.skip()` isn't typed here.
|
||||||
|
(this as any).skip();
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
const user = await seedUser();
|
||||||
|
await prisma.contactMessage.createMany({
|
||||||
|
data: Array.from({ length: 205 }, () => ({
|
||||||
|
authorId: user.id,
|
||||||
|
type: "bug",
|
||||||
|
message: faker.lorem.sentence(),
|
||||||
|
})),
|
||||||
|
});
|
||||||
|
|
||||||
|
const agent = await adminAgent();
|
||||||
|
const res = await agent.get("/admin/api/contact");
|
||||||
|
|
||||||
|
expect(res.status).to.equal(200);
|
||||||
|
expect(res.body).to.have.lengthOf(200);
|
||||||
|
});
|
||||||
|
|
||||||
|
it("reports author: null once the sender's account is deleted", async function () {
|
||||||
|
if (!adminSecretConfigured) {
|
||||||
|
// biome-ignore lint/suspicious/noExplicitAny: mocha's `this.skip()` isn't typed here.
|
||||||
|
(this as any).skip();
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
const user = await seedUser();
|
||||||
|
await seedMessage({ authorId: user.id, message: "signalé puis compte supprimé" });
|
||||||
|
await prisma.userProfile.delete({ where: { id: user.id } });
|
||||||
|
|
||||||
|
const agent = await adminAgent();
|
||||||
|
const res = await agent.get("/admin/api/contact");
|
||||||
|
|
||||||
|
expect(res.status).to.equal(200);
|
||||||
|
expect(res.body).to.have.lengthOf(1);
|
||||||
|
expect(res.body[0].message).to.equal("signalé puis compte supprimé");
|
||||||
|
expect(res.body[0].author).to.equal(null);
|
||||||
|
});
|
||||||
|
|
||||||
|
describe("Forgejo issue creation (#81)", () => {
|
||||||
|
let originalFetch: typeof fetch;
|
||||||
|
|
||||||
|
beforeEach(() => {
|
||||||
|
originalFetch = globalThis.fetch;
|
||||||
|
});
|
||||||
|
|
||||||
|
afterEach(() => {
|
||||||
|
globalThis.fetch = originalFetch;
|
||||||
|
});
|
||||||
|
|
||||||
|
/** Makes `forgejo.createIssue`'s `fetch` return `body` with `status`. */
|
||||||
|
function stubForgejoFetch(body: unknown, status = 201) {
|
||||||
|
globalThis.fetch = (async () =>
|
||||||
|
new Response(JSON.stringify(body), { status })) as typeof fetch;
|
||||||
|
}
|
||||||
|
|
||||||
|
it("returns 401 without an admin session", async () => {
|
||||||
|
const res = await request(app).post("/admin/api/contact/1/forgejo-issue").send({
|
||||||
|
title: "t",
|
||||||
|
body: "b",
|
||||||
|
});
|
||||||
|
expect(res.status).to.equal(401);
|
||||||
|
});
|
||||||
|
|
||||||
|
it("exposes the integration status", async function () {
|
||||||
|
if (!adminSecretConfigured) {
|
||||||
|
// biome-ignore lint/suspicious/noExplicitAny: mocha's `this.skip()` isn't typed here.
|
||||||
|
(this as any).skip();
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
const agent = await adminAgent();
|
||||||
|
const res = await agent.get("/admin/api/contact/forgejo/status");
|
||||||
|
expect(res.status).to.equal(200);
|
||||||
|
expect(res.body).to.deep.equal({ enabled: forgejoConfigured });
|
||||||
|
});
|
||||||
|
|
||||||
|
it("responds 503 FORGEJO_NOT_CONFIGURED when the env isn't set", async function () {
|
||||||
|
if (!adminSecretConfigured || forgejoConfigured) {
|
||||||
|
// biome-ignore lint/suspicious/noExplicitAny: mocha's `this.skip()` isn't typed here.
|
||||||
|
(this as any).skip();
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
const user = await seedUser();
|
||||||
|
const message = await seedMessage({ authorId: user.id });
|
||||||
|
const agent = await adminAgent();
|
||||||
|
|
||||||
|
const res = await agent
|
||||||
|
.post(`/admin/api/contact/${message.id}/forgejo-issue`)
|
||||||
|
.send({ title: "Titre", body: "Corps du ticket" });
|
||||||
|
|
||||||
|
expect(res.status).to.equal(503);
|
||||||
|
expect(res.body.code).to.equal(ErrorCode.FORGEJO_NOT_CONFIGURED);
|
||||||
|
});
|
||||||
|
|
||||||
|
it("creates the issue and records the link on the message", async function () {
|
||||||
|
if (!adminSecretConfigured || !forgejoConfigured) {
|
||||||
|
// biome-ignore lint/suspicious/noExplicitAny: mocha's `this.skip()` isn't typed here.
|
||||||
|
(this as any).skip();
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
stubForgejoFetch({ number: 77, html_url: "https://forge.example/ci/repo/issues/77" });
|
||||||
|
const user = await seedUser();
|
||||||
|
const message = await seedMessage({ authorId: user.id, message: "un bug précis" });
|
||||||
|
const agent = await adminAgent();
|
||||||
|
|
||||||
|
const res = await agent
|
||||||
|
.post(`/admin/api/contact/${message.id}/forgejo-issue`)
|
||||||
|
.send({ title: "[Bug] un bug précis", body: "un bug précis\n\n---\ncontexte" });
|
||||||
|
|
||||||
|
expect(res.status).to.equal(200);
|
||||||
|
expect(res.body.forgejoIssueNumber).to.equal(77);
|
||||||
|
expect(res.body.forgejoIssueUrl).to.equal("https://forge.example/ci/repo/issues/77");
|
||||||
|
|
||||||
|
const row = await prisma.contactMessage.findFirstOrThrow({ where: { id: message.id } });
|
||||||
|
expect(row.forgejoIssueNumber).to.equal(77);
|
||||||
|
expect(row.forgejoIssueUrl).to.equal("https://forge.example/ci/repo/issues/77");
|
||||||
|
});
|
||||||
|
|
||||||
|
it("responds 404 for an unknown message id", async function () {
|
||||||
|
if (!adminSecretConfigured || !forgejoConfigured) {
|
||||||
|
// biome-ignore lint/suspicious/noExplicitAny: mocha's `this.skip()` isn't typed here.
|
||||||
|
(this as any).skip();
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
stubForgejoFetch({ number: 1, html_url: "x" });
|
||||||
|
const agent = await adminAgent();
|
||||||
|
|
||||||
|
const res = await agent
|
||||||
|
.post("/admin/api/contact/999999/forgejo-issue")
|
||||||
|
.send({ title: "Titre", body: "Corps" });
|
||||||
|
|
||||||
|
expect(res.status).to.equal(404);
|
||||||
|
expect(res.body.code).to.equal(ErrorCode.CONTACT_MESSAGE_NOT_FOUND);
|
||||||
|
});
|
||||||
|
|
||||||
|
it("responds 409 when the message already links to an issue", async function () {
|
||||||
|
if (!adminSecretConfigured || !forgejoConfigured) {
|
||||||
|
// biome-ignore lint/suspicious/noExplicitAny: mocha's `this.skip()` isn't typed here.
|
||||||
|
(this as any).skip();
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
stubForgejoFetch({ number: 2, html_url: "x" });
|
||||||
|
const user = await seedUser();
|
||||||
|
const message = await seedMessage({ authorId: user.id });
|
||||||
|
await prisma.contactMessage.update({
|
||||||
|
where: { id: message.id },
|
||||||
|
data: { forgejoIssueNumber: 5, forgejoIssueUrl: "https://forge.example/ci/repo/issues/5" },
|
||||||
|
});
|
||||||
|
const agent = await adminAgent();
|
||||||
|
|
||||||
|
const res = await agent
|
||||||
|
.post(`/admin/api/contact/${message.id}/forgejo-issue`)
|
||||||
|
.send({ title: "Titre", body: "Corps" });
|
||||||
|
|
||||||
|
expect(res.status).to.equal(409);
|
||||||
|
expect(res.body.code).to.equal(ErrorCode.CONTACT_MESSAGE_ALREADY_LINKED);
|
||||||
|
});
|
||||||
|
|
||||||
|
it("leaves the message untouched when the Forgejo call fails (502)", async function () {
|
||||||
|
if (!adminSecretConfigured || !forgejoConfigured) {
|
||||||
|
// biome-ignore lint/suspicious/noExplicitAny: mocha's `this.skip()` isn't typed here.
|
||||||
|
(this as any).skip();
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
stubForgejoFetch("upstream boom", 500);
|
||||||
|
const user = await seedUser();
|
||||||
|
const message = await seedMessage({ authorId: user.id });
|
||||||
|
const agent = await adminAgent();
|
||||||
|
|
||||||
|
const res = await agent
|
||||||
|
.post(`/admin/api/contact/${message.id}/forgejo-issue`)
|
||||||
|
.send({ title: "Titre", body: "Corps" });
|
||||||
|
|
||||||
|
expect(res.status).to.equal(502);
|
||||||
|
expect(res.body.code).to.equal(ErrorCode.FORGEJO_REQUEST_FAILED);
|
||||||
|
|
||||||
|
const row = await prisma.contactMessage.findFirstOrThrow({ where: { id: message.id } });
|
||||||
|
expect(row.forgejoIssueNumber).to.equal(null);
|
||||||
|
expect(row.forgejoIssueUrl).to.equal(null);
|
||||||
|
});
|
||||||
|
|
||||||
|
it("rejects an empty title with 400", async function () {
|
||||||
|
if (!adminSecretConfigured || !forgejoConfigured) {
|
||||||
|
// biome-ignore lint/suspicious/noExplicitAny: mocha's `this.skip()` isn't typed here.
|
||||||
|
(this as any).skip();
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
const user = await seedUser();
|
||||||
|
const message = await seedMessage({ authorId: user.id });
|
||||||
|
const agent = await adminAgent();
|
||||||
|
|
||||||
|
const res = await agent
|
||||||
|
.post(`/admin/api/contact/${message.id}/forgejo-issue`)
|
||||||
|
.send({ title: " ", body: "Corps" });
|
||||||
|
|
||||||
|
expect(res.status).to.equal(400);
|
||||||
|
expect(res.body.code).to.equal(ErrorCode.VALIDATION_ERROR);
|
||||||
|
});
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
@ -78,7 +78,7 @@ describe("Admin metrics", () => {
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|
||||||
describe("GET /admin/metrics", () => {
|
describe("GET /admin/api/metrics", () => {
|
||||||
const app = createApp();
|
const app = createApp();
|
||||||
|
|
||||||
beforeEach(async () => {
|
beforeEach(async () => {
|
||||||
|
|
@ -90,7 +90,7 @@ describe("Admin metrics", () => {
|
||||||
});
|
});
|
||||||
|
|
||||||
it("rejects a request with no admin session with 401", async () => {
|
it("rejects a request with no admin session with 401", async () => {
|
||||||
const res = await request(app).get("/admin/metrics");
|
const res = await request(app).get("/admin/api/metrics");
|
||||||
expect(res.status).to.equal(401);
|
expect(res.status).to.equal(401);
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|
@ -109,9 +109,9 @@ describe("Admin metrics", () => {
|
||||||
await userB.post("/auth/signup").send(buildSignupPayload());
|
await userB.post("/auth/signup").send(buildSignupPayload());
|
||||||
|
|
||||||
const adminAgent = request.agent(app);
|
const adminAgent = request.agent(app);
|
||||||
await adminAgent.post("/admin/auth/login").send({ email, password });
|
await adminAgent.post("/admin/api/auth/login").send({ email, password });
|
||||||
|
|
||||||
const res = await adminAgent.get("/admin/metrics").query({ days: 14 });
|
const res = await adminAgent.get("/admin/api/metrics").query({ days: 14 });
|
||||||
expect(res.status).to.equal(200);
|
expect(res.status).to.equal(200);
|
||||||
expect(res.body.rangeDays).to.equal(14);
|
expect(res.body.rangeDays).to.equal(14);
|
||||||
expect(res.body.snapshot.users).to.equal(2);
|
expect(res.body.snapshot.users).to.equal(2);
|
||||||
|
|
|
||||||
174
apps/api/test/admin-monitoring-socket.test.ts
Normal file
174
apps/api/test/admin-monitoring-socket.test.ts
Normal file
|
|
@ -0,0 +1,174 @@
|
||||||
|
import type { AddressInfo } from "node:net";
|
||||||
|
import type { MonitoringView } from "@batch-cooking/shared";
|
||||||
|
import { faker } from "@faker-js/faker";
|
||||||
|
import { expect } from "chai";
|
||||||
|
import { Server as SocketIoServer } from "socket.io";
|
||||||
|
import { type Socket as ClientSocket, io as ioClient } from "socket.io-client";
|
||||||
|
import { createServer } from "../src/app.js";
|
||||||
|
import { env } from "../src/config/env.js";
|
||||||
|
import { prisma } from "../src/db/prisma.js";
|
||||||
|
import { signAdminToken } from "../src/lib/admin-jwt.js";
|
||||||
|
import { MonitoringBroadcastService } from "../src/lib/monitoring-broadcast.service.js";
|
||||||
|
import { hashAdminPassword } from "../src/modules/admin/admin-auth.service.js";
|
||||||
|
import { resetDatabase } from "../test-support/reset-db.js";
|
||||||
|
|
||||||
|
const VALID_STATUSES = ["up", "degraded", "down", "unknown"];
|
||||||
|
const adminSecretConfigured = env.ADMIN_JWT_SECRET !== undefined;
|
||||||
|
|
||||||
|
async function seedAdmin(): Promise<{ adminUserId: number; tokenVersion: number }> {
|
||||||
|
const admin = await prisma.adminUser.create({
|
||||||
|
data: {
|
||||||
|
email: faker.internet.email().toLowerCase(),
|
||||||
|
name: faker.person.fullName(),
|
||||||
|
passwordHash: await hashAdminPassword(faker.internet.password({ length: 16 })),
|
||||||
|
},
|
||||||
|
});
|
||||||
|
return { adminUserId: admin.id, tokenVersion: admin.tokenVersion };
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Waits for `event` on `socket`, rejecting after `timeoutMs` (default
|
||||||
|
* tuned for the auth-rejection tests, which never touch a real probe and
|
||||||
|
* so resolve almost immediately — the probe-touching tests below pass a
|
||||||
|
* larger value explicitly) — every real WebSocket round-trip in this file
|
||||||
|
* goes through this instead of a bare `socket.once`, so a broken push
|
||||||
|
* fails the test with a clear message instead of hanging until Mocha's
|
||||||
|
* own default test timeout.
|
||||||
|
*/
|
||||||
|
function waitForEvent<T>(socket: ClientSocket, event: string, timeoutMs = 1500): Promise<T> {
|
||||||
|
return new Promise((resolve, reject) => {
|
||||||
|
const timer = setTimeout(
|
||||||
|
() => reject(new Error(`Timed out waiting for "${event}"`)),
|
||||||
|
timeoutMs,
|
||||||
|
);
|
||||||
|
socket.once(event, (payload: T) => {
|
||||||
|
clearTimeout(timer);
|
||||||
|
resolve(payload);
|
||||||
|
});
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
describe("Admin monitoring — WebSocket push", () => {
|
||||||
|
let baseUrl: string;
|
||||||
|
let broadcast: MonitoringBroadcastService;
|
||||||
|
// Hoisted to suite scope (not a local in `before`) so `after` can shut
|
||||||
|
// it down. `broadcast.stop()` alone only clears the probe interval — the
|
||||||
|
// socket.io server keeps engine.io's ping timers and the listening
|
||||||
|
// http.Server (port 0) alive, and Mocha runs without `--exit`
|
||||||
|
// (`.mocharc.json`), so that one leaked handle stops the whole process
|
||||||
|
// from ever draining once the last test passes. That is exactly what
|
||||||
|
// stalled CI: the `test` job printed "N passing" and then hung for
|
||||||
|
// hours until the runner was killed.
|
||||||
|
let io: SocketIoServer;
|
||||||
|
const clientSockets: ClientSocket[] = [];
|
||||||
|
|
||||||
|
// A real listening server, not just createApp()'s bare Express instance
|
||||||
|
// (supertest's usual approach elsewhere in this suite) — socket.io needs
|
||||||
|
// an actual http.Server to attach to, and a real client (socket.io-
|
||||||
|
// client) needs a real port to connect to. Port 0 lets the OS pick a
|
||||||
|
// free one, so this suite never collides with anything else listening.
|
||||||
|
before(async () => {
|
||||||
|
const httpServer = createServer().httpServer;
|
||||||
|
io = new SocketIoServer(httpServer, { cors: { origin: "*" } });
|
||||||
|
broadcast = new MonitoringBroadcastService(io);
|
||||||
|
await new Promise<void>((resolve) => httpServer.listen(0, resolve));
|
||||||
|
const { port } = httpServer.address() as AddressInfo;
|
||||||
|
baseUrl = `http://localhost:${port}`;
|
||||||
|
broadcast.start();
|
||||||
|
});
|
||||||
|
|
||||||
|
after(async () => {
|
||||||
|
broadcast.stop();
|
||||||
|
// Disconnects any socket still open, stops engine.io's timers, and
|
||||||
|
// closes the http.Server socket.io was attached to — without this the
|
||||||
|
// suite never lets Node's event loop drain (see the `io` field's note).
|
||||||
|
await new Promise<void>((resolve, reject) => {
|
||||||
|
io.close((err) => (err ? reject(err) : resolve()));
|
||||||
|
});
|
||||||
|
await prisma.$disconnect();
|
||||||
|
});
|
||||||
|
|
||||||
|
beforeEach(async () => {
|
||||||
|
await resetDatabase();
|
||||||
|
});
|
||||||
|
|
||||||
|
afterEach(() => {
|
||||||
|
for (const socket of clientSockets.splice(0)) {
|
||||||
|
socket.disconnect();
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
/** Connects a client with the given cookie header (or none), tracked for automatic teardown in `afterEach`. */
|
||||||
|
function connect(cookie?: string): ClientSocket {
|
||||||
|
const socket = ioClient(baseUrl, {
|
||||||
|
extraHeaders: cookie ? { Cookie: cookie } : undefined,
|
||||||
|
// This suite creates several short-lived connections in a row —
|
||||||
|
// socket.io-client's default reconnection would otherwise keep
|
||||||
|
// retrying a deliberately-rejected connection in the background
|
||||||
|
// after its own test has already moved on.
|
||||||
|
reconnection: false,
|
||||||
|
forceNew: true,
|
||||||
|
});
|
||||||
|
clientSockets.push(socket);
|
||||||
|
return socket;
|
||||||
|
}
|
||||||
|
|
||||||
|
it("rejects a connection with no admin cookie at all", async () => {
|
||||||
|
const socket = connect();
|
||||||
|
const err = await waitForEvent<Error>(socket, "connect_error");
|
||||||
|
expect(err.message).to.equal("Not authenticated");
|
||||||
|
});
|
||||||
|
|
||||||
|
it("rejects a connection carrying an end-user session cookie, not an admin one", async () => {
|
||||||
|
const socket = connect("session=whatever-not-an-admin-token");
|
||||||
|
const err = await waitForEvent<Error>(socket, "connect_error");
|
||||||
|
expect(err.message).to.equal("Not authenticated");
|
||||||
|
});
|
||||||
|
|
||||||
|
it("accepts a valid admin session and pushes a monitoring:update covering all four targets", async function () {
|
||||||
|
if (!adminSecretConfigured) {
|
||||||
|
// biome-ignore lint/suspicious/noExplicitAny: mocha's `this.skip()` isn't typed here.
|
||||||
|
(this as any).skip();
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
// Longer than Mocha's 2000ms default: the very first probe tick can
|
||||||
|
// take close to PROBE_TIMEOUT_MS (2s) if e.g. the intent-service isn't
|
||||||
|
// reachable from this test environment (a probe timing out is a valid,
|
||||||
|
// expected outcome here — this test doesn't assert *which* status
|
||||||
|
// comes back, only that the shape is right).
|
||||||
|
this.timeout(8000);
|
||||||
|
const { adminUserId, tokenVersion } = await seedAdmin();
|
||||||
|
const token = signAdminToken({ adminUserId, tokenVersion });
|
||||||
|
|
||||||
|
const socket = connect(`${env.ADMIN_COOKIE_NAME}=${token}`);
|
||||||
|
const snapshot = await waitForEvent<MonitoringView>(socket, "monitoring:update", 6000);
|
||||||
|
|
||||||
|
expect(typeof snapshot.generatedAt).to.equal("string");
|
||||||
|
const keys = snapshot.services.map((service) => service.key);
|
||||||
|
expect(keys).to.have.members(["postgres", "api", "intent-service", "tech-step-llm-worker"]);
|
||||||
|
for (const service of snapshot.services) {
|
||||||
|
expect(VALID_STATUSES).to.include(service.status);
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
it("broadcasts the same update to every connected admin, not one probe per socket", async function () {
|
||||||
|
if (!adminSecretConfigured) {
|
||||||
|
// biome-ignore lint/suspicious/noExplicitAny: see above.
|
||||||
|
(this as any).skip();
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
this.timeout(8000); // see the previous test's comment
|
||||||
|
const { adminUserId, tokenVersion } = await seedAdmin();
|
||||||
|
const token = signAdminToken({ adminUserId, tokenVersion });
|
||||||
|
const cookie = `${env.ADMIN_COOKIE_NAME}=${token}`;
|
||||||
|
|
||||||
|
const first = connect(cookie);
|
||||||
|
const second = connect(cookie);
|
||||||
|
const [firstSnapshot, secondSnapshot] = await Promise.all([
|
||||||
|
waitForEvent<MonitoringView>(first, "monitoring:update", 6000),
|
||||||
|
waitForEvent<MonitoringView>(second, "monitoring:update", 6000),
|
||||||
|
]);
|
||||||
|
|
||||||
|
expect(firstSnapshot.generatedAt).to.equal(secondSnapshot.generatedAt);
|
||||||
|
});
|
||||||
|
});
|
||||||
Some files were not shown because too many files have changed in this diff Show more
Loading…
Reference in a new issue