fix: Listen in der Tagesuebersicht und Katalog-Makros uebernehmen
Tagebuchzeilen mit Liste gelten als zugeordnet. Berechnete Zutaten-Makros lassen sich am Tag in nutrition_log schreiben. Co-authored-by: Cursor <cursoragent@cursor.com>
This commit is contained in:
1 parent
44e3e216ab
commit
95453d548a
10 files changed
+221
-28
No files matched your search
@@ -339,9 +339,11 @@ def list_nutrition_items(
|
||||
if date:
|
||||
cur.execute(
|
||||
"""
|
||||
SELECT i.*, f.name_de AS food_name_de, f.bls_code, f.catalog_kind
|
||||
SELECT i.*, f.name_de AS food_name_de, f.bls_code, f.catalog_kind,
|
||||
r.name_raw AS recipe_name_de
|
||||
FROM nutrition_items i
|
||||
LEFT JOIN food_catalog f ON f.id = i.food_id
|
||||
LEFT JOIN food_recipes r ON r.id = i.recipe_id
|
||||
WHERE i.profile_id=%s AND i.date=%s
|
||||
ORDER BY i.logged_at NULLS LAST, i.source_name_raw
|
||||
""",
|
||||
@@ -350,16 +352,19 @@ def list_nutrition_items(
|
||||
else:
|
||||
cur.execute(
|
||||
"""
|
||||
SELECT i.*, f.name_de AS food_name_de, f.bls_code, f.catalog_kind
|
||||
SELECT i.*, f.name_de AS food_name_de, f.bls_code, f.catalog_kind,
|
||||
r.name_raw AS recipe_name_de
|
||||
FROM nutrition_items i
|
||||
LEFT JOIN food_catalog f ON f.id = i.food_id
|
||||
LEFT JOIN food_recipes r ON r.id = i.recipe_id
|
||||
WHERE i.profile_id=%s
|
||||
ORDER BY i.date DESC, i.logged_at NULLS LAST
|
||||
LIMIT %s
|
||||
""",
|
||||
(pid, min(limit, 500)),
|
||||
)
|
||||
return [r2d(r) for r in cur.fetchall()]
|
||||
from data_layer.nutrition_items import annotate_nutrition_item
|
||||
return [annotate_nutrition_item(cur, pid, r2d(r)) for r in cur.fetchall()]
|
||||
|
||||
|
||||
@router.get("/unmapped")
|
||||
@@ -422,10 +427,13 @@ def create_food_recipe(
|
||||
session: dict = Depends(require_auth),
|
||||
):
|
||||
from data_layer.food_recipes import save_recipe
|
||||
from data_layer.nutrition_items import schedule_daily_nutrient_rebuild
|
||||
pid = get_pid(x_profile_id)
|
||||
try:
|
||||
with get_db() as conn:
|
||||
return save_recipe(get_cursor(conn), pid, body.model_dump())
|
||||
saved = save_recipe(get_cursor(conn), pid, body.model_dump())
|
||||
schedule_daily_nutrient_rebuild(pid, saved.get("dates_linked") or [], "Liste angelegt")
|
||||
return saved
|
||||
except ValueError as e:
|
||||
raise HTTPException(400, str(e)) from e
|
||||
|
||||
@@ -438,10 +446,13 @@ def update_food_recipe(
|
||||
session: dict = Depends(require_auth),
|
||||
):
|
||||
from data_layer.food_recipes import save_recipe
|
||||
from data_layer.nutrition_items import schedule_daily_nutrient_rebuild
|
||||
pid = get_pid(x_profile_id)
|
||||
try:
|
||||
with get_db() as conn:
|
||||
return save_recipe(get_cursor(conn), pid, body.model_dump(), recipe_id)
|
||||
saved = save_recipe(get_cursor(conn), pid, body.model_dump(), recipe_id)
|
||||
schedule_daily_nutrient_rebuild(pid, saved.get("dates_linked") or [], "Liste geändert")
|
||||
return saved
|
||||
except KeyError:
|
||||
raise HTTPException(404, "Rezept nicht gefunden") from None
|
||||
except ValueError as e:
|
||||
@@ -612,6 +623,35 @@ def resolve_import_conflicts(
|
||||
return {"applied": applied}
|
||||
|
||||
|
||||
@router.get("/days/{day}/macros")
|
||||
def get_day_macros(
|
||||
day: str,
|
||||
x_profile_id: Optional[str] = Header(default=None),
|
||||
session: dict = Depends(require_auth),
|
||||
):
|
||||
from data_layer.nutrition_items import day_macro_preview
|
||||
|
||||
pid = get_pid(x_profile_id)
|
||||
with get_db() as conn:
|
||||
return day_macro_preview(get_cursor(conn), pid, day)
|
||||
|
||||
|
||||
@router.post("/days/{day}/apply-catalog-macros")
|
||||
def apply_catalog_macros_for_day(
|
||||
day: str,
|
||||
x_profile_id: Optional[str] = Header(default=None),
|
||||
session: dict = Depends(require_auth),
|
||||
):
|
||||
from data_layer.nutrition_items import apply_day_catalog_macros
|
||||
|
||||
pid = get_pid(x_profile_id)
|
||||
try:
|
||||
with get_db() as conn:
|
||||
return apply_day_catalog_macros(get_cursor(conn), pid, day)
|
||||
except ValueError as e:
|
||||
raise HTTPException(400, str(e)) from e
|
||||
|
||||
|
||||
@router.put("/days/{day}/mark")
|
||||
def upsert_day_mark(
|
||||
day: str,
|
||||
|
||||
Reference in new issue
Block a user