36 Commits

Author SHA1 Message Date
hsiegeln
91fbf27269 chore: bump package.json + package-lock auf 1.4.2
All checks were successful
Build & Publish Docker Image / build-and-push (push) Successful in 3m52s
Patch-Release: Einkaufsliste-Konsolidierung ueber Einheiten (500 g + 1 kg
Kartoffeln → 1,5 kg). Migration 015 fuer Check-Key-Family-Stabilitaet.
formatQuantity app-weit auf de-DE Komma-Dezimal.

Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
2026-04-22 17:16:04 +02:00
hsiegeln
b556eb39b3 chore(shopping): stale Kommentar in clearCheckedItems entfernt
All checks were successful
Build & Publish Docker Image / build-and-push (push) Successful in 2m13s
Der alte Satz beschrieb die ersetzte SQL-EXISTS-Variante; der neue
erklaert den aktuellen JS-basierten Family-Lookup.

Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
2026-04-22 17:11:02 +02:00
hsiegeln
c177c1dc5f feat(shopping): clearCheckedItems auf Family-Key umgestellt
All checks were successful
Build & Publish Docker Image / build-and-push (push) Successful in 2m15s
Fix A: checked-Status in clearCheckedItems per JS-Lookup mit unitFamily()
statt SQL-EXISTS gegen raw unit_key berechnen.
Fix B: Orphan-Cleanup activeSet nutzt jetzt unitFamily(raw-unit) als Key,
sodass Checks mit family-key ('weight', 'volume') korrekt gematcht werden.
Neue Integrationstests bestaetigen Round-Trip und Orphan-Bereinigung.

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
2026-04-22 17:08:28 +02:00
hsiegeln
b2337a5c2a refactor(shopping): listShoppingList - Pipe-safe name/family lookup
All checks were successful
Build & Publish Docker Image / build-and-push (push) Successful in 2m14s
Liest nameKey und familyKey direkt von members[0] statt den
Composite-Key am Pipe-Zeichen zu splitten. Verhindert falsche
Dekodierung bei Zutaten wie "Fleisch- | Wurstwaren".

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
2026-04-22 17:05:53 +02:00
hsiegeln
f2656bd9e3 feat(shopping): listShoppingList konsolidiert g/kg + ml/l
All checks were successful
Build & Publish Docker Image / build-and-push (push) Successful in 2m14s
TS-seitige Family-Gruppierung via unitFamily() + consolidate() ersetzt
die reine SQL-Aggregation. unit_key im ShoppingListRow traegt jetzt den
Family-Key ('weight', 'volume' oder raw-unit). toggleCheck-Aufrufe und
unit_key-Assertions in den Tests entsprechend angepasst.

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
2026-04-22 17:02:27 +02:00
hsiegeln
fd55a44bfb feat(shopping): Migration 015 — Check-Keys auf Unit-Family
All checks were successful
Build & Publish Docker Image / build-and-push (push) Successful in 2m13s
unit_key in shopping_cart_check wird von Roheinheit (g, kg, ml, l)
auf Family-Key (weight, volume) umgestellt, damit Abhaks stabil
bleiben wenn die Display-Einheit wechselt. Entstehende Duplikate
werden durch Behalten des juengsten rowid dedupliziert.

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
2026-04-22 16:58:37 +02:00
hsiegeln
14cf1b1d35 feat(format): formatQuantity app-weit auf de-DE Komma-Dezimal
All checks were successful
Build & Publish Docker Image / build-and-push (push) Successful in 2m19s
Ersetzt Math.round/toFixed-Logik durch q.toLocaleString('de-DE', …).
Dezimaltrennzeichen ist jetzt konsistent ein Komma (0,5 statt 0.5).
Tests aktualisiert; alle 316 Tests + svelte-check grün.

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
2026-04-22 16:55:29 +02:00
hsiegeln
b85f869c09 refactor(shopping): redundanten kg-Check in consolidate() entfernt + Boundary-Test
Some checks failed
Build & Publish Docker Image / build-and-push (push) Has been cancelled
Weight-Branch prueft nicht mehr doppelt auf unitFamily; stil-parity mit Volume-Branch.
Boundary-Test fuer exakt 1000 g ergaenzt (15/15 Tests gruen).

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
2026-04-22 16:53:29 +02:00
hsiegeln
c6a549699a feat(shopping): consolidate() fuer g/kg + ml/l Summierung
Implementiert consolidate() in unit-consolidation.ts: summiert Mengen
innerhalb einer Unit-Family (Gewicht g/kg, Volumen ml/l) mit automatischer
Promotion ab Schwellwert; nicht-family-units werden direkt summiert.
quantity=null wird als 0 behandelt; alle-null ergibt null-Ergebnis.
9 neue Tests, alle 14 Tests gruen.

Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
2026-04-22 16:50:24 +02:00
hsiegeln
29f0245ce0 feat(shopping): unitFamily-Utility fuer Konsolidierung
Neue Hilfsfunktion `unitFamily` normalisiert Einheiten auf eine
Familien-Kennung ('weight', 'volume' oder lowercase-trim). Wird
in nachfolgenden Konsolidierungs-Schritten der Einkaufsliste
verwendet. Abgedeckt durch 5 Vitest-Unit-Tests (TDD).

Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
2026-04-22 16:46:43 +02:00
hsiegeln
59b232c5fc docs(plan): Implementation-Plan fuer Einkaufsliste-Konsolidierung
7 Tasks (TDD, atomic commits):
1. unitFamily + Unit-Tests
2. consolidate + Tests fuer alle Edge-Cases
3. formatQuantity auf toLocaleString('de-DE', ...)
4. Migration 015 — Check-Keys auf Family
5. listShoppingList konsolidiert via TS-side grouping
6. clearCheckedItems + toggleCheck auf Family-Key
7. E2E-Smoke im Dev-Deployment

Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
2026-04-22 16:44:18 +02:00
hsiegeln
b9b06e161c docs(spec): Einkaufsliste Mengen-Konsolidierung ueber Einheiten
Design fuer g/kg + ml/l Konsolidierung in listShoppingList():
500 g + 1 kg Kartoffeln aus verschiedenen Rezepten → 1,5 kg.

- unit-consolidation.ts mit unitFamily + consolidate
- GROUP BY wechselt auf family-key (weight/volume/raw)
- formatQuantity auf toLocaleString('de-DE', ...) app-weit
- Migration 015: shopping_cart_check.unit_key → family-key,
  bestehende Abhaks migriert, Duplikate dedupliziert
- Test-Coverage fuer alle Edge-Cases

Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
2026-04-22 16:39:47 +02:00
hsiegeln
2f0a45f487 chore: bump package.json + package-lock auf 1.4.1
All checks were successful
Build & Publish Docker Image / build-and-push (push) Successful in 3m59s
Patch-Release: fix fuer $effect-Loop auf der Startseite (sort=viewed)
und Wunschliste-Card-Layout auf Mobile.

Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
2026-04-22 16:24:58 +02:00
hsiegeln
a68b99c807 fix(wishlist): 2-Spalten-Grid auf Mobile statt stacked Footer
All checks were successful
Build & Publish Docker Image / build-and-push (push) Successful in 2m17s
Der stacked Card-Footer liess unter dem Bild (96x96) eine tote
Weissflaeche entstehen — Buttons rechts unten, links leer, unaufgeraeumt.

Neues Layout auf <=600px: Card ist 2-Spalten-Grid (96px | 1fr), Bild
spannt vertikal ueber alle Rows, rechts stapeln sich Titel -> Meta ->
Actions direkt untereinander. `display: contents` auf .body/.text zieht
die DOM-Kinder ohne Markup-Umbau in die Grid-Cells.

Ergebnis: Card-Hoehe orientiert sich am Content, keine toten Zonen,
Bild fuellt seinen Streifen vertikal, Buttons sitzen eng unter der Meta
(0.5rem padding) — tap-friendly ohne Kleben.

Getestet: svelte-check 0 errors.

Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
2026-04-22 16:05:28 +02:00
hsiegeln
2573f80940 style(wishlist): Actions als Card-Footer ohne Trenner
All checks were successful
Build & Publish Docker Image / build-and-push (push) Successful in 2m15s
Auf Mobile wirkten die Buttons in der abgesetzten grauen Row mit
border-top etwas verloren. Nun sitzen sie im gleichen weissen
Card-Background ohne Border/Background-Wechsel — das Footer-Padding
reicht als visuelle Trennung, die Buttons gehoeren erkennbar zur Card.

Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
2026-04-22 15:50:12 +02:00
hsiegeln
0a97ea2fea fix(wishlist): Card stacked auf Mobile, Titel-Overflow behoben
All checks were successful
Build & Publish Docker Image / build-and-push (push) Successful in 2m15s
Auf schmalen Viewports (~390px) ueberlagerten die drei Action-Buttons
den Titel: .text reservierte 170px padding-right, aber nach 96px Bild
+ Gaps blieb kaum Platz fuer den Titel — lange Woerter wie
"Spaetzle-Pfanne" liefen hinter die Buttons.

Fix: @media (max-width: 600px) — Card wird flex-direction:column,
Actions-Row rutscht aus position:absolute in eine statische Reihe mit
border-top unter dem Body, full-width. Zusaetzlich overflow-wrap +
word-break als Safety-Net gegen bindestrich-gefuellte Monstertitel.

Desktop-Layout unveraendert.

Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
2026-04-22 15:39:12 +02:00
hsiegeln
12f499cb98 fix(home): $effect-Loop bei sort=viewed via untrack
Der Profile-Switch-Refetch-Effect las allLoading in der sync tracking-
Phase. Der await fetch beendete die Sync-Phase, das finale
allLoading = false im finally lief ausserhalb → wurde als externer
Write interpretiert → Effect rerun → naechster Fetch → Endlosschleife.

2136 GETs auf /api/recipes/all?sort=viewed in 8s beobachtet.

Fix: nur profileStore.active bleibt tracked (der tatsaechliche
Trigger). allSort/allLoading werden in untrack() gelesen — die Writes
auf allLoading im finally triggern damit keinen Effect-Rerun mehr.

Verifiziert lokal: 1 Request statt 2000+ bei mount mit allSort=viewed.

Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
2026-04-22 15:39:02 +02:00
hsiegeln
829850aa88 chore: bump package.json + package-lock auf 1.4.0
All checks were successful
Build & Publish Docker Image / build-and-push (push) Successful in 3m21s
Tag v1.4.0 ist schon gesetzt (auf 2b0bd4d), der synchrone Version-Bump
in package.json und package-lock.json wurde dabei vergessen. Mit dem
Pattern aus vorigen Releases (v1.2.0/v1.3.0) wieder konsistent.

Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
2026-04-22 14:58:45 +02:00
hsiegeln
2b0bd4dc44 fix(recipe): View-Beacon ueber \$effect statt onMount
All checks were successful
Build & Publish Docker Image / build-and-push (push) Successful in 33s
Live-Test auf kochwas-dev: bei Hard-Reload/Cold-Start (nicht SPA-Click)
landete kein view-Eintrag in der DB. Ursache: Recipe-Page-onMount
feuert vor Layout-onMount, profileStore.load() laeuft aber im Layout-
onMount und macht erst danach einen async fetch — zum Zeitpunkt des
Beacons war profileStore.active noch null.

Loesung: Beacon im \$effect, das auf profileStore.active reagiert.
viewBeaconSent-Flag verhindert duplicate POSTs wenn der User waehrend
der Page-Lifetime das Profil wechselt — der ursprueglich getrackte
Profil-View bleibt der "richtige" fuer dieses Page-Open.

Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
2026-04-22 14:50:54 +02:00
hsiegeln
e7318164cb fix(home): focus-visible auf section-head + scoped chev-CSS
All checks were successful
Build & Publish Docker Image / build-and-push (push) Successful in 2m14s
Code-Review zu commit 2216c89: button hatte keinen :focus-visible
Outline (Safari zeigt sonst gar nichts an) — Pattern aus dem Rest
der Page uebernommen (#2b6a3d Outline). Globale .chev-Selektoren
unter .section-head gescoped, damit andere Komponenten den Klassen-
Namen kuenftig wiederverwenden koennen ohne Konflikte.

Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
2026-04-22 14:42:44 +02:00
hsiegeln
2216c89a04 feat(home): Collapsible Sections fuer Favoriten + Zuletzt hinzugefuegt
Header als <button> mit Chevron + Count-Pill, slide-Transition (180ms).
State in localStorage unter kochwas.collapsed.sections — JSON-Map
{favorites, recent}, default beide offen, corrupt-JSON faellt auf
Default zurueck.

Alle Rezepte bleibt absichtlich nicht-collapsibel — Hauptliste, immer
sichtbar.

Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
2026-04-22 14:38:43 +02:00
hsiegeln
01d29bff0e feat(home): Sort-Chip 'Zuletzt angesehen' + Profile-Switch-Refetch
Neuer Wert 'viewed' im AllSort-Enum + ALL_SORTS-Array. localStorage-
Whitelist ergaenzt. Reactive $effect lauscht auf profileStore.active
und refetcht offset=0 nur wenn aktueller Sort 'viewed' ist — andere
Sortierungen sind profilunabhaengig.

Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
2026-04-22 14:35:28 +02:00
hsiegeln
a5321d620a feat(home): profile_id in alle /api/recipes/all-Fetches
buildAllUrl-Helper haengt profile_id an wenn ein Profil aktiv ist;
nutzt es loadAllMore, setAllSort und rehydrateAll. Voraussetzung fuer
sort=viewed (Server braucht profile_id fuer den View-Join).

Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
2026-04-22 14:33:42 +02:00
hsiegeln
b31223add5 feat(api): /api/recipes/all akzeptiert sort=viewed + profile_id
VALID_SORTS um 'viewed' erweitert. parseProfileId-Helper analog zu
/api/wishlist. Wert wird an listAllRecipesPaginated als 5. Param
durchgereicht.

Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
2026-04-22 14:31:17 +02:00
hsiegeln
f495c024c6 feat(recipe): View-Beacon beim oeffnen der Detailseite
Fire-and-forget POST /api/recipes/[id]/view in onMount, nur wenn
profileStore.active gesetzt. Schreibt last_viewed_at fuers Profil —
Voraussetzung fuer den Sort 'Zuletzt angesehen' auf der Hauptseite.

Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
2026-04-22 14:28:32 +02:00
hsiegeln
1214b9e01d refactor(api): parsePositiveIntParam fuer view-endpoint
Code-Review-Finding zu commit 82d4348: das Sibling-Endpoint
recipes/[id]/+server.ts nutzt schon parsePositiveIntParam aus
api-helpers.ts. Der neue View-Endpoint hatte die Logik inline
nachgebaut — jetzt aufgeraeumt fuer Konsistenz.

Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
2026-04-22 14:27:10 +02:00
hsiegeln
82d4348873 feat(api): POST /api/recipes/[id]/view fuer View-Beacon
Body { profile_id } via zod validiert. FK-Violation (unbekanntes
Profil oder Rezept) wird zu 404 normalisiert. Erfolg liefert 204
ohne Body — fire-and-forget vom Client.

Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
2026-04-22 14:23:36 +02:00
hsiegeln
6f54b004ca test(views): NULL-Tiebreaker explizit verifizieren
Code-Review-Finding zu commit 226ca5e: vorheriges Test seedete nur ein
NULL-Recipe, der alphabetische Tiebreaker fuer ungesehene Eintraege
wurde nicht exerciert. Zweites ungesehenes Rezept mit anderer
Einsatzreihenfolge ergaenzt — beweist dass Donauwelle vor
Zwiebelkuchen kommt.

Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
2026-04-22 14:20:51 +02:00
hsiegeln
226ca5e5ed feat(search): sort=viewed in listAllRecipesPaginated
Neuer Sort 'viewed' macht LEFT JOIN gegen recipe_view, ordert nach
last_viewed_at DESC mit alphabetischem Tiebreaker. NULL-Recipes (nie
angesehen) landen alphabetisch sortiert hinter den angesehenen
(CASE-NULL-last statt SQLite 3.30+ NULLS LAST).

Ohne profileId faellt der Sort auf alphabetisch zurueck — Sort-Chip
bleibt klickbar, ergibt aber sinnvolles Default-Verhalten ohne
aktiviertes Profil.

Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
2026-04-22 14:17:17 +02:00
hsiegeln
5357c9787b refactor(views): ON CONFLICT DO UPDATE statt INSERT OR REPLACE
Code-Review-Finding zu commit 6c8de6f: INSERT OR REPLACE ist intern
DELETE+INSERT, das wuerde eventuelle FK-Children kuenftig stillschweigend
mitloeschen. ON CONFLICT DO UPDATE bumpt nur das Timestamp-Feld und
matcht den Stil der anderen Repos (shopping/repository.ts:43).

Migration-Dateiname zu recipe_view (singular) angeglichen, matcht
jetzt den Tabellennamen aus 543008b.

Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
2026-04-22 14:14:44 +02:00
hsiegeln
6c8de6fa3a feat(db): recordView/listViews fuer recipe_view
INSERT OR REPLACE fuer idempotenten Bump des last_viewed_at Timestamps.
listViews-Helper nur fuer Tests; Sort-Query laeuft direkt in
listAllRecipesPaginated via LEFT JOIN.

Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
2026-04-22 14:10:52 +02:00
hsiegeln
866a222265 docs: plan/spec auf recipe_view (singular) angeglichen
Tabellen-Konvention im Repo ist singular — siehe Code-Review-Findings
zu Task 1 (commit 543008b). Plan und Spec angeglichen damit weitere
Tasks nicht mit dem alten Plural arbeiten.

Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
2026-04-22 14:08:54 +02:00
hsiegeln
543008b0f2 refactor(db): recipe_views -> recipe_view, TIMESTAMP-Konsistenz
Code-Review-Findings nachgezogen: Tabellen-Konvention im Repo ist
singular (profile, recipe, favorite, cooking_log, thumbnail_cache),
deshalb recipe_view statt recipe_views; Index analog umbenannt.
last_viewed_at auf TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP
gewechselt — matcht den Rest des Schemas. Header-Kommentar +
notnull-Assertion fuer recipe_id ergaenzt.

Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
2026-04-22 14:08:17 +02:00
hsiegeln
2cd9b47450 feat(db): recipe_views table mit Profil-FK und Recent-Index
Tracking-Tabelle fuer Sort-Option Zuletzt angesehen. Composite-PK
(profile_id, recipe_id) erlaubt INSERT OR REPLACE per Default-Timestamp.
Index nach profile_id + last_viewed_at DESC fuer Sort-Query.

Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
2026-04-22 14:04:27 +02:00
hsiegeln
98894bb895 docs(plan): Implementation-Plan fuer Views-Sort + Collapsibles
10 Tasks (Migration -> Repo -> Sort-Branch -> API -> Beacon -> URL-
Helper -> Sort-Chip + Reactive Refetch -> Collapsibles -> Push&Verify)
mit TDD-Schritten, exakten Filepfaden und vollstaendigem Code in
jedem Step.

Spec-Migrationsnummer auf 014 korrigiert (war 010 — letzte aktuelle
Migration ist 013_shopping_list).

Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
2026-04-22 14:00:22 +02:00
hsiegeln
363ea6fbe7 docs(spec): Hauptseite Zuletzt-angesehen-Sort + Collapsibles
Spec fuer zwei Hauptseite-Features aus Brainstorming am 2026-04-22:

1) Neue Sort-Option "Zuletzt angesehen" fuer "Alle Rezepte". Tracking
   per Profil in neuer SQLite-Tabelle recipe_views, beim Laden der
   Detail-Seite per Beacon (POST /api/recipes/[id]/view) gesetzt.
   Server-Sort macht LEFT JOIN mit ORDER BY last_viewed_at DESC NULLS
   LAST, alphabetischer Tiebreaker.

2) "Deine Favoriten" und "Zuletzt hinzugefuegt" auf-/zuklappbar.
   Default offen, User-Wahl persistiert in localStorage pro Device.
   Header als button mit Chevron + Count-Pill, slide-Transition.
   "Alle Rezepte" bleibt nicht-collapsibel (Hauptliste).

Spec deckt Schema, API-Endpoint, DB-Layer, Markup-Pattern,
Reactive-Refetch bei Profile-Switch, Snapshot-Kompatibilitaet (rehydrate
muss profile_id mitbekommen), Test-Strategie und Reihenfolge.

Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
2026-04-22 13:54:52 +02:00
22 changed files with 3703 additions and 106 deletions

View File

@@ -0,0 +1,887 @@
# Einkaufsliste Mengen-Konsolidierung Implementation Plan
> **For agentic workers:** REQUIRED SUB-SKILL: Use superpowers:subagent-driven-development (recommended) or superpowers:executing-plans to implement this plan task-by-task. Steps use checkbox (`- [ ]`) syntax for tracking.
**Goal:** Verschiedene Unit-Varianten derselben Zutat (500 g + 1 kg Kartoffeln) in der Einkaufsliste zu einer Zeile konsolidieren (→ 1,5 kg). Scope: g↔kg, ml↔l.
**Architecture:** Zwei reine TS-Utilities (`unitFamily`, `consolidate`) kapseln die Logik. `listShoppingList()` lässt SQL weiterhin pro (name, unit) aggregieren, bündelt die Zeilen dann in TS pro `(name, unitFamily)` und konsolidiert. Migration 015 macht `shopping_cart_check.unit_key` zum Family-Key, damit Abhaks nicht verloren gehen wenn Display-Unit zwischen g und kg wechselt. `formatQuantity` wechselt app-weit auf `toLocaleString('de-DE')` (Komma als Dezimaltrennzeichen).
**Tech Stack:** SvelteKit, better-sqlite3, Vitest. Keine neuen Deps.
---
## File Structure
**Create:**
- `src/lib/server/shopping/unit-consolidation.ts``unitFamily()` + `consolidate()`
- `src/lib/server/db/migrations/015_shopping_check_family.sql` — Family-Key-Migration
- `tests/unit/unit-consolidation.test.ts` — Unit-Tests
**Modify:**
- `src/lib/quantity-format.ts``toLocaleString('de-DE', …)` statt Punkt
- `tests/unit/quantity-format.test.ts` — Erwartungen auf Komma anpassen
- `src/lib/server/shopping/repository.ts``listShoppingList`, `toggleCheck`, `clearCheckedItems` auf Family-Key umstellen
- `tests/integration/shopping-repository.test.ts` — neue Describe-Blöcke für Konsolidierung
---
### Task 1: Unit-Family-Utility
**Files:**
- Create: `src/lib/server/unit-consolidation.ts`
- Test: `tests/unit/unit-consolidation.test.ts`
Hinweis: Datei bewusst in `src/lib/server/` (nicht in `shopping/`), weil `unitFamily` auch vom Migration-Code referenziert wird — eine Ebene höher ist intuitiver.
- [ ] **Step 1: Write failing tests for `unitFamily`**
Create `tests/unit/unit-consolidation.test.ts`:
```typescript
import { describe, it, expect } from 'vitest';
import { unitFamily } from '../../src/lib/server/unit-consolidation';
describe('unitFamily', () => {
it('maps g and kg to weight', () => {
expect(unitFamily('g')).toBe('weight');
expect(unitFamily('kg')).toBe('weight');
});
it('maps ml and l to volume', () => {
expect(unitFamily('ml')).toBe('volume');
expect(unitFamily('l')).toBe('volume');
});
it('lowercases and trims unknown units', () => {
expect(unitFamily(' Bund ')).toBe('bund');
expect(unitFamily('TL')).toBe('tl');
expect(unitFamily('Stück')).toBe('stück');
});
it('is case-insensitive for weight/volume', () => {
expect(unitFamily('Kg')).toBe('weight');
expect(unitFamily('ML')).toBe('volume');
});
it('returns empty string for null/undefined/empty', () => {
expect(unitFamily(null)).toBe('');
expect(unitFamily(undefined)).toBe('');
expect(unitFamily('')).toBe('');
expect(unitFamily(' ')).toBe('');
});
});
```
- [ ] **Step 2: Run tests to verify they fail**
Run: `npm test -- tests/unit/unit-consolidation.test.ts`
Expected: All fail with "Cannot find module …/unit-consolidation".
- [ ] **Step 3: Implement `unitFamily`**
Create `src/lib/server/unit-consolidation.ts`:
```typescript
export type UnitFamily = 'weight' | 'volume' | string;
const WEIGHT_UNITS = new Set(['g', 'kg']);
const VOLUME_UNITS = new Set(['ml', 'l']);
export function unitFamily(unit: string | null | undefined): UnitFamily {
const u = (unit ?? '').trim().toLowerCase();
if (WEIGHT_UNITS.has(u)) return 'weight';
if (VOLUME_UNITS.has(u)) return 'volume';
return u;
}
```
- [ ] **Step 4: Run tests to verify they pass**
Run: `npm test -- tests/unit/unit-consolidation.test.ts`
Expected: 5 tests pass.
- [ ] **Step 5: Commit**
```bash
git add src/lib/server/unit-consolidation.ts tests/unit/unit-consolidation.test.ts
git commit -m "feat(shopping): unitFamily-Utility fuer Konsolidierung"
```
---
### Task 2: Consolidate-Funktion
**Files:**
- Modify: `src/lib/server/unit-consolidation.ts`
- Modify: `tests/unit/unit-consolidation.test.ts`
- [ ] **Step 1: Append failing tests for `consolidate` to the existing test file**
Append to `tests/unit/unit-consolidation.test.ts` (after the `unitFamily` describe):
```typescript
import { consolidate } from '../../src/lib/server/unit-consolidation';
describe('consolidate', () => {
it('kombiniert 500 g + 1 kg zu 1,5 kg', () => {
const out = consolidate([
{ quantity: 500, unit: 'g' },
{ quantity: 1, unit: 'kg' }
]);
expect(out).toEqual({ quantity: 1.5, unit: 'kg' });
});
it('bleibt bei g wenn Summe < 1 kg', () => {
const out = consolidate([
{ quantity: 200, unit: 'g' },
{ quantity: 300, unit: 'g' }
]);
expect(out).toEqual({ quantity: 500, unit: 'g' });
});
it('kombiniert ml + l analog (400 ml + 0,5 l → 900 ml)', () => {
const out = consolidate([
{ quantity: 400, unit: 'ml' },
{ quantity: 0.5, unit: 'l' }
]);
expect(out).toEqual({ quantity: 900, unit: 'ml' });
});
it('promoted zu l ab 1000 ml (0,5 l + 0,8 l → 1,3 l)', () => {
const out = consolidate([
{ quantity: 0.5, unit: 'l' },
{ quantity: 0.8, unit: 'l' }
]);
expect(out).toEqual({ quantity: 1.3, unit: 'l' });
});
it('summiert gleiche nicht-family-units (2 Bund + 1 Bund → 3 Bund)', () => {
const out = consolidate([
{ quantity: 2, unit: 'Bund' },
{ quantity: 1, unit: 'Bund' }
]);
expect(out).toEqual({ quantity: 3, unit: 'Bund' });
});
it('behandelt quantity=null als 0', () => {
const out = consolidate([
{ quantity: null, unit: 'TL' },
{ quantity: 1, unit: 'TL' }
]);
expect(out).toEqual({ quantity: 1, unit: 'TL' });
});
it('gibt null zurueck wenn alle quantities null sind', () => {
const out = consolidate([
{ quantity: null, unit: 'Prise' },
{ quantity: null, unit: 'Prise' }
]);
expect(out).toEqual({ quantity: null, unit: 'Prise' });
});
it('rundet Float-Artefakte auf 2 Dezimalen (0,1 + 0,2 kg → 0,3 kg)', () => {
const out = consolidate([
{ quantity: 0.1, unit: 'kg' },
{ quantity: 0.2, unit: 'kg' }
]);
// 0.1 + 0.2 in kg = 0.3 kg, in g = 300 → promoted? 300 < 1000 → 300 g
expect(out).toEqual({ quantity: 300, unit: 'g' });
});
it('nimmt unit vom ersten Eintrag bei unbekannter family', () => {
const out = consolidate([{ quantity: 5, unit: 'Stück' }]);
expect(out).toEqual({ quantity: 5, unit: 'Stück' });
});
});
```
- [ ] **Step 2: Run tests to verify they fail**
Run: `npm test -- tests/unit/unit-consolidation.test.ts`
Expected: Fail with "consolidate is not a function" or similar (9 new tests fail).
- [ ] **Step 3: Implement `consolidate`**
Append to `src/lib/server/unit-consolidation.ts`:
```typescript
export interface QuantityInUnit {
quantity: number | null;
unit: string | null;
}
function round2(n: number): number {
return Math.round(n * 100) / 100;
}
/**
* Konsolidiert mehrere {quantity, unit}-Eintraege derselben Unit-Family
* zu einer gemeinsamen Menge + Display-Unit.
*
* - Gewicht (g, kg): summiert in g, promoted bei >=1000 g auf kg.
* - Volumen (ml, l): summiert in ml, promoted bei >=1000 ml auf l.
* - Andere: summiert quantity ohne Umrechnung, Display-Unit vom ersten
* Eintrag.
*
* quantity=null wird als 0 behandelt. Wenn ALLE quantities null sind,
* ist die Gesamtmenge ebenfalls null.
*/
export function consolidate(rows: QuantityInUnit[]): QuantityInUnit {
if (rows.length === 0) return { quantity: null, unit: null };
const family = unitFamily(rows[0].unit);
const firstUnit = rows[0].unit;
const allNull = rows.every((r) => r.quantity === null);
if (family === 'weight') {
if (allNull) return { quantity: null, unit: firstUnit };
const grams = rows.reduce((sum, r) => {
const q = r.quantity ?? 0;
return sum + (unitFamily(r.unit) === 'weight' && r.unit?.toLowerCase().trim() === 'kg' ? q * 1000 : q);
}, 0);
if (grams >= 1000) return { quantity: round2(grams / 1000), unit: 'kg' };
return { quantity: round2(grams), unit: 'g' };
}
if (family === 'volume') {
if (allNull) return { quantity: null, unit: firstUnit };
const ml = rows.reduce((sum, r) => {
const q = r.quantity ?? 0;
return sum + (r.unit?.toLowerCase().trim() === 'l' ? q * 1000 : q);
}, 0);
if (ml >= 1000) return { quantity: round2(ml / 1000), unit: 'l' };
return { quantity: round2(ml), unit: 'ml' };
}
// Non-family: summiere quantity direkt
if (allNull) return { quantity: null, unit: firstUnit };
const sum = rows.reduce((acc, r) => acc + (r.quantity ?? 0), 0);
return { quantity: round2(sum), unit: firstUnit };
}
```
- [ ] **Step 4: Run tests to verify they pass**
Run: `npm test -- tests/unit/unit-consolidation.test.ts`
Expected: 14 tests pass (5 from Task 1 + 9 new).
- [ ] **Step 5: Commit**
```bash
git add src/lib/server/unit-consolidation.ts tests/unit/unit-consolidation.test.ts
git commit -m "feat(shopping): consolidate() fuer g/kg + ml/l Summierung"
```
---
### Task 3: formatQuantity auf deutsches Locale
**Files:**
- Modify: `src/lib/quantity-format.ts`
- Modify: `tests/unit/quantity-format.test.ts`
- [ ] **Step 1: Update tests to expect comma decimal**
Open `tests/unit/quantity-format.test.ts`. Jede Erwartung mit Dezimalpunkt auf Komma ändern, z. B.:
```typescript
// vorher: expect(formatQuantity(0.333)).toBe('0.33');
// nachher:
expect(formatQuantity(0.333)).toBe('0,33');
```
Betroffene Assertions (aus dem bestehenden Test-File):
- `formatQuantity(0.333)``'0,33'`
- `formatQuantity(0.5)``'0,5'`
- `formatQuantity(1.25)``'1,25'`
Ganze Zahlen (`formatQuantity(3)``'3'`) und null (`''`) bleiben gleich.
- [ ] **Step 2: Run tests to verify they fail with current implementation**
Run: `npm test -- tests/unit/quantity-format.test.ts`
Expected: Tests with decimal values fail (`'0.33'` received, `'0,33'` expected).
- [ ] **Step 3: Rewrite `formatQuantity` mit toLocaleString**
Replace contents of `src/lib/quantity-format.ts`:
```typescript
export function formatQuantity(q: number | null): string {
if (q === null || q === undefined) return '';
return q.toLocaleString('de-DE', {
maximumFractionDigits: 2,
useGrouping: false
});
}
```
- [ ] **Step 4: Run tests to verify they pass**
Run: `npm test -- tests/unit/quantity-format.test.ts`
Expected: Alle 5 Tests grün.
- [ ] **Step 5: Run full suite to catch app-wide regressions**
Run: `npm test`
Expected: Alle Tests grün. Falls andere Tests (z. B. Rezept-Detail-Rendering) Erwartungen auf `'.'` haben und fehlschlagen, Assertions dort auf Komma anpassen und in denselben Commit nehmen.
- [ ] **Step 6: Commit**
```bash
git add src/lib/quantity-format.ts tests/unit/quantity-format.test.ts
git commit -m "feat(format): formatQuantity app-weit auf de-DE Komma-Dezimal"
```
---
### Task 4: Migration 015 — Check-Keys auf Family
**Files:**
- Create: `src/lib/server/db/migrations/015_shopping_check_family.sql`
Hinweis: Migrations werden via `import.meta.glob('./migrations/*.sql', {eager, query:'?raw'})` gebundelt (siehe CLAUDE.md) — kein Dockerfile-Copy nötig.
- [ ] **Step 1: Write the migration**
Create `src/lib/server/db/migrations/015_shopping_check_family.sql`:
```sql
-- Konsolidierung: unit_key in shopping_cart_check wird zum Family-Key, damit
-- Abhaks stabil bleiben wenn Display-Unit zwischen g und kg wechselt.
-- g/kg → 'weight', ml/l → 'volume', Rest bleibt unveraendert.
UPDATE shopping_cart_check SET unit_key = 'weight' WHERE LOWER(TRIM(unit_key)) IN ('g', 'kg');
UPDATE shopping_cart_check SET unit_key = 'volume' WHERE LOWER(TRIM(unit_key)) IN ('ml', 'l');
-- Nach Relabeling koennen Duplikate entstehen (zwei Zeilen mit 'weight' pro
-- name_key). Juengsten Eintrag behalten.
DELETE FROM shopping_cart_check
WHERE rowid NOT IN (
SELECT MAX(rowid)
FROM shopping_cart_check
GROUP BY name_key, unit_key
);
```
- [ ] **Step 2: Verify migration runs (smoke test via any integration test)**
Run: `npm test -- tests/integration/shopping-repository.test.ts`
Expected: Alle bestehenden Tests grün (Migration läuft beim `openInMemoryForTest()`, bricht nichts weil Tabelle beim ersten Lauf leer ist).
- [ ] **Step 3: Commit**
```bash
git add src/lib/server/db/migrations/015_shopping_check_family.sql
git commit -m "feat(shopping): Migration 015 — Check-Keys auf Unit-Family"
```
---
### Task 5: listShoppingList mit Family-Konsolidierung
**Files:**
- Modify: `src/lib/server/shopping/repository.ts:70-107`
- Modify: `tests/integration/shopping-repository.test.ts`
- [ ] **Step 1: Write failing integration test**
Append to `tests/integration/shopping-repository.test.ts` (z. B. nach dem vorhandenen `addRecipeToCart`-Block, ein eigener Describe-Block):
```typescript
describe('listShoppingList — Konsolidierung ueber Einheiten', () => {
it('fasst 500 g + 1 kg Kartoffeln zu 1,5 kg zusammen', () => {
const db = openInMemoryForTest();
const a = insertRecipe(
db,
recipe({
title: 'Kartoffelsuppe',
servings_default: 4,
ingredients: [
{ position: 1, name: 'Kartoffeln', quantity: 500, unit: 'g', note: null, raw_text: null }
]
})
);
const b = insertRecipe(
db,
recipe({
title: 'Kartoffelpuffer',
servings_default: 4,
ingredients: [
{ position: 1, name: 'Kartoffeln', quantity: 1, unit: 'kg', note: null, raw_text: null }
]
})
);
addRecipeToCart(db, a, null);
addRecipeToCart(db, b, null);
const snap = listShoppingList(db);
const kartoffeln = snap.rows.filter((r) => r.display_name.toLowerCase() === 'kartoffeln');
expect(kartoffeln).toHaveLength(1);
expect(kartoffeln[0].total_quantity).toBe(1.5);
expect(kartoffeln[0].display_unit).toBe('kg');
});
it('kombiniert ml + l korrekt (400 ml + 0,5 l → 900 ml)', () => {
const db = openInMemoryForTest();
const a = insertRecipe(
db,
recipe({
title: 'R1',
servings_default: 4,
ingredients: [{ position: 1, name: 'Milch', quantity: 400, unit: 'ml', note: null, raw_text: null }]
})
);
const b = insertRecipe(
db,
recipe({
title: 'R2',
servings_default: 4,
ingredients: [{ position: 1, name: 'Milch', quantity: 0.5, unit: 'l', note: null, raw_text: null }]
})
);
addRecipeToCart(db, a, null);
addRecipeToCart(db, b, null);
const milch = listShoppingList(db).rows.filter((r) => r.display_name.toLowerCase() === 'milch');
expect(milch).toHaveLength(1);
expect(milch[0].total_quantity).toBe(900);
expect(milch[0].display_unit).toBe('ml');
});
it('laesst inkompatible Families getrennt (5 Stueck Eier + 500 g Eier = 2 Zeilen)', () => {
const db = openInMemoryForTest();
const a = insertRecipe(
db,
recipe({
title: 'R1',
servings_default: 4,
ingredients: [{ position: 1, name: 'Eier', quantity: 5, unit: 'Stück', note: null, raw_text: null }]
})
);
const b = insertRecipe(
db,
recipe({
title: 'R2',
servings_default: 4,
ingredients: [{ position: 1, name: 'Eier', quantity: 500, unit: 'g', note: null, raw_text: null }]
})
);
addRecipeToCart(db, a, null);
addRecipeToCart(db, b, null);
const eier = listShoppingList(db).rows.filter((r) => r.display_name.toLowerCase() === 'eier');
expect(eier).toHaveLength(2);
});
it('summiert gleiche Unit-Family ohne Konversion (2 Bund + 1 Bund → 3 Bund)', () => {
const db = openInMemoryForTest();
const a = insertRecipe(
db,
recipe({
title: 'R1',
servings_default: 4,
ingredients: [{ position: 1, name: 'Petersilie', quantity: 2, unit: 'Bund', note: null, raw_text: null }]
})
);
const b = insertRecipe(
db,
recipe({
title: 'R2',
servings_default: 4,
ingredients: [{ position: 1, name: 'Petersilie', quantity: 1, unit: 'Bund', note: null, raw_text: null }]
})
);
addRecipeToCart(db, a, null);
addRecipeToCart(db, b, null);
const petersilie = listShoppingList(db).rows.filter((r) => r.display_name.toLowerCase() === 'petersilie');
expect(petersilie).toHaveLength(1);
expect(petersilie[0].total_quantity).toBe(3);
expect(petersilie[0].display_unit?.toLowerCase()).toBe('bund');
});
});
```
- [ ] **Step 2: Run tests to verify they fail**
Run: `npm test -- tests/integration/shopping-repository.test.ts`
Expected: 4 neue Tests fail (Konsolidierung existiert noch nicht).
- [ ] **Step 3: Rewrite `listShoppingList` to use TS-side consolidation**
Replace the `listShoppingList` body in `src/lib/server/shopping/repository.ts` (Zeilen 70-107):
```typescript
import { consolidate, unitFamily } from '../unit-consolidation';
// (oben im File unter den bestehenden Imports einfuegen)
export function listShoppingList(
db: Database.Database
): ShoppingListSnapshot {
const recipes = db
.prepare(
`SELECT cr.recipe_id, r.title, r.image_path, cr.servings,
COALESCE(r.servings_default, cr.servings) AS servings_default
FROM shopping_cart_recipe cr
JOIN recipe r ON r.id = cr.recipe_id
ORDER BY cr.added_at ASC`
)
.all() as ShoppingCartRecipe[];
// SQL aggregiert weiterhin pro (name, raw-unit). Die family-Gruppierung
// + Konsolidierung macht TypeScript, damit SQL lesbar bleibt und die
// Logik Unit-testbar ist.
type RawRow = {
name_key: string;
unit_key: string;
display_name: string;
display_unit: string | null;
total_quantity: number | null;
from_recipes: string;
};
const raw = db
.prepare(
`SELECT
LOWER(TRIM(i.name)) AS name_key,
LOWER(TRIM(COALESCE(i.unit, ''))) AS unit_key,
MIN(i.name) AS display_name,
MIN(i.unit) AS display_unit,
SUM(i.quantity * cr.servings * 1.0 / NULLIF(COALESCE(r.servings_default, cr.servings), 0)) AS total_quantity,
GROUP_CONCAT(DISTINCT r.title) AS from_recipes
FROM shopping_cart_recipe cr
JOIN recipe r ON r.id = cr.recipe_id
JOIN ingredient i ON i.recipe_id = r.id
GROUP BY name_key, unit_key`
)
.all() as RawRow[];
// Check-Keys einmalig vorladen
const checkedSet = new Set(
(
db
.prepare('SELECT name_key, unit_key FROM shopping_cart_check')
.all() as { name_key: string; unit_key: string }[]
).map((c) => `${c.name_key}|${c.unit_key}`)
);
// Gruppieren nach (name_key, unitFamily(unit_key))
const grouped = new Map<string, RawRow[]>();
for (const r of raw) {
const familyKey = unitFamily(r.unit_key);
const key = `${r.name_key}|${familyKey}`;
const arr = grouped.get(key) ?? [];
arr.push(r);
grouped.set(key, arr);
}
const rows: ShoppingListRow[] = [];
for (const [key, members] of grouped) {
const [nameKey, familyKey] = key.split('|');
const consolidated = consolidate(
members.map((m) => ({ quantity: m.total_quantity, unit: m.display_unit }))
);
// display_name: ersten nehmen (alle Member haben dasselbe name_key)
const displayName = members[0].display_name;
// from_recipes: alle unique Titel aus den Members kombinieren
const allRecipes = new Set<string>();
for (const m of members) {
for (const t of m.from_recipes.split(',')) allRecipes.add(t);
}
rows.push({
name_key: nameKey,
unit_key: familyKey, // wichtig: family-key, matched mit checked-Lookup
display_name: displayName,
display_unit: consolidated.unit,
total_quantity: consolidated.quantity,
from_recipes: [...allRecipes].join(','),
checked: checkedSet.has(`${nameKey}|${familyKey}`) ? 1 : 0
});
}
// Sort wie bisher: erst unchecked, dann alphabetisch by display_name
rows.sort((a, b) => {
if (a.checked !== b.checked) return a.checked - b.checked;
return a.display_name.localeCompare(b.display_name, 'de', { sensitivity: 'base' });
});
const uncheckedCount = rows.reduce((n, r) => n + (r.checked ? 0 : 1), 0);
return { recipes, rows, uncheckedCount };
}
```
- [ ] **Step 4: Run tests to verify they pass**
Run: `npm test -- tests/integration/shopping-repository.test.ts`
Expected: Alle Tests grün (bestehende + 4 neue).
- [ ] **Step 5: Commit**
```bash
git add src/lib/server/shopping/repository.ts tests/integration/shopping-repository.test.ts
git commit -m "feat(shopping): listShoppingList konsolidiert g/kg + ml/l"
```
---
### Task 6: toggleCheck + clearCheckedItems auf Family-Key
**Files:**
- Modify: `src/lib/server/shopping/repository.ts:109-188`
- Modify: `tests/integration/shopping-repository.test.ts`
- [ ] **Step 1: Write failing integration tests**
Append to `tests/integration/shopping-repository.test.ts`:
```typescript
describe('toggleCheck — stabil ueber Unit-Family', () => {
it('haekchen bleibt erhalten wenn Gesamtmenge von kg auf g faellt', () => {
const db = openInMemoryForTest();
const a = insertRecipe(
db,
recipe({
title: 'R1',
servings_default: 4,
ingredients: [{ position: 1, name: 'Kartoffeln', quantity: 500, unit: 'g', note: null, raw_text: null }]
})
);
const b = insertRecipe(
db,
recipe({
title: 'R2',
servings_default: 4,
ingredients: [{ position: 1, name: 'Kartoffeln', quantity: 1, unit: 'kg', note: null, raw_text: null }]
})
);
addRecipeToCart(db, a, null);
addRecipeToCart(db, b, null);
// Abhaken der konsolidierten 1,5-kg-Zeile via family-key
const before = listShoppingList(db).rows[0];
toggleCheck(db, before.name_key, before.unit_key, true);
expect(listShoppingList(db).rows[0].checked).toBe(1);
// Ein Rezept rausnehmen → nur noch 500 g, display wechselt auf g
removeRecipeFromCart(db, b);
const after = listShoppingList(db).rows[0];
expect(after.display_unit).toBe('g');
expect(after.total_quantity).toBe(500);
// Haekchen bleibt: unit_key ist weiterhin 'weight'
expect(after.checked).toBe(1);
});
});
```
- [ ] **Step 2: Run tests to verify they fail**
Run: `npm test -- tests/integration/shopping-repository.test.ts`
Expected: Der neue Test failt, weil `toggleCheck` noch mit `unit_key` als raw unit arbeitet — der Check wird mit `'weight'` geschrieben, ABER das Schreiben selbst könnte fälschlich doch durchgehen (toggleCheck macht ja nur INSERT mit dem gegebenen Key). Der Failure entsteht beim zweiten `listShoppingList()`: der Lookup-Key matched noch nicht mit dem gespeicherten Check.
Tatsächlich: Mit Task 5 schreibt `toggleCheck(db, name, 'weight', true)` einen Eintrag `(kartoffeln, 'weight')` in `shopping_cart_check`. `listShoppingList` liest den Check mit dem Family-Key — also passt. Der Test müsste grün sein _wenn_ toggleCheck unverändert funktioniert.
Hmm — let me re-check. `toggleCheck(db, nameKey, unitKey, checked)` nimmt einfach den String, den der Caller übergibt, und speichert. Das ist agnostisch. Also wenn die UI `row.unit_key` durchreicht (was ja jetzt 'weight' ist), funktioniert das. Kein Code-Change nötig in toggleCheck.
`clearCheckedItems` hingegen vergleicht Check-Keys mit der Ingredient-Tabelle via `LOWER(TRIM(COALESCE(i.unit, '')))` — das ist aber der RAW unit, nicht der Family-Key. Hier ist der Fix nötig.
→ Step 2 wird daher beide Facetten prüfen: (1) toggleCheck/round-trip funktioniert bereits (Test grün), (2) clearCheckedItems dedupliziert korrekt.
Ich füge daher einen expliziten clearCheckedItems-Test hinzu:
Append weitere Test-Case in denselben Block:
```typescript
it('clearCheckedItems respektiert family-key beim Orphan-Cleanup', () => {
const db = openInMemoryForTest();
const a = insertRecipe(
db,
recipe({
title: 'R1',
servings_default: 4,
ingredients: [
{ position: 1, name: 'Kartoffeln', quantity: 500, unit: 'g', note: null, raw_text: null },
{ position: 2, name: 'Salz', quantity: 1, unit: 'Prise', note: null, raw_text: null }
]
})
);
addRecipeToCart(db, a, null);
const rows = listShoppingList(db).rows;
// Alle abhaken
for (const r of rows) toggleCheck(db, r.name_key, r.unit_key, true);
clearCheckedItems(db);
// Das Rezept sollte raus sein
expect(listShoppingList(db).recipes).toHaveLength(0);
// Check-Tabelle sollte leer sein (keine Orphans)
const remaining = (db.prepare('SELECT COUNT(*) AS c FROM shopping_cart_check').get() as { c: number }).c;
expect(remaining).toBe(0);
});
```
Run: `npm test -- tests/integration/shopping-repository.test.ts`
Expected: Der clearCheckedItems-Test könnte failen weil der Orphan-Cleanup mit raw-unit vergleicht — der Check hat 'weight', das Ingredient hat 'g', Key-Match schlägt fehl, Check bleibt als Orphan.
- [ ] **Step 3: Fix `clearCheckedItems` to use family-key for orphan comparison**
In `src/lib/server/shopping/repository.ts`, in `clearCheckedItems` den Orphan-Cleanup-Block:
Ersetzen (aktuell Zeilen 163-185):
```typescript
// Orphan-Checks raeumen: alle Check-Keys, die jetzt in KEINEM Cart-Rezept
// mehr vorkommen.
const activeKeys = db
.prepare(
`SELECT DISTINCT
LOWER(TRIM(i.name)) AS name_key,
LOWER(TRIM(COALESCE(i.unit, ''))) AS unit_key
FROM shopping_cart_recipe cr
JOIN ingredient i ON i.recipe_id = cr.recipe_id`
)
.all() as { name_key: string; unit_key: string }[];
const activeSet = new Set(activeKeys.map((k) => `${k.name_key} ${k.unit_key}`));
const allChecks = db
.prepare('SELECT name_key, unit_key FROM shopping_cart_check')
.all() as { name_key: string; unit_key: string }[];
const del = db.prepare(
'DELETE FROM shopping_cart_check WHERE name_key = ? AND unit_key = ?'
);
for (const c of allChecks) {
if (!activeSet.has(`${c.name_key} ${c.unit_key}`)) {
del.run(c.name_key, c.unit_key);
}
}
```
durch:
```typescript
// Orphan-Checks raeumen: Active-Keys nach (name_key, unitFamily(raw-unit))
// bauen, damit Checks mit family-key korrekt gematcht werden.
const activeRaw = db
.prepare(
`SELECT DISTINCT
LOWER(TRIM(i.name)) AS name_key,
LOWER(TRIM(COALESCE(i.unit, ''))) AS unit_key
FROM shopping_cart_recipe cr
JOIN ingredient i ON i.recipe_id = cr.recipe_id`
)
.all() as { name_key: string; unit_key: string }[];
const activeSet = new Set(
activeRaw.map((k) => `${k.name_key}|${unitFamily(k.unit_key)}`)
);
const allChecks = db
.prepare('SELECT name_key, unit_key FROM shopping_cart_check')
.all() as { name_key: string; unit_key: string }[];
const del = db.prepare(
'DELETE FROM shopping_cart_check WHERE name_key = ? AND unit_key = ?'
);
for (const c of allChecks) {
if (!activeSet.has(`${c.name_key}|${c.unit_key}`)) {
del.run(c.name_key, c.unit_key);
}
}
```
Analog den oberen Block in `clearCheckedItems` (perRecipe-Gruppierung, Zeilen 132-146), der `unit_key` mit `LOWER(TRIM(i.unit))` matched — da wird pro recipe_id gezählt, ob alle Zeilen abgehakt sind. Der Count-Vergleich mit `shopping_cart_check` erfolgt auch hier via unit_key. Anpassen:
Ersetzen (aktuell Zeilen 132-147):
```typescript
const allRows = db
.prepare(
`SELECT
cr.recipe_id,
LOWER(TRIM(i.name)) AS name_key,
LOWER(TRIM(COALESCE(i.unit, ''))) AS unit_key,
EXISTS(
SELECT 1 FROM shopping_cart_check c
WHERE c.name_key = LOWER(TRIM(i.name))
AND c.unit_key = LOWER(TRIM(COALESCE(i.unit, '')))
) AS checked
FROM shopping_cart_recipe cr
JOIN ingredient i ON i.recipe_id = cr.recipe_id`
)
.all() as { recipe_id: number; name_key: string; unit_key: string; checked: 0 | 1 }[];
```
durch:
```typescript
// Rohe (name, unit)-Zeilen holen, checked-Status per Family-Key-Lookup
// in JS entscheiden (SQL-CASE-Duplikation vermeiden).
const allRowsRaw = db
.prepare(
`SELECT
cr.recipe_id,
LOWER(TRIM(i.name)) AS name_key,
LOWER(TRIM(COALESCE(i.unit, ''))) AS unit_key
FROM shopping_cart_recipe cr
JOIN ingredient i ON i.recipe_id = cr.recipe_id`
)
.all() as { recipe_id: number; name_key: string; unit_key: string }[];
const checkSet = new Set(
(
db
.prepare('SELECT name_key, unit_key FROM shopping_cart_check')
.all() as { name_key: string; unit_key: string }[]
).map((c) => `${c.name_key}|${c.unit_key}`)
);
const allRows = allRowsRaw.map((r) => ({
recipe_id: r.recipe_id,
name_key: r.name_key,
unit_key: r.unit_key,
checked: checkSet.has(`${r.name_key}|${unitFamily(r.unit_key)}`) ? (1 as const) : (0 as const)
}));
```
- [ ] **Step 4: Run tests to verify they pass**
Run: `npm test -- tests/integration/shopping-repository.test.ts`
Expected: Alle Tests grün.
- [ ] **Step 5: Run full suite + typecheck**
Run: `npm test && npm run check`
Expected:
- Tests: alle grün
- svelte-check: `0 ERRORS 0 WARNINGS`
- [ ] **Step 6: Commit**
```bash
git add src/lib/server/shopping/repository.ts tests/integration/shopping-repository.test.ts
git commit -m "feat(shopping): clearCheckedItems auf Family-Key umgestellt"
```
---
### Task 7: End-to-End-Smoketest im Dev-Deployment
**Files:** keine
- [ ] **Step 1: Push und warten auf CI-Deploy**
```bash
git push
```
CI baut arm64-Image, deployt nach dev. ~5 Min.
- [ ] **Step 2: Manuell auf `https://kochwas-dev.siegeln.net/shopping-list` prüfen**
Check-Liste:
- Zwei Rezepte mit 500 g + 1 kg gleicher Zutat in den Warenkorb → eine Zeile mit "1,5 kg".
- 400 ml + 0,5 l → "900 ml".
- Komma-Darstellung in Rezept-Detail überall ok (keine Regressionen).
- Abhaken + Rezept rausnehmen → Haken bleibt.
Wenn alle grün: Feature ist done. Kein separater Commit nötig.
---
## Self-Review Checklist
- [x] Spec-Coverage: Alle Sektionen abgedeckt (Unit-Konsolidierung → Task 1+2, Migration → Task 4, Formatter → Task 3, listShoppingList-Integration → Task 5, Check-Stabilität → Task 6).
- [x] Keine Placeholder: alle Tests und Implementierungen vollständig ausgeschrieben.
- [x] Type-Konsistenz: `QuantityInUnit`, `ShoppingListRow` einheitlich referenziert. `unit_key` bleibt derselbe Feldname, semantisch jetzt Family-Key.
- [x] Scope: eine einzelne Phase, atomic commits, TDD.

File diff suppressed because it is too large Load Diff

View File

@@ -0,0 +1,208 @@
# Einkaufsliste: Mengen-Konsolidierung über Einheiten
## Kontext
Die Einkaufsliste (`/src/lib/server/shopping/repository.ts`, `listShoppingList()`) aggregiert
Zutaten aus allen Warenkorb-Rezepten dynamisch per `GROUP BY LOWER(TRIM(name)), LOWER(TRIM(unit))`
und summiert die skalierten Mengen. Verschiedene Einheiten für dieselbe Zutat bleiben separate
Zeilen — typisches Beispiel: `500 g Kartoffeln` (Rezept A) und `1 kg Kartoffeln` (Rezept B)
erscheinen als zwei Zeilen. Gewünscht: beides konsolidiert zu `1,5 kg Kartoffeln`.
## Design-Entscheidungen (durch Brainstorming bestätigt)
- **Scope**: nur Gewicht (g ↔ kg) und Volumen (ml ↔ l). TL/EL/Tasse/Stück bleiben unverändert.
- **Anzeige-Einheit**: Auto-Promote ab ≥ 1000 in Basis-Einheit (500 g + 1 kg → "1,5 kg",
200 g + 300 g → "500 g", 400 ml + 0,5 l → "900 ml", 0,5 l + 0,8 l → "1,3 l").
- **Formatter**: `formatQuantity` wechselt app-weit auf `toLocaleString('de-DE', …)`
deutsches Komma als Dezimaltrennzeichen überall, kein Tausender-Grouping.
- **Check-Stabilität**: der „abgehakt"-State hängt künftig an der Unit-Family (weight / volume /
raw-unit), nicht an einer Display-Einheit, damit Hin-und-her-Wechsel zwischen g und kg den
Haken nicht verlieren.
## Sektion 1 — Unit-Konsolidierung
### Neue Utility: `src/lib/server/shopping/unit-consolidation.ts`
Zwei reine Funktionen, vollständig getestet per Unit-Tests:
```ts
export type UnitFamily = 'weight' | 'volume' | string;
const WEIGHT_UNITS = new Set(['g', 'kg']);
const VOLUME_UNITS = new Set(['ml', 'l']);
export function unitFamily(unit: string | null | undefined): UnitFamily {
const u = (unit ?? '').trim().toLowerCase();
if (WEIGHT_UNITS.has(u)) return 'weight';
if (VOLUME_UNITS.has(u)) return 'volume';
return u; // leer bleibt leer → eigene Gruppe
}
export interface QuantityInUnit {
quantity: number | null;
unit: string | null;
}
export function consolidate(rows: QuantityInUnit[]): QuantityInUnit {
// Gewicht: in g summieren, ≥1000 → kg, sonst g
// Volumen: in ml summieren, ≥1000 → l, sonst ml
// Andere: quantity einfach summieren, unit vom ersten Eintrag
// (alle rows einer Gruppe haben dieselbe Family = denselben unit-string)
// quantity=null wird als 0 behandelt (z. B. "etwas Salz" + "1 TL Salz" → "1 TL")
}
```
**Rundung Promote-Schwelle**: Vergleich passiert auf summierter Basis-Einheit
(z. B. 1500 g ≥ 1000 → kg). Ergebnis-Rundung: `Math.round(x * 100) / 100` (max.
zwei Nachkommastellen), die finale Display-Formatierung macht `formatQuantity`.
**Edge-Cases, die expliziter Test-Fall sind**:
- `500 g + 1 kg``{quantity: 1.5, unit: 'kg'}`
- `200 g + 300 g``{quantity: 500, unit: 'g'}`
- `400 ml + 0.5 l``{quantity: 900, unit: 'ml'}`
- `0.5 l + 0.8 l``{quantity: 1.3, unit: 'l'}`
- `2 Bund + 1 Bund``{quantity: 3, unit: 'Bund'}` (unchanged family)
- `5 Stück + 3 Stück``{quantity: 8, unit: 'Stück'}`
- `null + 1 TL Salz` (eine Menge unbekannt) → `{quantity: 1, unit: 'TL'}`
- `null + null``{quantity: null, unit: '<leer oder erster unit>'}`
### Integration in `listShoppingList()`
Die existierende SQL-Query liefert schon skalierte Mengen pro Zutat-Zeile
(quantity * servings / servings_default). Änderung:
1. **GROUP BY** der SQL-Query wechselt von `LOWER(TRIM(unit))` auf einen
Family-Key (inline per `CASE`):
```sql
GROUP BY LOWER(TRIM(name)),
CASE LOWER(TRIM(unit))
WHEN 'g' THEN 'weight'
WHEN 'kg' THEN 'weight'
WHEN 'ml' THEN 'volume'
WHEN 'l' THEN 'volume'
ELSE LOWER(TRIM(unit))
END
```
2. **SUM()** wird nicht mehr blind über quantity gerechnet (500 + 1 ≠ 1500
in Basis). Stattdessen liefert SQL pro Gruppe eine Liste der einzelnen
`(quantity, unit)`-Paare — z. B. via `json_group_array(json_object('quantity', q, 'unit', u))`.
TypeScript ruft dann `consolidate()` pro Zeile auf.
Alternative: SQL liefert für Familien 'weight' und 'volume' schon die
summierten Basis-Werte (via `SUM(q * CASE WHEN unit='kg' THEN 1000 ELSE 1 END)`),
für andere Families die unveränderte `SUM(q)`. Spart den json_group_array-Trick,
ist aber in SQL hässlich. **Empfehlung**: json_group_array + consolidate in TS —
SQL bleibt lesbar, Logik testbar.
3. Der Rückgabewert `ShoppingListItem` bekommt zwei zusätzliche Felder (wenn
nicht schon vorhanden):
- `quantity: number | null` (finaler Display-Wert)
- `unit: string | null` (finale Display-Einheit)
- `unitFamilyKey: string` (für den Check-Lookup clientseitig)
## Sektion 2 — Check-Key-Stabilität
Aktuelle Tabelle (aus `013_shopping_list.sql`):
```sql
CREATE TABLE shopping_cart_check (
name_key TEXT NOT NULL,
unit_key TEXT NOT NULL,
checked_at TEXT NOT NULL DEFAULT (datetime('now')),
PRIMARY KEY (name_key, unit_key)
);
```
### Neue Migration `015_shopping_check_family.sql`
```sql
-- Unit-Key wird zum Family-Key: g/kg → 'weight', ml/l → 'volume', sonst lowercased unit.
-- Wir migrieren bestehende Einträge damit alte Abhaks gültig bleiben.
UPDATE shopping_cart_check SET unit_key = 'weight' WHERE unit_key IN ('g', 'kg');
UPDATE shopping_cart_check SET unit_key = 'volume' WHERE unit_key IN ('ml', 'l');
-- Nach Umetikettierung können Duplikate entstehen (z. B. zwei Einträge mit
-- 'weight' für dieselbe Zutat). Deduplizieren: jüngsten behalten.
DELETE FROM shopping_cart_check
WHERE rowid NOT IN (
SELECT MAX(rowid)
FROM shopping_cart_check
GROUP BY name_key, unit_key
);
```
### Code-Änderungen
- `listShoppingList()`: beim Joinen von `shopping_cart_check` mit den aggregierten
Zeilen matched jetzt `(name_key, unit_family_key)` statt `(name_key, unit_key)`.
- `toggleCheck(name, unit, checked)`: speichert/löscht Check mit
`unitFamily(unit)` statt raw unit.
## Sektion 3 — Display-Formatter
### `src/lib/quantity-format.ts`
```ts
export function formatQuantity(q: number | null): string {
if (q === null || q === undefined) return '';
return q.toLocaleString('de-DE', {
maximumFractionDigits: 2,
useGrouping: false
});
}
```
Kleinere Datei, dieselbe Semantik (max. 2 Dezimalen, ganze Zahlen ohne Dezimal),
plus deutsches Dezimalkomma app-weit.
### Test-Anpassung `tests/unit/quantity-format.test.ts`
Erwartungswerte von `"0.33"` auf `"0,33"` etc. ziehen. Bestehende 5 Tests müssen mit.
## Sektion 4 — Tests
### Neu: `tests/unit/unit-consolidation.test.ts`
Alle Edge-Cases aus Sektion 1 als expect-Assertions. Plus: `unitFamily`-Table-Tests.
### Ergänzung: `tests/integration/shopping-repository.test.ts`
Ein neuer `describe`-Block „konsolidiert über Einheiten":
- Rezept A mit `500 g Kartoffeln`, Rezept B mit `1 kg Kartoffeln` → eine Zeile
`{name: 'kartoffeln', quantity: 1.5, unit: 'kg'}`.
- Analog Volumen mit ml + l.
- Gemischte Units wie `2 Bund Petersilie + 1 Bund Petersilie` → eine Zeile `3 Bund`.
- `5 Stück Eier + 500 g Eier` → **zwei** Zeilen (verschiedene Families).
- Abhaken einer konsolidierten kg-Zeile → nach Entfernung eines Rezepts (jetzt nur
noch 800 g) bleibt die Zeile abgehakt (Family = 'weight' stabil).
### Ergänzung: Migration-Test
Ein kleiner Test ähnlich dem Stil anderer Migration-Tests im Repo, der verifiziert:
- Alt-Einträge `(milch, 'ml')` und `(milch, 'l')` kollabieren zu einem `(milch, 'volume')`.
- Unveränderte Einträge wie `(petersilie, 'bund')` bleiben.
## Was explizit NICHT dabei ist (YAGNI)
- **Fuzzy-Name-Matching** (Kartoffel vs Kartoffeln, „Zwiebeln, rot" vs „rote Zwiebeln") —
ausgeschlossen, hohe Fehlerrate.
- **Stück-zu-Gramm-Mappings** (1 Zwiebel ≈ 80 g) — semantisch fraglich, nicht deterministisch.
- **TL/EL/Tasse-Konvertierung** — Einkauft man nicht in.
- **User-editierbare Custom-Units** — Overkill für eine Familien-PWA.
- **UI-Anzeige der zugrundeliegenden Einzelmengen** („1,5 kg — aus 500 g + 1 kg") — wäre
nett, aber nicht notwendig für die Hauptfunktion.
## Phase-Gliederung (für die spätere writing-plans-Phase)
Eine Phase reicht aus:
1. `unit-consolidation.ts` + Unit-Tests
2. `quantity-format.ts` auf `toLocaleString` umbauen + Tests updaten
3. Migration `015_shopping_check_family.sql`
4. `listShoppingList()` integriert Konsolidierung + Check-Join
5. `toggleCheck()` auf Family-Key umstellen
6. Integration-Tests
Alles in einer Phase, weil Änderungen eng verzahnt sind (Migration + Repository + Formatter
müssen zusammen deployt werden, sonst gibt es UI-Inkonsistenzen).

View File

@@ -0,0 +1,244 @@
# Hauptseite: "Zuletzt angesehen" Sort + Collapsible Sections
## Kontext
Die Hauptseite (`src/routes/+page.svelte`) hat heute drei Sektionen — "Deine
Favoriten", "Zuletzt hinzugefügt", "Alle Rezepte" — und vier Sort-Optionen
für "Alle Rezepte" (Name, Bewertung, Zuletzt gekocht, Hinzugefügt). Der
User möchte:
1. Eine fünfte Sort-Option "Zuletzt angesehen" für "Alle Rezepte"
2. "Deine Favoriten" und "Zuletzt hinzugefügt" auf-/zuklappbar machen
Beides reduziert visuelle Last und gibt Zugriff auf "kürzlich
beschäftigte mich" Rezepte ohne Suche.
## Design-Entscheidungen (durch Brainstorming bestätigt)
- **View-Tracking**: zählt sofort beim Laden der Detailseite — kein Threshold
- **Storage**: SQLite, pro Profil (konsistent mit Ratings, Cooked, Wishlist)
- **Collapsibles**: standardmäßig offen, User-Wahl persistiert pro Device
## Sektion 1 — Schema & View-Tracking
### Migration
Neue Datei `src/lib/server/db/migrations/014_recipe_view.sql`
(Numbering: aktuell ist die letzte Migration `013_shopping_list.sql`):
```sql
CREATE TABLE recipe_view (
profile_id INTEGER NOT NULL REFERENCES profiles(id) ON DELETE CASCADE,
recipe_id INTEGER NOT NULL REFERENCES recipes(id) ON DELETE CASCADE,
last_viewed_at TEXT NOT NULL DEFAULT (datetime('now')),
PRIMARY KEY (profile_id, recipe_id)
);
CREATE INDEX idx_recipe_view_recent
ON recipe_view(profile_id, last_viewed_at DESC);
```
Idempotent über `INSERT OR REPLACE` — mehrfache Visits ein- und desselben
Profils auf dasselbe Rezept führen nur zur Aktualisierung des Timestamps,
kein Multi-Insert.
Cascade auf beide FKs: löscht ein User ein Rezept oder ein Profil, gehen
zugehörige Views automatisch mit.
### API
Neuer Endpoint `POST /api/recipes/[id]/view`:
```
Request body: { "profile_id": number }
Response: 204 No Content
Errors:
- 400 wenn profile_id fehlt oder kein Number
- 404 wenn Recipe nicht existiert (FK-Violation)
- 404 wenn Profil nicht existiert (FK-Violation)
```
Implementation: einfache `INSERT OR REPLACE` mit den IDs. `last_viewed_at`
nutzt den Default (`datetime('now')`).
### Client-Hook
In `src/routes/recipes/[id]/+page.svelte`, in `onMount`:
```ts
if (profileStore.active) {
void fetch(`/api/recipes/${recipe.id}/view`, {
method: 'POST',
headers: { 'content-type': 'application/json' },
body: JSON.stringify({ profile_id: profileStore.active.id })
});
}
```
Fire-and-forget, kein UI-Block, kein Error-Handling — wenn der Beacon
fehlschlägt, ist es kein User-Visible-Bug, das nächste View korrigiert
es.
## Sektion 2 — Sort "Zuletzt angesehen"
### Page
In `src/routes/+page.svelte`:
```ts
type AllSort = 'name' | 'rating' | 'cooked' | 'created' | 'viewed';
const ALL_SORTS = [
...,
{ value: 'viewed', label: 'Zuletzt angesehen' }
];
```
### API
`GET /api/recipes/all` bekommt einen optionalen `profile_id`-Query-Param.
Der Endpoint reicht ihn an `listAllRecipesPaginated` durch.
### DB-Layer
`listAllRecipesPaginated` in `src/lib/server/recipes/search-local.ts`
bekommt einen optionalen `profileId: number | null`-Parameter. Wenn
`sort === 'viewed'` UND `profileId !== null`:
```sql
SELECT r.*, ...
FROM recipes r
LEFT JOIN recipe_view v
ON v.recipe_id = r.id AND v.profile_id = :profileId
ORDER BY v.last_viewed_at DESC NULLS LAST,
r.title COLLATE NOCASE ASC
LIMIT :limit OFFSET :offset
```
Bei `sort === 'viewed'` ohne `profileId`: fällt auf alphabetische
Sortierung zurück (kein Crash, sinnvolles Default-Verhalten).
### Reactive Refetch bei Profile-Switch
Auf Home-Page-Ebene: ein `$effect` der auf `profileStore.activeId` lauscht
und — wenn `allSort === 'viewed'``setAllSort('viewed')` retriggert
(forciert Refetch mit neuem profile_id). Sonst (anderer Sort) keine
Aktion, weil andere Sorts nicht profilabhängig sind.
### Snapshot-Kompatibilität
Der existierende `rehydrateAll(sort, count, exhausted)` in `+page.svelte`
muss `profile_id` mitschicken, sonst zeigt der Back-Nav für sort='viewed'
einen anderen Inhalt als vor dem Forward-Klick. Das gleiche gilt für
`loadAllMore` und `setAllSort`.
## Sektion 3 — Auf-/Zuklappbare Sektionen
### State
In `src/routes/+page.svelte`:
```ts
type CollapseKey = 'favorites' | 'recent';
let collapsed = $state<Record<CollapseKey, boolean>>({
favorites: false,
recent: false
});
const STORAGE_KEY = 'kochwas.collapsed.sections';
function toggle(key: CollapseKey) {
collapsed[key] = !collapsed[key];
localStorage.setItem(STORAGE_KEY, JSON.stringify(collapsed));
}
```
In `onMount`: aus localStorage parsen, fehlerhafte JSON ignorieren
(default-state behalten).
### Markup
Pro Sektion:
```svelte
<section class="listing">
<button
class="section-head"
onclick={() => toggle('favorites')}
aria-expanded={!collapsed.favorites}
>
<ChevronDown size={18} class:rotated={collapsed.favorites} />
<h2>Deine Favoriten</h2>
<span class="count">{favorites.length}</span>
</button>
{#if !collapsed.favorites}
<div transition:slide={{ duration: 180 }}>
<ul class="cards"></ul>
</div>
{/if}
</section>
```
### Visual / CSS
- Header `<button>`: transparenter Border, full-width, `display: flex`,
`align-items: center`, `gap: 0.5rem`, `min-height: 44px` (Tap-Target)
- Chevron-Icon (lucide-svelte `ChevronDown`): rotiert auf
`transform: rotate(-90deg)` wenn `.rotated`
- Count-Pill rechts: kleiner grauer Text, hilft zu sehen wie viel hinter
einer zugeklappten Sektion steckt
- Hover: leichter Hintergrund (`#f4f8f5`, wie andere interaktive Elemente)
- Animation: `svelte/transition`'s `slide`, ~180 ms
### Persistenz-Format
```json
{ "favorites": false, "recent": true }
```
Truthy = collapsed. Default-Zustand wenn key fehlt: beide false.
### "Alle Rezepte" bleibt nicht-collapsible
Hauptliste, immer sichtbar — User würde das Scrollen verlieren.
## Test-Strategie
### Schema/Migration
- Migrations-Test (existierendes Pattern in `tests/integration`): nach
`applyMigrations` muss `recipe_view` existieren mit erwarteten
Spalten
### View-Endpoint
- `POST /api/recipes/[id]/view` Integration-Test:
- Erstes POST → Row mit `last_viewed_at` ungefähr `now`
- Zweites POST → gleiche Row, `last_viewed_at` aktualisiert
- POST mit ungültiger profile_id → 404
- POST mit ungültiger recipe_id → 404
- POST ohne profile_id im Body → 400
### Sort-Logik
- Unit-Test für `listAllRecipesPaginated(db, 'viewed', limit, offset, profileId)`:
- Mit Views-Daten: angesehene Rezepte zuerst (DESC nach `last_viewed_at`),
Rest alphabetisch
- Ohne profileId: fallback auf alphabetisch
- Mit profileId aber ohne Views: alle als NULL → alphabetisch
### Collapsibles (manuell oder unit)
- localStorage-Persistenz: Toggle, Reload, gleicher State
- Default-State wenn localStorage leer/corrupt: beide offen
- Ein Unit-Test für eine reine Helper-Funktion (parse/serialize), Markup
ist Snapshot-mässig nicht so wertvoll testbar
## Reihenfolge der Umsetzung
1. Migration + DB-Layer + Sort-Query (`search-local.ts`-Erweiterung)
2. View-Endpoint (`POST /api/recipes/[id]/view`) + Client-Beacon in
`recipes/[id]/+page.svelte`
3. Sort-Option in `+page.svelte` UI + API-Param weiterreichen +
profile_id in `loadAllMore`/`rehydrateAll`/`setAllSort` durchreichen
4. Collapsible-Pattern in `+page.svelte` für Favoriten und Recent
Jede Phase atomar committen + pushen.

4
package-lock.json generated
View File

@@ -1,12 +1,12 @@
{
"name": "kochwas",
"version": "1.3.0",
"version": "1.4.2",
"lockfileVersion": 3,
"requires": true,
"packages": {
"": {
"name": "kochwas",
"version": "1.3.0",
"version": "1.4.2",
"dependencies": {
"@google/generative-ai": "^0.24.1",
"@types/archiver": "^7.0.0",

View File

@@ -1,6 +1,6 @@
{
"name": "kochwas",
"version": "1.3.0",
"version": "1.4.2",
"private": true,
"type": "module",
"scripts": {

View File

@@ -1,7 +1,7 @@
export function formatQuantity(q: number | null): string {
if (q === null || q === undefined) return '';
const rounded = Math.round(q);
if (Math.abs(q - rounded) < 0.01) return String(rounded);
// auf max. 2 Nachkommastellen, trailing Nullen raus
return q.toFixed(2).replace(/\.?0+$/, '');
return q.toLocaleString('de-DE', {
maximumFractionDigits: 2,
useGrouping: false
});
}

View File

@@ -0,0 +1,10 @@
-- Merkt je Profil, wann ein Rezept zuletzt angesehen wurde.
-- Dient als Basis fuer "Zuletzt gesehen"-Sortierung auf der Startseite.
CREATE TABLE recipe_view (
profile_id INTEGER NOT NULL REFERENCES profile(id) ON DELETE CASCADE,
recipe_id INTEGER NOT NULL REFERENCES recipe(id) ON DELETE CASCADE,
last_viewed_at TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP,
PRIMARY KEY (profile_id, recipe_id)
);
CREATE INDEX idx_recipe_view_recent
ON recipe_view (profile_id, last_viewed_at DESC);

View File

@@ -0,0 +1,14 @@
-- Konsolidierung: unit_key in shopping_cart_check wird zum Family-Key, damit
-- Abhaks stabil bleiben wenn Display-Unit zwischen g und kg wechselt.
-- g/kg → 'weight', ml/l → 'volume', Rest bleibt unveraendert.
UPDATE shopping_cart_check SET unit_key = 'weight' WHERE LOWER(TRIM(unit_key)) IN ('g', 'kg');
UPDATE shopping_cart_check SET unit_key = 'volume' WHERE LOWER(TRIM(unit_key)) IN ('ml', 'l');
-- Nach Relabeling koennen Duplikate entstehen (zwei Zeilen mit 'weight' pro
-- name_key). Juengsten Eintrag behalten.
DELETE FROM shopping_cart_check
WHERE rowid NOT IN (
SELECT MAX(rowid)
FROM shopping_cart_check
GROUP BY name_key, unit_key
);

View File

@@ -88,27 +88,20 @@ export function listAllRecipes(db: Database.Database): SearchHit[] {
.all() as SearchHit[];
}
export type AllRecipesSort = 'name' | 'rating' | 'cooked' | 'created';
export type AllRecipesSort = 'name' | 'rating' | 'cooked' | 'created' | 'viewed';
export function listAllRecipesPaginated(
db: Database.Database,
sort: AllRecipesSort,
limit: number,
offset: number
offset: number,
profileId: number | null = null
): SearchHit[] {
// NULLS-last-Emulation per CASE-Expression — SQLite unterstützt NULLS LAST
// zwar seit 3.30, aber der Pi könnte auf einer älteren Version laufen und
// CASE ist überall zuverlässig.
const orderBy: Record<AllRecipesSort, string> = {
name: 'r.title COLLATE NOCASE ASC',
rating:
'CASE WHEN (SELECT AVG(stars) FROM rating WHERE recipe_id = r.id) IS NULL THEN 1 ELSE 0 END, ' +
'(SELECT AVG(stars) FROM rating WHERE recipe_id = r.id) DESC, r.title COLLATE NOCASE ASC',
cooked:
'CASE WHEN (SELECT MAX(cooked_at) FROM cooking_log WHERE recipe_id = r.id) IS NULL THEN 1 ELSE 0 END, ' +
'(SELECT MAX(cooked_at) FROM cooking_log WHERE recipe_id = r.id) DESC, r.title COLLATE NOCASE ASC',
created: 'r.created_at DESC, r.id DESC'
};
// 'viewed' branch needs a JOIN against recipe_view — diverges from the
// simpler ORDER-BY-only path. We keep it in a separate prepare for
// clarity. Without profileId, fall back to alphabetical so the
// sort-chip still produces a sensible list.
if (sort === 'viewed' && profileId !== null) {
return db
.prepare(
`SELECT r.id,
@@ -119,7 +112,42 @@ export function listAllRecipesPaginated(
(SELECT AVG(stars) FROM rating WHERE recipe_id = r.id) AS avg_stars,
(SELECT MAX(cooked_at) FROM cooking_log WHERE recipe_id = r.id) AS last_cooked_at
FROM recipe r
ORDER BY ${orderBy[sort]}
LEFT JOIN recipe_view v
ON v.recipe_id = r.id AND v.profile_id = ?
ORDER BY CASE WHEN v.last_viewed_at IS NULL THEN 1 ELSE 0 END,
v.last_viewed_at DESC,
r.title COLLATE NOCASE ASC
LIMIT ? OFFSET ?`
)
.all(profileId, limit, offset) as SearchHit[];
}
// NULLS-last-Emulation per CASE-Expression — SQLite unterstützt NULLS LAST
// zwar seit 3.30, aber der Pi könnte auf einer älteren Version laufen und
// CASE ist überall zuverlässig.
const orderBy: Record<Exclude<AllRecipesSort, 'viewed'>, string> = {
name: 'r.title COLLATE NOCASE ASC',
rating:
'CASE WHEN (SELECT AVG(stars) FROM rating WHERE recipe_id = r.id) IS NULL THEN 1 ELSE 0 END, ' +
'(SELECT AVG(stars) FROM rating WHERE recipe_id = r.id) DESC, r.title COLLATE NOCASE ASC',
cooked:
'CASE WHEN (SELECT MAX(cooked_at) FROM cooking_log WHERE recipe_id = r.id) IS NULL THEN 1 ELSE 0 END, ' +
'(SELECT MAX(cooked_at) FROM cooking_log WHERE recipe_id = r.id) DESC, r.title COLLATE NOCASE ASC',
created: 'r.created_at DESC, r.id DESC'
};
// Without profile, 'viewed' degrades to alphabetical.
const effectiveSort = sort === 'viewed' ? 'name' : sort;
return db
.prepare(
`SELECT r.id,
r.title,
r.description,
r.image_path,
r.source_domain,
(SELECT AVG(stars) FROM rating WHERE recipe_id = r.id) AS avg_stars,
(SELECT MAX(cooked_at) FROM cooking_log WHERE recipe_id = r.id) AS last_cooked_at
FROM recipe r
ORDER BY ${orderBy[effectiveSort]}
LIMIT ? OFFSET ?`
)
.all(limit, offset) as SearchHit[];

View File

@@ -0,0 +1,37 @@
import type Database from 'better-sqlite3';
export function recordView(
db: Database.Database,
profileId: number,
recipeId: number
): void {
// ON CONFLICT DO UPDATE bumps only the timestamp field — avoids the
// DELETE+INSERT that INSERT OR REPLACE performs under the hood, which would
// silently cascade-delete any future FK-referencing children.
db.prepare(
`INSERT INTO recipe_view (profile_id, recipe_id)
VALUES (?, ?)
ON CONFLICT(profile_id, recipe_id) DO UPDATE
SET last_viewed_at = CURRENT_TIMESTAMP`
).run(profileId, recipeId);
}
export type ViewRow = {
profile_id: number;
recipe_id: number;
last_viewed_at: string;
};
export function listViews(
db: Database.Database,
profileId: number
): ViewRow[] {
return db
.prepare(
`SELECT profile_id, recipe_id, last_viewed_at
FROM recipe_view
WHERE profile_id = ?
ORDER BY last_viewed_at DESC`
)
.all(profileId) as ViewRow[];
}

View File

@@ -1,4 +1,5 @@
import type Database from 'better-sqlite3';
import { consolidate, unitFamily } from '../unit-consolidation';
// Fallback when a recipe has no servings_default set — matches the default
// used by RecipeEditor's "new recipe" template.
@@ -80,7 +81,18 @@ export function listShoppingList(
)
.all() as ShoppingCartRecipe[];
const rows = db
// SQL aggregates per (name, raw-unit). Family-grouping + consolidation is
// done in TypeScript so SQL stays readable and the logic is unit-testable.
type RawRow = {
name_key: string;
unit_key: string;
display_name: string;
display_unit: string | null;
total_quantity: number | null;
from_recipes: string;
};
const raw = db
.prepare(
`SELECT
LOWER(TRIM(i.name)) AS name_key,
@@ -88,19 +100,61 @@ export function listShoppingList(
MIN(i.name) AS display_name,
MIN(i.unit) AS display_unit,
SUM(i.quantity * cr.servings * 1.0 / NULLIF(COALESCE(r.servings_default, cr.servings), 0)) AS total_quantity,
GROUP_CONCAT(DISTINCT r.title) AS from_recipes,
EXISTS(
SELECT 1 FROM shopping_cart_check c
WHERE c.name_key = LOWER(TRIM(i.name))
AND c.unit_key = LOWER(TRIM(COALESCE(i.unit, '')))
) AS checked
GROUP_CONCAT(DISTINCT r.title) AS from_recipes
FROM shopping_cart_recipe cr
JOIN recipe r ON r.id = cr.recipe_id
JOIN ingredient i ON i.recipe_id = r.id
GROUP BY name_key, unit_key
ORDER BY checked ASC, display_name COLLATE NOCASE`
GROUP BY name_key, unit_key`
)
.all() as ShoppingListRow[];
.all() as RawRow[];
// Load all checked keys up front
const checkedSet = new Set(
(
db
.prepare('SELECT name_key, unit_key FROM shopping_cart_check')
.all() as { name_key: string; unit_key: string }[]
).map((c) => `${c.name_key}|${c.unit_key}`)
);
// Group by (name_key, unitFamily(unit_key))
const grouped = new Map<string, RawRow[]>();
for (const r of raw) {
const familyKey = unitFamily(r.unit_key);
const key = `${r.name_key}|${familyKey}`;
const arr = grouped.get(key) ?? [];
arr.push(r);
grouped.set(key, arr);
}
const rows: ShoppingListRow[] = [];
for (const members of grouped.values()) {
const nameKey = members[0].name_key;
const familyKey = unitFamily(members[0].unit_key);
const consolidated = consolidate(
members.map((m) => ({ quantity: m.total_quantity, unit: m.display_unit }))
);
const displayName = members[0].display_name;
const allRecipes = new Set<string>();
for (const m of members) {
for (const t of m.from_recipes.split(',')) allRecipes.add(t);
}
rows.push({
name_key: nameKey,
unit_key: familyKey,
display_name: displayName,
display_unit: consolidated.unit,
total_quantity: consolidated.quantity,
from_recipes: [...allRecipes].join(','),
checked: checkedSet.has(`${nameKey}|${familyKey}`) ? 1 : 0
});
}
// Sort: unchecked first, then alphabetically by display_name
rows.sort((a, b) => {
if (a.checked !== b.checked) return a.checked - b.checked;
return a.display_name.localeCompare(b.display_name, 'de', { sensitivity: 'base' });
});
const uncheckedCount = rows.reduce((n, r) => n + (r.checked ? 0 : 1), 0);
return { recipes, rows, uncheckedCount };
@@ -127,23 +181,33 @@ export function toggleCheck(
export function clearCheckedItems(db: Database.Database): void {
const tx = db.transaction(() => {
// Alle aggregierten Zeilen mit checked-Status holen, pro recipe_id gruppieren
// und Rezepte finden, deren Zeilen ALLE abgehakt sind.
const allRows = db
// Rohe (name, unit)-Zeilen holen, checked-Status per Family-Key-Lookup
// in JS entscheiden. Rezepte mit ALLEN Zeilen abgehakt werden raus.
const allRowsRaw = db
.prepare(
`SELECT
cr.recipe_id,
LOWER(TRIM(i.name)) AS name_key,
LOWER(TRIM(COALESCE(i.unit, ''))) AS unit_key,
EXISTS(
SELECT 1 FROM shopping_cart_check c
WHERE c.name_key = LOWER(TRIM(i.name))
AND c.unit_key = LOWER(TRIM(COALESCE(i.unit, '')))
) AS checked
LOWER(TRIM(COALESCE(i.unit, ''))) AS unit_key
FROM shopping_cart_recipe cr
JOIN ingredient i ON i.recipe_id = cr.recipe_id`
)
.all() as { recipe_id: number; name_key: string; unit_key: string; checked: 0 | 1 }[];
.all() as { recipe_id: number; name_key: string; unit_key: string }[];
const checkSet = new Set(
(
db
.prepare('SELECT name_key, unit_key FROM shopping_cart_check')
.all() as { name_key: string; unit_key: string }[]
).map((c) => `${c.name_key}|${c.unit_key}`)
);
const allRows = allRowsRaw.map((r) => ({
recipe_id: r.recipe_id,
name_key: r.name_key,
unit_key: r.unit_key,
checked: checkSet.has(`${r.name_key}|${unitFamily(r.unit_key)}`) ? (1 as const) : (0 as const)
}));
const perRecipe = new Map<number, { total: number; checked: number }>();
for (const r of allRows) {
@@ -160,9 +224,9 @@ export function clearCheckedItems(db: Database.Database): void {
db.prepare('DELETE FROM shopping_cart_recipe WHERE recipe_id = ?').run(id);
}
// Orphan-Checks raeumen: alle Check-Keys, die jetzt in KEINEM Cart-Rezept
// mehr vorkommen.
const activeKeys = db
// Orphan-Checks raeumen: Active-Keys nach (name_key, unitFamily(raw-unit))
// bauen, damit Checks mit family-key korrekt gematcht werden.
const activeRaw = db
.prepare(
`SELECT DISTINCT
LOWER(TRIM(i.name)) AS name_key,
@@ -171,7 +235,9 @@ export function clearCheckedItems(db: Database.Database): void {
JOIN ingredient i ON i.recipe_id = cr.recipe_id`
)
.all() as { name_key: string; unit_key: string }[];
const activeSet = new Set(activeKeys.map((k) => `${k.name_key} ${k.unit_key}`));
const activeSet = new Set(
activeRaw.map((k) => `${k.name_key}|${unitFamily(k.unit_key)}`)
);
const allChecks = db
.prepare('SELECT name_key, unit_key FROM shopping_cart_check')
.all() as { name_key: string; unit_key: string }[];
@@ -179,7 +245,7 @@ export function clearCheckedItems(db: Database.Database): void {
'DELETE FROM shopping_cart_check WHERE name_key = ? AND unit_key = ?'
);
for (const c of allChecks) {
if (!activeSet.has(`${c.name_key} ${c.unit_key}`)) {
if (!activeSet.has(`${c.name_key}|${c.unit_key}`)) {
del.run(c.name_key, c.unit_key);
}
}

View File

@@ -0,0 +1,66 @@
export type UnitFamily = 'weight' | 'volume' | string;
const WEIGHT_UNITS = new Set(['g', 'kg']);
const VOLUME_UNITS = new Set(['ml', 'l']);
export function unitFamily(unit: string | null | undefined): UnitFamily {
const u = (unit ?? '').trim().toLowerCase();
if (WEIGHT_UNITS.has(u)) return 'weight';
if (VOLUME_UNITS.has(u)) return 'volume';
return u;
}
export interface QuantityInUnit {
quantity: number | null;
unit: string | null;
}
function round2(n: number): number {
return Math.round(n * 100) / 100;
}
/**
* Konsolidiert mehrere {quantity, unit}-Eintraege derselben Unit-Family
* zu einer gemeinsamen Menge + Display-Unit.
*
* - Gewicht (g, kg): summiert in g, promoted bei >=1000 g auf kg.
* - Volumen (ml, l): summiert in ml, promoted bei >=1000 ml auf l.
* - Andere: summiert quantity ohne Umrechnung, Display-Unit vom ersten
* Eintrag.
*
* quantity=null wird als 0 behandelt. Wenn ALLE quantities null sind,
* ist die Gesamtmenge ebenfalls null.
*/
export function consolidate(rows: QuantityInUnit[]): QuantityInUnit {
if (rows.length === 0) return { quantity: null, unit: null };
const family = unitFamily(rows[0].unit);
const firstUnit = rows[0].unit;
const allNull = rows.every((r) => r.quantity === null);
if (family === 'weight') {
if (allNull) return { quantity: null, unit: firstUnit };
const grams = rows.reduce((sum, r) => {
const q = r.quantity ?? 0;
return sum + (r.unit?.toLowerCase().trim() === 'kg' ? q * 1000 : q);
}, 0);
if (grams >= 1000) return { quantity: round2(grams / 1000), unit: 'kg' };
return { quantity: round2(grams), unit: 'g' };
}
if (family === 'volume') {
if (allNull) return { quantity: null, unit: firstUnit };
const ml = rows.reduce((sum, r) => {
const q = r.quantity ?? 0;
return sum + (r.unit?.toLowerCase().trim() === 'l' ? q * 1000 : q);
}, 0);
if (ml >= 1000) return { quantity: round2(ml / 1000), unit: 'l' };
return { quantity: round2(ml), unit: 'ml' };
}
// Non-family: summiere quantity direkt
if (allNull) return { quantity: null, unit: firstUnit };
const sum = rows.reduce((acc, r) => acc + (r.quantity ?? 0), 0);
return { quantity: round2(sum), unit: firstUnit };
}

View File

@@ -1,7 +1,8 @@
<script lang="ts">
import { onMount, tick } from 'svelte';
import { onMount, tick, untrack } from 'svelte';
import { page } from '$app/stores';
import { CookingPot, X } from 'lucide-svelte';
import { CookingPot, X, ChevronDown } from 'lucide-svelte';
import { slide } from 'svelte/transition';
import type { Snapshot } from './$types';
import type { SearchHit } from '$lib/server/recipes/search-local';
import { randomQuote } from '$lib/quotes';
@@ -27,13 +28,20 @@
let favorites = $state<SearchHit[]>([]);
const ALL_PAGE = 10;
type AllSort = 'name' | 'rating' | 'cooked' | 'created';
type AllSort = 'name' | 'rating' | 'cooked' | 'created' | 'viewed';
const ALL_SORTS: { value: AllSort; label: string }[] = [
{ value: 'name', label: 'Name' },
{ value: 'rating', label: 'Bewertung' },
{ value: 'cooked', label: 'Zuletzt gekocht' },
{ value: 'created', label: 'Hinzugefügt' }
{ value: 'created', label: 'Hinzugefügt' },
{ value: 'viewed', label: 'Zuletzt angesehen' }
];
function buildAllUrl(sort: AllSort, limit: number, offset: number): string {
const profileId = profileStore.active?.id;
const profilePart = profileId ? `&profile_id=${profileId}` : '';
return `/api/recipes/all?sort=${sort}&limit=${limit}&offset=${offset}${profilePart}`;
}
let allRecipes = $state<SearchHit[]>([]);
let allSort = $state<AllSort>('name');
let allExhausted = $state(false);
@@ -42,6 +50,20 @@
let allChips: HTMLElement | undefined = $state();
let allObserver: IntersectionObserver | null = null;
type CollapseKey = 'favorites' | 'recent';
const COLLAPSE_STORAGE_KEY = 'kochwas.collapsed.sections';
let collapsed = $state<Record<CollapseKey, boolean>>({
favorites: false,
recent: false
});
function toggleCollapsed(key: CollapseKey) {
collapsed[key] = !collapsed[key];
if (typeof localStorage !== 'undefined') {
localStorage.setItem(COLLAPSE_STORAGE_KEY, JSON.stringify(collapsed));
}
}
// Snapshot persists across history navigation. We capture not only the
// search store, but also the pagination depth ("user had loaded 60
// recipes via infinite scroll") so on back-nav we can re-hydrate the
@@ -79,7 +101,7 @@
async function rehydrateAll(sort: AllSort, count: number, exhausted: boolean) {
allLoading = true;
try {
const res = await fetch(`/api/recipes/all?sort=${sort}&limit=${count}&offset=0`);
const res = await fetch(buildAllUrl(sort, count, 0));
if (!res.ok) return;
const body = await res.json();
const hits = body.hits as SearchHit[];
@@ -100,9 +122,7 @@
if (allLoading || allExhausted) return;
allLoading = true;
try {
const res = await fetch(
`/api/recipes/all?sort=${allSort}&limit=${ALL_PAGE}&offset=${allRecipes.length}`
);
const res = await fetch(buildAllUrl(allSort, ALL_PAGE, allRecipes.length));
if (!res.ok) return;
const body = await res.json();
const more = body.hits as SearchHit[];
@@ -126,9 +146,7 @@
const chipsBefore = allChips?.getBoundingClientRect().top ?? 0;
allLoading = true;
try {
const res = await fetch(
`/api/recipes/all?sort=${next}&limit=${ALL_PAGE}&offset=0`
);
const res = await fetch(buildAllUrl(next, ALL_PAGE, 0));
if (!res.ok) return;
const body = await res.json();
const hits = body.hits as SearchHit[];
@@ -164,7 +182,7 @@
void loadRecent();
void searchFilterStore.load();
const saved = localStorage.getItem('kochwas.allSort');
if (saved && ['name', 'rating', 'cooked', 'created'].includes(saved)) {
if (saved && ['name', 'rating', 'cooked', 'created', 'viewed'].includes(saved)) {
allSort = saved as AllSort;
}
// Fresh-mount: kick off the initial 10. On back-nav, snapshot.restore
@@ -172,6 +190,16 @@
// this; if loadAllMore lands first, rehydrateAll's larger result
// simply overwrites allRecipes once it resolves.
void loadAllMore();
const rawCollapsed = localStorage.getItem(COLLAPSE_STORAGE_KEY);
if (rawCollapsed) {
try {
const parsed = JSON.parse(rawCollapsed) as Partial<Record<CollapseKey, boolean>>;
if (typeof parsed.favorites === 'boolean') collapsed.favorites = parsed.favorites;
if (typeof parsed.recent === 'boolean') collapsed.recent = parsed.recent;
} catch {
// Corrupt JSON — keep defaults (both open).
}
}
});
// IntersectionObserver an den Sentinel hängen — wenn sichtbar, nachladen.
@@ -203,6 +231,37 @@
store.reSearch();
});
// 'viewed' sort depends on the active profile. When the user switches
// profiles, refetch with the new profile_id so the list reflects what
// the *current* profile has viewed. Other sorts are profile-agnostic
// and don't need this.
//
// Only `profileStore.active` must be a tracked dep. `allSort` /
// `allLoading` are read inside untrack: otherwise the `allLoading = false`
// write in the fetch-finally would re-trigger the effect and start the
// next fetch → endless loop.
$effect(() => {
// eslint-disable-next-line @typescript-eslint/no-unused-expressions
profileStore.active;
untrack(() => {
if (allSort !== 'viewed') return;
if (allLoading) return;
void (async () => {
allLoading = true;
try {
const res = await fetch(buildAllUrl('viewed', ALL_PAGE, 0));
if (!res.ok) return;
const body = await res.json();
const hits = body.hits as SearchHit[];
allRecipes = hits;
allExhausted = hits.length < ALL_PAGE;
} finally {
allLoading = false;
}
})();
});
});
// Sync current query back into the URL as ?q=... via replaceState,
// without spamming the history stack. Pushing a new entry happens only
// when the user clicks a result or otherwise navigates away.
@@ -346,7 +405,22 @@
{:else}
{#if profileStore.active && favorites.length > 0}
<section class="listing">
<button
type="button"
class="section-head"
onclick={() => toggleCollapsed('favorites')}
aria-expanded={!collapsed.favorites}
>
<ChevronDown
size={18}
strokeWidth={2.2}
class={collapsed.favorites ? 'chev rotated' : 'chev'}
/>
<h2>Deine Favoriten</h2>
<span class="count">{favorites.length}</span>
</button>
{#if !collapsed.favorites}
<div transition:slide={{ duration: 180 }}>
<ul class="cards">
{#each favorites as r (r.id)}
<li class="card-wrap">
@@ -366,11 +440,28 @@
</li>
{/each}
</ul>
</div>
{/if}
</section>
{/if}
{#if recent.length > 0}
<section class="listing">
<button
type="button"
class="section-head"
onclick={() => toggleCollapsed('recent')}
aria-expanded={!collapsed.recent}
>
<ChevronDown
size={18}
strokeWidth={2.2}
class={collapsed.recent ? 'chev rotated' : 'chev'}
/>
<h2>Zuletzt hinzugefügt</h2>
<span class="count">{recent.length}</span>
</button>
{#if !collapsed.recent}
<div transition:slide={{ duration: 180 }}>
<ul class="cards">
{#each recent as r (r.id)}
<li class="card-wrap">
@@ -397,6 +488,8 @@
</li>
{/each}
</ul>
</div>
{/if}
</section>
{/if}
<section class="listing">
@@ -516,6 +609,49 @@
color: #444;
margin: 0 0 0.75rem;
}
.section-head {
display: flex;
align-items: center;
gap: 0.5rem;
width: 100%;
padding: 0.4rem 0.25rem;
background: transparent;
border: 0;
border-radius: 8px;
text-align: left;
cursor: pointer;
font-family: inherit;
color: inherit;
min-height: 44px;
margin-bottom: 0.4rem;
}
.section-head:hover {
background: #f4f8f5;
}
.section-head:focus-visible {
outline: 2px solid #2b6a3d;
outline-offset: 2px;
}
.section-head h2 {
margin: 0;
font-size: 1.05rem;
color: #444;
font-weight: 600;
}
.section-head .count {
margin-left: auto;
color: #888;
font-size: 0.85rem;
font-variant-numeric: tabular-nums;
}
.section-head :global(.chev) {
color: #2b6a3d;
flex-shrink: 0;
transition: transform 180ms;
}
.section-head :global(.chev.rotated) {
transform: rotate(-90deg);
}
.listing-head {
display: flex;
align-items: center;

View File

@@ -0,0 +1,27 @@
import type { RequestHandler } from './$types';
import { z } from 'zod';
import { error } from '@sveltejs/kit';
import { getDb } from '$lib/server/db';
import { validateBody, parsePositiveIntParam } from '$lib/server/api-helpers';
import { recordView } from '$lib/server/recipes/views';
const Schema = z.object({
profile_id: z.number().int().positive()
});
export const POST: RequestHandler = async ({ params, request }) => {
const recipeId = parsePositiveIntParam(params.id, 'id');
const body = validateBody(await request.json().catch(() => null), Schema);
try {
recordView(getDb(), body.profile_id, recipeId);
} catch (e) {
// FK violation (unknown profile or recipe) → 404
if (e instanceof Error && /FOREIGN KEY constraint failed/i.test(e.message)) {
error(404, { message: 'Recipe or profile not found' });
}
throw e;
}
return new Response(null, { status: 204 });
};

View File

@@ -6,7 +6,19 @@ import {
type AllRecipesSort
} from '$lib/server/recipes/search-local';
const VALID_SORTS = new Set<AllRecipesSort>(['name', 'rating', 'cooked', 'created']);
const VALID_SORTS = new Set<AllRecipesSort>([
'name',
'rating',
'cooked',
'created',
'viewed'
]);
function parseProfileId(raw: string | null): number | null {
if (!raw) return null;
const n = Number(raw);
return Number.isInteger(n) && n > 0 ? n : null;
}
export const GET: RequestHandler = async ({ url }) => {
const sortRaw = (url.searchParams.get('sort') ?? 'name') as AllRecipesSort;
@@ -17,6 +29,7 @@ export const GET: RequestHandler = async ({ url }) => {
// one round-trip so document height matches and scroll-restore lands.
const limit = Math.min(200, Math.max(1, Number(url.searchParams.get('limit') ?? 10)));
const offset = Math.max(0, Number(url.searchParams.get('offset') ?? 0));
const hits = listAllRecipesPaginated(getDb(), sortRaw, limit, offset);
const profileId = parseProfileId(url.searchParams.get('profile_id'));
const hits = listAllRecipesPaginated(getDb(), sortRaw, limit, offset, profileId);
return json({ sort: sortRaw, limit, offset, hits });
};

View File

@@ -355,9 +355,28 @@
}
};
document.addEventListener('visibilitychange', onVisibility);
return () => document.removeEventListener('visibilitychange', onVisibility);
});
// Track view per active profile (fire-and-forget). Lives in $effect, not
// onMount, because profileStore.load() runs from layout's onMount and the
// child onMount fires first — at mount time profileStore.active is still
// null on cold loads. The effect re-runs once active populates, the
// viewBeaconSent flag prevents duplicate POSTs on subsequent profile
// switches within the same page instance.
let viewBeaconSent = $state(false);
$effect(() => {
if (viewBeaconSent) return;
if (!profileStore.active) return;
viewBeaconSent = true;
void fetch(`/api/recipes/${data.recipe.id}/view`, {
method: 'POST',
headers: { 'content-type': 'application/json' },
body: JSON.stringify({ profile_id: profileStore.active.id })
});
});
onDestroy(() => {
void releaseWakeLock();
});

View File

@@ -284,6 +284,8 @@
font-weight: 600;
font-size: 1rem;
line-height: 1.3;
overflow-wrap: break-word;
word-break: break-word;
}
.meta {
display: flex;
@@ -340,4 +342,51 @@
font-size: 0.85rem;
font-weight: 600;
}
/* Handy: 2-Spalten-Grid — Bild links ueber alle Rows, rechts stapeln
sich Titel, Meta, Actions. `display: contents` auf .body/.text zieht
die DOM-Kinder direkt in die Card-Grid, ohne Markup-Umbau. Vermeidet
die tote Weissflaeche unter dem Bild bei schmalen Viewports. */
@media (max-width: 600px) {
.card {
display: grid;
grid-template-columns: 96px 1fr;
grid-template-areas:
'img title'
'img meta'
'img actions';
column-gap: 0;
}
.body {
display: contents;
}
.body img,
.placeholder {
grid-area: img;
width: 96px;
height: 100%;
min-height: 100%;
}
.text {
display: contents;
}
.title {
grid-area: title;
padding: 0.7rem 0.75rem 0.15rem;
}
.meta {
grid-area: meta;
padding: 0 0.75rem;
margin-top: 0;
}
.actions-top {
grid-area: actions;
position: static;
display: flex;
gap: 0.4rem;
padding: 0.5rem 0.75rem 0.7rem;
justify-content: flex-end;
align-self: end;
}
}
</style>

View File

@@ -0,0 +1,270 @@
import { describe, it, expect, beforeEach, vi } from 'vitest';
import { openInMemoryForTest } from '../../src/lib/server/db';
// ---------------------------------------------------------------------------
// Module-level mock so the POST handler uses the in-memory test DB.
// Must be declared before any import of the handler itself.
// ---------------------------------------------------------------------------
const { testDb } = vi.hoisted(() => ({
testDb: { current: null as ReturnType<typeof openInMemoryForTest> | null }
}));
vi.mock('$lib/server/db', async () => {
const actual =
await vi.importActual<typeof import('../../src/lib/server/db')>(
'../../src/lib/server/db'
);
return {
...actual,
getDb: () => {
if (!testDb.current) throw new Error('test DB not initialised');
return testDb.current;
}
};
});
import { recordView, listViews } from '../../src/lib/server/recipes/views';
import { createProfile } from '../../src/lib/server/profiles/repository';
import { listAllRecipesPaginated } from '../../src/lib/server/recipes/search-local';
import { POST } from '../../src/routes/api/recipes/[id]/view/+server';
function seedRecipe(db: ReturnType<typeof openInMemoryForTest>, title: string): number {
const r = db
.prepare("INSERT INTO recipe (title, created_at) VALUES (?, datetime('now')) RETURNING id")
.get(title) as { id: number };
return r.id;
}
function mkReq(body: unknown) {
return new Request('http://test/api/recipes/1/view', {
method: 'POST',
headers: { 'content-type': 'application/json' },
body: JSON.stringify(body)
});
}
describe('014_recipe_views migration', () => {
it('creates recipe_view table with expected columns', () => {
const db = openInMemoryForTest();
const cols = db.prepare("PRAGMA table_info(recipe_view)").all() as Array<{
name: string;
type: string;
notnull: number;
pk: number;
}>;
const byName = Object.fromEntries(cols.map((c) => [c.name, c]));
expect(byName.profile_id?.type).toBe('INTEGER');
expect(byName.profile_id?.notnull).toBe(1);
expect(byName.profile_id?.pk).toBe(1);
expect(byName.recipe_id?.type).toBe('INTEGER');
expect(byName.recipe_id?.notnull).toBe(1);
expect(byName.recipe_id?.pk).toBe(2);
expect(byName.last_viewed_at?.type).toBe('TIMESTAMP');
expect(byName.last_viewed_at?.notnull).toBe(1);
});
it('has index on (profile_id, last_viewed_at DESC)', () => {
const db = openInMemoryForTest();
const idxList = db
.prepare("PRAGMA index_list(recipe_view)")
.all() as Array<{ name: string }>;
expect(idxList.some((i) => i.name === 'idx_recipe_view_recent')).toBe(true);
});
});
describe('recordView', () => {
it('inserts a view row with default timestamp', () => {
const db = openInMemoryForTest();
const profile = createProfile(db, 'Test');
const recipeId = seedRecipe(db, 'Pasta');
recordView(db, profile.id, recipeId);
const rows = listViews(db, profile.id);
expect(rows.length).toBe(1);
expect(rows[0].recipe_id).toBe(recipeId);
expect(rows[0].last_viewed_at).toMatch(/^\d{4}-\d{2}-\d{2}/);
});
it('updates timestamp on subsequent view of same recipe', async () => {
const db = openInMemoryForTest();
const profile = createProfile(db, 'Test');
const recipeId = seedRecipe(db, 'Pasta');
recordView(db, profile.id, recipeId);
const first = listViews(db, profile.id)[0].last_viewed_at;
// tiny delay so the second timestamp differs
await new Promise((r) => setTimeout(r, 1100));
recordView(db, profile.id, recipeId);
const rows = listViews(db, profile.id);
expect(rows.length).toBe(1);
expect(rows[0].last_viewed_at >= first).toBe(true);
});
it('throws on unknown profile_id (FK)', () => {
const db = openInMemoryForTest();
const recipeId = seedRecipe(db, 'Pasta');
expect(() => recordView(db, 999, recipeId)).toThrow();
});
it('throws on unknown recipe_id (FK)', () => {
const db = openInMemoryForTest();
const profile = createProfile(db, 'Test');
expect(() => recordView(db, profile.id, 999)).toThrow();
});
});
describe("listAllRecipesPaginated sort='viewed'", () => {
it('puts recently-viewed recipes first, NULLs alphabetically last', async () => {
const db = openInMemoryForTest();
const profile = createProfile(db, 'Test');
const recipeA = seedRecipe(db, 'Apfelkuchen');
const recipeB = seedRecipe(db, 'Brokkoli');
// Inserted in reverse-alphabetical order (Z before D) to prove the
// tiebreaker sorts by title, not insertion order.
const recipeC = seedRecipe(db, 'Zwiebelkuchen');
const recipeD = seedRecipe(db, 'Donauwelle');
// View order: B then A. C and D never viewed.
recordView(db, profile.id, recipeB);
await new Promise((r) => setTimeout(r, 1100));
recordView(db, profile.id, recipeA);
const hits = listAllRecipesPaginated(db, 'viewed', 50, 0, profile.id);
// Viewed: A (most recent), B — then unviewed alphabetically: D before C.
expect(hits.map((h) => h.id)).toEqual([recipeA, recipeB, recipeD, recipeC]);
});
it('falls back to alphabetical when profileId is null', () => {
const db = openInMemoryForTest();
seedRecipe(db, 'Couscous');
seedRecipe(db, 'Apfelkuchen');
seedRecipe(db, 'Brokkoli');
const hits = listAllRecipesPaginated(db, 'viewed', 50, 0, null);
expect(hits.map((h) => h.title)).toEqual(['Apfelkuchen', 'Brokkoli', 'Couscous']);
});
it('keeps existing sorts working unchanged', () => {
const db = openInMemoryForTest();
seedRecipe(db, 'Couscous');
seedRecipe(db, 'Apfelkuchen');
seedRecipe(db, 'Brokkoli');
const hits = listAllRecipesPaginated(db, 'name', 50, 0);
expect(hits.map((h) => h.title)).toEqual(['Apfelkuchen', 'Brokkoli', 'Couscous']);
});
});
// ---------------------------------------------------------------------------
// POST /api/recipes/[id]/view — endpoint integration tests
// ---------------------------------------------------------------------------
beforeEach(() => {
testDb.current = openInMemoryForTest();
});
describe('POST /api/recipes/[id]/view', () => {
it('204 + view row written on success', async () => {
const db = testDb.current!;
const profile = createProfile(db, 'Tester');
const recipeId = seedRecipe(db, 'Pasta');
// eslint-disable-next-line @typescript-eslint/no-explicit-any
const res = await POST({ params: { id: String(recipeId) }, request: mkReq({ profile_id: profile.id }) } as any);
expect(res.status).toBe(204);
const rows = listViews(db, profile.id);
expect(rows.length).toBe(1);
expect(rows[0].recipe_id).toBe(recipeId);
});
it('400 on recipe id = 0', async () => {
await expect(
// eslint-disable-next-line @typescript-eslint/no-explicit-any
POST({ params: { id: '0' }, request: mkReq({ profile_id: 1 }) } as any)
).rejects.toMatchObject({ status: 400 });
});
it('400 on non-numeric recipe id', async () => {
await expect(
// eslint-disable-next-line @typescript-eslint/no-explicit-any
POST({ params: { id: 'abc' }, request: mkReq({ profile_id: 1 }) } as any)
).rejects.toMatchObject({ status: 400 });
});
it('400 on missing profile_id in body', async () => {
await expect(
// eslint-disable-next-line @typescript-eslint/no-explicit-any
POST({ params: { id: '1' }, request: mkReq({}) } as any)
).rejects.toMatchObject({ status: 400 });
});
it('400 on non-positive profile_id', async () => {
await expect(
// eslint-disable-next-line @typescript-eslint/no-explicit-any
POST({ params: { id: '1' }, request: mkReq({ profile_id: 0 }) } as any)
).rejects.toMatchObject({ status: 400 });
});
it('400 on malformed JSON body', async () => {
const badReq = new Request('http://test/api/recipes/1/view', {
method: 'POST',
headers: { 'content-type': 'application/json' },
body: 'not-json'
});
await expect(
// eslint-disable-next-line @typescript-eslint/no-explicit-any
POST({ params: { id: '1' }, request: badReq } as any)
).rejects.toMatchObject({ status: 400 });
});
it('404 on unknown profile_id (FK violation)', async () => {
const recipeId = seedRecipe(testDb.current!, 'Pasta');
await expect(
// eslint-disable-next-line @typescript-eslint/no-explicit-any
POST({ params: { id: String(recipeId) }, request: mkReq({ profile_id: 999 }) } as any)
).rejects.toMatchObject({ status: 404 });
});
it('404 on unknown recipe_id (FK violation)', async () => {
const profile = createProfile(testDb.current!, 'Tester');
await expect(
// eslint-disable-next-line @typescript-eslint/no-explicit-any
POST({ params: { id: '99999' }, request: mkReq({ profile_id: profile.id }) } as any)
).rejects.toMatchObject({ status: 404 });
});
});
// ---------------------------------------------------------------------------
// GET /api/recipes/all — sort=viewed + profile_id
// ---------------------------------------------------------------------------
import { GET as allGet } from '../../src/routes/api/recipes/all/+server';
describe('GET /api/recipes/all sort=viewed', () => {
it('passes profile_id through and returns viewed-order hits', async () => {
const db = openInMemoryForTest();
testDb.current = db;
const profile = createProfile(db, 'Test');
const a = seedRecipe(db, 'Apfel');
const b = seedRecipe(db, 'Birne');
recordView(db, profile.id, b);
await new Promise((r) => setTimeout(r, 1100));
recordView(db, profile.id, a);
const url = new URL(`http://localhost/api/recipes/all?sort=viewed&profile_id=${profile.id}&limit=10`);
const res = await allGet({ url } as never);
expect(res.status).toBe(200);
const body = await res.json();
expect(body.sort).toBe('viewed');
expect(body.hits.map((h: { id: number }) => h.id)).toEqual([a, b]);
});
it('400 on invalid sort', async () => {
const url = new URL('http://localhost/api/recipes/all?sort=invalid');
await expect(allGet({ url } as never)).rejects.toMatchObject({ status: 400 });
});
});

View File

@@ -123,7 +123,7 @@ describe('listShoppingList aggregation', () => {
const rows = listShoppingList(db).rows;
expect(rows).toHaveLength(1);
expect(rows[0].name_key).toBe('mehl');
expect(rows[0].unit_key).toBe('g');
expect(rows[0].unit_key).toBe('weight');
expect(rows[0].total_quantity).toBe(400);
expect(rows[0].from_recipes).toContain('Carbonara');
expect(rows[0].from_recipes).toContain('Lasagne');
@@ -201,15 +201,15 @@ describe('toggleCheck', () => {
it('marks a row as checked', () => {
const { db } = setupOneRowCart();
toggleCheck(db, 'mehl', 'g', true);
toggleCheck(db, 'mehl', 'weight', true);
const rows = listShoppingList(db).rows;
expect(rows[0].checked).toBe(1);
});
it('unchecks a row when passed false', () => {
const { db } = setupOneRowCart();
toggleCheck(db, 'mehl', 'g', true);
toggleCheck(db, 'mehl', 'g', false);
toggleCheck(db, 'mehl', 'weight', true);
toggleCheck(db, 'mehl', 'weight', false);
expect(listShoppingList(db).rows[0].checked).toBe(0);
});
@@ -225,7 +225,7 @@ describe('toggleCheck', () => {
}));
addRecipeToCart(db, a, null);
addRecipeToCart(db, b, null);
toggleCheck(db, 'mehl', 'g', true);
toggleCheck(db, 'mehl', 'weight', true);
// Rezept A weg, Mehl kommt noch aus B — check bleibt, mit neuer Menge
removeRecipeFromCart(db, a);
const rows = listShoppingList(db).rows;
@@ -304,3 +304,178 @@ describe('clearCart', () => {
expect(anyCheck).toBeUndefined();
});
});
describe('toggleCheck — stabil ueber Unit-Family', () => {
it('haekchen bleibt erhalten wenn Gesamtmenge von kg auf g faellt', () => {
const db = openInMemoryForTest();
const a = insertRecipe(
db,
recipe({
title: 'R1',
servings_default: 4,
ingredients: [{ position: 1, name: 'Kartoffeln', quantity: 500, unit: 'g', note: null, raw_text: '', section_heading: null }]
})
);
const b = insertRecipe(
db,
recipe({
title: 'R2',
servings_default: 4,
ingredients: [{ position: 1, name: 'Kartoffeln', quantity: 1, unit: 'kg', note: null, raw_text: '', section_heading: null }]
})
);
addRecipeToCart(db, a, null);
addRecipeToCart(db, b, null);
// Abhaken der konsolidierten 1,5-kg-Zeile via family-key
const before = listShoppingList(db).rows[0];
toggleCheck(db, before.name_key, before.unit_key, true);
expect(listShoppingList(db).rows[0].checked).toBe(1);
// Ein Rezept rausnehmen → nur noch 500 g, display wechselt auf g
removeRecipeFromCart(db, b);
const after = listShoppingList(db).rows[0];
expect(after.display_unit).toBe('g');
expect(after.total_quantity).toBe(500);
// Haekchen bleibt: unit_key ist weiterhin 'weight'
expect(after.checked).toBe(1);
});
it('clearCheckedItems respektiert family-key beim Orphan-Cleanup', () => {
const db = openInMemoryForTest();
const a = insertRecipe(
db,
recipe({
title: 'R1',
servings_default: 4,
ingredients: [
{ position: 1, name: 'Kartoffeln', quantity: 500, unit: 'g', note: null, raw_text: '', section_heading: null },
{ position: 2, name: 'Salz', quantity: 1, unit: 'Prise', note: null, raw_text: '', section_heading: null }
]
})
);
addRecipeToCart(db, a, null);
const rows = listShoppingList(db).rows;
// Alle abhaken
for (const r of rows) toggleCheck(db, r.name_key, r.unit_key, true);
clearCheckedItems(db);
// Das Rezept sollte raus sein
expect(listShoppingList(db).recipes).toHaveLength(0);
// Check-Tabelle sollte leer sein (keine Orphans)
const remaining = (db.prepare('SELECT COUNT(*) AS c FROM shopping_cart_check').get() as { c: number }).c;
expect(remaining).toBe(0);
});
});
describe('listShoppingList — Konsolidierung ueber Einheiten', () => {
it('fasst 500 g + 1 kg Kartoffeln zu 1,5 kg zusammen', () => {
const db = openInMemoryForTest();
const a = insertRecipe(
db,
recipe({
title: 'Kartoffelsuppe',
servings_default: 4,
ingredients: [
{ position: 1, name: 'Kartoffeln', quantity: 500, unit: 'g', note: null, raw_text: '', section_heading: null }
]
})
);
const b = insertRecipe(
db,
recipe({
title: 'Kartoffelpuffer',
servings_default: 4,
ingredients: [
{ position: 1, name: 'Kartoffeln', quantity: 1, unit: 'kg', note: null, raw_text: '', section_heading: null }
]
})
);
addRecipeToCart(db, a, null);
addRecipeToCart(db, b, null);
const snap = listShoppingList(db);
const kartoffeln = snap.rows.filter((r) => r.display_name.toLowerCase() === 'kartoffeln');
expect(kartoffeln).toHaveLength(1);
expect(kartoffeln[0].total_quantity).toBe(1.5);
expect(kartoffeln[0].display_unit).toBe('kg');
});
it('kombiniert ml + l korrekt (400 ml + 0,5 l → 900 ml)', () => {
const db = openInMemoryForTest();
const a = insertRecipe(
db,
recipe({
title: 'R1',
servings_default: 4,
ingredients: [{ position: 1, name: 'Milch', quantity: 400, unit: 'ml', note: null, raw_text: '', section_heading: null }]
})
);
const b = insertRecipe(
db,
recipe({
title: 'R2',
servings_default: 4,
ingredients: [{ position: 1, name: 'Milch', quantity: 0.5, unit: 'l', note: null, raw_text: '', section_heading: null }]
})
);
addRecipeToCart(db, a, null);
addRecipeToCart(db, b, null);
const milch = listShoppingList(db).rows.filter((r) => r.display_name.toLowerCase() === 'milch');
expect(milch).toHaveLength(1);
expect(milch[0].total_quantity).toBe(900);
expect(milch[0].display_unit).toBe('ml');
});
it('laesst inkompatible Families getrennt (5 Stueck Eier + 500 g Eier = 2 Zeilen)', () => {
const db = openInMemoryForTest();
const a = insertRecipe(
db,
recipe({
title: 'R1',
servings_default: 4,
ingredients: [{ position: 1, name: 'Eier', quantity: 5, unit: 'Stück', note: null, raw_text: '', section_heading: null }]
})
);
const b = insertRecipe(
db,
recipe({
title: 'R2',
servings_default: 4,
ingredients: [{ position: 1, name: 'Eier', quantity: 500, unit: 'g', note: null, raw_text: '', section_heading: null }]
})
);
addRecipeToCart(db, a, null);
addRecipeToCart(db, b, null);
const eier = listShoppingList(db).rows.filter((r) => r.display_name.toLowerCase() === 'eier');
expect(eier).toHaveLength(2);
});
it('summiert gleiche Unit-Family ohne Konversion (2 Bund + 1 Bund → 3 Bund)', () => {
const db = openInMemoryForTest();
const a = insertRecipe(
db,
recipe({
title: 'R1',
servings_default: 4,
ingredients: [{ position: 1, name: 'Petersilie', quantity: 2, unit: 'Bund', note: null, raw_text: '', section_heading: null }]
})
);
const b = insertRecipe(
db,
recipe({
title: 'R2',
servings_default: 4,
ingredients: [{ position: 1, name: 'Petersilie', quantity: 1, unit: 'Bund', note: null, raw_text: '', section_heading: null }]
})
);
addRecipeToCart(db, a, null);
addRecipeToCart(db, b, null);
const petersilie = listShoppingList(db).rows.filter((r) => r.display_name.toLowerCase() === 'petersilie');
expect(petersilie).toHaveLength(1);
expect(petersilie[0].total_quantity).toBe(3);
expect(petersilie[0].display_unit?.toLowerCase()).toBe('bund');
});
});

View File

@@ -16,10 +16,10 @@ describe('formatQuantity', () => {
});
it('renders fractional with up to 2 decimals, trailing zeros trimmed', () => {
expect(formatQuantity(0.5)).toBe('0.5');
expect(formatQuantity(0.333333)).toBe('0.33');
expect(formatQuantity(1.1)).toBe('1.1');
expect(formatQuantity(1.1)).toBe('1.1');
expect(formatQuantity(0.5)).toBe('0,5');
expect(formatQuantity(0.333333)).toBe('0,33');
expect(formatQuantity(1.1)).toBe('1,1');
expect(formatQuantity(1.1)).toBe('1,1');
});
it('handles zero', () => {

View File

@@ -0,0 +1,107 @@
import { describe, it, expect } from 'vitest';
import { unitFamily, consolidate } from '../../src/lib/server/unit-consolidation';
describe('unitFamily', () => {
it('maps g and kg to weight', () => {
expect(unitFamily('g')).toBe('weight');
expect(unitFamily('kg')).toBe('weight');
});
it('maps ml and l to volume', () => {
expect(unitFamily('ml')).toBe('volume');
expect(unitFamily('l')).toBe('volume');
});
it('lowercases and trims unknown units', () => {
expect(unitFamily(' Bund ')).toBe('bund');
expect(unitFamily('TL')).toBe('tl');
expect(unitFamily('Stück')).toBe('stück');
});
it('is case-insensitive for weight/volume', () => {
expect(unitFamily('Kg')).toBe('weight');
expect(unitFamily('ML')).toBe('volume');
});
it('returns empty string for null/undefined/empty', () => {
expect(unitFamily(null)).toBe('');
expect(unitFamily(undefined)).toBe('');
expect(unitFamily('')).toBe('');
expect(unitFamily(' ')).toBe('');
});
});
describe('consolidate', () => {
it('kombiniert 500 g + 1 kg zu 1,5 kg', () => {
const out = consolidate([
{ quantity: 500, unit: 'g' },
{ quantity: 1, unit: 'kg' }
]);
expect(out).toEqual({ quantity: 1.5, unit: 'kg' });
});
it('bleibt bei g wenn Summe < 1 kg', () => {
const out = consolidate([
{ quantity: 200, unit: 'g' },
{ quantity: 300, unit: 'g' }
]);
expect(out).toEqual({ quantity: 500, unit: 'g' });
});
it('promoted bei exakt 1000 g (Boundary)', () => {
const out = consolidate([
{ quantity: 1000, unit: 'g' }
]);
expect(out).toEqual({ quantity: 1, unit: 'kg' });
});
it('kombiniert ml + l analog (400 ml + 0,5 l → 900 ml)', () => {
const out = consolidate([
{ quantity: 400, unit: 'ml' },
{ quantity: 0.5, unit: 'l' }
]);
expect(out).toEqual({ quantity: 900, unit: 'ml' });
});
it('promoted zu l ab 1000 ml (0,5 l + 0,8 l → 1,3 l)', () => {
const out = consolidate([
{ quantity: 0.5, unit: 'l' },
{ quantity: 0.8, unit: 'l' }
]);
expect(out).toEqual({ quantity: 1.3, unit: 'l' });
});
it('summiert gleiche nicht-family-units (2 Bund + 1 Bund → 3 Bund)', () => {
const out = consolidate([
{ quantity: 2, unit: 'Bund' },
{ quantity: 1, unit: 'Bund' }
]);
expect(out).toEqual({ quantity: 3, unit: 'Bund' });
});
it('behandelt quantity=null als 0', () => {
const out = consolidate([
{ quantity: null, unit: 'TL' },
{ quantity: 1, unit: 'TL' }
]);
expect(out).toEqual({ quantity: 1, unit: 'TL' });
});
it('gibt null zurueck wenn alle quantities null sind', () => {
const out = consolidate([
{ quantity: null, unit: 'Prise' },
{ quantity: null, unit: 'Prise' }
]);
expect(out).toEqual({ quantity: null, unit: 'Prise' });
});
it('rundet Float-Artefakte auf 2 Dezimalen (0,1 + 0,2 kg → 0,3 kg)', () => {
const out = consolidate([
{ quantity: 0.1, unit: 'kg' },
{ quantity: 0.2, unit: 'kg' }
]);
// 0.1 + 0.2 in kg = 0.3 kg, in g = 300 → promoted? 300 < 1000 → 300 g
expect(out).toEqual({ quantity: 300, unit: 'g' });
});
it('nimmt unit vom ersten Eintrag bei unbekannter family', () => {
const out = consolidate([{ quantity: 5, unit: 'Stück' }]);
expect(out).toEqual({ quantity: 5, unit: 'Stück' });
});
});