feature/mealplanner-rewrite (#417)

* multiple recipes per day

* fix update

* meal-planner rewrite

* disable meal-tests

* spacing

Co-authored-by: hay-kot <hay-kot@pm.me>

mealie/routes/mealplans/crud.py

@@ -2,18 +2,18 @@ from fastapi import APIRouter, BackgroundTasks, Depends, HTTPException, status
 from mealie.db.database import db
 from mealie.db.db_setup import generate_session
 from mealie.routes.deps import get_current_user
-from mealie.schema.meal import MealPlanIn, MealPlanInDB
+from mealie.schema.meal import MealPlanIn, MealPlanOut
 from mealie.schema.user import GroupInDB, UserInDB
 from mealie.services.events import create_group_event
 from mealie.services.image import image
-from mealie.services.meal_services import get_todays_meal, process_meals
+from mealie.services.meal_services import get_todays_meal, set_mealplan_dates
 from sqlalchemy.orm.session import Session
 from starlette.responses import FileResponse
 
 router = APIRouter(prefix="/api/meal-plans", tags=["Meal Plan"])
 
 
-@router.get("/all", response_model=list[MealPlanInDB])
+@router.get("/all", response_model=list[MealPlanOut])
 def get_all_meals(
     current_user: UserInDB = Depends(get_current_user),
     session: Session = Depends(generate_session),
@@ -31,11 +31,11 @@ def create_meal_plan(
     current_user: UserInDB = Depends(get_current_user),
 ):
     """ Creates a meal plan database entry """
-    processed_plan = process_meals(session, data)
+    set_mealplan_dates(data)
     background_tasks.add_task(
         create_group_event, "Meal Plan Created", f"Mealplan Created for '{current_user.group}'", session=session
     )
-    return db.meals.create(session, processed_plan.dict())
+    return db.meals.create(session, data.dict())
 
 
 @router.put("/{plan_id}")
@@ -47,8 +47,8 @@ def update_meal_plan(
     current_user: UserInDB = Depends(get_current_user),
 ):
     """ Updates a meal plan based off ID """
-    processed_plan = process_meals(session, meal_plan)
-    processed_plan = MealPlanInDB(uid=plan_id, **processed_plan.dict())
+    set_mealplan_dates(meal_plan)
+    processed_plan = MealPlanOut(uid=plan_id, **meal_plan.dict())
     try:
         db.meals.update(session, plan_id, processed_plan.dict())
         background_tasks.add_task(
@@ -76,7 +76,7 @@ def delete_meal_plan(
         raise HTTPException(status.HTTP_400_BAD_REQUEST)
 
 
-@router.get("/this-week", response_model=MealPlanInDB)
+@router.get("/this-week", response_model=MealPlanOut)
 def get_this_week(session: Session = Depends(generate_session), current_user: UserInDB = Depends(get_current_user)):
     """ Returns the meal plan data for this week """
     plans = db.groups.get_meals(session, current_user.group)

mealie/routes/mealplans/helpers.py

@@ -1,11 +1,16 @@
 from fastapi import APIRouter, Depends
+from mealie.core.root_logger import get_logger
 from mealie.db.database import db
 from mealie.db.db_setup import generate_session
 from mealie.routes.deps import get_current_user
-from mealie.schema.meal import MealPlanInDB
+from mealie.schema.meal import MealPlanOut
 from mealie.schema.recipe import Recipe
+from mealie.schema.shopping_list import ListItem, ShoppingListIn, ShoppingListOut
+from mealie.schema.user import UserInDB
 from sqlalchemy.orm.session import Session
 
+logger = get_logger()
+
 router = APIRouter(prefix="/api/meal-plans", tags=["Meal Plan"])
 
 
@@ -13,12 +18,32 @@ router = APIRouter(prefix="/api/meal-plans", tags=["Meal Plan"])
 def get_shopping_list(
     id: str,
     session: Session = Depends(generate_session),
-    current_user=Depends(get_current_user),
+    current_user: UserInDB = Depends(get_current_user),
 ):
 
-    # ! Refactor into Single Database Call
-    mealplan = db.meals.get(session, id)
-    mealplan: MealPlanInDB
-    slugs = [x.slug for x in mealplan.meals]
-    recipes: list[Recipe] = [db.recipes.get(session, x) for x in slugs]
-    return [{"name": x.name, "recipe_ingredient": x.recipe_ingredient} for x in recipes if x]
+    mealplan: MealPlanOut = db.meals.get(session, id)
+
+    all_ingredients = []
+
+    for plan_day in mealplan.plan_days:
+        for meal in plan_day.meals:
+            if not meal.slug:
+                continue
+
+            try:
+                recipe: Recipe = db.recipes.get(session, meal.slug)
+                all_ingredients += recipe.recipe_ingredient
+            except Exception:
+                logger.error("Recipe Not Found")
+
+    new_list = ShoppingListIn(
+        name="MealPlan Shopping List", group=current_user.group, items=[ListItem(text=t) for t in all_ingredients]
+    )
+
+    created_list: ShoppingListOut = db.shopping_lists.create(session, new_list)
+
+    mealplan.shopping_list = created_list.id
+
+    db.meals.update(session, mealplan.uid, mealplan)
+
+    return created_list

mealie/routes/recipe/category_routes.py

@@ -5,10 +5,7 @@ from mealie.routes.deps import get_current_user
 from mealie.schema.category import CategoryIn, RecipeCategoryResponse
 from sqlalchemy.orm.session import Session
 
-router = APIRouter(
-    prefix="/api/categories",
-    tags=["Recipe Categories"],
-)
+router = APIRouter(prefix="/api/categories", tags=["Recipe Categories"])
 
 
 @router.get("")

mealie/routes/shopping_list.py

@@ -0,0 +1,40 @@
+from fastapi import APIRouter, Depends
+from mealie.db.database import db
+from mealie.db.db_setup import generate_session
+from mealie.routes.deps import get_current_user
+from mealie.schema.shopping_list import ShoppingListIn, ShoppingListOut
+from mealie.schema.user import UserInDB
+from sqlalchemy.orm.session import Session
+
+shopping_list_router = APIRouter(prefix="/api/shopping-lists", tags=["Shopping Lists"])
+
+
+@shopping_list_router.post("", response_model=ShoppingListOut)
+async def create_shopping_list(
+    list_in: ShoppingListIn,
+    current_user: UserInDB = Depends(get_current_user),
+    session: Session = Depends(generate_session),
+):
+    """ Create Shopping List in the Database """
+
+    list_in.group = current_user.group
+
+    return db.shopping_lists.create(session, list_in)
+
+
+@shopping_list_router.get("/{id}", response_model=ShoppingListOut)
+async def get_shopping_list(id: int, session: Session = Depends(generate_session)):
+    """ Get Shopping List from the Database """
+    return db.shopping_lists.get(session, id)
+
+
+@shopping_list_router.put("/{id}", dependencies=[Depends(get_current_user)], response_model=ShoppingListOut)
+async def update_shopping_list(id: int, new_data: ShoppingListIn, session: Session = Depends(generate_session)):
+    """ Update Shopping List in the Database """
+    return db.shopping_lists.update(session, id, new_data)
+
+
+@shopping_list_router.delete("/{id}", dependencies=[Depends(get_current_user)])
+async def delete_shopping_list(id: int, session: Session = Depends(generate_session)):
+    """ Delete Shopping List from the Database """
+    return db.shopping_lists.delete(session, id)