Mirrors/mealie
1
0
Fork 0
mirror of https://github.com/mealie-recipes/mealie.git synced 2026-01-24 09:42:55 -05:00
Code Issues Packages Projects Releases Wiki Activity

updated models/services/tests to include user_id

Browse Source
This commit is contained in:
Michael Genson
2024-02-23 17:02:32 +00:00
parent 74d6f58363
commit 0bf3aed287
7 changed files with 19 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
mealie/services/group_services/shopping_lists.py
View File

@@ -19,13 +19,14 @@ from mealie.schema.group.group_shopping_list import (
)
from mealie.schema.recipe.recipe_ingredient import IngredientFood, IngredientUnit, RecipeIngredient
from mealie.schema.response.pagination import OrderDirection, PaginationQuery
from mealie.schema.user.user import GroupInDB
from mealie.schema.user.user import GroupInDB, UserOut
class ShoppingListService:
def __init__(self, repos: AllRepositories, group: GroupInDB):
def __init__(self, repos: AllRepositories, group: GroupInDB, user: UserOut):
self.repos = repos
self.group = group
self.user = user
self.shopping_lists = repos.group_shopping_lists
self.list_items = repos.group_shopping_list_item
self.list_item_refs = repos.group_shopping_list_item_references
@@ -476,7 +477,7 @@ class ShoppingListService:
return self.shopping_lists.get_one(shopping_list.id), items # type: ignore
def create_one_list(self, data: ShoppingListCreate):
create_data = data.cast(ShoppingListSave, group_id=self.group.id)
create_data = data.cast(ShoppingListSave, group_id=self.group.id, user_id=self.user.id)
new_list = self.shopping_lists.create(create_data) # type: ignore
labels = self.repos.group_multi_purpose_labels.by_group(self.group.id).page_all(

3
mealie/services/scheduler/tasks/delete_old_checked_shopping_list_items.py
View File

@@ -60,7 +60,8 @@ def delete_old_checked_list_items(group_id: UUID4 | None = None):
for group in groups:
event_bus_service = EventBusService(session=session, group_id=group.id)
shopping_list_service = ShoppingListService(repos, group)
# user is passed as None since we don't use it here
shopping_list_service = ShoppingListService(repos, group, None) # type: ignore
shopping_list_data = repos.group_shopping_lists.by_group(group.id).page_all(
PaginationQuery(page=1, per_page=-1)
)