feat(db): section_heading roundtrip in recipe-repository
INSERT/SELECT in insertRecipe, replaceIngredients und getRecipeById um section_heading ergänzt. IngredientSchema im PATCH-Endpoint sowie Ingredient-Fixtures in search-local-, scaler- und repository-Tests auf das neue Pflichtfeld aktualisiert. Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
This commit is contained in:
@@ -64,11 +64,11 @@ export function insertRecipe(db: Database.Database, recipe: Recipe): number {
|
|||||||
const id = Number(info.lastInsertRowid);
|
const id = Number(info.lastInsertRowid);
|
||||||
|
|
||||||
const insIng = db.prepare(
|
const insIng = db.prepare(
|
||||||
`INSERT INTO ingredient(recipe_id, position, quantity, unit, name, note, raw_text)
|
`INSERT INTO ingredient(recipe_id, position, quantity, unit, name, note, raw_text, section_heading)
|
||||||
VALUES (?, ?, ?, ?, ?, ?, ?)`
|
VALUES (?, ?, ?, ?, ?, ?, ?, ?)`
|
||||||
);
|
);
|
||||||
for (const ing of recipe.ingredients) {
|
for (const ing of recipe.ingredients) {
|
||||||
insIng.run(id, ing.position, ing.quantity, ing.unit, ing.name, ing.note, ing.raw_text);
|
insIng.run(id, ing.position, ing.quantity, ing.unit, ing.name, ing.note, ing.raw_text, ing.section_heading);
|
||||||
}
|
}
|
||||||
|
|
||||||
const insStep = db.prepare(
|
const insStep = db.prepare(
|
||||||
@@ -104,7 +104,7 @@ export function getRecipeById(db: Database.Database, id: number): Recipe | null
|
|||||||
|
|
||||||
const ingredients = db
|
const ingredients = db
|
||||||
.prepare(
|
.prepare(
|
||||||
`SELECT position, quantity, unit, name, note, raw_text
|
`SELECT position, quantity, unit, name, note, raw_text, section_heading
|
||||||
FROM ingredient WHERE recipe_id = ? ORDER BY position`
|
FROM ingredient WHERE recipe_id = ? ORDER BY position`
|
||||||
)
|
)
|
||||||
.all(id) as Ingredient[];
|
.all(id) as Ingredient[];
|
||||||
@@ -215,11 +215,11 @@ export function replaceIngredients(
|
|||||||
const tx = db.transaction(() => {
|
const tx = db.transaction(() => {
|
||||||
db.prepare('DELETE FROM ingredient WHERE recipe_id = ?').run(recipeId);
|
db.prepare('DELETE FROM ingredient WHERE recipe_id = ?').run(recipeId);
|
||||||
const ins = db.prepare(
|
const ins = db.prepare(
|
||||||
`INSERT INTO ingredient(recipe_id, position, quantity, unit, name, note, raw_text)
|
`INSERT INTO ingredient(recipe_id, position, quantity, unit, name, note, raw_text, section_heading)
|
||||||
VALUES (?, ?, ?, ?, ?, ?, ?)`
|
VALUES (?, ?, ?, ?, ?, ?, ?, ?)`
|
||||||
);
|
);
|
||||||
for (const ing of ingredients) {
|
for (const ing of ingredients) {
|
||||||
ins.run(recipeId, ing.position, ing.quantity, ing.unit, ing.name, ing.note, ing.raw_text);
|
ins.run(recipeId, ing.position, ing.quantity, ing.unit, ing.name, ing.note, ing.raw_text, ing.section_heading);
|
||||||
}
|
}
|
||||||
refreshFts(db, recipeId);
|
refreshFts(db, recipeId);
|
||||||
});
|
});
|
||||||
|
|||||||
@@ -24,7 +24,8 @@ const IngredientSchema = z.object({
|
|||||||
unit: z.string().max(30).nullable(),
|
unit: z.string().max(30).nullable(),
|
||||||
name: z.string().min(1).max(200),
|
name: z.string().min(1).max(200),
|
||||||
note: z.string().max(300).nullable(),
|
note: z.string().max(300).nullable(),
|
||||||
raw_text: z.string().max(500)
|
raw_text: z.string().max(500),
|
||||||
|
section_heading: z.string().max(200).nullable()
|
||||||
});
|
});
|
||||||
|
|
||||||
const StepSchema = z.object({
|
const StepSchema = z.object({
|
||||||
|
|||||||
@@ -70,7 +70,8 @@ describe('recipe repository', () => {
|
|||||||
unit: 'g',
|
unit: 'g',
|
||||||
name: 'Pancetta',
|
name: 'Pancetta',
|
||||||
note: null,
|
note: null,
|
||||||
raw_text: '200 g Pancetta'
|
raw_text: '200 g Pancetta',
|
||||||
|
section_heading: null
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
tags: ['Italienisch']
|
tags: ['Italienisch']
|
||||||
@@ -118,13 +119,13 @@ describe('recipe repository', () => {
|
|||||||
baseRecipe({
|
baseRecipe({
|
||||||
title: 'Pasta',
|
title: 'Pasta',
|
||||||
ingredients: [
|
ingredients: [
|
||||||
{ position: 1, quantity: 200, unit: 'g', name: 'Pancetta', note: null, raw_text: '200 g Pancetta' }
|
{ position: 1, quantity: 200, unit: 'g', name: 'Pancetta', note: null, raw_text: '200 g Pancetta', section_heading: null }
|
||||||
]
|
]
|
||||||
})
|
})
|
||||||
);
|
);
|
||||||
replaceIngredients(db, id, [
|
replaceIngredients(db, id, [
|
||||||
{ position: 1, quantity: 500, unit: 'g', name: 'Nudeln', note: null, raw_text: '500 g Nudeln' },
|
{ position: 1, quantity: 500, unit: 'g', name: 'Nudeln', note: null, raw_text: '500 g Nudeln', section_heading: null },
|
||||||
{ position: 2, quantity: 2, unit: null, name: 'Eier', note: null, raw_text: '2 Eier' }
|
{ position: 2, quantity: 2, unit: null, name: 'Eier', note: null, raw_text: '2 Eier', section_heading: null }
|
||||||
]);
|
]);
|
||||||
const loaded = getRecipeById(db, id);
|
const loaded = getRecipeById(db, id);
|
||||||
expect(loaded?.ingredients.length).toBe(2);
|
expect(loaded?.ingredients.length).toBe(2);
|
||||||
@@ -154,4 +155,31 @@ describe('recipe repository', () => {
|
|||||||
const loaded = getRecipeById(db, id);
|
const loaded = getRecipeById(db, id);
|
||||||
expect(loaded?.steps.map((s) => s.text)).toEqual(['Erst', 'Dann']);
|
expect(loaded?.steps.map((s) => s.text)).toEqual(['Erst', 'Dann']);
|
||||||
});
|
});
|
||||||
|
|
||||||
|
it('persistiert section_heading und gibt es beim Laden zurueck', () => {
|
||||||
|
const db = openInMemoryForTest();
|
||||||
|
const recipe = baseRecipe({
|
||||||
|
title: 'Torte',
|
||||||
|
ingredients: [
|
||||||
|
{ position: 1, quantity: 200, unit: 'g', name: 'Mehl', note: null, raw_text: '200 g Mehl', section_heading: 'Für den Teig' },
|
||||||
|
{ position: 2, quantity: 100, unit: 'g', name: 'Zucker', note: null, raw_text: '100 g Zucker', section_heading: null },
|
||||||
|
{ position: 3, quantity: 300, unit: 'g', name: 'Beeren', note: null, raw_text: '300 g Beeren', section_heading: 'Für die Füllung' }
|
||||||
|
]
|
||||||
|
});
|
||||||
|
const id = insertRecipe(db, recipe);
|
||||||
|
const loaded = getRecipeById(db, id);
|
||||||
|
expect(loaded!.ingredients[0].section_heading).toBe('Für den Teig');
|
||||||
|
expect(loaded!.ingredients[1].section_heading).toBeNull();
|
||||||
|
expect(loaded!.ingredients[2].section_heading).toBe('Für die Füllung');
|
||||||
|
});
|
||||||
|
|
||||||
|
it('replaceIngredients persistiert section_heading', () => {
|
||||||
|
const db = openInMemoryForTest();
|
||||||
|
const id = insertRecipe(db, baseRecipe({ title: 'X' }));
|
||||||
|
replaceIngredients(db, id, [
|
||||||
|
{ position: 1, quantity: null, unit: null, name: 'A', note: null, raw_text: 'A', section_heading: 'Kopf' }
|
||||||
|
]);
|
||||||
|
const loaded = getRecipeById(db, id);
|
||||||
|
expect(loaded!.ingredients[0].section_heading).toBe('Kopf');
|
||||||
|
});
|
||||||
});
|
});
|
||||||
|
|||||||
@@ -48,7 +48,7 @@ describe('searchLocal', () => {
|
|||||||
recipe({
|
recipe({
|
||||||
title: 'Pasta',
|
title: 'Pasta',
|
||||||
ingredients: [
|
ingredients: [
|
||||||
{ position: 1, quantity: 200, unit: 'g', name: 'Pancetta', note: null, raw_text: '' }
|
{ position: 1, quantity: 200, unit: 'g', name: 'Pancetta', note: null, raw_text: '', section_heading: null }
|
||||||
]
|
]
|
||||||
})
|
})
|
||||||
);
|
);
|
||||||
|
|||||||
@@ -8,7 +8,8 @@ const mk = (q: number | null, unit: string | null, name: string): Ingredient =>
|
|||||||
unit,
|
unit,
|
||||||
name,
|
name,
|
||||||
note: null,
|
note: null,
|
||||||
raw_text: ''
|
raw_text: '',
|
||||||
|
section_heading: null
|
||||||
});
|
});
|
||||||
|
|
||||||
describe('roundQuantity', () => {
|
describe('roundQuantity', () => {
|
||||||
|
|||||||
Reference in New Issue
Block a user