From 754f43c135463dcdd51d7a7376857ca9fadeba79 Mon Sep 17 00:00:00 2001 From: Michael Genson <71845777+michael-genson@users.noreply.github.com> Date: Fri, 11 Jul 2025 16:33:59 +0000 Subject: [PATCH] remove misc flag references --- mealie/repos/repository_recipes.py | 1 - mealie/services/household_services/shopping_lists.py | 3 --- mealie/services/migrations/_migration_base.py | 1 - mealie/services/parser_services/ingredient_parser.py | 2 -- mealie/services/recipe/recipe_service.py | 1 - mealie/services/user_services/registration_service.py | 1 - 6 files changed, 9 deletions(-) diff --git a/mealie/repos/repository_recipes.py b/mealie/repos/repository_recipes.py index 7250e681b..354efa413 100644 --- a/mealie/repos/repository_recipes.py +++ b/mealie/repos/repository_recipes.py @@ -440,7 +440,6 @@ class RepositoryRecipes(HouseholdRepositoryGeneric[Recipe, RecipeModel]): ) q = ( q.join(settings_alias, self.model.settings) - .filter(settings_alias.disable_amount == False) # noqa: E712 - required for SQLAlchemy comparison .outerjoin(unmatched_foods_query, self.model.id == unmatched_foods_query.c.recipe_id) .outerjoin(total_user_foods_query, self.model.id == total_user_foods_query.c.recipe_id) .filter( diff --git a/mealie/services/household_services/shopping_lists.py b/mealie/services/household_services/shopping_lists.py index b7ba8bb28..6fef00672 100644 --- a/mealie/services/household_services/shopping_lists.py +++ b/mealie/services/household_services/shopping_lists.py @@ -312,12 +312,10 @@ class ShoppingListService: list_items: list[ShoppingListItemCreate] = [] for ingredient in recipe_ingredients: if isinstance(ingredient.food, IngredientFood): - is_food = True food_id = ingredient.food.id label_id = ingredient.food.label_id else: - is_food = False food_id = None label_id = None @@ -329,7 +327,6 @@ class ShoppingListService: new_item = ShoppingListItemCreate( shopping_list_id=list_id, - is_food=is_food, note=ingredient.note, quantity=ingredient.quantity * scale if ingredient.quantity else 0, food_id=food_id, diff --git a/mealie/services/migrations/_migration_base.py b/mealie/services/migrations/_migration_base.py index 1f7cf574d..0c13867c3 100644 --- a/mealie/services/migrations/_migration_base.py +++ b/mealie/services/migrations/_migration_base.py @@ -177,7 +177,6 @@ class BaseMigrator(BaseService): show_assets=self.household.preferences.recipe_show_assets, landscape_view=self.household.preferences.recipe_landscape_view, disable_comments=self.household.preferences.recipe_disable_comments, - disable_amount=self.household.preferences.recipe_disable_amount, ) for recipe in validated_recipes: diff --git a/mealie/services/parser_services/ingredient_parser.py b/mealie/services/parser_services/ingredient_parser.py index 648d861bf..77a17909b 100644 --- a/mealie/services/parser_services/ingredient_parser.py +++ b/mealie/services/parser_services/ingredient_parser.py @@ -36,7 +36,6 @@ class BruteForceParser(ABCIngredientParser): ingredient=RecipeIngredient( unit=CreateIngredientUnit(name=bfi.unit), food=CreateIngredientFood(name=bfi.food), - disable_amount=False, quantity=bfi.amount, note=bfi.note, ), @@ -151,7 +150,6 @@ class NLPParser(ABCIngredientParser): quantity=qty, unit=CreateIngredientUnit(name=unit) if unit else None, food=CreateIngredientFood(name=food) if food else None, - disable_amount=False, note=note, ), ) diff --git a/mealie/services/recipe/recipe_service.py b/mealie/services/recipe/recipe_service.py index 0040ff88a..c8d3f033a 100644 --- a/mealie/services/recipe/recipe_service.py +++ b/mealie/services/recipe/recipe_service.py @@ -167,7 +167,6 @@ class RecipeService(RecipeServiceBase): show_assets=self.household.preferences.recipe_show_assets, landscape_view=self.household.preferences.recipe_landscape_view, disable_comments=self.household.preferences.recipe_disable_comments, - disable_amount=self.household.preferences.recipe_disable_amount, ) else: data.settings = RecipeSettings() diff --git a/mealie/services/user_services/registration_service.py b/mealie/services/user_services/registration_service.py index 08ca36f01..30cb9400e 100644 --- a/mealie/services/user_services/registration_service.py +++ b/mealie/services/user_services/registration_service.py @@ -74,7 +74,6 @@ class RegistrationService: recipe_show_assets=self.registration.advanced, recipe_landscape_view=False, recipe_disable_comments=self.registration.advanced, - recipe_disable_amount=self.registration.advanced, ) return HouseholdService.create_household(group_repos, household_data, household_preferences)