Mirrors/mealie
1
0
Fork 0
mirror of https://github.com/mealie-recipes/mealie.git synced 2026-04-14 00:45:35 -04:00
Code Issues Packages Projects Releases Wiki Activity

fix: Removing a recipe ingredient doesn't remove its links to steps (#6896)

Browse Source 
Co-authored-by: Michael Genson <genson.michael@gmail.com>
Co-authored-by: Michael Genson <71845777+michael-genson@users.noreply.github.com>
This commit is contained in:
Rohan Shah
2026-03-27 00:55:34 +05:30
committed by GitHub
parent 41c3f1fced
commit 93d51a2fdb
2 changed files with 79 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
mealie/services/recipe/recipe_service.py
View File

@@ -463,6 +463,24 @@ class RecipeService(RecipeServiceBase):
return recipe
def _remove_non_existent_ingredient_references(self, update_data: Recipe) -> Recipe:
"""Removes the references of ingredients from steps that no longer exist."""
current_ingredient_reference_ids = set() # set of current ingredient(s) reference id's
for ingredient in update_data.recipe_ingredient:
current_ingredient_reference_ids.add(ingredient.reference_id)
recipe_instructions = update_data.recipe_instructions
if recipe_instructions is not None:
for instruction in recipe_instructions:
instruction.ingredient_references = [
ref
for ref in instruction.ingredient_references
if ref.reference_id in current_ingredient_reference_ids
]
return update_data
def _resolve_ingredient_sub_recipes(self, update_data: Recipe) -> Recipe:
"""Resolve all referenced_recipe slugs to IDs within the current group."""
if not update_data.recipe_ingredient:
@@ -488,7 +506,7 @@ class RecipeService(RecipeServiceBase):
def update_one(self, slug_or_id: str | UUID, update_data: Recipe) -> Recipe:
recipe = self._pre_update_check(slug_or_id, update_data)
# Resolve sub-recipe references before passing to repository
update_data = self._remove_non_existent_ingredient_references(update_data)
update_data = self._resolve_ingredient_sub_recipes(update_data)
new_data = self.group_recipes.update(recipe.slug, update_data)