mirror of
https://github.com/mealie-recipes/mealie.git
synced 2025-08-02 20:15:24 +02:00
feat: adding the rest ofthe nutrition properties from schema.org (#4301)
This commit is contained in:
parent
3aea229f2d
commit
02c0fe993b
16 changed files with 279 additions and 57 deletions
|
@ -1,5 +1,5 @@
|
|||
import os
|
||||
from dataclasses import dataclass
|
||||
from dataclasses import dataclass, field
|
||||
from pathlib import Path
|
||||
from tempfile import TemporaryDirectory
|
||||
from zipfile import ZipFile
|
||||
|
@ -8,6 +8,7 @@ import pytest
|
|||
from fastapi.testclient import TestClient
|
||||
|
||||
from mealie.schema.group.group_migration import SupportedMigrations
|
||||
from mealie.schema.recipe.recipe import Recipe
|
||||
from mealie.schema.reports.reports import ReportEntryOut
|
||||
from tests import data as test_data
|
||||
from tests.utils import api_routes
|
||||
|
@ -19,18 +20,94 @@ from tests.utils.fixture_schemas import TestUser
|
|||
class MigrationTestData:
|
||||
typ: SupportedMigrations
|
||||
archive: Path
|
||||
search_slug: str
|
||||
|
||||
nutrition_filter: set[str] = field(default_factory=set)
|
||||
nutrition_entries: set[str] = field(
|
||||
default_factory=lambda: {
|
||||
"calories",
|
||||
"carbohydrateContent",
|
||||
"cholesterolContent",
|
||||
"fatContent",
|
||||
"fiberContent",
|
||||
"proteinContent",
|
||||
"saturatedFatContent",
|
||||
"sodiumContent",
|
||||
"sugarContent",
|
||||
"transFatContent",
|
||||
"unsaturatedFatContent",
|
||||
}
|
||||
)
|
||||
|
||||
|
||||
test_cases = [
|
||||
MigrationTestData(typ=SupportedMigrations.nextcloud, archive=test_data.migrations_nextcloud),
|
||||
MigrationTestData(typ=SupportedMigrations.paprika, archive=test_data.migrations_paprika),
|
||||
MigrationTestData(typ=SupportedMigrations.chowdown, archive=test_data.migrations_chowdown),
|
||||
MigrationTestData(typ=SupportedMigrations.copymethat, archive=test_data.migrations_copymethat),
|
||||
MigrationTestData(typ=SupportedMigrations.mealie_alpha, archive=test_data.migrations_mealie),
|
||||
MigrationTestData(typ=SupportedMigrations.tandoor, archive=test_data.migrations_tandoor),
|
||||
MigrationTestData(typ=SupportedMigrations.plantoeat, archive=test_data.migrations_plantoeat),
|
||||
MigrationTestData(typ=SupportedMigrations.myrecipebox, archive=test_data.migrations_myrecipebox),
|
||||
MigrationTestData(typ=SupportedMigrations.recipekeeper, archive=test_data.migrations_recipekeeper),
|
||||
MigrationTestData(
|
||||
typ=SupportedMigrations.nextcloud,
|
||||
archive=test_data.migrations_nextcloud,
|
||||
search_slug="skillet-shepherd-s-pie",
|
||||
nutrition_filter={
|
||||
"transFatContent",
|
||||
"unsaturatedFatContent",
|
||||
},
|
||||
),
|
||||
MigrationTestData(
|
||||
typ=SupportedMigrations.paprika,
|
||||
archive=test_data.migrations_paprika,
|
||||
search_slug="zucchini-kartoffel-frittata",
|
||||
nutrition_entries=set(),
|
||||
),
|
||||
MigrationTestData(
|
||||
typ=SupportedMigrations.chowdown,
|
||||
archive=test_data.migrations_chowdown,
|
||||
search_slug="roasted-okra",
|
||||
nutrition_entries=set(),
|
||||
),
|
||||
MigrationTestData(
|
||||
typ=SupportedMigrations.copymethat,
|
||||
archive=test_data.migrations_copymethat,
|
||||
search_slug="spam-zoodles",
|
||||
nutrition_entries=set(),
|
||||
),
|
||||
MigrationTestData(
|
||||
typ=SupportedMigrations.mealie_alpha,
|
||||
archive=test_data.migrations_mealie,
|
||||
search_slug="old-fashioned-beef-stew",
|
||||
nutrition_filter={
|
||||
"cholesterolContent",
|
||||
"saturatedFatContent",
|
||||
"transFatContent",
|
||||
"unsaturatedFatContent",
|
||||
},
|
||||
),
|
||||
MigrationTestData(
|
||||
typ=SupportedMigrations.tandoor,
|
||||
archive=test_data.migrations_tandoor,
|
||||
search_slug="texas-red-chili",
|
||||
nutrition_entries=set(),
|
||||
),
|
||||
MigrationTestData(
|
||||
typ=SupportedMigrations.plantoeat,
|
||||
archive=test_data.migrations_plantoeat,
|
||||
search_slug="test-recipe",
|
||||
nutrition_filter={
|
||||
"unsaturatedFatContent",
|
||||
"transFatContent",
|
||||
},
|
||||
),
|
||||
MigrationTestData(
|
||||
typ=SupportedMigrations.myrecipebox,
|
||||
archive=test_data.migrations_myrecipebox,
|
||||
search_slug="beef-cheese-piroshki",
|
||||
nutrition_filter={
|
||||
"cholesterolContent",
|
||||
},
|
||||
),
|
||||
MigrationTestData(
|
||||
typ=SupportedMigrations.recipekeeper,
|
||||
archive=test_data.migrations_recipekeeper,
|
||||
search_slug="zucchini-bread",
|
||||
nutrition_entries=set(),
|
||||
),
|
||||
]
|
||||
|
||||
test_ids = [
|
||||
|
@ -47,7 +124,8 @@ test_ids = [
|
|||
|
||||
|
||||
@pytest.mark.parametrize("mig", test_cases, ids=test_ids)
|
||||
def test_recipe_migration(api_client: TestClient, unique_user: TestUser, mig: MigrationTestData) -> None:
|
||||
def test_recipe_migration(api_client: TestClient, unique_user_fn_scoped: TestUser, mig: MigrationTestData) -> None:
|
||||
unique_user = unique_user_fn_scoped
|
||||
payload = {
|
||||
"migration_type": mig.typ.value,
|
||||
}
|
||||
|
@ -91,6 +169,19 @@ def test_recipe_migration(api_client: TestClient, unique_user: TestUser, mig: Mi
|
|||
events = query_data["items"]
|
||||
assert len(events)
|
||||
|
||||
# Validate recipe content
|
||||
response = api_client.get(api_routes.recipes_slug(mig.search_slug), headers=unique_user.token)
|
||||
recipe = Recipe(**assert_deserialize(response))
|
||||
|
||||
if mig.nutrition_entries:
|
||||
assert recipe.nutrition is not None
|
||||
nutrition = recipe.nutrition.model_dump(by_alias=True)
|
||||
|
||||
for k in mig.nutrition_entries.difference(mig.nutrition_filter):
|
||||
assert k in nutrition and nutrition[k] is not None
|
||||
|
||||
# TODO: validate other types of content
|
||||
|
||||
|
||||
def test_bad_mealie_alpha_data_is_ignored(api_client: TestClient, unique_user: TestUser):
|
||||
with TemporaryDirectory() as tmpdir:
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue