Mirrors/mealie
1
0
Fork 0
mirror of https://github.com/mealie-recipes/mealie.git synced 2025-11-03 18:53:17 -05:00
Code Issues Packages Projects Releases Wiki Activity

account for slugs or recipes when constructing user favorites

Browse Source
This commit is contained in:
Michael Genson
2024-03-11 00:13:57 +00:00
parent 5f6844eceb
commit 05e13e6078
1 changed files with 13 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
mealie/schema/user/user.py
View File

@@ -107,7 +107,7 @@ class UserOut(UserBase):
group_slug: str group_slug: str
tokens: list[LongLiveTokenOut] | None = None tokens: list[LongLiveTokenOut] | None = None
cache_key: str cache_key: str
favorite_recipes: Annotated[list[str] | None, Field(validate_default=True)] = [] favorite_recipes: Annotated[list[str], Field(validate_default=True)] = []
model_config = ConfigDict(from_attributes=True) model_config = ConfigDict(from_attributes=True)
@property @property
@@ -119,8 +119,18 @@ class UserOut(UserBase):
return [joinedload(User.group), joinedload(User.favorite_recipes), joinedload(User.tokens)] return [joinedload(User.group), joinedload(User.favorite_recipes), joinedload(User.tokens)]
@field_validator("favorite_recipes", mode="before") @field_validator("favorite_recipes", mode="before")
def convert_favorite_recipes_to_slugs(cls, v): def convert_favorite_recipes_to_slugs(cls, v: list[str | RecipeSummary] | None):
return [recipe.slug for recipe in v] if v else v if not v:
return []
slugs: list[str] = []
for recipe in v:
if isinstance(recipe, str):
slugs.append(recipe)
else:
slugs.append(recipe.slug)
return slugs
class UserPagination(PaginationBase): class UserPagination(PaginationBase):