Cutlery/mealie
1
0
Fork 0
mirror of https://github.com/mealie-recipes/mealie.git synced 2025-07-09 03:04:54 -04: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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
mealie/routes/groups/controller_shopping_lists.py
View File

@ -89,7 +89,7 @@ def publish_list_item_events(publisher: Callable, items_collection: ShoppingList
class ShoppingListItemController(BaseCrudController): class ShoppingListItemController(BaseCrudController):
@cached_property @cached_property
def service(self): def service(self):
return ShoppingListService(self.repos, self.group) return ShoppingListService(self.repos, self.group, self.user)
@cached_property @cached_property
def repo(self): def repo(self):
@ -154,7 +154,7 @@ router = APIRouter(prefix="/groups/shopping/lists", tags=["Group: Shopping Lists
class ShoppingListController(BaseCrudController): class ShoppingListController(BaseCrudController):
@cached_property @cached_property
def service(self): def service(self):
return ShoppingListService(self.repos, self.group) return ShoppingListService(self.repos, self.group, self.user)
@cached_property @cached_property
def repo(self): def repo(self):

1
mealie/schema/group/group_shopping_list.py
View File

@ -190,6 +190,7 @@ class ShoppingListRecipeRefOut(MealieModel):
class ShoppingListSave(ShoppingListCreate): class ShoppingListSave(ShoppingListCreate):
group_id: UUID4 group_id: UUID4
user_id: UUID4
class ShoppingListSummary(ShoppingListSave): class ShoppingListSummary(ShoppingListSave):

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.recipe.recipe_ingredient import IngredientFood, IngredientUnit, RecipeIngredient
from mealie.schema.response.pagination import OrderDirection, PaginationQuery 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: class ShoppingListService:
def __init__(self, repos: AllRepositories, group: GroupInDB): def __init__(self, repos: AllRepositories, group: GroupInDB, user: UserOut):
self.repos = repos self.repos = repos
self.group = group self.group = group
self.user = user
self.shopping_lists = repos.group_shopping_lists self.shopping_lists = repos.group_shopping_lists
self.list_items = repos.group_shopping_list_item self.list_items = repos.group_shopping_list_item
self.list_item_refs = repos.group_shopping_list_item_references 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 return self.shopping_lists.get_one(shopping_list.id), items # type: ignore
def create_one_list(self, data: ShoppingListCreate): 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 new_list = self.shopping_lists.create(create_data) # type: ignore
labels = self.repos.group_multi_purpose_labels.by_group(self.group.id).page_all( 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: for group in groups:
event_bus_service = EventBusService(session=session, group_id=group.id) 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( shopping_list_data = repos.group_shopping_lists.by_group(group.id).page_all(
PaginationQuery(page=1, per_page=-1) PaginationQuery(page=1, per_page=-1)
) )

6
tests/fixtures/fixture_shopping_lists.py vendored
View File

@ -29,7 +29,7 @@ def shopping_lists(database: AllRepositories, unique_user: TestUser):
for _ in range(3): for _ in range(3):
model = database.group_shopping_lists.create( model = database.group_shopping_lists.create(
ShoppingListSave(name=random_string(10), group_id=unique_user.group_id), ShoppingListSave(name=random_string(10), group_id=unique_user.group_id, user_id=unique_user.user_id),
) )
models.append(model) models.append(model)
@ -46,7 +46,7 @@ def shopping_lists(database: AllRepositories, unique_user: TestUser):
@pytest.fixture(scope="function") @pytest.fixture(scope="function")
def shopping_list(database: AllRepositories, unique_user: TestUser): def shopping_list(database: AllRepositories, unique_user: TestUser):
model = database.group_shopping_lists.create( model = database.group_shopping_lists.create(
ShoppingListSave(name=random_string(10), group_id=unique_user.group_id), ShoppingListSave(name=random_string(10), group_id=unique_user.group_id, user_id=unique_user.user_id),
) )
yield model yield model
@ -60,7 +60,7 @@ def shopping_list(database: AllRepositories, unique_user: TestUser):
@pytest.fixture(scope="function") @pytest.fixture(scope="function")
def list_with_items(database: AllRepositories, unique_user: TestUser): def list_with_items(database: AllRepositories, unique_user: TestUser):
list_model = database.group_shopping_lists.create( list_model = database.group_shopping_lists.create(
ShoppingListSave(name=random_string(10), group_id=unique_user.group_id), ShoppingListSave(name=random_string(10), group_id=unique_user.group_id, user_id=unique_user.user_id),
) )
for _ in range(10): for _ in range(10):

2
tests/unit_tests/repository_tests/test_pagination.py
View File

@ -758,7 +758,7 @@ def test_pagination_order_by_nulls(
def test_pagination_shopping_list_items_with_labels(database: AllRepositories, unique_user: TestUser): def test_pagination_shopping_list_items_with_labels(database: AllRepositories, unique_user: TestUser):
# create a shopping list and populate it with some items with labels, and some without labels # create a shopping list and populate it with some items with labels, and some without labels
shopping_list = database.group_shopping_lists.create( shopping_list = database.group_shopping_lists.create(
ShoppingListSave(name=random_string(), group_id=unique_user.group_id) ShoppingListSave(name=random_string(), group_id=unique_user.group_id, user_id=unique_user.user_id)
) )
labels = database.group_multi_purpose_labels.create_many( labels = database.group_multi_purpose_labels.create_many(

8
tests/unit_tests/services_tests/scheduler/tasks/test_delete_old_checked_shopping_list_items.py
View File

@ -14,7 +14,9 @@ def test_cleanup(database: AllRepositories, unique_user: TestUser):
list_repo = database.group_shopping_lists.by_group(unique_user.group_id) list_repo = database.group_shopping_lists.by_group(unique_user.group_id)
list_item_repo = database.group_shopping_list_item list_item_repo = database.group_shopping_list_item
shopping_list = list_repo.create(ShoppingListSave(name=random_string(), group_id=unique_user.group_id)) shopping_list = list_repo.create(
ShoppingListSave(name=random_string(), group_id=unique_user.group_id, user_id=unique_user.user_id)
)
unchecked_items = list_item_repo.create_many( unchecked_items = list_item_repo.create_many(
[ [
ShoppingListItemCreate(note=random_string(), shopping_list_id=shopping_list.id) ShoppingListItemCreate(note=random_string(), shopping_list_id=shopping_list.id)
@ -57,7 +59,9 @@ def test_no_cleanup(database: AllRepositories, unique_user: TestUser):
list_repo = database.group_shopping_lists.by_group(unique_user.group_id) list_repo = database.group_shopping_lists.by_group(unique_user.group_id)
list_item_repo = database.group_shopping_list_item list_item_repo = database.group_shopping_list_item
shopping_list = list_repo.create(ShoppingListSave(name=random_string(), group_id=unique_user.group_id)) shopping_list = list_repo.create(
ShoppingListSave(name=random_string(), group_id=unique_user.group_id, user_id=unique_user.user_id)
)
unchecked_items = list_item_repo.create_many( unchecked_items = list_item_repo.create_many(
[ [
ShoppingListItemCreate(note=random_string(), shopping_list_id=shopping_list.id) ShoppingListItemCreate(note=random_string(), shopping_list_id=shopping_list.id)