feat: adding the rest ofthe nutrition properties from schema.org (#4301)

tests/fixtures/fixture_users.py

@@ -173,8 +173,7 @@ def g2_user(session: Session, admin_token, api_client: TestClient):
         pass
 
 
-@fixture(scope="module")
-def unique_user(session: Session, api_client: TestClient):
+def _unique_user(session: Session, api_client: TestClient):
     registration = utils.user_registration_factory()
     response = api_client.post("/api/users/register", json=registration.model_dump(by_alias=True))
     assert response.status_code == 201
@@ -213,6 +212,16 @@ def unique_user(session: Session, api_client: TestClient):
         pass
 
 
+@fixture(scope="function")
+def unique_user_fn_scoped(session: Session, api_client: TestClient):
+    yield from _unique_user(session, api_client)
+
+
+@fixture(scope="module")
+def unique_user(session: Session, api_client: TestClient):
+    yield from _unique_user(session, api_client)
+
+
 @fixture(scope="module")
 def user_tuple(session: Session, admin_token, api_client: TestClient) -> Generator[list[utils.TestUser], None, None]:
     group_name = utils.random_string()

tests/integration_tests/recipe_migration_tests/test_recipe_migrations.py

@@ -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:

tests/unit_tests/services_tests/scraper_tests/test_cleaner_parts.py

@@ -481,20 +481,24 @@ nutrition_test_cases = (
         },
     ),
     CleanerCase(
-        test_id="special support for sodiumContent (g -> mg)",
+        test_id="special support for sodiumContent/cholesterolContent (g -> mg)",
         input={
+            "cholesterolContent": "10g",
             "sodiumContent": "10g",
         },
         expected={
+            "cholesterolContent": "10000.0",
             "sodiumContent": "10000.0",
         },
     ),
     CleanerCase(
-        test_id="special support for sodiumContent (mg -> mg)",
+        test_id="special support for sodiumContent/cholesterolContent (mg -> mg)",
         input={
+            "cholesterolContent": "10000mg",
             "sodiumContent": "10000mg",
         },
         expected={
+            "cholesterolContent": "10000",
             "sodiumContent": "10000",
         },
     ),

tests/unit_tests/test_recipe_parser.py

@@ -23,6 +23,12 @@ async def test_recipe_parser(recipe_test_data: RecipeSiteTestCase):
     recipe, _ = await scraper.create_from_html(recipe_test_data.url, translator)
 
     assert recipe.slug == recipe_test_data.expected_slug
+
     assert len(recipe.recipe_instructions or []) == recipe_test_data.num_steps
+
     assert len(recipe.recipe_ingredient) == recipe_test_data.num_ingredients
+
+    actual = recipe.nutrition.model_dump() if recipe.nutrition else {}
+    assert recipe_test_data.num_nutrition_entries == len(actual.items())
+
     assert recipe.org_url == recipe_test_data.url

tests/utils/recipe_data.py

@@ -13,6 +13,7 @@ class RecipeSiteTestCase:
     num_steps: int
     html_file: Path
 
+    num_nutrition_entries: int = 0
     include_tags: bool = False
     expected_tags: set[str] | None = None
 
@@ -26,6 +27,7 @@ def get_recipe_test_cases():
             expected_slug="taiwanese-three-cup-chicken-san-bei-ji-recipe",
             num_ingredients=10,
             num_steps=3,
+            num_nutrition_entries=11,
         ),
         RecipeSiteTestCase(
             url="https://www.rezeptwelt.de/backen-herzhaft-rezepte/schinken-kaese-waffeln-ohne-viel-schnickschnack/4j0bkiig-94d4d-106529-cfcd2-is97x2ml",