Docker/mealie
Docker/mealie
1
0
Fork 0
mirror of https://github.com/mealie-recipes/mealie.git synced 2025-08-05 21:45:25 +02:00
Code Issues Releases Activity

feat: Query Filter Builder for Cookbooks and Meal Plans (#4346)

Browse source
This commit is contained in:
Michael Genson 2024-10-17 10:35:39 -05:00 • committed by GitHub
parent 2a9a6fa5e6
commit b8e62ab8dd
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
47 changed files with 2043 additions and 440 deletions
Download patch file Download diff file Expand all files Collapse all files

106
tests/integration_tests/public_explorer_tests/test_public_cookbooks.py
View file

@ -178,7 +178,7 @@ def test_get_cookbooks_with_recipes(api_client: TestClient, unique_user: TestUse
database.recipes.update_many([public_recipe, private_recipe])
# Create a recipe in another household that's public with the same known tag
# Create a public and private recipe with a known tag in another household
other_database = h2_user.repos
other_household = other_database.households.get_one(h2_user.household_id)
assert other_household and other_household.preferences
@ -187,17 +187,24 @@ def test_get_cookbooks_with_recipes(api_client: TestClient, unique_user: TestUse
other_household.preferences.recipe_public = True
other_database.household_preferences.update(household.id, household.preferences)
other_household_recipe = other_database.recipes.create(
other_household_public_recipe, other_household_private_recipe = database.recipes.create_many(
Recipe(
user_id=h2_user.user_id,
group_id=h2_user.group_id,
name=random_string(),
)
for _ in range(2)
)
assert other_household_recipe.settings
other_household_recipe.settings.public = True
other_household_recipe.tags = [tag]
other_database.recipes.update(other_household_recipe.slug, other_household_recipe)
assert other_household_public_recipe.settings
other_household_public_recipe.settings.public = True
other_household_public_recipe.tags = [tag]
assert other_household_private_recipe.settings
other_household_private_recipe.settings.public = False
other_household_private_recipe.tags = [tag]
other_database.recipes.update_many([other_household_public_recipe, other_household_private_recipe])
# Create a public cookbook with tag
cookbook = database.cookbooks.create(
@ -206,11 +213,91 @@ def test_get_cookbooks_with_recipes(api_client: TestClient, unique_user: TestUse
group_id=unique_user.group_id,
household_id=unique_user.household_id,
public=True,
tags=[tag],
query_filter_string=f'tags.id IN ["{tag.id}"]',
)
)
# Get the cookbook and make sure we only get the public recipe from the correct household
# Get the cookbook and make sure we only get the public recipes from each household
response = api_client.get(api_routes.explore_groups_group_slug_cookbooks_item_id(unique_user.group_id, cookbook.id))
assert response.status_code == 200
cookbook_data = response.json()
assert cookbook_data["id"] == str(cookbook.id)
cookbook_recipe_ids: set[str] = {recipe["id"] for recipe in cookbook_data["recipes"]}
assert len(cookbook_recipe_ids) == 2
assert str(public_recipe.id) in cookbook_recipe_ids
assert str(private_recipe.id) not in cookbook_recipe_ids
assert str(other_household_public_recipe.id) in cookbook_recipe_ids
assert str(other_household_private_recipe.id) not in cookbook_recipe_ids
def test_get_cookbooks_private_household(api_client: TestClient, unique_user: TestUser, h2_user: TestUser):
database = unique_user.repos
# Create a public recipe with a known tag
group = database.groups.get_one(unique_user.group_id)
assert group and group.preferences
group.preferences.private_group = False
database.group_preferences.update(group.id, group.preferences)
household = database.households.get_one(unique_user.household_id)
assert household and household.preferences
household.preferences.private_household = False
household.preferences.recipe_public = True
database.household_preferences.update(household.id, household.preferences)
tag = database.tags.create(TagSave(name=random_string(), group_id=unique_user.group_id))
public_recipe = database.recipes.create(
Recipe(
user_id=unique_user.user_id,
group_id=unique_user.group_id,
name=random_string(),
)
)
assert public_recipe.settings
public_recipe.settings.public = True
public_recipe.tags = [tag]
database.recipes.update(public_recipe.slug, public_recipe)
# Create a public recipe with a known tag on a private household
other_database = h2_user.repos
other_household = other_database.households.get_one(h2_user.household_id)
assert other_household and other_household.preferences
other_household.preferences.private_household = True
other_household.preferences.recipe_public = True
other_database.household_preferences.update(household.id, household.preferences)
other_household_private_recipe = database.recipes.create(
Recipe(
user_id=h2_user.user_id,
group_id=h2_user.group_id,
name=random_string(),
)
)
assert other_household_private_recipe.settings
other_household_private_recipe.settings.public = False
other_household_private_recipe.tags = [tag]
other_database.recipes.update(other_household_private_recipe.slug, other_household_private_recipe)
# Create a public cookbook with tag
cookbook = database.cookbooks.create(
SaveCookBook(
name=random_string(),
group_id=unique_user.group_id,
household_id=unique_user.household_id,
public=True,
query_filter_string=f'tags.id IN ["{tag.id}"]',
)
)
# Get the cookbook and make sure we only get the public recipes from each household
response = api_client.get(api_routes.explore_groups_group_slug_cookbooks_item_id(unique_user.group_id, cookbook.id))
assert response.status_code == 200
cookbook_data = response.json()
@ -219,5 +306,4 @@ def test_get_cookbooks_with_recipes(api_client: TestClient, unique_user: TestUse
cookbook_recipe_ids: set[str] = {recipe["id"] for recipe in cookbook_data["recipes"]}
assert len(cookbook_recipe_ids) == 1
assert str(public_recipe.id) in cookbook_recipe_ids
assert str(private_recipe.id) not in cookbook_recipe_ids
assert str(other_household_recipe.id) not in cookbook_recipe_ids
assert str(other_household_private_recipe.id) not in cookbook_recipe_ids

28
tests/integration_tests/public_explorer_tests/test_public_recipes.py
View file

@ -244,8 +244,12 @@ def test_public_recipe_cookbook_filter(
assert response.status_code == 200
def test_public_recipe_cookbook_filter_with_recipes(api_client: TestClient, unique_user: TestUser, h2_user: TestUser):
@pytest.mark.parametrize("other_household_private", [True, False])
def test_public_recipe_cookbook_filter_with_recipes(
api_client: TestClient, unique_user: TestUser, h2_user: TestUser, other_household_private: bool
):
database = unique_user.repos
database.session.rollback()
# Create a public and private recipe with a known tag
group = database.groups.get_one(unique_user.group_id)
@ -281,14 +285,14 @@ def test_public_recipe_cookbook_filter_with_recipes(api_client: TestClient, uniq
database.recipes.update_many([public_recipe, private_recipe])
# Create a recipe in another household that's public with the same known tag
# Create a recipe in another household with the same known tag
other_database = h2_user.repos
other_household = other_database.households.get_one(h2_user.household_id)
assert other_household and other_household.preferences
other_household.preferences.private_household = False
other_household.preferences.private_household = other_household_private
other_household.preferences.recipe_public = True
other_database.household_preferences.update(household.id, household.preferences)
other_database.household_preferences.update(other_household.id, other_household.preferences)
other_household_recipe = other_database.recipes.create(
Recipe(
@ -309,17 +313,25 @@ def test_public_recipe_cookbook_filter_with_recipes(api_client: TestClient, uniq
group_id=unique_user.group_id,
household_id=unique_user.household_id,
public=True,
tags=[tag],
query_filter_string=f'tags.id IN ["{tag.id}"]',
)
)
# Get the cookbook's recipes and make sure we only get the public recipe from the correct household
# Get the cookbook's recipes and make sure we get both public recipes
response = api_client.get(
api_routes.explore_groups_group_slug_recipes(unique_user.group_id), params={"cookbook": cookbook.id}
)
assert response.status_code == 200
recipe_ids: set[str] = {recipe["id"] for recipe in response.json()["items"]}
assert len(recipe_ids) == 1
if other_household_private:
assert len(recipe_ids) == 1
else:
assert len(recipe_ids) == 2
assert str(public_recipe.id) in recipe_ids
assert str(private_recipe.id) not in recipe_ids
assert str(other_household_recipe.id) not in recipe_ids
if other_household_private:
assert str(other_household_recipe.id) not in recipe_ids
else:
assert str(other_household_recipe.id) in recipe_ids