From 16bbd21f886bbb52fa9bff41641ec6d907bc9281 Mon Sep 17 00:00:00 2001 From: hay-kot Date: Mon, 15 Mar 2021 16:42:18 -0800 Subject: [PATCH] fix meal plan this week --- mealie/routes/mealplans/crud.py | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/mealie/routes/mealplans/crud.py b/mealie/routes/mealplans/crud.py index e4a504ed0..484f928ef 100644 --- a/mealie/routes/mealplans/crud.py +++ b/mealie/routes/mealplans/crud.py @@ -59,10 +59,19 @@ def delete_meal_plan(plan_id, session: Session = Depends(generate_session)): @router.get("/this-week", response_model=MealPlanInDB) -def get_this_week(session: Session = Depends(generate_session)): +def get_this_week( + session: Session = Depends(generate_session), + current_user: UserInDB = Depends(manager), +): """ Returns the meal plan data for this week """ - return db.meals.get_all(session, limit=1, order_by="startDate") + group_in_db: GroupInDB = db.groups.get(session, current_user.group, "name") + + meals_sorted = sorted( + group_in_db.mealplans, key=lambda mealplan: mealplan.startDate + ) + + return meals_sorted[0] @router.get("/today", tags=["Meal Plan"])