From 994940f270022e4491a37768f707d23d3b9283b7 Mon Sep 17 00:00:00 2001 From: Michael Genson <71845777+michael-genson@users.noreply.github.com> Date: Mon, 19 Feb 2024 16:05:50 +0000 Subject: [PATCH] more db model fixes --- mealie/db/models/group/shopping_list.py | 2 +- mealie/db/models/recipe/recipe.py | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/mealie/db/models/group/shopping_list.py b/mealie/db/models/group/shopping_list.py index a2184d8e3cd0..195a6cf3a04d 100644 --- a/mealie/db/models/group/shopping_list.py +++ b/mealie/db/models/group/shopping_list.py @@ -124,7 +124,7 @@ class ShoppingList(SqlAlchemyBase, BaseMixins): group: Mapped["Group"] = orm.relationship("Group", back_populates="shopping_lists") name: Mapped[str | None] = mapped_column(String) - list_items: Mapped[ShoppingListItem] = orm.relationship( + list_items: Mapped[list[ShoppingListItem]] = orm.relationship( ShoppingListItem, cascade="all, delete, delete-orphan", order_by="ShoppingListItem.position", diff --git a/mealie/db/models/recipe/recipe.py b/mealie/db/models/recipe/recipe.py index 598ff220066c..63632a6e304c 100644 --- a/mealie/db/models/recipe/recipe.py +++ b/mealie/db/models/recipe/recipe.py @@ -49,7 +49,7 @@ class RecipeModel(SqlAlchemyBase, BaseMixins): user_id: Mapped[GUID | None] = mapped_column(GUID, sa.ForeignKey("users.id", use_alter=True), index=True) user: Mapped["User"] = orm.relationship("User", uselist=False, foreign_keys=[user_id]) - meal_entries: Mapped["GroupMealPlan"] = orm.relationship( + meal_entries: Mapped[list["GroupMealPlan"]] = orm.relationship( "GroupMealPlan", back_populates="recipe", cascade="all, delete-orphan" ) @@ -72,7 +72,7 @@ class RecipeModel(SqlAlchemyBase, BaseMixins): recipe_yield: Mapped[str | None] = mapped_column(sa.String) recipeCuisine: Mapped[str | None] = mapped_column(sa.String) - assets: Mapped[RecipeAsset] = orm.relationship("RecipeAsset", cascade="all, delete-orphan") + assets: Mapped[list[RecipeAsset]] = orm.relationship("RecipeAsset", cascade="all, delete-orphan") nutrition: Mapped[Nutrition] = orm.relationship("Nutrition", uselist=False, cascade="all, delete-orphan") recipe_category: Mapped[list["Category"]] = orm.relationship( "Category", secondary=recipes_to_categories, back_populates="recipes"