From f78eb4ec39f041a58114cc02458e8bcff6737bfe Mon Sep 17 00:00:00 2001 From: hay-kot Date: Sat, 28 Aug 2021 17:42:12 -0800 Subject: [PATCH] fix(backend): :bug: fix error when assigning favorite recipe --- mealie/db/models/_model_utils.py | 2 +- mealie/db/models/recipe/recipe.py | 3 +++ mealie/services/user/user_service.py | 2 -- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/mealie/db/models/_model_utils.py b/mealie/db/models/_model_utils.py index cafb908c4a06..0199b186deeb 100644 --- a/mealie/db/models/_model_utils.py +++ b/mealie/db/models/_model_utils.py @@ -102,7 +102,7 @@ def auto_init(exclude: Union[set, list] = None): # sourcery no-metrics if len(val) > 0 and isinstance(val[0], dict): val = [elem.get("id") for elem in val] - instances = [relation_cls.get_ref(elem, session=session) for elem in val] + instances = [x for x in [relation_cls.get_ref(elem, session=session) for elem in val] if x] setattr(self, key, instances) return init(self, *args, **kwargs) diff --git a/mealie/db/models/recipe/recipe.py b/mealie/db/models/recipe/recipe.py index c4471e99dbaa..71026034e9c3 100644 --- a/mealie/db/models/recipe/recipe.py +++ b/mealie/db/models/recipe/recipe.py @@ -73,6 +73,9 @@ class RecipeModel(SqlAlchemyBase, BaseMixins): favorited_by_id = sa.Column(sa.Integer, sa.ForeignKey("users.id")) favorited_by = orm.relationship("User", back_populates="favorite_recipes") + class Config: + get_attr = "slug" + @validates("name") def validate_name(self, key, name): assert name != "" diff --git a/mealie/services/user/user_service.py b/mealie/services/user/user_service.py index e0e8fa7afbbe..9e4251f45922 100644 --- a/mealie/services/user/user_service.py +++ b/mealie/services/user/user_service.py @@ -15,8 +15,6 @@ logger = get_logger(module=__name__) class UserService: - """""" - def __init__(self, session: Session, acting_user: PrivateUser, background_tasks: BackgroundTasks = None) -> None: self.session = session or SessionLocal() self.acting_user = acting_user