From 8b48470f76866c412b1f54f8972a9a4d6612308d Mon Sep 17 00:00:00 2001 From: Michael Genson <71845777+michael-genson@users.noreply.github.com> Date: Fri, 11 Jul 2025 16:16:10 +0000 Subject: [PATCH] move is_food and disable_amount fields to deprecated --- mealie/db/models/household/preferences.py | 2 ++ mealie/db/models/household/shopping_list.py | 4 +++- mealie/db/models/recipe/settings.py | 4 +++- 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/mealie/db/models/household/preferences.py b/mealie/db/models/household/preferences.py index a6de03c37..88f9ae728 100644 --- a/mealie/db/models/household/preferences.py +++ b/mealie/db/models/household/preferences.py @@ -31,6 +31,8 @@ class HouseholdPreferencesModel(SqlAlchemyBase, BaseMixins): recipe_show_assets: Mapped[bool | None] = mapped_column(sa.Boolean, default=False) recipe_landscape_view: Mapped[bool | None] = mapped_column(sa.Boolean, default=False) recipe_disable_comments: Mapped[bool | None] = mapped_column(sa.Boolean, default=False) + + # Deprecated recipe_disable_amount: Mapped[bool | None] = mapped_column(sa.Boolean, default=True) @auto_init() diff --git a/mealie/db/models/household/shopping_list.py b/mealie/db/models/household/shopping_list.py index f07610742..1a2d38290 100644 --- a/mealie/db/models/household/shopping_list.py +++ b/mealie/db/models/household/shopping_list.py @@ -65,7 +65,6 @@ class ShoppingListItem(SqlAlchemyBase, BaseMixins): quantity: Mapped[float | None] = mapped_column(Float, default=1) note: Mapped[str | None] = mapped_column(String) - is_food: Mapped[bool | None] = mapped_column(Boolean, default=False) extras: Mapped[list[ShoppingListItemExtras]] = orm.relationship( "ShoppingListItemExtras", cascade="all, delete-orphan" ) @@ -88,6 +87,9 @@ class ShoppingListItem(SqlAlchemyBase, BaseMixins): ) model_config = ConfigDict(exclude={"label", "food", "unit"}) + # Deprecated + is_food: Mapped[bool | None] = mapped_column(Boolean, default=False) + @api_extras @auto_init() def __init__(self, **_) -> None: diff --git a/mealie/db/models/recipe/settings.py b/mealie/db/models/recipe/settings.py index b645a578d..2e412e5b1 100644 --- a/mealie/db/models/recipe/settings.py +++ b/mealie/db/models/recipe/settings.py @@ -13,10 +13,12 @@ class RecipeSettings(SqlAlchemyBase): show_nutrition: Mapped[bool | None] = mapped_column(sa.Boolean) show_assets: Mapped[bool | None] = mapped_column(sa.Boolean) landscape_view: Mapped[bool | None] = mapped_column(sa.Boolean) - disable_amount: Mapped[bool | None] = mapped_column(sa.Boolean, default=True) disable_comments: Mapped[bool | None] = mapped_column(sa.Boolean, default=False) locked: Mapped[bool | None] = mapped_column(sa.Boolean, default=False) + # Deprecated + disable_amount: Mapped[bool | None] = mapped_column(sa.Boolean, default=True) + def __init__( self, public=True,