feat: pantry notes/categories, ingredient-alias matching, cook-log edit/delete, fork-list popover (v0.83.0)
Pantry: notes + category fields (collapsible grouping like the shopping list), a "Merge duplicates" cleanup action, and fixed quantity display precision (was showing raw decimal(10,4) strings like "0.3333 kg" everywhere — pantry, shopping list, print views, Markdown exports). Ingredient-alias matching: the ingredients table (canonical name + aliases) existed but was never populated or used. Seeded ~10 bilingual EN/FR staples and wired resolution into pantry add/edit, can-cook scoring, auto-deduct-on-cook, and shopping-list pantry-awareness, so "sel"/"sel fin"/"table salt" are recognized as the same ingredient. Cook log: entries from "Mark cooked" can now be edited and deleted (previously log-only, no fix-a-mistake path). The "Cooked N times" text is a hover tooltip listing every date and opens a full manage sheet on click. Also: the "Forked by N others" backlink is now a click-to-open popover instead of an always-inline list. Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>
This commit is contained in:
@@ -0,0 +1,52 @@
|
||||
import { NextRequest, NextResponse } from "next/server";
|
||||
import { z } from "zod";
|
||||
import { db, cookingHistory, eq, and, isNull } from "@epicure/db";
|
||||
import { requireSessionOrApiKey } from "@/lib/api-auth";
|
||||
|
||||
type Params = { params: Promise<{ id: string; logId: string }> };
|
||||
|
||||
const PatchSchema = z.object({
|
||||
servings: z.number().int().min(1).max(1000).nullable().optional(),
|
||||
notes: z.string().max(2000).nullable().optional(),
|
||||
cookedAt: z.string().optional(),
|
||||
});
|
||||
|
||||
// Plain (non-batch) cook log entries only — see the sibling GET's comment.
|
||||
// Editing/deleting never touches pantry quantities: the deduction (if any)
|
||||
// already happened at creation time and isn't reversible from here.
|
||||
export async function PATCH(req: NextRequest, { params }: Params) {
|
||||
const { session, response } = await requireSessionOrApiKey(req);
|
||||
if (response) return response;
|
||||
const { id, logId } = await params;
|
||||
|
||||
const log = await db.query.cookingHistory.findFirst({
|
||||
where: and(eq(cookingHistory.id, logId), eq(cookingHistory.recipeId, id), eq(cookingHistory.userId, session!.user.id), isNull(cookingHistory.batchDishId)),
|
||||
});
|
||||
if (!log) return NextResponse.json({ error: "Not found" }, { status: 404 });
|
||||
|
||||
const parsed = PatchSchema.safeParse(await req.json().catch(() => null));
|
||||
if (!parsed.success) return NextResponse.json({ error: "Validation error" }, { status: 400 });
|
||||
|
||||
const data = parsed.data;
|
||||
const cookedAt = data.cookedAt ? new Date(data.cookedAt) : undefined;
|
||||
|
||||
await db.update(cookingHistory).set({
|
||||
...(data.servings !== undefined && { servings: data.servings ?? undefined }),
|
||||
...(data.notes !== undefined && { notes: data.notes ?? undefined }),
|
||||
...(cookedAt && !isNaN(cookedAt.getTime()) && { cookedAt }),
|
||||
}).where(eq(cookingHistory.id, logId));
|
||||
|
||||
return NextResponse.json({ updated: true });
|
||||
}
|
||||
|
||||
export async function DELETE(req: NextRequest, { params }: Params) {
|
||||
const { session, response } = await requireSessionOrApiKey(req);
|
||||
if (response) return response;
|
||||
const { id, logId } = await params;
|
||||
|
||||
await db.delete(cookingHistory).where(
|
||||
and(eq(cookingHistory.id, logId), eq(cookingHistory.recipeId, id), eq(cookingHistory.userId, session!.user.id), isNull(cookingHistory.batchDishId))
|
||||
);
|
||||
|
||||
return new NextResponse(null, { status: 204 });
|
||||
}
|
||||
Reference in New Issue
Block a user