Docker/mealie
Docker/mealie
1
0
Fork 0
mirror of https://github.com/mealie-recipes/mealie.git synced 2025-07-24 07:39:41 +02:00
Code Issues Releases Activity

fix: "NOT IN" doesn't apply filter properly (#5154)

Browse source
This commit is contained in:
Michael Genson 2025-03-18 13:07:26 -05:00 • committed by GitHub
parent 2deb9c276c
commit 0f58ac5b47
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 102 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

84
tests/unit_tests/repository_tests/test_pagination.py
View file

@ -312,6 +312,18 @@ def test_pagination_filter_in(query_units: tuple[RepositoryUnit, IngredientUnit,
assert unit_2.id in result_ids
assert unit_3.id not in result_ids
query = PaginationQuery(page=1, per_page=-1, query_filter=f'name IN ["{unit_3.name}"]')
unit_results = units_repo.page_all(query).items
result_ids = {unit.id for unit in unit_results}
assert unit_1.id not in result_ids
assert unit_2.id not in result_ids
assert unit_3.id in result_ids
def test_pagination_filter_not_in(query_units: tuple[RepositoryUnit, IngredientUnit, IngredientUnit, IngredientUnit]):
units_repo, unit_1, unit_2, unit_3 = query_units
query = PaginationQuery(page=1, per_page=-1, query_filter=f"name NOT IN [{unit_1.name}, {unit_2.name}]")
unit_results = units_repo.page_all(query).items
@ -320,13 +332,73 @@ def test_pagination_filter_in(query_units: tuple[RepositoryUnit, IngredientUnit,
assert unit_2.id not in result_ids
assert unit_3.id in result_ids
query = PaginationQuery(page=1, per_page=-1, query_filter=f'name IN ["{unit_3.name}"]')
unit_results = units_repo.page_all(query).items
result_ids = {unit.id for unit in unit_results}
assert unit_1.id not in result_ids
assert unit_2.id not in result_ids
assert unit_3.id in result_ids
def test_pagination_filter_in_m2m(unique_user: TestUser):
db = unique_user.repos
unique_category_1, unique_category_2, shared_category = (
db.categories.create(CategorySave(group_id=unique_user.group_id, name=random_string(10))) for _ in range(3)
)
recipe_1, recipe_2 = (
db.recipes.create(Recipe(user_id=unique_user.user_id, group_id=unique_user.group_id, name=random_string()))
for _ in range(2)
)
recipe_1.recipe_category = [unique_category_1, shared_category]
recipe_2.recipe_category = [unique_category_2, shared_category]
db.recipes.update(recipe_1.slug, recipe_1)
db.recipes.update(recipe_2.slug, recipe_2)
query = PaginationQuery(page=1, per_page=-1, query_filter=f"recipeCategory.name IN [{shared_category.name}]")
recipe_results = db.recipes.page_all(query).items
assert len(recipe_results) == 2
assert {recipe.id for recipe in recipe_results} == {recipe_1.id, recipe_2.id}
def test_pagination_filter_not_in_m2m(unique_user: TestUser):
db = unique_user.repos
unique_category_1, unique_category_2, shared_category = (
db.categories.create(CategorySave(group_id=unique_user.group_id, name=random_string(10))) for _ in range(3)
)
recipe_1, recipe_2 = (
db.recipes.create(Recipe(user_id=unique_user.user_id, group_id=unique_user.group_id, name=random_string()))
for _ in range(2)
)
recipe_1.recipe_category = [unique_category_1, shared_category]
recipe_2.recipe_category = [unique_category_2, shared_category]
db.recipes.update(recipe_1.slug, recipe_1)
db.recipes.update(recipe_2.slug, recipe_2)
query = PaginationQuery(page=1, per_page=-1, query_filter=f"recipeCategory.name NOT IN [{unique_category_1.name}]")
recipe_results = db.recipes.page_all(query).items
recipe_results_ids = {recipe.id for recipe in recipe_results}
assert recipe_1.id not in recipe_results_ids
assert recipe_2.id in recipe_results_ids
def test_pagination_filter_not_in_includes_null(unique_user: TestUser):
db = unique_user.repos
unique_category_1, unique_category_2, shared_category = (
db.categories.create(CategorySave(group_id=unique_user.group_id, name=random_string(10))) for _ in range(3)
)
recipe_1, recipe_2, recipe_3 = (
db.recipes.create(Recipe(user_id=unique_user.user_id, group_id=unique_user.group_id, name=random_string()))
for _ in range(3)
)
recipe_1.recipe_category = [unique_category_1, shared_category]
recipe_2.recipe_category = [unique_category_2, shared_category]
db.recipes.update(recipe_1.slug, recipe_1)
db.recipes.update(recipe_2.slug, recipe_2)
query = PaginationQuery(page=1, per_page=-1, query_filter=f"recipeCategory.name NOT IN [{unique_category_1.name}]")
recipe_results = db.recipes.page_all(query).items
recipe_results_ids = {recipe.id for recipe in recipe_results}
assert recipe_1.id not in recipe_results_ids
assert recipe_2.id in recipe_results_ids
# this recipe has no categories, and therefore should be included in the results
assert recipe_3.id in recipe_results_ids
def test_pagination_filter_in_advanced(unique_user: TestUser):