mirror of
https://github.com/mealie-recipes/mealie.git
synced 2025-07-24 15:49:42 +02:00
Feature: Global Timeline (#2265)
* extended query filter to accept nested tables * decoupled timeline api from recipe slug * modified frontend to use simplified events api * fixed nested loop index ghosting * updated existing tests * gave mypy a snack * added tests for nested queries * fixed "last made" render error * decoupled recipe timeline from dialog * removed unused props * tweaked recipe get_all to accept ids * created group global timeline added new timeline page to sidebar reformatted the recipe timeline added vertical option to recipe card mobile * extracted timeline item into its own component * fixed apploader centering * added paginated scrolling to recipe timeline * added sort direction config fixed infinite scroll on dialog fixed hasMore var not resetting during instantiation * added sort direction to user preferences * updated API docs with new query filter feature * better error tracing * fix for recipe not found response * simplified recipe crud route for slug/id added test for fetching by slug/id * made query filter UUID validation clearer * moved timeline menu option below shopping lists --------- Co-authored-by: Hayden <64056131+hay-kot@users.noreply.github.com>
This commit is contained in:
parent
0e397b34fd
commit
fe17922bb8
28 changed files with 871 additions and 506 deletions
|
@ -1,4 +1,5 @@
|
|||
import time
|
||||
from collections import defaultdict
|
||||
from random import randint
|
||||
from urllib.parse import parse_qsl, urlsplit
|
||||
|
||||
|
@ -11,13 +12,16 @@ from mealie.repos.repository_units import RepositoryUnit
|
|||
from mealie.schema.recipe.recipe_ingredient import IngredientUnit, SaveIngredientUnit
|
||||
from mealie.schema.response.pagination import PaginationQuery
|
||||
from mealie.services.seeder.seeder_service import SeederService
|
||||
from tests.utils import api_routes
|
||||
from tests.utils.factories import random_int, random_string
|
||||
from tests.utils.fixture_schemas import TestUser
|
||||
|
||||
|
||||
def test_repository_pagination(database: AllRepositories, unique_user: TestUser):
|
||||
group = database.groups.get_one(unique_user.group_id)
|
||||
assert group
|
||||
|
||||
seeder = SeederService(database, None, group)
|
||||
seeder = SeederService(database, None, group) # type: ignore
|
||||
seeder.seed_foods("en-US")
|
||||
|
||||
foods_repo = database.ingredient_foods.by_group(unique_user.group_id) # type: ignore
|
||||
|
@ -50,8 +54,9 @@ def test_repository_pagination(database: AllRepositories, unique_user: TestUser)
|
|||
|
||||
def test_pagination_response_and_metadata(database: AllRepositories, unique_user: TestUser):
|
||||
group = database.groups.get_one(unique_user.group_id)
|
||||
assert group
|
||||
|
||||
seeder = SeederService(database, None, group)
|
||||
seeder = SeederService(database, None, group) # type: ignore
|
||||
seeder.seed_foods("en-US")
|
||||
|
||||
foods_repo = database.ingredient_foods.by_group(unique_user.group_id) # type: ignore
|
||||
|
@ -78,8 +83,9 @@ def test_pagination_response_and_metadata(database: AllRepositories, unique_user
|
|||
|
||||
def test_pagination_guides(database: AllRepositories, unique_user: TestUser):
|
||||
group = database.groups.get_one(unique_user.group_id)
|
||||
assert group
|
||||
|
||||
seeder = SeederService(database, None, group)
|
||||
seeder = SeederService(database, None, group) # type: ignore
|
||||
seeder.seed_foods("en-US")
|
||||
|
||||
foods_repo = database.ingredient_foods.by_group(unique_user.group_id) # type: ignore
|
||||
|
@ -107,10 +113,10 @@ def test_pagination_guides(database: AllRepositories, unique_user: TestUser):
|
|||
random_page_of_results = foods_repo.page_all(query)
|
||||
random_page_of_results.set_pagination_guides(foods_route, query.dict())
|
||||
|
||||
next_params = dict(parse_qsl(urlsplit(random_page_of_results.next).query))
|
||||
next_params: dict = dict(parse_qsl(urlsplit(random_page_of_results.next).query)) # type: ignore
|
||||
assert int(next_params["page"]) == random_page + 1
|
||||
|
||||
prev_params = dict(parse_qsl(urlsplit(random_page_of_results.previous).query))
|
||||
prev_params: dict = dict(parse_qsl(urlsplit(random_page_of_results.previous).query)) # type: ignore
|
||||
assert int(prev_params["page"]) == random_page - 1
|
||||
|
||||
source_params = camelize(query.dict())
|
||||
|
@ -173,7 +179,7 @@ def test_pagination_filter_datetimes(
|
|||
unit_1 = query_units[1]
|
||||
unit_2 = query_units[2]
|
||||
|
||||
dt = unit_2.created_at.isoformat()
|
||||
dt = unit_2.created_at.isoformat() # type: ignore
|
||||
query = PaginationQuery(page=1, per_page=-1, query_filter=f'createdAt>="{dt}"')
|
||||
unit_results = units_repo.page_all(query).items
|
||||
assert len(unit_results) == 2
|
||||
|
@ -194,7 +200,7 @@ def test_pagination_filter_advanced(query_units: tuple[RepositoryUnit, Ingredien
|
|||
units_repo = query_units[0]
|
||||
unit_3 = query_units[3]
|
||||
|
||||
dt = unit_3.created_at.isoformat()
|
||||
dt = str(unit_3.created_at.isoformat()) # type: ignore
|
||||
qf = f'name="test unit 1" OR (useAbbreviation=f AND (name="test unit 2" OR createdAt > "{dt}"))'
|
||||
query = PaginationQuery(page=1, per_page=-1, query_filter=qf)
|
||||
unit_results = units_repo.page_all(query).items
|
||||
|
@ -206,8 +212,11 @@ def test_pagination_filter_advanced(query_units: tuple[RepositoryUnit, Ingredien
|
|||
"qf",
|
||||
[
|
||||
pytest.param('(name="test name" AND useAbbreviation=f))', id="unbalanced parenthesis"),
|
||||
pytest.param('id="this is not a valid UUID"', id="invalid UUID"),
|
||||
pytest.param('createdAt="this is not a valid datetime format"', id="invalid datetime format"),
|
||||
pytest.param('badAttribute="test value"', id="invalid attribute"),
|
||||
pytest.param('group.badAttribute="test value"', id="bad nested attribute"),
|
||||
pytest.param('group.preferences.badAttribute="test value"', id="bad double nested attribute"),
|
||||
],
|
||||
)
|
||||
def test_malformed_query_filters(api_client: TestClient, unique_user: TestUser, qf: str):
|
||||
|
@ -216,3 +225,46 @@ def test_malformed_query_filters(api_client: TestClient, unique_user: TestUser,
|
|||
|
||||
response = api_client.get(route, params={"queryFilter": qf}, headers=unique_user.token)
|
||||
assert response.status_code == 400
|
||||
|
||||
|
||||
def test_pagination_filter_nested(api_client: TestClient, user_tuple: list[TestUser]):
|
||||
# create a few recipes for each user
|
||||
slugs: defaultdict[int, list[str]] = defaultdict(list)
|
||||
for i, user in enumerate(user_tuple):
|
||||
for _ in range(random_int(3, 5)):
|
||||
slug: str = random_string()
|
||||
response = api_client.post(api_routes.recipes, json={"name": slug}, headers=user.token)
|
||||
|
||||
assert response.status_code == 201
|
||||
slugs[i].append(slug)
|
||||
|
||||
# query recipes with a nested user filter
|
||||
recipe_ids: defaultdict[int, list[str]] = defaultdict(list)
|
||||
for i, user in enumerate(user_tuple):
|
||||
params = {"page": 1, "perPage": -1, "queryFilter": f'user.id="{user.user_id}"'}
|
||||
response = api_client.get(api_routes.recipes, params=params, headers=user.token)
|
||||
|
||||
assert response.status_code == 200
|
||||
recipes_data: list[dict] = response.json()["items"]
|
||||
assert recipes_data
|
||||
|
||||
for recipe_data in recipes_data:
|
||||
slug = recipe_data["slug"]
|
||||
assert slug in slugs[i]
|
||||
assert slug not in slugs[(i + 1) % len(user_tuple)]
|
||||
|
||||
recipe_ids[i].append(recipe_data["id"])
|
||||
|
||||
# query timeline events with a double nested recipe.user filter
|
||||
for i, user in enumerate(user_tuple):
|
||||
params = {"page": 1, "perPage": -1, "queryFilter": f'recipe.user.id="{user.user_id}"'}
|
||||
response = api_client.get(api_routes.recipes_timeline_events, params=params, headers=user.token)
|
||||
|
||||
assert response.status_code == 200
|
||||
events_data: list[dict] = response.json()["items"]
|
||||
assert events_data
|
||||
|
||||
for event_data in events_data:
|
||||
recipe_id = event_data["recipeId"]
|
||||
assert recipe_id in recipe_ids[i]
|
||||
assert recipe_id not in recipe_ids[(i + 1) % len(user_tuple)]
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue