Mirrors/mealie
1
0
Fork 0
mirror of https://github.com/mealie-recipes/mealie.git synced 2025-12-25 11:45:21 -05:00
Code Issues Packages Projects Releases Wiki Activity

fix: the add_pagination_to_query now always returns the correct count (#6505)

Browse Source 
Co-authored-by: Michael Genson <71845777+michael-genson@users.noreply.github.com>
This commit is contained in:
Aurelien
2025-12-22 17:39:35 +01:00
committed by GitHub
parent 6ed85d72d7
commit 7b32508201
2 changed files with 40 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -131,6 +131,29 @@ def test_pagination_response_and_metadata(unique_user: TestUser):
assert last_page_of_results.items[-1] == all_results.items[-1]
def test_pagination_total_calculation(unique_user: TestUser):
db = unique_user.repos
unique_category_1, unused_category = (
db.categories.create(CategorySave(group_id=unique_user.group_id, name=random_string(10))) for _ in range(2)
)
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]
db.recipes.update(recipe_1.slug, recipe_1)
db.recipes.update(recipe_2.slug, recipe_2)
query = PaginationQuery(page=1, per_page=64, query_filter=f"recipeCategory.name NOT IN [{unique_category_1.name}]")
result = db.recipes.page_all(query)
assert result.total == 1
query = PaginationQuery(page=1, per_page=64, query_filter=f"recipeCategory.name NOT IN [{unused_category.name}]")
result = db.recipes.page_all(query)
assert result.total == 2
def test_pagination_guides(unique_user: TestUser):
database = unique_user.repos
group = database.groups.get_one(unique_user.group_id)
@@ -239,19 +262,19 @@ def test_pagination_filter_string_case_insensitive(
units_repo.delete(upper_unit.id)
def test_pagination_filter_null(unique_user: TestUser):
database = unique_user.repos
def test_pagination_filter_null(unique_user_fn_scoped: TestUser):
database = unique_user_fn_scoped.repos
recipe_not_made_1 = database.recipes.create(
Recipe(
user_id=unique_user.user_id,
group_id=unique_user.group_id,
user_id=unique_user_fn_scoped.user_id,
group_id=unique_user_fn_scoped.group_id,
name=random_string(),
)
)
recipe_not_made_2 = database.recipes.create(
Recipe(
user_id=unique_user.user_id,
group_id=unique_user.group_id,
user_id=unique_user_fn_scoped.user_id,
group_id=unique_user_fn_scoped.group_id,
name=random_string(),
)
)
@@ -259,8 +282,8 @@ def test_pagination_filter_null(unique_user: TestUser):
# give one recipe a last made date
recipe_made = database.recipes.create(
Recipe(
user_id=unique_user.user_id,
group_id=unique_user.group_id,
user_id=unique_user_fn_scoped.user_id,
group_id=unique_user_fn_scoped.group_id,
name=random_string(),
last_made=datetime.now(UTC),
)
@@ -370,6 +393,7 @@ def test_pagination_filter_not_in_m2m(unique_user: TestUser):
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