From fe758b9af931241dcc5686b4da8497adcce2e1f4 Mon Sep 17 00:00:00 2001 From: himanshisrestha <135853264+himanshisrestha@users.noreply.github.com> Date: Thu, 21 Mar 2024 15:32:49 +0530 Subject: [PATCH 1/8] Add is_in_taxonomy boolean flag in ingredient parsing result --- lib/ProductOpener/Ingredients.pm | 3 + .../test/products/3270190128403.json | 3 +- .../test/products/4270190128403.json | 2 + .../test/products/5270190128403.json | 1 + .../export_more_fields/export_more_fields.csv | 38 +- .../rows/0850032917148.json | 2 +- .../export_more_fields/rows/25000044984.json | 2 +- .../export_more_fields/rows/26281742.json | 2 +- .../export_more_fields/rows/27096765.json | 2 +- .../rows/3256220513173.json | 2 +- .../rows/3259330020135.json | 2 +- .../rows/3270160503070.json | 2 +- .../rows/3451790834080.json | 2 +- .../rows/3564703999971.json | 2 +- .../rows/3661344653573.json | 2 +- .../rows/3770013801303.json | 2 +- .../rows/5050083706622.json | 2 +- .../rows/5410803950689.json | 2 +- .../rows/5601009974337.json | 2 +- .../export_more_fields/rows/71464240608.json | 2 +- .../export_more_fields/rows/77000001.json | 2 +- .../rows/7804659650035.json | 2 +- .../rows/8722700472575.json | 2 +- .../rows/9002355004345.json | 2 +- .../3003004006001.json | 2 +- .../3003004006004.json | 2 +- .../import_csv_file/test/2003004006001.json | 2 +- .../import_csv_file/test/2003004006004.json | 2 +- .../attributes/en-attributes.json | 11 + .../attributes/en-maybe-vegan.json | 3 + .../attributes/en-no-ingredients.json | 2 +- .../attributes/en-nova-groups-markers.json | 9 +- .../attributes/en-nutriscore.json | 1 + .../attributes/en-unknown-ingredients.json | 3 +- .../attributes/fr-palm-kernel-fat.json | 1 + .../attributes/fr-palm-oil-free.json | 4 + .../attributes/fr-palm-oil.json | 2 + .../attributes/fr-vegetable-oils.json | 3 + .../calvados-ingredients-no-origins.json | 380 +++++++++--------- .../calvados-no-ingredients-no-origins.json | 379 ++++++++--------- .../ecoscore/carrots-plastic.json | 1 + .../ecoscore/carrots.json | 1 + .../category-without-ecoscore-sodas.json | 2 + .../ecoscore/energy-drink.json | 2 + .../ecoscore/foie-gras.json | 1 + .../ecoscore/fr-verseur-en-plastique.json | 1 + .../ecoscore/fr-viande-porcine-francaise.json | 4 + .../ecoscore/fresh-vegetable.json | 1 + .../ecoscore/frozen-vegetable.json | 1 + .../grade-a-with-non-recyclable-label.json | 3 + .../grade-a-with-recyclable-label.json | 3 + .../ecoscore/lamb-leg.json | 1 + .../expected_test_results/ecoscore/milk.json | 1 + ...ingredients-in-origins-field-multiple.json | 3 + ...igins-of-ingredients-in-origins-field.json | 3 + .../origins-of-ingredients-nested-2.json | 7 + .../origins-of-ingredients-nested.json | 4 + .../origins-of-ingredients-not-specified.json | 3 + ...igins-of-ingredients-partly-specified.json | 3 + ...ins-of-ingredients-specified-multiple.json | 3 + .../origins-of-ingredients-specified.json | 3 + ...origins-of-ingredients-unknown-origin.json | 1 + ...ins-of-ingredients-unspecified-origin.json | 1 + .../ecoscore/packaging-fr-new-shapes.json | 1 + .../packaging-unspecified-no-a-eco-score.json | 1 + .../sum-of-bonuses-greater-than-25.json | 1 + .../ecoscore/track-ecoscore-changes.json | 1 + .../ecoscore/track-ecoscore-no-change.json | 1 + .../ecoscore/track-ecoscore-same-grade.json | 1 + .../track-ecoscore-tags-retained.json | 1 + .../ecoscore/uk-milk.json | 1 + ...bio-oeuf-label-rouge-os-de-poulet-igp.json | 3 + .../fr-ingredients-filet-de-poulet-bio.json | 1 + .../forest_footprint/fr-ingredients-lait.json | 1 + ...ngredients-nested-matching-ingredient.json | 4 + ...dients-nested-matching-sub-ingredient.json | 4 + .../fr-ingredients-poulet-du-gers.json | 1 + .../fr-ingredients-poulet.json | 1 + .../ingredients/ca-middle-dot.json | 7 + .../en-allergens-in-parenthesis.json | 8 + .../ingredients/en-category-types.json | 4 + .../ingredients/en-emulsifier-synonyms.json | 6 + .../ingredients/en-flavour-synonyms.json | 2 + .../en-fruits-sub-ingredients.json | 6 + .../en-illegal-division-by-zero.json | 2 + ...-ing1-and-ing2-processing-parenthesis.json | 7 + .../en-ing1-and-ing2-processing.json | 14 + ...redients-analysis-unknown-ingredients.json | 8 + ...is-that-are-in-the-allergens-taxonomy.json | 3 + .../ingredients/en-kosher.json | 3 + .../en-mechanicaly-separated-meat.json | 1 + .../en-nova-4-fruit-juice-concentrates.json | 1 + .../ingredients/en-origin-and.json | 1 + .../en-origin-field-with-commas-and.json | 2 + .../en-origin-field-with-commas.json | 2 + ...in-field-with-not-taxonomized-entries.json | 3 + .../ingredients/en-origin-field.json | 6 + .../en-origin-ingredient-from-origin.json | 2 + ...n-origin-ingredient-origin-and-origin.json | 2 + .../ingredients/en-origins-u.json | 2 + .../ingredients/en-origins.json | 6 + .../en-quantity-of-ingredient.json | 4 + .../ingredients/en-quantity-per-100g.json | 2 + ...ts-multiple-strings-of-one-ingredient.json | 3 + .../ingredients/en-specific-ingredients.json | 3 + .../ingredients/en-vegetal-ingredients.json | 5 + .../ingredients/en-vitamin.json | 2 + .../en-wheat-flour-organic-gluten-free.json | 2 + .../ingredients/es-percent-loop.json | 11 + ...es-procedente-e-agricultura-biologica.json | 2 + .../ingredients/fi-additive.json | 2 + .../ingredients/fi-additives-origins.json | 5 + .../ingredients/fi-additives-percents.json | 19 + .../ingredients/fi-do-not-match-myanmar.json | 7 + .../ingredients/fi-labels.json | 2 + .../fi-organic-label-part-of-ingredient.json | 3 + .../ingredients/fi-origins.json | 6 + .../ingredients/fi-percents.json | 3 + .../ingredients/fr-additive.json | 2 + ...-agriculture-biologique-de-madagascar.json | 1 + .../ingredients/fr-chocolate-cake.json | 19 + .../ingredients/fr-epices-irradiees.json | 3 + .../fr-farines-labels-and-processes.json | 4 + .../ingredients/fr-halal.json | 4 + .../fr-huile-de-palme-certifiee-durable.json | 3 + .../fr-illegal-division-by-zero.json | 2 + .../fr-infinite-loop-allergens.json | 12 + ...is-that-are-in-the-allergens-taxonomy.json | 3 + .../fr-label-and-multiple-origins.json | 4 + .../ingredients/fr-labels.json | 2 + ...egumes-issus-de-l-agriculture-durable.json | 1 + .../ingredients/fr-marmelade.json | 41 ++ .../fr-mechanicaly-separated-meat.json | 3 + .../fr-oignon-francais-tomate-francaise.json | 2 + .../ingredients/fr-origin-and.json | 1 + .../ingredients/fr-origin-field.json | 11 + ...r-origin-ingredient-origin-and-origin.json | 13 + .../fr-origins-agriculture-ue-non-ue.json | 1 + ...lemagne-france-pays-bas-contient-lait.json | 1 + .../ingredients/fr-origins-labels.json | 9 + .../ingredients/fr-origins.json | 4 + .../ingredients/fr-palm-kernel-fat.json | 1 + .../ingredients/fr-percents-origins-2.json | 6 + .../ingredients/fr-percents-origins.json | 4 + .../ingredients/fr-percents.json | 3 + .../ingredients/fr-processing-multi.json | 6 + .../fr-quantity-of-ingredient.json | 4 + .../ingredients/fr-quantity-per-100g.json | 2 + .../ingredients/fr-semi.json | 2 + .../ingredients/fr-specific-ingredients.json | 5 + .../ingredients/fr-starred-label.json | 3 + .../ingredients/fr-truncated-puree.json | 4 + .../ingredients/fr-vegetal-origin.json | 3 + ...oeuf-issue-d-animaux-nourris-sans-ogm.json | 1 + .../fr-viande-porcine-francaise.json | 4 + .../ingredients/ja-additives.json | 14 + .../ja-allergens-in-parenthesis.json | 4 + .../ingredients/ja-origin-and.json | 2 + .../ingredients/ja-origins.json | 11 + .../ingredients/ja-parenthesis.json | 15 + .../ingredients/ja-slash.json | 15 + .../ingredients/nl-e471-niet-dierlijk.json | 1 + .../ingredients/ru-russian-oil.json | 3 + .../ingredients/xx-single-letters.json | 37 ++ .../fruits-water-sugar.json | 5 + .../ingredients_contents/vegetable-oils.json | 4 + .../2-ingredients-with-max-percent.json | 3 + .../ingredients_percent/absolute-percent.json | 6 + .../chocolate-1-sub-ingredient.json | 2 + .../chocolate-2-sub-ingredients.json | 4 + .../chocolate-sub-sub-ingredients.json | 5 + .../flour-chocolate-egg.json | 6 + ...llegal-division-by-zero-bug-0-percent.json | 5 + .../impossible-values-infinte-loop-bug.json | 4 + .../impossible-values-sub-ingredients.json | 6 + ...cent-but-lower-than-later-ingredients.json | 3 + ...percent-but-sum-less-than-100-percent.json | 2 + ...th-max-percent-from-parent-ingredient.json | 2 + ...-with-max-percent-is-first-ingredient.json | 2 + .../ingredient-with-max-percent.json | 2 + .../ingredients-in-different-quantities.json | 6 + ...-with-1-ingredient-missing-a-quantity.json | 3 + ...ts-in-grams-with-sum-greater-than-100.json | 3 + ...lesser-than-100-not-in-quantity-order.json | 5 + .../max-sugar-salt-nutrition-facts.json | 3 + .../ingredients_percent/min-in-cumin-bug.json | 5 + .../ingredients_percent/minimum-percent.json | 2 + .../missing-percent-not-first-or-last.json | 3 + .../percentage-range-negative-pl.json | 5 + .../ingredients_percent/percentage-range.json | 5 + .../propagate-max-percent.json | 7 + ...percent-min-and-percent-max-on-parent.json | 6 + ...ive-percent-with-no-percent-on-parent.json | 5 + .../ingredients_percent/relative-percent.json | 6 + ...le-percents-when-sum-greater-than-100.json | 3 + .../specific-ingredients-da.json | 7 + .../specific-ingredients-en.json | 1 + .../specific-ingredients-es.json | 5 + .../specific-ingredients-hr.json | 8 + .../specific-ingredients-nl.json | 11 + .../specific-ingredients-sv.json | 7 + .../sugar-90-percent-milk.json | 2 + .../sugar-milk-10-percent-water.json | 3 + .../sugar-milk-10-percent.json | 2 + .../ingredients_percent/sugar-milk-water.json | 3 + .../ingredients_percent/sugar-milk.json | 2 + .../sugar-water-milk-10-percent.json | 3 + .../ingredients_percent/sugar.json | 1 + ...-percent-sugar-and-unknown-ingredient.json | 4 +- .../beverage-with-80-percent-milk.json | 2 + .../nutriscore/breakfast-cereals.json | 2 +- .../nutriscore/colza-oil.json | 2 +- .../nutriscore/cookies.json | 2 +- .../dairy-drink-with-80-percent-milk.json | 4 +- ...-drink-with-less-than-80-percent-milk.json | 4 +- .../nutriscore/dairy-drinks-without-milk.json | 4 +- .../en-apple-estimated-nutrients.json | 3 +- .../nutriscore/en-avocado-oil.json | 3 +- .../nutriscore/en-beers-category.json | 2 +- ...n-beverage-preparation-flavored-syrup.json | 6 +- .../nutriscore/en-cherry-tomatoes.json | 3 +- .../nutriscore/en-milk.json | 2 +- .../en-olive-oil-no-ingredients.json | 2 +- ...en-olive-oil-unrecognized-ingredients.json | 3 +- .../nutriscore/en-olive-oil.json | 3 +- ...orange-juice-category-and-ingredients.json | 5 +- .../nutriscore/en-orange-juice-category.json | 2 +- .../nutriscore/en-potatoes-category.json | 2 +- ...ategory-ingredients-with-lots-of-meat.json | 6 +- ...ous-category-ingredients-with-no-meat.json | 5 +- ...ory-ingredients-with-very-little-meat.json | 8 +- ...eat-ambiguous-category-no-ingredients.json | 2 +- .../en-red-meat-category-no-ingredients.json | 2 +- ...n-soy-beans-processed-and-unprocessed.json | 7 +- .../en-sugar-estimated-nutrients.json | 3 +- .../nutriscore/en-sweeteners-erythritol.json | 6 +- .../nutriscore/en-sweeteners.json | 6 +- .../nutriscore/en-tofu.json | 5 +- .../nutriscore/en-vegetable-crisps.json | 4 +- .../flavored-spring-water-no-nutrition.json | 2 +- .../flavored-spring-with-nutrition.json | 2 +- .../nutriscore/fr-canned-green-beans.json | 5 +- .../nutriscore/fr-canned-pineapple.json | 3 + .../nutriscore/fr-coconut-milk.json | 2 + .../nutriscore/fr-gaspacho.json | 13 +- .../nutriscore/fr-green-beans-beverage.json | 5 +- .../nutriscore/fr-ice-tea-with-sweetener.json | 18 +- .../fr-mixed-oils-with-olive-oil.json | 7 +- .../nutriscore/fr-orange-nectar-0-fat.json | 6 +- .../fr-plant-beverages-soy-milk.json | 4 +- .../nutriscore/fr-rapeseed-oil.json | 3 +- .../nutriscore/milk.json | 3 +- .../nutriscore/mushrooms.json | 4 +- .../nutriscore/olive-oil.json | 2 +- .../nutriscore/spring-water-no-nutrition.json | 2 +- .../sunflower-oil-no-sugar-no-sat-fat.json | 2 +- .../nutriscore/sunflower-oil-no-sugar.json | 2 +- .../nutriscore/sunflower-oil.json | 2 +- .../nutriscore/walnut-oil.json | 2 +- .../100-percent-sugar.json | 1 + .../100-percent-white-sugar.json | 1 + ...percent-sugar-and-unknown-ingredients.json | 3 + .../nutrition_estimation/frik.json | 1 + ...rgherita-pizzas.fr-margherita-pizza-1.json | 9 + ...rgherita-pizza-2-compound-ingredients.json | 8 + .../recipes/nectars.guava-nectar.json | 5 + .../nectars.impossible-ingredients.json | 3 + .../recipes/nectars.strawberry-nectar.json | 3 + 268 files changed, 1392 insertions(+), 470 deletions(-) diff --git a/lib/ProductOpener/Ingredients.pm b/lib/ProductOpener/Ingredients.pm index dd51045da63f4..309a743fe4caf 100644 --- a/lib/ProductOpener/Ingredients.pm +++ b/lib/ProductOpener/Ingredients.pm @@ -2862,6 +2862,9 @@ sub parse_ingredients_text_service ($product_ref, $updated_product_fields_ref) { text => $ingredient ); + my $is_in_taxonomy = exists_taxonomy_tag("ingredients", $ingredient_id) ? 1 : 0; + $ingredient{is_in_taxonomy} = $is_in_taxonomy; + if (defined $percent_or_quantity_value) { my ($percent, $quantity, $quantity_g) = get_percent_or_quantity_and_normalized_quantity($percent_or_quantity_value, diff --git a/tests/integration/expected_test_results/convert_and_import_excel_file/test/products/3270190128403.json b/tests/integration/expected_test_results/convert_and_import_excel_file/test/products/3270190128403.json index e14a888079537..62ac0220e2ef1 100644 --- a/tests/integration/expected_test_results/convert_and_import_excel_file/test/products/3270190128403.json +++ b/tests/integration/expected_test_results/convert_and_import_excel_file/test/products/3270190128403.json @@ -566,7 +566,7 @@ "emb-43062a" ], "entry_dates_tags" : "--ignore--", - "food_groups" : "en:vegetables", + "food_groups" : "en:Vegetables", "food_groups_tags" : [ "en:fruits-and-vegetables", "en:vegetables" @@ -633,6 +633,7 @@ { "ciqual_food_code" : "20505", "id" : "en:green-lentils", + "is_in_taxonomy" : 1, "labels" : "en:organic", "percent_estimate" : 100, "percent_max" : 100, diff --git a/tests/integration/expected_test_results/convert_and_import_excel_file/test/products/4270190128403.json b/tests/integration/expected_test_results/convert_and_import_excel_file/test/products/4270190128403.json index 3fffac7cc0fe4..33700d8a76c11 100644 --- a/tests/integration/expected_test_results/convert_and_import_excel_file/test/products/4270190128403.json +++ b/tests/integration/expected_test_results/convert_and_import_excel_file/test/products/4270190128403.json @@ -361,6 +361,7 @@ "ingredients" : [ { "id" : "fr:white-peaches", + "is_in_taxonomy" : 0, "percent_estimate" : 75, "percent_max" : 100, "percent_min" : 50, @@ -368,6 +369,7 @@ }, { "id" : "fr:high-fructose-corn-syrup", + "is_in_taxonomy" : 0, "percent_estimate" : 25, "percent_max" : 50, "percent_min" : 0, diff --git a/tests/integration/expected_test_results/convert_and_import_excel_file/test/products/5270190128403.json b/tests/integration/expected_test_results/convert_and_import_excel_file/test/products/5270190128403.json index b2f5feb115ef5..1dad2e179fe0a 100644 --- a/tests/integration/expected_test_results/convert_and_import_excel_file/test/products/5270190128403.json +++ b/tests/integration/expected_test_results/convert_and_import_excel_file/test/products/5270190128403.json @@ -351,6 +351,7 @@ { "ciqual_food_code" : "13005", "id" : "en:banana", + "is_in_taxonomy" : 1, "percent_estimate" : 100, "percent_max" : 100, "percent_min" : 100, diff --git a/tests/integration/expected_test_results/export_more_fields/export_more_fields.csv b/tests/integration/expected_test_results/export_more_fields/export_more_fields.csv index e70dd865103b6..d4b97405ef65b 100644 --- a/tests/integration/expected_test_results/export_more_fields/export_more_fields.csv +++ b/tests/integration/expected_test_results/export_more_fields/export_more_fields.csv @@ -1,9 +1,9 @@ code producer_product_id producer_version_id lc product_name_de product_name_en product_name_es product_name_fr product_name_pt abbreviated_product_name_en abbreviated_product_name_fr generic_name_en generic_name_fr generic_name_pt quantity serving_size packaging packaging_tags brands brands_tags brand_owner categories categories_tags labels labels_tags countries countries_tags stores stores_tags origins origins_tags origin_fr manufacturing_places manufacturing_places_tags emb_codes emb_codes_tags ingredients_text_en ingredients_text_es ingredients_text_fr ingredients_text_pt allergens allergens_tags traces traces_tags nutrition_data_per nutrition_data_prepared_per energy-kj_value energy-kj_unit energy-kcal_value energy-kcal_unit fat_value fat_unit saturated-fat_value saturated-fat_unit carbohydrates_value carbohydrates_unit sugars_value sugars_unit fiber_value fiber_unit proteins_value proteins_unit salt_value salt_unit sodium_value sodium_unit energy_value energy_unit monounsaturated-fat_value monounsaturated-fat_unit polyunsaturated-fat_value polyunsaturated-fat_unit trans-fat_value trans-fat_unit cholesterol_value cholesterol_unit vitamin-a_value vitamin-a_unit vitamin-c_value vitamin-c_unit vitamin-b1_value vitamin-b1_unit vitamin-b2_value vitamin-b2_unit vitamin-pp_value vitamin-pp_unit vitamin-b6_value vitamin-b6_unit vitamin-b9_value vitamin-b9_unit vitamin-b12_value vitamin-b12_unit potassium_value potassium_unit calcium_value calcium_unit iron_value iron_unit manganese_value manganese_unit fruits-vegetables-nuts-estimate_value fruits-vegetables-nuts-estimate_unit packaging_1_number_of_units packaging_1_shape packaging_1_material packaging_1_quantity_per_unit packaging_1_weight_specified packaging_1_weight_measured packaging_2_number_of_units packaging_2_shape packaging_2_material packaging_2_weight_measured conservation_conditions_fr preparation_fr customer_service_fr link off:food_groups off:food_groups_tags off:nova_groups off:nova_groups_tags off:nutriscore_grade off:nutriscore_score off:ecoscore_grade off:ecoscore_score off:ecoscore_data.missing_key_data off:ecoscore_data.agribalyse.code off:ecoscore_data.adjustments.origins_of_ingredients.value off:ecoscore_data.adjustments.packaging.value off:ecoscore_data.adjustments.packaging.non_recyclable_and_non_biodegradable_materials off:ecoscore_data.adjustments.production_system.value off:ecoscore_data.adjustments.threatened_species.value sources_fields:org-database-usda:available_date sources_fields:org-database-usda:fdc_category sources_fields:org-database-usda:fdc_data_source sources_fields:org-database-usda:fdc_id sources_fields:org-database-usda:modified_date sources_fields:org-database-usda:publication_date sources_fields:org-gs1:gln sources_fields:org-gs1:gpcCategoryCode sources_fields:org-gs1:gpcCategoryName sources_fields:org-gs1:isAllergenRelevantDataProvided sources_fields:org-gs1:lastChangeDateTime sources_fields:org-gs1:partyName sources_fields:org-gs1:productionVariantDescription sources_fields:org-gs1:publicationDateTime data_sources obsolete -3661344653573 fr Yaourt Crémeuh Café Les 2 vaches les-2-vaches Produits laitiers, Desserts, Desserts lactés, Crèmes dessert, Crèmes dessert café en:dairies,en:desserts,en:dairy-desserts,en:creamy-puddings,en:coffee-creamy-puddings Commerce équitable, Bio, Bio européen, Fairtrade International, FR-BIO-01, Max Havelaar, Nutriscore, Nutriscore C en:fair-trade,en:organic,en:eu-organic,en:fairtrade-international,en:fr-bio-01,en:max-havelaar,en:nutriscore,en:nutriscore-grade-c France en:france FR 14.370.001 EC fr-14-370-001-ec "Lait entier pasteurisé équitable (73,4%), sucre de canne'; équiltable (9,5%), crème'; équitable amidon* de mais, lait écrémé en poudre, cale'; lyophilise équitable (1,2%). ';Issu de l'agriculture biologique, Lait Origine France. Commerce équitable contrilé Fair For Life: 90.7% des ingrédients d'origine agricole. Café issu du commerce équitable certifié Fairtrade/Max Havelaar. 'poudre de lait origine France Meuglez-nous au 0 801 803 804 CERTI AGRIC FR 14.370.001 CE CRÊMEUH CAFE" Lait en:milk 100g 100g 137 kcal 5 g 3.5 g 19.2 g 15 g 3.9 g 0.4 g 0.16 g 137 kcal 2 en:bottle en:pet-1-polyethylene-terephthalate 32.1 2 en:lid en:pp-5-polypropylene 3 en:dairy-desserts en:milk-and-dairy-products,en:dairy-desserts 3 en:3-processed-foods c 6 a 100 39246 -5 -7 0 20 App - yuka, Apps, App - Open Food Facts 0 -3564703999971 fr Huile d'olive Marque Repère marque-repere Matières grasses en:fats Bio en:organic France en:france Leclerc leclerc Huile d'olive vierge extra issue de l'agriculture biologique - huile pour friture et assaisonnement - huile d'olive de catégorie supérieure obtenue directement des olives et uniquement par des procédés mécaniques tunisie 100g 100g 819 kcal 91 g 16 g 0 g 0 g 0 g 0 g 0 g 0 g 819 kcal 5 en:box en:cardboard 70.7 en:fats en:fats-and-sauces,en:fats 2 en:2-processed-culinary-ingredients c 10 unknown -5 -1 0 0 App - yuka, Apps 0 -8722700472575 CU AM SLDDRE CAESAR 6X1L PBOT FR fr Amora Sauce caesar salade & sandwich bouteille 1L Amora sauce caesar 1l Sauce Salade & Sandwich Caesar 1000 ml 30 ml (Portion) Plastique, Bouteille ou Flacon, Bouteille, en:test en:plastic,en:bottle-or-vial,en:bottle,en:test Amora amora Condiments, Sauces, Sauces salades, Sauces caesar, Epicerie en:condiments,en:sauces,en:salad-dressings,en:caesar-sauces,fr:epicerie Sans colorants artificiels, Sans exhausteur de goût en:no-artificial-colors,en:no-flavour-enhancer France en:france Intermarché intermarche "Eau, huile de tournesol, vinaigre d'alcool, FROMAGE 3,2%, LAIT écrémé en poudre, jaune d'ŒUF de poules élevées en plein air 2,3%, ail 2,2%, amidon modifié de maïs, sel, jus de citron concentré, sucre, ANCHOIS 0,27%, conservateur : sorbate de potassium, épaississant : gomme xanthane, poivre noir, antioxydant : E385, sirop de sucre inverti, concentré de carthame. Peut contenir : sésame, moutarde." "Œufs, Poisson, Lait" en:eggs,en:fish,en:milk Moutarde, Graines de sésame en:mustard,en:sesame-seeds 100g 100g 1137 kJ 273 kcal 27 g 3.8 g 4.8 g 3.2 g 0 g 2.8 g 1.6 g 0.64 g 1137 kJ "A conserver au sec, à l'abri de la lumière et à température ambiante (<25°C).Après ouverture, se conserve au réfrigérateur dans un délai de 1 mois." Bien agiter avant emploi. UNILEVER France Food Solutions Relation Consommateurs, Unilever France Food Solutions, 20 rue des Deux Gares 92842 Rueil-Malmaison Cedex http://www-unileverfoodsolutions-com.s3.amazonaws.com/ext%2Fdownload%2Fmis%2Ffr%2F8_72270_047257_5_fr.pdf en:dressings-and-sauces en:fats-and-sauces,en:dressings-and-sauces 4 en:4-ultra-processed-food-and-drink-products d 13 d 37 1 11187 -5 -15 1 0 8711200996988 10000200 Assaisonnements/Sauces Froides (Longue Conservation) true 2022-01-12T19:08:58+01:00 UNILEVER FRANCE RHD CU AM SLDDRE CAESAR 6X1L PBOT FR 2022-01-12T19:08:58+01:00 App - yuka, Apps, Producers, Producer - unilever-france-rhd, Database - Equadis, Database - GDSN, Databases 0 -5050083706622 fr Trésor goût Chocolat Noisettes Céréales fourrées chocolat noisette 400 g 30 g Papier ou carton, Carton en:paper-or-cardboard,en:cardboard Kellogg's, kellogs kellogg-s,kellogs "Aliments et boissons à base de végétaux, Aliments d'origine végétale, Petit-déjeuners, Céréales et pommes de terre, Céréales et dérivés, Céréales pour petit-déjeuner, Céréales au chocolat, Céréales extrudées, Céréales fourrées" en:plant-based-foods-and-beverages,en:plant-based-foods,en:breakfasts,en:cereals-and-potatoes,en:cereals-and-their-products,en:breakfast-cereals,en:chocolate-cereals,en:extruded-cereals,en:filled-cereals France en:france "Farines de céréales (Blé{26%}, Avoine complète{17%}, Riz{12%}), Fourrage Chocolat Noisettes (Sucre, Huiles végétaleles [Colza, Palme], Chocolat {4%}[Sucre, Pâte de cacao], Maltodextrine, Noisettes{2%),Cacao maigre en poudre, Petit-lait en poudre, lait écrémé en poudre, Émulsifiant([Lécithine de tournesol], Arôme naturel), Sucre, Sel, Colorant (Charoténoides, Rocou), Antioxydant (Palmitate d'ascorbyle, Alpha-tocophérol). Vitamines et Minéraux : Vitamines (niacine, B6, B2, Bl, acide folique, B12), Fer." "Gluten, Lait, Fruits à coque" en:gluten,en:milk,en:nuts "Fruits à coque" en:nuts 100g 100g 450 kcal 16 g 4 g 68 g 29 g 1 g 6.9 g 1.14 g 0.456 g 450 kcal 0.28 mg 0.35 mg 4 mg 0.35 mg 50 µg 0.63 µg 2.4 mg en:breakfast-cereals en:cereals-and-potatoes,en:breakfast-cereals 4 en:4-ultra-processed-food-and-drink-products d 18 e 15 1 32135 -5 -15 1 0 -10 App - yuka, Apps, App - Open Food Facts 0 -3256220513173 fr Sirop de thé pêche Sirop de Thé Pêche 75 cl 200 ml Métal, Bidon ou bonbonne, Bidon en:metal,en:jug-or-canister,en:jug U u Boissons et préparations de boissons, Boissons, Sirops, Boissons avec sucre ajouté en:beverages-and-beverages-preparations,en:beverages,en:syrups,en:sweetened-beverages Sans conservateurs, Point Vert, Transformé en France en:no-preservatives,en:green-dot,en:transformed-in-france France en:france Super U, Magasins U super-u,magasins-u "Sucre, jus de fruits à base de concentrés 40% (pêche 20%, citron), eau, arômes, acidifiant : acide citrique, colorants : lutéine et anthocyanes, stabilisant : E445." 100g 100g 1402 kJ 330 kcal 0.1 g 0.1 g 80 g 79 g 0.5 g 0.1 g 0.01 g 0.004 g 1402 kJ en:sweetened-beverages en:beverages,en:sweetened-beverages 4 en:4-ultra-processed-food-and-drink-products e 20 unknown 1 -5 -15 1 0 Producer - Systeme U, Producers, App - yuka, Apps 0 +3661344653573 fr Yaourt Crémeuh Café Les 2 vaches les-2-vaches Produits laitiers, Desserts, Desserts lactés, Crèmes dessert, Crèmes dessert café en:dairies,en:desserts,en:dairy-desserts,en:creamy-puddings,en:coffee-creamy-puddings Commerce équitable, Bio, Bio européen, Fairtrade International, FR-BIO-01, Max Havelaar, Nutriscore, Nutriscore C en:fair-trade,en:organic,en:eu-organic,en:fairtrade-international,en:fr-bio-01,en:max-havelaar,en:nutriscore,en:nutriscore-grade-c France en:france FR 14.370.001 EC fr-14-370-001-ec "Lait entier pasteurisé équitable (73,4%), sucre de canne'; équiltable (9,5%), crème'; équitable amidon* de mais, lait écrémé en poudre, cale'; lyophilise équitable (1,2%). ';Issu de l'agriculture biologique, Lait Origine France. Commerce équitable contrilé Fair For Life: 90.7% des ingrédients d'origine agricole. Café issu du commerce équitable certifié Fairtrade/Max Havelaar. 'poudre de lait origine France Meuglez-nous au 0 801 803 804 CERTI AGRIC FR 14.370.001 CE CRÊMEUH CAFE" Lait en:milk 100g 100g 137 kcal 5 g 3.5 g 19.2 g 15 g 3.9 g 0.4 g 0.16 g 137 kcal 2 en:bottle en:pet-1-polyethylene-terephthalate 32.1 2 en:lid en:pp-5-polypropylene 3 en:Dairy desserts en:milk-and-dairy-products,en:dairy-desserts 3 en:3-processed-foods c 6 a 100 39246 -5 -7 0 20 App - yuka, Apps, App - Open Food Facts 0 +3564703999971 fr Huile d'olive Marque Repère marque-repere Matières grasses en:fats Bio en:organic France en:france Leclerc leclerc Huile d'olive vierge extra issue de l'agriculture biologique - huile pour friture et assaisonnement - huile d'olive de catégorie supérieure obtenue directement des olives et uniquement par des procédés mécaniques tunisie 100g 100g 819 kcal 91 g 16 g 0 g 0 g 0 g 0 g 0 g 0 g 819 kcal 5 en:box en:cardboard 70.7 en:Fats en:fats-and-sauces,en:fats 2 en:2-processed-culinary-ingredients c 10 unknown -5 -1 0 0 App - yuka, Apps 0 +8722700472575 CU AM SLDDRE CAESAR 6X1L PBOT FR fr Amora Sauce caesar salade & sandwich bouteille 1L Amora sauce caesar 1l Sauce Salade & Sandwich Caesar 1000 ml 30 ml (Portion) Plastique, Bouteille ou Flacon, Bouteille, en:test en:plastic,en:bottle-or-vial,en:bottle,en:test Amora amora Condiments, Sauces, Sauces salades, Sauces caesar, Epicerie en:condiments,en:sauces,en:salad-dressings,en:caesar-sauces,fr:epicerie Sans colorants artificiels, Sans exhausteur de goût en:no-artificial-colors,en:no-flavour-enhancer France en:france Intermarché intermarche "Eau, huile de tournesol, vinaigre d'alcool, FROMAGE 3,2%, LAIT écrémé en poudre, jaune d'ŒUF de poules élevées en plein air 2,3%, ail 2,2%, amidon modifié de maïs, sel, jus de citron concentré, sucre, ANCHOIS 0,27%, conservateur : sorbate de potassium, épaississant : gomme xanthane, poivre noir, antioxydant : E385, sirop de sucre inverti, concentré de carthame. Peut contenir : sésame, moutarde." "Œufs, Poisson, Lait" en:eggs,en:fish,en:milk Moutarde, Graines de sésame en:mustard,en:sesame-seeds 100g 100g 1137 kJ 273 kcal 27 g 3.8 g 4.8 g 3.2 g 0 g 2.8 g 1.6 g 0.64 g 1137 kJ "A conserver au sec, à l'abri de la lumière et à température ambiante (<25°C).Après ouverture, se conserve au réfrigérateur dans un délai de 1 mois." Bien agiter avant emploi. UNILEVER France Food Solutions Relation Consommateurs, Unilever France Food Solutions, 20 rue des Deux Gares 92842 Rueil-Malmaison Cedex http://www-unileverfoodsolutions-com.s3.amazonaws.com/ext%2Fdownload%2Fmis%2Ffr%2F8_72270_047257_5_fr.pdf en:Dressings and sauces en:fats-and-sauces,en:dressings-and-sauces 4 en:4-ultra-processed-food-and-drink-products d 13 d 37 1 11187 -5 -15 1 0 8711200996988 10000200 Assaisonnements/Sauces Froides (Longue Conservation) true 2022-01-12T19:08:58+01:00 UNILEVER FRANCE RHD CU AM SLDDRE CAESAR 6X1L PBOT FR 2022-01-12T19:08:58+01:00 App - yuka, Apps, Producers, Producer - unilever-france-rhd, Database - Equadis, Database - GDSN, Databases 0 +5050083706622 fr Trésor goût Chocolat Noisettes Céréales fourrées chocolat noisette 400 g 30 g Papier ou carton, Carton en:paper-or-cardboard,en:cardboard Kellogg's, kellogs kellogg-s,kellogs "Aliments et boissons à base de végétaux, Aliments d'origine végétale, Petit-déjeuners, Céréales et pommes de terre, Céréales et dérivés, Céréales pour petit-déjeuner, Céréales au chocolat, Céréales extrudées, Céréales fourrées" en:plant-based-foods-and-beverages,en:plant-based-foods,en:breakfasts,en:cereals-and-potatoes,en:cereals-and-their-products,en:breakfast-cereals,en:chocolate-cereals,en:extruded-cereals,en:filled-cereals France en:france "Farines de céréales (Blé{26%}, Avoine complète{17%}, Riz{12%}), Fourrage Chocolat Noisettes (Sucre, Huiles végétaleles [Colza, Palme], Chocolat {4%}[Sucre, Pâte de cacao], Maltodextrine, Noisettes{2%),Cacao maigre en poudre, Petit-lait en poudre, lait écrémé en poudre, Émulsifiant([Lécithine de tournesol], Arôme naturel), Sucre, Sel, Colorant (Charoténoides, Rocou), Antioxydant (Palmitate d'ascorbyle, Alpha-tocophérol). Vitamines et Minéraux : Vitamines (niacine, B6, B2, Bl, acide folique, B12), Fer." "Gluten, Lait, Fruits à coque" en:gluten,en:milk,en:nuts "Fruits à coque" en:nuts 100g 100g 450 kcal 16 g 4 g 68 g 29 g 1 g 6.9 g 1.14 g 0.456 g 450 kcal 0.28 mg 0.35 mg 4 mg 0.35 mg 50 µg 0.63 µg 2.4 mg en:Breakfast cereals en:cereals-and-potatoes,en:breakfast-cereals 4 en:4-ultra-processed-food-and-drink-products d 18 e 15 1 32135 -5 -15 1 0 -10 App - yuka, Apps, App - Open Food Facts 0 +3256220513173 fr Sirop de thé pêche Sirop de Thé Pêche 75 cl 200 ml Métal, Bidon ou bonbonne, Bidon en:metal,en:jug-or-canister,en:jug U u Boissons et préparations de boissons, Boissons, Sirops, Boissons avec sucre ajouté en:beverages-and-beverages-preparations,en:beverages,en:syrups,en:sweetened-beverages Sans conservateurs, Point Vert, Transformé en France en:no-preservatives,en:green-dot,en:transformed-in-france France en:france Super U, Magasins U super-u,magasins-u "Sucre, jus de fruits à base de concentrés 40% (pêche 20%, citron), eau, arômes, acidifiant : acide citrique, colorants : lutéine et anthocyanes, stabilisant : E445." 100g 100g 1402 kJ 330 kcal 0.1 g 0.1 g 80 g 79 g 0.5 g 0.1 g 0.01 g 0.004 g 1402 kJ en:Sweetened beverages en:beverages,en:sweetened-beverages 4 en:4-ultra-processed-food-and-drink-products e 20 unknown 1 -5 -15 1 0 Producer - Systeme U, Producers, App - yuka, Apps 0 3173990027337 fr Fourrés myrtilles France en:france 100g 100g 455 kcal 15 g 1.6 g 70 g 34 g 5.7 g 0.43 g 0.172 g 455 kcal unknown unknown unknown 1 -5 -15 1 0 App - yuka, Apps 0 7804659650035 es Not mayo 12 g Notco notco Condimentos, Salsas, Mayonesas, Comestibles en:condiments,en:sauces,en:mayonnaises,es:comestibles Vegetariano, Vegano en:vegetarian,en:vegan Chile, Francia, España en:chile,en:france,en:spain "Aceite de canola, agua, garbanzos, lupino, semillas de mostaza, vinagre de uva, jugo de limón, sal, azúcar rubia, pimienta blanca, ajo en polvo, EDTA. @@ -11,22 +11,22 @@ code producer_product_id producer_version_id lc product_name_de product_name_en Ingredients list (English): -Canola Oil, Water, Garbanzo Beans, Lupin (bean), Mustard Seeds, Grape Vinegar, Lemon Juice, Salt, White Sugar, White Pepper, Garlic Powder, EDTA." Altramuces, Mostaza en:lupin,en:mustard 100g 100g 582 kcal 58 g 3 g 9.3 g 1 g 0 g 1 g 640 mg 256 mg 582 kcal 39 g 3 g en:dressings-and-sauces en:fats-and-sauces,en:dressings-and-sauces unknown c 9 d 37 1 11054 -5 -15 1 0 App - yuka, Apps 0 -5410803950689 fr Sauce algérienne Sauce émulsionnée froide piquante aux oignons rôtis 500 ml Plastique, Bouteille ou Flacon, Flacon en:plastic,en:bottle-or-vial,en:vial Halal maïza halal-maiza Condiments, Sauces, Sauces algériennes, Epicerie en:condiments,en:sauces,en:algerian-style-sauces,fr:epicerie Halal en:halal France en:france 100g 100g 521 kcal 49.4 g 4.2 g 17.1 g 12.8 g 1.9 g 2.1 g 0.84 g 521 kcal en:dressings-and-sauces en:fats-and-sauces,en:dressings-and-sauces unknown e 21 unknown 1 -5 -15 1 0 App - yuka, Apps 0 -27096765 fr Lait crème 5 x 40 g 40 g Plastique, Métal, Métaux recyclables, Aluminium en:plastic,en:metal,en:recyclable-metals,en:aluminium Château chateau Snacks, Snacks sucrés, Cacao et dérivés, Biscuits et gâteaux, Gâteaux, Chocolats, Chocolats au lait, Gâteaux au chocolat en:snacks,en:sweet-snacks,en:cocoa-and-its-products,en:biscuits-and-cakes,en:cakes,en:chocolates,en:milk-chocolates,en:chocolate-cakes Agriculture durable, Certifié UTZ en:sustainable-farming,en:utz-certified Belgique, France en:belgium,en:france Sugar, cocoa butter, cream powder (milk) (15.9%), cocoa paste, whole milk powder (5.5%), skim milk powder, lactose, emulsifier: lecithin (soy), vanilla extract Sucre, beurre de cacao, crème en poudre (lait) (15,9%), pâte de cacao, lait entier en poudre (5,5%), lait écrémé en poudre, lactose, émulsifiant : lécithine (soja), extrait de vanille Lait, Soja en:milk,en:soybeans "Fruits à coque, Arachides" en:nuts,en:peanuts 100g 100g 563 kcal 35 g 22 g 52 g 51 g 8 g 0.24 g 0.096 g 563 kcal en:chocolate-products en:sugary-snacks,en:chocolate-products 4 en:4-ultra-processed-food-and-drink-products e 28 d 37 1 23585 -5 -15 1 10 App - yuka, Apps, App - InFood 0 -3270160503070 fr Oignons rouges émincés surgelés Oignons surgelés 450 g Plastique, Surgelé en:plastic,en:frozen Picard picard "Aliments et boissons à base de végétaux, Aliments d'origine végétale, Aliments à base de fruits et de légumes, Condiments, Légumes et dérivés, Plantes condimentaires, Surgelés, Aliments à base de plantes surgelés, Légumes surgelés, Epicerie" en:plant-based-foods-and-beverages,en:plant-based-foods,en:fruits-and-vegetables-based-foods,en:condiments,en:vegetables-based-foods,en:culinary-plants,en:frozen-foods,en:frozen-plant-based-foods,en:frozen-vegetables,fr:epicerie France en:france Picard picard France, Bénélux EMB 62863C emb-62863c Oignons rouges 100% 100g 100g 41 kcal 0.2 g 0.1 g 7.9 g 5.6 g 1.4 g 1.2 g 0.01 g 0.004 g 41 kcal en:vegetables en:fruits-and-vegetables,en:vegetables 1 en:1-unprocessed-or-minimally-processed-foods a -5 unknown 1 -5 -15 1 0 App - Yuka, Apps 0 -3451790834080 29135200 fr UHT sterilised semi-skimmed milk enriched with vitamins B1, B2, B5, B12 and D - Long life Lait demi ecrémé Vitamin enriched milk Semi-skimmed milk Lait demi-écrémé stérilisé UHT enrichi en vitamines B1, B2, B5, B12 et D - longue conservation 1 l "Plastique, Bouchon en polyéthylène, Bouteille en Polyéthylène, Opercule en matériau composite, Étiquette en papier" en:plastic,fr:bouchon-en-polyethylene,fr:bouteille-en-polyethylene,fr:opercule-en-materiau-composite,fr:etiquette-en-papier Elle & Vire, Savencia, Elle&Vire International elle-vire,savencia,elle-vire-international Savencia Produits laitiers, Crèmes, Laits, Laits homogénéisés, Laits demi-écrémés, Laits UHT, Crèmes entières, Crèmes cuisson en:dairies,en:creams,en:milks,en:homogenized-milks,en:semi-skimmed-milks,en:uht-milks,fr:cremes-entieres,fr:cremes-cuisson Enrichi en vitamines, Fabriqué en France en:enriched-with-vitamins,en:made-in-france France en:france Toutes enseignes GMS toutes-enseignes-gms France en:france France, Somme france,somme FR 80.001.002 EC, FR 50.139.001 EC fr-80-001-002-ec,fr-50-139-001-ec Milk Leche _Lait_ demi-écrémé stérilisé UHT enrichi en vitamines B1, B2, B5, B12 et D. Leite Lait en:milk 100g 100g 193 kJ 46 kcal 1.55 g 1.1 g 4.8 g 4.8 g 0 g 3.2 g 0.13 g 0.052 g 193 kJ 120 mg 21.875 g https://www.elle-et-vire.com/en/produits/lait/bouteilles/lait-demi-ecreme-vitamine-uht/ en:milk-and-yogurt en:milk-and-dairy-products,en:milk-and-yogurt 1 en:1-unprocessed-or-minimally-processed-foods b 1 b 61 1 19041 19 -15 1 0 App - yuka, Apps, Producers, Producer - elle-vire 0 +Canola Oil, Water, Garbanzo Beans, Lupin (bean), Mustard Seeds, Grape Vinegar, Lemon Juice, Salt, White Sugar, White Pepper, Garlic Powder, EDTA." Altramuces, Mostaza en:lupin,en:mustard 100g 100g 582 kcal 58 g 3 g 9.3 g 1 g 0 g 1 g 640 mg 256 mg 582 kcal 39 g 3 g en:Dressings and sauces en:fats-and-sauces,en:dressings-and-sauces unknown c 9 d 37 1 11054 -5 -15 1 0 App - yuka, Apps 0 +5410803950689 fr Sauce algérienne Sauce émulsionnée froide piquante aux oignons rôtis 500 ml Plastique, Bouteille ou Flacon, Flacon en:plastic,en:bottle-or-vial,en:vial Halal maïza halal-maiza Condiments, Sauces, Sauces algériennes, Epicerie en:condiments,en:sauces,en:algerian-style-sauces,fr:epicerie Halal en:halal France en:france 100g 100g 521 kcal 49.4 g 4.2 g 17.1 g 12.8 g 1.9 g 2.1 g 0.84 g 521 kcal en:Dressings and sauces en:fats-and-sauces,en:dressings-and-sauces unknown e 21 unknown 1 -5 -15 1 0 App - yuka, Apps 0 +27096765 fr Lait crème 5 x 40 g 40 g Plastique, Métal, Métaux recyclables, Aluminium en:plastic,en:metal,en:recyclable-metals,en:aluminium Château chateau Snacks, Snacks sucrés, Cacao et dérivés, Biscuits et gâteaux, Gâteaux, Chocolats, Chocolats au lait, Gâteaux au chocolat en:snacks,en:sweet-snacks,en:cocoa-and-its-products,en:biscuits-and-cakes,en:cakes,en:chocolates,en:milk-chocolates,en:chocolate-cakes Agriculture durable, Certifié UTZ en:sustainable-farming,en:utz-certified Belgique, France en:belgium,en:france Sugar, cocoa butter, cream powder (milk) (15.9%), cocoa paste, whole milk powder (5.5%), skim milk powder, lactose, emulsifier: lecithin (soy), vanilla extract Sucre, beurre de cacao, crème en poudre (lait) (15,9%), pâte de cacao, lait entier en poudre (5,5%), lait écrémé en poudre, lactose, émulsifiant : lécithine (soja), extrait de vanille Lait, Soja en:milk,en:soybeans "Fruits à coque, Arachides" en:nuts,en:peanuts 100g 100g 563 kcal 35 g 22 g 52 g 51 g 8 g 0.24 g 0.096 g 563 kcal en:Chocolate products en:sugary-snacks,en:chocolate-products 4 en:4-ultra-processed-food-and-drink-products e 28 d 37 1 23585 -5 -15 1 10 App - yuka, Apps, App - InFood 0 +3270160503070 fr Oignons rouges émincés surgelés Oignons surgelés 450 g Plastique, Surgelé en:plastic,en:frozen Picard picard "Aliments et boissons à base de végétaux, Aliments d'origine végétale, Aliments à base de fruits et de légumes, Condiments, Légumes et dérivés, Plantes condimentaires, Surgelés, Aliments à base de plantes surgelés, Légumes surgelés, Epicerie" en:plant-based-foods-and-beverages,en:plant-based-foods,en:fruits-and-vegetables-based-foods,en:condiments,en:vegetables-based-foods,en:culinary-plants,en:frozen-foods,en:frozen-plant-based-foods,en:frozen-vegetables,fr:epicerie France en:france Picard picard France, Bénélux EMB 62863C emb-62863c Oignons rouges 100% 100g 100g 41 kcal 0.2 g 0.1 g 7.9 g 5.6 g 1.4 g 1.2 g 0.01 g 0.004 g 41 kcal en:Vegetables en:fruits-and-vegetables,en:vegetables 1 en:1-unprocessed-or-minimally-processed-foods a -5 unknown 1 -5 -15 1 0 App - Yuka, Apps 0 +3451790834080 29135200 fr UHT sterilised semi-skimmed milk enriched with vitamins B1, B2, B5, B12 and D - Long life Lait demi ecrémé Vitamin enriched milk Semi-skimmed milk Lait demi-écrémé stérilisé UHT enrichi en vitamines B1, B2, B5, B12 et D - longue conservation 1 l "Plastique, Bouchon en polyéthylène, Bouteille en Polyéthylène, Opercule en matériau composite, Étiquette en papier" en:plastic,fr:bouchon-en-polyethylene,fr:bouteille-en-polyethylene,fr:opercule-en-materiau-composite,fr:etiquette-en-papier Elle & Vire, Savencia, Elle&Vire International elle-vire,savencia,elle-vire-international Savencia Produits laitiers, Crèmes, Laits, Laits homogénéisés, Laits demi-écrémés, Laits UHT, Crèmes entières, Crèmes cuisson en:dairies,en:creams,en:milks,en:homogenized-milks,en:semi-skimmed-milks,en:uht-milks,fr:cremes-entieres,fr:cremes-cuisson Enrichi en vitamines, Fabriqué en France en:enriched-with-vitamins,en:made-in-france France en:france Toutes enseignes GMS toutes-enseignes-gms France en:france France, Somme france,somme FR 80.001.002 EC, FR 50.139.001 EC fr-80-001-002-ec,fr-50-139-001-ec Milk Leche _Lait_ demi-écrémé stérilisé UHT enrichi en vitamines B1, B2, B5, B12 et D. Leite Lait en:milk 100g 100g 193 kJ 46 kcal 1.55 g 1.1 g 4.8 g 4.8 g 0 g 3.2 g 0.13 g 0.052 g 193 kJ 120 mg 21.875 g https://www.elle-et-vire.com/en/produits/lait/bouteilles/lait-demi-ecreme-vitamine-uht/ en:Milk and yogurt en:milk-and-dairy-products,en:milk-and-yogurt 1 en:1-unprocessed-or-minimally-processed-foods b 1 b 61 1 19041 19 -15 1 0 App - yuka, Apps, Producers, Producer - elle-vire 0 3760178254021 fr Chocolat au lait France en:france 100g 100g 148 kcal 9.2 g 5.4 g 13 g 13 g 3.4 g 148 kcal unknown unknown unknown 1 -5 -15 1 0 App - yuka, Apps 0 29161690 fr 100 % Almond Buter 227 g France en:france 100g 100g 635 kcal 54.9 g 5.4 g 27.6 g 3.4 g 21 g 635 kcal unknown unknown unknown 1 -5 -15 1 0 App - yuka, Apps 0 -3770013801303 fr Limonade Boissons et préparations de boissons, Boissons, Boissons gazeuses, Sodas, Limonades en:beverages-and-beverages-preparations,en:beverages,en:carbonated-drinks,en:sodas,en:lemonade Bio en:organic France en:france 100g 100g 31.2 kcal 1 g 1 g 7.5 g 7.5 g 1 g 0.7 g 31.2 kcal en:sweetened-beverages en:beverages,en:sweetened-beverages unknown unknown not-applicable 1 -5 -15 1 0 App - yuka, Apps 0 -25000044984 en Simply lemonade Simply Lemonade 8 OZA (240 ml) The Minute Maid Company Beverages and beverages preparations, Beverages, Carbonated drinks, Sodas, Lemonade, Sweetened beverages en:beverages-and-beverages-preparations,en:beverages,en:carbonated-drinks,en:sodas,en:lemonade,en:sweetened-beverages France, United States en:france,en:united-states Contains pure filtered water, lemon juice, cane sugar, natural flavors. Contains pure filtered water, lemon juice, cane sugar, natural flavors. 100g 100g 50 kcal 0 g 0 g 12.5 g 11.67 g 0 g 0.0159 g 0.00636 g 50 kcal en:sweetened-beverages en:beverages,en:sweetened-beverages 4 en:4-ultra-processed-food-and-drink-products e 15 not-applicable 1 -5 -15 1 0 2019-07-29T00:00:00Z Soda LI 678078 2019-07-29T00:00:00Z 2019-12-06T00:00:00Z App - yuka, Apps, Databases, database-usda, App - InFood 0 +3770013801303 fr Limonade Boissons et préparations de boissons, Boissons, Boissons gazeuses, Sodas, Limonades en:beverages-and-beverages-preparations,en:beverages,en:carbonated-drinks,en:sodas,en:lemonade Bio en:organic France en:france 100g 100g 31.2 kcal 1 g 1 g 7.5 g 7.5 g 1 g 0.7 g 31.2 kcal en:Sweetened beverages en:beverages,en:sweetened-beverages unknown unknown not-applicable 1 -5 -15 1 0 App - yuka, Apps 0 +25000044984 en Simply lemonade Simply Lemonade 8 OZA (240 ml) The Minute Maid Company Beverages and beverages preparations, Beverages, Carbonated drinks, Sodas, Lemonade, Sweetened beverages en:beverages-and-beverages-preparations,en:beverages,en:carbonated-drinks,en:sodas,en:lemonade,en:sweetened-beverages France, United States en:france,en:united-states Contains pure filtered water, lemon juice, cane sugar, natural flavors. Contains pure filtered water, lemon juice, cane sugar, natural flavors. 100g 100g 50 kcal 0 g 0 g 12.5 g 11.67 g 0 g 0.0159 g 0.00636 g 50 kcal en:Sweetened beverages en:beverages,en:sweetened-beverages 4 en:4-ultra-processed-food-and-drink-products e 15 not-applicable 1 -5 -15 1 0 2019-07-29T00:00:00Z Soda LI 678078 2019-07-29T00:00:00Z 2019-12-06T00:00:00Z App - yuka, Apps, Databases, database-usda, App - InFood 0 80650904 fr Olio aromatizzato funghi e tartufo France en:france 100g 100g unknown unknown unknown 1 -5 -15 1 0 App - yuka, Apps 0 -9002355004345 de Tiroler Früchteküche Marillen 420 g Glas en:glass Tiroler Früchteküche tiroler-fruchtekuche "Pflanzliche Lebensmittel und Getränke, Pflanzliche Lebensmittel, Frucht- und gemüsebasierte Lebensmittel, Frühstücke, Brotaufstriche, Fruchtbasierte Lebensmittel, Pflanzliche Brotaufstriche, Süße Brotaufstriche, Konfitüren und Marmeladen, Konfitüren" en:plant-based-foods-and-beverages,en:plant-based-foods,en:fruits-and-vegetables-based-foods,en:breakfasts,en:spreads,en:fruits-based-foods,en:plant-based-spreads,en:sweet-spreads,en:fruit-and-vegetable-preserves,en:jams Frankreich, Deutschland en:france,en:germany 100g 100g 224 kcal 0 g 0 g 54 g 53 g 0 g 0 g 0 g 224 kcal en:sweets en:sugary-snacks,en:sweets unknown d 11 b 60 1 31024 -5 -15 1 0 App - yuka, Apps 0 -26281742 en Stawberry jam Strawberry conserve 500 g serving fr:bocal verre fr:bocal-verre Grandessa grandessa Plant-based foods and beverages, Plant-based foods, Breakfasts, Spreads, Plant-based spreads, Sweet spreads, Fruit and vegetable preserves en:plant-based-foods-and-beverages,en:plant-based-foods,en:breakfasts,en:spreads,en:plant-based-spreads,en:sweet-spreads,en:fruit-and-vegetable-preserves Made in Belgium en:made-in-belgium France en:france made in belgium made-in-belgium Eggs, Milk en:eggs,en:milk serving 100g 171 kcal 0.1 g 0.1 g 9.9 g 9.9 g 0.1 g 2.54 g 1.016 g 171 kcal en:sweets en:sugary-snacks,en:sweets unknown unknown unknown 1 -5 -15 1 0 App - yuka, Apps 0 +9002355004345 de Tiroler Früchteküche Marillen 420 g Glas en:glass Tiroler Früchteküche tiroler-fruchtekuche "Pflanzliche Lebensmittel und Getränke, Pflanzliche Lebensmittel, Frucht- und gemüsebasierte Lebensmittel, Frühstücke, Brotaufstriche, Fruchtbasierte Lebensmittel, Pflanzliche Brotaufstriche, Süße Brotaufstriche, Konfitüren und Marmeladen, Konfitüren" en:plant-based-foods-and-beverages,en:plant-based-foods,en:fruits-and-vegetables-based-foods,en:breakfasts,en:spreads,en:fruits-based-foods,en:plant-based-spreads,en:sweet-spreads,en:fruit-and-vegetable-preserves,en:jams Frankreich, Deutschland en:france,en:germany 100g 100g 224 kcal 0 g 0 g 54 g 53 g 0 g 0 g 0 g 224 kcal en:Sweets en:sugary-snacks,en:sweets unknown d 11 b 60 1 31024 -5 -15 1 0 App - yuka, Apps 0 +26281742 en Stawberry jam Strawberry conserve 500 g serving fr:bocal verre fr:bocal-verre Grandessa grandessa Plant-based foods and beverages, Plant-based foods, Breakfasts, Spreads, Plant-based spreads, Sweet spreads, Fruit and vegetable preserves en:plant-based-foods-and-beverages,en:plant-based-foods,en:breakfasts,en:spreads,en:plant-based-spreads,en:sweet-spreads,en:fruit-and-vegetable-preserves Made in Belgium en:made-in-belgium France en:france made in belgium made-in-belgium Eggs, Milk en:eggs,en:milk serving 100g 171 kcal 0.1 g 0.1 g 9.9 g 9.9 g 0.1 g 2.54 g 1.016 g 171 kcal en:Sweets en:sugary-snacks,en:sweets unknown unknown unknown 1 -5 -15 1 0 App - yuka, Apps 0 3250392332105 fr Thon catalane Netto netto France en:france 100g 100g 84 kcal 3 g 0.2 g 4.1 g 4.1 g 8.9 g 1.1 g 0.44 g 84 kcal unknown unknown unknown 1 -5 -15 1 0 App - yuka, Apps 0 -3259330020135 en Tofu en flan Plant-based foods and beverages, Plant-based foods, Legumes and their products, Meat alternatives, Meat analogues, Tofu en:plant-based-foods-and-beverages,en:plant-based-foods,en:legumes-and-their-products,en:meat-alternatives,en:meat-analogues,en:tofu France en:france Graines de soja sans OGM, eau, glucono delta lactone (E575) chlorure de calcium (E509), sulfate de calcium (E516) 100g 100g en:legumes en:cereals-and-potatoes,en:legumes 3 en:3-processed-foods unknown b 77 1 20904 -5 -15 1 0 App - yuka, Apps 0 -5601009974337 pt Iogurte morango banana Iogurte Líquido Meio Gordo com sumo e polpa de morango (4,4%) e polpa de banana (1%). 170 g Plástico, PE 7 - polietileno, HDPE 2 - Polietileno de alta densidade en:plastic,en:pe-7-polyethylene,en:hdpe-2-high-density-polyethylene Pingo Doce, Gelgurte pingo-doce,gelgurte Laticínios, Alimentos Fermentados, Produtos lácteos fermentados, Sobremesas, Sobremesas de laticínios, en:Fermented dairy desserts, Iogurtes en:dairies,en:fermented-foods,en:fermented-milk-products,en:desserts,en:dairy-desserts,en:fermented-dairy-desserts,en:yogurts França, Portugal en:france,en:portugal Pingo Doce pingo-doce Portugal en:portugal Guarda, Portugal guarda,portugal PT ILT 39 EC pt-ilt-39-ec _Leite_ pasteurizado desnatado, _leite_ pasteurizado, açucar, sumo de morango reconstituído e polpa de morango, polpa de banana, _leite_ em pó magro, dextrose, aroma banana, aroma morango, corantes da fruta (antocianinas, beta-caroteno), amido de milho, espessantes (pectina amidada, goma xantana), fermentos lácticos, regulador de acidez (citrato trissódico), conservante da fruta (sorbato de potássio). Leite en:milk 100g 100g 78 kcal 1.4 g 0.9 g 13.7 g 11.1 g 0 g 2.7 g 0.1 g 0.04 g 78 kcal en:milk-and-yogurt en:milk-and-dairy-products,en:milk-and-yogurt 4 en:4-ultra-processed-food-and-drink-products b 1 b 79 1 19593 8 -15 1 0 App - yuka, Apps 0 -77000001 fr "Pâte à tartiner chocolat et noisettes" 300 g Alex Olivier alex-olivier "Petit-déjeuners, Produits à tartiner, Produits à tartiner sucrés, Pâtes à tartiner, Pâtes à tartiner aux noisettes, Pâtes à tartiner au chocolat, Pâtes à tartiner aux noisettes et au cacao" en:breakfasts,en:spreads,en:sweet-spreads,fr:pates-a-tartiner,en:hazelnut-spreads,en:chocolate-spreads,en:cocoa-and-hazelnuts-spreads France en:france 100g 100g 49 % en:sweets en:sugary-snacks,en:sweets unknown unknown d 31 1 31032 -5 -15 1 0 0 +3259330020135 en Tofu en flan Plant-based foods and beverages, Plant-based foods, Legumes and their products, Meat alternatives, Meat analogues, Tofu en:plant-based-foods-and-beverages,en:plant-based-foods,en:legumes-and-their-products,en:meat-alternatives,en:meat-analogues,en:tofu France en:france Graines de soja sans OGM, eau, glucono delta lactone (E575) chlorure de calcium (E509), sulfate de calcium (E516) 100g 100g en:Legumes en:cereals-and-potatoes,en:legumes 3 en:3-processed-foods unknown b 77 1 20904 -5 -15 1 0 App - yuka, Apps 0 +5601009974337 pt Iogurte morango banana Iogurte Líquido Meio Gordo com sumo e polpa de morango (4,4%) e polpa de banana (1%). 170 g Plástico, PE 7 - polietileno, HDPE 2 - Polietileno de alta densidade en:plastic,en:pe-7-polyethylene,en:hdpe-2-high-density-polyethylene Pingo Doce, Gelgurte pingo-doce,gelgurte Laticínios, Alimentos Fermentados, Produtos lácteos fermentados, Sobremesas, Sobremesas de laticínios, en:Fermented dairy desserts, Iogurtes en:dairies,en:fermented-foods,en:fermented-milk-products,en:desserts,en:dairy-desserts,en:fermented-dairy-desserts,en:yogurts França, Portugal en:france,en:portugal Pingo Doce pingo-doce Portugal en:portugal Guarda, Portugal guarda,portugal PT ILT 39 EC pt-ilt-39-ec _Leite_ pasteurizado desnatado, _leite_ pasteurizado, açucar, sumo de morango reconstituído e polpa de morango, polpa de banana, _leite_ em pó magro, dextrose, aroma banana, aroma morango, corantes da fruta (antocianinas, beta-caroteno), amido de milho, espessantes (pectina amidada, goma xantana), fermentos lácticos, regulador de acidez (citrato trissódico), conservante da fruta (sorbato de potássio). Leite en:milk 100g 100g 78 kcal 1.4 g 0.9 g 13.7 g 11.1 g 0 g 2.7 g 0.1 g 0.04 g 78 kcal en:Milk and yogurt en:milk-and-dairy-products,en:milk-and-yogurt 4 en:4-ultra-processed-food-and-drink-products b 1 b 79 1 19593 8 -15 1 0 App - yuka, Apps 0 +77000001 fr "Pâte à tartiner chocolat et noisettes" 300 g Alex Olivier alex-olivier "Petit-déjeuners, Produits à tartiner, Produits à tartiner sucrés, Pâtes à tartiner, Pâtes à tartiner aux noisettes, Pâtes à tartiner au chocolat, Pâtes à tartiner aux noisettes et au cacao" en:breakfasts,en:spreads,en:sweet-spreads,fr:pates-a-tartiner,en:hazelnut-spreads,en:chocolate-spreads,en:cocoa-and-hazelnuts-spreads France en:france 100g 100g 49 % en:Sweets en:sugary-snacks,en:sweets unknown unknown d 31 1 31032 -5 -15 1 0 0 8712423020221 fr The Tasty Decaf Unilever unilever France en:france 100g 100g 1 kcal 0 g 0 g 0 g 0 g 0 g 0 g 0 g 1 kcal unknown unknown unknown 1 -5 -15 1 0 App - yuka, Apps 0 -71464240608 en 100% fruit juice smoothie, green goodness Green goodness smoothie 8 OZA (240 ml) Bolthouse Farms bolthouse-farms Wm. Bolthouse Farms Inc. Beverages and beverages preparations, Plant-based foods and beverages, Beverages, Plant-based beverages en:beverages-and-beverages-preparations,en:plant-based-foods-and-beverages,en:beverages,en:plant-based-beverages France, United States en:france,en:united-states Pineapple juice from concentrate (water, pineapple juice concentrate), apple juice from concentrate (water, apple juice concentrate), mango puree from concentrate (water, mango puree concentrate), banana puree, kiwi puree, spirulina powder, natural flavor, green tea extract, spinach powder, broccoli powder, barley grass powder, wheat grass powder, garlic powder, jerusalem artichoke powder, nova scotia dulse powder. 100g 100g 58 kcal 0 g 0 g 13.75 g 12.5 g 0.8 g 0.83 g 30 mg 12 mg 58 kcal 0 g 0 mg 417 IU 12.5 mg 0.071 mg 0.125 mg 0.62 µg 175 mg 17 mg 0.45 mg 1 mg en:unsweetened-beverages en:beverages,en:unsweetened-beverages 4 en:4-ultra-processed-food-and-drink-products d 8 unknown 1 -5 -15 1 0 2018-02-14T00:00:00Z Fruit & Vegetable Juice, Nectars & Fruit Drinks LI 653042 2018-02-14T00:00:00Z 2019-12-06T00:00:00Z App - yuka, Apps, Databases, database-usda 0 -0850032917148 en Tulú Drinks - Strawberry Flavor Aloe Drink with Strawberry Flavor 500 ml 240 ml Plastic en:plastic Tulú, Tulú Drinks tulu,tulu-drinks Colombia's Best Beverages and beverages preparations, Plant-based foods and beverages, Beverages, Plant-based beverages, Fruit-based beverages, Non-alcoholic beverages, Aloe Vera drinks en:beverages-and-beverages-preparations,en:plant-based-foods-and-beverages,en:beverages,en:plant-based-beverages,en:fruit-based-beverages,en:non-alcoholic-beverages,en:aloe-vera-drinks Vegetarian, No preservatives, Vegan en:vegetarian,en:no-preservatives,en:vegan Puerto Rico en:puerto-rico Colombia en:colombia Water, Aloe Vera Pulp, Sugar, Citric Acid, Sodium Citrate, Aloe Artifical Flavor, Calcium Lactate, Strawberry Artificial Flavor, Ascorbic Acid, Gellan Gum, EDTA, Sucralose, FD&C Red No. 40 None en:none None en:none serving 100g 50 kcal 0 g 0 g 12 g 12 g 0 g 0 g 100 mg 40 mg 50 kcal en:sweetened-beverages en:beverages,en:sweetened-beverages 4 en:4-ultra-processed-food-and-drink-products d 7 c 48 1 18309 -1 -15 1 0 0 +71464240608 en 100% fruit juice smoothie, green goodness Green goodness smoothie 8 OZA (240 ml) Bolthouse Farms bolthouse-farms Wm. Bolthouse Farms Inc. Beverages and beverages preparations, Plant-based foods and beverages, Beverages, Plant-based beverages en:beverages-and-beverages-preparations,en:plant-based-foods-and-beverages,en:beverages,en:plant-based-beverages France, United States en:france,en:united-states Pineapple juice from concentrate (water, pineapple juice concentrate), apple juice from concentrate (water, apple juice concentrate), mango puree from concentrate (water, mango puree concentrate), banana puree, kiwi puree, spirulina powder, natural flavor, green tea extract, spinach powder, broccoli powder, barley grass powder, wheat grass powder, garlic powder, jerusalem artichoke powder, nova scotia dulse powder. 100g 100g 58 kcal 0 g 0 g 13.75 g 12.5 g 0.8 g 0.83 g 30 mg 12 mg 58 kcal 0 g 0 mg 417 IU 12.5 mg 0.071 mg 0.125 mg 0.62 µg 175 mg 17 mg 0.45 mg 1 mg en:Unsweetened beverages en:beverages,en:unsweetened-beverages 4 en:4-ultra-processed-food-and-drink-products d 8 unknown 1 -5 -15 1 0 2018-02-14T00:00:00Z Fruit & Vegetable Juice, Nectars & Fruit Drinks LI 653042 2018-02-14T00:00:00Z 2019-12-06T00:00:00Z App - yuka, Apps, Databases, database-usda 0 +0850032917148 en Tulú Drinks - Strawberry Flavor Aloe Drink with Strawberry Flavor 500 ml 240 ml Plastic en:plastic Tulú, Tulú Drinks tulu,tulu-drinks Colombia's Best Beverages and beverages preparations, Plant-based foods and beverages, Beverages, Plant-based beverages, Fruit-based beverages, Non-alcoholic beverages, Aloe Vera drinks en:beverages-and-beverages-preparations,en:plant-based-foods-and-beverages,en:beverages,en:plant-based-beverages,en:fruit-based-beverages,en:non-alcoholic-beverages,en:aloe-vera-drinks Vegetarian, No preservatives, Vegan en:vegetarian,en:no-preservatives,en:vegan Puerto Rico en:puerto-rico Colombia en:colombia Water, Aloe Vera Pulp, Sugar, Citric Acid, Sodium Citrate, Aloe Artifical Flavor, Calcium Lactate, Strawberry Artificial Flavor, Ascorbic Acid, Gellan Gum, EDTA, Sucralose, FD&C Red No. 40 None en:none None en:none serving 100g 50 kcal 0 g 0 g 12 g 12 g 0 g 0 g 100 mg 40 mg 50 kcal en:Sweetened beverages en:beverages,en:sweetened-beverages 4 en:4-ultra-processed-food-and-drink-products d 7 c 48 1 18309 -1 -15 1 0 0 diff --git a/tests/integration/expected_test_results/export_more_fields/rows/0850032917148.json b/tests/integration/expected_test_results/export_more_fields/rows/0850032917148.json index 729ffab878af8..6ba359cb14ded 100644 --- a/tests/integration/expected_test_results/export_more_fields/rows/0850032917148.json +++ b/tests/integration/expected_test_results/export_more_fields/rows/0850032917148.json @@ -65,7 +65,7 @@ "off:ecoscore_data.missing_key_data" : "1", "off:ecoscore_grade" : "c", "off:ecoscore_score" : "48", - "off:food_groups" : "en:sweetened-beverages", + "off:food_groups" : "en:Sweetened beverages", "off:food_groups_tags" : "en:beverages,en:sweetened-beverages", "off:nova_groups" : "4", "off:nova_groups_tags" : "en:4-ultra-processed-food-and-drink-products", diff --git a/tests/integration/expected_test_results/export_more_fields/rows/25000044984.json b/tests/integration/expected_test_results/export_more_fields/rows/25000044984.json index 8bbd4560221b8..e99951f04be7a 100644 --- a/tests/integration/expected_test_results/export_more_fields/rows/25000044984.json +++ b/tests/integration/expected_test_results/export_more_fields/rows/25000044984.json @@ -65,7 +65,7 @@ "off:ecoscore_data.missing_key_data" : "1", "off:ecoscore_grade" : "not-applicable", "off:ecoscore_score" : "", - "off:food_groups" : "en:sweetened-beverages", + "off:food_groups" : "en:Sweetened beverages", "off:food_groups_tags" : "en:beverages,en:sweetened-beverages", "off:nova_groups" : "4", "off:nova_groups_tags" : "en:4-ultra-processed-food-and-drink-products", diff --git a/tests/integration/expected_test_results/export_more_fields/rows/26281742.json b/tests/integration/expected_test_results/export_more_fields/rows/26281742.json index c1e1ea3645367..7ec06cff8bf27 100644 --- a/tests/integration/expected_test_results/export_more_fields/rows/26281742.json +++ b/tests/integration/expected_test_results/export_more_fields/rows/26281742.json @@ -65,7 +65,7 @@ "off:ecoscore_data.missing_key_data" : "1", "off:ecoscore_grade" : "unknown", "off:ecoscore_score" : "", - "off:food_groups" : "en:sweets", + "off:food_groups" : "en:Sweets", "off:food_groups_tags" : "en:sugary-snacks,en:sweets", "off:nova_groups" : "", "off:nova_groups_tags" : "unknown", diff --git a/tests/integration/expected_test_results/export_more_fields/rows/27096765.json b/tests/integration/expected_test_results/export_more_fields/rows/27096765.json index b5d269c66cf2f..d597548f4312b 100644 --- a/tests/integration/expected_test_results/export_more_fields/rows/27096765.json +++ b/tests/integration/expected_test_results/export_more_fields/rows/27096765.json @@ -65,7 +65,7 @@ "off:ecoscore_data.missing_key_data" : "1", "off:ecoscore_grade" : "d", "off:ecoscore_score" : "37", - "off:food_groups" : "en:chocolate-products", + "off:food_groups" : "en:Chocolate products", "off:food_groups_tags" : "en:sugary-snacks,en:chocolate-products", "off:nova_groups" : "4", "off:nova_groups_tags" : "en:4-ultra-processed-food-and-drink-products", diff --git a/tests/integration/expected_test_results/export_more_fields/rows/3256220513173.json b/tests/integration/expected_test_results/export_more_fields/rows/3256220513173.json index 042df7a90099b..fa994094d2062 100644 --- a/tests/integration/expected_test_results/export_more_fields/rows/3256220513173.json +++ b/tests/integration/expected_test_results/export_more_fields/rows/3256220513173.json @@ -65,7 +65,7 @@ "off:ecoscore_data.missing_key_data" : "1", "off:ecoscore_grade" : "unknown", "off:ecoscore_score" : "", - "off:food_groups" : "en:sweetened-beverages", + "off:food_groups" : "en:Sweetened beverages", "off:food_groups_tags" : "en:beverages,en:sweetened-beverages", "off:nova_groups" : "4", "off:nova_groups_tags" : "en:4-ultra-processed-food-and-drink-products", diff --git a/tests/integration/expected_test_results/export_more_fields/rows/3259330020135.json b/tests/integration/expected_test_results/export_more_fields/rows/3259330020135.json index 612d0a4e2a69c..88346e1db1ac9 100644 --- a/tests/integration/expected_test_results/export_more_fields/rows/3259330020135.json +++ b/tests/integration/expected_test_results/export_more_fields/rows/3259330020135.json @@ -65,7 +65,7 @@ "off:ecoscore_data.missing_key_data" : "1", "off:ecoscore_grade" : "b", "off:ecoscore_score" : "77", - "off:food_groups" : "en:legumes", + "off:food_groups" : "en:Legumes", "off:food_groups_tags" : "en:cereals-and-potatoes,en:legumes", "off:nova_groups" : "3", "off:nova_groups_tags" : "en:3-processed-foods", diff --git a/tests/integration/expected_test_results/export_more_fields/rows/3270160503070.json b/tests/integration/expected_test_results/export_more_fields/rows/3270160503070.json index f462f3be68444..99bd0eda2072f 100644 --- a/tests/integration/expected_test_results/export_more_fields/rows/3270160503070.json +++ b/tests/integration/expected_test_results/export_more_fields/rows/3270160503070.json @@ -65,7 +65,7 @@ "off:ecoscore_data.missing_key_data" : "1", "off:ecoscore_grade" : "unknown", "off:ecoscore_score" : "", - "off:food_groups" : "en:vegetables", + "off:food_groups" : "en:Vegetables", "off:food_groups_tags" : "en:fruits-and-vegetables,en:vegetables", "off:nova_groups" : "1", "off:nova_groups_tags" : "en:1-unprocessed-or-minimally-processed-foods", diff --git a/tests/integration/expected_test_results/export_more_fields/rows/3451790834080.json b/tests/integration/expected_test_results/export_more_fields/rows/3451790834080.json index 11a310f1c9fa0..e6200b0ae9f54 100644 --- a/tests/integration/expected_test_results/export_more_fields/rows/3451790834080.json +++ b/tests/integration/expected_test_results/export_more_fields/rows/3451790834080.json @@ -65,7 +65,7 @@ "off:ecoscore_data.missing_key_data" : "1", "off:ecoscore_grade" : "b", "off:ecoscore_score" : "61", - "off:food_groups" : "en:milk-and-yogurt", + "off:food_groups" : "en:Milk and yogurt", "off:food_groups_tags" : "en:milk-and-dairy-products,en:milk-and-yogurt", "off:nova_groups" : "1", "off:nova_groups_tags" : "en:1-unprocessed-or-minimally-processed-foods", diff --git a/tests/integration/expected_test_results/export_more_fields/rows/3564703999971.json b/tests/integration/expected_test_results/export_more_fields/rows/3564703999971.json index e4a5d8d81be56..8b8cfda84bf1a 100644 --- a/tests/integration/expected_test_results/export_more_fields/rows/3564703999971.json +++ b/tests/integration/expected_test_results/export_more_fields/rows/3564703999971.json @@ -65,7 +65,7 @@ "off:ecoscore_data.missing_key_data" : "", "off:ecoscore_grade" : "unknown", "off:ecoscore_score" : "", - "off:food_groups" : "en:fats", + "off:food_groups" : "en:Fats", "off:food_groups_tags" : "en:fats-and-sauces,en:fats", "off:nova_groups" : "2", "off:nova_groups_tags" : "en:2-processed-culinary-ingredients", diff --git a/tests/integration/expected_test_results/export_more_fields/rows/3661344653573.json b/tests/integration/expected_test_results/export_more_fields/rows/3661344653573.json index aceb2e9f39708..6beae097206be 100644 --- a/tests/integration/expected_test_results/export_more_fields/rows/3661344653573.json +++ b/tests/integration/expected_test_results/export_more_fields/rows/3661344653573.json @@ -65,7 +65,7 @@ "off:ecoscore_data.missing_key_data" : "", "off:ecoscore_grade" : "a", "off:ecoscore_score" : "100", - "off:food_groups" : "en:dairy-desserts", + "off:food_groups" : "en:Dairy desserts", "off:food_groups_tags" : "en:milk-and-dairy-products,en:dairy-desserts", "off:nova_groups" : "3", "off:nova_groups_tags" : "en:3-processed-foods", diff --git a/tests/integration/expected_test_results/export_more_fields/rows/3770013801303.json b/tests/integration/expected_test_results/export_more_fields/rows/3770013801303.json index 71968e385bb18..862811906782d 100644 --- a/tests/integration/expected_test_results/export_more_fields/rows/3770013801303.json +++ b/tests/integration/expected_test_results/export_more_fields/rows/3770013801303.json @@ -65,7 +65,7 @@ "off:ecoscore_data.missing_key_data" : "1", "off:ecoscore_grade" : "not-applicable", "off:ecoscore_score" : "", - "off:food_groups" : "en:sweetened-beverages", + "off:food_groups" : "en:Sweetened beverages", "off:food_groups_tags" : "en:beverages,en:sweetened-beverages", "off:nova_groups" : "", "off:nova_groups_tags" : "unknown", diff --git a/tests/integration/expected_test_results/export_more_fields/rows/5050083706622.json b/tests/integration/expected_test_results/export_more_fields/rows/5050083706622.json index cc35e287dfb60..cdccfd3cd02e1 100644 --- a/tests/integration/expected_test_results/export_more_fields/rows/5050083706622.json +++ b/tests/integration/expected_test_results/export_more_fields/rows/5050083706622.json @@ -65,7 +65,7 @@ "off:ecoscore_data.missing_key_data" : "1", "off:ecoscore_grade" : "e", "off:ecoscore_score" : "15", - "off:food_groups" : "en:breakfast-cereals", + "off:food_groups" : "en:Breakfast cereals", "off:food_groups_tags" : "en:cereals-and-potatoes,en:breakfast-cereals", "off:nova_groups" : "4", "off:nova_groups_tags" : "en:4-ultra-processed-food-and-drink-products", diff --git a/tests/integration/expected_test_results/export_more_fields/rows/5410803950689.json b/tests/integration/expected_test_results/export_more_fields/rows/5410803950689.json index 999fea7b16e75..98b678a8c1954 100644 --- a/tests/integration/expected_test_results/export_more_fields/rows/5410803950689.json +++ b/tests/integration/expected_test_results/export_more_fields/rows/5410803950689.json @@ -65,7 +65,7 @@ "off:ecoscore_data.missing_key_data" : "1", "off:ecoscore_grade" : "unknown", "off:ecoscore_score" : "", - "off:food_groups" : "en:dressings-and-sauces", + "off:food_groups" : "en:Dressings and sauces", "off:food_groups_tags" : "en:fats-and-sauces,en:dressings-and-sauces", "off:nova_groups" : "", "off:nova_groups_tags" : "unknown", diff --git a/tests/integration/expected_test_results/export_more_fields/rows/5601009974337.json b/tests/integration/expected_test_results/export_more_fields/rows/5601009974337.json index af643fe0ab6f9..303a4a43971d3 100644 --- a/tests/integration/expected_test_results/export_more_fields/rows/5601009974337.json +++ b/tests/integration/expected_test_results/export_more_fields/rows/5601009974337.json @@ -65,7 +65,7 @@ "off:ecoscore_data.missing_key_data" : "1", "off:ecoscore_grade" : "b", "off:ecoscore_score" : "79", - "off:food_groups" : "en:milk-and-yogurt", + "off:food_groups" : "en:Milk and yogurt", "off:food_groups_tags" : "en:milk-and-dairy-products,en:milk-and-yogurt", "off:nova_groups" : "4", "off:nova_groups_tags" : "en:4-ultra-processed-food-and-drink-products", diff --git a/tests/integration/expected_test_results/export_more_fields/rows/71464240608.json b/tests/integration/expected_test_results/export_more_fields/rows/71464240608.json index 9fa2ac973dff6..d7fed9dca8761 100644 --- a/tests/integration/expected_test_results/export_more_fields/rows/71464240608.json +++ b/tests/integration/expected_test_results/export_more_fields/rows/71464240608.json @@ -65,7 +65,7 @@ "off:ecoscore_data.missing_key_data" : "1", "off:ecoscore_grade" : "unknown", "off:ecoscore_score" : "", - "off:food_groups" : "en:unsweetened-beverages", + "off:food_groups" : "en:Unsweetened beverages", "off:food_groups_tags" : "en:beverages,en:unsweetened-beverages", "off:nova_groups" : "4", "off:nova_groups_tags" : "en:4-ultra-processed-food-and-drink-products", diff --git a/tests/integration/expected_test_results/export_more_fields/rows/77000001.json b/tests/integration/expected_test_results/export_more_fields/rows/77000001.json index 68f2e8206448d..2f5429fbd578e 100644 --- a/tests/integration/expected_test_results/export_more_fields/rows/77000001.json +++ b/tests/integration/expected_test_results/export_more_fields/rows/77000001.json @@ -65,7 +65,7 @@ "off:ecoscore_data.missing_key_data" : "1", "off:ecoscore_grade" : "d", "off:ecoscore_score" : "31", - "off:food_groups" : "en:sweets", + "off:food_groups" : "en:Sweets", "off:food_groups_tags" : "en:sugary-snacks,en:sweets", "off:nova_groups" : "", "off:nova_groups_tags" : "unknown", diff --git a/tests/integration/expected_test_results/export_more_fields/rows/7804659650035.json b/tests/integration/expected_test_results/export_more_fields/rows/7804659650035.json index 764a2afee4a3c..c9217a780f79c 100644 --- a/tests/integration/expected_test_results/export_more_fields/rows/7804659650035.json +++ b/tests/integration/expected_test_results/export_more_fields/rows/7804659650035.json @@ -65,7 +65,7 @@ "off:ecoscore_data.missing_key_data" : "1", "off:ecoscore_grade" : "d", "off:ecoscore_score" : "37", - "off:food_groups" : "en:dressings-and-sauces", + "off:food_groups" : "en:Dressings and sauces", "off:food_groups_tags" : "en:fats-and-sauces,en:dressings-and-sauces", "off:nova_groups" : "", "off:nova_groups_tags" : "unknown", diff --git a/tests/integration/expected_test_results/export_more_fields/rows/8722700472575.json b/tests/integration/expected_test_results/export_more_fields/rows/8722700472575.json index 9f0a91315b472..1782b3ad325ed 100644 --- a/tests/integration/expected_test_results/export_more_fields/rows/8722700472575.json +++ b/tests/integration/expected_test_results/export_more_fields/rows/8722700472575.json @@ -65,7 +65,7 @@ "off:ecoscore_data.missing_key_data" : "1", "off:ecoscore_grade" : "d", "off:ecoscore_score" : "37", - "off:food_groups" : "en:dressings-and-sauces", + "off:food_groups" : "en:Dressings and sauces", "off:food_groups_tags" : "en:fats-and-sauces,en:dressings-and-sauces", "off:nova_groups" : "4", "off:nova_groups_tags" : "en:4-ultra-processed-food-and-drink-products", diff --git a/tests/integration/expected_test_results/export_more_fields/rows/9002355004345.json b/tests/integration/expected_test_results/export_more_fields/rows/9002355004345.json index a0d6fd950aaa0..5f1a9a6451657 100644 --- a/tests/integration/expected_test_results/export_more_fields/rows/9002355004345.json +++ b/tests/integration/expected_test_results/export_more_fields/rows/9002355004345.json @@ -65,7 +65,7 @@ "off:ecoscore_data.missing_key_data" : "1", "off:ecoscore_grade" : "b", "off:ecoscore_score" : "60", - "off:food_groups" : "en:sweets", + "off:food_groups" : "en:Sweets", "off:food_groups_tags" : "en:sugary-snacks,en:sweets", "off:nova_groups" : "", "off:nova_groups_tags" : "unknown", diff --git a/tests/integration/expected_test_results/import_csv_file/replace_existing_values/3003004006001.json b/tests/integration/expected_test_results/import_csv_file/replace_existing_values/3003004006001.json index a8c6cbf32595c..dff36c2ff7cad 100644 --- a/tests/integration/expected_test_results/import_csv_file/replace_existing_values/3003004006001.json +++ b/tests/integration/expected_test_results/import_csv_file/replace_existing_values/3003004006001.json @@ -526,7 +526,7 @@ "test-user" ], "entry_dates_tags" : "--ignore--", - "food_groups" : "en:biscuits-and-cakes", + "food_groups" : "en:Biscuits and cakes", "food_groups_tags" : [ "en:sugary-snacks", "en:biscuits-and-cakes" diff --git a/tests/integration/expected_test_results/import_csv_file/replace_existing_values/3003004006004.json b/tests/integration/expected_test_results/import_csv_file/replace_existing_values/3003004006004.json index 9509862975815..2410dea2d6237 100644 --- a/tests/integration/expected_test_results/import_csv_file/replace_existing_values/3003004006004.json +++ b/tests/integration/expected_test_results/import_csv_file/replace_existing_values/3003004006004.json @@ -548,7 +548,7 @@ "test-user" ], "entry_dates_tags" : "--ignore--", - "food_groups" : "en:dressings-and-sauces", + "food_groups" : "en:Dressings and sauces", "food_groups_tags" : [ "en:fats-and-sauces", "en:dressings-and-sauces" diff --git a/tests/integration/expected_test_results/import_csv_file/test/2003004006001.json b/tests/integration/expected_test_results/import_csv_file/test/2003004006001.json index 89eb39e14e24a..16d28c220d9d4 100644 --- a/tests/integration/expected_test_results/import_csv_file/test/2003004006001.json +++ b/tests/integration/expected_test_results/import_csv_file/test/2003004006001.json @@ -518,7 +518,7 @@ "test-user" ], "entry_dates_tags" : "--ignore--", - "food_groups" : "en:biscuits-and-cakes", + "food_groups" : "en:Biscuits and cakes", "food_groups_tags" : [ "en:sugary-snacks", "en:biscuits-and-cakes" diff --git a/tests/integration/expected_test_results/import_csv_file/test/2003004006004.json b/tests/integration/expected_test_results/import_csv_file/test/2003004006004.json index 4f6500149dd48..d97b8499a5abf 100644 --- a/tests/integration/expected_test_results/import_csv_file/test/2003004006004.json +++ b/tests/integration/expected_test_results/import_csv_file/test/2003004006004.json @@ -511,7 +511,7 @@ "test-user" ], "entry_dates_tags" : "--ignore--", - "food_groups" : "en:dressings-and-sauces", + "food_groups" : "en:Dressings and sauces", "food_groups_tags" : [ "en:fats-and-sauces", "en:dressings-and-sauces" diff --git a/tests/unit/expected_test_results/attributes/en-attributes.json b/tests/unit/expected_test_results/attributes/en-attributes.json index 654e4639c35f0..fca05df1d27f1 100644 --- a/tests/unit/expected_test_results/attributes/en-attributes.json +++ b/tests/unit/expected_test_results/attributes/en-attributes.json @@ -851,6 +851,7 @@ { "ciqual_proxy_food_code" : "9410", "id" : "en:wheat-flour", + "is_in_taxonomy" : 1, "origins" : "en:united-kingdom", "percent_estimate" : 54.5454545454545, "percent_max" : 100, @@ -862,6 +863,7 @@ { "ciqual_proxy_food_code" : "31016", "id" : "en:sugar", + "is_in_taxonomy" : 1, "origins" : "en:paraguay", "percent_estimate" : 12.5, "percent_max" : 25, @@ -873,6 +875,7 @@ { "ciqual_food_code" : "22000", "id" : "en:egg", + "is_in_taxonomy" : 1, "percent_estimate" : 12.5, "percent_max" : 25, "percent_min" : 0, @@ -883,6 +886,7 @@ { "ciqual_food_code" : "13014", "id" : "en:strawberry", + "is_in_taxonomy" : 1, "percent_estimate" : 10.2272727272727, "percent_max" : 25, "percent_min" : 0, @@ -893,6 +897,7 @@ { "ciqual_food_code" : "31077", "id" : "en:high-fructose-corn-syrup", + "is_in_taxonomy" : 1, "percent_estimate" : 5.11363636363636, "percent_max" : 20, "percent_min" : 0, @@ -904,6 +909,7 @@ "ciqual_food_code" : "17130", "from_palm_oil" : "no", "id" : "en:rapeseed-oil", + "is_in_taxonomy" : 1, "percent_estimate" : 2.55681818181818, "percent_max" : 16.6666666666667, "percent_min" : 0, @@ -914,6 +920,7 @@ { "ciqual_food_code" : "15027", "id" : "en:macadamia-nut", + "is_in_taxonomy" : 1, "percent_estimate" : 1.27840909090909, "percent_max" : 14.2857142857143, "percent_min" : 0, @@ -923,6 +930,7 @@ }, { "id" : "en:milk-proteins", + "is_in_taxonomy" : 1, "percent_estimate" : 0.639204545454547, "percent_max" : 12.5, "percent_min" : 0, @@ -933,6 +941,7 @@ { "ciqual_food_code" : "11058", "id" : "en:salt", + "is_in_taxonomy" : 1, "percent_estimate" : 0.125, "percent_max" : 0.25, "percent_min" : 0, @@ -942,6 +951,7 @@ }, { "id" : "en:e102", + "is_in_taxonomy" : 1, "percent_estimate" : 0.125, "percent_max" : 0.25, "percent_min" : 0, @@ -951,6 +961,7 @@ }, { "id" : "en:e120", + "is_in_taxonomy" : 1, "percent_estimate" : 0.389204545454547, "percent_max" : 0.25, "percent_min" : 0, diff --git a/tests/unit/expected_test_results/attributes/en-maybe-vegan.json b/tests/unit/expected_test_results/attributes/en-maybe-vegan.json index e17f8a9e4bf20..1c7351815fc17 100644 --- a/tests/unit/expected_test_results/attributes/en-maybe-vegan.json +++ b/tests/unit/expected_test_results/attributes/en-maybe-vegan.json @@ -629,6 +629,7 @@ { "ciqual_proxy_food_code" : "9510", "id" : "en:tapioca", + "is_in_taxonomy" : 1, "percent_estimate" : 66.6666666666667, "percent_max" : 100, "percent_min" : 33.3333333333333, @@ -640,6 +641,7 @@ "ciqual_food_code" : "16129", "from_palm_oil" : "yes", "id" : "en:palm-oil", + "is_in_taxonomy" : 1, "percent_estimate" : 16.6666666666667, "percent_max" : 50, "percent_min" : 0, @@ -649,6 +651,7 @@ }, { "id" : "en:enzyme", + "is_in_taxonomy" : 1, "percent_estimate" : 16.6666666666667, "percent_max" : 33.3333333333333, "percent_min" : 0, diff --git a/tests/unit/expected_test_results/attributes/en-no-ingredients.json b/tests/unit/expected_test_results/attributes/en-no-ingredients.json index 0c73485e65154..89804492e9889 100644 --- a/tests/unit/expected_test_results/attributes/en-no-ingredients.json +++ b/tests/unit/expected_test_results/attributes/en-no-ingredients.json @@ -777,7 +777,7 @@ "ecoscore_tags" : [ "d" ], - "food_groups" : "en:cheese", + "food_groups" : "en:Cheese", "food_groups_tags" : [ "en:milk-and-dairy-products", "en:cheese" diff --git a/tests/unit/expected_test_results/attributes/en-nova-groups-markers.json b/tests/unit/expected_test_results/attributes/en-nova-groups-markers.json index 36652a182dc4f..2a25f5fd1f282 100644 --- a/tests/unit/expected_test_results/attributes/en-nova-groups-markers.json +++ b/tests/unit/expected_test_results/attributes/en-nova-groups-markers.json @@ -790,7 +790,7 @@ "ecoscore_tags" : [ "d" ], - "food_groups" : "en:cheese", + "food_groups" : "en:Cheese", "food_groups_tags" : [ "en:milk-and-dairy-products", "en:cheese" @@ -799,6 +799,7 @@ { "ciqual_proxy_food_code" : "19051", "id" : "en:cow-s-milk", + "is_in_taxonomy" : 1, "percent_estimate" : 57.1428571428571, "percent_max" : 100, "percent_min" : 14.2857142857143, @@ -809,6 +810,7 @@ { "ciqual_food_code" : "11058", "id" : "en:salt", + "is_in_taxonomy" : 1, "percent_estimate" : 21.4285714285714, "percent_max" : 50, "percent_min" : 0, @@ -818,6 +820,7 @@ }, { "id" : "en:microbial-culture", + "is_in_taxonomy" : 1, "percent_estimate" : 10.7142857142857, "percent_max" : 33.3333333333333, "percent_min" : 0, @@ -827,6 +830,7 @@ }, { "id" : "en:garlic-flavouring", + "is_in_taxonomy" : 1, "percent_estimate" : 2.5, "percent_max" : "5", "percent_min" : 0, @@ -836,6 +840,7 @@ }, { "id" : "en:e412", + "is_in_taxonomy" : 1, "percent_estimate" : 2.5, "percent_max" : "5", "percent_min" : 0, @@ -846,6 +851,7 @@ { "ciqual_proxy_food_code" : "31016", "id" : "en:sugar", + "is_in_taxonomy" : 1, "percent_estimate" : 2.5, "percent_max" : "5", "percent_min" : 0, @@ -856,6 +862,7 @@ { "ciqual_food_code" : "31077", "id" : "en:high-fructose-corn-syrup", + "is_in_taxonomy" : 1, "percent_estimate" : 3.21428571428572, "percent_max" : "5", "percent_min" : 0, diff --git a/tests/unit/expected_test_results/attributes/en-nutriscore.json b/tests/unit/expected_test_results/attributes/en-nutriscore.json index 56969401542ce..74c73edf3fb0f 100644 --- a/tests/unit/expected_test_results/attributes/en-nutriscore.json +++ b/tests/unit/expected_test_results/attributes/en-nutriscore.json @@ -790,6 +790,7 @@ "ingredients" : [ { "id" : "en:fruit", + "is_in_taxonomy" : 1, "percent" : 100, "percent_estimate" : 100, "percent_max" : 100, diff --git a/tests/unit/expected_test_results/attributes/en-unknown-ingredients.json b/tests/unit/expected_test_results/attributes/en-unknown-ingredients.json index cf2b45f00b3bc..fd3ed281bb5ba 100644 --- a/tests/unit/expected_test_results/attributes/en-unknown-ingredients.json +++ b/tests/unit/expected_test_results/attributes/en-unknown-ingredients.json @@ -783,7 +783,7 @@ "ecoscore_tags" : [ "d" ], - "food_groups" : "en:cheese", + "food_groups" : "en:Cheese", "food_groups_tags" : [ "en:milk-and-dairy-products", "en:cheese" @@ -791,6 +791,7 @@ "ingredients" : [ { "id" : "en:some-ingredient-that-we-do-not-recognize", + "is_in_taxonomy" : 0, "percent_estimate" : 100, "percent_max" : 100, "percent_min" : 100, diff --git a/tests/unit/expected_test_results/attributes/fr-palm-kernel-fat.json b/tests/unit/expected_test_results/attributes/fr-palm-kernel-fat.json index 56625a8308cc5..8a24e40152b7a 100644 --- a/tests/unit/expected_test_results/attributes/fr-palm-kernel-fat.json +++ b/tests/unit/expected_test_results/attributes/fr-palm-kernel-fat.json @@ -627,6 +627,7 @@ { "from_palm_oil" : "yes", "id" : "en:palm-kernel-fat", + "is_in_taxonomy" : 1, "percent_estimate" : 100, "percent_max" : 100, "percent_min" : 100, diff --git a/tests/unit/expected_test_results/attributes/fr-palm-oil-free.json b/tests/unit/expected_test_results/attributes/fr-palm-oil-free.json index 1f78685da3eb6..3f3ac1a84f9eb 100644 --- a/tests/unit/expected_test_results/attributes/fr-palm-oil-free.json +++ b/tests/unit/expected_test_results/attributes/fr-palm-oil-free.json @@ -622,6 +622,7 @@ { "ciqual_food_code" : "18066", "id" : "en:water", + "is_in_taxonomy" : 1, "percent_estimate" : 62.5, "percent_max" : 100, "percent_min" : 25, @@ -632,6 +633,7 @@ { "ciqual_proxy_food_code" : "9410", "id" : "en:flour", + "is_in_taxonomy" : 1, "percent_estimate" : 18.75, "percent_max" : 50, "percent_min" : 0, @@ -642,6 +644,7 @@ { "ciqual_proxy_food_code" : "31016", "id" : "en:sugar", + "is_in_taxonomy" : 1, "percent_estimate" : 9.375, "percent_max" : 33.3333333333333, "percent_min" : 0, @@ -651,6 +654,7 @@ }, { "id" : "en:chocolate", + "is_in_taxonomy" : 1, "percent_estimate" : 9.375, "percent_max" : 25, "percent_min" : 0, diff --git a/tests/unit/expected_test_results/attributes/fr-palm-oil.json b/tests/unit/expected_test_results/attributes/fr-palm-oil.json index 103d4361d6b51..33ecbd5217e32 100644 --- a/tests/unit/expected_test_results/attributes/fr-palm-oil.json +++ b/tests/unit/expected_test_results/attributes/fr-palm-oil.json @@ -625,6 +625,7 @@ { "ciqual_food_code" : "4003", "id" : "en:potato", + "is_in_taxonomy" : 1, "percent_estimate" : 75, "percent_max" : 100, "percent_min" : 50, @@ -636,6 +637,7 @@ "ciqual_food_code" : "16129", "from_palm_oil" : "yes", "id" : "en:palm-oil", + "is_in_taxonomy" : 1, "percent_estimate" : 25, "percent_max" : 50, "percent_min" : 0, diff --git a/tests/unit/expected_test_results/attributes/fr-vegetable-oils.json b/tests/unit/expected_test_results/attributes/fr-vegetable-oils.json index 749d6a9ca9038..031be3d051def 100644 --- a/tests/unit/expected_test_results/attributes/fr-vegetable-oils.json +++ b/tests/unit/expected_test_results/attributes/fr-vegetable-oils.json @@ -622,6 +622,7 @@ { "ciqual_food_code" : "9545", "id" : "en:corn-flour", + "is_in_taxonomy" : 1, "percent_estimate" : 66.6666666666667, "percent_max" : 100, "percent_min" : 33.3333333333333, @@ -632,6 +633,7 @@ { "from_palm_oil" : "maybe", "id" : "en:vegetable-oil", + "is_in_taxonomy" : 1, "percent_estimate" : 16.6666666666667, "percent_max" : 50, "percent_min" : 0, @@ -642,6 +644,7 @@ { "ciqual_food_code" : "11058", "id" : "en:salt", + "is_in_taxonomy" : 1, "percent_estimate" : 16.6666666666667, "percent_max" : 33.3333333333333, "percent_min" : 0, diff --git a/tests/unit/expected_test_results/ecoscore/calvados-ingredients-no-origins.json b/tests/unit/expected_test_results/ecoscore/calvados-ingredients-no-origins.json index 12c5ae7cb3e59..45671283bf7a9 100644 --- a/tests/unit/expected_test_results/ecoscore/calvados-ingredients-no-origins.json +++ b/tests/unit/expected_test_results/ecoscore/calvados-ingredients-no-origins.json @@ -7,213 +7,215 @@ "origins_of_ingredients" : { "aggregated_origins" : [ { - "origin" : "en:france", + "origin" : "en:unknown", "percent" : 100 } ], - "epi_score" : 93, - "epi_value" : 4, + "epi_score" : 0, + "epi_value" : -5, "origins_from_categories" : [ - "en:france" + "en:unknown", + "en:unknown" ], "origins_from_origins_field" : [ "en:unknown" ], "transportation_scores" : { - "ad" : 57, + "ad" : 0, "al" : 0, - "at" : 38, - "ax" : 67, - "ba" : 14, - "be" : 85, - "bg" : 21, - "ch" : 69, - "cy" : 40, - "cz" : 48, - "de" : 61, - "dk" : 39, - "dz" : 45, - "ee" : 71, - "eg" : 35, - "es" : 37, - "fi" : 69, - "fo" : 62, - "fr" : 100, - "gg" : 78, - "gi" : 4, - "gr" : 49, - "hr" : 30, - "hu" : 26, - "ie" : 47, - "il" : 34, - "im" : 50, - "is" : 53, - "it" : 47, - "je" : 76, - "lb" : 39, - "li" : 64, - "lt" : 63, - "lu" : 82, - "lv" : 71, - "ly" : 56, - "ma" : 60, - "mc" : 52, - "md" : 29, - "me" : 37, - "mk" : 29, - "mt" : 57, - "nl" : 77, - "no" : 20, - "pl" : 25, - "ps" : 42, - "pt" : 13, - "ro" : 31, - "rs" : 7, - "se" : 15, - "si" : 38, - "sj" : 53, - "sk" : 24, - "sm" : 40, - "sy" : 26, - "tn" : 9, - "tr" : 7, - "ua" : 40, - "uk" : 68, + "at" : 0, + "ax" : 0, + "ba" : 0, + "be" : 0, + "bg" : 0, + "ch" : 0, + "cy" : 0, + "cz" : 0, + "de" : 0, + "dk" : 0, + "dz" : 0, + "ee" : 0, + "eg" : 0, + "es" : 0, + "fi" : 0, + "fo" : 0, + "fr" : 0, + "gg" : 0, + "gi" : 0, + "gr" : 0, + "hr" : 0, + "hu" : 0, + "ie" : 0, + "il" : 0, + "im" : 0, + "is" : 0, + "it" : 0, + "je" : 0, + "lb" : 0, + "li" : 0, + "lt" : 0, + "lu" : 0, + "lv" : 0, + "ly" : 0, + "ma" : 0, + "mc" : 0, + "md" : 0, + "me" : 0, + "mk" : 0, + "mt" : 0, + "nl" : 0, + "no" : 0, + "pl" : 0, + "ps" : 0, + "pt" : 0, + "ro" : 0, + "rs" : 0, + "se" : 0, + "si" : 0, + "sj" : 0, + "sk" : 0, + "sm" : 0, + "sy" : 0, + "tn" : 0, + "tr" : 0, + "ua" : 0, + "uk" : 0, "us" : 0, - "va" : 29, + "va" : 0, "world" : 0, - "xk" : 28 + "xk" : 0 }, "transportation_values" : { - "ad" : 9, + "ad" : 0, "al" : 0, - "at" : 6, - "ax" : 10, - "ba" : 2, - "be" : 13, - "bg" : 3, - "ch" : 10, - "cy" : 6, - "cz" : 7, - "de" : 9, - "dk" : 6, - "dz" : 7, - "ee" : 11, - "eg" : 5, - "es" : 6, - "fi" : 10, - "fo" : 9, - "fr" : 15, - "gg" : 12, - "gi" : 1, - "gr" : 7, - "hr" : 5, - "hu" : 4, - "ie" : 7, - "il" : 5, - "im" : 8, - "is" : 8, - "it" : 7, - "je" : 11, - "lb" : 6, - "li" : 10, - "lt" : 9, - "lu" : 12, - "lv" : 11, - "ly" : 8, - "ma" : 9, - "mc" : 8, - "md" : 4, - "me" : 6, - "mk" : 4, - "mt" : 9, - "nl" : 12, - "no" : 3, - "pl" : 4, - "ps" : 6, - "pt" : 2, - "ro" : 5, - "rs" : 1, - "se" : 2, - "si" : 6, - "sj" : 8, - "sk" : 4, - "sm" : 6, - "sy" : 4, - "tn" : 1, - "tr" : 1, - "ua" : 6, - "uk" : 10, + "at" : 0, + "ax" : 0, + "ba" : 0, + "be" : 0, + "bg" : 0, + "ch" : 0, + "cy" : 0, + "cz" : 0, + "de" : 0, + "dk" : 0, + "dz" : 0, + "ee" : 0, + "eg" : 0, + "es" : 0, + "fi" : 0, + "fo" : 0, + "fr" : 0, + "gg" : 0, + "gi" : 0, + "gr" : 0, + "hr" : 0, + "hu" : 0, + "ie" : 0, + "il" : 0, + "im" : 0, + "is" : 0, + "it" : 0, + "je" : 0, + "lb" : 0, + "li" : 0, + "lt" : 0, + "lu" : 0, + "lv" : 0, + "ly" : 0, + "ma" : 0, + "mc" : 0, + "md" : 0, + "me" : 0, + "mk" : 0, + "mt" : 0, + "nl" : 0, + "no" : 0, + "pl" : 0, + "ps" : 0, + "pt" : 0, + "ro" : 0, + "rs" : 0, + "se" : 0, + "si" : 0, + "sj" : 0, + "sk" : 0, + "sm" : 0, + "sy" : 0, + "tn" : 0, + "tr" : 0, + "ua" : 0, + "uk" : 0, "us" : 0, - "va" : 4, + "va" : 0, "world" : 0, - "xk" : 4 + "xk" : 0 }, "values" : { - "ad" : 13, - "al" : 4, - "at" : 10, - "ax" : 14, - "ba" : 6, - "be" : 17, - "bg" : 7, - "ch" : 14, - "cy" : 10, - "cz" : 11, - "de" : 13, - "dk" : 10, - "dz" : 11, - "ee" : 15, - "eg" : 9, - "es" : 10, - "fi" : 14, - "fo" : 13, - "fr" : 19, - "gg" : 16, - "gi" : 5, - "gr" : 11, - "hr" : 9, - "hu" : 8, - "ie" : 11, - "il" : 9, - "im" : 12, - "is" : 12, - "it" : 11, - "je" : 15, - "lb" : 10, - "li" : 14, - "lt" : 13, - "lu" : 16, - "lv" : 15, - "ly" : 12, - "ma" : 13, - "mc" : 12, - "md" : 8, - "me" : 10, - "mk" : 8, - "mt" : 13, - "nl" : 16, - "no" : 7, - "pl" : 8, - "ps" : 10, - "pt" : 6, - "ro" : 9, - "rs" : 5, - "se" : 6, - "si" : 10, - "sj" : 12, - "sk" : 8, - "sm" : 10, - "sy" : 8, - "tn" : 5, - "tr" : 5, - "ua" : 10, - "uk" : 14, - "us" : 4, - "va" : 8, - "world" : 4, - "xk" : 8 - } + "ad" : -5, + "al" : -5, + "at" : -5, + "ax" : -5, + "ba" : -5, + "be" : -5, + "bg" : -5, + "ch" : -5, + "cy" : -5, + "cz" : -5, + "de" : -5, + "dk" : -5, + "dz" : -5, + "ee" : -5, + "eg" : -5, + "es" : -5, + "fi" : -5, + "fo" : -5, + "fr" : -5, + "gg" : -5, + "gi" : -5, + "gr" : -5, + "hr" : -5, + "hu" : -5, + "ie" : -5, + "il" : -5, + "im" : -5, + "is" : -5, + "it" : -5, + "je" : -5, + "lb" : -5, + "li" : -5, + "lt" : -5, + "lu" : -5, + "lv" : -5, + "ly" : -5, + "ma" : -5, + "mc" : -5, + "md" : -5, + "me" : -5, + "mk" : -5, + "mt" : -5, + "nl" : -5, + "no" : -5, + "pl" : -5, + "ps" : -5, + "pt" : -5, + "ro" : -5, + "rs" : -5, + "se" : -5, + "si" : -5, + "sj" : -5, + "sk" : -5, + "sm" : -5, + "sy" : -5, + "tn" : -5, + "tr" : -5, + "ua" : -5, + "uk" : -5, + "us" : -5, + "va" : -5, + "world" : -5, + "xk" : -5 + }, + "warning" : "origins_are_100_percent_unknown" }, "packaging" : { "non_recyclable_and_non_biodegradable_materials" : 1, @@ -233,6 +235,7 @@ "missing" : { "agb_category" : 1, "labels" : 1, + "origins" : 1, "packagings" : 1 }, "missing_agribalyse_match_warning" : 1, @@ -247,6 +250,7 @@ { "ciqual_food_code" : "1014", "id" : "en:wine", + "is_in_taxonomy" : 1, "percent_estimate" : 100, "percent_max" : 100, "percent_min" : 100, diff --git a/tests/unit/expected_test_results/ecoscore/calvados-no-ingredients-no-origins.json b/tests/unit/expected_test_results/ecoscore/calvados-no-ingredients-no-origins.json index ec0adcf7994ad..eacf9353cb91f 100644 --- a/tests/unit/expected_test_results/ecoscore/calvados-no-ingredients-no-origins.json +++ b/tests/unit/expected_test_results/ecoscore/calvados-no-ingredients-no-origins.json @@ -7,213 +7,215 @@ "origins_of_ingredients" : { "aggregated_origins" : [ { - "origin" : "en:france", + "origin" : "en:unknown", "percent" : 100 } ], - "epi_score" : 93, - "epi_value" : 4, + "epi_score" : 0, + "epi_value" : -5, "origins_from_categories" : [ - "en:france" + "en:unknown", + "en:unknown" ], "origins_from_origins_field" : [ "en:unknown" ], "transportation_scores" : { - "ad" : 57, + "ad" : 0, "al" : 0, - "at" : 38, - "ax" : 67, - "ba" : 14, - "be" : 85, - "bg" : 21, - "ch" : 69, - "cy" : 40, - "cz" : 48, - "de" : 61, - "dk" : 39, - "dz" : 45, - "ee" : 71, - "eg" : 35, - "es" : 37, - "fi" : 69, - "fo" : 62, - "fr" : 100, - "gg" : 78, - "gi" : 4, - "gr" : 49, - "hr" : 30, - "hu" : 26, - "ie" : 47, - "il" : 34, - "im" : 50, - "is" : 53, - "it" : 47, - "je" : 76, - "lb" : 39, - "li" : 64, - "lt" : 63, - "lu" : 82, - "lv" : 71, - "ly" : 56, - "ma" : 60, - "mc" : 52, - "md" : 29, - "me" : 37, - "mk" : 29, - "mt" : 57, - "nl" : 77, - "no" : 20, - "pl" : 25, - "ps" : 42, - "pt" : 13, - "ro" : 31, - "rs" : 7, - "se" : 15, - "si" : 38, - "sj" : 53, - "sk" : 24, - "sm" : 40, - "sy" : 26, - "tn" : 9, - "tr" : 7, - "ua" : 40, - "uk" : 68, + "at" : 0, + "ax" : 0, + "ba" : 0, + "be" : 0, + "bg" : 0, + "ch" : 0, + "cy" : 0, + "cz" : 0, + "de" : 0, + "dk" : 0, + "dz" : 0, + "ee" : 0, + "eg" : 0, + "es" : 0, + "fi" : 0, + "fo" : 0, + "fr" : 0, + "gg" : 0, + "gi" : 0, + "gr" : 0, + "hr" : 0, + "hu" : 0, + "ie" : 0, + "il" : 0, + "im" : 0, + "is" : 0, + "it" : 0, + "je" : 0, + "lb" : 0, + "li" : 0, + "lt" : 0, + "lu" : 0, + "lv" : 0, + "ly" : 0, + "ma" : 0, + "mc" : 0, + "md" : 0, + "me" : 0, + "mk" : 0, + "mt" : 0, + "nl" : 0, + "no" : 0, + "pl" : 0, + "ps" : 0, + "pt" : 0, + "ro" : 0, + "rs" : 0, + "se" : 0, + "si" : 0, + "sj" : 0, + "sk" : 0, + "sm" : 0, + "sy" : 0, + "tn" : 0, + "tr" : 0, + "ua" : 0, + "uk" : 0, "us" : 0, - "va" : 29, + "va" : 0, "world" : 0, - "xk" : 28 + "xk" : 0 }, "transportation_values" : { - "ad" : 9, + "ad" : 0, "al" : 0, - "at" : 6, - "ax" : 10, - "ba" : 2, - "be" : 13, - "bg" : 3, - "ch" : 10, - "cy" : 6, - "cz" : 7, - "de" : 9, - "dk" : 6, - "dz" : 7, - "ee" : 11, - "eg" : 5, - "es" : 6, - "fi" : 10, - "fo" : 9, - "fr" : 15, - "gg" : 12, - "gi" : 1, - "gr" : 7, - "hr" : 5, - "hu" : 4, - "ie" : 7, - "il" : 5, - "im" : 8, - "is" : 8, - "it" : 7, - "je" : 11, - "lb" : 6, - "li" : 10, - "lt" : 9, - "lu" : 12, - "lv" : 11, - "ly" : 8, - "ma" : 9, - "mc" : 8, - "md" : 4, - "me" : 6, - "mk" : 4, - "mt" : 9, - "nl" : 12, - "no" : 3, - "pl" : 4, - "ps" : 6, - "pt" : 2, - "ro" : 5, - "rs" : 1, - "se" : 2, - "si" : 6, - "sj" : 8, - "sk" : 4, - "sm" : 6, - "sy" : 4, - "tn" : 1, - "tr" : 1, - "ua" : 6, - "uk" : 10, + "at" : 0, + "ax" : 0, + "ba" : 0, + "be" : 0, + "bg" : 0, + "ch" : 0, + "cy" : 0, + "cz" : 0, + "de" : 0, + "dk" : 0, + "dz" : 0, + "ee" : 0, + "eg" : 0, + "es" : 0, + "fi" : 0, + "fo" : 0, + "fr" : 0, + "gg" : 0, + "gi" : 0, + "gr" : 0, + "hr" : 0, + "hu" : 0, + "ie" : 0, + "il" : 0, + "im" : 0, + "is" : 0, + "it" : 0, + "je" : 0, + "lb" : 0, + "li" : 0, + "lt" : 0, + "lu" : 0, + "lv" : 0, + "ly" : 0, + "ma" : 0, + "mc" : 0, + "md" : 0, + "me" : 0, + "mk" : 0, + "mt" : 0, + "nl" : 0, + "no" : 0, + "pl" : 0, + "ps" : 0, + "pt" : 0, + "ro" : 0, + "rs" : 0, + "se" : 0, + "si" : 0, + "sj" : 0, + "sk" : 0, + "sm" : 0, + "sy" : 0, + "tn" : 0, + "tr" : 0, + "ua" : 0, + "uk" : 0, "us" : 0, - "va" : 4, + "va" : 0, "world" : 0, - "xk" : 4 + "xk" : 0 }, "values" : { - "ad" : 13, - "al" : 4, - "at" : 10, - "ax" : 14, - "ba" : 6, - "be" : 17, - "bg" : 7, - "ch" : 14, - "cy" : 10, - "cz" : 11, - "de" : 13, - "dk" : 10, - "dz" : 11, - "ee" : 15, - "eg" : 9, - "es" : 10, - "fi" : 14, - "fo" : 13, - "fr" : 19, - "gg" : 16, - "gi" : 5, - "gr" : 11, - "hr" : 9, - "hu" : 8, - "ie" : 11, - "il" : 9, - "im" : 12, - "is" : 12, - "it" : 11, - "je" : 15, - "lb" : 10, - "li" : 14, - "lt" : 13, - "lu" : 16, - "lv" : 15, - "ly" : 12, - "ma" : 13, - "mc" : 12, - "md" : 8, - "me" : 10, - "mk" : 8, - "mt" : 13, - "nl" : 16, - "no" : 7, - "pl" : 8, - "ps" : 10, - "pt" : 6, - "ro" : 9, - "rs" : 5, - "se" : 6, - "si" : 10, - "sj" : 12, - "sk" : 8, - "sm" : 10, - "sy" : 8, - "tn" : 5, - "tr" : 5, - "ua" : 10, - "uk" : 14, - "us" : 4, - "va" : 8, - "world" : 4, - "xk" : 8 - } + "ad" : -5, + "al" : -5, + "at" : -5, + "ax" : -5, + "ba" : -5, + "be" : -5, + "bg" : -5, + "ch" : -5, + "cy" : -5, + "cz" : -5, + "de" : -5, + "dk" : -5, + "dz" : -5, + "ee" : -5, + "eg" : -5, + "es" : -5, + "fi" : -5, + "fo" : -5, + "fr" : -5, + "gg" : -5, + "gi" : -5, + "gr" : -5, + "hr" : -5, + "hu" : -5, + "ie" : -5, + "il" : -5, + "im" : -5, + "is" : -5, + "it" : -5, + "je" : -5, + "lb" : -5, + "li" : -5, + "lt" : -5, + "lu" : -5, + "lv" : -5, + "ly" : -5, + "ma" : -5, + "mc" : -5, + "md" : -5, + "me" : -5, + "mk" : -5, + "mt" : -5, + "nl" : -5, + "no" : -5, + "pl" : -5, + "ps" : -5, + "pt" : -5, + "ro" : -5, + "rs" : -5, + "se" : -5, + "si" : -5, + "sj" : -5, + "sk" : -5, + "sm" : -5, + "sy" : -5, + "tn" : -5, + "tr" : -5, + "ua" : -5, + "uk" : -5, + "us" : -5, + "va" : -5, + "world" : -5, + "xk" : -5 + }, + "warning" : "origins_are_100_percent_unknown" }, "packaging" : { "non_recyclable_and_non_biodegradable_materials" : 1, @@ -236,6 +238,7 @@ "agb_category" : 1, "ingredients" : 1, "labels" : 1, + "origins" : 1, "packagings" : 1 }, "missing_agribalyse_match_warning" : 1, diff --git a/tests/unit/expected_test_results/ecoscore/carrots-plastic.json b/tests/unit/expected_test_results/ecoscore/carrots-plastic.json index fe8c7fc1e2275..aff1d0f11ae9b 100644 --- a/tests/unit/expected_test_results/ecoscore/carrots-plastic.json +++ b/tests/unit/expected_test_results/ecoscore/carrots-plastic.json @@ -406,6 +406,7 @@ { "ciqual_food_code" : "20009", "id" : "en:carrot", + "is_in_taxonomy" : 1, "origins" : "en:france", "percent_estimate" : 100, "percent_max" : 100, diff --git a/tests/unit/expected_test_results/ecoscore/carrots.json b/tests/unit/expected_test_results/ecoscore/carrots.json index d1d35ecd79041..bbbb463f01d30 100644 --- a/tests/unit/expected_test_results/ecoscore/carrots.json +++ b/tests/unit/expected_test_results/ecoscore/carrots.json @@ -408,6 +408,7 @@ { "ciqual_food_code" : "20009", "id" : "en:carrot", + "is_in_taxonomy" : 1, "origins" : "en:france", "percent_estimate" : 100, "percent_max" : 100, diff --git a/tests/unit/expected_test_results/ecoscore/category-without-ecoscore-sodas.json b/tests/unit/expected_test_results/ecoscore/category-without-ecoscore-sodas.json index 4dbb4de6d8c95..f0eaa0563ce80 100644 --- a/tests/unit/expected_test_results/ecoscore/category-without-ecoscore-sodas.json +++ b/tests/unit/expected_test_results/ecoscore/category-without-ecoscore-sodas.json @@ -245,6 +245,7 @@ { "ciqual_food_code" : "18066", "id" : "en:water", + "is_in_taxonomy" : 1, "percent_estimate" : 75, "percent_max" : 100, "percent_min" : 50, @@ -255,6 +256,7 @@ { "ciqual_proxy_food_code" : "31016", "id" : "en:sugar", + "is_in_taxonomy" : 1, "percent_estimate" : 25, "percent_max" : 50, "percent_min" : 0, diff --git a/tests/unit/expected_test_results/ecoscore/energy-drink.json b/tests/unit/expected_test_results/ecoscore/energy-drink.json index 49dc2767d8b7b..8615402e0bf62 100644 --- a/tests/unit/expected_test_results/ecoscore/energy-drink.json +++ b/tests/unit/expected_test_results/ecoscore/energy-drink.json @@ -263,6 +263,7 @@ { "ciqual_food_code" : "18066", "id" : "en:water", + "is_in_taxonomy" : 1, "percent_estimate" : 75, "percent_max" : 100, "percent_min" : 50, @@ -272,6 +273,7 @@ }, { "id" : "en:caffeine", + "is_in_taxonomy" : 1, "percent_estimate" : 25, "percent_max" : 50, "percent_min" : 0, diff --git a/tests/unit/expected_test_results/ecoscore/foie-gras.json b/tests/unit/expected_test_results/ecoscore/foie-gras.json index f8392213a9a3c..8ea411432dec2 100644 --- a/tests/unit/expected_test_results/ecoscore/foie-gras.json +++ b/tests/unit/expected_test_results/ecoscore/foie-gras.json @@ -416,6 +416,7 @@ { "ciqual_food_code" : "40121", "id" : "en:duck-foie-gras", + "is_in_taxonomy" : 1, "percent_estimate" : 100, "percent_max" : 100, "percent_min" : 100, diff --git a/tests/unit/expected_test_results/ecoscore/fr-verseur-en-plastique.json b/tests/unit/expected_test_results/ecoscore/fr-verseur-en-plastique.json index b58e55db4502f..d2f41026f3b6c 100644 --- a/tests/unit/expected_test_results/ecoscore/fr-verseur-en-plastique.json +++ b/tests/unit/expected_test_results/ecoscore/fr-verseur-en-plastique.json @@ -435,6 +435,7 @@ "ciqual_food_code" : "17270", "from_palm_oil" : "no", "id" : "en:extra-virgin-olive-oil", + "is_in_taxonomy" : 1, "percent_estimate" : 100, "percent_max" : 100, "percent_min" : 100, diff --git a/tests/unit/expected_test_results/ecoscore/fr-viande-porcine-francaise.json b/tests/unit/expected_test_results/ecoscore/fr-viande-porcine-francaise.json index 0af43ed73df3c..aa6003ebdd30b 100644 --- a/tests/unit/expected_test_results/ecoscore/fr-viande-porcine-francaise.json +++ b/tests/unit/expected_test_results/ecoscore/fr-viande-porcine-francaise.json @@ -411,6 +411,7 @@ { "ciqual_food_code" : "20026", "id" : "en:belgian-endive", + "is_in_taxonomy" : 1, "percent" : 40, "percent_estimate" : 40, "percent_max" : 40, @@ -422,6 +423,7 @@ { "ciqual_proxy_food_code" : "28205", "id" : "en:cooked-ham", + "is_in_taxonomy" : 1, "origins" : "en:france", "percent_estimate" : 30, "percent_max" : 40, @@ -433,6 +435,7 @@ { "ciqual_food_code" : "22002", "id" : "en:egg-yolk", + "is_in_taxonomy" : 1, "origins" : "en:france", "percent_estimate" : 20, "percent_max" : 33.3333333333333, @@ -444,6 +447,7 @@ { "ciqual_food_code" : "11058", "id" : "en:salt", + "is_in_taxonomy" : 1, "percent_estimate" : 10, "percent_max" : 20, "percent_min" : 0, diff --git a/tests/unit/expected_test_results/ecoscore/fresh-vegetable.json b/tests/unit/expected_test_results/ecoscore/fresh-vegetable.json index 9751cf18435e3..1c334fdd758bb 100644 --- a/tests/unit/expected_test_results/ecoscore/fresh-vegetable.json +++ b/tests/unit/expected_test_results/ecoscore/fresh-vegetable.json @@ -255,6 +255,7 @@ { "ciqual_food_code" : "20047", "id" : "en:tomato", + "is_in_taxonomy" : 1, "percent_estimate" : 100, "percent_max" : 100, "percent_min" : 100, diff --git a/tests/unit/expected_test_results/ecoscore/frozen-vegetable.json b/tests/unit/expected_test_results/ecoscore/frozen-vegetable.json index 2fdd8e7141123..3d7b2fa03fd93 100644 --- a/tests/unit/expected_test_results/ecoscore/frozen-vegetable.json +++ b/tests/unit/expected_test_results/ecoscore/frozen-vegetable.json @@ -412,6 +412,7 @@ { "ciqual_food_code" : "20009", "id" : "en:carrot", + "is_in_taxonomy" : 1, "percent_estimate" : 100, "percent_max" : 100, "percent_min" : 100, diff --git a/tests/unit/expected_test_results/ecoscore/grade-a-with-non-recyclable-label.json b/tests/unit/expected_test_results/ecoscore/grade-a-with-non-recyclable-label.json index 909bc65eda8ec..b191b938722b8 100644 --- a/tests/unit/expected_test_results/ecoscore/grade-a-with-non-recyclable-label.json +++ b/tests/unit/expected_test_results/ecoscore/grade-a-with-non-recyclable-label.json @@ -422,6 +422,7 @@ { "ciqual_food_code" : "20053", "id" : "en:aubergine", + "is_in_taxonomy" : 1, "percent" : 60, "percent_estimate" : 60, "percent_max" : 60, @@ -433,6 +434,7 @@ { "ciqual_food_code" : "4003", "id" : "en:potato", + "is_in_taxonomy" : 1, "percent" : 39, "percent_estimate" : 39, "percent_max" : 39, @@ -445,6 +447,7 @@ "ciqual_food_code" : "17130", "from_palm_oil" : "no", "id" : "en:colza-oil", + "is_in_taxonomy" : 1, "percent" : 1, "percent_estimate" : 1, "percent_max" : 1, diff --git a/tests/unit/expected_test_results/ecoscore/grade-a-with-recyclable-label.json b/tests/unit/expected_test_results/ecoscore/grade-a-with-recyclable-label.json index 906e273c6cf16..5872895b373a2 100644 --- a/tests/unit/expected_test_results/ecoscore/grade-a-with-recyclable-label.json +++ b/tests/unit/expected_test_results/ecoscore/grade-a-with-recyclable-label.json @@ -422,6 +422,7 @@ { "ciqual_food_code" : "20053", "id" : "en:aubergine", + "is_in_taxonomy" : 1, "percent" : 60, "percent_estimate" : 60, "percent_max" : 60, @@ -433,6 +434,7 @@ { "ciqual_food_code" : "4003", "id" : "en:potato", + "is_in_taxonomy" : 1, "percent" : 39, "percent_estimate" : 39, "percent_max" : 39, @@ -445,6 +447,7 @@ "ciqual_food_code" : "17130", "from_palm_oil" : "no", "id" : "en:colza-oil", + "is_in_taxonomy" : 1, "percent" : 1, "percent_estimate" : 1, "percent_max" : 1, diff --git a/tests/unit/expected_test_results/ecoscore/lamb-leg.json b/tests/unit/expected_test_results/ecoscore/lamb-leg.json index d63ca98ee0d99..3f520540aff8a 100644 --- a/tests/unit/expected_test_results/ecoscore/lamb-leg.json +++ b/tests/unit/expected_test_results/ecoscore/lamb-leg.json @@ -400,6 +400,7 @@ { "ciqual_food_code" : "21502", "id" : "en:lamb-leg", + "is_in_taxonomy" : 1, "origins" : "en:great-britain", "percent_estimate" : 100, "percent_max" : 100, diff --git a/tests/unit/expected_test_results/ecoscore/milk.json b/tests/unit/expected_test_results/ecoscore/milk.json index b7b706cc7689f..b1d38de8133b3 100644 --- a/tests/unit/expected_test_results/ecoscore/milk.json +++ b/tests/unit/expected_test_results/ecoscore/milk.json @@ -415,6 +415,7 @@ { "ciqual_proxy_food_code" : "19051", "id" : "en:milk", + "is_in_taxonomy" : 1, "origins" : "en:brittany", "percent_estimate" : 100, "percent_max" : 100, diff --git a/tests/unit/expected_test_results/ecoscore/origins-of-ingredients-in-origins-field-multiple.json b/tests/unit/expected_test_results/ecoscore/origins-of-ingredients-in-origins-field-multiple.json index 30ebc63327b2c..2e668a1c00e3e 100644 --- a/tests/unit/expected_test_results/ecoscore/origins-of-ingredients-in-origins-field-multiple.json +++ b/tests/unit/expected_test_results/ecoscore/origins-of-ingredients-in-origins-field-multiple.json @@ -409,6 +409,7 @@ { "ciqual_food_code" : "13000", "id" : "en:apricot", + "is_in_taxonomy" : 1, "percent" : 60, "percent_estimate" : 60, "percent_max" : 60, @@ -420,6 +421,7 @@ { "ciqual_proxy_food_code" : "31016", "id" : "en:cane-sugar", + "is_in_taxonomy" : 1, "origins" : "en:martinique", "percent" : 30, "percent_estimate" : 30, @@ -432,6 +434,7 @@ { "ciqual_food_code" : "2028", "id" : "en:lemon-juice", + "is_in_taxonomy" : 1, "percent_estimate" : 10, "percent_max" : 10, "percent_min" : 10, diff --git a/tests/unit/expected_test_results/ecoscore/origins-of-ingredients-in-origins-field.json b/tests/unit/expected_test_results/ecoscore/origins-of-ingredients-in-origins-field.json index 0a2760a59a26d..926db6d7a4bfc 100644 --- a/tests/unit/expected_test_results/ecoscore/origins-of-ingredients-in-origins-field.json +++ b/tests/unit/expected_test_results/ecoscore/origins-of-ingredients-in-origins-field.json @@ -406,6 +406,7 @@ { "ciqual_food_code" : "13000", "id" : "en:apricot", + "is_in_taxonomy" : 1, "percent" : 60, "percent_estimate" : 60, "percent_max" : 60, @@ -417,6 +418,7 @@ { "ciqual_proxy_food_code" : "31016", "id" : "en:cane-sugar", + "is_in_taxonomy" : 1, "origins" : "en:martinique", "percent" : 30, "percent_estimate" : 30, @@ -429,6 +431,7 @@ { "ciqual_food_code" : "2028", "id" : "en:lemon-juice", + "is_in_taxonomy" : 1, "percent_estimate" : 10, "percent_max" : 10, "percent_min" : 10, diff --git a/tests/unit/expected_test_results/ecoscore/origins-of-ingredients-nested-2.json b/tests/unit/expected_test_results/ecoscore/origins-of-ingredients-nested-2.json index 7cfdc6089ae14..5e758dcb892f1 100644 --- a/tests/unit/expected_test_results/ecoscore/origins-of-ingredients-nested-2.json +++ b/tests/unit/expected_test_results/ecoscore/origins-of-ingredients-nested-2.json @@ -402,6 +402,7 @@ { "ciqual_proxy_food_code" : "19051", "id" : "en:milk", + "is_in_taxonomy" : 1, "percent_estimate" : 66.6666666666667, "percent_max" : 100, "percent_min" : 33.3333333333333, @@ -415,6 +416,7 @@ { "ciqual_proxy_food_code" : "18100", "id" : "en:cocoa", + "is_in_taxonomy" : 1, "percent_estimate" : 8.33333333333333, "percent_max" : 50, "percent_min" : 0, @@ -425,6 +427,7 @@ { "ciqual_food_code" : "16030", "id" : "en:cocoa-butter", + "is_in_taxonomy" : 1, "percent_estimate" : 4.16666666666667, "percent_max" : 25, "percent_min" : 0, @@ -437,6 +440,7 @@ "ingredients" : [ { "id" : "en:e951", + "is_in_taxonomy" : 1, "percent_estimate" : 4.16666666666667, "percent_max" : 16.6666666666667, "percent_min" : 0, @@ -445,12 +449,14 @@ "vegetarian" : "yes" } ], + "is_in_taxonomy" : 1, "percent_estimate" : 4.16666666666667, "percent_max" : 16.6666666666667, "percent_min" : 0, "text" : "sweetener" } ], + "is_in_taxonomy" : 1, "percent_estimate" : 16.6666666666667, "percent_max" : 50, "percent_min" : 0, @@ -461,6 +467,7 @@ { "ciqual_food_code" : "11058", "id" : "en:salt", + "is_in_taxonomy" : 1, "percent_estimate" : 16.6666666666667, "percent_max" : 33.3333333333333, "percent_min" : 0, diff --git a/tests/unit/expected_test_results/ecoscore/origins-of-ingredients-nested.json b/tests/unit/expected_test_results/ecoscore/origins-of-ingredients-nested.json index 92dbe66a76f65..c1e52da4456c7 100644 --- a/tests/unit/expected_test_results/ecoscore/origins-of-ingredients-nested.json +++ b/tests/unit/expected_test_results/ecoscore/origins-of-ingredients-nested.json @@ -402,6 +402,7 @@ { "ciqual_proxy_food_code" : "19051", "id" : "en:milk", + "is_in_taxonomy" : 1, "percent_estimate" : 66.6666666666667, "percent_max" : 100, "percent_min" : 33.3333333333333, @@ -412,6 +413,7 @@ { "ciqual_food_code" : "11058", "id" : "en:salt", + "is_in_taxonomy" : 1, "percent_estimate" : 16.6666666666667, "percent_max" : 50, "percent_min" : 0, @@ -424,6 +426,7 @@ "ingredients" : [ { "id" : "en:e160b", + "is_in_taxonomy" : 1, "percent_estimate" : 16.6666666666667, "percent_max" : 33.3333333333333, "percent_min" : 0, @@ -432,6 +435,7 @@ "vegetarian" : "yes" } ], + "is_in_taxonomy" : 1, "percent_estimate" : 16.6666666666667, "percent_max" : 33.3333333333333, "percent_min" : 0, diff --git a/tests/unit/expected_test_results/ecoscore/origins-of-ingredients-not-specified.json b/tests/unit/expected_test_results/ecoscore/origins-of-ingredients-not-specified.json index 2ec078ee32df3..43386b520355f 100644 --- a/tests/unit/expected_test_results/ecoscore/origins-of-ingredients-not-specified.json +++ b/tests/unit/expected_test_results/ecoscore/origins-of-ingredients-not-specified.json @@ -402,6 +402,7 @@ { "ciqual_food_code" : "13000", "id" : "en:apricot", + "is_in_taxonomy" : 1, "percent" : 60, "percent_estimate" : 60, "percent_max" : 60, @@ -413,6 +414,7 @@ { "ciqual_proxy_food_code" : "31016", "id" : "en:cane-sugar", + "is_in_taxonomy" : 1, "percent" : 30, "percent_estimate" : 30, "percent_max" : 30, @@ -424,6 +426,7 @@ { "ciqual_food_code" : "2028", "id" : "en:lemon-juice", + "is_in_taxonomy" : 1, "percent_estimate" : 10, "percent_max" : 10, "percent_min" : 10, diff --git a/tests/unit/expected_test_results/ecoscore/origins-of-ingredients-partly-specified.json b/tests/unit/expected_test_results/ecoscore/origins-of-ingredients-partly-specified.json index c5749d0ce4667..9aa3a5de168e4 100644 --- a/tests/unit/expected_test_results/ecoscore/origins-of-ingredients-partly-specified.json +++ b/tests/unit/expected_test_results/ecoscore/origins-of-ingredients-partly-specified.json @@ -404,6 +404,7 @@ { "ciqual_food_code" : "13000", "id" : "en:apricot", + "is_in_taxonomy" : 1, "origins" : "en:france", "percent" : 60, "percent_estimate" : 60, @@ -416,6 +417,7 @@ { "ciqual_proxy_food_code" : "31016", "id" : "en:cane-sugar", + "is_in_taxonomy" : 1, "percent" : 30, "percent_estimate" : 30, "percent_max" : 30, @@ -427,6 +429,7 @@ { "ciqual_food_code" : "2028", "id" : "en:lemon-juice", + "is_in_taxonomy" : 1, "percent_estimate" : 10, "percent_max" : 10, "percent_min" : 10, diff --git a/tests/unit/expected_test_results/ecoscore/origins-of-ingredients-specified-multiple.json b/tests/unit/expected_test_results/ecoscore/origins-of-ingredients-specified-multiple.json index d191372deea8f..059ac44dd8214 100644 --- a/tests/unit/expected_test_results/ecoscore/origins-of-ingredients-specified-multiple.json +++ b/tests/unit/expected_test_results/ecoscore/origins-of-ingredients-specified-multiple.json @@ -420,6 +420,7 @@ { "ciqual_food_code" : "13000", "id" : "en:apricot", + "is_in_taxonomy" : 1, "origins" : "en:france,en:spain", "percent" : 60, "percent_estimate" : 60, @@ -432,6 +433,7 @@ { "ciqual_proxy_food_code" : "31016", "id" : "en:cane-sugar", + "is_in_taxonomy" : 1, "origins" : "en:martinique,en:guadeloupe,en:dominican-republic", "percent" : 30, "percent_estimate" : 30, @@ -444,6 +446,7 @@ { "ciqual_food_code" : "2028", "id" : "en:lemon-juice", + "is_in_taxonomy" : 1, "percent_estimate" : 10, "percent_max" : 10, "percent_min" : 10, diff --git a/tests/unit/expected_test_results/ecoscore/origins-of-ingredients-specified.json b/tests/unit/expected_test_results/ecoscore/origins-of-ingredients-specified.json index 4cd4c380f0cce..4938d2c629bfc 100644 --- a/tests/unit/expected_test_results/ecoscore/origins-of-ingredients-specified.json +++ b/tests/unit/expected_test_results/ecoscore/origins-of-ingredients-specified.json @@ -410,6 +410,7 @@ { "ciqual_food_code" : "13000", "id" : "en:apricot", + "is_in_taxonomy" : 1, "origins" : "en:france", "percent" : 60, "percent_estimate" : 60, @@ -422,6 +423,7 @@ { "ciqual_proxy_food_code" : "31016", "id" : "en:cane-sugar", + "is_in_taxonomy" : 1, "origins" : "en:martinique", "percent" : 30, "percent_estimate" : 30, @@ -434,6 +436,7 @@ { "ciqual_food_code" : "2028", "id" : "en:lemon-juice", + "is_in_taxonomy" : 1, "origins" : "en:italy", "percent_estimate" : 10, "percent_max" : 10, diff --git a/tests/unit/expected_test_results/ecoscore/origins-of-ingredients-unknown-origin.json b/tests/unit/expected_test_results/ecoscore/origins-of-ingredients-unknown-origin.json index c71c0dfdb02c7..52577e4b21c89 100644 --- a/tests/unit/expected_test_results/ecoscore/origins-of-ingredients-unknown-origin.json +++ b/tests/unit/expected_test_results/ecoscore/origins-of-ingredients-unknown-origin.json @@ -402,6 +402,7 @@ { "ciqual_proxy_food_code" : "19051", "id" : "en:milk", + "is_in_taxonomy" : 1, "origins" : "en:Milky way", "percent_estimate" : 100, "percent_max" : 100, diff --git a/tests/unit/expected_test_results/ecoscore/origins-of-ingredients-unspecified-origin.json b/tests/unit/expected_test_results/ecoscore/origins-of-ingredients-unspecified-origin.json index 2d75d1cba2433..5b6cc0198386d 100644 --- a/tests/unit/expected_test_results/ecoscore/origins-of-ingredients-unspecified-origin.json +++ b/tests/unit/expected_test_results/ecoscore/origins-of-ingredients-unspecified-origin.json @@ -400,6 +400,7 @@ { "ciqual_proxy_food_code" : "19051", "id" : "en:milk", + "is_in_taxonomy" : 1, "percent_estimate" : 100, "percent_max" : 100, "percent_min" : 100, diff --git a/tests/unit/expected_test_results/ecoscore/packaging-fr-new-shapes.json b/tests/unit/expected_test_results/ecoscore/packaging-fr-new-shapes.json index 91d4a0df40f99..ebf42054406b7 100644 --- a/tests/unit/expected_test_results/ecoscore/packaging-fr-new-shapes.json +++ b/tests/unit/expected_test_results/ecoscore/packaging-fr-new-shapes.json @@ -440,6 +440,7 @@ { "ciqual_proxy_food_code" : "9410", "id" : "en:wheat", + "is_in_taxonomy" : 1, "origins" : "en:france", "percent_estimate" : 100, "percent_max" : 100, diff --git a/tests/unit/expected_test_results/ecoscore/packaging-unspecified-no-a-eco-score.json b/tests/unit/expected_test_results/ecoscore/packaging-unspecified-no-a-eco-score.json index 7adbeae2c6117..81f83b381a222 100644 --- a/tests/unit/expected_test_results/ecoscore/packaging-unspecified-no-a-eco-score.json +++ b/tests/unit/expected_test_results/ecoscore/packaging-unspecified-no-a-eco-score.json @@ -402,6 +402,7 @@ { "ciqual_proxy_food_code" : "9410", "id" : "en:wheat", + "is_in_taxonomy" : 1, "origins" : "en:france", "percent_estimate" : 100, "percent_max" : 100, diff --git a/tests/unit/expected_test_results/ecoscore/sum-of-bonuses-greater-than-25.json b/tests/unit/expected_test_results/ecoscore/sum-of-bonuses-greater-than-25.json index b9aefac4ac447..a218ad1e2e74f 100644 --- a/tests/unit/expected_test_results/ecoscore/sum-of-bonuses-greater-than-25.json +++ b/tests/unit/expected_test_results/ecoscore/sum-of-bonuses-greater-than-25.json @@ -408,6 +408,7 @@ { "ciqual_proxy_food_code" : "36005", "id" : "en:chicken", + "is_in_taxonomy" : 1, "origins" : "en:france", "percent_estimate" : 100, "percent_max" : 100, diff --git a/tests/unit/expected_test_results/ecoscore/track-ecoscore-changes.json b/tests/unit/expected_test_results/ecoscore/track-ecoscore-changes.json index 42c144b8a7d85..ad160bac5cea8 100644 --- a/tests/unit/expected_test_results/ecoscore/track-ecoscore-changes.json +++ b/tests/unit/expected_test_results/ecoscore/track-ecoscore-changes.json @@ -423,6 +423,7 @@ { "ciqual_food_code" : "40121", "id" : "en:duck-foie-gras", + "is_in_taxonomy" : 1, "percent_estimate" : 100, "percent_max" : 100, "percent_min" : 100, diff --git a/tests/unit/expected_test_results/ecoscore/track-ecoscore-no-change.json b/tests/unit/expected_test_results/ecoscore/track-ecoscore-no-change.json index 4e6e694d2fae6..cee0faac2da50 100644 --- a/tests/unit/expected_test_results/ecoscore/track-ecoscore-no-change.json +++ b/tests/unit/expected_test_results/ecoscore/track-ecoscore-no-change.json @@ -416,6 +416,7 @@ { "ciqual_food_code" : "40121", "id" : "en:duck-foie-gras", + "is_in_taxonomy" : 1, "percent_estimate" : 100, "percent_max" : 100, "percent_min" : 100, diff --git a/tests/unit/expected_test_results/ecoscore/track-ecoscore-same-grade.json b/tests/unit/expected_test_results/ecoscore/track-ecoscore-same-grade.json index b6c7b6a3d4c0b..58480021fcd71 100644 --- a/tests/unit/expected_test_results/ecoscore/track-ecoscore-same-grade.json +++ b/tests/unit/expected_test_results/ecoscore/track-ecoscore-same-grade.json @@ -423,6 +423,7 @@ { "ciqual_food_code" : "40121", "id" : "en:duck-foie-gras", + "is_in_taxonomy" : 1, "percent_estimate" : 100, "percent_max" : 100, "percent_min" : 100, diff --git a/tests/unit/expected_test_results/ecoscore/track-ecoscore-tags-retained.json b/tests/unit/expected_test_results/ecoscore/track-ecoscore-tags-retained.json index 21c1938f1feb6..928551bcdcb00 100644 --- a/tests/unit/expected_test_results/ecoscore/track-ecoscore-tags-retained.json +++ b/tests/unit/expected_test_results/ecoscore/track-ecoscore-tags-retained.json @@ -421,6 +421,7 @@ { "ciqual_food_code" : "40121", "id" : "en:duck-foie-gras", + "is_in_taxonomy" : 1, "percent_estimate" : 100, "percent_max" : 100, "percent_min" : 100, diff --git a/tests/unit/expected_test_results/ecoscore/uk-milk.json b/tests/unit/expected_test_results/ecoscore/uk-milk.json index 5760c9ea8c7ed..8fd70b8efa111 100644 --- a/tests/unit/expected_test_results/ecoscore/uk-milk.json +++ b/tests/unit/expected_test_results/ecoscore/uk-milk.json @@ -418,6 +418,7 @@ { "ciqual_proxy_food_code" : "19051", "id" : "en:milk", + "is_in_taxonomy" : 1, "origins" : "en:england", "percent_estimate" : 100, "percent_max" : 100, diff --git a/tests/unit/expected_test_results/forest_footprint/fr-ingredients-filet-de-poulet-bio-oeuf-label-rouge-os-de-poulet-igp.json b/tests/unit/expected_test_results/forest_footprint/fr-ingredients-filet-de-poulet-bio-oeuf-label-rouge-os-de-poulet-igp.json index 7856b599aeeb5..bd2ac21a9949b 100644 --- a/tests/unit/expected_test_results/forest_footprint/fr-ingredients-filet-de-poulet-bio-oeuf-label-rouge-os-de-poulet-igp.json +++ b/tests/unit/expected_test_results/forest_footprint/fr-ingredients-filet-de-poulet-bio-oeuf-label-rouge-os-de-poulet-igp.json @@ -72,6 +72,7 @@ { "ciqual_food_code" : "36018", "id" : "en:chicken-fillet", + "is_in_taxonomy" : 1, "labels" : "en:organic", "percent_estimate" : 66.6666666666667, "percent_max" : 100, @@ -83,6 +84,7 @@ { "ciqual_food_code" : "22000", "id" : "en:egg", + "is_in_taxonomy" : 1, "labels" : "fr:label-rouge", "percent_estimate" : 16.6666666666667, "percent_max" : 50, @@ -94,6 +96,7 @@ { "ciqual_proxy_food_code" : "36005", "id" : "en:chicken-bone", + "is_in_taxonomy" : 1, "labels" : "en:pgi", "percent_estimate" : 16.6666666666667, "percent_max" : 33.3333333333333, diff --git a/tests/unit/expected_test_results/forest_footprint/fr-ingredients-filet-de-poulet-bio.json b/tests/unit/expected_test_results/forest_footprint/fr-ingredients-filet-de-poulet-bio.json index b565e4032c6fd..d782bf115fc7e 100644 --- a/tests/unit/expected_test_results/forest_footprint/fr-ingredients-filet-de-poulet-bio.json +++ b/tests/unit/expected_test_results/forest_footprint/fr-ingredients-filet-de-poulet-bio.json @@ -30,6 +30,7 @@ { "ciqual_food_code" : "36018", "id" : "en:chicken-fillet", + "is_in_taxonomy" : 1, "labels" : "en:organic", "percent_estimate" : 100, "percent_max" : 100, diff --git a/tests/unit/expected_test_results/forest_footprint/fr-ingredients-lait.json b/tests/unit/expected_test_results/forest_footprint/fr-ingredients-lait.json index eafec59d0febf..14a0ccea4d49e 100644 --- a/tests/unit/expected_test_results/forest_footprint/fr-ingredients-lait.json +++ b/tests/unit/expected_test_results/forest_footprint/fr-ingredients-lait.json @@ -3,6 +3,7 @@ { "ciqual_proxy_food_code" : "19051", "id" : "en:milk", + "is_in_taxonomy" : 1, "percent_estimate" : 100, "percent_max" : 100, "percent_min" : 100, diff --git a/tests/unit/expected_test_results/forest_footprint/fr-ingredients-nested-matching-ingredient.json b/tests/unit/expected_test_results/forest_footprint/fr-ingredients-nested-matching-ingredient.json index 2744d36c9c8e3..393af80a42069 100644 --- a/tests/unit/expected_test_results/forest_footprint/fr-ingredients-nested-matching-ingredient.json +++ b/tests/unit/expected_test_results/forest_footprint/fr-ingredients-nested-matching-ingredient.json @@ -28,6 +28,7 @@ "ingredients" : [ { "id" : "en:kangaroo", + "is_in_taxonomy" : 1, "percent_estimate" : 66.6666666666667, "percent_max" : 100, "percent_min" : 33.3333333333333, @@ -38,6 +39,7 @@ { "ciqual_food_code" : "18066", "id" : "en:water", + "is_in_taxonomy" : 1, "percent_estimate" : 16.6666666666667, "percent_max" : 50, "percent_min" : 0, @@ -47,12 +49,14 @@ }, { "id" : "en:brine", + "is_in_taxonomy" : 1, "percent_estimate" : 16.6666666666667, "percent_max" : 33.3333333333333, "percent_min" : 0, "text" : "saumure" } ], + "is_in_taxonomy" : 1, "percent_estimate" : 100, "percent_max" : 100, "percent_min" : 100, diff --git a/tests/unit/expected_test_results/forest_footprint/fr-ingredients-nested-matching-sub-ingredient.json b/tests/unit/expected_test_results/forest_footprint/fr-ingredients-nested-matching-sub-ingredient.json index 7e4dcf0f608ea..b0bfd7701cd34 100644 --- a/tests/unit/expected_test_results/forest_footprint/fr-ingredients-nested-matching-sub-ingredient.json +++ b/tests/unit/expected_test_results/forest_footprint/fr-ingredients-nested-matching-sub-ingredient.json @@ -34,6 +34,7 @@ { "ciqual_food_code" : "36005", "id" : "en:chicken-meat", + "is_in_taxonomy" : 1, "origins" : "en:france", "percent_estimate" : 66.6666666666667, "percent_max" : 100, @@ -45,6 +46,7 @@ { "ciqual_food_code" : "18066", "id" : "en:water", + "is_in_taxonomy" : 1, "percent_estimate" : 16.6666666666667, "percent_max" : 50, "percent_min" : 0, @@ -54,12 +56,14 @@ }, { "id" : "en:brine", + "is_in_taxonomy" : 1, "percent_estimate" : 16.6666666666667, "percent_max" : 33.3333333333333, "percent_min" : 0, "text" : "saumure" } ], + "is_in_taxonomy" : 1, "percent_estimate" : 100, "percent_max" : 100, "percent_min" : 100, diff --git a/tests/unit/expected_test_results/forest_footprint/fr-ingredients-poulet-du-gers.json b/tests/unit/expected_test_results/forest_footprint/fr-ingredients-poulet-du-gers.json index eecd70c0d4b09..3c76a9b1355bb 100644 --- a/tests/unit/expected_test_results/forest_footprint/fr-ingredients-poulet-du-gers.json +++ b/tests/unit/expected_test_results/forest_footprint/fr-ingredients-poulet-du-gers.json @@ -30,6 +30,7 @@ { "ciqual_proxy_food_code" : "36005", "id" : "en:chicken", + "is_in_taxonomy" : 1, "origins" : "en:gers", "percent_estimate" : 100, "percent_max" : 100, diff --git a/tests/unit/expected_test_results/forest_footprint/fr-ingredients-poulet.json b/tests/unit/expected_test_results/forest_footprint/fr-ingredients-poulet.json index d0d981a5e53d3..96386b34bfd04 100644 --- a/tests/unit/expected_test_results/forest_footprint/fr-ingredients-poulet.json +++ b/tests/unit/expected_test_results/forest_footprint/fr-ingredients-poulet.json @@ -25,6 +25,7 @@ { "ciqual_proxy_food_code" : "36005", "id" : "en:chicken", + "is_in_taxonomy" : 1, "percent_estimate" : 100, "percent_max" : 100, "percent_min" : 100, diff --git a/tests/unit/expected_test_results/ingredients/ca-middle-dot.json b/tests/unit/expected_test_results/ingredients/ca-middle-dot.json index 64f305a6ff141..1c2aab97f50a9 100644 --- a/tests/unit/expected_test_results/ingredients/ca-middle-dot.json +++ b/tests/unit/expected_test_results/ingredients/ca-middle-dot.json @@ -7,6 +7,7 @@ { "ciqual_proxy_food_code" : "19051", "id" : "en:pasteurised-cow-s-milk", + "is_in_taxonomy" : 1, "percent_estimate" : 43.75, "percent_max" : 100, "percent_min" : 12.5, @@ -17,6 +18,7 @@ { "ciqual_food_code" : "11058", "id" : "en:salt", + "is_in_taxonomy" : 1, "percent_estimate" : 15.625, "percent_max" : 50, "percent_min" : 0, @@ -26,6 +28,7 @@ }, { "id" : "en:lactic-ferments", + "is_in_taxonomy" : 1, "percent_estimate" : 7.8125, "percent_max" : 33.3333333333333, "percent_min" : 0, @@ -35,6 +38,7 @@ }, { "id" : "en:rennet", + "is_in_taxonomy" : 1, "percent_estimate" : 7.8125, "percent_max" : 25, "percent_min" : 0, @@ -43,6 +47,7 @@ "vegetarian" : "maybe" } ], + "is_in_taxonomy" : 1, "percent_estimate" : 75, "percent_max" : 100, "percent_min" : 50, @@ -55,6 +60,7 @@ "ingredients" : [ { "id" : "en:e460", + "is_in_taxonomy" : 1, "percent_estimate" : 25, "percent_max" : 50, "percent_min" : 0, @@ -63,6 +69,7 @@ "vegetarian" : "yes" } ], + "is_in_taxonomy" : 1, "percent_estimate" : 25, "percent_max" : 50, "percent_min" : 0, diff --git a/tests/unit/expected_test_results/ingredients/en-allergens-in-parenthesis.json b/tests/unit/expected_test_results/ingredients/en-allergens-in-parenthesis.json index 323176adc1884..45f173ceee8bf 100644 --- a/tests/unit/expected_test_results/ingredients/en-allergens-in-parenthesis.json +++ b/tests/unit/expected_test_results/ingredients/en-allergens-in-parenthesis.json @@ -4,6 +4,7 @@ { "ciqual_proxy_food_code" : "16400", "id" : "en:butter", + "is_in_taxonomy" : 1, "percent_estimate" : 62.5, "percent_max" : 100, "percent_min" : 25, @@ -14,6 +15,7 @@ { "ciqual_proxy_food_code" : "26140", "id" : "en:surimi", + "is_in_taxonomy" : 1, "percent_estimate" : 18.75, "percent_max" : 50, "percent_min" : 0, @@ -24,6 +26,7 @@ { "ciqual_proxy_food_code" : "9410", "id" : "en:wheat-flour", + "is_in_taxonomy" : 1, "percent_estimate" : 9.375, "percent_max" : 33.3333333333333, "percent_min" : 0, @@ -37,6 +40,7 @@ { "ciqual_proxy_food_code" : "9410", "id" : "en:flour", + "is_in_taxonomy" : 1, "percent_estimate" : 4.6875, "percent_max" : 25, "percent_min" : 0, @@ -46,6 +50,7 @@ }, { "id" : "en:gluten", + "is_in_taxonomy" : 1, "percent_estimate" : 2.34375, "percent_max" : 12.5, "percent_min" : 0, @@ -56,6 +61,7 @@ { "ciqual_food_code" : "11058", "id" : "en:salt", + "is_in_taxonomy" : 1, "percent_estimate" : 1.171875, "percent_max" : 8.33333333333333, "percent_min" : 0, @@ -66,6 +72,7 @@ { "ciqual_food_code" : "18066", "id" : "en:water", + "is_in_taxonomy" : 1, "percent_estimate" : 1.171875, "percent_max" : 6.25, "percent_min" : 0, @@ -74,6 +81,7 @@ "vegetarian" : "yes" } ], + "is_in_taxonomy" : 1, "percent_estimate" : 9.375, "percent_max" : 25, "percent_min" : 0, diff --git a/tests/unit/expected_test_results/ingredients/en-category-types.json b/tests/unit/expected_test_results/ingredients/en-category-types.json index ba2ec7030ddd0..c85a7d63b8440 100644 --- a/tests/unit/expected_test_results/ingredients/en-category-types.json +++ b/tests/unit/expected_test_results/ingredients/en-category-types.json @@ -4,6 +4,7 @@ "ciqual_food_code" : "17130", "from_palm_oil" : "no", "id" : "en:rapeseed-oil", + "is_in_taxonomy" : 1, "percent_estimate" : 62.5, "percent_max" : 100, "percent_min" : 25, @@ -15,6 +16,7 @@ "ciqual_proxy_food_code" : "16129", "from_palm_oil" : "yes", "id" : "en:palm-fat", + "is_in_taxonomy" : 1, "percent_estimate" : 18.75, "percent_max" : 50, "percent_min" : 0, @@ -26,6 +28,7 @@ "ciqual_food_code" : "16110", "from_palm_oil" : "no", "id" : "en:shea-butter", + "is_in_taxonomy" : 1, "percent_estimate" : 9.375, "percent_max" : 33.3333333333333, "percent_min" : 0, @@ -36,6 +39,7 @@ { "from_palm_oil" : "no", "id" : "en:sunflower-fat", + "is_in_taxonomy" : 1, "percent_estimate" : 9.375, "percent_max" : 25, "percent_min" : 0, diff --git a/tests/unit/expected_test_results/ingredients/en-emulsifier-synonyms.json b/tests/unit/expected_test_results/ingredients/en-emulsifier-synonyms.json index 72ef052d9977e..5a6298b89b9f7 100644 --- a/tests/unit/expected_test_results/ingredients/en-emulsifier-synonyms.json +++ b/tests/unit/expected_test_results/ingredients/en-emulsifier-synonyms.json @@ -6,6 +6,7 @@ { "from_palm_oil" : "maybe", "id" : "en:e471", + "is_in_taxonomy" : 1, "percent_estimate" : 50, "percent_max" : 100, "percent_min" : 25, @@ -15,6 +16,7 @@ }, { "id" : "en:e477", + "is_in_taxonomy" : 1, "percent_estimate" : 25, "percent_max" : 50, "percent_min" : 0, @@ -23,6 +25,7 @@ "vegetarian" : "maybe" } ], + "is_in_taxonomy" : 1, "percent_estimate" : 75, "percent_max" : 100, "percent_min" : 50, @@ -33,6 +36,7 @@ "ingredients" : [ { "id" : "en:e412", + "is_in_taxonomy" : 1, "percent_estimate" : 12.5, "percent_max" : 50, "percent_min" : 0, @@ -42,6 +46,7 @@ }, { "id" : "en:e410", + "is_in_taxonomy" : 1, "percent_estimate" : 12.5, "percent_max" : 25, "percent_min" : 0, @@ -50,6 +55,7 @@ "vegetarian" : "yes" } ], + "is_in_taxonomy" : 1, "percent_estimate" : 25, "percent_max" : 50, "percent_min" : 0, diff --git a/tests/unit/expected_test_results/ingredients/en-flavour-synonyms.json b/tests/unit/expected_test_results/ingredients/en-flavour-synonyms.json index 8f11888be2c29..e63c6403ea711 100644 --- a/tests/unit/expected_test_results/ingredients/en-flavour-synonyms.json +++ b/tests/unit/expected_test_results/ingredients/en-flavour-synonyms.json @@ -2,6 +2,7 @@ "ingredients" : [ { "id" : "en:natural-orange-flavouring", + "is_in_taxonomy" : 1, "percent_estimate" : 75, "percent_max" : 100, "percent_min" : 50, @@ -11,6 +12,7 @@ }, { "id" : "en:lemon-flavouring", + "is_in_taxonomy" : 1, "percent_estimate" : 25, "percent_max" : 50, "percent_min" : 0, diff --git a/tests/unit/expected_test_results/ingredients/en-fruits-sub-ingredients.json b/tests/unit/expected_test_results/ingredients/en-fruits-sub-ingredients.json index fae8dae081091..57efd6d5dc23e 100644 --- a/tests/unit/expected_test_results/ingredients/en-fruits-sub-ingredients.json +++ b/tests/unit/expected_test_results/ingredients/en-fruits-sub-ingredients.json @@ -6,6 +6,7 @@ { "ciqual_food_code" : "13050", "id" : "en:apple", + "is_in_taxonomy" : 1, "percent" : 20, "percent_estimate" : 20, "percent_max" : 20, @@ -16,6 +17,7 @@ }, { "id" : "en:pear", + "is_in_taxonomy" : 1, "percent" : 15, "percent_estimate" : 15, "percent_max" : 15, @@ -27,6 +29,7 @@ { "ciqual_food_code" : "13113", "id" : "en:cranberry", + "is_in_taxonomy" : 1, "percent_estimate" : 11.25, "percent_max" : 15, "percent_min" : 7.5, @@ -37,6 +40,7 @@ { "ciqual_proxy_food_code" : "13009", "id" : "en:lemon", + "is_in_taxonomy" : 1, "percent_estimate" : 3.75, "percent_max" : 7.5, "percent_min" : 0, @@ -45,6 +49,7 @@ "vegetarian" : "yes" } ], + "is_in_taxonomy" : 1, "percent" : 50, "percent_estimate" : 50, "percent_max" : 50, @@ -56,6 +61,7 @@ { "ciqual_proxy_food_code" : "31016", "id" : "en:sugar", + "is_in_taxonomy" : 1, "percent_estimate" : 50, "percent_max" : 50, "percent_min" : 50, diff --git a/tests/unit/expected_test_results/ingredients/en-illegal-division-by-zero.json b/tests/unit/expected_test_results/ingredients/en-illegal-division-by-zero.json index bf5e7207915d8..a223e2b6e68be 100644 --- a/tests/unit/expected_test_results/ingredients/en-illegal-division-by-zero.json +++ b/tests/unit/expected_test_results/ingredients/en-illegal-division-by-zero.json @@ -5,6 +5,7 @@ "ingredients" : [ { "id" : "en:paracetamol-500-m-5-060198-790", + "is_in_taxonomy" : 0, "percent_estimate" : 100, "percent_max" : 100, "percent_min" : 100, @@ -13,6 +14,7 @@ "text" : "paracetamol 500 m 5 060198 790" } ], + "is_in_taxonomy" : 0, "percent_estimate" : 100, "percent_max" : 100, "percent_min" : 100, diff --git a/tests/unit/expected_test_results/ingredients/en-ing1-and-ing2-processing-parenthesis.json b/tests/unit/expected_test_results/ingredients/en-ing1-and-ing2-processing-parenthesis.json index b6d3785a32eba..bf0a573e7dfc6 100644 --- a/tests/unit/expected_test_results/ingredients/en-ing1-and-ing2-processing-parenthesis.json +++ b/tests/unit/expected_test_results/ingredients/en-ing1-and-ing2-processing-parenthesis.json @@ -6,6 +6,7 @@ { "ciqual_food_code" : "13050", "id" : "en:apple", + "is_in_taxonomy" : 1, "percent_estimate" : 45.8333333333333, "percent_max" : 100, "percent_min" : 16.6666666666667, @@ -16,6 +17,7 @@ { "ciqual_food_code" : "13005", "id" : "en:banana", + "is_in_taxonomy" : 1, "percent_estimate" : 14.5833333333333, "percent_max" : 50, "percent_min" : 0, @@ -26,6 +28,7 @@ { "ciqual_food_code" : "13008", "id" : "en:cherry", + "is_in_taxonomy" : 1, "percent_estimate" : 14.5833333333333, "percent_max" : 33.3333333333333, "percent_min" : 0, @@ -35,6 +38,7 @@ "vegetarian" : "yes" } ], + "is_in_taxonomy" : 1, "percent_estimate" : 75, "percent_max" : 100, "percent_min" : 50, @@ -47,6 +51,7 @@ "ingredients" : [ { "id" : "en:avocado", + "is_in_taxonomy" : 1, "percent_estimate" : 12.5, "percent_max" : 50, "percent_min" : 0, @@ -58,6 +63,7 @@ { "ciqual_food_code" : "20089", "id" : "en:black-radish", + "is_in_taxonomy" : 1, "percent_estimate" : 12.5, "percent_max" : 25, "percent_min" : 0, @@ -67,6 +73,7 @@ "vegetarian" : "yes" } ], + "is_in_taxonomy" : 1, "percent_estimate" : 25, "percent_max" : 50, "percent_min" : 0, diff --git a/tests/unit/expected_test_results/ingredients/en-ing1-and-ing2-processing.json b/tests/unit/expected_test_results/ingredients/en-ing1-and-ing2-processing.json index e17af491c9c4c..9a7ea5c90f110 100644 --- a/tests/unit/expected_test_results/ingredients/en-ing1-and-ing2-processing.json +++ b/tests/unit/expected_test_results/ingredients/en-ing1-and-ing2-processing.json @@ -3,6 +3,7 @@ { "ciqual_food_code" : "13050", "id" : "en:apple", + "is_in_taxonomy" : 1, "percent_estimate" : 53.5714285714286, "percent_max" : 100, "percent_min" : 7.14285714285714, @@ -13,6 +14,7 @@ { "ciqual_food_code" : "13005", "id" : "en:banana", + "is_in_taxonomy" : 1, "percent_estimate" : 23.2142857142857, "percent_max" : 50, "percent_min" : 0, @@ -24,6 +26,7 @@ { "ciqual_food_code" : "13008", "id" : "en:cherry", + "is_in_taxonomy" : 1, "percent_estimate" : 11.6071428571429, "percent_max" : 33.3333333333333, "percent_min" : 0, @@ -34,6 +37,7 @@ { "ciqual_food_code" : "13011", "id" : "en:date", + "is_in_taxonomy" : 1, "percent_estimate" : 5.80357142857143, "percent_max" : 25, "percent_min" : 0, @@ -44,6 +48,7 @@ { "ciqual_food_code" : "13126", "id" : "en:elderberry", + "is_in_taxonomy" : 1, "percent_estimate" : 2.90178571428572, "percent_max" : 20, "percent_min" : 0, @@ -55,6 +60,7 @@ { "ciqual_food_code" : "13012", "id" : "en:fig", + "is_in_taxonomy" : 1, "percent_estimate" : 1.45089285714286, "percent_max" : 16.6666666666667, "percent_min" : 0, @@ -65,6 +71,7 @@ { "ciqual_food_code" : "13112", "id" : "en:grape", + "is_in_taxonomy" : 1, "percent_estimate" : 0.725446428571431, "percent_max" : 14.2857142857143, "percent_min" : 0, @@ -75,6 +82,7 @@ { "ciqual_food_code" : "13028", "id" : "en:bilberry", + "is_in_taxonomy" : 1, "percent_estimate" : 0.362723214285715, "percent_max" : 12.5, "percent_min" : 0, @@ -85,6 +93,7 @@ }, { "id" : "en:jackfruit", + "is_in_taxonomy" : 1, "percent_estimate" : 0.181361607142861, "percent_max" : 11.1111111111111, "percent_min" : 0, @@ -96,6 +105,7 @@ { "ciqual_food_code" : "13021", "id" : "en:kiwi", + "is_in_taxonomy" : 1, "percent_estimate" : 0.0906808035714306, "percent_max" : 10, "percent_min" : 0, @@ -106,6 +116,7 @@ }, { "id" : "en:lemon-and-unknown-fruit", + "is_in_taxonomy" : 0, "percent_estimate" : 0.0453404017857153, "percent_max" : 9.09090909090909, "percent_min" : 0, @@ -113,6 +124,7 @@ }, { "id" : "en:toasted-mango-and-unknown-fruit2", + "is_in_taxonomy" : 0, "percent_estimate" : 0.0226702008928612, "percent_max" : 8.33333333333333, "percent_min" : 0, @@ -120,6 +132,7 @@ }, { "id" : "en:nectarine-and-fried-unknown-fruit3", + "is_in_taxonomy" : 0, "percent_estimate" : 0.0113351004464306, "percent_max" : 7.69230769230769, "percent_min" : 0, @@ -127,6 +140,7 @@ }, { "id" : "en:puffed-orange-and-caramelized-unknown-fruit4", + "is_in_taxonomy" : 0, "percent_estimate" : 0.0113351004464306, "percent_max" : 7.14285714285714, "percent_min" : 0, diff --git a/tests/unit/expected_test_results/ingredients/en-ingredients-analysis-unknown-ingredients.json b/tests/unit/expected_test_results/ingredients/en-ingredients-analysis-unknown-ingredients.json index e76c0dd05a229..40c60dee485ed 100644 --- a/tests/unit/expected_test_results/ingredients/en-ingredients-analysis-unknown-ingredients.json +++ b/tests/unit/expected_test_results/ingredients/en-ingredients-analysis-unknown-ingredients.json @@ -3,6 +3,7 @@ { "ciqual_proxy_food_code" : "19051", "id" : "en:milk", + "is_in_taxonomy" : 1, "percent_estimate" : 56.25, "percent_max" : 100, "percent_min" : 12.5, @@ -12,6 +13,7 @@ }, { "id" : "en:some-unknown-ingredient", + "is_in_taxonomy" : 0, "percent_estimate" : 21.875, "percent_max" : 50, "percent_min" : 0, @@ -19,6 +21,7 @@ }, { "id" : "en:another-unknown-ingredient", + "is_in_taxonomy" : 0, "percent_estimate" : 10.9375, "percent_max" : 33.3333333333333, "percent_min" : 0, @@ -27,6 +30,7 @@ { "ciqual_food_code" : "11058", "id" : "en:salt", + "is_in_taxonomy" : 1, "percent_estimate" : 5.46875, "percent_max" : 25, "percent_min" : 0, @@ -37,6 +41,7 @@ { "ciqual_proxy_food_code" : "31016", "id" : "en:sugar", + "is_in_taxonomy" : 1, "percent_estimate" : 2.734375, "percent_max" : 20, "percent_min" : 0, @@ -47,6 +52,7 @@ { "ciqual_proxy_food_code" : "11015", "id" : "en:pepper", + "is_in_taxonomy" : 1, "percent_estimate" : 1.3671875, "percent_max" : 16.6666666666667, "percent_min" : 0, @@ -56,6 +62,7 @@ }, { "id" : "en:spice", + "is_in_taxonomy" : 1, "percent_estimate" : 0.68359375, "percent_max" : 14.2857142857143, "percent_min" : 0, @@ -66,6 +73,7 @@ { "ciqual_food_code" : "18066", "id" : "en:water", + "is_in_taxonomy" : 1, "percent_estimate" : 0.68359375, "percent_max" : 12.5, "percent_min" : 0, diff --git a/tests/unit/expected_test_results/ingredients/en-ingredients-in-parenthesis-that-are-in-the-allergens-taxonomy.json b/tests/unit/expected_test_results/ingredients/en-ingredients-in-parenthesis-that-are-in-the-allergens-taxonomy.json index f1764af186b04..93a0b97eb07ee 100644 --- a/tests/unit/expected_test_results/ingredients/en-ingredients-in-parenthesis-that-are-in-the-allergens-taxonomy.json +++ b/tests/unit/expected_test_results/ingredients/en-ingredients-in-parenthesis-that-are-in-the-allergens-taxonomy.json @@ -4,6 +4,7 @@ { "ciqual_proxy_food_code" : "16400", "id" : "en:butter", + "is_in_taxonomy" : 1, "percent_estimate" : 75, "percent_max" : 100, "percent_min" : 50, @@ -18,6 +19,7 @@ { "ciqual_food_code" : "12120", "id" : "en:parmigiano-reggiano", + "is_in_taxonomy" : 1, "percent_estimate" : 25, "percent_max" : 50, "percent_min" : 0, @@ -26,6 +28,7 @@ "vegetarian" : "maybe" } ], + "is_in_taxonomy" : 1, "percent_estimate" : 25, "percent_max" : 50, "percent_min" : 0, diff --git a/tests/unit/expected_test_results/ingredients/en-kosher.json b/tests/unit/expected_test_results/ingredients/en-kosher.json index 320c886e74c42..a65bcc66b010b 100644 --- a/tests/unit/expected_test_results/ingredients/en-kosher.json +++ b/tests/unit/expected_test_results/ingredients/en-kosher.json @@ -3,6 +3,7 @@ { "ciqual_food_code" : "11082", "id" : "en:sea-salt", + "is_in_taxonomy" : 1, "labels" : "en:kosher", "percent_estimate" : 66.6666666666667, "percent_max" : 100, @@ -14,6 +15,7 @@ { "ciqual_proxy_food_code" : "12999", "id" : "en:american-cheese", + "is_in_taxonomy" : 1, "labels" : "en:kosher", "percent_estimate" : 16.6666666666667, "percent_max" : 50, @@ -24,6 +26,7 @@ }, { "id" : "en:beef-gelatin", + "is_in_taxonomy" : 1, "labels" : "en:kosher", "percent_estimate" : 16.6666666666667, "percent_max" : 33.3333333333333, diff --git a/tests/unit/expected_test_results/ingredients/en-mechanicaly-separated-meat.json b/tests/unit/expected_test_results/ingredients/en-mechanicaly-separated-meat.json index 11516eaff4725..01eb5087e842f 100644 --- a/tests/unit/expected_test_results/ingredients/en-mechanicaly-separated-meat.json +++ b/tests/unit/expected_test_results/ingredients/en-mechanicaly-separated-meat.json @@ -2,6 +2,7 @@ "ingredients" : [ { "id" : "en:mechanicaly-separated-poultry-meat", + "is_in_taxonomy" : 0, "percent_estimate" : 100, "percent_max" : 100, "percent_min" : 100, diff --git a/tests/unit/expected_test_results/ingredients/en-nova-4-fruit-juice-concentrates.json b/tests/unit/expected_test_results/ingredients/en-nova-4-fruit-juice-concentrates.json index 2a0709cd376de..abb2dd21d8aaf 100644 --- a/tests/unit/expected_test_results/ingredients/en-nova-4-fruit-juice-concentrates.json +++ b/tests/unit/expected_test_results/ingredients/en-nova-4-fruit-juice-concentrates.json @@ -3,6 +3,7 @@ { "ciqual_food_code" : "2074", "id" : "en:apple-juice", + "is_in_taxonomy" : 1, "percent_estimate" : 100, "percent_max" : 100, "percent_min" : 100, diff --git a/tests/unit/expected_test_results/ingredients/en-origin-and.json b/tests/unit/expected_test_results/ingredients/en-origin-and.json index 6015bbf865d66..c28800e50ac35 100644 --- a/tests/unit/expected_test_results/ingredients/en-origin-and.json +++ b/tests/unit/expected_test_results/ingredients/en-origin-and.json @@ -3,6 +3,7 @@ { "ciqual_food_code" : "20047", "id" : "en:tomato", + "is_in_taxonomy" : 1, "origins" : "en:france,en:italy", "percent_estimate" : 100, "percent_max" : 100, diff --git a/tests/unit/expected_test_results/ingredients/en-origin-field-with-commas-and.json b/tests/unit/expected_test_results/ingredients/en-origin-field-with-commas-and.json index a8c1d67b53c1f..55c4c6f993b70 100644 --- a/tests/unit/expected_test_results/ingredients/en-origin-field-with-commas-and.json +++ b/tests/unit/expected_test_results/ingredients/en-origin-field-with-commas-and.json @@ -3,6 +3,7 @@ { "ciqual_proxy_food_code" : "19051", "id" : "en:milk", + "is_in_taxonomy" : 1, "origins" : "en:united-kingdom,en:european-union", "percent_estimate" : 75, "percent_max" : 100, @@ -14,6 +15,7 @@ { "ciqual_proxy_food_code" : "31016", "id" : "en:sugar", + "is_in_taxonomy" : 1, "origins" : "en:paraguay,en:uruguay,en:costa-rica", "percent_estimate" : 25, "percent_max" : 50, diff --git a/tests/unit/expected_test_results/ingredients/en-origin-field-with-commas.json b/tests/unit/expected_test_results/ingredients/en-origin-field-with-commas.json index e43173d1021aa..6eed74d45421c 100644 --- a/tests/unit/expected_test_results/ingredients/en-origin-field-with-commas.json +++ b/tests/unit/expected_test_results/ingredients/en-origin-field-with-commas.json @@ -3,6 +3,7 @@ { "ciqual_proxy_food_code" : "19051", "id" : "en:milk", + "is_in_taxonomy" : 1, "origins" : "en:belgium,en:spain", "percent_estimate" : 75, "percent_max" : 100, @@ -14,6 +15,7 @@ { "ciqual_proxy_food_code" : "31016", "id" : "en:sugar", + "is_in_taxonomy" : 1, "percent_estimate" : 25, "percent_max" : 50, "percent_min" : 0, diff --git a/tests/unit/expected_test_results/ingredients/en-origin-field-with-not-taxonomized-entries.json b/tests/unit/expected_test_results/ingredients/en-origin-field-with-not-taxonomized-entries.json index b8cb2b896769e..8cb22237e5cb0 100644 --- a/tests/unit/expected_test_results/ingredients/en-origin-field-with-not-taxonomized-entries.json +++ b/tests/unit/expected_test_results/ingredients/en-origin-field-with-not-taxonomized-entries.json @@ -2,6 +2,7 @@ "ingredients" : [ { "id" : "en:peach", + "is_in_taxonomy" : 1, "origins" : "en:spain", "percent_estimate" : 66.6666666666667, "percent_max" : 100, @@ -12,6 +13,7 @@ }, { "id" : "en:some-unknown-ingredient", + "is_in_taxonomy" : 0, "origins" : "en:france", "percent_estimate" : 16.6666666666667, "percent_max" : 50, @@ -20,6 +22,7 @@ }, { "id" : "en:another-unknown-ingredient", + "is_in_taxonomy" : 0, "origins" : "en:malta", "percent_estimate" : 16.6666666666667, "percent_max" : 33.3333333333333, diff --git a/tests/unit/expected_test_results/ingredients/en-origin-field.json b/tests/unit/expected_test_results/ingredients/en-origin-field.json index c9cc61591c277..9673f28ffee72 100644 --- a/tests/unit/expected_test_results/ingredients/en-origin-field.json +++ b/tests/unit/expected_test_results/ingredients/en-origin-field.json @@ -3,6 +3,7 @@ { "ciqual_food_code" : "13014", "id" : "en:strawberry", + "is_in_taxonomy" : 1, "origins" : "en:spain", "percent_estimate" : 58.3333333333333, "percent_max" : 100, @@ -14,6 +15,7 @@ { "ciqual_food_code" : "13015", "id" : "en:raspberry", + "is_in_taxonomy" : 1, "origins" : "en:new-caledonia", "percent_estimate" : 20.8333333333333, "percent_max" : 50, @@ -25,6 +27,7 @@ { "ciqual_food_code" : "13028", "id" : "en:blueberry", + "is_in_taxonomy" : 1, "origins" : "en:canada", "percent_estimate" : 10.4166666666667, "percent_max" : 33.3333333333333, @@ -36,6 +39,7 @@ { "ciqual_food_code" : "13020", "id" : "en:gooseberry", + "is_in_taxonomy" : 1, "percent_estimate" : 5.20833333333333, "percent_max" : 25, "percent_min" : 0, @@ -45,6 +49,7 @@ }, { "id" : "en:white-peach", + "is_in_taxonomy" : 1, "origins" : "en:mexico", "percent_estimate" : 2.60416666666666, "percent_max" : 20, @@ -56,6 +61,7 @@ { "ciqual_food_code" : "20041", "id" : "en:bell-pepper", + "is_in_taxonomy" : 1, "origins" : "en:guatemala", "percent_estimate" : 2.60416666666666, "percent_max" : 16.6666666666667, diff --git a/tests/unit/expected_test_results/ingredients/en-origin-ingredient-from-origin.json b/tests/unit/expected_test_results/ingredients/en-origin-ingredient-from-origin.json index e4eb9b8356062..962fcb3330771 100644 --- a/tests/unit/expected_test_results/ingredients/en-origin-ingredient-from-origin.json +++ b/tests/unit/expected_test_results/ingredients/en-origin-ingredient-from-origin.json @@ -3,6 +3,7 @@ { "ciqual_food_code" : "20087", "id" : "en:red-bell-pepper", + "is_in_taxonomy" : 1, "origins" : "en:spain,en:italy,en:france", "percent_estimate" : 75, "percent_max" : 100, @@ -14,6 +15,7 @@ { "ciqual_food_code" : "20168", "id" : "en:yellow-bell-pepper", + "is_in_taxonomy" : 1, "origins" : "en:south-america", "percent_estimate" : 25, "percent_max" : 50, diff --git a/tests/unit/expected_test_results/ingredients/en-origin-ingredient-origin-and-origin.json b/tests/unit/expected_test_results/ingredients/en-origin-ingredient-origin-and-origin.json index ce0c4c666f813..106a75bb2c1a9 100644 --- a/tests/unit/expected_test_results/ingredients/en-origin-ingredient-origin-and-origin.json +++ b/tests/unit/expected_test_results/ingredients/en-origin-ingredient-origin-and-origin.json @@ -3,6 +3,7 @@ { "ciqual_food_code" : "20087", "id" : "en:red-bell-pepper", + "is_in_taxonomy" : 1, "origins" : "en:spain,en:south-america", "percent_estimate" : 75, "percent_max" : 100, @@ -14,6 +15,7 @@ { "ciqual_food_code" : "20168", "id" : "en:yellow-bell-pepper", + "is_in_taxonomy" : 1, "origins" : "en:mexico,en:canada,en:california", "percent_estimate" : 25, "percent_max" : 50, diff --git a/tests/unit/expected_test_results/ingredients/en-origins-u.json b/tests/unit/expected_test_results/ingredients/en-origins-u.json index c3695d49af24a..79d8eecbddbae 100644 --- a/tests/unit/expected_test_results/ingredients/en-origins-u.json +++ b/tests/unit/expected_test_results/ingredients/en-origins-u.json @@ -5,12 +5,14 @@ "ingredients" : [ { "id" : "en:u", + "is_in_taxonomy" : 0, "percent_estimate" : 100, "percent_max" : 100, "percent_min" : 100, "text" : "U" } ], + "is_in_taxonomy" : 0, "percent_estimate" : 100, "percent_max" : 100, "percent_min" : 100, diff --git a/tests/unit/expected_test_results/ingredients/en-origins.json b/tests/unit/expected_test_results/ingredients/en-origins.json index 42345f3ebee99..49c9333a8f912 100644 --- a/tests/unit/expected_test_results/ingredients/en-origins.json +++ b/tests/unit/expected_test_results/ingredients/en-origins.json @@ -3,6 +3,7 @@ { "ciqual_food_code" : "15041", "id" : "en:almond", + "is_in_taxonomy" : 1, "origins" : "en:california", "percent_estimate" : 58.3333333333333, "percent_max" : 100, @@ -13,6 +14,7 @@ }, { "id" : "en:peach", + "is_in_taxonomy" : 1, "origins" : "en:south-carolina", "percent_estimate" : 20.8333333333333, "percent_max" : 50, @@ -24,6 +26,7 @@ { "ciqual_food_code" : "13186", "id" : "en:black-olive", + "is_in_taxonomy" : 1, "origins" : "en:south-carolina", "percent_estimate" : 10.4166666666667, "percent_max" : 33.3333333333333, @@ -35,6 +38,7 @@ { "ciqual_food_code" : "20047", "id" : "en:fresh-tomatoes", + "is_in_taxonomy" : 1, "origins" : "en:california", "percent_estimate" : 5.20833333333333, "percent_max" : 25, @@ -46,6 +50,7 @@ { "ciqual_proxy_food_code" : "13034", "id" : "en:orange", + "is_in_taxonomy" : 1, "origins" : "en:florida,en:united-states", "percent_estimate" : 2.60416666666666, "percent_max" : 20, @@ -57,6 +62,7 @@ { "ciqual_proxy_food_code" : "2070", "id" : "en:orange-juice", + "is_in_taxonomy" : 1, "origins" : "en:florida", "percent_estimate" : 2.60416666666666, "percent_max" : 16.6666666666667, diff --git a/tests/unit/expected_test_results/ingredients/en-quantity-of-ingredient.json b/tests/unit/expected_test_results/ingredients/en-quantity-of-ingredient.json index 21825b357cc04..5a07dd4d80686 100644 --- a/tests/unit/expected_test_results/ingredients/en-quantity-of-ingredient.json +++ b/tests/unit/expected_test_results/ingredients/en-quantity-of-ingredient.json @@ -3,6 +3,7 @@ { "ciqual_food_code" : "20047", "id" : "en:tomato", + "is_in_taxonomy" : 1, "percent_estimate" : 50, "percent_max" : 65, "percent_min" : 35, @@ -15,6 +16,7 @@ { "ciqual_food_code" : "11000", "id" : "en:garlic", + "is_in_taxonomy" : 1, "percent" : 35, "percent_estimate" : 35, "percent_max" : 35, @@ -26,6 +28,7 @@ { "ciqual_food_code" : "18066", "id" : "en:water", + "is_in_taxonomy" : 1, "percent_estimate" : 7.5, "percent_max" : 30, "percent_min" : 0, @@ -39,6 +42,7 @@ "ciqual_food_code" : "17130", "from_palm_oil" : "no", "id" : "en:rapeseed-oil", + "is_in_taxonomy" : 1, "percent_estimate" : 7.5, "percent_max" : 15, "percent_min" : 0, diff --git a/tests/unit/expected_test_results/ingredients/en-quantity-per-100g.json b/tests/unit/expected_test_results/ingredients/en-quantity-per-100g.json index 4fd7ec6118e5a..ba0e619bc801f 100644 --- a/tests/unit/expected_test_results/ingredients/en-quantity-per-100g.json +++ b/tests/unit/expected_test_results/ingredients/en-quantity-per-100g.json @@ -3,6 +3,7 @@ { "ciqual_food_code" : "20047", "id" : "en:tomato", + "is_in_taxonomy" : 1, "percent" : 42.5287356321839, "percent_estimate" : 42.5287356321839, "quantity" : "148 g", @@ -13,6 +14,7 @@ }, { "id" : "en:pork", + "is_in_taxonomy" : 1, "percent" : 57.4712643678161, "percent_estimate" : 57.4712643678161, "quantity" : "200 g", diff --git a/tests/unit/expected_test_results/ingredients/en-specific-ingredients-multiple-strings-of-one-ingredient.json b/tests/unit/expected_test_results/ingredients/en-specific-ingredients-multiple-strings-of-one-ingredient.json index e4ce28185e9a8..f2ea106a69918 100644 --- a/tests/unit/expected_test_results/ingredients/en-specific-ingredients-multiple-strings-of-one-ingredient.json +++ b/tests/unit/expected_test_results/ingredients/en-specific-ingredients-multiple-strings-of-one-ingredient.json @@ -3,6 +3,7 @@ { "ciqual_proxy_food_code" : "19051", "id" : "en:milk", + "is_in_taxonomy" : 1, "origins" : "en:united-kingdom", "percent_estimate" : 66.6666666666667, "percent_max" : 100, @@ -14,6 +15,7 @@ { "ciqual_food_code" : "19402", "id" : "en:cream", + "is_in_taxonomy" : 1, "percent_estimate" : 16.6666666666667, "percent_max" : 50, "percent_min" : 0, @@ -24,6 +26,7 @@ { "ciqual_proxy_food_code" : "31016", "id" : "en:sugar", + "is_in_taxonomy" : 1, "percent_estimate" : 16.6666666666667, "percent_max" : 33.3333333333333, "percent_min" : 0, diff --git a/tests/unit/expected_test_results/ingredients/en-specific-ingredients.json b/tests/unit/expected_test_results/ingredients/en-specific-ingredients.json index 8784ef42b4830..4be7ede66e735 100644 --- a/tests/unit/expected_test_results/ingredients/en-specific-ingredients.json +++ b/tests/unit/expected_test_results/ingredients/en-specific-ingredients.json @@ -3,6 +3,7 @@ { "ciqual_proxy_food_code" : "19051", "id" : "en:milk", + "is_in_taxonomy" : 1, "percent_estimate" : 66.6666666666667, "percent_max" : 100, "percent_min" : 33.3333333333333, @@ -13,6 +14,7 @@ { "ciqual_food_code" : "19402", "id" : "en:cream", + "is_in_taxonomy" : 1, "percent_estimate" : 16.6666666666667, "percent_max" : 50, "percent_min" : 0, @@ -23,6 +25,7 @@ { "ciqual_proxy_food_code" : "31016", "id" : "en:sugar", + "is_in_taxonomy" : 1, "percent_estimate" : 16.6666666666667, "percent_max" : 33.3333333333333, "percent_min" : 0, diff --git a/tests/unit/expected_test_results/ingredients/en-vegetal-ingredients.json b/tests/unit/expected_test_results/ingredients/en-vegetal-ingredients.json index efc216cbf7941..ef6985332b129 100644 --- a/tests/unit/expected_test_results/ingredients/en-vegetal-ingredients.json +++ b/tests/unit/expected_test_results/ingredients/en-vegetal-ingredients.json @@ -2,6 +2,7 @@ "ingredients" : [ { "id" : "en:e428", + "is_in_taxonomy" : 1, "labels" : "en:vegan", "percent_estimate" : 60, "percent_max" : 100, @@ -12,6 +13,7 @@ }, { "id" : "en:charcoal", + "is_in_taxonomy" : 0, "labels" : "en:vegan", "percent_estimate" : 20, "percent_max" : 50, @@ -22,6 +24,7 @@ }, { "id" : "en:ferment", + "is_in_taxonomy" : 1, "labels" : "en:vegan", "percent_estimate" : 10, "percent_max" : 33.3333333333333, @@ -32,6 +35,7 @@ }, { "id" : "en:rennet", + "is_in_taxonomy" : 1, "labels" : "en:vegan", "percent_estimate" : 5, "percent_max" : 25, @@ -42,6 +46,7 @@ }, { "id" : "en:flavouring", + "is_in_taxonomy" : 1, "labels" : "en:vegan", "percent_estimate" : 5, "percent_max" : "5", diff --git a/tests/unit/expected_test_results/ingredients/en-vitamin.json b/tests/unit/expected_test_results/ingredients/en-vitamin.json index 3b5331dd97959..ecf1a7b7af629 100644 --- a/tests/unit/expected_test_results/ingredients/en-vitamin.json +++ b/tests/unit/expected_test_results/ingredients/en-vitamin.json @@ -2,6 +2,7 @@ "ingredients" : [ { "id" : "en:vitamin-a", + "is_in_taxonomy" : 1, "percent_estimate" : 75, "percent_max" : 100, "percent_min" : 50, @@ -12,6 +13,7 @@ { "ciqual_food_code" : "11058", "id" : "en:salt", + "is_in_taxonomy" : 1, "percent_estimate" : 25, "percent_max" : 50, "percent_min" : 0, diff --git a/tests/unit/expected_test_results/ingredients/en-wheat-flour-organic-gluten-free.json b/tests/unit/expected_test_results/ingredients/en-wheat-flour-organic-gluten-free.json index 04fec6c5f0e03..7681c2691ca34 100644 --- a/tests/unit/expected_test_results/ingredients/en-wheat-flour-organic-gluten-free.json +++ b/tests/unit/expected_test_results/ingredients/en-wheat-flour-organic-gluten-free.json @@ -3,6 +3,7 @@ { "ciqual_proxy_food_code" : "9410", "id" : "en:wheat-flour", + "is_in_taxonomy" : 1, "percent_estimate" : 75, "percent_max" : 100, "percent_min" : 50, @@ -13,6 +14,7 @@ { "ciqual_proxy_food_code" : "26140", "id" : "en:fish", + "is_in_taxonomy" : 1, "labels" : "en:sustainable-seafood-msc", "percent_estimate" : 25, "percent_max" : 50, diff --git a/tests/unit/expected_test_results/ingredients/es-percent-loop.json b/tests/unit/expected_test_results/ingredients/es-percent-loop.json index 0de326b43c6d7..a15e32e2af30d 100644 --- a/tests/unit/expected_test_results/ingredients/es-percent-loop.json +++ b/tests/unit/expected_test_results/ingredients/es-percent-loop.json @@ -3,6 +3,7 @@ { "ciqual_food_code" : "20047", "id" : "en:tomato", + "is_in_taxonomy" : 1, "percent_estimate" : 62.125, "percent_max" : 68, "percent_min" : 56.25, @@ -13,6 +14,7 @@ { "ciqual_food_code" : "20041", "id" : "en:bell-pepper", + "is_in_taxonomy" : 1, "percent" : 12, "percent_estimate" : 12, "percent_max" : 12, @@ -24,6 +26,7 @@ { "ciqual_food_code" : "26053", "id" : "en:tuna", + "is_in_taxonomy" : 1, "percent" : 10, "percent_estimate" : 10, "percent_max" : 10, @@ -36,6 +39,7 @@ "ciqual_food_code" : "17270", "from_palm_oil" : "no", "id" : "en:extra-virgin-olive-oil", + "is_in_taxonomy" : 1, "percent" : 4, "percent_estimate" : 4, "percent_max" : 4, @@ -47,6 +51,7 @@ { "ciqual_food_code" : "22000", "id" : "en:egg", + "is_in_taxonomy" : 1, "percent" : 3, "percent_estimate" : 3, "percent_max" : 3, @@ -58,6 +63,7 @@ { "ciqual_food_code" : "20034", "id" : "en:onion", + "is_in_taxonomy" : 1, "percent" : 3, "percent_estimate" : 3, "percent_max" : 3, @@ -69,6 +75,7 @@ { "ciqual_proxy_food_code" : "31016", "id" : "en:sugar", + "is_in_taxonomy" : 1, "percent_estimate" : 1.5, "percent_max" : 3, "percent_min" : 0, @@ -79,6 +86,7 @@ { "ciqual_food_code" : "9510", "id" : "en:corn-starch", + "is_in_taxonomy" : 1, "percent_estimate" : 1.5, "percent_max" : 3, "percent_min" : 0, @@ -89,6 +97,7 @@ { "ciqual_food_code" : "11058", "id" : "en:salt", + "is_in_taxonomy" : 1, "percent_estimate" : 1.4375, "percent_max" : 3, "percent_min" : 0, @@ -101,6 +110,7 @@ "ingredients" : [ { "id" : "en:e330", + "is_in_taxonomy" : 1, "percent_estimate" : 1.4375, "percent_max" : 2.75, "percent_min" : 0, @@ -109,6 +119,7 @@ "vegetarian" : "yes" } ], + "is_in_taxonomy" : 1, "percent_estimate" : 1.4375, "percent_max" : 2.75, "percent_min" : 0, diff --git a/tests/unit/expected_test_results/ingredients/es-procedente-e-agricultura-biologica.json b/tests/unit/expected_test_results/ingredients/es-procedente-e-agricultura-biologica.json index ab193ef5a5c2f..aecd6bd8b0f4b 100644 --- a/tests/unit/expected_test_results/ingredients/es-procedente-e-agricultura-biologica.json +++ b/tests/unit/expected_test_results/ingredients/es-procedente-e-agricultura-biologica.json @@ -3,6 +3,7 @@ { "ciqual_food_code" : "19023", "id" : "en:pasteurised-whole-cow-s-milk", + "is_in_taxonomy" : 1, "labels" : "en:organic", "percent_estimate" : 75, "percent_max" : 100, @@ -13,6 +14,7 @@ }, { "id" : "en:kefir-lactic-ferments", + "is_in_taxonomy" : 1, "percent_estimate" : 25, "percent_max" : 50, "percent_min" : 0, diff --git a/tests/unit/expected_test_results/ingredients/fi-additive.json b/tests/unit/expected_test_results/ingredients/fi-additive.json index a0d37b3b6ead1..0d0c3651081de 100644 --- a/tests/unit/expected_test_results/ingredients/fi-additive.json +++ b/tests/unit/expected_test_results/ingredients/fi-additive.json @@ -5,6 +5,7 @@ "ingredients" : [ { "id" : "en:e440a", + "is_in_taxonomy" : 1, "percent_estimate" : 100, "percent_max" : 100, "percent_min" : 100, @@ -13,6 +14,7 @@ "vegetarian" : "yes" } ], + "is_in_taxonomy" : 1, "percent_estimate" : 100, "percent_max" : 100, "percent_min" : 100, diff --git a/tests/unit/expected_test_results/ingredients/fi-additives-origins.json b/tests/unit/expected_test_results/ingredients/fi-additives-origins.json index 24bf4edaabd46..3e33f158b7019 100644 --- a/tests/unit/expected_test_results/ingredients/fi-additives-origins.json +++ b/tests/unit/expected_test_results/ingredients/fi-additives-origins.json @@ -5,6 +5,7 @@ "ingredients" : [ { "id" : "en:sunflower-lecithin", + "is_in_taxonomy" : 1, "percent_estimate" : 33.5, "percent_max" : 34, "percent_min" : 33, @@ -13,6 +14,7 @@ "vegetarian" : "yes" } ], + "is_in_taxonomy" : 1, "percent_estimate" : 33.5, "percent_max" : 34, "percent_min" : 33, @@ -20,6 +22,7 @@ }, { "id" : "en:flavouring", + "is_in_taxonomy" : 1, "origins" : "en:european-union", "percent_estimate" : 33.25, "percent_max" : 33.5, @@ -31,6 +34,7 @@ { "ciqual_proxy_food_code" : "9410", "id" : "en:wheat-flour", + "is_in_taxonomy" : 1, "origins" : "en:france", "percent" : 33, "percent_estimate" : 33, @@ -43,6 +47,7 @@ { "ciqual_proxy_food_code" : "31016", "id" : "en:sugar", + "is_in_taxonomy" : 1, "percent_estimate" : 0.25, "percent_max" : 1, "percent_min" : 0, diff --git a/tests/unit/expected_test_results/ingredients/fi-additives-percents.json b/tests/unit/expected_test_results/ingredients/fi-additives-percents.json index 8d2949303fc1f..89e89a5434bb8 100644 --- a/tests/unit/expected_test_results/ingredients/fi-additives-percents.json +++ b/tests/unit/expected_test_results/ingredients/fi-additives-percents.json @@ -3,6 +3,7 @@ { "ciqual_proxy_food_code" : "9410", "id" : "en:flour", + "is_in_taxonomy" : 1, "percent" : 12, "percent_estimate" : 12, "text" : "jauho", @@ -15,6 +16,7 @@ { "ciqual_food_code" : "16030", "id" : "en:cocoa-butter", + "is_in_taxonomy" : 1, "percent_estimate" : 22, "text" : "kaakaovoi", "vegan" : "yes", @@ -23,6 +25,7 @@ { "ciqual_proxy_food_code" : "31016", "id" : "en:sugar", + "is_in_taxonomy" : 1, "percent_estimate" : 11, "text" : "sokeri", "vegan" : "yes", @@ -30,6 +33,7 @@ }, { "id" : "en:milk-proteins", + "is_in_taxonomy" : 1, "percent_estimate" : 5.5, "text" : "maitoproteiini", "vegan" : "no", @@ -38,12 +42,14 @@ { "ciqual_food_code" : "22000", "id" : "en:chicken-egg", + "is_in_taxonomy" : 1, "percent_estimate" : 5.5, "text" : "kananmuna", "vegan" : "no", "vegetarian" : "yes" } ], + "is_in_taxonomy" : 1, "percent_estimate" : 44, "text" : "suklaa", "vegan" : "maybe", @@ -54,18 +60,21 @@ "ingredients" : [ { "id" : "en:e463", + "is_in_taxonomy" : 1, "percent_estimate" : 22, "text" : "e463", "vegan" : "yes", "vegetarian" : "yes" } ], + "is_in_taxonomy" : 1, "percent_estimate" : 22, "text" : "emulgointiaineet" }, { "from_palm_oil" : "maybe", "id" : "en:e432", + "is_in_taxonomy" : 1, "percent_estimate" : 11, "text" : "e432", "vegan" : "maybe", @@ -74,6 +83,7 @@ { "from_palm_oil" : "maybe", "id" : "en:e472", + "is_in_taxonomy" : 1, "percent_estimate" : 5.5, "text" : "e472", "vegan" : "maybe", @@ -84,6 +94,7 @@ "ingredients" : [ { "id" : "en:e322", + "is_in_taxonomy" : 1, "percent_estimate" : 1.375, "text" : "e322", "vegan" : "maybe", @@ -91,17 +102,20 @@ }, { "id" : "en:e333", + "is_in_taxonomy" : 1, "percent_estimate" : 1.375, "text" : "e333", "vegan" : "yes", "vegetarian" : "yes" } ], + "is_in_taxonomy" : 1, "percent_estimate" : 2.75, "text" : "happamuudensäätöaineet" }, { "id" : "en:e474", + "is_in_taxonomy" : 1, "percent_estimate" : 1.375, "text" : "e474", "vegan" : "maybe", @@ -109,6 +123,7 @@ }, { "id" : "en:e475", + "is_in_taxonomy" : 1, "percent_estimate" : 0.6875, "text" : "e475", "vegan" : "maybe", @@ -119,6 +134,7 @@ "ingredients" : [ { "id" : "en:e330", + "is_in_taxonomy" : 1, "percent_estimate" : 0.171875, "text" : "sitruunahappo", "vegan" : "yes", @@ -126,18 +142,21 @@ }, { "id" : "en:e338", + "is_in_taxonomy" : 1, "percent_estimate" : 0.171875, "text" : "fosforihappo", "vegan" : "yes", "vegetarian" : "yes" } ], + "is_in_taxonomy" : 1, "percent_estimate" : 0.34375, "text" : "happo" }, { "ciqual_food_code" : "11058", "id" : "en:salt", + "is_in_taxonomy" : 1, "percent_estimate" : 0.34375, "text" : "suola", "vegan" : "yes", diff --git a/tests/unit/expected_test_results/ingredients/fi-do-not-match-myanmar.json b/tests/unit/expected_test_results/ingredients/fi-do-not-match-myanmar.json index 8e1048a6754da..a2f69d584a4b9 100644 --- a/tests/unit/expected_test_results/ingredients/fi-do-not-match-myanmar.json +++ b/tests/unit/expected_test_results/ingredients/fi-do-not-match-myanmar.json @@ -6,6 +6,7 @@ { "ciqual_proxy_food_code" : "11089", "id" : "en:turmeric", + "is_in_taxonomy" : 1, "percent_estimate" : 58.3333333333333, "percent_max" : 100, "percent_min" : 16.6666666666667, @@ -16,6 +17,7 @@ { "ciqual_food_code" : "11074", "id" : "en:ginger", + "is_in_taxonomy" : 1, "percent_estimate" : 20.8333333333333, "percent_max" : 50, "percent_min" : 0, @@ -26,6 +28,7 @@ { "ciqual_food_code" : "20041", "id" : "en:spice-or-bell-pepper", + "is_in_taxonomy" : 1, "percent_estimate" : 10.4166666666667, "percent_max" : 33.3333333333333, "percent_min" : 0, @@ -36,6 +39,7 @@ { "ciqual_food_code" : "11000", "id" : "en:garlic", + "is_in_taxonomy" : 1, "percent_estimate" : 5.20833333333333, "percent_max" : 25, "percent_min" : 0, @@ -45,6 +49,7 @@ }, { "id" : "en:coriander", + "is_in_taxonomy" : 1, "percent_estimate" : 2.60416666666666, "percent_max" : 20, "percent_min" : 0, @@ -55,6 +60,7 @@ { "ciqual_food_code" : "11013", "id" : "en:mustard-seed", + "is_in_taxonomy" : 1, "percent_estimate" : 2.60416666666666, "percent_max" : 16.6666666666667, "percent_min" : 0, @@ -63,6 +69,7 @@ "vegetarian" : "yes" } ], + "is_in_taxonomy" : 1, "percent_estimate" : 100, "percent_max" : 100, "percent_min" : 100, diff --git a/tests/unit/expected_test_results/ingredients/fi-labels.json b/tests/unit/expected_test_results/ingredients/fi-labels.json index cdbb26995c18e..bcb2c99197b65 100644 --- a/tests/unit/expected_test_results/ingredients/fi-labels.json +++ b/tests/unit/expected_test_results/ingredients/fi-labels.json @@ -3,6 +3,7 @@ { "ciqual_proxy_food_code" : "2070", "id" : "en:orange-juice", + "is_in_taxonomy" : 1, "labels" : "en:no-preservatives", "percent_estimate" : 75, "percent_max" : 100, @@ -14,6 +15,7 @@ { "ciqual_food_code" : "26036", "id" : "en:salmon", + "is_in_taxonomy" : 1, "labels" : "en:sustainable-seafood-msc", "percent_estimate" : 25, "percent_max" : 50, diff --git a/tests/unit/expected_test_results/ingredients/fi-organic-label-part-of-ingredient.json b/tests/unit/expected_test_results/ingredients/fi-organic-label-part-of-ingredient.json index 7d4993f0c04ef..b77b4218301b8 100644 --- a/tests/unit/expected_test_results/ingredients/fi-organic-label-part-of-ingredient.json +++ b/tests/unit/expected_test_results/ingredients/fi-organic-label-part-of-ingredient.json @@ -3,6 +3,7 @@ { "ciqual_food_code" : "18155", "id" : "en:green-tea", + "is_in_taxonomy" : 1, "labels" : "en:organic", "percent_estimate" : 66.6666666666667, "percent_max" : 100, @@ -14,6 +15,7 @@ { "ciqual_proxy_food_code" : "19051", "id" : "en:milk", + "is_in_taxonomy" : 1, "labels" : "en:organic", "percent_estimate" : 16.6666666666667, "percent_max" : 50, @@ -24,6 +26,7 @@ }, { "id" : "en:malted-barley", + "is_in_taxonomy" : 1, "labels" : "en:organic", "percent_estimate" : 16.6666666666667, "percent_max" : 33.3333333333333, diff --git a/tests/unit/expected_test_results/ingredients/fi-origins.json b/tests/unit/expected_test_results/ingredients/fi-origins.json index 924465c45b7b3..4258a18b2c28f 100644 --- a/tests/unit/expected_test_results/ingredients/fi-origins.json +++ b/tests/unit/expected_test_results/ingredients/fi-origins.json @@ -3,6 +3,7 @@ { "ciqual_food_code" : "13014", "id" : "en:strawberry", + "is_in_taxonomy" : 1, "origins" : "en:finland", "percent_estimate" : 58.3333333333333, "percent_max" : 100, @@ -14,6 +15,7 @@ { "ciqual_food_code" : "13007", "id" : "en:blackcurrant", + "is_in_taxonomy" : 1, "origins" : "en:south-africa", "percent_estimate" : 20.8333333333333, "percent_max" : 50, @@ -25,6 +27,7 @@ { "ciqual_food_code" : "13015", "id" : "en:raspberry", + "is_in_taxonomy" : 1, "origins" : "en:sweden", "percent_estimate" : 10.4166666666667, "percent_max" : 33.3333333333333, @@ -36,6 +39,7 @@ { "ciqual_proxy_food_code" : "13034", "id" : "en:orange", + "is_in_taxonomy" : 1, "labels" : "en:organic", "percent_estimate" : 5.20833333333333, "percent_max" : 25, @@ -47,6 +51,7 @@ { "ciqual_proxy_food_code" : "18100", "id" : "en:cocoa", + "is_in_taxonomy" : 1, "labels" : "en:fair-trade", "percent_estimate" : 2.60416666666666, "percent_max" : 20, @@ -58,6 +63,7 @@ { "ciqual_food_code" : "16030", "id" : "en:cocoa-butter", + "is_in_taxonomy" : 1, "labels" : "en:fair-trade", "percent_estimate" : 2.60416666666666, "percent_max" : 16.6666666666667, diff --git a/tests/unit/expected_test_results/ingredients/fi-percents.json b/tests/unit/expected_test_results/ingredients/fi-percents.json index 27c19281aad1c..21c7630022569 100644 --- a/tests/unit/expected_test_results/ingredients/fi-percents.json +++ b/tests/unit/expected_test_results/ingredients/fi-percents.json @@ -3,6 +3,7 @@ { "ciqual_food_code" : "13014", "id" : "en:strawberry", + "is_in_taxonomy" : 1, "percent" : 55.1569506726457, "percent_estimate" : 55.1569506726457, "percent_max" : 55.1569506726457, @@ -14,6 +15,7 @@ { "ciqual_proxy_food_code" : "13034", "id" : "en:orange", + "is_in_taxonomy" : 1, "percent" : 29.1479820627803, "percent_estimate" : 29.1479820627803, "percent_max" : 29.1479820627803, @@ -25,6 +27,7 @@ { "ciqual_food_code" : "13050", "id" : "en:apple", + "is_in_taxonomy" : 1, "percent" : 15.695067264574, "percent_estimate" : 15.695067264574, "percent_max" : 15.695067264574, diff --git a/tests/unit/expected_test_results/ingredients/fr-additive.json b/tests/unit/expected_test_results/ingredients/fr-additive.json index e100e0c3638c2..ea5031c0c5006 100644 --- a/tests/unit/expected_test_results/ingredients/fr-additive.json +++ b/tests/unit/expected_test_results/ingredients/fr-additive.json @@ -5,6 +5,7 @@ "ingredients" : [ { "id" : "en:e440a", + "is_in_taxonomy" : 1, "percent_estimate" : 100, "percent_max" : 100, "percent_min" : 100, @@ -13,6 +14,7 @@ "vegetarian" : "yes" } ], + "is_in_taxonomy" : 1, "percent_estimate" : 100, "percent_max" : 100, "percent_min" : 100, diff --git a/tests/unit/expected_test_results/ingredients/fr-cacao-issu-de-l-agriculture-biologique-de-madagascar.json b/tests/unit/expected_test_results/ingredients/fr-cacao-issu-de-l-agriculture-biologique-de-madagascar.json index 723b9ec13def5..fed1026f31099 100644 --- a/tests/unit/expected_test_results/ingredients/fr-cacao-issu-de-l-agriculture-biologique-de-madagascar.json +++ b/tests/unit/expected_test_results/ingredients/fr-cacao-issu-de-l-agriculture-biologique-de-madagascar.json @@ -3,6 +3,7 @@ { "ciqual_proxy_food_code" : "18100", "id" : "en:cocoa", + "is_in_taxonomy" : 1, "labels" : "en:organic", "origins" : "en:madagascar", "percent_estimate" : 100, diff --git a/tests/unit/expected_test_results/ingredients/fr-chocolate-cake.json b/tests/unit/expected_test_results/ingredients/fr-chocolate-cake.json index 36599550e2a8b..358ab042e2175 100644 --- a/tests/unit/expected_test_results/ingredients/fr-chocolate-cake.json +++ b/tests/unit/expected_test_results/ingredients/fr-chocolate-cake.json @@ -3,6 +3,7 @@ { "ciqual_proxy_food_code" : "9410", "id" : "en:flour", + "is_in_taxonomy" : 1, "percent" : 12, "percent_estimate" : 12, "text" : "farine", @@ -15,6 +16,7 @@ { "ciqual_food_code" : "16030", "id" : "en:cocoa-butter", + "is_in_taxonomy" : 1, "percent_estimate" : 22, "text" : "beurre de cacao", "vegan" : "yes", @@ -23,6 +25,7 @@ { "ciqual_proxy_food_code" : "31016", "id" : "en:sugar", + "is_in_taxonomy" : 1, "percent_estimate" : 11, "text" : "sucre", "vegan" : "yes", @@ -30,6 +33,7 @@ }, { "id" : "en:milk-proteins", + "is_in_taxonomy" : 1, "percent_estimate" : 5.5, "text" : "protéines de lait", "vegan" : "no", @@ -38,12 +42,14 @@ { "ciqual_food_code" : "22000", "id" : "en:egg", + "is_in_taxonomy" : 1, "percent_estimate" : 5.5, "text" : "oeuf", "vegan" : "no", "vegetarian" : "yes" } ], + "is_in_taxonomy" : 1, "percent_estimate" : 44, "text" : "chocolat", "vegan" : "maybe", @@ -54,18 +60,21 @@ "ingredients" : [ { "id" : "en:e463", + "is_in_taxonomy" : 1, "percent_estimate" : 22, "text" : "e463", "vegan" : "yes", "vegetarian" : "yes" } ], + "is_in_taxonomy" : 1, "percent_estimate" : 22, "text" : "émulsifiants" }, { "from_palm_oil" : "maybe", "id" : "en:e432", + "is_in_taxonomy" : 1, "percent_estimate" : 11, "text" : "e432", "vegan" : "maybe", @@ -74,6 +83,7 @@ { "from_palm_oil" : "maybe", "id" : "en:e472", + "is_in_taxonomy" : 1, "percent_estimate" : 5.5, "text" : "e472", "vegan" : "maybe", @@ -84,6 +94,7 @@ "ingredients" : [ { "id" : "en:e322", + "is_in_taxonomy" : 1, "percent_estimate" : 1.375, "text" : "e322", "vegan" : "maybe", @@ -91,17 +102,20 @@ }, { "id" : "en:e333", + "is_in_taxonomy" : 1, "percent_estimate" : 1.375, "text" : "e333", "vegan" : "yes", "vegetarian" : "yes" } ], + "is_in_taxonomy" : 1, "percent_estimate" : 2.75, "text" : "correcteurs d'acidité" }, { "id" : "en:e474", + "is_in_taxonomy" : 1, "percent_estimate" : 1.375, "text" : "e474", "vegan" : "maybe", @@ -109,6 +123,7 @@ }, { "id" : "en:e475", + "is_in_taxonomy" : 1, "percent_estimate" : 0.6875, "text" : "e475", "vegan" : "maybe", @@ -119,6 +134,7 @@ "ingredients" : [ { "id" : "en:e330", + "is_in_taxonomy" : 1, "percent_estimate" : 0.171875, "text" : "acide citrique", "vegan" : "yes", @@ -126,18 +142,21 @@ }, { "id" : "en:e338", + "is_in_taxonomy" : 1, "percent_estimate" : 0.171875, "text" : "acide phosphorique", "vegan" : "yes", "vegetarian" : "yes" } ], + "is_in_taxonomy" : 1, "percent_estimate" : 0.34375, "text" : "acidifiant" }, { "ciqual_food_code" : "11058", "id" : "en:salt", + "is_in_taxonomy" : 1, "percent_estimate" : 0.34375, "text" : "sel", "vegan" : "yes", diff --git a/tests/unit/expected_test_results/ingredients/fr-epices-irradiees.json b/tests/unit/expected_test_results/ingredients/fr-epices-irradiees.json index 987eb46fd2389..cd6bfdf84eaf5 100644 --- a/tests/unit/expected_test_results/ingredients/fr-epices-irradiees.json +++ b/tests/unit/expected_test_results/ingredients/fr-epices-irradiees.json @@ -2,6 +2,7 @@ "ingredients" : [ { "id" : "en:spice", + "is_in_taxonomy" : 1, "percent_estimate" : 66.6666666666667, "percent_max" : 100, "percent_min" : 33.3333333333333, @@ -13,6 +14,7 @@ { "ciqual_food_code" : "15010", "id" : "en:sesame", + "is_in_taxonomy" : 1, "labels" : "en:irradiated", "percent_estimate" : 16.6666666666667, "percent_max" : 50, @@ -24,6 +26,7 @@ { "ciqual_food_code" : "11070", "id" : "en:thyme", + "is_in_taxonomy" : 1, "percent_estimate" : 16.6666666666667, "percent_max" : 33.3333333333333, "percent_min" : 0, diff --git a/tests/unit/expected_test_results/ingredients/fr-farines-labels-and-processes.json b/tests/unit/expected_test_results/ingredients/fr-farines-labels-and-processes.json index 4ba691a916058..ee91112e8b368 100644 --- a/tests/unit/expected_test_results/ingredients/fr-farines-labels-and-processes.json +++ b/tests/unit/expected_test_results/ingredients/fr-farines-labels-and-processes.json @@ -3,6 +3,7 @@ { "ciqual_proxy_food_code" : "9410", "id" : "en:wheat-flour", + "is_in_taxonomy" : 1, "labels" : "fr:crc", "percent_estimate" : 62.5, "percent_max" : 100, @@ -14,6 +15,7 @@ { "ciqual_food_code" : "9200", "id" : "en:corn", + "is_in_taxonomy" : 1, "percent_estimate" : 18.75, "percent_max" : 50, "percent_min" : 0, @@ -25,6 +27,7 @@ { "ciqual_proxy_food_code" : "9410", "id" : "en:flour", + "is_in_taxonomy" : 1, "labels" : "en:no-gluten", "percent_estimate" : 9.375, "percent_max" : 33.3333333333333, @@ -36,6 +39,7 @@ { "ciqual_proxy_food_code" : "9410", "id" : "en:einkorn-wheat", + "is_in_taxonomy" : 1, "percent_estimate" : 9.375, "percent_max" : 25, "percent_min" : 0, diff --git a/tests/unit/expected_test_results/ingredients/fr-halal.json b/tests/unit/expected_test_results/ingredients/fr-halal.json index 04f4646258808..5116cc80e370a 100644 --- a/tests/unit/expected_test_results/ingredients/fr-halal.json +++ b/tests/unit/expected_test_results/ingredients/fr-halal.json @@ -2,6 +2,7 @@ "ingredients" : [ { "id" : "en:meat", + "is_in_taxonomy" : 1, "labels" : "en:halal", "percent_estimate" : 62.5, "percent_max" : 100, @@ -12,6 +13,7 @@ }, { "id" : "en:beef-gelatin", + "is_in_taxonomy" : 1, "labels" : "en:halal", "percent_estimate" : 18.75, "percent_max" : 50, @@ -22,6 +24,7 @@ }, { "id" : "en:collagen", + "is_in_taxonomy" : 1, "labels" : "en:halal", "percent_estimate" : 9.375, "percent_max" : 33.3333333333333, @@ -33,6 +36,7 @@ { "ciqual_food_code" : "40121", "id" : "en:duck-foie-gras", + "is_in_taxonomy" : 1, "labels" : "en:halal", "percent_estimate" : 9.375, "percent_max" : 25, diff --git a/tests/unit/expected_test_results/ingredients/fr-huile-de-palme-certifiee-durable.json b/tests/unit/expected_test_results/ingredients/fr-huile-de-palme-certifiee-durable.json index 9f86a67b21cba..54506a9b09af4 100644 --- a/tests/unit/expected_test_results/ingredients/fr-huile-de-palme-certifiee-durable.json +++ b/tests/unit/expected_test_results/ingredients/fr-huile-de-palme-certifiee-durable.json @@ -8,6 +8,7 @@ "ciqual_food_code" : "16129", "from_palm_oil" : "yes", "id" : "en:palm-oil", + "is_in_taxonomy" : 1, "labels" : "en:sustainable-palm-oil", "percent_estimate" : 75, "percent_max" : 100, @@ -20,6 +21,7 @@ "ciqual_food_code" : "17130", "from_palm_oil" : "no", "id" : "en:colza-oil", + "is_in_taxonomy" : 1, "percent_estimate" : 25, "percent_max" : 50, "percent_min" : 0, @@ -28,6 +30,7 @@ "vegetarian" : "yes" } ], + "is_in_taxonomy" : 1, "percent_estimate" : 100, "percent_max" : 100, "percent_min" : 100, diff --git a/tests/unit/expected_test_results/ingredients/fr-illegal-division-by-zero.json b/tests/unit/expected_test_results/ingredients/fr-illegal-division-by-zero.json index 494bc6a7b3615..26686a46866fa 100644 --- a/tests/unit/expected_test_results/ingredients/fr-illegal-division-by-zero.json +++ b/tests/unit/expected_test_results/ingredients/fr-illegal-division-by-zero.json @@ -5,12 +5,14 @@ "ingredients" : [ { "id" : "fr:1472-kj", + "is_in_taxonomy" : 0, "percent_estimate" : 100, "percent_max" : 100, "percent_min" : 100, "text" : "1472 kJ" } ], + "is_in_taxonomy" : 0, "percent_estimate" : 100, "percent_max" : 100, "percent_min" : 100, diff --git a/tests/unit/expected_test_results/ingredients/fr-infinite-loop-allergens.json b/tests/unit/expected_test_results/ingredients/fr-infinite-loop-allergens.json index 6481f4931a95d..7c615421383d8 100644 --- a/tests/unit/expected_test_results/ingredients/fr-infinite-loop-allergens.json +++ b/tests/unit/expected_test_results/ingredients/fr-infinite-loop-allergens.json @@ -4,6 +4,7 @@ { "ciqual_proxy_food_code" : "31016", "id" : "en:sugar", + "is_in_taxonomy" : 1, "percent_estimate" : 50, "text" : "Sucre", "vegan" : "yes", @@ -12,6 +13,7 @@ { "ciqual_food_code" : "19021", "id" : "en:whole-milk-powder", + "is_in_taxonomy" : 1, "percent" : 25, "percent_estimate" : 25, "text" : "LAIT* entier en poudre", @@ -22,6 +24,7 @@ "ciqual_proxy_food_code" : "16129", "from_palm_oil" : "yes", "id" : "en:palm-fat", + "is_in_taxonomy" : 1, "percent_estimate" : 12.5, "text" : "graisse végétale de palme", "vegan" : "yes", @@ -30,6 +33,7 @@ { "from_palm_oil" : "yes", "id" : "en:palm-kernel-fat", + "is_in_taxonomy" : 1, "percent_estimate" : 6.25, "text" : "graisse végétale de palmiste", "vegan" : "yes", @@ -37,17 +41,20 @@ }, { "id" : "fr:beurre-de-cacao1", + "is_in_taxonomy" : 0, "percent_estimate" : 3.125, "text" : "beurre de cacao1" }, { "id" : "fr:pate-de-cacao1", + "is_in_taxonomy" : 0, "percent_estimate" : 1.5625, "text" : "pâte de cacao1" }, { "ciqual_food_code" : "19054", "id" : "en:skimmed-milk-powder", + "is_in_taxonomy" : 1, "percent" : 3, "percent_estimate" : 1.5625, "text" : "LAIT* écrémé en poudre", @@ -58,6 +65,7 @@ "ciqual_food_code" : "17440", "from_palm_oil" : "no", "id" : "en:sunflower-oil", + "is_in_taxonomy" : 1, "percent_estimate" : 0, "text" : "huile de tournesol", "vegan" : "yes", @@ -68,17 +76,20 @@ "ingredients" : [ { "id" : "en:e322", + "is_in_taxonomy" : 1, "percent_estimate" : 0, "text" : "lécithines", "vegan" : "maybe", "vegetarian" : "maybe" } ], + "is_in_taxonomy" : 1, "percent_estimate" : 0, "text" : "émulsifiant" }, { "id" : "en:vanilla-flavouring", + "is_in_taxonomy" : 1, "percent_estimate" : 0, "text" : "arômes de vanille", "vegan" : "maybe", @@ -87,6 +98,7 @@ { "ciqual_proxy_food_code" : "18100", "id" : "en:cocoa", + "is_in_taxonomy" : 1, "percent" : 30, "percent_estimate" : 0, "text" : "Cacao", diff --git a/tests/unit/expected_test_results/ingredients/fr-ingredients-in-parenthesis-that-are-in-the-allergens-taxonomy.json b/tests/unit/expected_test_results/ingredients/fr-ingredients-in-parenthesis-that-are-in-the-allergens-taxonomy.json index a38d146645e61..ae2dfab604b03 100644 --- a/tests/unit/expected_test_results/ingredients/fr-ingredients-in-parenthesis-that-are-in-the-allergens-taxonomy.json +++ b/tests/unit/expected_test_results/ingredients/fr-ingredients-in-parenthesis-that-are-in-the-allergens-taxonomy.json @@ -4,6 +4,7 @@ { "ciqual_proxy_food_code" : "16400", "id" : "en:butter", + "is_in_taxonomy" : 1, "percent_estimate" : 75, "percent_max" : 100, "percent_min" : 50, @@ -18,6 +19,7 @@ { "ciqual_food_code" : "12120", "id" : "en:parmigiano-reggiano", + "is_in_taxonomy" : 1, "percent_estimate" : 25, "percent_max" : 50, "percent_min" : 0, @@ -26,6 +28,7 @@ "vegetarian" : "maybe" } ], + "is_in_taxonomy" : 1, "percent_estimate" : 25, "percent_max" : 50, "percent_min" : 0, diff --git a/tests/unit/expected_test_results/ingredients/fr-label-and-multiple-origins.json b/tests/unit/expected_test_results/ingredients/fr-label-and-multiple-origins.json index 6f513c97e93c6..ae126de95902a 100644 --- a/tests/unit/expected_test_results/ingredients/fr-label-and-multiple-origins.json +++ b/tests/unit/expected_test_results/ingredients/fr-label-and-multiple-origins.json @@ -6,6 +6,7 @@ "ingredients" : [ { "id" : "fr:d-elevage-au-sol", + "is_in_taxonomy" : 0, "percent_estimate" : 66.6666666666667, "percent_max" : 100, "percent_min" : 33.3333333333333, @@ -13,6 +14,7 @@ }, { "id" : "fr:suisse", + "is_in_taxonomy" : 0, "percent_estimate" : 16.6666666666667, "percent_max" : 50, "percent_min" : 0, @@ -20,12 +22,14 @@ }, { "id" : "fr:france", + "is_in_taxonomy" : 0, "percent_estimate" : 16.6666666666667, "percent_max" : 33.3333333333333, "percent_min" : 0, "text" : "France" } ], + "is_in_taxonomy" : 1, "percent_estimate" : 100, "percent_max" : 100, "percent_min" : 100, diff --git a/tests/unit/expected_test_results/ingredients/fr-labels.json b/tests/unit/expected_test_results/ingredients/fr-labels.json index fc92f29735a84..fd6ee746dec2d 100644 --- a/tests/unit/expected_test_results/ingredients/fr-labels.json +++ b/tests/unit/expected_test_results/ingredients/fr-labels.json @@ -3,6 +3,7 @@ { "ciqual_proxy_food_code" : "2070", "id" : "en:orange-juice", + "is_in_taxonomy" : 1, "labels" : "en:no-preservatives", "percent_estimate" : 75, "percent_max" : 100, @@ -14,6 +15,7 @@ { "ciqual_food_code" : "26036", "id" : "en:salmon", + "is_in_taxonomy" : 1, "labels" : "en:sustainable-seafood-msc", "percent_estimate" : 25, "percent_max" : 50, diff --git a/tests/unit/expected_test_results/ingredients/fr-legumes-issus-de-l-agriculture-durable.json b/tests/unit/expected_test_results/ingredients/fr-legumes-issus-de-l-agriculture-durable.json index f44893b8f2a9d..13b6cd99ca3cc 100644 --- a/tests/unit/expected_test_results/ingredients/fr-legumes-issus-de-l-agriculture-durable.json +++ b/tests/unit/expected_test_results/ingredients/fr-legumes-issus-de-l-agriculture-durable.json @@ -2,6 +2,7 @@ "ingredients" : [ { "id" : "en:vegetable", + "is_in_taxonomy" : 1, "labels" : "en:sustainable-farming", "percent_estimate" : 100, "percent_max" : 100, diff --git a/tests/unit/expected_test_results/ingredients/fr-marmelade.json b/tests/unit/expected_test_results/ingredients/fr-marmelade.json index 5109f71dfdae7..810dcccdb1864 100644 --- a/tests/unit/expected_test_results/ingredients/fr-marmelade.json +++ b/tests/unit/expected_test_results/ingredients/fr-marmelade.json @@ -7,6 +7,7 @@ { "ciqual_food_code" : "31077", "id" : "en:glucose-fructose-syrup", + "is_in_taxonomy" : 1, "percent_estimate" : 20.5, "text" : "sirop de glucose-fructose", "vegan" : "yes", @@ -15,6 +16,7 @@ { "ciqual_proxy_food_code" : "31016", "id" : "en:sugar", + "is_in_taxonomy" : 1, "percent_estimate" : 10.25, "text" : "sucre", "vegan" : "yes", @@ -23,6 +25,7 @@ { "ciqual_food_code" : "13034", "id" : "en:orange-pulp", + "is_in_taxonomy" : 1, "percent" : 4.5, "percent_estimate" : 4.5, "text" : "pulpe d'orange", @@ -33,6 +36,7 @@ "ciqual_proxy_food_code" : "2070", "id" : "en:concentrated-orange-juice", "ingredients" : [], + "is_in_taxonomy" : 1, "percent" : 1.4, "percent_estimate" : 1.4, "text" : "jus d'orange concentré", @@ -43,6 +47,7 @@ "ciqual_proxy_food_code" : "13034", "id" : "en:orange", "ingredients" : [], + "is_in_taxonomy" : 1, "percent" : 0.6, "percent_estimate" : 0.6, "processing" : "en:pulp,en:concentrated", @@ -55,12 +60,14 @@ "ingredients" : [ { "id" : "en:e440a", + "is_in_taxonomy" : 1, "percent_estimate" : 1.875, "text" : "pectines", "vegan" : "yes", "vegetarian" : "yes" } ], + "is_in_taxonomy" : 1, "percent_estimate" : 1.875, "text" : "gélifiant" }, @@ -69,12 +76,14 @@ "ingredients" : [ { "id" : "en:e330", + "is_in_taxonomy" : 1, "percent_estimate" : 0.9375, "text" : "acide citrique", "vegan" : "yes", "vegetarian" : "yes" } ], + "is_in_taxonomy" : 1, "percent_estimate" : 0.9375, "text" : "acidifiant" }, @@ -83,6 +92,7 @@ "ingredients" : [ { "id" : "en:e333", + "is_in_taxonomy" : 1, "percent_estimate" : 0.234375, "text" : "citrate de calcium", "vegan" : "yes", @@ -90,15 +100,18 @@ }, { "id" : "en:sodium-citrate", + "is_in_taxonomy" : 1, "percent_estimate" : 0.234375, "text" : "citrate de sodium" } ], + "is_in_taxonomy" : 1, "percent_estimate" : 0.46875, "text" : "correcteurs d'acidité" }, { "id" : "en:natural-orange-flavouring", + "is_in_taxonomy" : 1, "percent_estimate" : 0.234375, "text" : "arôme naturel d'orange", "vegan" : "maybe", @@ -109,16 +122,19 @@ "ingredients" : [ { "id" : "en:e415", + "is_in_taxonomy" : 1, "percent_estimate" : 0.234375, "text" : "gomme xanthane", "vegan" : "yes", "vegetarian" : "yes" } ], + "is_in_taxonomy" : 1, "percent_estimate" : 0.234375, "text" : "épaississant" } ], + "is_in_taxonomy" : 1, "percent" : 41, "percent_estimate" : 41, "text" : "Marmelade d'oranges" @@ -129,6 +145,7 @@ { "ciqual_proxy_food_code" : "31016", "id" : "en:sugar", + "is_in_taxonomy" : 1, "percent_estimate" : 12.45, "text" : "sucre", "vegan" : "yes", @@ -137,6 +154,7 @@ { "ciqual_proxy_food_code" : "16030", "id" : "en:cocoa-paste", + "is_in_taxonomy" : 1, "percent_estimate" : 6.225, "text" : "pâte de cacao", "vegan" : "yes", @@ -145,6 +163,7 @@ { "ciqual_food_code" : "16030", "id" : "en:cocoa-butter", + "is_in_taxonomy" : 1, "percent_estimate" : 3.1125, "text" : "beurre de cacao", "vegan" : "yes", @@ -153,6 +172,7 @@ { "from_palm_oil" : "no", "id" : "en:illipe-oil", + "is_in_taxonomy" : 1, "percent_estimate" : 1.55625, "text" : "graisses végétales d'illipe", "vegan" : "yes", @@ -161,6 +181,7 @@ { "from_palm_oil" : "no", "id" : "en:mango-kernel-oil", + "is_in_taxonomy" : 1, "percent_estimate" : 0.778124999999999, "text" : "graisses végétales de mangue", "vegan" : "yes", @@ -169,6 +190,7 @@ { "from_palm_oil" : "no", "id" : "en:shorea-robusta-seed-oil", + "is_in_taxonomy" : 1, "percent_estimate" : 0.3890625, "text" : "graisses végétales de sal", "vegan" : "yes", @@ -178,6 +200,7 @@ "ciqual_food_code" : "16110", "from_palm_oil" : "no", "id" : "en:shea-butter", + "is_in_taxonomy" : 1, "percent_estimate" : 0.194531250000001, "text" : "graisses végétales de karité", "vegan" : "yes", @@ -187,6 +210,7 @@ "ciqual_proxy_food_code" : "16129", "from_palm_oil" : "yes", "id" : "en:palm-fat", + "is_in_taxonomy" : 1, "percent_estimate" : 0.0972656250000004, "text" : "graisses végétales de palme", "vegan" : "yes", @@ -194,6 +218,7 @@ }, { "id" : "en:flavouring", + "is_in_taxonomy" : 1, "percent_estimate" : 0.0486328124999993, "text" : "arôme", "vegan" : "maybe", @@ -205,23 +230,27 @@ { "ciqual_food_code" : "42200", "id" : "en:soya-lecithin", + "is_in_taxonomy" : 1, "percent_estimate" : 0.0243164062499996, "text" : "lécithine de soja", "vegan" : "yes", "vegetarian" : "yes" } ], + "is_in_taxonomy" : 1, "percent_estimate" : 0.0243164062499996, "text" : "émulsifiant" }, { "id" : "en:lactose-and-milk-proteins", + "is_in_taxonomy" : 1, "percent_estimate" : 0.0243164062500014, "text" : "lactose et protéines de lait", "vegan" : "no", "vegetarian" : "yes" } ], + "is_in_taxonomy" : 1, "percent" : 24.9, "percent_estimate" : 24.9, "text" : "chocolat", @@ -231,6 +260,7 @@ { "ciqual_proxy_food_code" : "9410", "id" : "en:wheat-flour", + "is_in_taxonomy" : 1, "percent_estimate" : 17.05, "text" : "farine de blé", "vegan" : "yes", @@ -239,6 +269,7 @@ { "ciqual_proxy_food_code" : "31016", "id" : "en:sugar", + "is_in_taxonomy" : 1, "percent_estimate" : 8.525, "text" : "sucre", "vegan" : "yes", @@ -247,6 +278,7 @@ { "ciqual_food_code" : "22000", "id" : "en:egg", + "is_in_taxonomy" : 1, "percent_estimate" : 4.2625, "text" : "oeufs", "vegan" : "no", @@ -255,6 +287,7 @@ { "ciqual_food_code" : "31077", "id" : "en:glucose-fructose-syrup", + "is_in_taxonomy" : 1, "percent_estimate" : 2.13125, "text" : "sirop de glucose-fructose", "vegan" : "yes", @@ -264,6 +297,7 @@ "ciqual_food_code" : "17130", "from_palm_oil" : "no", "id" : "en:colza-oil", + "is_in_taxonomy" : 1, "percent_estimate" : 1.065625, "text" : "huile de colza", "vegan" : "yes", @@ -274,6 +308,7 @@ "ingredients" : [ { "id" : "en:e503ii", + "is_in_taxonomy" : 1, "percent_estimate" : 0.266406249999999, "text" : "carbonate acide d'ammonium", "vegan" : "yes", @@ -281,6 +316,7 @@ }, { "id" : "en:e450i", + "is_in_taxonomy" : 1, "percent_estimate" : 0.133203125, "text" : "diphosphate disodique", "vegan" : "yes", @@ -288,18 +324,21 @@ }, { "id" : "en:e500ii", + "is_in_taxonomy" : 1, "percent_estimate" : 0.133203125, "text" : "carbonate acide de sodium", "vegan" : "yes", "vegetarian" : "yes" } ], + "is_in_taxonomy" : 1, "percent_estimate" : 0.532812499999999, "text" : "poudre à lever" }, { "ciqual_food_code" : "11058", "id" : "en:salt", + "is_in_taxonomy" : 1, "percent_estimate" : 0.266406250000003, "text" : "sel", "vegan" : "yes", @@ -311,12 +350,14 @@ { "ciqual_food_code" : "42200", "id" : "en:soya-lecithin", + "is_in_taxonomy" : 1, "percent_estimate" : 0.266406250000003, "text" : "lécithine de soja", "vegan" : "yes", "vegetarian" : "yes" } ], + "is_in_taxonomy" : 1, "percent_estimate" : 0.266406250000003, "text" : "émulsifiant" } diff --git a/tests/unit/expected_test_results/ingredients/fr-mechanicaly-separated-meat.json b/tests/unit/expected_test_results/ingredients/fr-mechanicaly-separated-meat.json index 8e80ad1ffc0f8..c150e64489dbe 100644 --- a/tests/unit/expected_test_results/ingredients/fr-mechanicaly-separated-meat.json +++ b/tests/unit/expected_test_results/ingredients/fr-mechanicaly-separated-meat.json @@ -3,6 +3,7 @@ { "ciqual_food_code" : "36301", "id" : "en:mechanically-separated-meat-of-turkey", + "is_in_taxonomy" : 1, "percent_estimate" : 66.6666666666667, "percent_max" : 100, "percent_min" : 33.3333333333333, @@ -13,6 +14,7 @@ { "ciqual_proxy_food_code" : "28205", "id" : "en:mechanically-separated-meat-of-pork", + "is_in_taxonomy" : 1, "percent_estimate" : 16.6666666666667, "percent_max" : 50, "percent_min" : 0, @@ -23,6 +25,7 @@ { "ciqual_food_code" : "36005", "id" : "en:mechanically-separated-meat-of-chicken", + "is_in_taxonomy" : 1, "labels" : "en:halal", "percent_estimate" : 16.6666666666667, "percent_max" : 33.3333333333333, diff --git a/tests/unit/expected_test_results/ingredients/fr-oignon-francais-tomate-francaise.json b/tests/unit/expected_test_results/ingredients/fr-oignon-francais-tomate-francaise.json index f6bbc460b4464..d630d9da23d4a 100644 --- a/tests/unit/expected_test_results/ingredients/fr-oignon-francais-tomate-francaise.json +++ b/tests/unit/expected_test_results/ingredients/fr-oignon-francais-tomate-francaise.json @@ -2,6 +2,7 @@ "ingredients" : [ { "id" : "fr:oignon-francais", + "is_in_taxonomy" : 0, "percent_estimate" : 75, "percent_max" : 100, "percent_min" : 50, @@ -9,6 +10,7 @@ }, { "id" : "fr:tomate-francaise", + "is_in_taxonomy" : 0, "percent_estimate" : 25, "percent_max" : 50, "percent_min" : 0, diff --git a/tests/unit/expected_test_results/ingredients/fr-origin-and.json b/tests/unit/expected_test_results/ingredients/fr-origin-and.json index d7b91cf2d0479..49138fbfe7af6 100644 --- a/tests/unit/expected_test_results/ingredients/fr-origin-and.json +++ b/tests/unit/expected_test_results/ingredients/fr-origin-and.json @@ -3,6 +3,7 @@ { "ciqual_food_code" : "4003", "id" : "en:potato", + "is_in_taxonomy" : 1, "origins" : "en:france,en:italy", "percent_estimate" : 100, "percent_max" : 100, diff --git a/tests/unit/expected_test_results/ingredients/fr-origin-field.json b/tests/unit/expected_test_results/ingredients/fr-origin-field.json index 54f160c3c4862..0f9975993b741 100644 --- a/tests/unit/expected_test_results/ingredients/fr-origin-field.json +++ b/tests/unit/expected_test_results/ingredients/fr-origin-field.json @@ -2,6 +2,7 @@ "ingredients" : [ { "id" : "fr:coquillettes", + "is_in_taxonomy" : 0, "origins" : "en:italy", "percent_estimate" : 54.5454545454545, "percent_max" : 100, @@ -11,6 +12,7 @@ { "ciqual_food_code" : "12110", "id" : "en:comte", + "is_in_taxonomy" : 1, "percent_estimate" : 22.7272727272727, "percent_max" : 50, "percent_min" : 0, @@ -20,6 +22,7 @@ }, { "id" : "fr:jambon-superieur", + "is_in_taxonomy" : 0, "origins" : "en:france", "percent_estimate" : 11.3636363636364, "percent_max" : 33.3333333333333, @@ -29,6 +32,7 @@ { "ciqual_food_code" : "1014", "id" : "en:white-wine", + "is_in_taxonomy" : 1, "origins" : "en:europe", "percent_estimate" : 5.68181818181818, "percent_max" : 25, @@ -40,6 +44,7 @@ { "ciqual_food_code" : "5214", "id" : "en:red-wine", + "is_in_taxonomy" : 1, "origins" : "en:italy", "percent_estimate" : 2.84090909090909, "percent_max" : 20, @@ -51,6 +56,7 @@ { "ciqual_food_code" : "5216", "id" : "en:rose-wine", + "is_in_taxonomy" : 1, "origins" : "en:spain", "percent_estimate" : 1.42045454545455, "percent_max" : 16.6666666666667, @@ -62,6 +68,7 @@ { "ciqual_food_code" : "19402", "id" : "en:uht-cream", + "is_in_taxonomy" : 1, "percent_estimate" : 0.710227272727273, "percent_max" : 14.2857142857143, "percent_min" : 0, @@ -72,6 +79,7 @@ { "ciqual_food_code" : "12120", "id" : "en:parmigiano-reggiano", + "is_in_taxonomy" : 1, "origins" : "en:italy", "percent_estimate" : 0.35511363636364, "percent_max" : 12.5, @@ -83,6 +91,7 @@ { "ciqual_food_code" : "19585", "id" : "en:ricotta", + "is_in_taxonomy" : 1, "origins" : "en:italy", "percent_estimate" : 0.17755681818182, "percent_max" : 11.1111111111111, @@ -94,6 +103,7 @@ { "ciqual_food_code" : "11058", "id" : "en:salt", + "is_in_taxonomy" : 1, "percent_estimate" : 0.0887784090909065, "percent_max" : 10, "percent_min" : 0, @@ -104,6 +114,7 @@ { "ciqual_proxy_food_code" : "11015", "id" : "en:pepper", + "is_in_taxonomy" : 1, "origins" : "en:nepal", "percent_estimate" : 0.0887784090909065, "percent_max" : 9.09090909090909, diff --git a/tests/unit/expected_test_results/ingredients/fr-origin-ingredient-origin-and-origin.json b/tests/unit/expected_test_results/ingredients/fr-origin-ingredient-origin-and-origin.json index 717d38eae8838..8bf4dbd558cf0 100644 --- a/tests/unit/expected_test_results/ingredients/fr-origin-ingredient-origin-and-origin.json +++ b/tests/unit/expected_test_results/ingredients/fr-origin-ingredient-origin-and-origin.json @@ -3,6 +3,7 @@ { "ciqual_food_code" : "4003", "id" : "en:potato", + "is_in_taxonomy" : 1, "origins" : "en:france", "percent" : 46.8874700718276, "percent_estimate" : 46.8874700718276, @@ -12,6 +13,7 @@ }, { "id" : "en:pork", + "is_in_taxonomy" : 1, "origins" : "en:france", "percent" : 21.9473264166002, "percent_estimate" : 21.9473264166002, @@ -22,6 +24,7 @@ { "ciqual_proxy_food_code" : "19041", "id" : "en:semi-skimmed-milk", + "is_in_taxonomy" : 1, "origins" : "en:france", "percent" : 5.48683160415004, "percent_estimate" : 5.48683160415004, @@ -32,6 +35,7 @@ { "ciqual_food_code" : "19402", "id" : "en:single-cream", + "is_in_taxonomy" : 1, "origins" : "en:france", "percent" : 5.48683160415004, "percent_estimate" : 5.48683160415004, @@ -42,6 +46,7 @@ { "ciqual_food_code" : "18066", "id" : "en:water", + "is_in_taxonomy" : 1, "origins" : "en:france", "percent" : 5.48683160415004, "percent_estimate" : 5.48683160415004, @@ -52,6 +57,7 @@ { "ciqual_proxy_food_code" : "16400", "id" : "en:butter", + "is_in_taxonomy" : 1, "origins" : "en:france", "percent" : 2.69353551476456, "percent_estimate" : 2.69353551476456, @@ -63,6 +69,7 @@ "ciqual_food_code" : "11013", "id" : "fr:moutarde-a-l-ancienne", "ingredients" : [], + "is_in_taxonomy" : 1, "origins" : "en:france", "percent" : 2.69353551476456, "percent_estimate" : 2.69353551476456, @@ -71,6 +78,7 @@ { "ciqual_food_code" : "19402", "id" : "en:cream", + "is_in_taxonomy" : 1, "origins" : "en:france", "percent" : 2.69353551476456, "percent_estimate" : 2.69353551476456, @@ -82,6 +90,7 @@ "ciqual_food_code" : "11013", "id" : "en:dijon-mustard", "ingredients" : [], + "is_in_taxonomy" : 1, "origins" : "en:france", "percent" : 2.69353551476456, "percent_estimate" : 2.69353551476456, @@ -90,6 +99,7 @@ { "ciqual_food_code" : "31008", "id" : "en:flower-honey", + "is_in_taxonomy" : 1, "origins" : "en:france", "percent" : 2.69353551476456, "percent_estimate" : 2.69353551476456, @@ -99,6 +109,7 @@ }, { "id" : "en:spice", + "is_in_taxonomy" : 1, "origins" : "en:india", "percent" : 0.548683160415004, "percent_estimate" : 0.548683160415004, @@ -109,6 +120,7 @@ { "id" : "en:broth", "ingredients" : [], + "is_in_taxonomy" : 1, "origins" : "en:france", "percent" : 0.548683160415004, "percent_estimate" : 0.548683160415004, @@ -117,6 +129,7 @@ { "ciqual_food_code" : "11058", "id" : "en:finegrained-salt", + "is_in_taxonomy" : 1, "origins" : "en:france", "percent" : 0.139664804469274, "percent_estimate" : 0.139664804469277, diff --git a/tests/unit/expected_test_results/ingredients/fr-origins-agriculture-ue-non-ue.json b/tests/unit/expected_test_results/ingredients/fr-origins-agriculture-ue-non-ue.json index 394f0a592bc27..0132cf9361c04 100644 --- a/tests/unit/expected_test_results/ingredients/fr-origins-agriculture-ue-non-ue.json +++ b/tests/unit/expected_test_results/ingredients/fr-origins-agriculture-ue-non-ue.json @@ -3,6 +3,7 @@ { "ciqual_food_code" : "13014", "id" : "en:strawberry", + "is_in_taxonomy" : 1, "origins" : "en:european-union-and-non-european-union", "percent_estimate" : 100, "percent_max" : 100, diff --git a/tests/unit/expected_test_results/ingredients/fr-origins-emmental-allemagne-france-pays-bas-contient-lait.json b/tests/unit/expected_test_results/ingredients/fr-origins-emmental-allemagne-france-pays-bas-contient-lait.json index bfeeb7a888016..d0a70496d1777 100644 --- a/tests/unit/expected_test_results/ingredients/fr-origins-emmental-allemagne-france-pays-bas-contient-lait.json +++ b/tests/unit/expected_test_results/ingredients/fr-origins-emmental-allemagne-france-pays-bas-contient-lait.json @@ -3,6 +3,7 @@ { "ciqual_food_code" : "12115", "id" : "en:emmental", + "is_in_taxonomy" : 1, "origins" : "en:germany,en:france,en:netherlands", "percent_estimate" : 100, "percent_max" : 100, diff --git a/tests/unit/expected_test_results/ingredients/fr-origins-labels.json b/tests/unit/expected_test_results/ingredients/fr-origins-labels.json index 71cd29b4ec307..1c537f407099d 100644 --- a/tests/unit/expected_test_results/ingredients/fr-origins-labels.json +++ b/tests/unit/expected_test_results/ingredients/fr-origins-labels.json @@ -3,6 +3,7 @@ { "ciqual_food_code" : "13014", "id" : "en:strawberry", + "is_in_taxonomy" : 1, "origins" : "en:france", "percent_estimate" : 55.5555555555556, "percent_max" : 100, @@ -14,6 +15,7 @@ { "ciqual_food_code" : "13007", "id" : "en:blackcurrant", + "is_in_taxonomy" : 1, "origins" : "en:south-africa", "percent_estimate" : 22.2222222222222, "percent_max" : 50, @@ -25,6 +27,7 @@ { "ciqual_food_code" : "13015", "id" : "en:raspberry", + "is_in_taxonomy" : 1, "origins" : "en:belgium", "percent_estimate" : 11.1111111111111, "percent_max" : 33.3333333333333, @@ -36,6 +39,7 @@ { "ciqual_proxy_food_code" : "13040", "id" : "en:grapefruit", + "is_in_taxonomy" : 1, "labels" : "en:organic", "percent_estimate" : 5.55555555555556, "percent_max" : 25, @@ -47,6 +51,7 @@ { "ciqual_proxy_food_code" : "13034", "id" : "en:orange", + "is_in_taxonomy" : 1, "labels" : "en:organic", "percent_estimate" : 2.77777777777778, "percent_max" : 20, @@ -58,6 +63,7 @@ { "ciqual_proxy_food_code" : "13009", "id" : "en:lemon", + "is_in_taxonomy" : 1, "labels" : "en:organic", "percent_estimate" : 1.38888888888889, "percent_max" : 16.6666666666667, @@ -69,6 +75,7 @@ { "ciqual_proxy_food_code" : "18100", "id" : "en:cocoa", + "is_in_taxonomy" : 1, "labels" : "en:fair-trade", "percent_estimate" : 0.694444444444443, "percent_max" : 14.2857142857143, @@ -80,6 +87,7 @@ { "ciqual_food_code" : "16030", "id" : "en:cocoa-butter", + "is_in_taxonomy" : 1, "labels" : "en:fair-trade", "percent_estimate" : 0.347222222222221, "percent_max" : 12.5, @@ -91,6 +99,7 @@ { "ciqual_food_code" : "13008", "id" : "en:cherry", + "is_in_taxonomy" : 1, "labels" : "en:organic", "percent_estimate" : 0.347222222222229, "percent_max" : 11.1111111111111, diff --git a/tests/unit/expected_test_results/ingredients/fr-origins.json b/tests/unit/expected_test_results/ingredients/fr-origins.json index 054f52428013f..81bf2076b3d8c 100644 --- a/tests/unit/expected_test_results/ingredients/fr-origins.json +++ b/tests/unit/expected_test_results/ingredients/fr-origins.json @@ -3,6 +3,7 @@ { "ciqual_food_code" : "13014", "id" : "en:strawberry", + "is_in_taxonomy" : 1, "origins" : "en:brittany", "percent_estimate" : 62.5, "percent_max" : 100, @@ -14,6 +15,7 @@ { "ciqual_food_code" : "16400", "id" : "en:unsalted-butter", + "is_in_taxonomy" : 1, "origins" : "en:normandy", "percent_estimate" : 18.75, "percent_max" : 50, @@ -25,6 +27,7 @@ { "ciqual_food_code" : "20172", "id" : "en:cherry-tomato", + "is_in_taxonomy" : 1, "origins" : "en:brittany", "percent_estimate" : 9.375, "percent_max" : 33.3333333333333, @@ -36,6 +39,7 @@ { "ciqual_food_code" : "13050", "id" : "en:apple", + "is_in_taxonomy" : 1, "origins" : "en:normandy", "percent_estimate" : 9.375, "percent_max" : 25, diff --git a/tests/unit/expected_test_results/ingredients/fr-palm-kernel-fat.json b/tests/unit/expected_test_results/ingredients/fr-palm-kernel-fat.json index 5185ba4a024dc..75280881668ce 100644 --- a/tests/unit/expected_test_results/ingredients/fr-palm-kernel-fat.json +++ b/tests/unit/expected_test_results/ingredients/fr-palm-kernel-fat.json @@ -3,6 +3,7 @@ { "from_palm_oil" : "yes", "id" : "en:palm-kernel-fat", + "is_in_taxonomy" : 1, "percent_estimate" : 100, "percent_max" : 100, "percent_min" : 100, diff --git a/tests/unit/expected_test_results/ingredients/fr-percents-origins-2.json b/tests/unit/expected_test_results/ingredients/fr-percents-origins-2.json index 9641201c36503..367308cf23c6d 100644 --- a/tests/unit/expected_test_results/ingredients/fr-percents-origins-2.json +++ b/tests/unit/expected_test_results/ingredients/fr-percents-origins-2.json @@ -5,17 +5,20 @@ "ingredients" : [ { "id" : "en:sunflower-lecithin", + "is_in_taxonomy" : 1, "percent_estimate" : 50, "text" : "lécithines de tournesol", "vegan" : "yes", "vegetarian" : "yes" } ], + "is_in_taxonomy" : 1, "percent_estimate" : 50, "text" : "émulsifiant" }, { "id" : "en:flavouring", + "is_in_taxonomy" : 1, "origins" : "en:european-union", "percent_estimate" : 25, "text" : "arôme", @@ -25,6 +28,7 @@ { "ciqual_proxy_food_code" : "9410", "id" : "en:wheat-flour", + "is_in_taxonomy" : 1, "origins" : "en:france", "percent" : 33, "percent_estimate" : 25, @@ -35,6 +39,7 @@ { "ciqual_proxy_food_code" : "31016", "id" : "en:sugar", + "is_in_taxonomy" : 1, "percent_estimate" : 0, "text" : "sucre", "vegan" : "yes", @@ -44,6 +49,7 @@ "ciqual_food_code" : "16401", "from_palm_oil" : "maybe", "id" : "en:butterfat", + "is_in_taxonomy" : 1, "origins" : "en:france", "percent" : 6.5, "percent_estimate" : 0, diff --git a/tests/unit/expected_test_results/ingredients/fr-percents-origins.json b/tests/unit/expected_test_results/ingredients/fr-percents-origins.json index acea4a767d786..d61f7eae46f76 100644 --- a/tests/unit/expected_test_results/ingredients/fr-percents-origins.json +++ b/tests/unit/expected_test_results/ingredients/fr-percents-origins.json @@ -3,6 +3,7 @@ { "ciqual_food_code" : "2074", "id" : "en:apple-juice", + "is_in_taxonomy" : 1, "labels" : "en:organic", "percent" : 80, "percent_estimate" : 80, @@ -12,6 +13,7 @@ }, { "id" : "en:quince", + "is_in_taxonomy" : 1, "labels" : "en:organic", "percent" : 20, "percent_estimate" : 20, @@ -22,6 +24,7 @@ { "ciqual_food_code" : "11082", "id" : "en:sea-salt", + "is_in_taxonomy" : 1, "percent_estimate" : 0, "text" : "sel marin", "vegan" : "yes", @@ -29,6 +32,7 @@ }, { "id" : "en:sodium-chloride", + "is_in_taxonomy" : 1, "origins" : "en:france,en:italy", "percent" : 98, "percent_estimate" : 0, diff --git a/tests/unit/expected_test_results/ingredients/fr-percents.json b/tests/unit/expected_test_results/ingredients/fr-percents.json index a4355ebc11721..24d1a54a9dbee 100644 --- a/tests/unit/expected_test_results/ingredients/fr-percents.json +++ b/tests/unit/expected_test_results/ingredients/fr-percents.json @@ -3,6 +3,7 @@ { "ciqual_food_code" : "13014", "id" : "en:strawberry", + "is_in_taxonomy" : 1, "percent" : 55.1569506726457, "percent_estimate" : 55.1569506726457, "percent_max" : 55.1569506726457, @@ -14,6 +15,7 @@ { "ciqual_proxy_food_code" : "13034", "id" : "en:orange", + "is_in_taxonomy" : 1, "percent" : 29.1479820627803, "percent_estimate" : 29.1479820627803, "percent_max" : 29.1479820627803, @@ -25,6 +27,7 @@ { "ciqual_food_code" : "13050", "id" : "en:apple", + "is_in_taxonomy" : 1, "percent" : 15.695067264574, "percent_estimate" : 15.695067264574, "percent_max" : 15.695067264574, diff --git a/tests/unit/expected_test_results/ingredients/fr-processing-multi.json b/tests/unit/expected_test_results/ingredients/fr-processing-multi.json index e55986115392d..c6b681b152821 100644 --- a/tests/unit/expected_test_results/ingredients/fr-processing-multi.json +++ b/tests/unit/expected_test_results/ingredients/fr-processing-multi.json @@ -3,6 +3,7 @@ { "ciqual_food_code" : "20047", "id" : "en:peeled-tomatoes", + "is_in_taxonomy" : 1, "percent_estimate" : 58.3333333333333, "percent_max" : 100, "percent_min" : 16.6666666666667, @@ -14,6 +15,7 @@ { "ciqual_proxy_food_code" : "13009", "id" : "en:lemon", + "is_in_taxonomy" : 1, "percent_estimate" : 20.8333333333333, "percent_max" : 50, "percent_min" : 0, @@ -25,6 +27,7 @@ { "ciqual_food_code" : "20020", "id" : "en:courgette", + "is_in_taxonomy" : 1, "percent_estimate" : 10.4166666666667, "percent_max" : 33.3333333333333, "percent_min" : 0, @@ -36,6 +39,7 @@ { "ciqual_proxy_food_code" : "19051", "id" : "en:raw-milk", + "is_in_taxonomy" : 1, "percent_estimate" : 5.20833333333333, "percent_max" : 25, "percent_min" : 0, @@ -46,6 +50,7 @@ { "ciqual_food_code" : "20053", "id" : "en:aubergine", + "is_in_taxonomy" : 1, "percent_estimate" : 2.60416666666666, "percent_max" : 20, "percent_min" : 0, @@ -57,6 +62,7 @@ { "ciqual_food_code" : "28800", "id" : "en:raw-ham", + "is_in_taxonomy" : 1, "percent_estimate" : 2.60416666666666, "percent_max" : 16.6666666666667, "percent_min" : 0, diff --git a/tests/unit/expected_test_results/ingredients/fr-quantity-of-ingredient.json b/tests/unit/expected_test_results/ingredients/fr-quantity-of-ingredient.json index 181bb390a8e03..3c2c196ede3cc 100644 --- a/tests/unit/expected_test_results/ingredients/fr-quantity-of-ingredient.json +++ b/tests/unit/expected_test_results/ingredients/fr-quantity-of-ingredient.json @@ -3,6 +3,7 @@ { "ciqual_food_code" : "20047", "id" : "en:tomato", + "is_in_taxonomy" : 1, "percent_estimate" : 50, "percent_max" : 65, "percent_min" : 35, @@ -15,6 +16,7 @@ { "ciqual_food_code" : "11000", "id" : "en:garlic", + "is_in_taxonomy" : 1, "percent" : 35, "percent_estimate" : 35, "percent_max" : 35, @@ -26,6 +28,7 @@ { "ciqual_food_code" : "18066", "id" : "en:water", + "is_in_taxonomy" : 1, "percent_estimate" : 7.5, "percent_max" : 30, "percent_min" : 0, @@ -39,6 +42,7 @@ "ciqual_food_code" : "17130", "from_palm_oil" : "no", "id" : "en:colza-oil", + "is_in_taxonomy" : 1, "percent_estimate" : 7.5, "percent_max" : 15, "percent_min" : 0, diff --git a/tests/unit/expected_test_results/ingredients/fr-quantity-per-100g.json b/tests/unit/expected_test_results/ingredients/fr-quantity-per-100g.json index 136c99f00e38c..1ff587570a67a 100644 --- a/tests/unit/expected_test_results/ingredients/fr-quantity-per-100g.json +++ b/tests/unit/expected_test_results/ingredients/fr-quantity-per-100g.json @@ -3,6 +3,7 @@ { "ciqual_food_code" : "20047", "id" : "en:tomato", + "is_in_taxonomy" : 1, "percent" : 42.5287356321839, "percent_estimate" : 42.5287356321839, "quantity" : "148 g", @@ -13,6 +14,7 @@ }, { "id" : "en:pork", + "is_in_taxonomy" : 1, "percent" : 57.4712643678161, "percent_estimate" : 57.4712643678161, "quantity" : "200 g", diff --git a/tests/unit/expected_test_results/ingredients/fr-semi.json b/tests/unit/expected_test_results/ingredients/fr-semi.json index 245bf210bb60a..8338d74a2eda1 100644 --- a/tests/unit/expected_test_results/ingredients/fr-semi.json +++ b/tests/unit/expected_test_results/ingredients/fr-semi.json @@ -3,6 +3,7 @@ { "ciqual_food_code" : "9520", "id" : "en:semi-wholemeal-rice-flour", + "is_in_taxonomy" : 1, "percent_estimate" : 75, "percent_max" : 100, "percent_min" : 50, @@ -13,6 +14,7 @@ { "ciqual_proxy_food_code" : "9410", "id" : "en:semi-wholemeal-wheat-flour", + "is_in_taxonomy" : 1, "percent_estimate" : 25, "percent_max" : 50, "percent_min" : 0, diff --git a/tests/unit/expected_test_results/ingredients/fr-specific-ingredients.json b/tests/unit/expected_test_results/ingredients/fr-specific-ingredients.json index 4c9ed632edc6a..9225621dc04b7 100644 --- a/tests/unit/expected_test_results/ingredients/fr-specific-ingredients.json +++ b/tests/unit/expected_test_results/ingredients/fr-specific-ingredients.json @@ -3,6 +3,7 @@ { "ciqual_proxy_food_code" : "31016", "id" : "en:cane-sugar", + "is_in_taxonomy" : 1, "labels" : "en:organic", "percent_estimate" : 62.5, "percent_max" : 100, @@ -14,6 +15,7 @@ { "ciqual_food_code" : "13000", "id" : "en:apricot", + "is_in_taxonomy" : 1, "labels" : "en:organic", "origins" : "en:provence", "percent_estimate" : 18.75, @@ -26,6 +28,7 @@ { "ciqual_food_code" : "2028", "id" : "en:concentrated-lemon-juice", + "is_in_taxonomy" : 1, "labels" : "en:organic", "percent_estimate" : 9.375, "percent_max" : 33.3333333333333, @@ -39,6 +42,7 @@ "ingredients" : [ { "id" : "en:fruit-pectin", + "is_in_taxonomy" : 1, "percent_estimate" : 9.375, "percent_max" : 25, "percent_min" : 0, @@ -47,6 +51,7 @@ "vegetarian" : "yes" } ], + "is_in_taxonomy" : 1, "percent_estimate" : 9.375, "percent_max" : 25, "percent_min" : 0, diff --git a/tests/unit/expected_test_results/ingredients/fr-starred-label.json b/tests/unit/expected_test_results/ingredients/fr-starred-label.json index 1c8833b6e83a6..76068df1835f0 100644 --- a/tests/unit/expected_test_results/ingredients/fr-starred-label.json +++ b/tests/unit/expected_test_results/ingredients/fr-starred-label.json @@ -3,6 +3,7 @@ { "ciqual_proxy_food_code" : "16030", "id" : "en:cocoa-paste", + "is_in_taxonomy" : 1, "labels" : "en:fair-trade, en:organic", "origins" : "en:madagascar", "percent" : 75, @@ -16,6 +17,7 @@ { "ciqual_proxy_food_code" : "31016", "id" : "en:cane-sugar", + "is_in_taxonomy" : 1, "labels" : "en:fair-trade, en:organic", "percent_estimate" : 18.75, "percent_max" : 25, @@ -27,6 +29,7 @@ { "ciqual_food_code" : "16030", "id" : "en:cocoa-butter", + "is_in_taxonomy" : 1, "labels" : "en:fair-trade, en:organic", "percent_estimate" : 6.25, "percent_max" : 12.5, diff --git a/tests/unit/expected_test_results/ingredients/fr-truncated-puree.json b/tests/unit/expected_test_results/ingredients/fr-truncated-puree.json index 0c44f67795ec9..ee6ed19b00c3e 100644 --- a/tests/unit/expected_test_results/ingredients/fr-truncated-puree.json +++ b/tests/unit/expected_test_results/ingredients/fr-truncated-puree.json @@ -3,6 +3,7 @@ { "ciqual_food_code" : "20170", "id" : "en:tomato-puree", + "is_in_taxonomy" : 1, "percent" : 7.48031496062992, "percent_estimate" : 7.48031496062992, "text" : "purée de tomate", @@ -11,6 +12,7 @@ }, { "id" : "en:beef", + "is_in_taxonomy" : 1, "percent" : 35.4330708661417, "percent_estimate" : 35.4330708661417, "text" : "boeuf", @@ -19,6 +21,7 @@ }, { "id" : "en:fruit-juice", + "is_in_taxonomy" : 1, "percent" : 39.3700787401575, "percent_estimate" : 39.3700787401575, "processing" : "en:pure", @@ -29,6 +32,7 @@ { "from_palm_oil" : "maybe", "id" : "en:oil-and-fat", + "is_in_taxonomy" : 1, "percent" : 17.7165354330709, "percent_estimate" : 17.7165354330709, "text" : "matière grasses", diff --git a/tests/unit/expected_test_results/ingredients/fr-vegetal-origin.json b/tests/unit/expected_test_results/ingredients/fr-vegetal-origin.json index 0fbaf150c9963..3768ed2a5396c 100644 --- a/tests/unit/expected_test_results/ingredients/fr-vegetal-origin.json +++ b/tests/unit/expected_test_results/ingredients/fr-vegetal-origin.json @@ -3,6 +3,7 @@ { "from_palm_oil" : "maybe", "id" : "en:e471", + "is_in_taxonomy" : 1, "percent_estimate" : 66.6666666666667, "percent_max" : 100, "percent_min" : 33.3333333333333, @@ -13,6 +14,7 @@ { "from_palm_oil" : "maybe", "id" : "en:oil", + "is_in_taxonomy" : 1, "percent_estimate" : 16.6666666666667, "percent_max" : 50, "percent_min" : 0, @@ -22,6 +24,7 @@ }, { "id" : "en:e428", + "is_in_taxonomy" : 1, "percent_estimate" : 16.6666666666667, "percent_max" : 33.3333333333333, "percent_min" : 0, diff --git a/tests/unit/expected_test_results/ingredients/fr-viande-de-boeuf-issue-d-animaux-nourris-sans-ogm.json b/tests/unit/expected_test_results/ingredients/fr-viande-de-boeuf-issue-d-animaux-nourris-sans-ogm.json index 4df52e04bf747..81e2e6d78bc39 100644 --- a/tests/unit/expected_test_results/ingredients/fr-viande-de-boeuf-issue-d-animaux-nourris-sans-ogm.json +++ b/tests/unit/expected_test_results/ingredients/fr-viande-de-boeuf-issue-d-animaux-nourris-sans-ogm.json @@ -3,6 +3,7 @@ { "ciqual_proxy_food_code" : "6101", "id" : "en:beef-meat", + "is_in_taxonomy" : 1, "labels" : "en:fed-without-gmos", "percent_estimate" : 100, "percent_max" : 100, diff --git a/tests/unit/expected_test_results/ingredients/fr-viande-porcine-francaise.json b/tests/unit/expected_test_results/ingredients/fr-viande-porcine-francaise.json index 06534a04a0aaa..9750bcbc5f900 100644 --- a/tests/unit/expected_test_results/ingredients/fr-viande-porcine-francaise.json +++ b/tests/unit/expected_test_results/ingredients/fr-viande-porcine-francaise.json @@ -3,6 +3,7 @@ { "ciqual_food_code" : "20026", "id" : "en:belgian-endive", + "is_in_taxonomy" : 1, "percent" : 40, "percent_estimate" : 40, "percent_max" : 40, @@ -14,6 +15,7 @@ { "ciqual_proxy_food_code" : "28205", "id" : "en:cooked-ham", + "is_in_taxonomy" : 1, "origins" : "en:france", "percent_estimate" : 30, "percent_max" : 40, @@ -25,6 +27,7 @@ { "ciqual_food_code" : "22002", "id" : "en:egg-yolk", + "is_in_taxonomy" : 1, "origins" : "en:france", "percent_estimate" : 20, "percent_max" : 33.3333333333333, @@ -36,6 +39,7 @@ { "ciqual_food_code" : "11058", "id" : "en:salt", + "is_in_taxonomy" : 1, "percent_estimate" : 10, "percent_max" : 20, "percent_min" : 0, diff --git a/tests/unit/expected_test_results/ingredients/ja-additives.json b/tests/unit/expected_test_results/ingredients/ja-additives.json index f0141f328ad7a..cde683f1c213e 100644 --- a/tests/unit/expected_test_results/ingredients/ja-additives.json +++ b/tests/unit/expected_test_results/ingredients/ja-additives.json @@ -6,6 +6,7 @@ { "ciqual_proxy_food_code" : "9510", "id" : "en:modified-starch", + "is_in_taxonomy" : 1, "percent_estimate" : 31.25, "percent_max" : 100, "percent_min" : 6.25, @@ -15,6 +16,7 @@ }, { "id" : "en:e415", + "is_in_taxonomy" : 1, "percent_estimate" : 25, "percent_max" : 50, "percent_min" : 0, @@ -23,6 +25,7 @@ "vegetarian" : "yes" } ], + "is_in_taxonomy" : 1, "percent_estimate" : 56.25, "percent_max" : 100, "percent_min" : 12.5, @@ -30,6 +33,7 @@ }, { "id" : "en:e262", + "is_in_taxonomy" : 1, "percent_estimate" : 21.875, "percent_max" : 50, "percent_min" : 0, @@ -40,6 +44,7 @@ { "ciqual_proxy_food_code" : "31016", "id" : "en:trehalose", + "is_in_taxonomy" : 1, "percent_estimate" : 10.9375, "percent_max" : 33.3333333333333, "percent_min" : 0, @@ -50,6 +55,7 @@ { "ciqual_proxy_food_code" : "9510", "id" : "en:modified-starch", + "is_in_taxonomy" : 1, "percent_estimate" : 5.46875, "percent_max" : 25, "percent_min" : 0, @@ -59,6 +65,7 @@ }, { "id" : "en:e640i", + "is_in_taxonomy" : 1, "percent_estimate" : 2.734375, "percent_max" : 20, "percent_min" : 0, @@ -71,12 +78,14 @@ "ingredients" : [ { "id" : "en:amino-acids", + "is_in_taxonomy" : 1, "percent_estimate" : 1.3671875, "percent_max" : 16.6666666666667, "percent_min" : 0, "text" : "アミノ酸等" } ], + "is_in_taxonomy" : 1, "percent_estimate" : 1.3671875, "percent_max" : 16.6666666666667, "percent_min" : 0, @@ -89,6 +98,7 @@ "ingredients" : [ { "id" : "en:vitamin-c", + "is_in_taxonomy" : 1, "percent_estimate" : 0.341796875, "percent_max" : 14.2857142857143, "percent_min" : 0, @@ -96,12 +106,14 @@ }, { "id" : "en:vitamin-e", + "is_in_taxonomy" : 1, "percent_estimate" : 0.341796875, "percent_max" : 7.14285714285714, "percent_min" : 0, "text" : "V.E" } ], + "is_in_taxonomy" : 1, "percent_estimate" : 0.68359375, "percent_max" : 14.2857142857143, "percent_min" : 0, @@ -112,12 +124,14 @@ "ingredients" : [ { "id" : "en:vegetable-pigment", + "is_in_taxonomy" : 1, "percent_estimate" : 0.68359375, "percent_max" : 12.5, "percent_min" : 0, "text" : "野菜色素" } ], + "is_in_taxonomy" : 1, "percent_estimate" : 0.68359375, "percent_max" : 12.5, "percent_min" : 0, diff --git a/tests/unit/expected_test_results/ingredients/ja-allergens-in-parenthesis.json b/tests/unit/expected_test_results/ingredients/ja-allergens-in-parenthesis.json index b654af5f9cd34..8f01c20bce678 100644 --- a/tests/unit/expected_test_results/ingredients/ja-allergens-in-parenthesis.json +++ b/tests/unit/expected_test_results/ingredients/ja-allergens-in-parenthesis.json @@ -6,6 +6,7 @@ { "ciqual_food_code" : "15001", "id" : "en:peanut", + "is_in_taxonomy" : 1, "percent_estimate" : 66.6666666666667, "percent_max" : 100, "percent_min" : 33.3333333333333, @@ -15,6 +16,7 @@ }, { "id" : "en:nut", + "is_in_taxonomy" : 1, "percent_estimate" : 16.6666666666667, "percent_max" : 50, "percent_min" : 0, @@ -25,6 +27,7 @@ { "ciqual_proxy_food_code" : "26140", "id" : "en:fish", + "is_in_taxonomy" : 1, "percent_estimate" : 16.6666666666667, "percent_max" : 33.3333333333333, "percent_min" : 0, @@ -33,6 +36,7 @@ "vegetarian" : "no" } ], + "is_in_taxonomy" : 1, "percent_estimate" : 100, "percent_max" : 100, "percent_min" : 100, diff --git a/tests/unit/expected_test_results/ingredients/ja-origin-and.json b/tests/unit/expected_test_results/ingredients/ja-origin-and.json index 151b6a3142dbe..74c24227cf86d 100644 --- a/tests/unit/expected_test_results/ingredients/ja-origin-and.json +++ b/tests/unit/expected_test_results/ingredients/ja-origin-and.json @@ -6,12 +6,14 @@ "ingredients" : [ { "id" : "ja:ときがわ町", + "is_in_taxonomy" : 0, "percent_estimate" : 100, "percent_max" : 100, "percent_min" : 100, "text" : "ときがわ町" } ], + "is_in_taxonomy" : 1, "percent_estimate" : 100, "percent_max" : 100, "percent_min" : 100, diff --git a/tests/unit/expected_test_results/ingredients/ja-origins.json b/tests/unit/expected_test_results/ingredients/ja-origins.json index 8dbf17b5faa9f..dfaa15d6998a3 100644 --- a/tests/unit/expected_test_results/ingredients/ja-origins.json +++ b/tests/unit/expected_test_results/ingredients/ja-origins.json @@ -3,6 +3,7 @@ { "ciqual_food_code" : "11058", "id" : "en:salt", + "is_in_taxonomy" : 1, "origins" : "en:japan", "percent_estimate" : 54.5454545454545, "percent_max" : 100, @@ -14,6 +15,7 @@ { "ciqual_food_code" : "19402", "id" : "en:creme-fraiche", + "is_in_taxonomy" : 1, "origins" : "en:japan", "percent_estimate" : 22.7272727272727, "percent_max" : 50, @@ -24,6 +26,7 @@ }, { "id" : "en:meat", + "is_in_taxonomy" : 1, "origins" : "en:australia", "percent_estimate" : 11.3636363636364, "percent_max" : 33.3333333333333, @@ -36,6 +39,7 @@ "ciqual_proxy_food_code" : "17270", "from_palm_oil" : "no", "id" : "en:olive-oil", + "is_in_taxonomy" : 1, "origins" : "en:brazil,en:ethiopia", "percent_estimate" : 5.68181818181818, "percent_max" : 25, @@ -47,6 +51,7 @@ { "ciqual_food_code" : "11018", "id" : "en:white-wine-vinegar", + "is_in_taxonomy" : 1, "origins" : "en:australia,en:finland", "percent_estimate" : 2.84090909090909, "percent_max" : 20, @@ -57,6 +62,7 @@ }, { "id" : "en:malt", + "is_in_taxonomy" : 1, "origins" : "en:japan,en:south-korea", "percent_estimate" : 1.42045454545455, "percent_max" : 16.6666666666667, @@ -68,6 +74,7 @@ { "ciqual_proxy_food_code" : "31016", "id" : "en:sugar", + "is_in_taxonomy" : 1, "origins" : "en:outside-japan,en:japan", "percent_estimate" : 0.710227272727273, "percent_max" : 14.2857142857143, @@ -79,6 +86,7 @@ { "ciqual_proxy_food_code" : "18100", "id" : "en:cocoa", + "is_in_taxonomy" : 1, "origins" : "en:outside-japan,en:japan", "percent_estimate" : 0.35511363636364, "percent_max" : 12.5, @@ -90,6 +98,7 @@ { "ciqual_food_code" : "20901", "id" : "en:edamame", + "is_in_taxonomy" : 1, "origins" : "en:hokkaido", "percent_estimate" : 0.17755681818182, "percent_max" : 11.1111111111111, @@ -100,6 +109,7 @@ }, { "id" : "en:breadfruit", + "is_in_taxonomy" : 1, "origins" : "en:sanriku", "percent_estimate" : 0.0887784090909065, "percent_max" : 10, @@ -111,6 +121,7 @@ { "ciqual_food_code" : "13082", "id" : "en:clementine", + "is_in_taxonomy" : 1, "origins" : "en:kyushu", "percent_estimate" : 0.0887784090909065, "percent_max" : 9.09090909090909, diff --git a/tests/unit/expected_test_results/ingredients/ja-parenthesis.json b/tests/unit/expected_test_results/ingredients/ja-parenthesis.json index 1f28f0a1a50e0..9bf93f5bd4881 100644 --- a/tests/unit/expected_test_results/ingredients/ja-parenthesis.json +++ b/tests/unit/expected_test_results/ingredients/ja-parenthesis.json @@ -7,6 +7,7 @@ { "ciqual_food_code" : "11104", "id" : "en:honjozo", + "is_in_taxonomy" : 1, "percent_estimate" : 55, "percent_max" : 100, "percent_min" : 10, @@ -15,6 +16,7 @@ "vegetarian" : "maybe" } ], + "is_in_taxonomy" : 1, "percent_estimate" : 55, "percent_max" : 100, "percent_min" : 10, @@ -29,6 +31,7 @@ { "ciqual_food_code" : "31077", "id" : "en:high-fructose-corn-syrup", + "is_in_taxonomy" : 1, "percent_estimate" : 11.25, "percent_max" : 50, "percent_min" : 0, @@ -39,6 +42,7 @@ { "ciqual_proxy_food_code" : "31016", "id" : "en:glucose-syrup", + "is_in_taxonomy" : 1, "percent_estimate" : 5.625, "percent_max" : 25, "percent_min" : 0, @@ -49,6 +53,7 @@ { "ciqual_proxy_food_code" : "31016", "id" : "en:sugar", + "is_in_taxonomy" : 1, "percent_estimate" : 5.625, "percent_max" : 16.6666666666667, "percent_min" : 0, @@ -57,6 +62,7 @@ "vegetarian" : "yes" } ], + "is_in_taxonomy" : 1, "percent_estimate" : 22.5, "percent_max" : 50, "percent_min" : 0, @@ -66,6 +72,7 @@ }, { "id" : "en:mirin", + "is_in_taxonomy" : 1, "percent_estimate" : 11.25, "percent_max" : 33.3333333333333, "percent_min" : 0, @@ -76,6 +83,7 @@ { "ciqual_food_code" : "11058", "id" : "en:salt", + "is_in_taxonomy" : 1, "percent_estimate" : 5.625, "percent_max" : 25, "percent_min" : 0, @@ -86,6 +94,7 @@ { "ciqual_food_code" : "26068", "id" : "en:katsuobushi", + "is_in_taxonomy" : 1, "percent_estimate" : 2.8125, "percent_max" : 20, "percent_min" : 0, @@ -95,6 +104,7 @@ }, { "id" : "ja:さば節", + "is_in_taxonomy" : 0, "percent_estimate" : 1.40625, "percent_max" : 16.6666666666667, "percent_min" : 0, @@ -102,6 +112,7 @@ }, { "id" : "ja:たん白加水分解物混合物", + "is_in_taxonomy" : 0, "percent_estimate" : 0.703125, "percent_max" : 14.2857142857143, "percent_min" : 0, @@ -110,6 +121,7 @@ { "ciqual_food_code" : "20990", "id" : "en:kombu", + "is_in_taxonomy" : 1, "percent_estimate" : 0.3515625, "percent_max" : 12.5, "percent_min" : 0, @@ -122,12 +134,14 @@ "ingredients" : [ { "id" : "en:amino-acids", + "is_in_taxonomy" : 1, "percent_estimate" : 0.17578125, "percent_max" : 11.1111111111111, "percent_min" : 0, "text" : "アミノ酸等" } ], + "is_in_taxonomy" : 1, "percent_estimate" : 0.17578125, "percent_max" : 11.1111111111111, "percent_min" : 0, @@ -138,6 +152,7 @@ { "ciqual_food_code" : "1014", "id" : "en:alcohol", + "is_in_taxonomy" : 1, "percent_estimate" : 0.17578125, "percent_max" : 10, "percent_min" : 0, diff --git a/tests/unit/expected_test_results/ingredients/ja-slash.json b/tests/unit/expected_test_results/ingredients/ja-slash.json index d5bab039801e4..bbfaf3f38dfb1 100644 --- a/tests/unit/expected_test_results/ingredients/ja-slash.json +++ b/tests/unit/expected_test_results/ingredients/ja-slash.json @@ -4,6 +4,7 @@ { "ciqual_proxy_food_code" : "31016", "id" : "en:sugar", + "is_in_taxonomy" : 1, "percent_estimate" : 53.3333333333333, "percent_max" : 100, "percent_min" : 6.66666666666667, @@ -14,6 +15,7 @@ { "ciqual_proxy_food_code" : "9410", "id" : "en:wheat-flour", + "is_in_taxonomy" : 1, "percent_estimate" : 23.3333333333333, "percent_max" : 50, "percent_min" : 0, @@ -24,6 +26,7 @@ { "ciqual_food_code" : "19021", "id" : "en:whole-milk-powder", + "is_in_taxonomy" : 1, "percent_estimate" : 11.6666666666667, "percent_max" : 33.3333333333333, "percent_min" : 0, @@ -34,6 +37,7 @@ { "ciqual_proxy_food_code" : "16030", "id" : "en:cocoa-paste", + "is_in_taxonomy" : 1, "percent_estimate" : 5.83333333333333, "percent_max" : 25, "percent_min" : 0, @@ -44,6 +48,7 @@ { "from_palm_oil" : "maybe", "id" : "en:fat", + "is_in_taxonomy" : 1, "percent_estimate" : 2.91666666666666, "percent_max" : 20, "percent_min" : 0, @@ -54,6 +59,7 @@ { "from_palm_oil" : "maybe", "id" : "en:vegetable-oil-and-fat", + "is_in_taxonomy" : 1, "percent_estimate" : 1.45833333333333, "percent_max" : 16.6666666666667, "percent_min" : 0, @@ -64,6 +70,7 @@ { "ciqual_food_code" : "16030", "id" : "en:cocoa-butter", + "is_in_taxonomy" : 1, "percent_estimate" : 0.729166666666664, "percent_max" : 14.2857142857143, "percent_min" : 0, @@ -74,6 +81,7 @@ { "ciqual_proxy_food_code" : "9410", "id" : "en:whole-wheat-flour", + "is_in_taxonomy" : 1, "percent_estimate" : 0.364583333333329, "percent_max" : 12.5, "percent_min" : 0, @@ -84,6 +92,7 @@ { "ciqual_food_code" : "9621", "id" : "en:wheat-bran", + "is_in_taxonomy" : 1, "percent_estimate" : 0.182291666666664, "percent_max" : 11.1111111111111, "percent_min" : 0, @@ -94,6 +103,7 @@ { "ciqual_food_code" : "11058", "id" : "en:salt", + "is_in_taxonomy" : 1, "percent_estimate" : 0.0911458333333286, "percent_max" : 10, "percent_min" : 0, @@ -103,6 +113,7 @@ }, { "id" : "ja:小麦胚芽", + "is_in_taxonomy" : 0, "percent_estimate" : 0.0455729166666643, "percent_max" : 9.09090909090909, "percent_min" : 0, @@ -111,6 +122,7 @@ { "ciqual_proxy_food_code" : "9510", "id" : "en:modified-starch", + "is_in_taxonomy" : 1, "percent_estimate" : 0.0227864583333286, "percent_max" : 8.33333333333333, "percent_min" : 0, @@ -120,6 +132,7 @@ }, { "id" : "en:emulsifier", + "is_in_taxonomy" : 1, "percent_estimate" : 0.0113932291666643, "percent_max" : 7.69230769230769, "percent_min" : 0, @@ -127,6 +140,7 @@ }, { "id" : "en:raising-agent", + "is_in_taxonomy" : 1, "percent_estimate" : 0.0056966145833286, "percent_max" : 7.14285714285714, "percent_min" : 0, @@ -134,6 +148,7 @@ }, { "id" : "en:flavouring", + "is_in_taxonomy" : 1, "percent_estimate" : 0.0056966145833286, "percent_max" : "5", "percent_min" : 0, diff --git a/tests/unit/expected_test_results/ingredients/nl-e471-niet-dierlijk.json b/tests/unit/expected_test_results/ingredients/nl-e471-niet-dierlijk.json index c080225b0fdd8..35c7af35fbc0f 100644 --- a/tests/unit/expected_test_results/ingredients/nl-e471-niet-dierlijk.json +++ b/tests/unit/expected_test_results/ingredients/nl-e471-niet-dierlijk.json @@ -3,6 +3,7 @@ { "from_palm_oil" : "maybe", "id" : "en:e471", + "is_in_taxonomy" : 1, "labels" : "en:vegan", "percent_estimate" : 100, "percent_max" : 100, diff --git a/tests/unit/expected_test_results/ingredients/ru-russian-oil.json b/tests/unit/expected_test_results/ingredients/ru-russian-oil.json index 28279cae35197..424e0ecbe95b5 100644 --- a/tests/unit/expected_test_results/ingredients/ru-russian-oil.json +++ b/tests/unit/expected_test_results/ingredients/ru-russian-oil.json @@ -4,6 +4,7 @@ "ciqual_food_code" : "17440", "from_palm_oil" : "no", "id" : "en:sunflower-oil", + "is_in_taxonomy" : 1, "percent_estimate" : 66.6666666666667, "percent_max" : 100, "percent_min" : 33.3333333333333, @@ -15,6 +16,7 @@ "ciqual_food_code" : "17420", "from_palm_oil" : "no", "id" : "en:soya-oil", + "is_in_taxonomy" : 1, "percent_estimate" : 16.6666666666667, "percent_max" : 50, "percent_min" : 0, @@ -26,6 +28,7 @@ "ciqual_food_code" : "17420", "from_palm_oil" : "no", "id" : "en:soya-oil", + "is_in_taxonomy" : 1, "percent_estimate" : 16.6666666666667, "percent_max" : 33.3333333333333, "percent_min" : 0, diff --git a/tests/unit/expected_test_results/ingredients/xx-single-letters.json b/tests/unit/expected_test_results/ingredients/xx-single-letters.json index bff87edd6baa2..0291a4c004603 100644 --- a/tests/unit/expected_test_results/ingredients/xx-single-letters.json +++ b/tests/unit/expected_test_results/ingredients/xx-single-letters.json @@ -2,6 +2,7 @@ "ingredients" : [ { "id" : "fr:a", + "is_in_taxonomy" : 0, "percent_estimate" : 51.3888888888889, "percent_max" : 100, "percent_min" : 2.77777777777778, @@ -9,6 +10,7 @@ }, { "id" : "fr:b", + "is_in_taxonomy" : 0, "percent_estimate" : 24.3055555555556, "percent_max" : 50, "percent_min" : 0, @@ -16,6 +18,7 @@ }, { "id" : "fr:c", + "is_in_taxonomy" : 0, "percent_estimate" : 12.1527777777778, "percent_max" : 33.3333333333333, "percent_min" : 0, @@ -23,6 +26,7 @@ }, { "id" : "fr:d", + "is_in_taxonomy" : 0, "percent_estimate" : 6.07638888888889, "percent_max" : 25, "percent_min" : 0, @@ -30,6 +34,7 @@ }, { "id" : "fr:e", + "is_in_taxonomy" : 0, "percent_estimate" : 3.03819444444444, "percent_max" : 20, "percent_min" : 0, @@ -37,6 +42,7 @@ }, { "id" : "fr:f", + "is_in_taxonomy" : 0, "percent_estimate" : 1.51909722222222, "percent_max" : 16.6666666666667, "percent_min" : 0, @@ -44,6 +50,7 @@ }, { "id" : "fr:g", + "is_in_taxonomy" : 0, "percent_estimate" : 0.759548611111114, "percent_max" : 14.2857142857143, "percent_min" : 0, @@ -51,6 +58,7 @@ }, { "id" : "fr:h", + "is_in_taxonomy" : 0, "percent_estimate" : 0.379774305555557, "percent_max" : 12.5, "percent_min" : 0, @@ -58,6 +66,7 @@ }, { "id" : "fr:i", + "is_in_taxonomy" : 0, "percent_estimate" : 0.189887152777779, "percent_max" : 11.1111111111111, "percent_min" : 0, @@ -65,6 +74,7 @@ }, { "id" : "fr:j", + "is_in_taxonomy" : 0, "percent_estimate" : 0.0949435763888857, "percent_max" : 10, "percent_min" : 0, @@ -72,6 +82,7 @@ }, { "id" : "fr:k", + "is_in_taxonomy" : 0, "percent_estimate" : 0.0474717881944429, "percent_max" : 9.09090909090909, "percent_min" : 0, @@ -79,6 +90,7 @@ }, { "id" : "fr:l", + "is_in_taxonomy" : 0, "percent_estimate" : 0.0237358940972214, "percent_max" : 8.33333333333333, "percent_min" : 0, @@ -86,6 +98,7 @@ }, { "id" : "fr:m", + "is_in_taxonomy" : 0, "percent_estimate" : 0.0118679470486143, "percent_max" : 7.69230769230769, "percent_min" : 0, @@ -93,6 +106,7 @@ }, { "id" : "fr:n", + "is_in_taxonomy" : 0, "percent_estimate" : 0.00593397352430713, "percent_max" : 7.14285714285714, "percent_min" : 0, @@ -100,6 +114,7 @@ }, { "id" : "en:bone", + "is_in_taxonomy" : 1, "percent_estimate" : 0.00296698676215357, "percent_max" : 6.66666666666667, "percent_min" : 0, @@ -109,6 +124,7 @@ }, { "id" : "fr:p", + "is_in_taxonomy" : 0, "percent_estimate" : 0.00148349338107323, "percent_max" : 6.25, "percent_min" : 0, @@ -116,6 +132,7 @@ }, { "id" : "fr:q", + "is_in_taxonomy" : 0, "percent_estimate" : 0.000741746690536615, "percent_max" : 5.88235294117647, "percent_min" : 0, @@ -123,6 +140,7 @@ }, { "id" : "fr:r", + "is_in_taxonomy" : 0, "percent_estimate" : 0.000370873345268308, "percent_max" : 5.55555555555556, "percent_min" : 0, @@ -130,6 +148,7 @@ }, { "id" : "fr:s", + "is_in_taxonomy" : 0, "percent_estimate" : 0.000185436672637707, "percent_max" : 5.26315789473684, "percent_min" : 0, @@ -137,6 +156,7 @@ }, { "id" : "fr:t", + "is_in_taxonomy" : 0, "percent_estimate" : 9.27183363188533e-05, "percent_max" : 5, "percent_min" : 0, @@ -144,6 +164,7 @@ }, { "id" : "fr:u", + "is_in_taxonomy" : 0, "percent_estimate" : 4.63591681594266e-05, "percent_max" : 4.76190476190476, "percent_min" : 0, @@ -151,6 +172,7 @@ }, { "id" : "fr:v", + "is_in_taxonomy" : 0, "percent_estimate" : 2.31795840761606e-05, "percent_max" : 4.54545454545455, "percent_min" : 0, @@ -158,6 +180,7 @@ }, { "id" : "fr:w", + "is_in_taxonomy" : 0, "percent_estimate" : 1.15897920380803e-05, "percent_max" : 4.34782608695652, "percent_min" : 0, @@ -165,6 +188,7 @@ }, { "id" : "fr:x", + "is_in_taxonomy" : 0, "percent_estimate" : 5.79489601904015e-06, "percent_max" : 4.16666666666667, "percent_min" : 0, @@ -172,6 +196,7 @@ }, { "id" : "fr:y", + "is_in_taxonomy" : 0, "percent_estimate" : 2.89744801307279e-06, "percent_max" : 4, "percent_min" : 0, @@ -179,6 +204,7 @@ }, { "id" : "fr:z", + "is_in_taxonomy" : 0, "percent_estimate" : 1.44872400653639e-06, "percent_max" : 3.84615384615385, "percent_min" : 0, @@ -186,6 +212,7 @@ }, { "id" : "fr:0-1", + "is_in_taxonomy" : 0, "percent_estimate" : 7.24362003268197e-07, "percent_max" : 3.7037037037037, "percent_min" : 0, @@ -193,6 +220,7 @@ }, { "id" : "fr:2-3", + "is_in_taxonomy" : 0, "percent_estimate" : 3.62180998081385e-07, "percent_max" : 3.57142857142857, "percent_min" : 0, @@ -200,6 +228,7 @@ }, { "id" : "fr:4-5", + "is_in_taxonomy" : 0, "percent_estimate" : 1.81090499040693e-07, "percent_max" : 3.44827586206897, "percent_min" : 0, @@ -207,6 +236,7 @@ }, { "id" : "fr:6-7", + "is_in_taxonomy" : 0, "percent_estimate" : 9.05452495203463e-08, "percent_max" : 3.33333333333333, "percent_min" : 0, @@ -214,6 +244,7 @@ }, { "id" : "fr:8-9", + "is_in_taxonomy" : 0, "percent_estimate" : 4.52726283128868e-08, "percent_max" : 3.2258064516129, "percent_min" : 0, @@ -221,6 +252,7 @@ }, { "id" : "fr:10-100-1000", + "is_in_taxonomy" : 0, "percent_estimate" : 2.26363141564434e-08, "percent_max" : 3.125, "percent_min" : 0, @@ -228,6 +260,7 @@ }, { "id" : "fr:vt", + "is_in_taxonomy" : 0, "percent_estimate" : 1.13181570782217e-08, "percent_max" : 3.03030303030303, "percent_min" : 0, @@ -235,6 +268,7 @@ }, { "id" : "fr:leaf", + "is_in_taxonomy" : 0, "percent_estimate" : 5.65907498639717e-09, "percent_max" : 2.94117647058824, "percent_min" : 0, @@ -242,6 +276,7 @@ }, { "id" : "fr:something", + "is_in_taxonomy" : 0, "labels" : "en:organic", "percent_estimate" : 2.82953749319859e-09, "percent_max" : 2.94117647058824, @@ -253,12 +288,14 @@ "ingredients" : [ { "id" : "fr:u", + "is_in_taxonomy" : 0, "percent_estimate" : 2.82953749319859e-09, "percent_max" : 2.77777777777778, "percent_min" : 0, "text" : "u" } ], + "is_in_taxonomy" : 0, "percent_estimate" : 2.82953749319859e-09, "percent_max" : 2.77777777777778, "percent_min" : 0, diff --git a/tests/unit/expected_test_results/ingredients_contents/fruits-water-sugar.json b/tests/unit/expected_test_results/ingredients_contents/fruits-water-sugar.json index ed1cd3e652fa7..1228291ea2bf8 100644 --- a/tests/unit/expected_test_results/ingredients_contents/fruits-water-sugar.json +++ b/tests/unit/expected_test_results/ingredients_contents/fruits-water-sugar.json @@ -3,6 +3,7 @@ { "ciqual_food_code" : "13050", "id" : "en:apple", + "is_in_taxonomy" : 1, "percent" : 50, "percent_estimate" : 50, "percent_max" : 50, @@ -14,6 +15,7 @@ { "ciqual_food_code" : "13005", "id" : "en:banana", + "is_in_taxonomy" : 1, "percent" : 30, "percent_estimate" : 30, "percent_max" : 30, @@ -25,6 +27,7 @@ { "ciqual_food_code" : "13014", "id" : "en:strawberry", + "is_in_taxonomy" : 1, "percent" : 10, "percent_estimate" : 10, "percent_max" : 10, @@ -36,6 +39,7 @@ { "ciqual_food_code" : "18066", "id" : "en:water", + "is_in_taxonomy" : 1, "percent" : 5, "percent_estimate" : 5, "percent_max" : 5, @@ -47,6 +51,7 @@ { "ciqual_proxy_food_code" : "31016", "id" : "en:sugar", + "is_in_taxonomy" : 1, "percent" : 5, "percent_estimate" : 5, "percent_max" : 5, diff --git a/tests/unit/expected_test_results/ingredients_contents/vegetable-oils.json b/tests/unit/expected_test_results/ingredients_contents/vegetable-oils.json index 247591ff16007..1a47b5ee59a18 100644 --- a/tests/unit/expected_test_results/ingredients_contents/vegetable-oils.json +++ b/tests/unit/expected_test_results/ingredients_contents/vegetable-oils.json @@ -4,6 +4,7 @@ "ciqual_proxy_food_code" : "17270", "from_palm_oil" : "no", "id" : "en:olive-oil", + "is_in_taxonomy" : 1, "percent" : 40, "percent_estimate" : 40, "percent_max" : 40, @@ -16,6 +17,7 @@ "ciqual_food_code" : "17130", "from_palm_oil" : "no", "id" : "en:rapeseed-oil", + "is_in_taxonomy" : 1, "percent" : 30, "percent_estimate" : 30, "percent_max" : 30, @@ -28,6 +30,7 @@ "ciqual_food_code" : "17440", "from_palm_oil" : "no", "id" : "en:sunflower-oil", + "is_in_taxonomy" : 1, "percent" : 20, "percent_estimate" : 20, "percent_max" : 20, @@ -40,6 +43,7 @@ "ciqual_food_code" : "17220", "from_palm_oil" : "no", "id" : "en:walnut-oil", + "is_in_taxonomy" : 1, "percent" : 10, "percent_estimate" : 10, "percent_max" : 10, diff --git a/tests/unit/expected_test_results/ingredients_percent/2-ingredients-with-max-percent.json b/tests/unit/expected_test_results/ingredients_percent/2-ingredients-with-max-percent.json index ffb677b99bd90..852ba9e8b4656 100644 --- a/tests/unit/expected_test_results/ingredients_percent/2-ingredients-with-max-percent.json +++ b/tests/unit/expected_test_results/ingredients_percent/2-ingredients-with-max-percent.json @@ -1,6 +1,7 @@ [ { "id" : "en:milk", + "is_in_taxonomy" : 1, "percent_estimate" : 95, "percent_max" : 100, "percent_min" : 90, @@ -8,6 +9,7 @@ }, { "id" : "en:lemon-flavouring", + "is_in_taxonomy" : 1, "percent_estimate" : 2.5, "percent_max" : "5", "percent_min" : 0, @@ -15,6 +17,7 @@ }, { "id" : "en:orange-flavouring", + "is_in_taxonomy" : 1, "percent_estimate" : 2.5, "percent_max" : "5", "percent_min" : 0, diff --git a/tests/unit/expected_test_results/ingredients_percent/absolute-percent.json b/tests/unit/expected_test_results/ingredients_percent/absolute-percent.json index 4bf248a4c1ffa..7949d58899f27 100644 --- a/tests/unit/expected_test_results/ingredients_percent/absolute-percent.json +++ b/tests/unit/expected_test_results/ingredients_percent/absolute-percent.json @@ -4,6 +4,7 @@ "ingredients" : [ { "id" : "en:apple", + "is_in_taxonomy" : 1, "percent" : 20, "percent_estimate" : 20, "percent_max" : 20, @@ -12,6 +13,7 @@ }, { "id" : "en:pear", + "is_in_taxonomy" : 1, "percent" : 15, "percent_estimate" : 15, "percent_max" : 15, @@ -20,6 +22,7 @@ }, { "id" : "en:cranberry", + "is_in_taxonomy" : 1, "percent_estimate" : 11.25, "percent_max" : 15, "percent_min" : 7.5, @@ -27,12 +30,14 @@ }, { "id" : "en:lemon", + "is_in_taxonomy" : 1, "percent_estimate" : 3.75, "percent_max" : 7.5, "percent_min" : 0, "text" : "lemon" } ], + "is_in_taxonomy" : 1, "percent" : 50, "percent_estimate" : 50, "percent_max" : 50, @@ -41,6 +46,7 @@ }, { "id" : "en:sugar", + "is_in_taxonomy" : 1, "percent_estimate" : 50, "percent_max" : 50, "percent_min" : 50, diff --git a/tests/unit/expected_test_results/ingredients_percent/chocolate-1-sub-ingredient.json b/tests/unit/expected_test_results/ingredients_percent/chocolate-1-sub-ingredient.json index bcea78a973559..86f5b56998844 100644 --- a/tests/unit/expected_test_results/ingredients_percent/chocolate-1-sub-ingredient.json +++ b/tests/unit/expected_test_results/ingredients_percent/chocolate-1-sub-ingredient.json @@ -4,12 +4,14 @@ "ingredients" : [ { "id" : "en:cocoa", + "is_in_taxonomy" : 1, "percent_estimate" : 100, "percent_max" : 100, "percent_min" : 100, "text" : "cocoa" } ], + "is_in_taxonomy" : 1, "percent_estimate" : 100, "percent_max" : 100, "percent_min" : 100, diff --git a/tests/unit/expected_test_results/ingredients_percent/chocolate-2-sub-ingredients.json b/tests/unit/expected_test_results/ingredients_percent/chocolate-2-sub-ingredients.json index 32a52a8accf88..845439ebb971f 100644 --- a/tests/unit/expected_test_results/ingredients_percent/chocolate-2-sub-ingredients.json +++ b/tests/unit/expected_test_results/ingredients_percent/chocolate-2-sub-ingredients.json @@ -4,6 +4,7 @@ "ingredients" : [ { "id" : "en:cocoa", + "is_in_taxonomy" : 1, "percent_estimate" : 50, "percent_max" : 100, "percent_min" : 25, @@ -11,12 +12,14 @@ }, { "id" : "en:sugar", + "is_in_taxonomy" : 1, "percent_estimate" : 25, "percent_max" : 50, "percent_min" : 0, "text" : "sugar" } ], + "is_in_taxonomy" : 1, "percent_estimate" : 75, "percent_max" : 100, "percent_min" : 50, @@ -24,6 +27,7 @@ }, { "id" : "en:milk", + "is_in_taxonomy" : 1, "percent_estimate" : 25, "percent_max" : 50, "percent_min" : 0, diff --git a/tests/unit/expected_test_results/ingredients_percent/chocolate-sub-sub-ingredients.json b/tests/unit/expected_test_results/ingredients_percent/chocolate-sub-sub-ingredients.json index 9d2dba4a4d9e1..6cc8f9a2506aa 100644 --- a/tests/unit/expected_test_results/ingredients_percent/chocolate-sub-sub-ingredients.json +++ b/tests/unit/expected_test_results/ingredients_percent/chocolate-sub-sub-ingredients.json @@ -7,6 +7,7 @@ "ingredients" : [ { "id" : "en:cocoa-paste", + "is_in_taxonomy" : 1, "percent" : 70, "percent_estimate" : 70, "percent_max" : 70, @@ -15,12 +16,14 @@ }, { "id" : "en:cocoa-butter", + "is_in_taxonomy" : 1, "percent_estimate" : 15, "percent_max" : 30, "percent_min" : 0, "text" : "cocoa butter" } ], + "is_in_taxonomy" : 1, "percent_estimate" : 85, "percent_max" : 100, "percent_min" : 70, @@ -28,12 +31,14 @@ }, { "id" : "en:sugar", + "is_in_taxonomy" : 1, "percent_estimate" : 15, "percent_max" : 30, "percent_min" : 0, "text" : "sugar" } ], + "is_in_taxonomy" : 1, "percent_estimate" : 100, "percent_max" : 100, "percent_min" : 100, diff --git a/tests/unit/expected_test_results/ingredients_percent/flour-chocolate-egg.json b/tests/unit/expected_test_results/ingredients_percent/flour-chocolate-egg.json index 7dab8c7ef3a66..ab0c358ae4fa3 100644 --- a/tests/unit/expected_test_results/ingredients_percent/flour-chocolate-egg.json +++ b/tests/unit/expected_test_results/ingredients_percent/flour-chocolate-egg.json @@ -1,6 +1,7 @@ [ { "id" : "en:flour", + "is_in_taxonomy" : 1, "percent_estimate" : 66.6666666666667, "percent_max" : 100, "percent_min" : 33.3333333333333, @@ -11,6 +12,7 @@ "ingredients" : [ { "id" : "en:cocoa", + "is_in_taxonomy" : 1, "percent_estimate" : 8.33333333333333, "percent_max" : 50, "percent_min" : 0, @@ -18,6 +20,7 @@ }, { "id" : "en:sugar", + "is_in_taxonomy" : 1, "percent_estimate" : 4.16666666666667, "percent_max" : 25, "percent_min" : 0, @@ -25,12 +28,14 @@ }, { "id" : "en:soya-lecithin", + "is_in_taxonomy" : 1, "percent_estimate" : 4.16666666666667, "percent_max" : 16.6666666666667, "percent_min" : 0, "text" : "soy lecithin" } ], + "is_in_taxonomy" : 1, "percent_estimate" : 16.6666666666667, "percent_max" : 50, "percent_min" : 0, @@ -38,6 +43,7 @@ }, { "id" : "en:egg", + "is_in_taxonomy" : 1, "percent_estimate" : 16.6666666666667, "percent_max" : 33.3333333333333, "percent_min" : 0, diff --git a/tests/unit/expected_test_results/ingredients_percent/illegal-division-by-zero-bug-0-percent.json b/tests/unit/expected_test_results/ingredients_percent/illegal-division-by-zero-bug-0-percent.json index fb3b3ad21cc1d..4eee57eef9fe1 100644 --- a/tests/unit/expected_test_results/ingredients_percent/illegal-division-by-zero-bug-0-percent.json +++ b/tests/unit/expected_test_results/ingredients_percent/illegal-division-by-zero-bug-0-percent.json @@ -7,25 +7,30 @@ "ingredients" : [ { "id" : "en:onion", + "is_in_taxonomy" : 1, "percent_estimate" : 25, "text" : "contient oignon" }, { "id" : "en:e164", + "is_in_taxonomy" : 1, "percent" : 0.1, "percent_estimate" : 25, "text" : "safran" } ], + "is_in_taxonomy" : 1, "percent_estimate" : 50, "text" : "épices et aromates" }, { "id" : "en:salt", + "is_in_taxonomy" : 1, "percent_estimate" : 50, "text" : "sel" } ], + "is_in_taxonomy" : 1, "percent" : 0, "percent_estimate" : 100, "text" : "légumes" diff --git a/tests/unit/expected_test_results/ingredients_percent/impossible-values-infinte-loop-bug.json b/tests/unit/expected_test_results/ingredients_percent/impossible-values-infinte-loop-bug.json index 2dfac00717a9a..bb03eecd0fb1c 100644 --- a/tests/unit/expected_test_results/ingredients_percent/impossible-values-infinte-loop-bug.json +++ b/tests/unit/expected_test_results/ingredients_percent/impossible-values-infinte-loop-bug.json @@ -1,23 +1,27 @@ [ { "id" : "en:cocoa-butter", + "is_in_taxonomy" : 1, "percent" : 15, "percent_estimate" : 15, "text" : "beurre de cacao" }, { "id" : "en:sugar", + "is_in_taxonomy" : 1, "percent" : 10, "percent_estimate" : 10, "text" : "sucre" }, { "id" : "en:milk-proteins", + "is_in_taxonomy" : 1, "percent_estimate" : 37.5, "text" : "protéines de lait" }, { "id" : "en:egg", + "is_in_taxonomy" : 1, "percent" : 1, "percent_estimate" : 37.5, "text" : "oeuf" diff --git a/tests/unit/expected_test_results/ingredients_percent/impossible-values-sub-ingredients.json b/tests/unit/expected_test_results/ingredients_percent/impossible-values-sub-ingredients.json index a8de18f3b83ce..1d96d397e75f5 100644 --- a/tests/unit/expected_test_results/ingredients_percent/impossible-values-sub-ingredients.json +++ b/tests/unit/expected_test_results/ingredients_percent/impossible-values-sub-ingredients.json @@ -1,6 +1,7 @@ [ { "id" : "en:flour", + "is_in_taxonomy" : 1, "percent" : 12, "percent_estimate" : 12, "text" : "farine" @@ -10,28 +11,33 @@ "ingredients" : [ { "id" : "en:cocoa-butter", + "is_in_taxonomy" : 1, "percent" : 15, "percent_estimate" : 15, "text" : "beurre de cacao" }, { "id" : "en:sugar", + "is_in_taxonomy" : 1, "percent" : 10, "percent_estimate" : 10, "text" : "sucre" }, { "id" : "en:milk-proteins", + "is_in_taxonomy" : 1, "percent_estimate" : 31.5, "text" : "protéines de lait" }, { "id" : "en:egg", + "is_in_taxonomy" : 1, "percent" : 1, "percent_estimate" : 31.5, "text" : "oeuf" } ], + "is_in_taxonomy" : 1, "percent_estimate" : 88, "text" : "chocolat" } diff --git a/tests/unit/expected_test_results/ingredients_percent/ingredient-with-max-percent-but-lower-than-later-ingredients.json b/tests/unit/expected_test_results/ingredients_percent/ingredient-with-max-percent-but-lower-than-later-ingredients.json index 1f74e3ac8a4a5..38b92d98b24a8 100644 --- a/tests/unit/expected_test_results/ingredients_percent/ingredient-with-max-percent-but-lower-than-later-ingredients.json +++ b/tests/unit/expected_test_results/ingredients_percent/ingredient-with-max-percent-but-lower-than-later-ingredients.json @@ -1,6 +1,7 @@ [ { "id" : "en:milk", + "is_in_taxonomy" : 1, "percent_estimate" : 62.5, "percent_max" : 80, "percent_min" : 45, @@ -8,6 +9,7 @@ }, { "id" : "en:flavouring", + "is_in_taxonomy" : 1, "percent_estimate" : 23.75, "percent_max" : 45, "percent_min" : 10, @@ -15,6 +17,7 @@ }, { "id" : "en:sugar", + "is_in_taxonomy" : 1, "percent" : 10, "percent_estimate" : 13.75, "percent_max" : 10, diff --git a/tests/unit/expected_test_results/ingredients_percent/ingredient-with-max-percent-but-sum-less-than-100-percent.json b/tests/unit/expected_test_results/ingredients_percent/ingredient-with-max-percent-but-sum-less-than-100-percent.json index 9548fc1c447ff..dd6a104366181 100644 --- a/tests/unit/expected_test_results/ingredients_percent/ingredient-with-max-percent-but-sum-less-than-100-percent.json +++ b/tests/unit/expected_test_results/ingredients_percent/ingredient-with-max-percent-but-sum-less-than-100-percent.json @@ -1,6 +1,7 @@ [ { "id" : "en:milk", + "is_in_taxonomy" : 1, "percent" : 80, "percent_estimate" : 80, "percent_max" : 80, @@ -9,6 +10,7 @@ }, { "id" : "en:flavouring", + "is_in_taxonomy" : 1, "percent_estimate" : 20, "percent_max" : 20, "percent_min" : 20, diff --git a/tests/unit/expected_test_results/ingredients_percent/ingredient-with-max-percent-from-parent-ingredient.json b/tests/unit/expected_test_results/ingredients_percent/ingredient-with-max-percent-from-parent-ingredient.json index f940abe351231..c325ef0f6b0a2 100644 --- a/tests/unit/expected_test_results/ingredients_percent/ingredient-with-max-percent-from-parent-ingredient.json +++ b/tests/unit/expected_test_results/ingredients_percent/ingredient-with-max-percent-from-parent-ingredient.json @@ -1,6 +1,7 @@ [ { "id" : "en:milk", + "is_in_taxonomy" : 1, "percent_estimate" : 97.5, "percent_max" : 100, "percent_min" : 95, @@ -8,6 +9,7 @@ }, { "id" : "en:natural-flavouring", + "is_in_taxonomy" : 1, "percent_estimate" : 2.5, "percent_max" : "5", "percent_min" : 0, diff --git a/tests/unit/expected_test_results/ingredients_percent/ingredient-with-max-percent-is-first-ingredient.json b/tests/unit/expected_test_results/ingredients_percent/ingredient-with-max-percent-is-first-ingredient.json index ac1596670a797..16e0aebc17e1b 100644 --- a/tests/unit/expected_test_results/ingredients_percent/ingredient-with-max-percent-is-first-ingredient.json +++ b/tests/unit/expected_test_results/ingredients_percent/ingredient-with-max-percent-is-first-ingredient.json @@ -1,6 +1,7 @@ [ { "id" : "en:flavouring", + "is_in_taxonomy" : 1, "percent_estimate" : 75, "percent_max" : 100, "percent_min" : 50, @@ -8,6 +9,7 @@ }, { "id" : "en:lemon-flavouring", + "is_in_taxonomy" : 1, "percent_estimate" : 25, "percent_max" : 50, "percent_min" : 0, diff --git a/tests/unit/expected_test_results/ingredients_percent/ingredient-with-max-percent.json b/tests/unit/expected_test_results/ingredients_percent/ingredient-with-max-percent.json index 735e1ca96fb49..b8097258b0828 100644 --- a/tests/unit/expected_test_results/ingredients_percent/ingredient-with-max-percent.json +++ b/tests/unit/expected_test_results/ingredients_percent/ingredient-with-max-percent.json @@ -1,6 +1,7 @@ [ { "id" : "en:milk", + "is_in_taxonomy" : 1, "percent_estimate" : 97.5, "percent_max" : 100, "percent_min" : 95, @@ -8,6 +9,7 @@ }, { "id" : "en:flavouring", + "is_in_taxonomy" : 1, "percent_estimate" : 2.5, "percent_max" : "5", "percent_min" : 0, diff --git a/tests/unit/expected_test_results/ingredients_percent/ingredients-in-different-quantities.json b/tests/unit/expected_test_results/ingredients_percent/ingredients-in-different-quantities.json index 721105c531274..2e274b7cc7f77 100644 --- a/tests/unit/expected_test_results/ingredients_percent/ingredients-in-different-quantities.json +++ b/tests/unit/expected_test_results/ingredients_percent/ingredients-in-different-quantities.json @@ -1,6 +1,7 @@ [ { "id" : "en:lemon", + "is_in_taxonomy" : 1, "percent" : 45.3514636391239, "percent_estimate" : 45.3514636391239, "quantity" : "1 KG", @@ -9,6 +10,7 @@ }, { "id" : "en:orange-juice", + "is_in_taxonomy" : 1, "percent" : 4.53514636391239, "percent_estimate" : 4.53514636391239, "quantity" : "10 cl", @@ -17,6 +19,7 @@ }, { "id" : "en:sugar", + "is_in_taxonomy" : 1, "percent" : 0.226757318195619, "percent_estimate" : 0.226757318195619, "quantity" : "5 g", @@ -25,6 +28,7 @@ }, { "id" : "en:salt", + "is_in_taxonomy" : 1, "percent" : 2.26757318195619e-05, "percent_estimate" : 2.26757318195619e-05, "quantity" : "0.5 mg", @@ -33,6 +37,7 @@ }, { "id" : "en:apple-juice", + "is_in_taxonomy" : 1, "percent" : 45.3514636391239, "percent_estimate" : 45.3514636391239, "quantity" : "1 L", @@ -41,6 +46,7 @@ }, { "id" : "en:ice-cream", + "is_in_taxonomy" : 1, "percent" : 4.53514636391239, "percent_estimate" : 4.53514636391239, "quantity" : "100 ml", diff --git a/tests/unit/expected_test_results/ingredients_percent/ingredients-in-grams-with-1-ingredient-missing-a-quantity.json b/tests/unit/expected_test_results/ingredients_percent/ingredients-in-grams-with-1-ingredient-missing-a-quantity.json index 66200d4c2e75d..ea2cb0c6d4316 100644 --- a/tests/unit/expected_test_results/ingredients_percent/ingredients-in-grams-with-1-ingredient-missing-a-quantity.json +++ b/tests/unit/expected_test_results/ingredients_percent/ingredients-in-grams-with-1-ingredient-missing-a-quantity.json @@ -1,6 +1,7 @@ [ { "id" : "en:milk", + "is_in_taxonomy" : 1, "percent_estimate" : 72.5, "percent_max" : 100, "percent_min" : 45, @@ -10,6 +11,7 @@ }, { "id" : "en:sugar", + "is_in_taxonomy" : 1, "percent_estimate" : 13.75, "percent_max" : 50, "percent_min" : 0, @@ -19,6 +21,7 @@ }, { "id" : "en:lemon-flavouring", + "is_in_taxonomy" : 1, "percent_estimate" : 13.75, "percent_max" : "5", "percent_min" : 0, diff --git a/tests/unit/expected_test_results/ingredients_percent/ingredients-in-grams-with-sum-greater-than-100.json b/tests/unit/expected_test_results/ingredients_percent/ingredients-in-grams-with-sum-greater-than-100.json index d81dd68bd2c31..4ebdd23fbfe1c 100644 --- a/tests/unit/expected_test_results/ingredients_percent/ingredients-in-grams-with-sum-greater-than-100.json +++ b/tests/unit/expected_test_results/ingredients_percent/ingredients-in-grams-with-sum-greater-than-100.json @@ -1,6 +1,7 @@ [ { "id" : "en:milk", + "is_in_taxonomy" : 1, "percent" : 80, "percent_estimate" : 80, "percent_max" : 80, @@ -11,6 +12,7 @@ }, { "id" : "en:sugar", + "is_in_taxonomy" : 1, "percent" : 15, "percent_estimate" : 15, "percent_max" : 15, @@ -21,6 +23,7 @@ }, { "id" : "en:lemon-flavouring", + "is_in_taxonomy" : 1, "percent" : 5, "percent_estimate" : 5, "percent_max" : 5, diff --git a/tests/unit/expected_test_results/ingredients_percent/ingredients-in-grams-with-sum-lesser-than-100-not-in-quantity-order.json b/tests/unit/expected_test_results/ingredients_percent/ingredients-in-grams-with-sum-lesser-than-100-not-in-quantity-order.json index e949d6e1e5d67..318816f6dc84a 100644 --- a/tests/unit/expected_test_results/ingredients_percent/ingredients-in-grams-with-sum-lesser-than-100-not-in-quantity-order.json +++ b/tests/unit/expected_test_results/ingredients_percent/ingredients-in-grams-with-sum-lesser-than-100-not-in-quantity-order.json @@ -1,6 +1,7 @@ [ { "id" : "en:milk", + "is_in_taxonomy" : 1, "percent" : 20, "percent_estimate" : 20, "quantity" : "10 g", @@ -12,15 +13,18 @@ "ingredients" : [ { "id" : "en:apple", + "is_in_taxonomy" : 1, "percent_estimate" : 30, "text" : "apples" }, { "id" : "en:pear", + "is_in_taxonomy" : 1, "percent_estimate" : 30, "text" : "pears" } ], + "is_in_taxonomy" : 1, "percent" : 60, "percent_estimate" : 60, "quantity" : "30 g", @@ -29,6 +33,7 @@ }, { "id" : "en:lemon-flavouring", + "is_in_taxonomy" : 1, "percent" : 20, "percent_estimate" : 20, "quantity" : "10 g", diff --git a/tests/unit/expected_test_results/ingredients_percent/max-sugar-salt-nutrition-facts.json b/tests/unit/expected_test_results/ingredients_percent/max-sugar-salt-nutrition-facts.json index 7ba4ad4fa2cea..b5e6f56354325 100644 --- a/tests/unit/expected_test_results/ingredients_percent/max-sugar-salt-nutrition-facts.json +++ b/tests/unit/expected_test_results/ingredients_percent/max-sugar-salt-nutrition-facts.json @@ -1,6 +1,7 @@ [ { "id" : "en:water", + "is_in_taxonomy" : 1, "percent_estimate" : 92.5, "percent_max" : 100, "percent_min" : 85, @@ -8,6 +9,7 @@ }, { "id" : "en:sugar", + "is_in_taxonomy" : 1, "percent_estimate" : 3.75, "percent_max" : 10, "percent_min" : 0, @@ -15,6 +17,7 @@ }, { "id" : "en:salt", + "is_in_taxonomy" : 1, "percent_estimate" : 3.75, "percent_max" : 5, "percent_min" : 0, diff --git a/tests/unit/expected_test_results/ingredients_percent/min-in-cumin-bug.json b/tests/unit/expected_test_results/ingredients_percent/min-in-cumin-bug.json index 5c5177c958e67..86fef1b56c0d4 100644 --- a/tests/unit/expected_test_results/ingredients_percent/min-in-cumin-bug.json +++ b/tests/unit/expected_test_results/ingredients_percent/min-in-cumin-bug.json @@ -1,6 +1,7 @@ [ { "id" : "en:salt", + "is_in_taxonomy" : 1, "percent" : 56.3380281690141, "percent_estimate" : 56.3380281690141, "percent_max" : 56.3380281690141, @@ -9,6 +10,7 @@ }, { "id" : "en:pepper", + "is_in_taxonomy" : 1, "percent" : 28.169014084507, "percent_estimate" : 28.169014084507, "percent_max" : 28.169014084507, @@ -17,6 +19,7 @@ }, { "id" : "en:chili-pepper", + "is_in_taxonomy" : 1, "percent" : 14.0845070422535, "percent_estimate" : 14.0845070422535, "percent_max" : 14.0845070422535, @@ -25,6 +28,7 @@ }, { "id" : "en:cumin", + "is_in_taxonomy" : 1, "percent" : 1.12676056338028, "percent_estimate" : 1.12676056338028, "percent_max" : 1.12676056338027, @@ -33,6 +37,7 @@ }, { "id" : "en:garlic", + "is_in_taxonomy" : 1, "percent" : 0.28169014084507, "percent_estimate" : 0.281690140845058, "percent_max" : 0.281690140845058, diff --git a/tests/unit/expected_test_results/ingredients_percent/minimum-percent.json b/tests/unit/expected_test_results/ingredients_percent/minimum-percent.json index 4397061fd4ac6..50338eadee754 100644 --- a/tests/unit/expected_test_results/ingredients_percent/minimum-percent.json +++ b/tests/unit/expected_test_results/ingredients_percent/minimum-percent.json @@ -1,6 +1,7 @@ [ { "id" : "en:milk", + "is_in_taxonomy" : 1, "percent_estimate" : 73, "percent_max" : 73, "percent_min" : 73, @@ -8,6 +9,7 @@ }, { "id" : "en:cocoa", + "is_in_taxonomy" : 1, "percent" : 27, "percent_estimate" : 27, "percent_max" : 27, diff --git a/tests/unit/expected_test_results/ingredients_percent/missing-percent-not-first-or-last.json b/tests/unit/expected_test_results/ingredients_percent/missing-percent-not-first-or-last.json index c487d5383a16b..bd6c0080ad40d 100644 --- a/tests/unit/expected_test_results/ingredients_percent/missing-percent-not-first-or-last.json +++ b/tests/unit/expected_test_results/ingredients_percent/missing-percent-not-first-or-last.json @@ -1,6 +1,7 @@ [ { "id" : "en:apple-juice", + "is_in_taxonomy" : 1, "percent" : 57.3, "percent_estimate" : 57.3, "percent_max" : 57.3, @@ -9,6 +10,7 @@ }, { "id" : "en:carrot-juice", + "is_in_taxonomy" : 1, "percent_estimate" : 40.2, "percent_max" : 40.2, "percent_min" : 40.2, @@ -16,6 +18,7 @@ }, { "id" : "en:ginger", + "is_in_taxonomy" : 1, "percent" : 2.5, "percent_estimate" : 2.5, "percent_max" : 2.5, diff --git a/tests/unit/expected_test_results/ingredients_percent/percentage-range-negative-pl.json b/tests/unit/expected_test_results/ingredients_percent/percentage-range-negative-pl.json index fdcea19ad8b6f..60779be4185d6 100644 --- a/tests/unit/expected_test_results/ingredients_percent/percentage-range-negative-pl.json +++ b/tests/unit/expected_test_results/ingredients_percent/percentage-range-negative-pl.json @@ -1,6 +1,7 @@ [ { "id" : "en:apple", + "is_in_taxonomy" : 1, "percent" : 84, "percent_estimate" : 84, "percent_max" : 84, @@ -9,6 +10,7 @@ }, { "id" : "en:mango-puree", + "is_in_taxonomy" : 1, "percent" : 10, "percent_estimate" : 10, "percent_max" : 10, @@ -17,6 +19,7 @@ }, { "id" : "en:concentrated-apple-juice", + "is_in_taxonomy" : 1, "percent" : 3, "percent_estimate" : 3, "percent_max" : 3, @@ -25,6 +28,7 @@ }, { "id" : "pl:zagęszczony-sok-z-marakuji", + "is_in_taxonomy" : 0, "percent" : 1.5, "percent_estimate" : 1.5, "percent_max" : 1.5, @@ -33,6 +37,7 @@ }, { "id" : "en:acerola-juice", + "is_in_taxonomy" : 1, "percent_estimate" : 1.5, "percent_max" : 1.5, "percent_min" : 1.5, diff --git a/tests/unit/expected_test_results/ingredients_percent/percentage-range.json b/tests/unit/expected_test_results/ingredients_percent/percentage-range.json index a88252f8974fe..2a40fb4209085 100644 --- a/tests/unit/expected_test_results/ingredients_percent/percentage-range.json +++ b/tests/unit/expected_test_results/ingredients_percent/percentage-range.json @@ -1,6 +1,7 @@ [ { "id" : "en:pasteurised-whole-milk", + "is_in_taxonomy" : 1, "labels" : "en:fair-trade", "percent" : 74.3, "percent_estimate" : 74.3, @@ -8,24 +9,28 @@ }, { "id" : "en:cane-sugar", + "is_in_taxonomy" : 1, "percent" : 10, "percent_estimate" : 10, "text" : "sucre de canne" }, { "id" : "en:cream", + "is_in_taxonomy" : 1, "percent" : 5.5, "percent_estimate" : 5.5, "text" : "crème" }, { "id" : "en:corn-starch", + "is_in_taxonomy" : 1, "percent" : 5, "percent_estimate" : 5, "text" : "amidon de mais" }, { "id" : "en:coffee", + "is_in_taxonomy" : 1, "percent_estimate" : 5.2, "processing" : "en:freeze-dried", "text" : "café" diff --git a/tests/unit/expected_test_results/ingredients_percent/propagate-max-percent.json b/tests/unit/expected_test_results/ingredients_percent/propagate-max-percent.json index 527253e39b5a9..4bff9d0078ae0 100644 --- a/tests/unit/expected_test_results/ingredients_percent/propagate-max-percent.json +++ b/tests/unit/expected_test_results/ingredients_percent/propagate-max-percent.json @@ -1,6 +1,7 @@ [ { "id" : "en:beans", + "is_in_taxonomy" : 1, "percent" : 52, "percent_estimate" : 52, "percent_max" : 52, @@ -9,6 +10,7 @@ }, { "id" : "en:tomato", + "is_in_taxonomy" : 1, "percent" : 33, "percent_estimate" : 33, "percent_max" : 33, @@ -17,6 +19,7 @@ }, { "id" : "en:water", + "is_in_taxonomy" : 1, "percent_estimate" : 9, "percent_max" : 15, "percent_min" : 3, @@ -24,6 +27,7 @@ }, { "id" : "en:sugar", + "is_in_taxonomy" : 1, "percent_estimate" : 3, "percent_max" : 7.5, "percent_min" : 0, @@ -31,6 +35,7 @@ }, { "id" : "en:corn-flour", + "is_in_taxonomy" : 1, "percent_estimate" : 1.5, "percent_max" : 5, "percent_min" : 0, @@ -38,6 +43,7 @@ }, { "id" : "en:salt", + "is_in_taxonomy" : 1, "percent_estimate" : 0.75, "percent_max" : 3.75, "percent_min" : 0, @@ -45,6 +51,7 @@ }, { "id" : "en:spirit-vinegar", + "is_in_taxonomy" : 1, "percent_estimate" : 0.75, "percent_max" : 3, "percent_min" : 0, diff --git a/tests/unit/expected_test_results/ingredients_percent/relative-percent-with-different-percent-min-and-percent-max-on-parent.json b/tests/unit/expected_test_results/ingredients_percent/relative-percent-with-different-percent-min-and-percent-max-on-parent.json index 927f182e890a9..e71fb29535e21 100644 --- a/tests/unit/expected_test_results/ingredients_percent/relative-percent-with-different-percent-min-and-percent-max-on-parent.json +++ b/tests/unit/expected_test_results/ingredients_percent/relative-percent-with-different-percent-min-and-percent-max-on-parent.json @@ -1,6 +1,7 @@ [ { "id" : "en:water", + "is_in_taxonomy" : 1, "percent" : 60, "percent_estimate" : 60, "percent_max" : 60, @@ -12,6 +13,7 @@ "ingredients" : [ { "id" : "en:apple", + "is_in_taxonomy" : 1, "percent_estimate" : 12, "percent_max" : 16, "percent_min" : 8, @@ -19,6 +21,7 @@ }, { "id" : "en:mango", + "is_in_taxonomy" : 1, "percent_estimate" : 9, "percent_max" : 12, "percent_min" : 6, @@ -26,12 +29,14 @@ }, { "id" : "en:citrus-fruit", + "is_in_taxonomy" : 1, "percent_estimate" : 9, "percent_max" : 12, "percent_min" : 0, "text" : "citrus" } ], + "is_in_taxonomy" : 1, "percent_estimate" : 30, "percent_max" : 40, "percent_min" : 20, @@ -39,6 +44,7 @@ }, { "id" : "en:sugar", + "is_in_taxonomy" : 1, "percent_estimate" : 10, "percent_max" : 20, "percent_min" : 0, diff --git a/tests/unit/expected_test_results/ingredients_percent/relative-percent-with-no-percent-on-parent.json b/tests/unit/expected_test_results/ingredients_percent/relative-percent-with-no-percent-on-parent.json index 963b59f5df1ec..98587f23cc10d 100644 --- a/tests/unit/expected_test_results/ingredients_percent/relative-percent-with-no-percent-on-parent.json +++ b/tests/unit/expected_test_results/ingredients_percent/relative-percent-with-no-percent-on-parent.json @@ -1,6 +1,7 @@ [ { "id" : "en:water", + "is_in_taxonomy" : 1, "percent" : 60, "percent_estimate" : 60, "percent_max" : 60, @@ -12,6 +13,7 @@ "ingredients" : [ { "id" : "en:apple", + "is_in_taxonomy" : 1, "percent" : 16, "percent_estimate" : 16, "percent_max" : 16, @@ -20,6 +22,7 @@ }, { "id" : "en:mango", + "is_in_taxonomy" : 1, "percent" : 12, "percent_estimate" : 12, "percent_max" : 12, @@ -28,12 +31,14 @@ }, { "id" : "en:citrus-fruit", + "is_in_taxonomy" : 1, "percent_estimate" : 12, "percent_max" : 12, "percent_min" : 12, "text" : "citrus" } ], + "is_in_taxonomy" : 1, "percent_estimate" : 40, "percent_max" : 40, "percent_min" : 40, diff --git a/tests/unit/expected_test_results/ingredients_percent/relative-percent.json b/tests/unit/expected_test_results/ingredients_percent/relative-percent.json index 4bf248a4c1ffa..7949d58899f27 100644 --- a/tests/unit/expected_test_results/ingredients_percent/relative-percent.json +++ b/tests/unit/expected_test_results/ingredients_percent/relative-percent.json @@ -4,6 +4,7 @@ "ingredients" : [ { "id" : "en:apple", + "is_in_taxonomy" : 1, "percent" : 20, "percent_estimate" : 20, "percent_max" : 20, @@ -12,6 +13,7 @@ }, { "id" : "en:pear", + "is_in_taxonomy" : 1, "percent" : 15, "percent_estimate" : 15, "percent_max" : 15, @@ -20,6 +22,7 @@ }, { "id" : "en:cranberry", + "is_in_taxonomy" : 1, "percent_estimate" : 11.25, "percent_max" : 15, "percent_min" : 7.5, @@ -27,12 +30,14 @@ }, { "id" : "en:lemon", + "is_in_taxonomy" : 1, "percent_estimate" : 3.75, "percent_max" : 7.5, "percent_min" : 0, "text" : "lemon" } ], + "is_in_taxonomy" : 1, "percent" : 50, "percent_estimate" : 50, "percent_max" : 50, @@ -41,6 +46,7 @@ }, { "id" : "en:sugar", + "is_in_taxonomy" : 1, "percent_estimate" : 50, "percent_max" : 50, "percent_min" : 50, diff --git a/tests/unit/expected_test_results/ingredients_percent/scale-percents-when-sum-greater-than-100.json b/tests/unit/expected_test_results/ingredients_percent/scale-percents-when-sum-greater-than-100.json index b564fb04a8d6c..2d0d174dc8bbe 100644 --- a/tests/unit/expected_test_results/ingredients_percent/scale-percents-when-sum-greater-than-100.json +++ b/tests/unit/expected_test_results/ingredients_percent/scale-percents-when-sum-greater-than-100.json @@ -1,6 +1,7 @@ [ { "id" : "en:milk", + "is_in_taxonomy" : 1, "percent" : 61, "percent_estimate" : 61, "percent_max" : 61, @@ -9,6 +10,7 @@ }, { "id" : "en:cocoa", + "is_in_taxonomy" : 1, "percent" : 35, "percent_estimate" : 35, "percent_max" : 35, @@ -17,6 +19,7 @@ }, { "id" : "en:hazelnut", + "is_in_taxonomy" : 1, "percent" : 4, "percent_estimate" : 4, "percent_max" : 4, diff --git a/tests/unit/expected_test_results/ingredients_percent/specific-ingredients-da.json b/tests/unit/expected_test_results/ingredients_percent/specific-ingredients-da.json index a2cbb0d9cf340..efb6a33f377af 100644 --- a/tests/unit/expected_test_results/ingredients_percent/specific-ingredients-da.json +++ b/tests/unit/expected_test_results/ingredients_percent/specific-ingredients-da.json @@ -1,6 +1,7 @@ [ { "id" : "en:blackcurrant", + "is_in_taxonomy" : 1, "percent" : 40, "percent_estimate" : 40, "percent_max" : 40, @@ -9,6 +10,7 @@ }, { "id" : "en:sugar", + "is_in_taxonomy" : 1, "percent_estimate" : 27.5, "percent_max" : 40, "percent_min" : 15, @@ -16,6 +18,7 @@ }, { "id" : "en:water", + "is_in_taxonomy" : 1, "percent_estimate" : 19.5833333333333, "percent_max" : 33.3333333333333, "percent_min" : 6.66666666666667, @@ -26,12 +29,14 @@ "ingredients" : [ { "id" : "en:e440a", + "is_in_taxonomy" : 1, "percent_estimate" : 6.45833333333334, "percent_max" : 22.5, "percent_min" : 0, "text" : "e440" } ], + "is_in_taxonomy" : 1, "percent_estimate" : 6.45833333333334, "percent_max" : 22.5, "percent_min" : 0, @@ -42,12 +47,14 @@ "ingredients" : [ { "id" : "en:e202", + "is_in_taxonomy" : 1, "percent_estimate" : 6.45833333333334, "percent_max" : 15, "percent_min" : 0, "text" : "e202" } ], + "is_in_taxonomy" : 1, "percent_estimate" : 6.45833333333334, "percent_max" : 15, "percent_min" : 0, diff --git a/tests/unit/expected_test_results/ingredients_percent/specific-ingredients-en.json b/tests/unit/expected_test_results/ingredients_percent/specific-ingredients-en.json index 007145b0c837d..e7c2ba5074f13 100644 --- a/tests/unit/expected_test_results/ingredients_percent/specific-ingredients-en.json +++ b/tests/unit/expected_test_results/ingredients_percent/specific-ingredients-en.json @@ -1,6 +1,7 @@ [ { "id" : "en:water", + "is_in_taxonomy" : 1, "percent_estimate" : 100, "percent_max" : 100, "percent_min" : 100, diff --git a/tests/unit/expected_test_results/ingredients_percent/specific-ingredients-es.json b/tests/unit/expected_test_results/ingredients_percent/specific-ingredients-es.json index 5bbf62784d8f1..681f2b526a471 100644 --- a/tests/unit/expected_test_results/ingredients_percent/specific-ingredients-es.json +++ b/tests/unit/expected_test_results/ingredients_percent/specific-ingredients-es.json @@ -4,6 +4,7 @@ "ingredients" : [ { "id" : "es:tomate-por-cada-100g-de-producto-final", + "is_in_taxonomy" : 0, "percent_estimate" : 62.5, "percent_max" : 100, "percent_min" : 25, @@ -12,6 +13,7 @@ "text" : "tomate por cada 100g de producto final" } ], + "is_in_taxonomy" : 1, "percent_estimate" : 62.5, "percent_max" : 100, "percent_min" : 25, @@ -19,6 +21,7 @@ }, { "id" : "en:peach", + "is_in_taxonomy" : 1, "percent_estimate" : 18.75, "percent_max" : 50, "percent_min" : 0, @@ -26,6 +29,7 @@ }, { "id" : "en:whole-brown-cane-sugar", + "is_in_taxonomy" : 1, "percent_estimate" : 9.375, "percent_max" : 33.3333333333333, "percent_min" : 0, @@ -33,6 +37,7 @@ }, { "id" : "en:lemon-juice", + "is_in_taxonomy" : 1, "percent_estimate" : 9.375, "percent_max" : 25, "percent_min" : 0, diff --git a/tests/unit/expected_test_results/ingredients_percent/specific-ingredients-hr.json b/tests/unit/expected_test_results/ingredients_percent/specific-ingredients-hr.json index 70d52bf82b680..3096ad03a4e10 100644 --- a/tests/unit/expected_test_results/ingredients_percent/specific-ingredients-hr.json +++ b/tests/unit/expected_test_results/ingredients_percent/specific-ingredients-hr.json @@ -1,6 +1,7 @@ [ { "id" : "en:sugar", + "is_in_taxonomy" : 1, "percent_estimate" : 50, "percent_max" : 54, "percent_min" : 46, @@ -11,12 +12,14 @@ "ingredients" : [ { "id" : "en:e220", + "is_in_taxonomy" : 1, "percent_estimate" : 46, "percent_max" : 46, "percent_min" : 46, "text" : "sumporni dioksid" } ], + "is_in_taxonomy" : 1, "percent" : 46, "percent_estimate" : 46, "percent_max" : 46, @@ -26,6 +29,7 @@ }, { "id" : "en:water", + "is_in_taxonomy" : 1, "percent_estimate" : 2, "percent_max" : 8, "percent_min" : 0, @@ -36,12 +40,14 @@ "ingredients" : [ { "id" : "en:e330", + "is_in_taxonomy" : 1, "percent_estimate" : 1, "percent_max" : 4, "percent_min" : 0, "text" : "limunska kiselina" } ], + "is_in_taxonomy" : 1, "percent_estimate" : 1, "percent_max" : 4, "percent_min" : 0, @@ -52,12 +58,14 @@ "ingredients" : [ { "id" : "en:fruit-pectin", + "is_in_taxonomy" : 1, "percent_estimate" : 1, "percent_max" : 2.66666666666667, "percent_min" : 0, "text" : "voćni pektin" } ], + "is_in_taxonomy" : 1, "percent_estimate" : 1, "percent_max" : 2.66666666666667, "percent_min" : 0, diff --git a/tests/unit/expected_test_results/ingredients_percent/specific-ingredients-nl.json b/tests/unit/expected_test_results/ingredients_percent/specific-ingredients-nl.json index c0ca4f88a62e7..585b2a3581080 100644 --- a/tests/unit/expected_test_results/ingredients_percent/specific-ingredients-nl.json +++ b/tests/unit/expected_test_results/ingredients_percent/specific-ingredients-nl.json @@ -1,6 +1,7 @@ [ { "id" : "en:peach", + "is_in_taxonomy" : 1, "percent" : 50, "percent_estimate" : 50, "percent_max" : 50, @@ -9,6 +10,7 @@ }, { "id" : "en:sugar", + "is_in_taxonomy" : 1, "percent_estimate" : 29.1666666666667, "percent_max" : 50, "percent_min" : 8.33333333333333, @@ -19,12 +21,14 @@ "ingredients" : [ { "id" : "en:citrus-pectin", + "is_in_taxonomy" : 1, "percent_estimate" : 10.4166666666667, "percent_max" : 33.3333333333333, "percent_min" : 0, "text" : "citruspectine" } ], + "is_in_taxonomy" : 1, "percent_estimate" : 10.4166666666667, "percent_max" : 33.3333333333333, "percent_min" : 0, @@ -32,6 +36,7 @@ }, { "id" : "en:lemon-juice-from-concentrate", + "is_in_taxonomy" : 1, "percent_estimate" : 5.20833333333333, "percent_max" : 20.8333333333333, "percent_min" : 0, @@ -42,12 +47,14 @@ "ingredients" : [ { "id" : "en:e202", + "is_in_taxonomy" : 1, "percent_estimate" : 2.60416666666666, "percent_max" : 13.8888888888889, "percent_min" : 0, "text" : "kaliumsorbaat" } ], + "is_in_taxonomy" : 1, "percent_estimate" : 2.60416666666666, "percent_max" : 13.8888888888889, "percent_min" : 0, @@ -58,12 +65,14 @@ "ingredients" : [ { "id" : "en:e300", + "is_in_taxonomy" : 1, "percent_estimate" : 1.30208333333333, "percent_max" : 10.4166666666667, "percent_min" : 0, "text" : "ascorbinezuur" } ], + "is_in_taxonomy" : 1, "percent_estimate" : 1.30208333333333, "percent_max" : 10.4166666666667, "percent_min" : 0, @@ -74,12 +83,14 @@ "ingredients" : [ { "id" : "en:e960", + "is_in_taxonomy" : 1, "percent_estimate" : 1.30208333333333, "percent_max" : 8.33333333333333, "percent_min" : 0, "text" : "steviolglycosiden" } ], + "is_in_taxonomy" : 1, "percent_estimate" : 1.30208333333333, "percent_max" : 8.33333333333333, "percent_min" : 0, diff --git a/tests/unit/expected_test_results/ingredients_percent/specific-ingredients-sv.json b/tests/unit/expected_test_results/ingredients_percent/specific-ingredients-sv.json index 5aa5c23b8cdf3..e2dc67ebd55a8 100644 --- a/tests/unit/expected_test_results/ingredients_percent/specific-ingredients-sv.json +++ b/tests/unit/expected_test_results/ingredients_percent/specific-ingredients-sv.json @@ -1,6 +1,7 @@ [ { "id" : "en:lingonberry", + "is_in_taxonomy" : 1, "labels" : "sv:krav", "percent" : 50, "percent_estimate" : 50, @@ -10,6 +11,7 @@ }, { "id" : "en:sugar", + "is_in_taxonomy" : 1, "labels" : "sv:krav", "percent_estimate" : 31.25, "percent_max" : 50, @@ -18,6 +20,7 @@ }, { "id" : "en:water", + "is_in_taxonomy" : 1, "percent_estimate" : 9.375, "percent_max" : 33.3333333333333, "percent_min" : 0, @@ -28,12 +31,14 @@ "ingredients" : [ { "id" : "en:e440a", + "is_in_taxonomy" : 1, "percent_estimate" : 4.6875, "percent_max" : 18.75, "percent_min" : 0, "text" : "pektin" } ], + "is_in_taxonomy" : 1, "percent_estimate" : 4.6875, "percent_max" : 18.75, "percent_min" : 0, @@ -44,12 +49,14 @@ "ingredients" : [ { "id" : "en:e330", + "is_in_taxonomy" : 1, "percent_estimate" : 4.6875, "percent_max" : 12.5, "percent_min" : 0, "text" : "citronsyra" } ], + "is_in_taxonomy" : 1, "percent_estimate" : 4.6875, "percent_max" : 12.5, "percent_min" : 0, diff --git a/tests/unit/expected_test_results/ingredients_percent/sugar-90-percent-milk.json b/tests/unit/expected_test_results/ingredients_percent/sugar-90-percent-milk.json index c4523316c9760..de5f405e784ed 100644 --- a/tests/unit/expected_test_results/ingredients_percent/sugar-90-percent-milk.json +++ b/tests/unit/expected_test_results/ingredients_percent/sugar-90-percent-milk.json @@ -1,6 +1,7 @@ [ { "id" : "en:sugar", + "is_in_taxonomy" : 1, "percent" : 90, "percent_estimate" : 90, "percent_max" : 90, @@ -9,6 +10,7 @@ }, { "id" : "en:milk", + "is_in_taxonomy" : 1, "percent_estimate" : 10, "percent_max" : 10, "percent_min" : 10, diff --git a/tests/unit/expected_test_results/ingredients_percent/sugar-milk-10-percent-water.json b/tests/unit/expected_test_results/ingredients_percent/sugar-milk-10-percent-water.json index 1b5ec4da8d6f6..24d5426b3c324 100644 --- a/tests/unit/expected_test_results/ingredients_percent/sugar-milk-10-percent-water.json +++ b/tests/unit/expected_test_results/ingredients_percent/sugar-milk-10-percent-water.json @@ -1,6 +1,7 @@ [ { "id" : "en:sugar", + "is_in_taxonomy" : 1, "percent_estimate" : 85, "percent_max" : 90, "percent_min" : 80, @@ -8,6 +9,7 @@ }, { "id" : "en:milk", + "is_in_taxonomy" : 1, "percent" : 10, "percent_estimate" : 10, "percent_max" : 10, @@ -16,6 +18,7 @@ }, { "id" : "en:water", + "is_in_taxonomy" : 1, "percent_estimate" : 5, "percent_max" : 10, "percent_min" : 0, diff --git a/tests/unit/expected_test_results/ingredients_percent/sugar-milk-10-percent.json b/tests/unit/expected_test_results/ingredients_percent/sugar-milk-10-percent.json index a085de60d0547..a43aa02792148 100644 --- a/tests/unit/expected_test_results/ingredients_percent/sugar-milk-10-percent.json +++ b/tests/unit/expected_test_results/ingredients_percent/sugar-milk-10-percent.json @@ -1,6 +1,7 @@ [ { "id" : "en:sugar", + "is_in_taxonomy" : 1, "percent_estimate" : 90, "percent_max" : 90, "percent_min" : 90, @@ -8,6 +9,7 @@ }, { "id" : "en:milk", + "is_in_taxonomy" : 1, "percent" : 10, "percent_estimate" : 10, "percent_max" : 10, diff --git a/tests/unit/expected_test_results/ingredients_percent/sugar-milk-water.json b/tests/unit/expected_test_results/ingredients_percent/sugar-milk-water.json index 7bb11a8724cad..09ddf20c3ccf6 100644 --- a/tests/unit/expected_test_results/ingredients_percent/sugar-milk-water.json +++ b/tests/unit/expected_test_results/ingredients_percent/sugar-milk-water.json @@ -1,6 +1,7 @@ [ { "id" : "en:sugar", + "is_in_taxonomy" : 1, "percent_estimate" : 66.6666666666667, "percent_max" : 100, "percent_min" : 33.3333333333333, @@ -8,6 +9,7 @@ }, { "id" : "en:milk", + "is_in_taxonomy" : 1, "percent_estimate" : 16.6666666666667, "percent_max" : 50, "percent_min" : 0, @@ -15,6 +17,7 @@ }, { "id" : "en:water", + "is_in_taxonomy" : 1, "percent_estimate" : 16.6666666666667, "percent_max" : 33.3333333333333, "percent_min" : 0, diff --git a/tests/unit/expected_test_results/ingredients_percent/sugar-milk.json b/tests/unit/expected_test_results/ingredients_percent/sugar-milk.json index b2e89555b44cf..205e76e4d74e5 100644 --- a/tests/unit/expected_test_results/ingredients_percent/sugar-milk.json +++ b/tests/unit/expected_test_results/ingredients_percent/sugar-milk.json @@ -1,6 +1,7 @@ [ { "id" : "en:sugar", + "is_in_taxonomy" : 1, "percent_estimate" : 75, "percent_max" : 100, "percent_min" : 50, @@ -8,6 +9,7 @@ }, { "id" : "en:milk", + "is_in_taxonomy" : 1, "percent_estimate" : 25, "percent_max" : 50, "percent_min" : 0, diff --git a/tests/unit/expected_test_results/ingredients_percent/sugar-water-milk-10-percent.json b/tests/unit/expected_test_results/ingredients_percent/sugar-water-milk-10-percent.json index cb6e69584865f..38f315cd09f45 100644 --- a/tests/unit/expected_test_results/ingredients_percent/sugar-water-milk-10-percent.json +++ b/tests/unit/expected_test_results/ingredients_percent/sugar-water-milk-10-percent.json @@ -1,6 +1,7 @@ [ { "id" : "en:sugar", + "is_in_taxonomy" : 1, "percent_estimate" : 62.5, "percent_max" : 80, "percent_min" : 45, @@ -8,6 +9,7 @@ }, { "id" : "en:water", + "is_in_taxonomy" : 1, "percent_estimate" : 23.75, "percent_max" : 45, "percent_min" : 10, @@ -15,6 +17,7 @@ }, { "id" : "en:milk", + "is_in_taxonomy" : 1, "percent" : 10, "percent_estimate" : 13.75, "percent_max" : 10, diff --git a/tests/unit/expected_test_results/ingredients_percent/sugar.json b/tests/unit/expected_test_results/ingredients_percent/sugar.json index 1261ae1bb5f7f..802f86750f9db 100644 --- a/tests/unit/expected_test_results/ingredients_percent/sugar.json +++ b/tests/unit/expected_test_results/ingredients_percent/sugar.json @@ -1,6 +1,7 @@ [ { "id" : "en:sugar", + "is_in_taxonomy" : 1, "percent_estimate" : 100, "percent_max" : 100, "percent_min" : 100, diff --git a/tests/unit/expected_test_results/nutriscore/94-percent-sugar-and-unknown-ingredient.json b/tests/unit/expected_test_results/nutriscore/94-percent-sugar-and-unknown-ingredient.json index d703b9018c9ab..52dffac18eab3 100644 --- a/tests/unit/expected_test_results/nutriscore/94-percent-sugar-and-unknown-ingredient.json +++ b/tests/unit/expected_test_results/nutriscore/94-percent-sugar-and-unknown-ingredient.json @@ -28,7 +28,7 @@ "en:sweeteners", "en:sugars" ], - "food_groups" : "en:sweets", + "food_groups" : "en:Sweets", "food_groups_tags" : [ "en:sugary-snacks", "en:sweets" @@ -37,6 +37,7 @@ { "ciqual_proxy_food_code" : "31016", "id" : "en:sugar", + "is_in_taxonomy" : 1, "percent" : 94, "percent_estimate" : 94, "percent_max" : 94, @@ -47,6 +48,7 @@ }, { "id" : "en:strange-ingredient", + "is_in_taxonomy" : 0, "percent_estimate" : 6, "percent_max" : 6, "percent_min" : 6, diff --git a/tests/unit/expected_test_results/nutriscore/beverage-with-80-percent-milk.json b/tests/unit/expected_test_results/nutriscore/beverage-with-80-percent-milk.json index 691ccff2f9b26..a9f35e1feaad5 100644 --- a/tests/unit/expected_test_results/nutriscore/beverage-with-80-percent-milk.json +++ b/tests/unit/expected_test_results/nutriscore/beverage-with-80-percent-milk.json @@ -29,6 +29,7 @@ { "ciqual_proxy_food_code" : "19051", "id" : "en:fresh-milk", + "is_in_taxonomy" : 1, "percent" : 80, "percent_estimate" : 80, "percent_max" : 80, @@ -40,6 +41,7 @@ { "ciqual_proxy_food_code" : "31016", "id" : "en:sugar", + "is_in_taxonomy" : 1, "percent_estimate" : 20, "percent_max" : 20, "percent_min" : 20, diff --git a/tests/unit/expected_test_results/nutriscore/breakfast-cereals.json b/tests/unit/expected_test_results/nutriscore/breakfast-cereals.json index e41fdf803774f..6317904ceffcf 100644 --- a/tests/unit/expected_test_results/nutriscore/breakfast-cereals.json +++ b/tests/unit/expected_test_results/nutriscore/breakfast-cereals.json @@ -32,7 +32,7 @@ "en:cereals-and-their-products", "en:breakfast-cereals" ], - "food_groups" : "en:breakfast-cereals", + "food_groups" : "en:Breakfast cereals", "food_groups_tags" : [ "en:cereals-and-potatoes", "en:breakfast-cereals" diff --git a/tests/unit/expected_test_results/nutriscore/colza-oil.json b/tests/unit/expected_test_results/nutriscore/colza-oil.json index 414b0ced6d9b9..9ae1a19e9d71c 100644 --- a/tests/unit/expected_test_results/nutriscore/colza-oil.json +++ b/tests/unit/expected_test_results/nutriscore/colza-oil.json @@ -32,7 +32,7 @@ "en:vegetable-oils", "en:rapeseed-oils" ], - "food_groups" : "en:fats", + "food_groups" : "en:Fats", "food_groups_tags" : [ "en:fats-and-sauces", "en:fats" diff --git a/tests/unit/expected_test_results/nutriscore/cookies.json b/tests/unit/expected_test_results/nutriscore/cookies.json index 49828cf43a562..fe0928f4c37a3 100644 --- a/tests/unit/expected_test_results/nutriscore/cookies.json +++ b/tests/unit/expected_test_results/nutriscore/cookies.json @@ -26,7 +26,7 @@ "en:biscuits-and-cakes", "en:biscuits" ], - "food_groups" : "en:biscuits-and-cakes", + "food_groups" : "en:Biscuits and cakes", "food_groups_tags" : [ "en:sugary-snacks", "en:biscuits-and-cakes" diff --git a/tests/unit/expected_test_results/nutriscore/dairy-drink-with-80-percent-milk.json b/tests/unit/expected_test_results/nutriscore/dairy-drink-with-80-percent-milk.json index 674180dbcbbc6..9de4dad348537 100644 --- a/tests/unit/expected_test_results/nutriscore/dairy-drink-with-80-percent-milk.json +++ b/tests/unit/expected_test_results/nutriscore/dairy-drink-with-80-percent-milk.json @@ -28,7 +28,7 @@ "en:dairies", "en:dairy-drinks" ], - "food_groups" : "en:milk-and-yogurt", + "food_groups" : "en:Milk and yogurt", "food_groups_tags" : [ "en:milk-and-dairy-products", "en:milk-and-yogurt" @@ -37,6 +37,7 @@ { "ciqual_proxy_food_code" : "19051", "id" : "en:fresh-milk", + "is_in_taxonomy" : 1, "percent" : 80, "percent_estimate" : 80, "percent_max" : 80, @@ -48,6 +49,7 @@ { "ciqual_proxy_food_code" : "31016", "id" : "en:sugar", + "is_in_taxonomy" : 1, "percent_estimate" : 20, "percent_max" : 20, "percent_min" : 20, diff --git a/tests/unit/expected_test_results/nutriscore/dairy-drink-with-less-than-80-percent-milk.json b/tests/unit/expected_test_results/nutriscore/dairy-drink-with-less-than-80-percent-milk.json index 060d3eac1fe54..ef0988d921486 100644 --- a/tests/unit/expected_test_results/nutriscore/dairy-drink-with-less-than-80-percent-milk.json +++ b/tests/unit/expected_test_results/nutriscore/dairy-drink-with-less-than-80-percent-milk.json @@ -28,7 +28,7 @@ "en:dairies", "en:dairy-drinks" ], - "food_groups" : "en:milk-and-yogurt", + "food_groups" : "en:Milk and yogurt", "food_groups_tags" : [ "en:milk-and-dairy-products", "en:milk-and-yogurt" @@ -37,6 +37,7 @@ { "ciqual_proxy_food_code" : "19051", "id" : "en:milk", + "is_in_taxonomy" : 1, "percent_estimate" : 90, "percent_max" : 100, "percent_min" : 80, @@ -47,6 +48,7 @@ { "ciqual_proxy_food_code" : "31016", "id" : "en:sugar", + "is_in_taxonomy" : 1, "percent_estimate" : 10, "percent_max" : 20, "percent_min" : 0, diff --git a/tests/unit/expected_test_results/nutriscore/dairy-drinks-without-milk.json b/tests/unit/expected_test_results/nutriscore/dairy-drinks-without-milk.json index ca744e76bd049..6583e6d338a0a 100644 --- a/tests/unit/expected_test_results/nutriscore/dairy-drinks-without-milk.json +++ b/tests/unit/expected_test_results/nutriscore/dairy-drinks-without-milk.json @@ -28,7 +28,7 @@ "en:dairies", "en:dairy-drinks" ], - "food_groups" : "en:sweetened-beverages", + "food_groups" : "en:Sweetened beverages", "food_groups_tags" : [ "en:beverages", "en:sweetened-beverages" @@ -37,6 +37,7 @@ { "ciqual_food_code" : "18066", "id" : "en:water", + "is_in_taxonomy" : 1, "percent_estimate" : 95, "percent_max" : 100, "percent_min" : 90, @@ -47,6 +48,7 @@ { "ciqual_proxy_food_code" : "31016", "id" : "en:sugar", + "is_in_taxonomy" : 1, "percent_estimate" : 5, "percent_max" : 10, "percent_min" : 0, diff --git a/tests/unit/expected_test_results/nutriscore/en-apple-estimated-nutrients.json b/tests/unit/expected_test_results/nutriscore/en-apple-estimated-nutrients.json index 33eff09c911fe..4cfb9962265e4 100644 --- a/tests/unit/expected_test_results/nutriscore/en-apple-estimated-nutrients.json +++ b/tests/unit/expected_test_results/nutriscore/en-apple-estimated-nutrients.json @@ -36,7 +36,7 @@ "en:fruits", "en:apples" ], - "food_groups" : "en:fruits", + "food_groups" : "en:Fruits", "food_groups_tags" : [ "en:fruits-and-vegetables", "en:fruits" @@ -45,6 +45,7 @@ { "ciqual_food_code" : "13050", "id" : "en:apple", + "is_in_taxonomy" : 1, "percent_estimate" : 100, "percent_max" : 100, "percent_min" : 100, diff --git a/tests/unit/expected_test_results/nutriscore/en-avocado-oil.json b/tests/unit/expected_test_results/nutriscore/en-avocado-oil.json index d70b1b480651d..732e89c681d22 100644 --- a/tests/unit/expected_test_results/nutriscore/en-avocado-oil.json +++ b/tests/unit/expected_test_results/nutriscore/en-avocado-oil.json @@ -40,7 +40,7 @@ "en:fruit-and-fruit-seed-oils", "en:avocado-oils" ], - "food_groups" : "en:fats", + "food_groups" : "en:Fats", "food_groups_tags" : [ "en:fats-and-sauces", "en:fats" @@ -48,6 +48,7 @@ "ingredients" : [ { "id" : "en:avocado", + "is_in_taxonomy" : 1, "percent_estimate" : 100, "percent_max" : 100, "percent_min" : 100, diff --git a/tests/unit/expected_test_results/nutriscore/en-beers-category.json b/tests/unit/expected_test_results/nutriscore/en-beers-category.json index 5abcb432c1ac5..cb96441e0525e 100644 --- a/tests/unit/expected_test_results/nutriscore/en-beers-category.json +++ b/tests/unit/expected_test_results/nutriscore/en-beers-category.json @@ -26,7 +26,7 @@ "en:alcoholic-beverages", "en:beers" ], - "food_groups" : "en:alcoholic-beverages", + "food_groups" : "en:Alcoholic beverages", "food_groups_tags" : [ "en:alcoholic-beverages" ], diff --git a/tests/unit/expected_test_results/nutriscore/en-beverage-preparation-flavored-syrup.json b/tests/unit/expected_test_results/nutriscore/en-beverage-preparation-flavored-syrup.json index acf3e2f0116f7..a0b692eb2581f 100644 --- a/tests/unit/expected_test_results/nutriscore/en-beverage-preparation-flavored-syrup.json +++ b/tests/unit/expected_test_results/nutriscore/en-beverage-preparation-flavored-syrup.json @@ -38,7 +38,7 @@ "en:syrups", "en:flavoured-syrups" ], - "food_groups" : "en:sweetened-beverages", + "food_groups" : "en:Sweetened beverages", "food_groups_tags" : [ "en:beverages", "en:sweetened-beverages" @@ -47,6 +47,7 @@ { "ciqual_food_code" : "2074", "id" : "en:apple-juice", + "is_in_taxonomy" : 1, "percent_estimate" : 62.5, "percent_max" : 100, "percent_min" : 25, @@ -57,6 +58,7 @@ { "ciqual_food_code" : "18066", "id" : "en:water", + "is_in_taxonomy" : 1, "percent_estimate" : 18.75, "percent_max" : 50, "percent_min" : 0, @@ -67,6 +69,7 @@ { "ciqual_proxy_food_code" : "31016", "id" : "en:sugar", + "is_in_taxonomy" : 1, "percent_estimate" : 9.375, "percent_max" : 33.3333333333333, "percent_min" : 0, @@ -76,6 +79,7 @@ }, { "id" : "en:e951", + "is_in_taxonomy" : 1, "percent_estimate" : 9.375, "percent_max" : 25, "percent_min" : 0, diff --git a/tests/unit/expected_test_results/nutriscore/en-cherry-tomatoes.json b/tests/unit/expected_test_results/nutriscore/en-cherry-tomatoes.json index 651f8ae8dfab5..2b8b3e5bea988 100644 --- a/tests/unit/expected_test_results/nutriscore/en-cherry-tomatoes.json +++ b/tests/unit/expected_test_results/nutriscore/en-cherry-tomatoes.json @@ -42,7 +42,7 @@ "en:tomatoes", "en:cherry-tomatoes" ], - "food_groups" : "en:vegetables", + "food_groups" : "en:Vegetables", "food_groups_tags" : [ "en:fruits-and-vegetables", "en:vegetables" @@ -51,6 +51,7 @@ { "ciqual_food_code" : "20172", "id" : "en:cherry-tomato", + "is_in_taxonomy" : 1, "percent_estimate" : 100, "percent_max" : 100, "percent_min" : 100, diff --git a/tests/unit/expected_test_results/nutriscore/en-milk.json b/tests/unit/expected_test_results/nutriscore/en-milk.json index fca0ef046ed7f..c52bbc9da54c2 100644 --- a/tests/unit/expected_test_results/nutriscore/en-milk.json +++ b/tests/unit/expected_test_results/nutriscore/en-milk.json @@ -22,7 +22,7 @@ "en:dairies", "en:milks" ], - "food_groups" : "en:milk-and-yogurt", + "food_groups" : "en:Milk and yogurt", "food_groups_tags" : [ "en:milk-and-dairy-products", "en:milk-and-yogurt" diff --git a/tests/unit/expected_test_results/nutriscore/en-olive-oil-no-ingredients.json b/tests/unit/expected_test_results/nutriscore/en-olive-oil-no-ingredients.json index 1943eba21b550..03bd5652afb10 100644 --- a/tests/unit/expected_test_results/nutriscore/en-olive-oil-no-ingredients.json +++ b/tests/unit/expected_test_results/nutriscore/en-olive-oil-no-ingredients.json @@ -34,7 +34,7 @@ "en:vegetable-oils", "en:olive-oils" ], - "food_groups" : "en:fats", + "food_groups" : "en:Fats", "food_groups_tags" : [ "en:fats-and-sauces", "en:fats" diff --git a/tests/unit/expected_test_results/nutriscore/en-olive-oil-unrecognized-ingredients.json b/tests/unit/expected_test_results/nutriscore/en-olive-oil-unrecognized-ingredients.json index 6243e73fe017e..f285c266defad 100644 --- a/tests/unit/expected_test_results/nutriscore/en-olive-oil-unrecognized-ingredients.json +++ b/tests/unit/expected_test_results/nutriscore/en-olive-oil-unrecognized-ingredients.json @@ -40,7 +40,7 @@ "en:vegetable-oils", "en:olive-oils" ], - "food_groups" : "en:fats", + "food_groups" : "en:Fats", "food_groups_tags" : [ "en:fats-and-sauces", "en:fats" @@ -48,6 +48,7 @@ "ingredients" : [ { "id" : "en:some-very-fancy-but-unrecognized-way-of-writing-olive-oil", + "is_in_taxonomy" : 0, "percent_estimate" : 100, "percent_max" : 100, "percent_min" : 100, diff --git a/tests/unit/expected_test_results/nutriscore/en-olive-oil.json b/tests/unit/expected_test_results/nutriscore/en-olive-oil.json index 3c123b49bf605..6a4e5cfa5de48 100644 --- a/tests/unit/expected_test_results/nutriscore/en-olive-oil.json +++ b/tests/unit/expected_test_results/nutriscore/en-olive-oil.json @@ -40,7 +40,7 @@ "en:vegetable-oils", "en:olive-oils" ], - "food_groups" : "en:fats", + "food_groups" : "en:Fats", "food_groups_tags" : [ "en:fats-and-sauces", "en:fats" @@ -50,6 +50,7 @@ "ciqual_proxy_food_code" : "17270", "from_palm_oil" : "no", "id" : "en:olive-oil", + "is_in_taxonomy" : 1, "percent_estimate" : 100, "percent_max" : 100, "percent_min" : 100, diff --git a/tests/unit/expected_test_results/nutriscore/en-orange-juice-category-and-ingredients.json b/tests/unit/expected_test_results/nutriscore/en-orange-juice-category-and-ingredients.json index 20f281f99f7f7..afc6d3e2abbd1 100644 --- a/tests/unit/expected_test_results/nutriscore/en-orange-juice-category-and-ingredients.json +++ b/tests/unit/expected_test_results/nutriscore/en-orange-juice-category-and-ingredients.json @@ -42,7 +42,7 @@ "en:fruit-juices", "en:orange-juices" ], - "food_groups" : "en:sweetened-beverages", + "food_groups" : "en:Sweetened beverages", "food_groups_tags" : [ "en:beverages", "en:sweetened-beverages" @@ -51,6 +51,7 @@ { "ciqual_proxy_food_code" : "2070", "id" : "en:orange-juice", + "is_in_taxonomy" : 1, "percent" : 50, "percent_estimate" : 50, "percent_max" : 50, @@ -62,6 +63,7 @@ { "ciqual_food_code" : "18066", "id" : "en:water", + "is_in_taxonomy" : 1, "percent_estimate" : 45.55, "percent_max" : 50, "percent_min" : 41.1, @@ -72,6 +74,7 @@ { "ciqual_proxy_food_code" : "31016", "id" : "en:sugar", + "is_in_taxonomy" : 1, "percent_estimate" : 4.45, "percent_max" : 8.9, "percent_min" : 0, diff --git a/tests/unit/expected_test_results/nutriscore/en-orange-juice-category.json b/tests/unit/expected_test_results/nutriscore/en-orange-juice-category.json index c085a7586ad79..a740a8a88de1b 100644 --- a/tests/unit/expected_test_results/nutriscore/en-orange-juice-category.json +++ b/tests/unit/expected_test_results/nutriscore/en-orange-juice-category.json @@ -36,7 +36,7 @@ "en:fruit-juices", "en:orange-juices" ], - "food_groups" : "en:fruit-juices", + "food_groups" : "en:Fruit juices", "food_groups_tags" : [ "en:beverages", "en:fruit-juices" diff --git a/tests/unit/expected_test_results/nutriscore/en-potatoes-category.json b/tests/unit/expected_test_results/nutriscore/en-potatoes-category.json index 315dfcd9e88ac..65ae87acdf3f5 100644 --- a/tests/unit/expected_test_results/nutriscore/en-potatoes-category.json +++ b/tests/unit/expected_test_results/nutriscore/en-potatoes-category.json @@ -32,7 +32,7 @@ "en:vegetables", "en:potatoes" ], - "food_groups" : "en:potatoes", + "food_groups" : "en:Potatoes", "food_groups_tags" : [ "en:cereals-and-potatoes", "en:potatoes" diff --git a/tests/unit/expected_test_results/nutriscore/en-red-meat-ambiguous-category-ingredients-with-lots-of-meat.json b/tests/unit/expected_test_results/nutriscore/en-red-meat-ambiguous-category-ingredients-with-lots-of-meat.json index 910263396815a..6c0860ea2040d 100644 --- a/tests/unit/expected_test_results/nutriscore/en-red-meat-ambiguous-category-ingredients-with-lots-of-meat.json +++ b/tests/unit/expected_test_results/nutriscore/en-red-meat-ambiguous-category-ingredients-with-lots-of-meat.json @@ -29,7 +29,7 @@ "en:prepared-meats", "en:sausages" ], - "food_groups" : "en:processed-meat", + "food_groups" : "en:Processed meat", "food_groups_tags" : [ "en:fish-meat-eggs", "en:processed-meat" @@ -38,6 +38,7 @@ { "ciqual_proxy_food_code" : "28205", "id" : "en:pork-meat", + "is_in_taxonomy" : 1, "percent_estimate" : 61, "percent_max" : 97, "percent_min" : 25, @@ -48,6 +49,7 @@ { "ciqual_food_code" : "21523", "id" : "en:lamb-meat", + "is_in_taxonomy" : 1, "percent_estimate" : 20, "percent_max" : 49, "percent_min" : 1, @@ -58,6 +60,7 @@ { "ciqual_food_code" : "36005", "id" : "en:chicken-meat", + "is_in_taxonomy" : 1, "percent_estimate" : 10, "percent_max" : 33, "percent_min" : 1, @@ -68,6 +71,7 @@ { "ciqual_food_code" : "11058", "id" : "en:salt", + "is_in_taxonomy" : 1, "percent" : 1, "percent_estimate" : 9, "percent_max" : 1, diff --git a/tests/unit/expected_test_results/nutriscore/en-red-meat-ambiguous-category-ingredients-with-no-meat.json b/tests/unit/expected_test_results/nutriscore/en-red-meat-ambiguous-category-ingredients-with-no-meat.json index a97f0f40c4dcf..2af6230a92ded 100644 --- a/tests/unit/expected_test_results/nutriscore/en-red-meat-ambiguous-category-ingredients-with-no-meat.json +++ b/tests/unit/expected_test_results/nutriscore/en-red-meat-ambiguous-category-ingredients-with-no-meat.json @@ -29,7 +29,7 @@ "en:prepared-meats", "en:sausages" ], - "food_groups" : "en:processed-meat", + "food_groups" : "en:Processed meat", "food_groups_tags" : [ "en:fish-meat-eggs", "en:processed-meat" @@ -38,6 +38,7 @@ { "ciqual_food_code" : "26036", "id" : "en:salmon", + "is_in_taxonomy" : 1, "percent_estimate" : 73.75, "percent_max" : 98, "percent_min" : 49.5, @@ -48,6 +49,7 @@ { "ciqual_proxy_food_code" : "9410", "id" : "en:wheat-flour", + "is_in_taxonomy" : 1, "percent_estimate" : 13.625, "percent_max" : 49.5, "percent_min" : 1, @@ -58,6 +60,7 @@ { "ciqual_food_code" : "11058", "id" : "en:salt", + "is_in_taxonomy" : 1, "percent" : 1, "percent_estimate" : 12.625, "percent_max" : 1, diff --git a/tests/unit/expected_test_results/nutriscore/en-red-meat-ambiguous-category-ingredients-with-very-little-meat.json b/tests/unit/expected_test_results/nutriscore/en-red-meat-ambiguous-category-ingredients-with-very-little-meat.json index 007c2028ea5a2..03b423b66b917 100644 --- a/tests/unit/expected_test_results/nutriscore/en-red-meat-ambiguous-category-ingredients-with-very-little-meat.json +++ b/tests/unit/expected_test_results/nutriscore/en-red-meat-ambiguous-category-ingredients-with-very-little-meat.json @@ -29,7 +29,7 @@ "en:prepared-meats", "en:sausages" ], - "food_groups" : "en:processed-meat", + "food_groups" : "en:Processed meat", "food_groups_tags" : [ "en:fish-meat-eggs", "en:processed-meat" @@ -38,6 +38,7 @@ { "ciqual_food_code" : "22000", "id" : "en:egg", + "is_in_taxonomy" : 1, "percent_estimate" : 53.8333333333333, "percent_max" : 91, "percent_min" : 16.6666666666667, @@ -48,6 +49,7 @@ { "ciqual_proxy_food_code" : "9410", "id" : "en:wheat-flour", + "is_in_taxonomy" : 1, "percent_estimate" : 24.0833333333333, "percent_max" : 46.5, "percent_min" : 2, @@ -58,6 +60,7 @@ { "ciqual_food_code" : "18066", "id" : "en:water", + "is_in_taxonomy" : 1, "percent_estimate" : 12.0416666666667, "percent_max" : 31.6666666666667, "percent_min" : 2, @@ -68,6 +71,7 @@ { "ciqual_food_code" : "9520", "id" : "en:rice-flour", + "is_in_taxonomy" : 1, "percent_estimate" : 6.02083333333333, "percent_max" : 24.25, "percent_min" : 2, @@ -77,6 +81,7 @@ }, { "id" : "en:lamb", + "is_in_taxonomy" : 1, "percent" : 2, "percent_estimate" : 2, "percent_max" : 2, @@ -86,6 +91,7 @@ { "ciqual_food_code" : "11058", "id" : "en:salt", + "is_in_taxonomy" : 1, "percent" : 1, "percent_estimate" : 2.02083333333333, "percent_max" : 1, diff --git a/tests/unit/expected_test_results/nutriscore/en-red-meat-ambiguous-category-no-ingredients.json b/tests/unit/expected_test_results/nutriscore/en-red-meat-ambiguous-category-no-ingredients.json index 461ed9043c0f7..af139670378db 100644 --- a/tests/unit/expected_test_results/nutriscore/en-red-meat-ambiguous-category-no-ingredients.json +++ b/tests/unit/expected_test_results/nutriscore/en-red-meat-ambiguous-category-no-ingredients.json @@ -23,7 +23,7 @@ "en:prepared-meats", "en:sausages" ], - "food_groups" : "en:processed-meat", + "food_groups" : "en:Processed meat", "food_groups_tags" : [ "en:fish-meat-eggs", "en:processed-meat" diff --git a/tests/unit/expected_test_results/nutriscore/en-red-meat-category-no-ingredients.json b/tests/unit/expected_test_results/nutriscore/en-red-meat-category-no-ingredients.json index c420f22607874..bbfb8919e342b 100644 --- a/tests/unit/expected_test_results/nutriscore/en-red-meat-category-no-ingredients.json +++ b/tests/unit/expected_test_results/nutriscore/en-red-meat-category-no-ingredients.json @@ -32,7 +32,7 @@ "en:steaks", "en:beef-steaks" ], - "food_groups" : "en:meat-other-than-poultry", + "food_groups" : "en:Meat other than poultry", "food_groups_tags" : [ "en:fish-meat-eggs", "en:meat", diff --git a/tests/unit/expected_test_results/nutriscore/en-soy-beans-processed-and-unprocessed.json b/tests/unit/expected_test_results/nutriscore/en-soy-beans-processed-and-unprocessed.json index 469c1cddd64ca..41ac85cd48a8f 100644 --- a/tests/unit/expected_test_results/nutriscore/en-soy-beans-processed-and-unprocessed.json +++ b/tests/unit/expected_test_results/nutriscore/en-soy-beans-processed-and-unprocessed.json @@ -27,7 +27,7 @@ "en:meals", "en:soups" ], - "food_groups" : "en:one-dish-meals", + "food_groups" : "en:One-dish meals", "food_groups_tags" : [ "en:composite-foods", "en:one-dish-meals" @@ -36,6 +36,7 @@ { "ciqual_food_code" : "20901", "id" : "en:soya-bean", + "is_in_taxonomy" : 1, "percent" : 30, "percent_estimate" : 30, "percent_max" : 30, @@ -47,6 +48,7 @@ { "ciqual_food_code" : "20901", "id" : "en:soya-bean", + "is_in_taxonomy" : 1, "percent" : 25, "percent_estimate" : 25, "percent_max" : 25, @@ -59,6 +61,7 @@ { "ciqual_food_code" : "20901", "id" : "en:soya-bean", + "is_in_taxonomy" : 1, "percent" : 20, "percent_estimate" : 20, "percent_max" : 20, @@ -71,6 +74,7 @@ { "ciqual_food_code" : "20901", "id" : "en:soya-bean", + "is_in_taxonomy" : 1, "percent" : 15, "percent_estimate" : 15, "percent_max" : 15, @@ -83,6 +87,7 @@ { "ciqual_food_code" : "20901", "id" : "en:soya-bean", + "is_in_taxonomy" : 1, "percent" : 10, "percent_estimate" : 10, "percent_max" : 10, diff --git a/tests/unit/expected_test_results/nutriscore/en-sugar-estimated-nutrients.json b/tests/unit/expected_test_results/nutriscore/en-sugar-estimated-nutrients.json index 7b0fad852ef70..5b4a344a1a8d4 100644 --- a/tests/unit/expected_test_results/nutriscore/en-sugar-estimated-nutrients.json +++ b/tests/unit/expected_test_results/nutriscore/en-sugar-estimated-nutrients.json @@ -28,7 +28,7 @@ "en:sweeteners", "en:sugars" ], - "food_groups" : "en:sweets", + "food_groups" : "en:Sweets", "food_groups_tags" : [ "en:sugary-snacks", "en:sweets" @@ -37,6 +37,7 @@ { "ciqual_proxy_food_code" : "31016", "id" : "en:sugar", + "is_in_taxonomy" : 1, "percent_estimate" : 100, "percent_max" : 100, "percent_min" : 100, diff --git a/tests/unit/expected_test_results/nutriscore/en-sweeteners-erythritol.json b/tests/unit/expected_test_results/nutriscore/en-sweeteners-erythritol.json index b2e0e76fb13d3..d9083ef1a091f 100644 --- a/tests/unit/expected_test_results/nutriscore/en-sweeteners-erythritol.json +++ b/tests/unit/expected_test_results/nutriscore/en-sweeteners-erythritol.json @@ -38,7 +38,7 @@ "en:carbonated-drinks", "en:sodas" ], - "food_groups" : "en:sweetened-beverages", + "food_groups" : "en:Sweetened beverages", "food_groups_tags" : [ "en:beverages", "en:sweetened-beverages" @@ -47,6 +47,7 @@ { "ciqual_food_code" : "2074", "id" : "en:apple-juice", + "is_in_taxonomy" : 1, "percent_estimate" : 70.5, "percent_max" : 100, "percent_min" : 41, @@ -57,6 +58,7 @@ { "ciqual_food_code" : "18066", "id" : "en:water", + "is_in_taxonomy" : 1, "percent_estimate" : 14.75, "percent_max" : 50, "percent_min" : 0, @@ -67,6 +69,7 @@ { "ciqual_proxy_food_code" : "31016", "id" : "en:sugar", + "is_in_taxonomy" : 1, "percent_estimate" : 2.25, "percent_max" : 4.5, "percent_min" : 0, @@ -76,6 +79,7 @@ }, { "id" : "en:e968", + "is_in_taxonomy" : 1, "percent_estimate" : 12.5, "percent_max" : 4.5, "percent_min" : 0, diff --git a/tests/unit/expected_test_results/nutriscore/en-sweeteners.json b/tests/unit/expected_test_results/nutriscore/en-sweeteners.json index 8f90a3c90fe60..631422757a948 100644 --- a/tests/unit/expected_test_results/nutriscore/en-sweeteners.json +++ b/tests/unit/expected_test_results/nutriscore/en-sweeteners.json @@ -38,7 +38,7 @@ "en:carbonated-drinks", "en:sodas" ], - "food_groups" : "en:sweetened-beverages", + "food_groups" : "en:Sweetened beverages", "food_groups_tags" : [ "en:beverages", "en:sweetened-beverages" @@ -47,6 +47,7 @@ { "ciqual_food_code" : "2074", "id" : "en:apple-juice", + "is_in_taxonomy" : 1, "percent_estimate" : 70.5, "percent_max" : 100, "percent_min" : 41, @@ -57,6 +58,7 @@ { "ciqual_food_code" : "18066", "id" : "en:water", + "is_in_taxonomy" : 1, "percent_estimate" : 14.75, "percent_max" : 50, "percent_min" : 0, @@ -67,6 +69,7 @@ { "ciqual_proxy_food_code" : "31016", "id" : "en:sugar", + "is_in_taxonomy" : 1, "percent_estimate" : 2.25, "percent_max" : 4.5, "percent_min" : 0, @@ -76,6 +79,7 @@ }, { "id" : "en:e951", + "is_in_taxonomy" : 1, "percent_estimate" : 12.5, "percent_max" : 4.5, "percent_min" : 0, diff --git a/tests/unit/expected_test_results/nutriscore/en-tofu.json b/tests/unit/expected_test_results/nutriscore/en-tofu.json index edccbc62ec87e..ae3ab8239f822 100644 --- a/tests/unit/expected_test_results/nutriscore/en-tofu.json +++ b/tests/unit/expected_test_results/nutriscore/en-tofu.json @@ -36,7 +36,7 @@ "en:meat-alternatives", "en:tofu" ], - "food_groups" : "en:legumes", + "food_groups" : "en:Legumes", "food_groups_tags" : [ "en:cereals-and-potatoes", "en:legumes" @@ -45,6 +45,7 @@ { "ciqual_food_code" : "20901", "id" : "en:soya-bean", + "is_in_taxonomy" : 1, "percent" : 90, "percent_estimate" : 90, "percent_max" : 90, @@ -56,6 +57,7 @@ { "ciqual_food_code" : "18066", "id" : "en:water", + "is_in_taxonomy" : 1, "percent" : 9, "percent_estimate" : 9, "percent_max" : 9, @@ -67,6 +69,7 @@ { "ciqual_food_code" : "11058", "id" : "en:salt", + "is_in_taxonomy" : 1, "percent" : 1, "percent_estimate" : 1, "percent_max" : 1, diff --git a/tests/unit/expected_test_results/nutriscore/en-vegetable-crisps.json b/tests/unit/expected_test_results/nutriscore/en-vegetable-crisps.json index acc8ed662b9e8..fc257a6107bf1 100644 --- a/tests/unit/expected_test_results/nutriscore/en-vegetable-crisps.json +++ b/tests/unit/expected_test_results/nutriscore/en-vegetable-crisps.json @@ -32,7 +32,7 @@ "en:crisps", "en:parsnip-crisps" ], - "food_groups" : "en:appetizers", + "food_groups" : "en:Appetizers", "food_groups_tags" : [ "en:salty-snacks", "en:appetizers" @@ -41,6 +41,7 @@ { "ciqual_food_code" : "20181", "id" : "en:parsnip", + "is_in_taxonomy" : 1, "percent" : 70, "percent_estimate" : 70, "percent_max" : 70, @@ -52,6 +53,7 @@ { "ciqual_food_code" : "20091", "id" : "en:red-beetroot", + "is_in_taxonomy" : 1, "percent" : 30, "percent_estimate" : 30, "percent_max" : 30, diff --git a/tests/unit/expected_test_results/nutriscore/flavored-spring-water-no-nutrition.json b/tests/unit/expected_test_results/nutriscore/flavored-spring-water-no-nutrition.json index efb5a9dbc4580..48d7fbf9bb7d7 100644 --- a/tests/unit/expected_test_results/nutriscore/flavored-spring-water-no-nutrition.json +++ b/tests/unit/expected_test_results/nutriscore/flavored-spring-water-no-nutrition.json @@ -30,7 +30,7 @@ "en:flavored-waters", "en:flavored-spring-waters" ], - "food_groups" : "en:waters-and-flavored-waters", + "food_groups" : "en:Waters and flavored waters", "food_groups_tags" : [ "en:beverages", "en:waters-and-flavored-waters" diff --git a/tests/unit/expected_test_results/nutriscore/flavored-spring-with-nutrition.json b/tests/unit/expected_test_results/nutriscore/flavored-spring-with-nutrition.json index 17e4bd9fdbf26..fdd1372481ab8 100644 --- a/tests/unit/expected_test_results/nutriscore/flavored-spring-with-nutrition.json +++ b/tests/unit/expected_test_results/nutriscore/flavored-spring-with-nutrition.json @@ -30,7 +30,7 @@ "en:flavored-waters", "en:flavored-spring-waters" ], - "food_groups" : "en:waters-and-flavored-waters", + "food_groups" : "en:Waters and flavored waters", "food_groups_tags" : [ "en:beverages", "en:waters-and-flavored-waters" diff --git a/tests/unit/expected_test_results/nutriscore/fr-canned-green-beans.json b/tests/unit/expected_test_results/nutriscore/fr-canned-green-beans.json index 76e96a0a5484e..a9ca559d0a390 100644 --- a/tests/unit/expected_test_results/nutriscore/fr-canned-green-beans.json +++ b/tests/unit/expected_test_results/nutriscore/fr-canned-green-beans.json @@ -52,7 +52,7 @@ "en:canned-legumes", "en:canned-green-beans" ], - "food_groups" : "en:vegetables", + "food_groups" : "en:Vegetables", "food_groups_tags" : [ "en:fruits-and-vegetables", "en:vegetables" @@ -61,6 +61,7 @@ { "ciqual_food_code" : "18066", "id" : "en:water", + "is_in_taxonomy" : 1, "percent" : 80, "percent_estimate" : 80, "percent_max" : 80, @@ -72,6 +73,7 @@ { "ciqual_proxy_food_code" : "31016", "id" : "en:sugar", + "is_in_taxonomy" : 1, "percent" : 10, "percent_estimate" : 10, "percent_max" : 10, @@ -83,6 +85,7 @@ { "ciqual_food_code" : "20061", "id" : "en:green-bean", + "is_in_taxonomy" : 1, "percent" : 10, "percent_estimate" : 10, "percent_max" : 10, diff --git a/tests/unit/expected_test_results/nutriscore/fr-canned-pineapple.json b/tests/unit/expected_test_results/nutriscore/fr-canned-pineapple.json index b99029849ed17..ea4747c84a4dc 100644 --- a/tests/unit/expected_test_results/nutriscore/fr-canned-pineapple.json +++ b/tests/unit/expected_test_results/nutriscore/fr-canned-pineapple.json @@ -37,6 +37,7 @@ { "ciqual_food_code" : "18066", "id" : "en:water", + "is_in_taxonomy" : 1, "percent" : 80, "percent_estimate" : 80, "percent_max" : 80, @@ -48,6 +49,7 @@ { "ciqual_proxy_food_code" : "31016", "id" : "en:sugar", + "is_in_taxonomy" : 1, "percent" : 10, "percent_estimate" : 10, "percent_max" : 10, @@ -58,6 +60,7 @@ }, { "id" : "en:pineapple", + "is_in_taxonomy" : 1, "percent" : 10, "percent_estimate" : 10, "percent_max" : 10, diff --git a/tests/unit/expected_test_results/nutriscore/fr-coconut-milk.json b/tests/unit/expected_test_results/nutriscore/fr-coconut-milk.json index 595f8fe092fec..39f8ad61a9e44 100644 --- a/tests/unit/expected_test_results/nutriscore/fr-coconut-milk.json +++ b/tests/unit/expected_test_results/nutriscore/fr-coconut-milk.json @@ -41,6 +41,7 @@ { "ciqual_proxy_food_code" : "15006", "id" : "en:coconut", + "is_in_taxonomy" : 1, "percent" : 60, "percent_estimate" : 60, "percent_max" : 60, @@ -52,6 +53,7 @@ { "ciqual_food_code" : "18066", "id" : "en:water", + "is_in_taxonomy" : 1, "percent_estimate" : 40, "percent_max" : 40, "percent_min" : 40, diff --git a/tests/unit/expected_test_results/nutriscore/fr-gaspacho.json b/tests/unit/expected_test_results/nutriscore/fr-gaspacho.json index 48c3d7ee7bc18..21fb35c044e7a 100644 --- a/tests/unit/expected_test_results/nutriscore/fr-gaspacho.json +++ b/tests/unit/expected_test_results/nutriscore/fr-gaspacho.json @@ -44,7 +44,7 @@ "en:cold-soups", "en:gazpacho" ], - "food_groups" : "en:soups", + "food_groups" : "en:Soups", "food_groups_tags" : [ "en:fruits-and-vegetables", "en:soups" @@ -53,6 +53,7 @@ { "ciqual_food_code" : "20047", "id" : "en:tomato", + "is_in_taxonomy" : 1, "percent_estimate" : 51.7954545454545, "percent_max" : 94.5, "percent_min" : 9.09090909090909, @@ -63,6 +64,7 @@ { "ciqual_proxy_food_code" : "20019", "id" : "en:cucumber", + "is_in_taxonomy" : 1, "percent_estimate" : 24.45, "percent_max" : 47.8, "percent_min" : 1.1, @@ -73,6 +75,7 @@ { "ciqual_food_code" : "20041", "id" : "en:bell-pepper", + "is_in_taxonomy" : 1, "percent_estimate" : 12.4272727272727, "percent_max" : 32.2333333333333, "percent_min" : 1.1, @@ -83,6 +86,7 @@ { "ciqual_food_code" : "20034", "id" : "en:onion", + "is_in_taxonomy" : 1, "percent_estimate" : 6.21363636363636, "percent_max" : 24.45, "percent_min" : 1.1, @@ -93,6 +97,7 @@ { "ciqual_food_code" : "18066", "id" : "en:water", + "is_in_taxonomy" : 1, "percent_estimate" : 3.10681818181818, "percent_max" : 19.78, "percent_min" : 1.1, @@ -104,6 +109,7 @@ "ciqual_food_code" : "17270", "from_palm_oil" : "no", "id" : "en:extra-virgin-olive-oil", + "is_in_taxonomy" : 1, "percent" : 1.1, "percent_estimate" : 1.1, "percent_max" : 1.1, @@ -115,6 +121,7 @@ { "ciqual_food_code" : "11018", "id" : "en:wine-vinegar", + "is_in_taxonomy" : 1, "percent_estimate" : 0.453409090909091, "percent_max" : 1.1, "percent_min" : 0, @@ -124,6 +131,7 @@ }, { "id" : "fr:pain-de-riz", + "is_in_taxonomy" : 0, "percent_estimate" : 0.226704545454545, "percent_max" : 1.1, "percent_min" : 0, @@ -132,6 +140,7 @@ { "ciqual_food_code" : "11058", "id" : "en:salt", + "is_in_taxonomy" : 1, "percent_estimate" : 0.113352272727269, "percent_max" : 0.5, "percent_min" : 0, @@ -142,6 +151,7 @@ { "ciqual_food_code" : "11000", "id" : "en:garlic", + "is_in_taxonomy" : 1, "percent_estimate" : 0.0566761363636346, "percent_max" : 0.5, "percent_min" : 0, @@ -152,6 +162,7 @@ { "ciqual_food_code" : "2028", "id" : "en:lemon-juice", + "is_in_taxonomy" : 1, "percent_estimate" : 0.0566761363636346, "percent_max" : 0.5, "percent_min" : 0, diff --git a/tests/unit/expected_test_results/nutriscore/fr-green-beans-beverage.json b/tests/unit/expected_test_results/nutriscore/fr-green-beans-beverage.json index bd20d6ea00368..cf088edeed8f0 100644 --- a/tests/unit/expected_test_results/nutriscore/fr-green-beans-beverage.json +++ b/tests/unit/expected_test_results/nutriscore/fr-green-beans-beverage.json @@ -22,7 +22,7 @@ "categories_tags" : [ "en:meals" ], - "food_groups" : "en:one-dish-meals", + "food_groups" : "en:One-dish meals", "food_groups_tags" : [ "en:composite-foods", "en:one-dish-meals" @@ -31,6 +31,7 @@ { "ciqual_food_code" : "18066", "id" : "en:water", + "is_in_taxonomy" : 1, "percent" : 80, "percent_estimate" : 80, "percent_max" : 80, @@ -42,6 +43,7 @@ { "ciqual_proxy_food_code" : "31016", "id" : "en:sugar", + "is_in_taxonomy" : 1, "percent" : 10, "percent_estimate" : 10, "percent_max" : 10, @@ -53,6 +55,7 @@ { "ciqual_food_code" : "20061", "id" : "en:green-bean", + "is_in_taxonomy" : 1, "percent" : 10, "percent_estimate" : 10, "percent_max" : 10, diff --git a/tests/unit/expected_test_results/nutriscore/fr-ice-tea-with-sweetener.json b/tests/unit/expected_test_results/nutriscore/fr-ice-tea-with-sweetener.json index 264aff179ceb5..3bbe904ad13a4 100644 --- a/tests/unit/expected_test_results/nutriscore/fr-ice-tea-with-sweetener.json +++ b/tests/unit/expected_test_results/nutriscore/fr-ice-tea-with-sweetener.json @@ -53,7 +53,7 @@ "en:tea-based-beverages", "en:iced-teas" ], - "food_groups" : "en:sweetened-beverages", + "food_groups" : "en:Sweetened beverages", "food_groups_tags" : [ "en:beverages", "en:sweetened-beverages" @@ -62,6 +62,7 @@ { "ciqual_food_code" : "18066", "id" : "en:water", + "is_in_taxonomy" : 1, "percent_estimate" : 89.95, "percent_max" : 95.1, "percent_min" : 84.8, @@ -72,6 +73,7 @@ { "ciqual_proxy_food_code" : "31016", "id" : "en:sugar", + "is_in_taxonomy" : 1, "percent_estimate" : 2.85, "percent_max" : 4.5, "percent_min" : 1.2, @@ -82,6 +84,7 @@ { "ciqual_food_code" : "31077", "id" : "en:fructose", + "is_in_taxonomy" : 1, "percent_estimate" : 2.85, "percent_max" : 4.5, "percent_min" : 1.2, @@ -94,6 +97,7 @@ "ingredients" : [ { "id" : "en:e330", + "is_in_taxonomy" : 1, "percent_estimate" : 1.68750000000001, "percent_max" : 4.5, "percent_min" : 0.6, @@ -103,6 +107,7 @@ }, { "id" : "en:e296", + "is_in_taxonomy" : 1, "percent_estimate" : 1.08750000000001, "percent_max" : 2.25, "percent_min" : 0, @@ -111,6 +116,7 @@ "vegetarian" : "yes" } ], + "is_in_taxonomy" : 1, "percent_estimate" : 2.77500000000001, "percent_max" : 4.5, "percent_min" : 1.2, @@ -122,12 +128,14 @@ "ingredients" : [ { "id" : "fr:l", + "is_in_taxonomy" : 0, "percent_estimate" : 1.2, "percent_max" : 1.2, "percent_min" : 1.2, "text" : "l" } ], + "is_in_taxonomy" : 1, "percent" : 1.2, "percent_estimate" : 1.2, "percent_max" : 1.2, @@ -138,6 +146,7 @@ }, { "id" : "en:peach", + "is_in_taxonomy" : 1, "percent" : 0.1, "percent_estimate" : 0.1, "percent_max" : 0.1, @@ -152,12 +161,14 @@ "ingredients" : [ { "id" : "en:sodium-citrate", + "is_in_taxonomy" : 1, "percent_estimate" : 0.05, "percent_max" : 0.1, "percent_min" : 0, "text" : "citrate trisodique" } ], + "is_in_taxonomy" : 1, "percent_estimate" : 0.05, "percent_max" : 0.1, "percent_min" : 0, @@ -165,6 +176,7 @@ }, { "id" : "en:flavouring", + "is_in_taxonomy" : 1, "percent_estimate" : 0.05, "percent_max" : 0.1, "percent_min" : 0, @@ -177,6 +189,7 @@ "ingredients" : [ { "id" : "en:e300", + "is_in_taxonomy" : 1, "percent_estimate" : 0.05, "percent_max" : 0.1, "percent_min" : 0, @@ -185,6 +198,7 @@ "vegetarian" : "yes" } ], + "is_in_taxonomy" : 1, "percent_estimate" : 0.05, "percent_max" : 0.1, "percent_min" : 0, @@ -195,6 +209,7 @@ "ingredients" : [ { "id" : "en:e960", + "is_in_taxonomy" : 1, "percent_estimate" : 0.125000000000028, "percent_max" : 0.1, "percent_min" : 0, @@ -203,6 +218,7 @@ "vegetarian" : "yes" } ], + "is_in_taxonomy" : 1, "percent_estimate" : 0.125000000000028, "percent_max" : 0.1, "percent_min" : 0, diff --git a/tests/unit/expected_test_results/nutriscore/fr-mixed-oils-with-olive-oil.json b/tests/unit/expected_test_results/nutriscore/fr-mixed-oils-with-olive-oil.json index d187891415017..7b796e313207c 100644 --- a/tests/unit/expected_test_results/nutriscore/fr-mixed-oils-with-olive-oil.json +++ b/tests/unit/expected_test_results/nutriscore/fr-mixed-oils-with-olive-oil.json @@ -33,7 +33,7 @@ "en:vegetable-fats", "en:vegetable-oils" ], - "food_groups" : "en:fats", + "food_groups" : "en:Fats", "food_groups_tags" : [ "en:fats-and-sauces", "en:fats" @@ -43,6 +43,7 @@ "ciqual_food_code" : "17130", "from_palm_oil" : "no", "id" : "en:colza-oil", + "is_in_taxonomy" : 1, "percent" : 45, "percent_estimate" : 45, "percent_max" : 45, @@ -55,6 +56,7 @@ "ciqual_food_code" : "17440", "from_palm_oil" : "no", "id" : "en:sunflower-oil", + "is_in_taxonomy" : 1, "percent" : 30, "percent_estimate" : 30, "percent_max" : 30, @@ -67,6 +69,7 @@ "ciqual_food_code" : "17270", "from_palm_oil" : "no", "id" : "en:extra-virgin-olive-oil", + "is_in_taxonomy" : 1, "percent" : 20, "percent_estimate" : 20, "percent_max" : 20, @@ -79,6 +82,7 @@ "ciqual_food_code" : "17180", "from_palm_oil" : "no", "id" : "en:linseed-oil", + "is_in_taxonomy" : 1, "percent" : 5, "percent_estimate" : 5, "percent_max" : 5, @@ -89,6 +93,7 @@ }, { "id" : "en:vitamin-d", + "is_in_taxonomy" : 1, "percent_estimate" : 0, "percent_max" : 0, "percent_min" : 0, diff --git a/tests/unit/expected_test_results/nutriscore/fr-orange-nectar-0-fat.json b/tests/unit/expected_test_results/nutriscore/fr-orange-nectar-0-fat.json index 79b332072e5b8..cdc7d65285bdb 100644 --- a/tests/unit/expected_test_results/nutriscore/fr-orange-nectar-0-fat.json +++ b/tests/unit/expected_test_results/nutriscore/fr-orange-nectar-0-fat.json @@ -38,7 +38,7 @@ "en:juices-and-nectars", "en:fruit-nectars" ], - "food_groups" : "en:sweetened-beverages", + "food_groups" : "en:Sweetened beverages", "food_groups_tags" : [ "en:beverages", "en:sweetened-beverages" @@ -47,6 +47,7 @@ { "ciqual_proxy_food_code" : "13034", "id" : "en:orange", + "is_in_taxonomy" : 1, "percent" : 47, "percent_estimate" : 47, "percent_max" : 47, @@ -58,6 +59,7 @@ { "ciqual_food_code" : "18066", "id" : "en:water", + "is_in_taxonomy" : 1, "percent_estimate" : 32, "percent_max" : 33, "percent_min" : 31, @@ -68,6 +70,7 @@ { "ciqual_proxy_food_code" : "31016", "id" : "en:sugar", + "is_in_taxonomy" : 1, "percent_estimate" : 11, "percent_max" : 12, "percent_min" : 10, @@ -78,6 +81,7 @@ { "ciqual_food_code" : "20009", "id" : "en:carrot", + "is_in_taxonomy" : 1, "percent" : 10, "percent_estimate" : 10, "percent_max" : 10, diff --git a/tests/unit/expected_test_results/nutriscore/fr-plant-beverages-soy-milk.json b/tests/unit/expected_test_results/nutriscore/fr-plant-beverages-soy-milk.json index 7a5a7dc0ac8c1..78bb58ca64f62 100644 --- a/tests/unit/expected_test_results/nutriscore/fr-plant-beverages-soy-milk.json +++ b/tests/unit/expected_test_results/nutriscore/fr-plant-beverages-soy-milk.json @@ -48,7 +48,7 @@ "en:legume-based-drinks", "en:soy-based-drinks" ], - "food_groups" : "en:plant-based-milk-substitutes", + "food_groups" : "en:Plant-based milk substitutes", "food_groups_tags" : [ "en:beverages", "en:plant-based-milk-substitutes" @@ -57,6 +57,7 @@ { "ciqual_food_code" : "18066", "id" : "en:water", + "is_in_taxonomy" : 1, "percent_estimate" : 92, "percent_max" : 92, "percent_min" : 92, @@ -67,6 +68,7 @@ { "ciqual_food_code" : "20901", "id" : "en:soya-bean", + "is_in_taxonomy" : 1, "percent" : 8, "percent_estimate" : 8, "percent_max" : 8, diff --git a/tests/unit/expected_test_results/nutriscore/fr-rapeseed-oil.json b/tests/unit/expected_test_results/nutriscore/fr-rapeseed-oil.json index 25b2bf5ddc2da..d67b791794953 100644 --- a/tests/unit/expected_test_results/nutriscore/fr-rapeseed-oil.json +++ b/tests/unit/expected_test_results/nutriscore/fr-rapeseed-oil.json @@ -38,7 +38,7 @@ "en:vegetable-oils", "en:rapeseed-oils" ], - "food_groups" : "en:fats", + "food_groups" : "en:Fats", "food_groups_tags" : [ "en:fats-and-sauces", "en:fats" @@ -48,6 +48,7 @@ "ciqual_food_code" : "17130", "from_palm_oil" : "no", "id" : "en:colza-oil", + "is_in_taxonomy" : 1, "percent_estimate" : 100, "percent_max" : 100, "percent_min" : 100, diff --git a/tests/unit/expected_test_results/nutriscore/milk.json b/tests/unit/expected_test_results/nutriscore/milk.json index bff8b5c5ea05b..f9ef918f4e070 100644 --- a/tests/unit/expected_test_results/nutriscore/milk.json +++ b/tests/unit/expected_test_results/nutriscore/milk.json @@ -28,7 +28,7 @@ "en:dairies", "en:milks" ], - "food_groups" : "en:milk-and-yogurt", + "food_groups" : "en:Milk and yogurt", "food_groups_tags" : [ "en:milk-and-dairy-products", "en:milk-and-yogurt" @@ -37,6 +37,7 @@ { "ciqual_proxy_food_code" : "19051", "id" : "en:milk", + "is_in_taxonomy" : 1, "percent_estimate" : 100, "percent_max" : 100, "percent_min" : 100, diff --git a/tests/unit/expected_test_results/nutriscore/mushrooms.json b/tests/unit/expected_test_results/nutriscore/mushrooms.json index 05f537dd4c7b9..f815bd89bc02c 100644 --- a/tests/unit/expected_test_results/nutriscore/mushrooms.json +++ b/tests/unit/expected_test_results/nutriscore/mushrooms.json @@ -22,7 +22,7 @@ "categories_tags" : [ "en:meals" ], - "food_groups" : "en:one-dish-meals", + "food_groups" : "en:One-dish meals", "food_groups_tags" : [ "en:composite-foods", "en:one-dish-meals" @@ -31,6 +31,7 @@ { "ciqual_food_code" : "20114", "id" : "en:oyster-mushroom", + "is_in_taxonomy" : 1, "origins" : "en:european-union", "percent" : 69, "percent_estimate" : 69, @@ -42,6 +43,7 @@ }, { "id" : "fr:chapelure-de-mais", + "is_in_taxonomy" : 0, "percent_estimate" : 31, "percent_max" : 31, "percent_min" : 31, diff --git a/tests/unit/expected_test_results/nutriscore/olive-oil.json b/tests/unit/expected_test_results/nutriscore/olive-oil.json index 49add1281252f..7d5b88e06a224 100644 --- a/tests/unit/expected_test_results/nutriscore/olive-oil.json +++ b/tests/unit/expected_test_results/nutriscore/olive-oil.json @@ -34,7 +34,7 @@ "en:vegetable-oils", "en:olive-oils" ], - "food_groups" : "en:fats", + "food_groups" : "en:Fats", "food_groups_tags" : [ "en:fats-and-sauces", "en:fats" diff --git a/tests/unit/expected_test_results/nutriscore/spring-water-no-nutrition.json b/tests/unit/expected_test_results/nutriscore/spring-water-no-nutrition.json index 13ebd3aaf7055..87aff8f5856d0 100644 --- a/tests/unit/expected_test_results/nutriscore/spring-water-no-nutrition.json +++ b/tests/unit/expected_test_results/nutriscore/spring-water-no-nutrition.json @@ -28,7 +28,7 @@ "en:waters", "en:spring-waters" ], - "food_groups" : "en:waters-and-flavored-waters", + "food_groups" : "en:Waters and flavored waters", "food_groups_tags" : [ "en:beverages", "en:waters-and-flavored-waters" diff --git a/tests/unit/expected_test_results/nutriscore/sunflower-oil-no-sugar-no-sat-fat.json b/tests/unit/expected_test_results/nutriscore/sunflower-oil-no-sugar-no-sat-fat.json index 38d90bb4f681c..bbc9813436286 100644 --- a/tests/unit/expected_test_results/nutriscore/sunflower-oil-no-sugar-no-sat-fat.json +++ b/tests/unit/expected_test_results/nutriscore/sunflower-oil-no-sugar-no-sat-fat.json @@ -34,7 +34,7 @@ "en:sunflower-seeds-and-their-products", "en:sunflower-oils" ], - "food_groups" : "en:fats", + "food_groups" : "en:Fats", "food_groups_tags" : [ "en:fats-and-sauces", "en:fats" diff --git a/tests/unit/expected_test_results/nutriscore/sunflower-oil-no-sugar.json b/tests/unit/expected_test_results/nutriscore/sunflower-oil-no-sugar.json index 7d40b81b4ac2a..122b2ad9f61c1 100644 --- a/tests/unit/expected_test_results/nutriscore/sunflower-oil-no-sugar.json +++ b/tests/unit/expected_test_results/nutriscore/sunflower-oil-no-sugar.json @@ -34,7 +34,7 @@ "en:sunflower-seeds-and-their-products", "en:sunflower-oils" ], - "food_groups" : "en:fats", + "food_groups" : "en:Fats", "food_groups_tags" : [ "en:fats-and-sauces", "en:fats" diff --git a/tests/unit/expected_test_results/nutriscore/sunflower-oil.json b/tests/unit/expected_test_results/nutriscore/sunflower-oil.json index 409fcea25e850..e7b80f3579a3f 100644 --- a/tests/unit/expected_test_results/nutriscore/sunflower-oil.json +++ b/tests/unit/expected_test_results/nutriscore/sunflower-oil.json @@ -34,7 +34,7 @@ "en:sunflower-seeds-and-their-products", "en:sunflower-oils" ], - "food_groups" : "en:fats", + "food_groups" : "en:Fats", "food_groups_tags" : [ "en:fats-and-sauces", "en:fats" diff --git a/tests/unit/expected_test_results/nutriscore/walnut-oil.json b/tests/unit/expected_test_results/nutriscore/walnut-oil.json index 2e2f0ca3f836e..8cf74a858e814 100644 --- a/tests/unit/expected_test_results/nutriscore/walnut-oil.json +++ b/tests/unit/expected_test_results/nutriscore/walnut-oil.json @@ -36,7 +36,7 @@ "en:nut-oils", "en:walnut-oils" ], - "food_groups" : "en:fats", + "food_groups" : "en:Fats", "food_groups_tags" : [ "en:fats-and-sauces", "en:fats" diff --git a/tests/unit/expected_test_results/nutrition_estimation/100-percent-sugar.json b/tests/unit/expected_test_results/nutrition_estimation/100-percent-sugar.json index 831fe703c42ab..e056bc0f3ac8c 100644 --- a/tests/unit/expected_test_results/nutrition_estimation/100-percent-sugar.json +++ b/tests/unit/expected_test_results/nutrition_estimation/100-percent-sugar.json @@ -54,6 +54,7 @@ "ingredients" : [ { "id" : "en:sugar", + "is_in_taxonomy" : 1, "percent_estimate" : 100, "percent_max" : 100, "percent_min" : 100, diff --git a/tests/unit/expected_test_results/nutrition_estimation/100-percent-white-sugar.json b/tests/unit/expected_test_results/nutrition_estimation/100-percent-white-sugar.json index d3b6dadd8606a..93a8c8bb75fa7 100644 --- a/tests/unit/expected_test_results/nutrition_estimation/100-percent-white-sugar.json +++ b/tests/unit/expected_test_results/nutrition_estimation/100-percent-white-sugar.json @@ -54,6 +54,7 @@ "ingredients" : [ { "id" : "en:white-sugar", + "is_in_taxonomy" : 1, "percent_estimate" : 100, "percent_max" : 100, "percent_min" : 100, diff --git a/tests/unit/expected_test_results/nutrition_estimation/50-percent-sugar-and-unknown-ingredients.json b/tests/unit/expected_test_results/nutrition_estimation/50-percent-sugar-and-unknown-ingredients.json index 2978344889f7b..8625648e9887f 100644 --- a/tests/unit/expected_test_results/nutrition_estimation/50-percent-sugar-and-unknown-ingredients.json +++ b/tests/unit/expected_test_results/nutrition_estimation/50-percent-sugar-and-unknown-ingredients.json @@ -57,6 +57,7 @@ "ingredients" : [ { "id" : "en:sugar", + "is_in_taxonomy" : 1, "percent" : 50, "percent_estimate" : 50, "percent_max" : 50, @@ -65,6 +66,7 @@ }, { "id" : "en:strange-ingredient", + "is_in_taxonomy" : 0, "percent_estimate" : 37.5, "percent_max" : 50, "percent_min" : 25, @@ -72,6 +74,7 @@ }, { "id" : "en:stranger-ingredient", + "is_in_taxonomy" : 0, "percent_estimate" : 12.5, "percent_max" : 25, "percent_min" : 0, diff --git a/tests/unit/expected_test_results/nutrition_estimation/frik.json b/tests/unit/expected_test_results/nutrition_estimation/frik.json index 7983071924648..802c48a7d818d 100644 --- a/tests/unit/expected_test_results/nutrition_estimation/frik.json +++ b/tests/unit/expected_test_results/nutrition_estimation/frik.json @@ -36,6 +36,7 @@ "ingredients" : [ { "id" : "en:freekeh", + "is_in_taxonomy" : 1, "percent_estimate" : 100, "percent_max" : 100, "percent_min" : 100, diff --git a/tests/unit/expected_test_results/recipes/fr-margherita-pizzas.fr-margherita-pizza-1.json b/tests/unit/expected_test_results/recipes/fr-margherita-pizzas.fr-margherita-pizza-1.json index 8895a3119440f..410b3028ad183 100644 --- a/tests/unit/expected_test_results/recipes/fr-margherita-pizzas.fr-margherita-pizza-1.json +++ b/tests/unit/expected_test_results/recipes/fr-margherita-pizzas.fr-margherita-pizza-1.json @@ -3,6 +3,7 @@ { "ciqual_proxy_food_code" : "9410", "id" : "en:wheat-flour", + "is_in_taxonomy" : 1, "labels" : "en:organic", "percent_estimate" : 33, "percent_max" : 40, @@ -14,6 +15,7 @@ { "ciqual_food_code" : "20170", "id" : "en:tomato-puree", + "is_in_taxonomy" : 1, "labels" : "en:organic", "percent" : 26, "percent_estimate" : 26, @@ -26,6 +28,7 @@ { "ciqual_food_code" : "18066", "id" : "en:water", + "is_in_taxonomy" : 1, "percent_estimate" : 21.5, "percent_max" : 26, "percent_min" : 17, @@ -36,6 +39,7 @@ { "ciqual_food_code" : "19590", "id" : "en:mozzarella", + "is_in_taxonomy" : 1, "labels" : "en:organic", "percent" : 17, "percent_estimate" : 17, @@ -50,6 +54,7 @@ "ciqual_food_code" : "17440", "from_palm_oil" : "no", "id" : "en:sunflower-oil", + "is_in_taxonomy" : 1, "labels" : "en:organic", "percent_estimate" : 1.25, "percent_max" : 10.3333333333333, @@ -61,6 +66,7 @@ { "ciqual_proxy_food_code" : "11009", "id" : "en:yeast", + "is_in_taxonomy" : 1, "percent_estimate" : 0.625, "percent_max" : 7.75, "percent_min" : 0, @@ -71,6 +77,7 @@ { "ciqual_food_code" : "11058", "id" : "en:salt", + "is_in_taxonomy" : 1, "percent_estimate" : 0.3125, "percent_max" : 6.2, "percent_min" : 0, @@ -80,6 +87,7 @@ }, { "id" : "en:herb", + "is_in_taxonomy" : 1, "labels" : "en:organic", "percent_estimate" : 0.15625, "percent_max" : 5.16666666666667, @@ -90,6 +98,7 @@ }, { "id" : "en:spice", + "is_in_taxonomy" : 1, "labels" : "en:organic", "percent_estimate" : 0.15625, "percent_max" : 4.42857142857143, diff --git a/tests/unit/expected_test_results/recipes/fr-margherita-pizzas.fr-margherita-pizza-2-compound-ingredients.json b/tests/unit/expected_test_results/recipes/fr-margherita-pizzas.fr-margherita-pizza-2-compound-ingredients.json index aea327b5ab72e..e01ee52298ad3 100644 --- a/tests/unit/expected_test_results/recipes/fr-margherita-pizzas.fr-margherita-pizza-2-compound-ingredients.json +++ b/tests/unit/expected_test_results/recipes/fr-margherita-pizzas.fr-margherita-pizza-2-compound-ingredients.json @@ -6,6 +6,7 @@ { "ciqual_food_code" : "20047", "id" : "en:chopped-tomatoes", + "is_in_taxonomy" : 1, "percent_estimate" : 46.6666666666667, "percent_max" : 70, "percent_min" : 23.3333333333333, @@ -16,6 +17,7 @@ { "ciqual_proxy_food_code" : "12999", "id" : "en:cheese", + "is_in_taxonomy" : 1, "percent_estimate" : 11.6666666666667, "percent_max" : 35, "percent_min" : 0, @@ -27,6 +29,7 @@ { "ciqual_food_code" : "11033", "id" : "en:basil-leaf", + "is_in_taxonomy" : 1, "percent_estimate" : 11.6666666666667, "percent_max" : 23.3333333333333, "percent_min" : 0, @@ -35,6 +38,7 @@ "vegetarian" : "yes" } ], + "is_in_taxonomy" : 1, "percent" : 70, "percent_estimate" : 70, "percent_max" : 70, @@ -50,6 +54,7 @@ { "ciqual_proxy_food_code" : "9410", "id" : "en:wheat-flour", + "is_in_taxonomy" : 1, "percent_estimate" : 20, "percent_max" : 30, "percent_min" : 10, @@ -60,6 +65,7 @@ { "ciqual_food_code" : "18066", "id" : "en:water", + "is_in_taxonomy" : 1, "percent_estimate" : 5, "percent_max" : 15, "percent_min" : 0, @@ -70,6 +76,7 @@ { "ciqual_food_code" : "11058", "id" : "en:salt", + "is_in_taxonomy" : 1, "percent_estimate" : 5, "percent_max" : 10, "percent_min" : 0, @@ -78,6 +85,7 @@ "vegetarian" : "yes" } ], + "is_in_taxonomy" : 1, "percent" : 30, "percent_estimate" : 30, "percent_max" : 30, diff --git a/tests/unit/expected_test_results/recipes/nectars.guava-nectar.json b/tests/unit/expected_test_results/recipes/nectars.guava-nectar.json index 6dd180487045a..0956e0df068e6 100644 --- a/tests/unit/expected_test_results/recipes/nectars.guava-nectar.json +++ b/tests/unit/expected_test_results/recipes/nectars.guava-nectar.json @@ -3,6 +3,7 @@ { "ciqual_food_code" : "18066", "id" : "en:water", + "is_in_taxonomy" : 1, "percent_estimate" : 62, "percent_max" : 62, "percent_min" : 62, @@ -12,6 +13,7 @@ }, { "id" : "en:guava", + "is_in_taxonomy" : 1, "percent" : 25, "percent_estimate" : 25, "percent_max" : 25, @@ -24,6 +26,7 @@ { "ciqual_proxy_food_code" : "31016", "id" : "en:cane-sugar", + "is_in_taxonomy" : 1, "percent" : 10, "percent_estimate" : 10, "percent_max" : 10, @@ -34,6 +37,7 @@ }, { "id" : "en:e330", + "is_in_taxonomy" : 1, "percent" : 2, "percent_estimate" : 2, "percent_max" : 2, @@ -44,6 +48,7 @@ }, { "id" : "en:some-unknown-ingredient", + "is_in_taxonomy" : 0, "percent" : 1, "percent_estimate" : 1, "percent_max" : 1, diff --git a/tests/unit/expected_test_results/recipes/nectars.impossible-ingredients.json b/tests/unit/expected_test_results/recipes/nectars.impossible-ingredients.json index efc7e340c45cd..b2a49606e129b 100644 --- a/tests/unit/expected_test_results/recipes/nectars.impossible-ingredients.json +++ b/tests/unit/expected_test_results/recipes/nectars.impossible-ingredients.json @@ -3,6 +3,7 @@ { "ciqual_proxy_food_code" : "2070", "id" : "en:orange-juice", + "is_in_taxonomy" : 1, "percent" : 50, "percent_estimate" : 50, "text" : "Orange juice", @@ -12,6 +13,7 @@ { "ciqual_food_code" : "18066", "id" : "en:water", + "is_in_taxonomy" : 1, "percent_estimate" : 25, "text" : "water", "vegan" : "yes", @@ -20,6 +22,7 @@ { "ciqual_proxy_food_code" : "31016", "id" : "en:sugar", + "is_in_taxonomy" : 1, "percent" : 30, "percent_estimate" : 25, "text" : "sugar", diff --git a/tests/unit/expected_test_results/recipes/nectars.strawberry-nectar.json b/tests/unit/expected_test_results/recipes/nectars.strawberry-nectar.json index 193f5bebfcf98..3a393f2a4b271 100644 --- a/tests/unit/expected_test_results/recipes/nectars.strawberry-nectar.json +++ b/tests/unit/expected_test_results/recipes/nectars.strawberry-nectar.json @@ -3,6 +3,7 @@ { "ciqual_food_code" : "18066", "id" : "en:water", + "is_in_taxonomy" : 1, "percent_estimate" : 75, "percent_max" : 75, "percent_min" : 75, @@ -13,6 +14,7 @@ { "ciqual_food_code" : "13014", "id" : "en:strawberry-juice", + "is_in_taxonomy" : 1, "percent" : 20, "percent_estimate" : 20, "percent_max" : 20, @@ -24,6 +26,7 @@ { "ciqual_proxy_food_code" : "31016", "id" : "en:sugar", + "is_in_taxonomy" : 1, "percent" : 5, "percent_estimate" : 5, "percent_max" : 5, From f28f9004e68bf2985e21497a9d9456d9ff11735b Mon Sep 17 00:00:00 2001 From: himanshisrestha <135853264+himanshisrestha@users.noreply.github.com> Date: Sat, 23 Mar 2024 16:59:11 +0530 Subject: [PATCH 2/8] fix isInTaxonomy update test results --- .../test/products/3270190128403.json | 2 +- .../export_more_fields/export_more_fields.csv | 38 +- .../rows/0850032917148.json | 2 +- .../export_more_fields/rows/25000044984.json | 2 +- .../export_more_fields/rows/26281742.json | 2 +- .../export_more_fields/rows/27096765.json | 2 +- .../rows/3256220513173.json | 2 +- .../rows/3259330020135.json | 2 +- .../rows/3270160503070.json | 2 +- .../rows/3451790834080.json | 2 +- .../rows/3564703999971.json | 2 +- .../rows/3661344653573.json | 2 +- .../rows/3770013801303.json | 2 +- .../rows/5050083706622.json | 2 +- .../rows/5410803950689.json | 2 +- .../rows/5601009974337.json | 2 +- .../export_more_fields/rows/71464240608.json | 2 +- .../export_more_fields/rows/77000001.json | 2 +- .../rows/7804659650035.json | 2 +- .../rows/8722700472575.json | 2 +- .../rows/9002355004345.json | 2 +- .../3003004006001.json | 2 +- .../3003004006004.json | 2 +- .../import_csv_file/test/2003004006001.json | 2 +- .../import_csv_file/test/2003004006004.json | 2 +- .../attributes/en-no-ingredients.json | 2 +- .../attributes/en-nova-groups-markers.json | 2 +- .../attributes/en-unknown-ingredients.json | 2 +- .../calvados-ingredients-no-origins.json | 379 +++++++++--------- .../calvados-no-ingredients-no-origins.json | 379 +++++++++--------- ...-percent-sugar-and-unknown-ingredient.json | 2 +- .../nutriscore/breakfast-cereals.json | 2 +- .../nutriscore/colza-oil.json | 2 +- .../nutriscore/cookies.json | 2 +- .../dairy-drink-with-80-percent-milk.json | 2 +- ...-drink-with-less-than-80-percent-milk.json | 2 +- .../nutriscore/dairy-drinks-without-milk.json | 2 +- .../en-apple-estimated-nutrients.json | 2 +- .../nutriscore/en-avocado-oil.json | 2 +- .../nutriscore/en-beers-category.json | 2 +- ...n-beverage-preparation-flavored-syrup.json | 2 +- .../nutriscore/en-cherry-tomatoes.json | 2 +- .../nutriscore/en-milk.json | 2 +- .../en-olive-oil-no-ingredients.json | 2 +- ...en-olive-oil-unrecognized-ingredients.json | 2 +- .../nutriscore/en-olive-oil.json | 2 +- ...orange-juice-category-and-ingredients.json | 2 +- .../nutriscore/en-orange-juice-category.json | 2 +- .../nutriscore/en-potatoes-category.json | 2 +- ...ategory-ingredients-with-lots-of-meat.json | 2 +- ...ous-category-ingredients-with-no-meat.json | 2 +- ...ory-ingredients-with-very-little-meat.json | 2 +- ...eat-ambiguous-category-no-ingredients.json | 2 +- .../en-red-meat-category-no-ingredients.json | 2 +- ...n-soy-beans-processed-and-unprocessed.json | 2 +- .../en-sugar-estimated-nutrients.json | 2 +- .../nutriscore/en-sweeteners-erythritol.json | 2 +- .../nutriscore/en-sweeteners.json | 2 +- .../nutriscore/en-tofu.json | 2 +- .../nutriscore/en-vegetable-crisps.json | 2 +- .../flavored-spring-water-no-nutrition.json | 2 +- .../flavored-spring-with-nutrition.json | 2 +- .../nutriscore/fr-canned-green-beans.json | 2 +- .../nutriscore/fr-gaspacho.json | 2 +- .../nutriscore/fr-green-beans-beverage.json | 2 +- .../nutriscore/fr-ice-tea-with-sweetener.json | 2 +- .../fr-mixed-oils-with-olive-oil.json | 2 +- .../nutriscore/fr-orange-nectar-0-fat.json | 2 +- .../fr-plant-beverages-soy-milk.json | 2 +- .../nutriscore/fr-rapeseed-oil.json | 2 +- .../nutriscore/milk.json | 2 +- .../nutriscore/mushrooms.json | 2 +- .../nutriscore/olive-oil.json | 2 +- .../nutriscore/spring-water-no-nutrition.json | 2 +- .../sunflower-oil-no-sugar-no-sat-fat.json | 2 +- .../nutriscore/sunflower-oil-no-sugar.json | 2 +- .../nutriscore/sunflower-oil.json | 2 +- .../nutriscore/walnut-oil.json | 2 +- 78 files changed, 470 insertions(+), 476 deletions(-) diff --git a/tests/integration/expected_test_results/convert_and_import_excel_file/test/products/3270190128403.json b/tests/integration/expected_test_results/convert_and_import_excel_file/test/products/3270190128403.json index 62ac0220e2ef1..3f84826b4095c 100644 --- a/tests/integration/expected_test_results/convert_and_import_excel_file/test/products/3270190128403.json +++ b/tests/integration/expected_test_results/convert_and_import_excel_file/test/products/3270190128403.json @@ -566,7 +566,7 @@ "emb-43062a" ], "entry_dates_tags" : "--ignore--", - "food_groups" : "en:Vegetables", + "food_groups" : "en:vegetables", "food_groups_tags" : [ "en:fruits-and-vegetables", "en:vegetables" diff --git a/tests/integration/expected_test_results/export_more_fields/export_more_fields.csv b/tests/integration/expected_test_results/export_more_fields/export_more_fields.csv index d4b97405ef65b..e70dd865103b6 100644 --- a/tests/integration/expected_test_results/export_more_fields/export_more_fields.csv +++ b/tests/integration/expected_test_results/export_more_fields/export_more_fields.csv @@ -1,9 +1,9 @@ code producer_product_id producer_version_id lc product_name_de product_name_en product_name_es product_name_fr product_name_pt abbreviated_product_name_en abbreviated_product_name_fr generic_name_en generic_name_fr generic_name_pt quantity serving_size packaging packaging_tags brands brands_tags brand_owner categories categories_tags labels labels_tags countries countries_tags stores stores_tags origins origins_tags origin_fr manufacturing_places manufacturing_places_tags emb_codes emb_codes_tags ingredients_text_en ingredients_text_es ingredients_text_fr ingredients_text_pt allergens allergens_tags traces traces_tags nutrition_data_per nutrition_data_prepared_per energy-kj_value energy-kj_unit energy-kcal_value energy-kcal_unit fat_value fat_unit saturated-fat_value saturated-fat_unit carbohydrates_value carbohydrates_unit sugars_value sugars_unit fiber_value fiber_unit proteins_value proteins_unit salt_value salt_unit sodium_value sodium_unit energy_value energy_unit monounsaturated-fat_value monounsaturated-fat_unit polyunsaturated-fat_value polyunsaturated-fat_unit trans-fat_value trans-fat_unit cholesterol_value cholesterol_unit vitamin-a_value vitamin-a_unit vitamin-c_value vitamin-c_unit vitamin-b1_value vitamin-b1_unit vitamin-b2_value vitamin-b2_unit vitamin-pp_value vitamin-pp_unit vitamin-b6_value vitamin-b6_unit vitamin-b9_value vitamin-b9_unit vitamin-b12_value vitamin-b12_unit potassium_value potassium_unit calcium_value calcium_unit iron_value iron_unit manganese_value manganese_unit fruits-vegetables-nuts-estimate_value fruits-vegetables-nuts-estimate_unit packaging_1_number_of_units packaging_1_shape packaging_1_material packaging_1_quantity_per_unit packaging_1_weight_specified packaging_1_weight_measured packaging_2_number_of_units packaging_2_shape packaging_2_material packaging_2_weight_measured conservation_conditions_fr preparation_fr customer_service_fr link off:food_groups off:food_groups_tags off:nova_groups off:nova_groups_tags off:nutriscore_grade off:nutriscore_score off:ecoscore_grade off:ecoscore_score off:ecoscore_data.missing_key_data off:ecoscore_data.agribalyse.code off:ecoscore_data.adjustments.origins_of_ingredients.value off:ecoscore_data.adjustments.packaging.value off:ecoscore_data.adjustments.packaging.non_recyclable_and_non_biodegradable_materials off:ecoscore_data.adjustments.production_system.value off:ecoscore_data.adjustments.threatened_species.value sources_fields:org-database-usda:available_date sources_fields:org-database-usda:fdc_category sources_fields:org-database-usda:fdc_data_source sources_fields:org-database-usda:fdc_id sources_fields:org-database-usda:modified_date sources_fields:org-database-usda:publication_date sources_fields:org-gs1:gln sources_fields:org-gs1:gpcCategoryCode sources_fields:org-gs1:gpcCategoryName sources_fields:org-gs1:isAllergenRelevantDataProvided sources_fields:org-gs1:lastChangeDateTime sources_fields:org-gs1:partyName sources_fields:org-gs1:productionVariantDescription sources_fields:org-gs1:publicationDateTime data_sources obsolete -3661344653573 fr Yaourt Crémeuh Café Les 2 vaches les-2-vaches Produits laitiers, Desserts, Desserts lactés, Crèmes dessert, Crèmes dessert café en:dairies,en:desserts,en:dairy-desserts,en:creamy-puddings,en:coffee-creamy-puddings Commerce équitable, Bio, Bio européen, Fairtrade International, FR-BIO-01, Max Havelaar, Nutriscore, Nutriscore C en:fair-trade,en:organic,en:eu-organic,en:fairtrade-international,en:fr-bio-01,en:max-havelaar,en:nutriscore,en:nutriscore-grade-c France en:france FR 14.370.001 EC fr-14-370-001-ec "Lait entier pasteurisé équitable (73,4%), sucre de canne'; équiltable (9,5%), crème'; équitable amidon* de mais, lait écrémé en poudre, cale'; lyophilise équitable (1,2%). ';Issu de l'agriculture biologique, Lait Origine France. Commerce équitable contrilé Fair For Life: 90.7% des ingrédients d'origine agricole. Café issu du commerce équitable certifié Fairtrade/Max Havelaar. 'poudre de lait origine France Meuglez-nous au 0 801 803 804 CERTI AGRIC FR 14.370.001 CE CRÊMEUH CAFE" Lait en:milk 100g 100g 137 kcal 5 g 3.5 g 19.2 g 15 g 3.9 g 0.4 g 0.16 g 137 kcal 2 en:bottle en:pet-1-polyethylene-terephthalate 32.1 2 en:lid en:pp-5-polypropylene 3 en:Dairy desserts en:milk-and-dairy-products,en:dairy-desserts 3 en:3-processed-foods c 6 a 100 39246 -5 -7 0 20 App - yuka, Apps, App - Open Food Facts 0 -3564703999971 fr Huile d'olive Marque Repère marque-repere Matières grasses en:fats Bio en:organic France en:france Leclerc leclerc Huile d'olive vierge extra issue de l'agriculture biologique - huile pour friture et assaisonnement - huile d'olive de catégorie supérieure obtenue directement des olives et uniquement par des procédés mécaniques tunisie 100g 100g 819 kcal 91 g 16 g 0 g 0 g 0 g 0 g 0 g 0 g 819 kcal 5 en:box en:cardboard 70.7 en:Fats en:fats-and-sauces,en:fats 2 en:2-processed-culinary-ingredients c 10 unknown -5 -1 0 0 App - yuka, Apps 0 -8722700472575 CU AM SLDDRE CAESAR 6X1L PBOT FR fr Amora Sauce caesar salade & sandwich bouteille 1L Amora sauce caesar 1l Sauce Salade & Sandwich Caesar 1000 ml 30 ml (Portion) Plastique, Bouteille ou Flacon, Bouteille, en:test en:plastic,en:bottle-or-vial,en:bottle,en:test Amora amora Condiments, Sauces, Sauces salades, Sauces caesar, Epicerie en:condiments,en:sauces,en:salad-dressings,en:caesar-sauces,fr:epicerie Sans colorants artificiels, Sans exhausteur de goût en:no-artificial-colors,en:no-flavour-enhancer France en:france Intermarché intermarche "Eau, huile de tournesol, vinaigre d'alcool, FROMAGE 3,2%, LAIT écrémé en poudre, jaune d'ŒUF de poules élevées en plein air 2,3%, ail 2,2%, amidon modifié de maïs, sel, jus de citron concentré, sucre, ANCHOIS 0,27%, conservateur : sorbate de potassium, épaississant : gomme xanthane, poivre noir, antioxydant : E385, sirop de sucre inverti, concentré de carthame. Peut contenir : sésame, moutarde." "Œufs, Poisson, Lait" en:eggs,en:fish,en:milk Moutarde, Graines de sésame en:mustard,en:sesame-seeds 100g 100g 1137 kJ 273 kcal 27 g 3.8 g 4.8 g 3.2 g 0 g 2.8 g 1.6 g 0.64 g 1137 kJ "A conserver au sec, à l'abri de la lumière et à température ambiante (<25°C).Après ouverture, se conserve au réfrigérateur dans un délai de 1 mois." Bien agiter avant emploi. UNILEVER France Food Solutions Relation Consommateurs, Unilever France Food Solutions, 20 rue des Deux Gares 92842 Rueil-Malmaison Cedex http://www-unileverfoodsolutions-com.s3.amazonaws.com/ext%2Fdownload%2Fmis%2Ffr%2F8_72270_047257_5_fr.pdf en:Dressings and sauces en:fats-and-sauces,en:dressings-and-sauces 4 en:4-ultra-processed-food-and-drink-products d 13 d 37 1 11187 -5 -15 1 0 8711200996988 10000200 Assaisonnements/Sauces Froides (Longue Conservation) true 2022-01-12T19:08:58+01:00 UNILEVER FRANCE RHD CU AM SLDDRE CAESAR 6X1L PBOT FR 2022-01-12T19:08:58+01:00 App - yuka, Apps, Producers, Producer - unilever-france-rhd, Database - Equadis, Database - GDSN, Databases 0 -5050083706622 fr Trésor goût Chocolat Noisettes Céréales fourrées chocolat noisette 400 g 30 g Papier ou carton, Carton en:paper-or-cardboard,en:cardboard Kellogg's, kellogs kellogg-s,kellogs "Aliments et boissons à base de végétaux, Aliments d'origine végétale, Petit-déjeuners, Céréales et pommes de terre, Céréales et dérivés, Céréales pour petit-déjeuner, Céréales au chocolat, Céréales extrudées, Céréales fourrées" en:plant-based-foods-and-beverages,en:plant-based-foods,en:breakfasts,en:cereals-and-potatoes,en:cereals-and-their-products,en:breakfast-cereals,en:chocolate-cereals,en:extruded-cereals,en:filled-cereals France en:france "Farines de céréales (Blé{26%}, Avoine complète{17%}, Riz{12%}), Fourrage Chocolat Noisettes (Sucre, Huiles végétaleles [Colza, Palme], Chocolat {4%}[Sucre, Pâte de cacao], Maltodextrine, Noisettes{2%),Cacao maigre en poudre, Petit-lait en poudre, lait écrémé en poudre, Émulsifiant([Lécithine de tournesol], Arôme naturel), Sucre, Sel, Colorant (Charoténoides, Rocou), Antioxydant (Palmitate d'ascorbyle, Alpha-tocophérol). Vitamines et Minéraux : Vitamines (niacine, B6, B2, Bl, acide folique, B12), Fer." "Gluten, Lait, Fruits à coque" en:gluten,en:milk,en:nuts "Fruits à coque" en:nuts 100g 100g 450 kcal 16 g 4 g 68 g 29 g 1 g 6.9 g 1.14 g 0.456 g 450 kcal 0.28 mg 0.35 mg 4 mg 0.35 mg 50 µg 0.63 µg 2.4 mg en:Breakfast cereals en:cereals-and-potatoes,en:breakfast-cereals 4 en:4-ultra-processed-food-and-drink-products d 18 e 15 1 32135 -5 -15 1 0 -10 App - yuka, Apps, App - Open Food Facts 0 -3256220513173 fr Sirop de thé pêche Sirop de Thé Pêche 75 cl 200 ml Métal, Bidon ou bonbonne, Bidon en:metal,en:jug-or-canister,en:jug U u Boissons et préparations de boissons, Boissons, Sirops, Boissons avec sucre ajouté en:beverages-and-beverages-preparations,en:beverages,en:syrups,en:sweetened-beverages Sans conservateurs, Point Vert, Transformé en France en:no-preservatives,en:green-dot,en:transformed-in-france France en:france Super U, Magasins U super-u,magasins-u "Sucre, jus de fruits à base de concentrés 40% (pêche 20%, citron), eau, arômes, acidifiant : acide citrique, colorants : lutéine et anthocyanes, stabilisant : E445." 100g 100g 1402 kJ 330 kcal 0.1 g 0.1 g 80 g 79 g 0.5 g 0.1 g 0.01 g 0.004 g 1402 kJ en:Sweetened beverages en:beverages,en:sweetened-beverages 4 en:4-ultra-processed-food-and-drink-products e 20 unknown 1 -5 -15 1 0 Producer - Systeme U, Producers, App - yuka, Apps 0 +3661344653573 fr Yaourt Crémeuh Café Les 2 vaches les-2-vaches Produits laitiers, Desserts, Desserts lactés, Crèmes dessert, Crèmes dessert café en:dairies,en:desserts,en:dairy-desserts,en:creamy-puddings,en:coffee-creamy-puddings Commerce équitable, Bio, Bio européen, Fairtrade International, FR-BIO-01, Max Havelaar, Nutriscore, Nutriscore C en:fair-trade,en:organic,en:eu-organic,en:fairtrade-international,en:fr-bio-01,en:max-havelaar,en:nutriscore,en:nutriscore-grade-c France en:france FR 14.370.001 EC fr-14-370-001-ec "Lait entier pasteurisé équitable (73,4%), sucre de canne'; équiltable (9,5%), crème'; équitable amidon* de mais, lait écrémé en poudre, cale'; lyophilise équitable (1,2%). ';Issu de l'agriculture biologique, Lait Origine France. Commerce équitable contrilé Fair For Life: 90.7% des ingrédients d'origine agricole. Café issu du commerce équitable certifié Fairtrade/Max Havelaar. 'poudre de lait origine France Meuglez-nous au 0 801 803 804 CERTI AGRIC FR 14.370.001 CE CRÊMEUH CAFE" Lait en:milk 100g 100g 137 kcal 5 g 3.5 g 19.2 g 15 g 3.9 g 0.4 g 0.16 g 137 kcal 2 en:bottle en:pet-1-polyethylene-terephthalate 32.1 2 en:lid en:pp-5-polypropylene 3 en:dairy-desserts en:milk-and-dairy-products,en:dairy-desserts 3 en:3-processed-foods c 6 a 100 39246 -5 -7 0 20 App - yuka, Apps, App - Open Food Facts 0 +3564703999971 fr Huile d'olive Marque Repère marque-repere Matières grasses en:fats Bio en:organic France en:france Leclerc leclerc Huile d'olive vierge extra issue de l'agriculture biologique - huile pour friture et assaisonnement - huile d'olive de catégorie supérieure obtenue directement des olives et uniquement par des procédés mécaniques tunisie 100g 100g 819 kcal 91 g 16 g 0 g 0 g 0 g 0 g 0 g 0 g 819 kcal 5 en:box en:cardboard 70.7 en:fats en:fats-and-sauces,en:fats 2 en:2-processed-culinary-ingredients c 10 unknown -5 -1 0 0 App - yuka, Apps 0 +8722700472575 CU AM SLDDRE CAESAR 6X1L PBOT FR fr Amora Sauce caesar salade & sandwich bouteille 1L Amora sauce caesar 1l Sauce Salade & Sandwich Caesar 1000 ml 30 ml (Portion) Plastique, Bouteille ou Flacon, Bouteille, en:test en:plastic,en:bottle-or-vial,en:bottle,en:test Amora amora Condiments, Sauces, Sauces salades, Sauces caesar, Epicerie en:condiments,en:sauces,en:salad-dressings,en:caesar-sauces,fr:epicerie Sans colorants artificiels, Sans exhausteur de goût en:no-artificial-colors,en:no-flavour-enhancer France en:france Intermarché intermarche "Eau, huile de tournesol, vinaigre d'alcool, FROMAGE 3,2%, LAIT écrémé en poudre, jaune d'ŒUF de poules élevées en plein air 2,3%, ail 2,2%, amidon modifié de maïs, sel, jus de citron concentré, sucre, ANCHOIS 0,27%, conservateur : sorbate de potassium, épaississant : gomme xanthane, poivre noir, antioxydant : E385, sirop de sucre inverti, concentré de carthame. Peut contenir : sésame, moutarde." "Œufs, Poisson, Lait" en:eggs,en:fish,en:milk Moutarde, Graines de sésame en:mustard,en:sesame-seeds 100g 100g 1137 kJ 273 kcal 27 g 3.8 g 4.8 g 3.2 g 0 g 2.8 g 1.6 g 0.64 g 1137 kJ "A conserver au sec, à l'abri de la lumière et à température ambiante (<25°C).Après ouverture, se conserve au réfrigérateur dans un délai de 1 mois." Bien agiter avant emploi. UNILEVER France Food Solutions Relation Consommateurs, Unilever France Food Solutions, 20 rue des Deux Gares 92842 Rueil-Malmaison Cedex http://www-unileverfoodsolutions-com.s3.amazonaws.com/ext%2Fdownload%2Fmis%2Ffr%2F8_72270_047257_5_fr.pdf en:dressings-and-sauces en:fats-and-sauces,en:dressings-and-sauces 4 en:4-ultra-processed-food-and-drink-products d 13 d 37 1 11187 -5 -15 1 0 8711200996988 10000200 Assaisonnements/Sauces Froides (Longue Conservation) true 2022-01-12T19:08:58+01:00 UNILEVER FRANCE RHD CU AM SLDDRE CAESAR 6X1L PBOT FR 2022-01-12T19:08:58+01:00 App - yuka, Apps, Producers, Producer - unilever-france-rhd, Database - Equadis, Database - GDSN, Databases 0 +5050083706622 fr Trésor goût Chocolat Noisettes Céréales fourrées chocolat noisette 400 g 30 g Papier ou carton, Carton en:paper-or-cardboard,en:cardboard Kellogg's, kellogs kellogg-s,kellogs "Aliments et boissons à base de végétaux, Aliments d'origine végétale, Petit-déjeuners, Céréales et pommes de terre, Céréales et dérivés, Céréales pour petit-déjeuner, Céréales au chocolat, Céréales extrudées, Céréales fourrées" en:plant-based-foods-and-beverages,en:plant-based-foods,en:breakfasts,en:cereals-and-potatoes,en:cereals-and-their-products,en:breakfast-cereals,en:chocolate-cereals,en:extruded-cereals,en:filled-cereals France en:france "Farines de céréales (Blé{26%}, Avoine complète{17%}, Riz{12%}), Fourrage Chocolat Noisettes (Sucre, Huiles végétaleles [Colza, Palme], Chocolat {4%}[Sucre, Pâte de cacao], Maltodextrine, Noisettes{2%),Cacao maigre en poudre, Petit-lait en poudre, lait écrémé en poudre, Émulsifiant([Lécithine de tournesol], Arôme naturel), Sucre, Sel, Colorant (Charoténoides, Rocou), Antioxydant (Palmitate d'ascorbyle, Alpha-tocophérol). Vitamines et Minéraux : Vitamines (niacine, B6, B2, Bl, acide folique, B12), Fer." "Gluten, Lait, Fruits à coque" en:gluten,en:milk,en:nuts "Fruits à coque" en:nuts 100g 100g 450 kcal 16 g 4 g 68 g 29 g 1 g 6.9 g 1.14 g 0.456 g 450 kcal 0.28 mg 0.35 mg 4 mg 0.35 mg 50 µg 0.63 µg 2.4 mg en:breakfast-cereals en:cereals-and-potatoes,en:breakfast-cereals 4 en:4-ultra-processed-food-and-drink-products d 18 e 15 1 32135 -5 -15 1 0 -10 App - yuka, Apps, App - Open Food Facts 0 +3256220513173 fr Sirop de thé pêche Sirop de Thé Pêche 75 cl 200 ml Métal, Bidon ou bonbonne, Bidon en:metal,en:jug-or-canister,en:jug U u Boissons et préparations de boissons, Boissons, Sirops, Boissons avec sucre ajouté en:beverages-and-beverages-preparations,en:beverages,en:syrups,en:sweetened-beverages Sans conservateurs, Point Vert, Transformé en France en:no-preservatives,en:green-dot,en:transformed-in-france France en:france Super U, Magasins U super-u,magasins-u "Sucre, jus de fruits à base de concentrés 40% (pêche 20%, citron), eau, arômes, acidifiant : acide citrique, colorants : lutéine et anthocyanes, stabilisant : E445." 100g 100g 1402 kJ 330 kcal 0.1 g 0.1 g 80 g 79 g 0.5 g 0.1 g 0.01 g 0.004 g 1402 kJ en:sweetened-beverages en:beverages,en:sweetened-beverages 4 en:4-ultra-processed-food-and-drink-products e 20 unknown 1 -5 -15 1 0 Producer - Systeme U, Producers, App - yuka, Apps 0 3173990027337 fr Fourrés myrtilles France en:france 100g 100g 455 kcal 15 g 1.6 g 70 g 34 g 5.7 g 0.43 g 0.172 g 455 kcal unknown unknown unknown 1 -5 -15 1 0 App - yuka, Apps 0 7804659650035 es Not mayo 12 g Notco notco Condimentos, Salsas, Mayonesas, Comestibles en:condiments,en:sauces,en:mayonnaises,es:comestibles Vegetariano, Vegano en:vegetarian,en:vegan Chile, Francia, España en:chile,en:france,en:spain "Aceite de canola, agua, garbanzos, lupino, semillas de mostaza, vinagre de uva, jugo de limón, sal, azúcar rubia, pimienta blanca, ajo en polvo, EDTA. @@ -11,22 +11,22 @@ code producer_product_id producer_version_id lc product_name_de product_name_en Ingredients list (English): -Canola Oil, Water, Garbanzo Beans, Lupin (bean), Mustard Seeds, Grape Vinegar, Lemon Juice, Salt, White Sugar, White Pepper, Garlic Powder, EDTA." Altramuces, Mostaza en:lupin,en:mustard 100g 100g 582 kcal 58 g 3 g 9.3 g 1 g 0 g 1 g 640 mg 256 mg 582 kcal 39 g 3 g en:Dressings and sauces en:fats-and-sauces,en:dressings-and-sauces unknown c 9 d 37 1 11054 -5 -15 1 0 App - yuka, Apps 0 -5410803950689 fr Sauce algérienne Sauce émulsionnée froide piquante aux oignons rôtis 500 ml Plastique, Bouteille ou Flacon, Flacon en:plastic,en:bottle-or-vial,en:vial Halal maïza halal-maiza Condiments, Sauces, Sauces algériennes, Epicerie en:condiments,en:sauces,en:algerian-style-sauces,fr:epicerie Halal en:halal France en:france 100g 100g 521 kcal 49.4 g 4.2 g 17.1 g 12.8 g 1.9 g 2.1 g 0.84 g 521 kcal en:Dressings and sauces en:fats-and-sauces,en:dressings-and-sauces unknown e 21 unknown 1 -5 -15 1 0 App - yuka, Apps 0 -27096765 fr Lait crème 5 x 40 g 40 g Plastique, Métal, Métaux recyclables, Aluminium en:plastic,en:metal,en:recyclable-metals,en:aluminium Château chateau Snacks, Snacks sucrés, Cacao et dérivés, Biscuits et gâteaux, Gâteaux, Chocolats, Chocolats au lait, Gâteaux au chocolat en:snacks,en:sweet-snacks,en:cocoa-and-its-products,en:biscuits-and-cakes,en:cakes,en:chocolates,en:milk-chocolates,en:chocolate-cakes Agriculture durable, Certifié UTZ en:sustainable-farming,en:utz-certified Belgique, France en:belgium,en:france Sugar, cocoa butter, cream powder (milk) (15.9%), cocoa paste, whole milk powder (5.5%), skim milk powder, lactose, emulsifier: lecithin (soy), vanilla extract Sucre, beurre de cacao, crème en poudre (lait) (15,9%), pâte de cacao, lait entier en poudre (5,5%), lait écrémé en poudre, lactose, émulsifiant : lécithine (soja), extrait de vanille Lait, Soja en:milk,en:soybeans "Fruits à coque, Arachides" en:nuts,en:peanuts 100g 100g 563 kcal 35 g 22 g 52 g 51 g 8 g 0.24 g 0.096 g 563 kcal en:Chocolate products en:sugary-snacks,en:chocolate-products 4 en:4-ultra-processed-food-and-drink-products e 28 d 37 1 23585 -5 -15 1 10 App - yuka, Apps, App - InFood 0 -3270160503070 fr Oignons rouges émincés surgelés Oignons surgelés 450 g Plastique, Surgelé en:plastic,en:frozen Picard picard "Aliments et boissons à base de végétaux, Aliments d'origine végétale, Aliments à base de fruits et de légumes, Condiments, Légumes et dérivés, Plantes condimentaires, Surgelés, Aliments à base de plantes surgelés, Légumes surgelés, Epicerie" en:plant-based-foods-and-beverages,en:plant-based-foods,en:fruits-and-vegetables-based-foods,en:condiments,en:vegetables-based-foods,en:culinary-plants,en:frozen-foods,en:frozen-plant-based-foods,en:frozen-vegetables,fr:epicerie France en:france Picard picard France, Bénélux EMB 62863C emb-62863c Oignons rouges 100% 100g 100g 41 kcal 0.2 g 0.1 g 7.9 g 5.6 g 1.4 g 1.2 g 0.01 g 0.004 g 41 kcal en:Vegetables en:fruits-and-vegetables,en:vegetables 1 en:1-unprocessed-or-minimally-processed-foods a -5 unknown 1 -5 -15 1 0 App - Yuka, Apps 0 -3451790834080 29135200 fr UHT sterilised semi-skimmed milk enriched with vitamins B1, B2, B5, B12 and D - Long life Lait demi ecrémé Vitamin enriched milk Semi-skimmed milk Lait demi-écrémé stérilisé UHT enrichi en vitamines B1, B2, B5, B12 et D - longue conservation 1 l "Plastique, Bouchon en polyéthylène, Bouteille en Polyéthylène, Opercule en matériau composite, Étiquette en papier" en:plastic,fr:bouchon-en-polyethylene,fr:bouteille-en-polyethylene,fr:opercule-en-materiau-composite,fr:etiquette-en-papier Elle & Vire, Savencia, Elle&Vire International elle-vire,savencia,elle-vire-international Savencia Produits laitiers, Crèmes, Laits, Laits homogénéisés, Laits demi-écrémés, Laits UHT, Crèmes entières, Crèmes cuisson en:dairies,en:creams,en:milks,en:homogenized-milks,en:semi-skimmed-milks,en:uht-milks,fr:cremes-entieres,fr:cremes-cuisson Enrichi en vitamines, Fabriqué en France en:enriched-with-vitamins,en:made-in-france France en:france Toutes enseignes GMS toutes-enseignes-gms France en:france France, Somme france,somme FR 80.001.002 EC, FR 50.139.001 EC fr-80-001-002-ec,fr-50-139-001-ec Milk Leche _Lait_ demi-écrémé stérilisé UHT enrichi en vitamines B1, B2, B5, B12 et D. Leite Lait en:milk 100g 100g 193 kJ 46 kcal 1.55 g 1.1 g 4.8 g 4.8 g 0 g 3.2 g 0.13 g 0.052 g 193 kJ 120 mg 21.875 g https://www.elle-et-vire.com/en/produits/lait/bouteilles/lait-demi-ecreme-vitamine-uht/ en:Milk and yogurt en:milk-and-dairy-products,en:milk-and-yogurt 1 en:1-unprocessed-or-minimally-processed-foods b 1 b 61 1 19041 19 -15 1 0 App - yuka, Apps, Producers, Producer - elle-vire 0 +Canola Oil, Water, Garbanzo Beans, Lupin (bean), Mustard Seeds, Grape Vinegar, Lemon Juice, Salt, White Sugar, White Pepper, Garlic Powder, EDTA." Altramuces, Mostaza en:lupin,en:mustard 100g 100g 582 kcal 58 g 3 g 9.3 g 1 g 0 g 1 g 640 mg 256 mg 582 kcal 39 g 3 g en:dressings-and-sauces en:fats-and-sauces,en:dressings-and-sauces unknown c 9 d 37 1 11054 -5 -15 1 0 App - yuka, Apps 0 +5410803950689 fr Sauce algérienne Sauce émulsionnée froide piquante aux oignons rôtis 500 ml Plastique, Bouteille ou Flacon, Flacon en:plastic,en:bottle-or-vial,en:vial Halal maïza halal-maiza Condiments, Sauces, Sauces algériennes, Epicerie en:condiments,en:sauces,en:algerian-style-sauces,fr:epicerie Halal en:halal France en:france 100g 100g 521 kcal 49.4 g 4.2 g 17.1 g 12.8 g 1.9 g 2.1 g 0.84 g 521 kcal en:dressings-and-sauces en:fats-and-sauces,en:dressings-and-sauces unknown e 21 unknown 1 -5 -15 1 0 App - yuka, Apps 0 +27096765 fr Lait crème 5 x 40 g 40 g Plastique, Métal, Métaux recyclables, Aluminium en:plastic,en:metal,en:recyclable-metals,en:aluminium Château chateau Snacks, Snacks sucrés, Cacao et dérivés, Biscuits et gâteaux, Gâteaux, Chocolats, Chocolats au lait, Gâteaux au chocolat en:snacks,en:sweet-snacks,en:cocoa-and-its-products,en:biscuits-and-cakes,en:cakes,en:chocolates,en:milk-chocolates,en:chocolate-cakes Agriculture durable, Certifié UTZ en:sustainable-farming,en:utz-certified Belgique, France en:belgium,en:france Sugar, cocoa butter, cream powder (milk) (15.9%), cocoa paste, whole milk powder (5.5%), skim milk powder, lactose, emulsifier: lecithin (soy), vanilla extract Sucre, beurre de cacao, crème en poudre (lait) (15,9%), pâte de cacao, lait entier en poudre (5,5%), lait écrémé en poudre, lactose, émulsifiant : lécithine (soja), extrait de vanille Lait, Soja en:milk,en:soybeans "Fruits à coque, Arachides" en:nuts,en:peanuts 100g 100g 563 kcal 35 g 22 g 52 g 51 g 8 g 0.24 g 0.096 g 563 kcal en:chocolate-products en:sugary-snacks,en:chocolate-products 4 en:4-ultra-processed-food-and-drink-products e 28 d 37 1 23585 -5 -15 1 10 App - yuka, Apps, App - InFood 0 +3270160503070 fr Oignons rouges émincés surgelés Oignons surgelés 450 g Plastique, Surgelé en:plastic,en:frozen Picard picard "Aliments et boissons à base de végétaux, Aliments d'origine végétale, Aliments à base de fruits et de légumes, Condiments, Légumes et dérivés, Plantes condimentaires, Surgelés, Aliments à base de plantes surgelés, Légumes surgelés, Epicerie" en:plant-based-foods-and-beverages,en:plant-based-foods,en:fruits-and-vegetables-based-foods,en:condiments,en:vegetables-based-foods,en:culinary-plants,en:frozen-foods,en:frozen-plant-based-foods,en:frozen-vegetables,fr:epicerie France en:france Picard picard France, Bénélux EMB 62863C emb-62863c Oignons rouges 100% 100g 100g 41 kcal 0.2 g 0.1 g 7.9 g 5.6 g 1.4 g 1.2 g 0.01 g 0.004 g 41 kcal en:vegetables en:fruits-and-vegetables,en:vegetables 1 en:1-unprocessed-or-minimally-processed-foods a -5 unknown 1 -5 -15 1 0 App - Yuka, Apps 0 +3451790834080 29135200 fr UHT sterilised semi-skimmed milk enriched with vitamins B1, B2, B5, B12 and D - Long life Lait demi ecrémé Vitamin enriched milk Semi-skimmed milk Lait demi-écrémé stérilisé UHT enrichi en vitamines B1, B2, B5, B12 et D - longue conservation 1 l "Plastique, Bouchon en polyéthylène, Bouteille en Polyéthylène, Opercule en matériau composite, Étiquette en papier" en:plastic,fr:bouchon-en-polyethylene,fr:bouteille-en-polyethylene,fr:opercule-en-materiau-composite,fr:etiquette-en-papier Elle & Vire, Savencia, Elle&Vire International elle-vire,savencia,elle-vire-international Savencia Produits laitiers, Crèmes, Laits, Laits homogénéisés, Laits demi-écrémés, Laits UHT, Crèmes entières, Crèmes cuisson en:dairies,en:creams,en:milks,en:homogenized-milks,en:semi-skimmed-milks,en:uht-milks,fr:cremes-entieres,fr:cremes-cuisson Enrichi en vitamines, Fabriqué en France en:enriched-with-vitamins,en:made-in-france France en:france Toutes enseignes GMS toutes-enseignes-gms France en:france France, Somme france,somme FR 80.001.002 EC, FR 50.139.001 EC fr-80-001-002-ec,fr-50-139-001-ec Milk Leche _Lait_ demi-écrémé stérilisé UHT enrichi en vitamines B1, B2, B5, B12 et D. Leite Lait en:milk 100g 100g 193 kJ 46 kcal 1.55 g 1.1 g 4.8 g 4.8 g 0 g 3.2 g 0.13 g 0.052 g 193 kJ 120 mg 21.875 g https://www.elle-et-vire.com/en/produits/lait/bouteilles/lait-demi-ecreme-vitamine-uht/ en:milk-and-yogurt en:milk-and-dairy-products,en:milk-and-yogurt 1 en:1-unprocessed-or-minimally-processed-foods b 1 b 61 1 19041 19 -15 1 0 App - yuka, Apps, Producers, Producer - elle-vire 0 3760178254021 fr Chocolat au lait France en:france 100g 100g 148 kcal 9.2 g 5.4 g 13 g 13 g 3.4 g 148 kcal unknown unknown unknown 1 -5 -15 1 0 App - yuka, Apps 0 29161690 fr 100 % Almond Buter 227 g France en:france 100g 100g 635 kcal 54.9 g 5.4 g 27.6 g 3.4 g 21 g 635 kcal unknown unknown unknown 1 -5 -15 1 0 App - yuka, Apps 0 -3770013801303 fr Limonade Boissons et préparations de boissons, Boissons, Boissons gazeuses, Sodas, Limonades en:beverages-and-beverages-preparations,en:beverages,en:carbonated-drinks,en:sodas,en:lemonade Bio en:organic France en:france 100g 100g 31.2 kcal 1 g 1 g 7.5 g 7.5 g 1 g 0.7 g 31.2 kcal en:Sweetened beverages en:beverages,en:sweetened-beverages unknown unknown not-applicable 1 -5 -15 1 0 App - yuka, Apps 0 -25000044984 en Simply lemonade Simply Lemonade 8 OZA (240 ml) The Minute Maid Company Beverages and beverages preparations, Beverages, Carbonated drinks, Sodas, Lemonade, Sweetened beverages en:beverages-and-beverages-preparations,en:beverages,en:carbonated-drinks,en:sodas,en:lemonade,en:sweetened-beverages France, United States en:france,en:united-states Contains pure filtered water, lemon juice, cane sugar, natural flavors. Contains pure filtered water, lemon juice, cane sugar, natural flavors. 100g 100g 50 kcal 0 g 0 g 12.5 g 11.67 g 0 g 0.0159 g 0.00636 g 50 kcal en:Sweetened beverages en:beverages,en:sweetened-beverages 4 en:4-ultra-processed-food-and-drink-products e 15 not-applicable 1 -5 -15 1 0 2019-07-29T00:00:00Z Soda LI 678078 2019-07-29T00:00:00Z 2019-12-06T00:00:00Z App - yuka, Apps, Databases, database-usda, App - InFood 0 +3770013801303 fr Limonade Boissons et préparations de boissons, Boissons, Boissons gazeuses, Sodas, Limonades en:beverages-and-beverages-preparations,en:beverages,en:carbonated-drinks,en:sodas,en:lemonade Bio en:organic France en:france 100g 100g 31.2 kcal 1 g 1 g 7.5 g 7.5 g 1 g 0.7 g 31.2 kcal en:sweetened-beverages en:beverages,en:sweetened-beverages unknown unknown not-applicable 1 -5 -15 1 0 App - yuka, Apps 0 +25000044984 en Simply lemonade Simply Lemonade 8 OZA (240 ml) The Minute Maid Company Beverages and beverages preparations, Beverages, Carbonated drinks, Sodas, Lemonade, Sweetened beverages en:beverages-and-beverages-preparations,en:beverages,en:carbonated-drinks,en:sodas,en:lemonade,en:sweetened-beverages France, United States en:france,en:united-states Contains pure filtered water, lemon juice, cane sugar, natural flavors. Contains pure filtered water, lemon juice, cane sugar, natural flavors. 100g 100g 50 kcal 0 g 0 g 12.5 g 11.67 g 0 g 0.0159 g 0.00636 g 50 kcal en:sweetened-beverages en:beverages,en:sweetened-beverages 4 en:4-ultra-processed-food-and-drink-products e 15 not-applicable 1 -5 -15 1 0 2019-07-29T00:00:00Z Soda LI 678078 2019-07-29T00:00:00Z 2019-12-06T00:00:00Z App - yuka, Apps, Databases, database-usda, App - InFood 0 80650904 fr Olio aromatizzato funghi e tartufo France en:france 100g 100g unknown unknown unknown 1 -5 -15 1 0 App - yuka, Apps 0 -9002355004345 de Tiroler Früchteküche Marillen 420 g Glas en:glass Tiroler Früchteküche tiroler-fruchtekuche "Pflanzliche Lebensmittel und Getränke, Pflanzliche Lebensmittel, Frucht- und gemüsebasierte Lebensmittel, Frühstücke, Brotaufstriche, Fruchtbasierte Lebensmittel, Pflanzliche Brotaufstriche, Süße Brotaufstriche, Konfitüren und Marmeladen, Konfitüren" en:plant-based-foods-and-beverages,en:plant-based-foods,en:fruits-and-vegetables-based-foods,en:breakfasts,en:spreads,en:fruits-based-foods,en:plant-based-spreads,en:sweet-spreads,en:fruit-and-vegetable-preserves,en:jams Frankreich, Deutschland en:france,en:germany 100g 100g 224 kcal 0 g 0 g 54 g 53 g 0 g 0 g 0 g 224 kcal en:Sweets en:sugary-snacks,en:sweets unknown d 11 b 60 1 31024 -5 -15 1 0 App - yuka, Apps 0 -26281742 en Stawberry jam Strawberry conserve 500 g serving fr:bocal verre fr:bocal-verre Grandessa grandessa Plant-based foods and beverages, Plant-based foods, Breakfasts, Spreads, Plant-based spreads, Sweet spreads, Fruit and vegetable preserves en:plant-based-foods-and-beverages,en:plant-based-foods,en:breakfasts,en:spreads,en:plant-based-spreads,en:sweet-spreads,en:fruit-and-vegetable-preserves Made in Belgium en:made-in-belgium France en:france made in belgium made-in-belgium Eggs, Milk en:eggs,en:milk serving 100g 171 kcal 0.1 g 0.1 g 9.9 g 9.9 g 0.1 g 2.54 g 1.016 g 171 kcal en:Sweets en:sugary-snacks,en:sweets unknown unknown unknown 1 -5 -15 1 0 App - yuka, Apps 0 +9002355004345 de Tiroler Früchteküche Marillen 420 g Glas en:glass Tiroler Früchteküche tiroler-fruchtekuche "Pflanzliche Lebensmittel und Getränke, Pflanzliche Lebensmittel, Frucht- und gemüsebasierte Lebensmittel, Frühstücke, Brotaufstriche, Fruchtbasierte Lebensmittel, Pflanzliche Brotaufstriche, Süße Brotaufstriche, Konfitüren und Marmeladen, Konfitüren" en:plant-based-foods-and-beverages,en:plant-based-foods,en:fruits-and-vegetables-based-foods,en:breakfasts,en:spreads,en:fruits-based-foods,en:plant-based-spreads,en:sweet-spreads,en:fruit-and-vegetable-preserves,en:jams Frankreich, Deutschland en:france,en:germany 100g 100g 224 kcal 0 g 0 g 54 g 53 g 0 g 0 g 0 g 224 kcal en:sweets en:sugary-snacks,en:sweets unknown d 11 b 60 1 31024 -5 -15 1 0 App - yuka, Apps 0 +26281742 en Stawberry jam Strawberry conserve 500 g serving fr:bocal verre fr:bocal-verre Grandessa grandessa Plant-based foods and beverages, Plant-based foods, Breakfasts, Spreads, Plant-based spreads, Sweet spreads, Fruit and vegetable preserves en:plant-based-foods-and-beverages,en:plant-based-foods,en:breakfasts,en:spreads,en:plant-based-spreads,en:sweet-spreads,en:fruit-and-vegetable-preserves Made in Belgium en:made-in-belgium France en:france made in belgium made-in-belgium Eggs, Milk en:eggs,en:milk serving 100g 171 kcal 0.1 g 0.1 g 9.9 g 9.9 g 0.1 g 2.54 g 1.016 g 171 kcal en:sweets en:sugary-snacks,en:sweets unknown unknown unknown 1 -5 -15 1 0 App - yuka, Apps 0 3250392332105 fr Thon catalane Netto netto France en:france 100g 100g 84 kcal 3 g 0.2 g 4.1 g 4.1 g 8.9 g 1.1 g 0.44 g 84 kcal unknown unknown unknown 1 -5 -15 1 0 App - yuka, Apps 0 -3259330020135 en Tofu en flan Plant-based foods and beverages, Plant-based foods, Legumes and their products, Meat alternatives, Meat analogues, Tofu en:plant-based-foods-and-beverages,en:plant-based-foods,en:legumes-and-their-products,en:meat-alternatives,en:meat-analogues,en:tofu France en:france Graines de soja sans OGM, eau, glucono delta lactone (E575) chlorure de calcium (E509), sulfate de calcium (E516) 100g 100g en:Legumes en:cereals-and-potatoes,en:legumes 3 en:3-processed-foods unknown b 77 1 20904 -5 -15 1 0 App - yuka, Apps 0 -5601009974337 pt Iogurte morango banana Iogurte Líquido Meio Gordo com sumo e polpa de morango (4,4%) e polpa de banana (1%). 170 g Plástico, PE 7 - polietileno, HDPE 2 - Polietileno de alta densidade en:plastic,en:pe-7-polyethylene,en:hdpe-2-high-density-polyethylene Pingo Doce, Gelgurte pingo-doce,gelgurte Laticínios, Alimentos Fermentados, Produtos lácteos fermentados, Sobremesas, Sobremesas de laticínios, en:Fermented dairy desserts, Iogurtes en:dairies,en:fermented-foods,en:fermented-milk-products,en:desserts,en:dairy-desserts,en:fermented-dairy-desserts,en:yogurts França, Portugal en:france,en:portugal Pingo Doce pingo-doce Portugal en:portugal Guarda, Portugal guarda,portugal PT ILT 39 EC pt-ilt-39-ec _Leite_ pasteurizado desnatado, _leite_ pasteurizado, açucar, sumo de morango reconstituído e polpa de morango, polpa de banana, _leite_ em pó magro, dextrose, aroma banana, aroma morango, corantes da fruta (antocianinas, beta-caroteno), amido de milho, espessantes (pectina amidada, goma xantana), fermentos lácticos, regulador de acidez (citrato trissódico), conservante da fruta (sorbato de potássio). Leite en:milk 100g 100g 78 kcal 1.4 g 0.9 g 13.7 g 11.1 g 0 g 2.7 g 0.1 g 0.04 g 78 kcal en:Milk and yogurt en:milk-and-dairy-products,en:milk-and-yogurt 4 en:4-ultra-processed-food-and-drink-products b 1 b 79 1 19593 8 -15 1 0 App - yuka, Apps 0 -77000001 fr "Pâte à tartiner chocolat et noisettes" 300 g Alex Olivier alex-olivier "Petit-déjeuners, Produits à tartiner, Produits à tartiner sucrés, Pâtes à tartiner, Pâtes à tartiner aux noisettes, Pâtes à tartiner au chocolat, Pâtes à tartiner aux noisettes et au cacao" en:breakfasts,en:spreads,en:sweet-spreads,fr:pates-a-tartiner,en:hazelnut-spreads,en:chocolate-spreads,en:cocoa-and-hazelnuts-spreads France en:france 100g 100g 49 % en:Sweets en:sugary-snacks,en:sweets unknown unknown d 31 1 31032 -5 -15 1 0 0 +3259330020135 en Tofu en flan Plant-based foods and beverages, Plant-based foods, Legumes and their products, Meat alternatives, Meat analogues, Tofu en:plant-based-foods-and-beverages,en:plant-based-foods,en:legumes-and-their-products,en:meat-alternatives,en:meat-analogues,en:tofu France en:france Graines de soja sans OGM, eau, glucono delta lactone (E575) chlorure de calcium (E509), sulfate de calcium (E516) 100g 100g en:legumes en:cereals-and-potatoes,en:legumes 3 en:3-processed-foods unknown b 77 1 20904 -5 -15 1 0 App - yuka, Apps 0 +5601009974337 pt Iogurte morango banana Iogurte Líquido Meio Gordo com sumo e polpa de morango (4,4%) e polpa de banana (1%). 170 g Plástico, PE 7 - polietileno, HDPE 2 - Polietileno de alta densidade en:plastic,en:pe-7-polyethylene,en:hdpe-2-high-density-polyethylene Pingo Doce, Gelgurte pingo-doce,gelgurte Laticínios, Alimentos Fermentados, Produtos lácteos fermentados, Sobremesas, Sobremesas de laticínios, en:Fermented dairy desserts, Iogurtes en:dairies,en:fermented-foods,en:fermented-milk-products,en:desserts,en:dairy-desserts,en:fermented-dairy-desserts,en:yogurts França, Portugal en:france,en:portugal Pingo Doce pingo-doce Portugal en:portugal Guarda, Portugal guarda,portugal PT ILT 39 EC pt-ilt-39-ec _Leite_ pasteurizado desnatado, _leite_ pasteurizado, açucar, sumo de morango reconstituído e polpa de morango, polpa de banana, _leite_ em pó magro, dextrose, aroma banana, aroma morango, corantes da fruta (antocianinas, beta-caroteno), amido de milho, espessantes (pectina amidada, goma xantana), fermentos lácticos, regulador de acidez (citrato trissódico), conservante da fruta (sorbato de potássio). Leite en:milk 100g 100g 78 kcal 1.4 g 0.9 g 13.7 g 11.1 g 0 g 2.7 g 0.1 g 0.04 g 78 kcal en:milk-and-yogurt en:milk-and-dairy-products,en:milk-and-yogurt 4 en:4-ultra-processed-food-and-drink-products b 1 b 79 1 19593 8 -15 1 0 App - yuka, Apps 0 +77000001 fr "Pâte à tartiner chocolat et noisettes" 300 g Alex Olivier alex-olivier "Petit-déjeuners, Produits à tartiner, Produits à tartiner sucrés, Pâtes à tartiner, Pâtes à tartiner aux noisettes, Pâtes à tartiner au chocolat, Pâtes à tartiner aux noisettes et au cacao" en:breakfasts,en:spreads,en:sweet-spreads,fr:pates-a-tartiner,en:hazelnut-spreads,en:chocolate-spreads,en:cocoa-and-hazelnuts-spreads France en:france 100g 100g 49 % en:sweets en:sugary-snacks,en:sweets unknown unknown d 31 1 31032 -5 -15 1 0 0 8712423020221 fr The Tasty Decaf Unilever unilever France en:france 100g 100g 1 kcal 0 g 0 g 0 g 0 g 0 g 0 g 0 g 1 kcal unknown unknown unknown 1 -5 -15 1 0 App - yuka, Apps 0 -71464240608 en 100% fruit juice smoothie, green goodness Green goodness smoothie 8 OZA (240 ml) Bolthouse Farms bolthouse-farms Wm. Bolthouse Farms Inc. Beverages and beverages preparations, Plant-based foods and beverages, Beverages, Plant-based beverages en:beverages-and-beverages-preparations,en:plant-based-foods-and-beverages,en:beverages,en:plant-based-beverages France, United States en:france,en:united-states Pineapple juice from concentrate (water, pineapple juice concentrate), apple juice from concentrate (water, apple juice concentrate), mango puree from concentrate (water, mango puree concentrate), banana puree, kiwi puree, spirulina powder, natural flavor, green tea extract, spinach powder, broccoli powder, barley grass powder, wheat grass powder, garlic powder, jerusalem artichoke powder, nova scotia dulse powder. 100g 100g 58 kcal 0 g 0 g 13.75 g 12.5 g 0.8 g 0.83 g 30 mg 12 mg 58 kcal 0 g 0 mg 417 IU 12.5 mg 0.071 mg 0.125 mg 0.62 µg 175 mg 17 mg 0.45 mg 1 mg en:Unsweetened beverages en:beverages,en:unsweetened-beverages 4 en:4-ultra-processed-food-and-drink-products d 8 unknown 1 -5 -15 1 0 2018-02-14T00:00:00Z Fruit & Vegetable Juice, Nectars & Fruit Drinks LI 653042 2018-02-14T00:00:00Z 2019-12-06T00:00:00Z App - yuka, Apps, Databases, database-usda 0 -0850032917148 en Tulú Drinks - Strawberry Flavor Aloe Drink with Strawberry Flavor 500 ml 240 ml Plastic en:plastic Tulú, Tulú Drinks tulu,tulu-drinks Colombia's Best Beverages and beverages preparations, Plant-based foods and beverages, Beverages, Plant-based beverages, Fruit-based beverages, Non-alcoholic beverages, Aloe Vera drinks en:beverages-and-beverages-preparations,en:plant-based-foods-and-beverages,en:beverages,en:plant-based-beverages,en:fruit-based-beverages,en:non-alcoholic-beverages,en:aloe-vera-drinks Vegetarian, No preservatives, Vegan en:vegetarian,en:no-preservatives,en:vegan Puerto Rico en:puerto-rico Colombia en:colombia Water, Aloe Vera Pulp, Sugar, Citric Acid, Sodium Citrate, Aloe Artifical Flavor, Calcium Lactate, Strawberry Artificial Flavor, Ascorbic Acid, Gellan Gum, EDTA, Sucralose, FD&C Red No. 40 None en:none None en:none serving 100g 50 kcal 0 g 0 g 12 g 12 g 0 g 0 g 100 mg 40 mg 50 kcal en:Sweetened beverages en:beverages,en:sweetened-beverages 4 en:4-ultra-processed-food-and-drink-products d 7 c 48 1 18309 -1 -15 1 0 0 +71464240608 en 100% fruit juice smoothie, green goodness Green goodness smoothie 8 OZA (240 ml) Bolthouse Farms bolthouse-farms Wm. Bolthouse Farms Inc. Beverages and beverages preparations, Plant-based foods and beverages, Beverages, Plant-based beverages en:beverages-and-beverages-preparations,en:plant-based-foods-and-beverages,en:beverages,en:plant-based-beverages France, United States en:france,en:united-states Pineapple juice from concentrate (water, pineapple juice concentrate), apple juice from concentrate (water, apple juice concentrate), mango puree from concentrate (water, mango puree concentrate), banana puree, kiwi puree, spirulina powder, natural flavor, green tea extract, spinach powder, broccoli powder, barley grass powder, wheat grass powder, garlic powder, jerusalem artichoke powder, nova scotia dulse powder. 100g 100g 58 kcal 0 g 0 g 13.75 g 12.5 g 0.8 g 0.83 g 30 mg 12 mg 58 kcal 0 g 0 mg 417 IU 12.5 mg 0.071 mg 0.125 mg 0.62 µg 175 mg 17 mg 0.45 mg 1 mg en:unsweetened-beverages en:beverages,en:unsweetened-beverages 4 en:4-ultra-processed-food-and-drink-products d 8 unknown 1 -5 -15 1 0 2018-02-14T00:00:00Z Fruit & Vegetable Juice, Nectars & Fruit Drinks LI 653042 2018-02-14T00:00:00Z 2019-12-06T00:00:00Z App - yuka, Apps, Databases, database-usda 0 +0850032917148 en Tulú Drinks - Strawberry Flavor Aloe Drink with Strawberry Flavor 500 ml 240 ml Plastic en:plastic Tulú, Tulú Drinks tulu,tulu-drinks Colombia's Best Beverages and beverages preparations, Plant-based foods and beverages, Beverages, Plant-based beverages, Fruit-based beverages, Non-alcoholic beverages, Aloe Vera drinks en:beverages-and-beverages-preparations,en:plant-based-foods-and-beverages,en:beverages,en:plant-based-beverages,en:fruit-based-beverages,en:non-alcoholic-beverages,en:aloe-vera-drinks Vegetarian, No preservatives, Vegan en:vegetarian,en:no-preservatives,en:vegan Puerto Rico en:puerto-rico Colombia en:colombia Water, Aloe Vera Pulp, Sugar, Citric Acid, Sodium Citrate, Aloe Artifical Flavor, Calcium Lactate, Strawberry Artificial Flavor, Ascorbic Acid, Gellan Gum, EDTA, Sucralose, FD&C Red No. 40 None en:none None en:none serving 100g 50 kcal 0 g 0 g 12 g 12 g 0 g 0 g 100 mg 40 mg 50 kcal en:sweetened-beverages en:beverages,en:sweetened-beverages 4 en:4-ultra-processed-food-and-drink-products d 7 c 48 1 18309 -1 -15 1 0 0 diff --git a/tests/integration/expected_test_results/export_more_fields/rows/0850032917148.json b/tests/integration/expected_test_results/export_more_fields/rows/0850032917148.json index 6ba359cb14ded..729ffab878af8 100644 --- a/tests/integration/expected_test_results/export_more_fields/rows/0850032917148.json +++ b/tests/integration/expected_test_results/export_more_fields/rows/0850032917148.json @@ -65,7 +65,7 @@ "off:ecoscore_data.missing_key_data" : "1", "off:ecoscore_grade" : "c", "off:ecoscore_score" : "48", - "off:food_groups" : "en:Sweetened beverages", + "off:food_groups" : "en:sweetened-beverages", "off:food_groups_tags" : "en:beverages,en:sweetened-beverages", "off:nova_groups" : "4", "off:nova_groups_tags" : "en:4-ultra-processed-food-and-drink-products", diff --git a/tests/integration/expected_test_results/export_more_fields/rows/25000044984.json b/tests/integration/expected_test_results/export_more_fields/rows/25000044984.json index e99951f04be7a..8bbd4560221b8 100644 --- a/tests/integration/expected_test_results/export_more_fields/rows/25000044984.json +++ b/tests/integration/expected_test_results/export_more_fields/rows/25000044984.json @@ -65,7 +65,7 @@ "off:ecoscore_data.missing_key_data" : "1", "off:ecoscore_grade" : "not-applicable", "off:ecoscore_score" : "", - "off:food_groups" : "en:Sweetened beverages", + "off:food_groups" : "en:sweetened-beverages", "off:food_groups_tags" : "en:beverages,en:sweetened-beverages", "off:nova_groups" : "4", "off:nova_groups_tags" : "en:4-ultra-processed-food-and-drink-products", diff --git a/tests/integration/expected_test_results/export_more_fields/rows/26281742.json b/tests/integration/expected_test_results/export_more_fields/rows/26281742.json index 7ec06cff8bf27..c1e1ea3645367 100644 --- a/tests/integration/expected_test_results/export_more_fields/rows/26281742.json +++ b/tests/integration/expected_test_results/export_more_fields/rows/26281742.json @@ -65,7 +65,7 @@ "off:ecoscore_data.missing_key_data" : "1", "off:ecoscore_grade" : "unknown", "off:ecoscore_score" : "", - "off:food_groups" : "en:Sweets", + "off:food_groups" : "en:sweets", "off:food_groups_tags" : "en:sugary-snacks,en:sweets", "off:nova_groups" : "", "off:nova_groups_tags" : "unknown", diff --git a/tests/integration/expected_test_results/export_more_fields/rows/27096765.json b/tests/integration/expected_test_results/export_more_fields/rows/27096765.json index d597548f4312b..b5d269c66cf2f 100644 --- a/tests/integration/expected_test_results/export_more_fields/rows/27096765.json +++ b/tests/integration/expected_test_results/export_more_fields/rows/27096765.json @@ -65,7 +65,7 @@ "off:ecoscore_data.missing_key_data" : "1", "off:ecoscore_grade" : "d", "off:ecoscore_score" : "37", - "off:food_groups" : "en:Chocolate products", + "off:food_groups" : "en:chocolate-products", "off:food_groups_tags" : "en:sugary-snacks,en:chocolate-products", "off:nova_groups" : "4", "off:nova_groups_tags" : "en:4-ultra-processed-food-and-drink-products", diff --git a/tests/integration/expected_test_results/export_more_fields/rows/3256220513173.json b/tests/integration/expected_test_results/export_more_fields/rows/3256220513173.json index fa994094d2062..042df7a90099b 100644 --- a/tests/integration/expected_test_results/export_more_fields/rows/3256220513173.json +++ b/tests/integration/expected_test_results/export_more_fields/rows/3256220513173.json @@ -65,7 +65,7 @@ "off:ecoscore_data.missing_key_data" : "1", "off:ecoscore_grade" : "unknown", "off:ecoscore_score" : "", - "off:food_groups" : "en:Sweetened beverages", + "off:food_groups" : "en:sweetened-beverages", "off:food_groups_tags" : "en:beverages,en:sweetened-beverages", "off:nova_groups" : "4", "off:nova_groups_tags" : "en:4-ultra-processed-food-and-drink-products", diff --git a/tests/integration/expected_test_results/export_more_fields/rows/3259330020135.json b/tests/integration/expected_test_results/export_more_fields/rows/3259330020135.json index 88346e1db1ac9..612d0a4e2a69c 100644 --- a/tests/integration/expected_test_results/export_more_fields/rows/3259330020135.json +++ b/tests/integration/expected_test_results/export_more_fields/rows/3259330020135.json @@ -65,7 +65,7 @@ "off:ecoscore_data.missing_key_data" : "1", "off:ecoscore_grade" : "b", "off:ecoscore_score" : "77", - "off:food_groups" : "en:Legumes", + "off:food_groups" : "en:legumes", "off:food_groups_tags" : "en:cereals-and-potatoes,en:legumes", "off:nova_groups" : "3", "off:nova_groups_tags" : "en:3-processed-foods", diff --git a/tests/integration/expected_test_results/export_more_fields/rows/3270160503070.json b/tests/integration/expected_test_results/export_more_fields/rows/3270160503070.json index 99bd0eda2072f..f462f3be68444 100644 --- a/tests/integration/expected_test_results/export_more_fields/rows/3270160503070.json +++ b/tests/integration/expected_test_results/export_more_fields/rows/3270160503070.json @@ -65,7 +65,7 @@ "off:ecoscore_data.missing_key_data" : "1", "off:ecoscore_grade" : "unknown", "off:ecoscore_score" : "", - "off:food_groups" : "en:Vegetables", + "off:food_groups" : "en:vegetables", "off:food_groups_tags" : "en:fruits-and-vegetables,en:vegetables", "off:nova_groups" : "1", "off:nova_groups_tags" : "en:1-unprocessed-or-minimally-processed-foods", diff --git a/tests/integration/expected_test_results/export_more_fields/rows/3451790834080.json b/tests/integration/expected_test_results/export_more_fields/rows/3451790834080.json index e6200b0ae9f54..11a310f1c9fa0 100644 --- a/tests/integration/expected_test_results/export_more_fields/rows/3451790834080.json +++ b/tests/integration/expected_test_results/export_more_fields/rows/3451790834080.json @@ -65,7 +65,7 @@ "off:ecoscore_data.missing_key_data" : "1", "off:ecoscore_grade" : "b", "off:ecoscore_score" : "61", - "off:food_groups" : "en:Milk and yogurt", + "off:food_groups" : "en:milk-and-yogurt", "off:food_groups_tags" : "en:milk-and-dairy-products,en:milk-and-yogurt", "off:nova_groups" : "1", "off:nova_groups_tags" : "en:1-unprocessed-or-minimally-processed-foods", diff --git a/tests/integration/expected_test_results/export_more_fields/rows/3564703999971.json b/tests/integration/expected_test_results/export_more_fields/rows/3564703999971.json index 8b8cfda84bf1a..e4a5d8d81be56 100644 --- a/tests/integration/expected_test_results/export_more_fields/rows/3564703999971.json +++ b/tests/integration/expected_test_results/export_more_fields/rows/3564703999971.json @@ -65,7 +65,7 @@ "off:ecoscore_data.missing_key_data" : "", "off:ecoscore_grade" : "unknown", "off:ecoscore_score" : "", - "off:food_groups" : "en:Fats", + "off:food_groups" : "en:fats", "off:food_groups_tags" : "en:fats-and-sauces,en:fats", "off:nova_groups" : "2", "off:nova_groups_tags" : "en:2-processed-culinary-ingredients", diff --git a/tests/integration/expected_test_results/export_more_fields/rows/3661344653573.json b/tests/integration/expected_test_results/export_more_fields/rows/3661344653573.json index 6beae097206be..aceb2e9f39708 100644 --- a/tests/integration/expected_test_results/export_more_fields/rows/3661344653573.json +++ b/tests/integration/expected_test_results/export_more_fields/rows/3661344653573.json @@ -65,7 +65,7 @@ "off:ecoscore_data.missing_key_data" : "", "off:ecoscore_grade" : "a", "off:ecoscore_score" : "100", - "off:food_groups" : "en:Dairy desserts", + "off:food_groups" : "en:dairy-desserts", "off:food_groups_tags" : "en:milk-and-dairy-products,en:dairy-desserts", "off:nova_groups" : "3", "off:nova_groups_tags" : "en:3-processed-foods", diff --git a/tests/integration/expected_test_results/export_more_fields/rows/3770013801303.json b/tests/integration/expected_test_results/export_more_fields/rows/3770013801303.json index 862811906782d..71968e385bb18 100644 --- a/tests/integration/expected_test_results/export_more_fields/rows/3770013801303.json +++ b/tests/integration/expected_test_results/export_more_fields/rows/3770013801303.json @@ -65,7 +65,7 @@ "off:ecoscore_data.missing_key_data" : "1", "off:ecoscore_grade" : "not-applicable", "off:ecoscore_score" : "", - "off:food_groups" : "en:Sweetened beverages", + "off:food_groups" : "en:sweetened-beverages", "off:food_groups_tags" : "en:beverages,en:sweetened-beverages", "off:nova_groups" : "", "off:nova_groups_tags" : "unknown", diff --git a/tests/integration/expected_test_results/export_more_fields/rows/5050083706622.json b/tests/integration/expected_test_results/export_more_fields/rows/5050083706622.json index cdccfd3cd02e1..cc35e287dfb60 100644 --- a/tests/integration/expected_test_results/export_more_fields/rows/5050083706622.json +++ b/tests/integration/expected_test_results/export_more_fields/rows/5050083706622.json @@ -65,7 +65,7 @@ "off:ecoscore_data.missing_key_data" : "1", "off:ecoscore_grade" : "e", "off:ecoscore_score" : "15", - "off:food_groups" : "en:Breakfast cereals", + "off:food_groups" : "en:breakfast-cereals", "off:food_groups_tags" : "en:cereals-and-potatoes,en:breakfast-cereals", "off:nova_groups" : "4", "off:nova_groups_tags" : "en:4-ultra-processed-food-and-drink-products", diff --git a/tests/integration/expected_test_results/export_more_fields/rows/5410803950689.json b/tests/integration/expected_test_results/export_more_fields/rows/5410803950689.json index 98b678a8c1954..999fea7b16e75 100644 --- a/tests/integration/expected_test_results/export_more_fields/rows/5410803950689.json +++ b/tests/integration/expected_test_results/export_more_fields/rows/5410803950689.json @@ -65,7 +65,7 @@ "off:ecoscore_data.missing_key_data" : "1", "off:ecoscore_grade" : "unknown", "off:ecoscore_score" : "", - "off:food_groups" : "en:Dressings and sauces", + "off:food_groups" : "en:dressings-and-sauces", "off:food_groups_tags" : "en:fats-and-sauces,en:dressings-and-sauces", "off:nova_groups" : "", "off:nova_groups_tags" : "unknown", diff --git a/tests/integration/expected_test_results/export_more_fields/rows/5601009974337.json b/tests/integration/expected_test_results/export_more_fields/rows/5601009974337.json index 303a4a43971d3..af643fe0ab6f9 100644 --- a/tests/integration/expected_test_results/export_more_fields/rows/5601009974337.json +++ b/tests/integration/expected_test_results/export_more_fields/rows/5601009974337.json @@ -65,7 +65,7 @@ "off:ecoscore_data.missing_key_data" : "1", "off:ecoscore_grade" : "b", "off:ecoscore_score" : "79", - "off:food_groups" : "en:Milk and yogurt", + "off:food_groups" : "en:milk-and-yogurt", "off:food_groups_tags" : "en:milk-and-dairy-products,en:milk-and-yogurt", "off:nova_groups" : "4", "off:nova_groups_tags" : "en:4-ultra-processed-food-and-drink-products", diff --git a/tests/integration/expected_test_results/export_more_fields/rows/71464240608.json b/tests/integration/expected_test_results/export_more_fields/rows/71464240608.json index d7fed9dca8761..9fa2ac973dff6 100644 --- a/tests/integration/expected_test_results/export_more_fields/rows/71464240608.json +++ b/tests/integration/expected_test_results/export_more_fields/rows/71464240608.json @@ -65,7 +65,7 @@ "off:ecoscore_data.missing_key_data" : "1", "off:ecoscore_grade" : "unknown", "off:ecoscore_score" : "", - "off:food_groups" : "en:Unsweetened beverages", + "off:food_groups" : "en:unsweetened-beverages", "off:food_groups_tags" : "en:beverages,en:unsweetened-beverages", "off:nova_groups" : "4", "off:nova_groups_tags" : "en:4-ultra-processed-food-and-drink-products", diff --git a/tests/integration/expected_test_results/export_more_fields/rows/77000001.json b/tests/integration/expected_test_results/export_more_fields/rows/77000001.json index 2f5429fbd578e..68f2e8206448d 100644 --- a/tests/integration/expected_test_results/export_more_fields/rows/77000001.json +++ b/tests/integration/expected_test_results/export_more_fields/rows/77000001.json @@ -65,7 +65,7 @@ "off:ecoscore_data.missing_key_data" : "1", "off:ecoscore_grade" : "d", "off:ecoscore_score" : "31", - "off:food_groups" : "en:Sweets", + "off:food_groups" : "en:sweets", "off:food_groups_tags" : "en:sugary-snacks,en:sweets", "off:nova_groups" : "", "off:nova_groups_tags" : "unknown", diff --git a/tests/integration/expected_test_results/export_more_fields/rows/7804659650035.json b/tests/integration/expected_test_results/export_more_fields/rows/7804659650035.json index c9217a780f79c..764a2afee4a3c 100644 --- a/tests/integration/expected_test_results/export_more_fields/rows/7804659650035.json +++ b/tests/integration/expected_test_results/export_more_fields/rows/7804659650035.json @@ -65,7 +65,7 @@ "off:ecoscore_data.missing_key_data" : "1", "off:ecoscore_grade" : "d", "off:ecoscore_score" : "37", - "off:food_groups" : "en:Dressings and sauces", + "off:food_groups" : "en:dressings-and-sauces", "off:food_groups_tags" : "en:fats-and-sauces,en:dressings-and-sauces", "off:nova_groups" : "", "off:nova_groups_tags" : "unknown", diff --git a/tests/integration/expected_test_results/export_more_fields/rows/8722700472575.json b/tests/integration/expected_test_results/export_more_fields/rows/8722700472575.json index 1782b3ad325ed..9f0a91315b472 100644 --- a/tests/integration/expected_test_results/export_more_fields/rows/8722700472575.json +++ b/tests/integration/expected_test_results/export_more_fields/rows/8722700472575.json @@ -65,7 +65,7 @@ "off:ecoscore_data.missing_key_data" : "1", "off:ecoscore_grade" : "d", "off:ecoscore_score" : "37", - "off:food_groups" : "en:Dressings and sauces", + "off:food_groups" : "en:dressings-and-sauces", "off:food_groups_tags" : "en:fats-and-sauces,en:dressings-and-sauces", "off:nova_groups" : "4", "off:nova_groups_tags" : "en:4-ultra-processed-food-and-drink-products", diff --git a/tests/integration/expected_test_results/export_more_fields/rows/9002355004345.json b/tests/integration/expected_test_results/export_more_fields/rows/9002355004345.json index 5f1a9a6451657..a0d6fd950aaa0 100644 --- a/tests/integration/expected_test_results/export_more_fields/rows/9002355004345.json +++ b/tests/integration/expected_test_results/export_more_fields/rows/9002355004345.json @@ -65,7 +65,7 @@ "off:ecoscore_data.missing_key_data" : "1", "off:ecoscore_grade" : "b", "off:ecoscore_score" : "60", - "off:food_groups" : "en:Sweets", + "off:food_groups" : "en:sweets", "off:food_groups_tags" : "en:sugary-snacks,en:sweets", "off:nova_groups" : "", "off:nova_groups_tags" : "unknown", diff --git a/tests/integration/expected_test_results/import_csv_file/replace_existing_values/3003004006001.json b/tests/integration/expected_test_results/import_csv_file/replace_existing_values/3003004006001.json index dff36c2ff7cad..a8c6cbf32595c 100644 --- a/tests/integration/expected_test_results/import_csv_file/replace_existing_values/3003004006001.json +++ b/tests/integration/expected_test_results/import_csv_file/replace_existing_values/3003004006001.json @@ -526,7 +526,7 @@ "test-user" ], "entry_dates_tags" : "--ignore--", - "food_groups" : "en:Biscuits and cakes", + "food_groups" : "en:biscuits-and-cakes", "food_groups_tags" : [ "en:sugary-snacks", "en:biscuits-and-cakes" diff --git a/tests/integration/expected_test_results/import_csv_file/replace_existing_values/3003004006004.json b/tests/integration/expected_test_results/import_csv_file/replace_existing_values/3003004006004.json index 2410dea2d6237..9509862975815 100644 --- a/tests/integration/expected_test_results/import_csv_file/replace_existing_values/3003004006004.json +++ b/tests/integration/expected_test_results/import_csv_file/replace_existing_values/3003004006004.json @@ -548,7 +548,7 @@ "test-user" ], "entry_dates_tags" : "--ignore--", - "food_groups" : "en:Dressings and sauces", + "food_groups" : "en:dressings-and-sauces", "food_groups_tags" : [ "en:fats-and-sauces", "en:dressings-and-sauces" diff --git a/tests/integration/expected_test_results/import_csv_file/test/2003004006001.json b/tests/integration/expected_test_results/import_csv_file/test/2003004006001.json index 16d28c220d9d4..89eb39e14e24a 100644 --- a/tests/integration/expected_test_results/import_csv_file/test/2003004006001.json +++ b/tests/integration/expected_test_results/import_csv_file/test/2003004006001.json @@ -518,7 +518,7 @@ "test-user" ], "entry_dates_tags" : "--ignore--", - "food_groups" : "en:Biscuits and cakes", + "food_groups" : "en:biscuits-and-cakes", "food_groups_tags" : [ "en:sugary-snacks", "en:biscuits-and-cakes" diff --git a/tests/integration/expected_test_results/import_csv_file/test/2003004006004.json b/tests/integration/expected_test_results/import_csv_file/test/2003004006004.json index d97b8499a5abf..4f6500149dd48 100644 --- a/tests/integration/expected_test_results/import_csv_file/test/2003004006004.json +++ b/tests/integration/expected_test_results/import_csv_file/test/2003004006004.json @@ -511,7 +511,7 @@ "test-user" ], "entry_dates_tags" : "--ignore--", - "food_groups" : "en:Dressings and sauces", + "food_groups" : "en:dressings-and-sauces", "food_groups_tags" : [ "en:fats-and-sauces", "en:dressings-and-sauces" diff --git a/tests/unit/expected_test_results/attributes/en-no-ingredients.json b/tests/unit/expected_test_results/attributes/en-no-ingredients.json index 89804492e9889..0c73485e65154 100644 --- a/tests/unit/expected_test_results/attributes/en-no-ingredients.json +++ b/tests/unit/expected_test_results/attributes/en-no-ingredients.json @@ -777,7 +777,7 @@ "ecoscore_tags" : [ "d" ], - "food_groups" : "en:Cheese", + "food_groups" : "en:cheese", "food_groups_tags" : [ "en:milk-and-dairy-products", "en:cheese" diff --git a/tests/unit/expected_test_results/attributes/en-nova-groups-markers.json b/tests/unit/expected_test_results/attributes/en-nova-groups-markers.json index 2a25f5fd1f282..b6a69eacb69cc 100644 --- a/tests/unit/expected_test_results/attributes/en-nova-groups-markers.json +++ b/tests/unit/expected_test_results/attributes/en-nova-groups-markers.json @@ -790,7 +790,7 @@ "ecoscore_tags" : [ "d" ], - "food_groups" : "en:Cheese", + "food_groups" : "en:cheese", "food_groups_tags" : [ "en:milk-and-dairy-products", "en:cheese" diff --git a/tests/unit/expected_test_results/attributes/en-unknown-ingredients.json b/tests/unit/expected_test_results/attributes/en-unknown-ingredients.json index fd3ed281bb5ba..6b93ca0bc00b1 100644 --- a/tests/unit/expected_test_results/attributes/en-unknown-ingredients.json +++ b/tests/unit/expected_test_results/attributes/en-unknown-ingredients.json @@ -783,7 +783,7 @@ "ecoscore_tags" : [ "d" ], - "food_groups" : "en:Cheese", + "food_groups" : "en:cheese", "food_groups_tags" : [ "en:milk-and-dairy-products", "en:cheese" diff --git a/tests/unit/expected_test_results/ecoscore/calvados-ingredients-no-origins.json b/tests/unit/expected_test_results/ecoscore/calvados-ingredients-no-origins.json index 45671283bf7a9..f71a7e1061b15 100644 --- a/tests/unit/expected_test_results/ecoscore/calvados-ingredients-no-origins.json +++ b/tests/unit/expected_test_results/ecoscore/calvados-ingredients-no-origins.json @@ -7,215 +7,213 @@ "origins_of_ingredients" : { "aggregated_origins" : [ { - "origin" : "en:unknown", + "origin" : "en:france", "percent" : 100 } ], - "epi_score" : 0, - "epi_value" : -5, + "epi_score" : 93, + "epi_value" : 4, "origins_from_categories" : [ - "en:unknown", - "en:unknown" + "en:france" ], "origins_from_origins_field" : [ "en:unknown" ], "transportation_scores" : { - "ad" : 0, + "ad" : 57, "al" : 0, - "at" : 0, - "ax" : 0, - "ba" : 0, - "be" : 0, - "bg" : 0, - "ch" : 0, - "cy" : 0, - "cz" : 0, - "de" : 0, - "dk" : 0, - "dz" : 0, - "ee" : 0, - "eg" : 0, - "es" : 0, - "fi" : 0, - "fo" : 0, - "fr" : 0, - "gg" : 0, - "gi" : 0, - "gr" : 0, - "hr" : 0, - "hu" : 0, - "ie" : 0, - "il" : 0, - "im" : 0, - "is" : 0, - "it" : 0, - "je" : 0, - "lb" : 0, - "li" : 0, - "lt" : 0, - "lu" : 0, - "lv" : 0, - "ly" : 0, - "ma" : 0, - "mc" : 0, - "md" : 0, - "me" : 0, - "mk" : 0, - "mt" : 0, - "nl" : 0, - "no" : 0, - "pl" : 0, - "ps" : 0, - "pt" : 0, - "ro" : 0, - "rs" : 0, - "se" : 0, - "si" : 0, - "sj" : 0, - "sk" : 0, - "sm" : 0, - "sy" : 0, - "tn" : 0, - "tr" : 0, - "ua" : 0, - "uk" : 0, + "at" : 38, + "ax" : 67, + "ba" : 14, + "be" : 85, + "bg" : 21, + "ch" : 69, + "cy" : 40, + "cz" : 48, + "de" : 61, + "dk" : 39, + "dz" : 45, + "ee" : 71, + "eg" : 35, + "es" : 37, + "fi" : 69, + "fo" : 62, + "fr" : 100, + "gg" : 78, + "gi" : 4, + "gr" : 49, + "hr" : 30, + "hu" : 26, + "ie" : 47, + "il" : 34, + "im" : 50, + "is" : 53, + "it" : 47, + "je" : 76, + "lb" : 39, + "li" : 64, + "lt" : 63, + "lu" : 82, + "lv" : 71, + "ly" : 56, + "ma" : 60, + "mc" : 52, + "md" : 29, + "me" : 37, + "mk" : 29, + "mt" : 57, + "nl" : 77, + "no" : 20, + "pl" : 25, + "ps" : 42, + "pt" : 13, + "ro" : 31, + "rs" : 7, + "se" : 15, + "si" : 38, + "sj" : 53, + "sk" : 24, + "sm" : 40, + "sy" : 26, + "tn" : 9, + "tr" : 7, + "ua" : 40, + "uk" : 68, "us" : 0, - "va" : 0, + "va" : 29, "world" : 0, - "xk" : 0 + "xk" : 28 }, "transportation_values" : { - "ad" : 0, + "ad" : 9, "al" : 0, - "at" : 0, - "ax" : 0, - "ba" : 0, - "be" : 0, - "bg" : 0, - "ch" : 0, - "cy" : 0, - "cz" : 0, - "de" : 0, - "dk" : 0, - "dz" : 0, - "ee" : 0, - "eg" : 0, - "es" : 0, - "fi" : 0, - "fo" : 0, - "fr" : 0, - "gg" : 0, - "gi" : 0, - "gr" : 0, - "hr" : 0, - "hu" : 0, - "ie" : 0, - "il" : 0, - "im" : 0, - "is" : 0, - "it" : 0, - "je" : 0, - "lb" : 0, - "li" : 0, - "lt" : 0, - "lu" : 0, - "lv" : 0, - "ly" : 0, - "ma" : 0, - "mc" : 0, - "md" : 0, - "me" : 0, - "mk" : 0, - "mt" : 0, - "nl" : 0, - "no" : 0, - "pl" : 0, - "ps" : 0, - "pt" : 0, - "ro" : 0, - "rs" : 0, - "se" : 0, - "si" : 0, - "sj" : 0, - "sk" : 0, - "sm" : 0, - "sy" : 0, - "tn" : 0, - "tr" : 0, - "ua" : 0, - "uk" : 0, + "at" : 6, + "ax" : 10, + "ba" : 2, + "be" : 13, + "bg" : 3, + "ch" : 10, + "cy" : 6, + "cz" : 7, + "de" : 9, + "dk" : 6, + "dz" : 7, + "ee" : 11, + "eg" : 5, + "es" : 6, + "fi" : 10, + "fo" : 9, + "fr" : 15, + "gg" : 12, + "gi" : 1, + "gr" : 7, + "hr" : 5, + "hu" : 4, + "ie" : 7, + "il" : 5, + "im" : 8, + "is" : 8, + "it" : 7, + "je" : 11, + "lb" : 6, + "li" : 10, + "lt" : 9, + "lu" : 12, + "lv" : 11, + "ly" : 8, + "ma" : 9, + "mc" : 8, + "md" : 4, + "me" : 6, + "mk" : 4, + "mt" : 9, + "nl" : 12, + "no" : 3, + "pl" : 4, + "ps" : 6, + "pt" : 2, + "ro" : 5, + "rs" : 1, + "se" : 2, + "si" : 6, + "sj" : 8, + "sk" : 4, + "sm" : 6, + "sy" : 4, + "tn" : 1, + "tr" : 1, + "ua" : 6, + "uk" : 10, "us" : 0, - "va" : 0, + "va" : 4, "world" : 0, - "xk" : 0 + "xk" : 4 }, "values" : { - "ad" : -5, - "al" : -5, - "at" : -5, - "ax" : -5, - "ba" : -5, - "be" : -5, - "bg" : -5, - "ch" : -5, - "cy" : -5, - "cz" : -5, - "de" : -5, - "dk" : -5, - "dz" : -5, - "ee" : -5, - "eg" : -5, - "es" : -5, - "fi" : -5, - "fo" : -5, - "fr" : -5, - "gg" : -5, - "gi" : -5, - "gr" : -5, - "hr" : -5, - "hu" : -5, - "ie" : -5, - "il" : -5, - "im" : -5, - "is" : -5, - "it" : -5, - "je" : -5, - "lb" : -5, - "li" : -5, - "lt" : -5, - "lu" : -5, - "lv" : -5, - "ly" : -5, - "ma" : -5, - "mc" : -5, - "md" : -5, - "me" : -5, - "mk" : -5, - "mt" : -5, - "nl" : -5, - "no" : -5, - "pl" : -5, - "ps" : -5, - "pt" : -5, - "ro" : -5, - "rs" : -5, - "se" : -5, - "si" : -5, - "sj" : -5, - "sk" : -5, - "sm" : -5, - "sy" : -5, - "tn" : -5, - "tr" : -5, - "ua" : -5, - "uk" : -5, - "us" : -5, - "va" : -5, - "world" : -5, - "xk" : -5 - }, - "warning" : "origins_are_100_percent_unknown" + "ad" : 13, + "al" : 4, + "at" : 10, + "ax" : 14, + "ba" : 6, + "be" : 17, + "bg" : 7, + "ch" : 14, + "cy" : 10, + "cz" : 11, + "de" : 13, + "dk" : 10, + "dz" : 11, + "ee" : 15, + "eg" : 9, + "es" : 10, + "fi" : 14, + "fo" : 13, + "fr" : 19, + "gg" : 16, + "gi" : 5, + "gr" : 11, + "hr" : 9, + "hu" : 8, + "ie" : 11, + "il" : 9, + "im" : 12, + "is" : 12, + "it" : 11, + "je" : 15, + "lb" : 10, + "li" : 14, + "lt" : 13, + "lu" : 16, + "lv" : 15, + "ly" : 12, + "ma" : 13, + "mc" : 12, + "md" : 8, + "me" : 10, + "mk" : 8, + "mt" : 13, + "nl" : 16, + "no" : 7, + "pl" : 8, + "ps" : 10, + "pt" : 6, + "ro" : 9, + "rs" : 5, + "se" : 6, + "si" : 10, + "sj" : 12, + "sk" : 8, + "sm" : 10, + "sy" : 8, + "tn" : 5, + "tr" : 5, + "ua" : 10, + "uk" : 14, + "us" : 4, + "va" : 8, + "world" : 4, + "xk" : 8 + } }, "packaging" : { "non_recyclable_and_non_biodegradable_materials" : 1, @@ -235,7 +233,6 @@ "missing" : { "agb_category" : 1, "labels" : 1, - "origins" : 1, "packagings" : 1 }, "missing_agribalyse_match_warning" : 1, diff --git a/tests/unit/expected_test_results/ecoscore/calvados-no-ingredients-no-origins.json b/tests/unit/expected_test_results/ecoscore/calvados-no-ingredients-no-origins.json index eacf9353cb91f..ec0adcf7994ad 100644 --- a/tests/unit/expected_test_results/ecoscore/calvados-no-ingredients-no-origins.json +++ b/tests/unit/expected_test_results/ecoscore/calvados-no-ingredients-no-origins.json @@ -7,215 +7,213 @@ "origins_of_ingredients" : { "aggregated_origins" : [ { - "origin" : "en:unknown", + "origin" : "en:france", "percent" : 100 } ], - "epi_score" : 0, - "epi_value" : -5, + "epi_score" : 93, + "epi_value" : 4, "origins_from_categories" : [ - "en:unknown", - "en:unknown" + "en:france" ], "origins_from_origins_field" : [ "en:unknown" ], "transportation_scores" : { - "ad" : 0, + "ad" : 57, "al" : 0, - "at" : 0, - "ax" : 0, - "ba" : 0, - "be" : 0, - "bg" : 0, - "ch" : 0, - "cy" : 0, - "cz" : 0, - "de" : 0, - "dk" : 0, - "dz" : 0, - "ee" : 0, - "eg" : 0, - "es" : 0, - "fi" : 0, - "fo" : 0, - "fr" : 0, - "gg" : 0, - "gi" : 0, - "gr" : 0, - "hr" : 0, - "hu" : 0, - "ie" : 0, - "il" : 0, - "im" : 0, - "is" : 0, - "it" : 0, - "je" : 0, - "lb" : 0, - "li" : 0, - "lt" : 0, - "lu" : 0, - "lv" : 0, - "ly" : 0, - "ma" : 0, - "mc" : 0, - "md" : 0, - "me" : 0, - "mk" : 0, - "mt" : 0, - "nl" : 0, - "no" : 0, - "pl" : 0, - "ps" : 0, - "pt" : 0, - "ro" : 0, - "rs" : 0, - "se" : 0, - "si" : 0, - "sj" : 0, - "sk" : 0, - "sm" : 0, - "sy" : 0, - "tn" : 0, - "tr" : 0, - "ua" : 0, - "uk" : 0, + "at" : 38, + "ax" : 67, + "ba" : 14, + "be" : 85, + "bg" : 21, + "ch" : 69, + "cy" : 40, + "cz" : 48, + "de" : 61, + "dk" : 39, + "dz" : 45, + "ee" : 71, + "eg" : 35, + "es" : 37, + "fi" : 69, + "fo" : 62, + "fr" : 100, + "gg" : 78, + "gi" : 4, + "gr" : 49, + "hr" : 30, + "hu" : 26, + "ie" : 47, + "il" : 34, + "im" : 50, + "is" : 53, + "it" : 47, + "je" : 76, + "lb" : 39, + "li" : 64, + "lt" : 63, + "lu" : 82, + "lv" : 71, + "ly" : 56, + "ma" : 60, + "mc" : 52, + "md" : 29, + "me" : 37, + "mk" : 29, + "mt" : 57, + "nl" : 77, + "no" : 20, + "pl" : 25, + "ps" : 42, + "pt" : 13, + "ro" : 31, + "rs" : 7, + "se" : 15, + "si" : 38, + "sj" : 53, + "sk" : 24, + "sm" : 40, + "sy" : 26, + "tn" : 9, + "tr" : 7, + "ua" : 40, + "uk" : 68, "us" : 0, - "va" : 0, + "va" : 29, "world" : 0, - "xk" : 0 + "xk" : 28 }, "transportation_values" : { - "ad" : 0, + "ad" : 9, "al" : 0, - "at" : 0, - "ax" : 0, - "ba" : 0, - "be" : 0, - "bg" : 0, - "ch" : 0, - "cy" : 0, - "cz" : 0, - "de" : 0, - "dk" : 0, - "dz" : 0, - "ee" : 0, - "eg" : 0, - "es" : 0, - "fi" : 0, - "fo" : 0, - "fr" : 0, - "gg" : 0, - "gi" : 0, - "gr" : 0, - "hr" : 0, - "hu" : 0, - "ie" : 0, - "il" : 0, - "im" : 0, - "is" : 0, - "it" : 0, - "je" : 0, - "lb" : 0, - "li" : 0, - "lt" : 0, - "lu" : 0, - "lv" : 0, - "ly" : 0, - "ma" : 0, - "mc" : 0, - "md" : 0, - "me" : 0, - "mk" : 0, - "mt" : 0, - "nl" : 0, - "no" : 0, - "pl" : 0, - "ps" : 0, - "pt" : 0, - "ro" : 0, - "rs" : 0, - "se" : 0, - "si" : 0, - "sj" : 0, - "sk" : 0, - "sm" : 0, - "sy" : 0, - "tn" : 0, - "tr" : 0, - "ua" : 0, - "uk" : 0, + "at" : 6, + "ax" : 10, + "ba" : 2, + "be" : 13, + "bg" : 3, + "ch" : 10, + "cy" : 6, + "cz" : 7, + "de" : 9, + "dk" : 6, + "dz" : 7, + "ee" : 11, + "eg" : 5, + "es" : 6, + "fi" : 10, + "fo" : 9, + "fr" : 15, + "gg" : 12, + "gi" : 1, + "gr" : 7, + "hr" : 5, + "hu" : 4, + "ie" : 7, + "il" : 5, + "im" : 8, + "is" : 8, + "it" : 7, + "je" : 11, + "lb" : 6, + "li" : 10, + "lt" : 9, + "lu" : 12, + "lv" : 11, + "ly" : 8, + "ma" : 9, + "mc" : 8, + "md" : 4, + "me" : 6, + "mk" : 4, + "mt" : 9, + "nl" : 12, + "no" : 3, + "pl" : 4, + "ps" : 6, + "pt" : 2, + "ro" : 5, + "rs" : 1, + "se" : 2, + "si" : 6, + "sj" : 8, + "sk" : 4, + "sm" : 6, + "sy" : 4, + "tn" : 1, + "tr" : 1, + "ua" : 6, + "uk" : 10, "us" : 0, - "va" : 0, + "va" : 4, "world" : 0, - "xk" : 0 + "xk" : 4 }, "values" : { - "ad" : -5, - "al" : -5, - "at" : -5, - "ax" : -5, - "ba" : -5, - "be" : -5, - "bg" : -5, - "ch" : -5, - "cy" : -5, - "cz" : -5, - "de" : -5, - "dk" : -5, - "dz" : -5, - "ee" : -5, - "eg" : -5, - "es" : -5, - "fi" : -5, - "fo" : -5, - "fr" : -5, - "gg" : -5, - "gi" : -5, - "gr" : -5, - "hr" : -5, - "hu" : -5, - "ie" : -5, - "il" : -5, - "im" : -5, - "is" : -5, - "it" : -5, - "je" : -5, - "lb" : -5, - "li" : -5, - "lt" : -5, - "lu" : -5, - "lv" : -5, - "ly" : -5, - "ma" : -5, - "mc" : -5, - "md" : -5, - "me" : -5, - "mk" : -5, - "mt" : -5, - "nl" : -5, - "no" : -5, - "pl" : -5, - "ps" : -5, - "pt" : -5, - "ro" : -5, - "rs" : -5, - "se" : -5, - "si" : -5, - "sj" : -5, - "sk" : -5, - "sm" : -5, - "sy" : -5, - "tn" : -5, - "tr" : -5, - "ua" : -5, - "uk" : -5, - "us" : -5, - "va" : -5, - "world" : -5, - "xk" : -5 - }, - "warning" : "origins_are_100_percent_unknown" + "ad" : 13, + "al" : 4, + "at" : 10, + "ax" : 14, + "ba" : 6, + "be" : 17, + "bg" : 7, + "ch" : 14, + "cy" : 10, + "cz" : 11, + "de" : 13, + "dk" : 10, + "dz" : 11, + "ee" : 15, + "eg" : 9, + "es" : 10, + "fi" : 14, + "fo" : 13, + "fr" : 19, + "gg" : 16, + "gi" : 5, + "gr" : 11, + "hr" : 9, + "hu" : 8, + "ie" : 11, + "il" : 9, + "im" : 12, + "is" : 12, + "it" : 11, + "je" : 15, + "lb" : 10, + "li" : 14, + "lt" : 13, + "lu" : 16, + "lv" : 15, + "ly" : 12, + "ma" : 13, + "mc" : 12, + "md" : 8, + "me" : 10, + "mk" : 8, + "mt" : 13, + "nl" : 16, + "no" : 7, + "pl" : 8, + "ps" : 10, + "pt" : 6, + "ro" : 9, + "rs" : 5, + "se" : 6, + "si" : 10, + "sj" : 12, + "sk" : 8, + "sm" : 10, + "sy" : 8, + "tn" : 5, + "tr" : 5, + "ua" : 10, + "uk" : 14, + "us" : 4, + "va" : 8, + "world" : 4, + "xk" : 8 + } }, "packaging" : { "non_recyclable_and_non_biodegradable_materials" : 1, @@ -238,7 +236,6 @@ "agb_category" : 1, "ingredients" : 1, "labels" : 1, - "origins" : 1, "packagings" : 1 }, "missing_agribalyse_match_warning" : 1, diff --git a/tests/unit/expected_test_results/nutriscore/94-percent-sugar-and-unknown-ingredient.json b/tests/unit/expected_test_results/nutriscore/94-percent-sugar-and-unknown-ingredient.json index 52dffac18eab3..0df4685979d29 100644 --- a/tests/unit/expected_test_results/nutriscore/94-percent-sugar-and-unknown-ingredient.json +++ b/tests/unit/expected_test_results/nutriscore/94-percent-sugar-and-unknown-ingredient.json @@ -28,7 +28,7 @@ "en:sweeteners", "en:sugars" ], - "food_groups" : "en:Sweets", + "food_groups" : "en:sweets", "food_groups_tags" : [ "en:sugary-snacks", "en:sweets" diff --git a/tests/unit/expected_test_results/nutriscore/breakfast-cereals.json b/tests/unit/expected_test_results/nutriscore/breakfast-cereals.json index 6317904ceffcf..e41fdf803774f 100644 --- a/tests/unit/expected_test_results/nutriscore/breakfast-cereals.json +++ b/tests/unit/expected_test_results/nutriscore/breakfast-cereals.json @@ -32,7 +32,7 @@ "en:cereals-and-their-products", "en:breakfast-cereals" ], - "food_groups" : "en:Breakfast cereals", + "food_groups" : "en:breakfast-cereals", "food_groups_tags" : [ "en:cereals-and-potatoes", "en:breakfast-cereals" diff --git a/tests/unit/expected_test_results/nutriscore/colza-oil.json b/tests/unit/expected_test_results/nutriscore/colza-oil.json index 9ae1a19e9d71c..414b0ced6d9b9 100644 --- a/tests/unit/expected_test_results/nutriscore/colza-oil.json +++ b/tests/unit/expected_test_results/nutriscore/colza-oil.json @@ -32,7 +32,7 @@ "en:vegetable-oils", "en:rapeseed-oils" ], - "food_groups" : "en:Fats", + "food_groups" : "en:fats", "food_groups_tags" : [ "en:fats-and-sauces", "en:fats" diff --git a/tests/unit/expected_test_results/nutriscore/cookies.json b/tests/unit/expected_test_results/nutriscore/cookies.json index fe0928f4c37a3..49828cf43a562 100644 --- a/tests/unit/expected_test_results/nutriscore/cookies.json +++ b/tests/unit/expected_test_results/nutriscore/cookies.json @@ -26,7 +26,7 @@ "en:biscuits-and-cakes", "en:biscuits" ], - "food_groups" : "en:Biscuits and cakes", + "food_groups" : "en:biscuits-and-cakes", "food_groups_tags" : [ "en:sugary-snacks", "en:biscuits-and-cakes" diff --git a/tests/unit/expected_test_results/nutriscore/dairy-drink-with-80-percent-milk.json b/tests/unit/expected_test_results/nutriscore/dairy-drink-with-80-percent-milk.json index 9de4dad348537..24b9f7242117d 100644 --- a/tests/unit/expected_test_results/nutriscore/dairy-drink-with-80-percent-milk.json +++ b/tests/unit/expected_test_results/nutriscore/dairy-drink-with-80-percent-milk.json @@ -28,7 +28,7 @@ "en:dairies", "en:dairy-drinks" ], - "food_groups" : "en:Milk and yogurt", + "food_groups" : "en:milk-and-yogurt", "food_groups_tags" : [ "en:milk-and-dairy-products", "en:milk-and-yogurt" diff --git a/tests/unit/expected_test_results/nutriscore/dairy-drink-with-less-than-80-percent-milk.json b/tests/unit/expected_test_results/nutriscore/dairy-drink-with-less-than-80-percent-milk.json index ef0988d921486..b2f2f972f336a 100644 --- a/tests/unit/expected_test_results/nutriscore/dairy-drink-with-less-than-80-percent-milk.json +++ b/tests/unit/expected_test_results/nutriscore/dairy-drink-with-less-than-80-percent-milk.json @@ -28,7 +28,7 @@ "en:dairies", "en:dairy-drinks" ], - "food_groups" : "en:Milk and yogurt", + "food_groups" : "en:milk-and-yogurt", "food_groups_tags" : [ "en:milk-and-dairy-products", "en:milk-and-yogurt" diff --git a/tests/unit/expected_test_results/nutriscore/dairy-drinks-without-milk.json b/tests/unit/expected_test_results/nutriscore/dairy-drinks-without-milk.json index 6583e6d338a0a..3b0640979a633 100644 --- a/tests/unit/expected_test_results/nutriscore/dairy-drinks-without-milk.json +++ b/tests/unit/expected_test_results/nutriscore/dairy-drinks-without-milk.json @@ -28,7 +28,7 @@ "en:dairies", "en:dairy-drinks" ], - "food_groups" : "en:Sweetened beverages", + "food_groups" : "en:sweetened-beverages", "food_groups_tags" : [ "en:beverages", "en:sweetened-beverages" diff --git a/tests/unit/expected_test_results/nutriscore/en-apple-estimated-nutrients.json b/tests/unit/expected_test_results/nutriscore/en-apple-estimated-nutrients.json index 4cfb9962265e4..162347cc2b40c 100644 --- a/tests/unit/expected_test_results/nutriscore/en-apple-estimated-nutrients.json +++ b/tests/unit/expected_test_results/nutriscore/en-apple-estimated-nutrients.json @@ -36,7 +36,7 @@ "en:fruits", "en:apples" ], - "food_groups" : "en:Fruits", + "food_groups" : "en:fruits", "food_groups_tags" : [ "en:fruits-and-vegetables", "en:fruits" diff --git a/tests/unit/expected_test_results/nutriscore/en-avocado-oil.json b/tests/unit/expected_test_results/nutriscore/en-avocado-oil.json index 732e89c681d22..f5b745fd5a181 100644 --- a/tests/unit/expected_test_results/nutriscore/en-avocado-oil.json +++ b/tests/unit/expected_test_results/nutriscore/en-avocado-oil.json @@ -40,7 +40,7 @@ "en:fruit-and-fruit-seed-oils", "en:avocado-oils" ], - "food_groups" : "en:Fats", + "food_groups" : "en:fats", "food_groups_tags" : [ "en:fats-and-sauces", "en:fats" diff --git a/tests/unit/expected_test_results/nutriscore/en-beers-category.json b/tests/unit/expected_test_results/nutriscore/en-beers-category.json index cb96441e0525e..5abcb432c1ac5 100644 --- a/tests/unit/expected_test_results/nutriscore/en-beers-category.json +++ b/tests/unit/expected_test_results/nutriscore/en-beers-category.json @@ -26,7 +26,7 @@ "en:alcoholic-beverages", "en:beers" ], - "food_groups" : "en:Alcoholic beverages", + "food_groups" : "en:alcoholic-beverages", "food_groups_tags" : [ "en:alcoholic-beverages" ], diff --git a/tests/unit/expected_test_results/nutriscore/en-beverage-preparation-flavored-syrup.json b/tests/unit/expected_test_results/nutriscore/en-beverage-preparation-flavored-syrup.json index a0b692eb2581f..de6c76a3883cd 100644 --- a/tests/unit/expected_test_results/nutriscore/en-beverage-preparation-flavored-syrup.json +++ b/tests/unit/expected_test_results/nutriscore/en-beverage-preparation-flavored-syrup.json @@ -38,7 +38,7 @@ "en:syrups", "en:flavoured-syrups" ], - "food_groups" : "en:Sweetened beverages", + "food_groups" : "en:sweetened-beverages", "food_groups_tags" : [ "en:beverages", "en:sweetened-beverages" diff --git a/tests/unit/expected_test_results/nutriscore/en-cherry-tomatoes.json b/tests/unit/expected_test_results/nutriscore/en-cherry-tomatoes.json index 2b8b3e5bea988..73c1236de161d 100644 --- a/tests/unit/expected_test_results/nutriscore/en-cherry-tomatoes.json +++ b/tests/unit/expected_test_results/nutriscore/en-cherry-tomatoes.json @@ -42,7 +42,7 @@ "en:tomatoes", "en:cherry-tomatoes" ], - "food_groups" : "en:Vegetables", + "food_groups" : "en:vegetables", "food_groups_tags" : [ "en:fruits-and-vegetables", "en:vegetables" diff --git a/tests/unit/expected_test_results/nutriscore/en-milk.json b/tests/unit/expected_test_results/nutriscore/en-milk.json index c52bbc9da54c2..fca0ef046ed7f 100644 --- a/tests/unit/expected_test_results/nutriscore/en-milk.json +++ b/tests/unit/expected_test_results/nutriscore/en-milk.json @@ -22,7 +22,7 @@ "en:dairies", "en:milks" ], - "food_groups" : "en:Milk and yogurt", + "food_groups" : "en:milk-and-yogurt", "food_groups_tags" : [ "en:milk-and-dairy-products", "en:milk-and-yogurt" diff --git a/tests/unit/expected_test_results/nutriscore/en-olive-oil-no-ingredients.json b/tests/unit/expected_test_results/nutriscore/en-olive-oil-no-ingredients.json index 03bd5652afb10..1943eba21b550 100644 --- a/tests/unit/expected_test_results/nutriscore/en-olive-oil-no-ingredients.json +++ b/tests/unit/expected_test_results/nutriscore/en-olive-oil-no-ingredients.json @@ -34,7 +34,7 @@ "en:vegetable-oils", "en:olive-oils" ], - "food_groups" : "en:Fats", + "food_groups" : "en:fats", "food_groups_tags" : [ "en:fats-and-sauces", "en:fats" diff --git a/tests/unit/expected_test_results/nutriscore/en-olive-oil-unrecognized-ingredients.json b/tests/unit/expected_test_results/nutriscore/en-olive-oil-unrecognized-ingredients.json index f285c266defad..82857465829ea 100644 --- a/tests/unit/expected_test_results/nutriscore/en-olive-oil-unrecognized-ingredients.json +++ b/tests/unit/expected_test_results/nutriscore/en-olive-oil-unrecognized-ingredients.json @@ -40,7 +40,7 @@ "en:vegetable-oils", "en:olive-oils" ], - "food_groups" : "en:Fats", + "food_groups" : "en:fats", "food_groups_tags" : [ "en:fats-and-sauces", "en:fats" diff --git a/tests/unit/expected_test_results/nutriscore/en-olive-oil.json b/tests/unit/expected_test_results/nutriscore/en-olive-oil.json index 6a4e5cfa5de48..084fca2c98855 100644 --- a/tests/unit/expected_test_results/nutriscore/en-olive-oil.json +++ b/tests/unit/expected_test_results/nutriscore/en-olive-oil.json @@ -40,7 +40,7 @@ "en:vegetable-oils", "en:olive-oils" ], - "food_groups" : "en:Fats", + "food_groups" : "en:fats", "food_groups_tags" : [ "en:fats-and-sauces", "en:fats" diff --git a/tests/unit/expected_test_results/nutriscore/en-orange-juice-category-and-ingredients.json b/tests/unit/expected_test_results/nutriscore/en-orange-juice-category-and-ingredients.json index afc6d3e2abbd1..309c433c60a62 100644 --- a/tests/unit/expected_test_results/nutriscore/en-orange-juice-category-and-ingredients.json +++ b/tests/unit/expected_test_results/nutriscore/en-orange-juice-category-and-ingredients.json @@ -42,7 +42,7 @@ "en:fruit-juices", "en:orange-juices" ], - "food_groups" : "en:Sweetened beverages", + "food_groups" : "en:sweetened-beverages", "food_groups_tags" : [ "en:beverages", "en:sweetened-beverages" diff --git a/tests/unit/expected_test_results/nutriscore/en-orange-juice-category.json b/tests/unit/expected_test_results/nutriscore/en-orange-juice-category.json index a740a8a88de1b..c085a7586ad79 100644 --- a/tests/unit/expected_test_results/nutriscore/en-orange-juice-category.json +++ b/tests/unit/expected_test_results/nutriscore/en-orange-juice-category.json @@ -36,7 +36,7 @@ "en:fruit-juices", "en:orange-juices" ], - "food_groups" : "en:Fruit juices", + "food_groups" : "en:fruit-juices", "food_groups_tags" : [ "en:beverages", "en:fruit-juices" diff --git a/tests/unit/expected_test_results/nutriscore/en-potatoes-category.json b/tests/unit/expected_test_results/nutriscore/en-potatoes-category.json index 65ae87acdf3f5..315dfcd9e88ac 100644 --- a/tests/unit/expected_test_results/nutriscore/en-potatoes-category.json +++ b/tests/unit/expected_test_results/nutriscore/en-potatoes-category.json @@ -32,7 +32,7 @@ "en:vegetables", "en:potatoes" ], - "food_groups" : "en:Potatoes", + "food_groups" : "en:potatoes", "food_groups_tags" : [ "en:cereals-and-potatoes", "en:potatoes" diff --git a/tests/unit/expected_test_results/nutriscore/en-red-meat-ambiguous-category-ingredients-with-lots-of-meat.json b/tests/unit/expected_test_results/nutriscore/en-red-meat-ambiguous-category-ingredients-with-lots-of-meat.json index 6c0860ea2040d..96396ef142c99 100644 --- a/tests/unit/expected_test_results/nutriscore/en-red-meat-ambiguous-category-ingredients-with-lots-of-meat.json +++ b/tests/unit/expected_test_results/nutriscore/en-red-meat-ambiguous-category-ingredients-with-lots-of-meat.json @@ -29,7 +29,7 @@ "en:prepared-meats", "en:sausages" ], - "food_groups" : "en:Processed meat", + "food_groups" : "en:processed-meat", "food_groups_tags" : [ "en:fish-meat-eggs", "en:processed-meat" diff --git a/tests/unit/expected_test_results/nutriscore/en-red-meat-ambiguous-category-ingredients-with-no-meat.json b/tests/unit/expected_test_results/nutriscore/en-red-meat-ambiguous-category-ingredients-with-no-meat.json index 2af6230a92ded..67c2a48a514a7 100644 --- a/tests/unit/expected_test_results/nutriscore/en-red-meat-ambiguous-category-ingredients-with-no-meat.json +++ b/tests/unit/expected_test_results/nutriscore/en-red-meat-ambiguous-category-ingredients-with-no-meat.json @@ -29,7 +29,7 @@ "en:prepared-meats", "en:sausages" ], - "food_groups" : "en:Processed meat", + "food_groups" : "en:processed-meat", "food_groups_tags" : [ "en:fish-meat-eggs", "en:processed-meat" diff --git a/tests/unit/expected_test_results/nutriscore/en-red-meat-ambiguous-category-ingredients-with-very-little-meat.json b/tests/unit/expected_test_results/nutriscore/en-red-meat-ambiguous-category-ingredients-with-very-little-meat.json index 03b423b66b917..96cd34187f685 100644 --- a/tests/unit/expected_test_results/nutriscore/en-red-meat-ambiguous-category-ingredients-with-very-little-meat.json +++ b/tests/unit/expected_test_results/nutriscore/en-red-meat-ambiguous-category-ingredients-with-very-little-meat.json @@ -29,7 +29,7 @@ "en:prepared-meats", "en:sausages" ], - "food_groups" : "en:Processed meat", + "food_groups" : "en:processed-meat", "food_groups_tags" : [ "en:fish-meat-eggs", "en:processed-meat" diff --git a/tests/unit/expected_test_results/nutriscore/en-red-meat-ambiguous-category-no-ingredients.json b/tests/unit/expected_test_results/nutriscore/en-red-meat-ambiguous-category-no-ingredients.json index af139670378db..461ed9043c0f7 100644 --- a/tests/unit/expected_test_results/nutriscore/en-red-meat-ambiguous-category-no-ingredients.json +++ b/tests/unit/expected_test_results/nutriscore/en-red-meat-ambiguous-category-no-ingredients.json @@ -23,7 +23,7 @@ "en:prepared-meats", "en:sausages" ], - "food_groups" : "en:Processed meat", + "food_groups" : "en:processed-meat", "food_groups_tags" : [ "en:fish-meat-eggs", "en:processed-meat" diff --git a/tests/unit/expected_test_results/nutriscore/en-red-meat-category-no-ingredients.json b/tests/unit/expected_test_results/nutriscore/en-red-meat-category-no-ingredients.json index bbfb8919e342b..c420f22607874 100644 --- a/tests/unit/expected_test_results/nutriscore/en-red-meat-category-no-ingredients.json +++ b/tests/unit/expected_test_results/nutriscore/en-red-meat-category-no-ingredients.json @@ -32,7 +32,7 @@ "en:steaks", "en:beef-steaks" ], - "food_groups" : "en:Meat other than poultry", + "food_groups" : "en:meat-other-than-poultry", "food_groups_tags" : [ "en:fish-meat-eggs", "en:meat", diff --git a/tests/unit/expected_test_results/nutriscore/en-soy-beans-processed-and-unprocessed.json b/tests/unit/expected_test_results/nutriscore/en-soy-beans-processed-and-unprocessed.json index 41ac85cd48a8f..1f0c18309689f 100644 --- a/tests/unit/expected_test_results/nutriscore/en-soy-beans-processed-and-unprocessed.json +++ b/tests/unit/expected_test_results/nutriscore/en-soy-beans-processed-and-unprocessed.json @@ -27,7 +27,7 @@ "en:meals", "en:soups" ], - "food_groups" : "en:One-dish meals", + "food_groups" : "en:one-dish-meals", "food_groups_tags" : [ "en:composite-foods", "en:one-dish-meals" diff --git a/tests/unit/expected_test_results/nutriscore/en-sugar-estimated-nutrients.json b/tests/unit/expected_test_results/nutriscore/en-sugar-estimated-nutrients.json index 5b4a344a1a8d4..a376e38326e51 100644 --- a/tests/unit/expected_test_results/nutriscore/en-sugar-estimated-nutrients.json +++ b/tests/unit/expected_test_results/nutriscore/en-sugar-estimated-nutrients.json @@ -28,7 +28,7 @@ "en:sweeteners", "en:sugars" ], - "food_groups" : "en:Sweets", + "food_groups" : "en:sweets", "food_groups_tags" : [ "en:sugary-snacks", "en:sweets" diff --git a/tests/unit/expected_test_results/nutriscore/en-sweeteners-erythritol.json b/tests/unit/expected_test_results/nutriscore/en-sweeteners-erythritol.json index d9083ef1a091f..73edf9166d287 100644 --- a/tests/unit/expected_test_results/nutriscore/en-sweeteners-erythritol.json +++ b/tests/unit/expected_test_results/nutriscore/en-sweeteners-erythritol.json @@ -38,7 +38,7 @@ "en:carbonated-drinks", "en:sodas" ], - "food_groups" : "en:Sweetened beverages", + "food_groups" : "en:sweetened-beverages", "food_groups_tags" : [ "en:beverages", "en:sweetened-beverages" diff --git a/tests/unit/expected_test_results/nutriscore/en-sweeteners.json b/tests/unit/expected_test_results/nutriscore/en-sweeteners.json index 631422757a948..ec088846e672e 100644 --- a/tests/unit/expected_test_results/nutriscore/en-sweeteners.json +++ b/tests/unit/expected_test_results/nutriscore/en-sweeteners.json @@ -38,7 +38,7 @@ "en:carbonated-drinks", "en:sodas" ], - "food_groups" : "en:Sweetened beverages", + "food_groups" : "en:sweetened-beverages", "food_groups_tags" : [ "en:beverages", "en:sweetened-beverages" diff --git a/tests/unit/expected_test_results/nutriscore/en-tofu.json b/tests/unit/expected_test_results/nutriscore/en-tofu.json index ae3ab8239f822..527c77ce4a2da 100644 --- a/tests/unit/expected_test_results/nutriscore/en-tofu.json +++ b/tests/unit/expected_test_results/nutriscore/en-tofu.json @@ -36,7 +36,7 @@ "en:meat-alternatives", "en:tofu" ], - "food_groups" : "en:Legumes", + "food_groups" : "en:legumes", "food_groups_tags" : [ "en:cereals-and-potatoes", "en:legumes" diff --git a/tests/unit/expected_test_results/nutriscore/en-vegetable-crisps.json b/tests/unit/expected_test_results/nutriscore/en-vegetable-crisps.json index fc257a6107bf1..fcd259333d8fe 100644 --- a/tests/unit/expected_test_results/nutriscore/en-vegetable-crisps.json +++ b/tests/unit/expected_test_results/nutriscore/en-vegetable-crisps.json @@ -32,7 +32,7 @@ "en:crisps", "en:parsnip-crisps" ], - "food_groups" : "en:Appetizers", + "food_groups" : "en:appetizers", "food_groups_tags" : [ "en:salty-snacks", "en:appetizers" diff --git a/tests/unit/expected_test_results/nutriscore/flavored-spring-water-no-nutrition.json b/tests/unit/expected_test_results/nutriscore/flavored-spring-water-no-nutrition.json index 48d7fbf9bb7d7..efb5a9dbc4580 100644 --- a/tests/unit/expected_test_results/nutriscore/flavored-spring-water-no-nutrition.json +++ b/tests/unit/expected_test_results/nutriscore/flavored-spring-water-no-nutrition.json @@ -30,7 +30,7 @@ "en:flavored-waters", "en:flavored-spring-waters" ], - "food_groups" : "en:Waters and flavored waters", + "food_groups" : "en:waters-and-flavored-waters", "food_groups_tags" : [ "en:beverages", "en:waters-and-flavored-waters" diff --git a/tests/unit/expected_test_results/nutriscore/flavored-spring-with-nutrition.json b/tests/unit/expected_test_results/nutriscore/flavored-spring-with-nutrition.json index fdd1372481ab8..17e4bd9fdbf26 100644 --- a/tests/unit/expected_test_results/nutriscore/flavored-spring-with-nutrition.json +++ b/tests/unit/expected_test_results/nutriscore/flavored-spring-with-nutrition.json @@ -30,7 +30,7 @@ "en:flavored-waters", "en:flavored-spring-waters" ], - "food_groups" : "en:Waters and flavored waters", + "food_groups" : "en:waters-and-flavored-waters", "food_groups_tags" : [ "en:beverages", "en:waters-and-flavored-waters" diff --git a/tests/unit/expected_test_results/nutriscore/fr-canned-green-beans.json b/tests/unit/expected_test_results/nutriscore/fr-canned-green-beans.json index a9ca559d0a390..0aa3db95c95fb 100644 --- a/tests/unit/expected_test_results/nutriscore/fr-canned-green-beans.json +++ b/tests/unit/expected_test_results/nutriscore/fr-canned-green-beans.json @@ -52,7 +52,7 @@ "en:canned-legumes", "en:canned-green-beans" ], - "food_groups" : "en:Vegetables", + "food_groups" : "en:vegetables", "food_groups_tags" : [ "en:fruits-and-vegetables", "en:vegetables" diff --git a/tests/unit/expected_test_results/nutriscore/fr-gaspacho.json b/tests/unit/expected_test_results/nutriscore/fr-gaspacho.json index 21fb35c044e7a..dc954697d2ba1 100644 --- a/tests/unit/expected_test_results/nutriscore/fr-gaspacho.json +++ b/tests/unit/expected_test_results/nutriscore/fr-gaspacho.json @@ -44,7 +44,7 @@ "en:cold-soups", "en:gazpacho" ], - "food_groups" : "en:Soups", + "food_groups" : "en:soups", "food_groups_tags" : [ "en:fruits-and-vegetables", "en:soups" diff --git a/tests/unit/expected_test_results/nutriscore/fr-green-beans-beverage.json b/tests/unit/expected_test_results/nutriscore/fr-green-beans-beverage.json index cf088edeed8f0..931b3227a94da 100644 --- a/tests/unit/expected_test_results/nutriscore/fr-green-beans-beverage.json +++ b/tests/unit/expected_test_results/nutriscore/fr-green-beans-beverage.json @@ -22,7 +22,7 @@ "categories_tags" : [ "en:meals" ], - "food_groups" : "en:One-dish meals", + "food_groups" : "en:one-dish-meals", "food_groups_tags" : [ "en:composite-foods", "en:one-dish-meals" diff --git a/tests/unit/expected_test_results/nutriscore/fr-ice-tea-with-sweetener.json b/tests/unit/expected_test_results/nutriscore/fr-ice-tea-with-sweetener.json index 3bbe904ad13a4..dd241f98dfada 100644 --- a/tests/unit/expected_test_results/nutriscore/fr-ice-tea-with-sweetener.json +++ b/tests/unit/expected_test_results/nutriscore/fr-ice-tea-with-sweetener.json @@ -53,7 +53,7 @@ "en:tea-based-beverages", "en:iced-teas" ], - "food_groups" : "en:Sweetened beverages", + "food_groups" : "en:sweetened-beverages", "food_groups_tags" : [ "en:beverages", "en:sweetened-beverages" diff --git a/tests/unit/expected_test_results/nutriscore/fr-mixed-oils-with-olive-oil.json b/tests/unit/expected_test_results/nutriscore/fr-mixed-oils-with-olive-oil.json index 7b796e313207c..0dcf1a928b0b2 100644 --- a/tests/unit/expected_test_results/nutriscore/fr-mixed-oils-with-olive-oil.json +++ b/tests/unit/expected_test_results/nutriscore/fr-mixed-oils-with-olive-oil.json @@ -33,7 +33,7 @@ "en:vegetable-fats", "en:vegetable-oils" ], - "food_groups" : "en:Fats", + "food_groups" : "en:fats", "food_groups_tags" : [ "en:fats-and-sauces", "en:fats" diff --git a/tests/unit/expected_test_results/nutriscore/fr-orange-nectar-0-fat.json b/tests/unit/expected_test_results/nutriscore/fr-orange-nectar-0-fat.json index cdc7d65285bdb..62035938335a5 100644 --- a/tests/unit/expected_test_results/nutriscore/fr-orange-nectar-0-fat.json +++ b/tests/unit/expected_test_results/nutriscore/fr-orange-nectar-0-fat.json @@ -38,7 +38,7 @@ "en:juices-and-nectars", "en:fruit-nectars" ], - "food_groups" : "en:Sweetened beverages", + "food_groups" : "en:sweetened-beverages", "food_groups_tags" : [ "en:beverages", "en:sweetened-beverages" diff --git a/tests/unit/expected_test_results/nutriscore/fr-plant-beverages-soy-milk.json b/tests/unit/expected_test_results/nutriscore/fr-plant-beverages-soy-milk.json index 78bb58ca64f62..0f3a7140b77a8 100644 --- a/tests/unit/expected_test_results/nutriscore/fr-plant-beverages-soy-milk.json +++ b/tests/unit/expected_test_results/nutriscore/fr-plant-beverages-soy-milk.json @@ -48,7 +48,7 @@ "en:legume-based-drinks", "en:soy-based-drinks" ], - "food_groups" : "en:Plant-based milk substitutes", + "food_groups" : "en:plant-based-milk-substitutes", "food_groups_tags" : [ "en:beverages", "en:plant-based-milk-substitutes" diff --git a/tests/unit/expected_test_results/nutriscore/fr-rapeseed-oil.json b/tests/unit/expected_test_results/nutriscore/fr-rapeseed-oil.json index d67b791794953..0cb1c30647d97 100644 --- a/tests/unit/expected_test_results/nutriscore/fr-rapeseed-oil.json +++ b/tests/unit/expected_test_results/nutriscore/fr-rapeseed-oil.json @@ -38,7 +38,7 @@ "en:vegetable-oils", "en:rapeseed-oils" ], - "food_groups" : "en:Fats", + "food_groups" : "en:fats", "food_groups_tags" : [ "en:fats-and-sauces", "en:fats" diff --git a/tests/unit/expected_test_results/nutriscore/milk.json b/tests/unit/expected_test_results/nutriscore/milk.json index f9ef918f4e070..b0acdc1b346b5 100644 --- a/tests/unit/expected_test_results/nutriscore/milk.json +++ b/tests/unit/expected_test_results/nutriscore/milk.json @@ -28,7 +28,7 @@ "en:dairies", "en:milks" ], - "food_groups" : "en:Milk and yogurt", + "food_groups" : "en:milk-and-yogurt", "food_groups_tags" : [ "en:milk-and-dairy-products", "en:milk-and-yogurt" diff --git a/tests/unit/expected_test_results/nutriscore/mushrooms.json b/tests/unit/expected_test_results/nutriscore/mushrooms.json index f815bd89bc02c..9eb745b3b5b05 100644 --- a/tests/unit/expected_test_results/nutriscore/mushrooms.json +++ b/tests/unit/expected_test_results/nutriscore/mushrooms.json @@ -22,7 +22,7 @@ "categories_tags" : [ "en:meals" ], - "food_groups" : "en:One-dish meals", + "food_groups" : "en:one-dish-meals", "food_groups_tags" : [ "en:composite-foods", "en:one-dish-meals" diff --git a/tests/unit/expected_test_results/nutriscore/olive-oil.json b/tests/unit/expected_test_results/nutriscore/olive-oil.json index 7d5b88e06a224..49add1281252f 100644 --- a/tests/unit/expected_test_results/nutriscore/olive-oil.json +++ b/tests/unit/expected_test_results/nutriscore/olive-oil.json @@ -34,7 +34,7 @@ "en:vegetable-oils", "en:olive-oils" ], - "food_groups" : "en:Fats", + "food_groups" : "en:fats", "food_groups_tags" : [ "en:fats-and-sauces", "en:fats" diff --git a/tests/unit/expected_test_results/nutriscore/spring-water-no-nutrition.json b/tests/unit/expected_test_results/nutriscore/spring-water-no-nutrition.json index 87aff8f5856d0..13ebd3aaf7055 100644 --- a/tests/unit/expected_test_results/nutriscore/spring-water-no-nutrition.json +++ b/tests/unit/expected_test_results/nutriscore/spring-water-no-nutrition.json @@ -28,7 +28,7 @@ "en:waters", "en:spring-waters" ], - "food_groups" : "en:Waters and flavored waters", + "food_groups" : "en:waters-and-flavored-waters", "food_groups_tags" : [ "en:beverages", "en:waters-and-flavored-waters" diff --git a/tests/unit/expected_test_results/nutriscore/sunflower-oil-no-sugar-no-sat-fat.json b/tests/unit/expected_test_results/nutriscore/sunflower-oil-no-sugar-no-sat-fat.json index bbc9813436286..38d90bb4f681c 100644 --- a/tests/unit/expected_test_results/nutriscore/sunflower-oil-no-sugar-no-sat-fat.json +++ b/tests/unit/expected_test_results/nutriscore/sunflower-oil-no-sugar-no-sat-fat.json @@ -34,7 +34,7 @@ "en:sunflower-seeds-and-their-products", "en:sunflower-oils" ], - "food_groups" : "en:Fats", + "food_groups" : "en:fats", "food_groups_tags" : [ "en:fats-and-sauces", "en:fats" diff --git a/tests/unit/expected_test_results/nutriscore/sunflower-oil-no-sugar.json b/tests/unit/expected_test_results/nutriscore/sunflower-oil-no-sugar.json index 122b2ad9f61c1..7d40b81b4ac2a 100644 --- a/tests/unit/expected_test_results/nutriscore/sunflower-oil-no-sugar.json +++ b/tests/unit/expected_test_results/nutriscore/sunflower-oil-no-sugar.json @@ -34,7 +34,7 @@ "en:sunflower-seeds-and-their-products", "en:sunflower-oils" ], - "food_groups" : "en:Fats", + "food_groups" : "en:fats", "food_groups_tags" : [ "en:fats-and-sauces", "en:fats" diff --git a/tests/unit/expected_test_results/nutriscore/sunflower-oil.json b/tests/unit/expected_test_results/nutriscore/sunflower-oil.json index e7b80f3579a3f..409fcea25e850 100644 --- a/tests/unit/expected_test_results/nutriscore/sunflower-oil.json +++ b/tests/unit/expected_test_results/nutriscore/sunflower-oil.json @@ -34,7 +34,7 @@ "en:sunflower-seeds-and-their-products", "en:sunflower-oils" ], - "food_groups" : "en:Fats", + "food_groups" : "en:fats", "food_groups_tags" : [ "en:fats-and-sauces", "en:fats" diff --git a/tests/unit/expected_test_results/nutriscore/walnut-oil.json b/tests/unit/expected_test_results/nutriscore/walnut-oil.json index 8cf74a858e814..2e2f0ca3f836e 100644 --- a/tests/unit/expected_test_results/nutriscore/walnut-oil.json +++ b/tests/unit/expected_test_results/nutriscore/walnut-oil.json @@ -36,7 +36,7 @@ "en:nut-oils", "en:walnut-oils" ], - "food_groups" : "en:Fats", + "food_groups" : "en:fats", "food_groups_tags" : [ "en:fats-and-sauces", "en:fats" From 5dcfcdf7a26ce47cf0582739747f5a8988d5189e Mon Sep 17 00:00:00 2001 From: himanshisrestha <135853264+himanshisrestha@users.noreply.github.com> Date: Fri, 5 Apr 2024 01:37:01 +0530 Subject: [PATCH 3/8] lint added --- lib/ProductOpener/Ingredients.pm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/lib/ProductOpener/Ingredients.pm b/lib/ProductOpener/Ingredients.pm index 5e50fa29437e9..3edff8f534cda 100644 --- a/lib/ProductOpener/Ingredients.pm +++ b/lib/ProductOpener/Ingredients.pm @@ -202,7 +202,8 @@ my %may_contain_regexps = ( "Dit product kan sporen van|bevat mogelijk sporen van|Kan sporen bevatten van|Kan sporen van|bevat mogelijk|sporen van|Geproduceerd in ruimtes waar", nb => "kan inneholde spor av|kan forekomme spor av|kan inneholde spor|kan forekomme spor|kan inneholde|kan forekomme", - pl => "może zawierać śladowe ilości|produkt może zawierać|może zawierać|możliwa obecność|może zawierać alergeny|możliwa obecność|w produkcie możliwa obecność|wyprodukowano w zakładzie przetwarzającym", + pl => + "może zawierać śladowe ilości|produkt może zawierać|może zawierać|możliwa obecność|może zawierać alergeny|możliwa obecność|w produkcie możliwa obecność|wyprodukowano w zakładzie przetwarzającym", pt => "pode conter vestígios de|pode conter", ro => "poate con[țţt]ine urme de|poate con[țţt]ine|poate con[țţt]in|produsul poate conţine urme de", rs => "može sadržati tragove", From 6f4e50293a530c35e40399c654815ddf1e5ddad1 Mon Sep 17 00:00:00 2001 From: himanshisrestha <135853264+himanshisrestha@users.noreply.github.com> Date: Fri, 5 Apr 2024 11:03:26 +0530 Subject: [PATCH 4/8] expected results updated for ingredients processing unit test --- tests/unit/ingredients_processing.t | 326 ++++++++++++++++++++++++++++ 1 file changed, 326 insertions(+) diff --git a/tests/unit/ingredients_processing.t b/tests/unit/ingredients_processing.t index c170660a1bcc3..77be7f521f43c 100755 --- a/tests/unit/ingredients_processing.t +++ b/tests/unit/ingredients_processing.t @@ -36,30 +36,36 @@ my @tests = ( [ { 'id' => 'en:raw-milk', + 'is_in_taxonomy' => 1, 'text' => 'raw milk' }, { 'id' => 'en:tomato', + 'is_in_taxonomy' => 1, 'processing' => 'en:sliced', 'text' => 'tomatoes' }, { 'id' => 'en:garlic', + 'is_in_taxonomy' => 1, 'processing' => 'en:powder', 'text' => 'garlic' }, { 'id' => 'en:aubergine', + 'is_in_taxonomy' => 1, 'processing' => 'en:powder', 'text' => 'eggplant' }, { 'id' => 'en:courgette', + 'is_in_taxonomy' => 1, 'processing' => 'en:powder', 'text' => 'courgette' }, { 'id' => 'en:ham', + 'is_in_taxonomy' => 1, 'processing' => 'en:sieved', 'text' => 'ham' } @@ -72,6 +78,7 @@ my @tests = ( [ { 'id' => 'en:milk', + 'is_in_taxonomy' => 1, 'processing' => 'en:dried', 'text' => 'milk' } @@ -84,11 +91,13 @@ my @tests = ( [ { 'id' => 'en:milk', + 'is_in_taxonomy' => 1, 'processing' => 'en:smoked', 'text' => 'milk' }, { 'id' => 'en:tomato', + 'is_in_taxonomy' => 1, 'processing' => 'en:not-smoked', 'text' => 'tomatoes' } @@ -104,16 +113,19 @@ my @tests = ( [ { 'id' => 'en:milk', + 'is_in_taxonomy' => 1, 'processing' => 'en:sweetened', 'text' => 'milk' }, { 'id' => 'en:tomato', + 'is_in_taxonomy' => 1, 'processing' => 'en:unsweetened', 'text' => 'tomatoes' }, { 'id' => 'en:ham', + 'is_in_taxonomy' => 1, 'processing' => 'en:sugared', 'text' => 'ham' } @@ -126,11 +138,13 @@ my @tests = ( [ { 'id' => 'en:milk', + 'is_in_taxonomy' => 1, 'processing' => 'en:halved', 'text' => 'milk' }, { 'id' => 'en:tomato', + 'is_in_taxonomy' => 1, 'processing' => 'en:halved', 'text' => 'tomatoes' } @@ -147,26 +161,31 @@ my @tests = ( [ { 'id' => 'en:egg-white', + 'is_in_taxonomy' => 1, 'processing' => 'en:partially-rehydrated', 'text' => 'egg white' }, { 'id' => 'en:e551', + 'is_in_taxonomy' => 1, 'processing' => 'en:hydrated', 'text' => 'silica' }, { 'id' => 'en:sugarcane-juice', + 'is_in_taxonomy' => 1, 'processing' => 'en:dehydrated', 'text' => 'cane juice' }, { 'id' => 'en:chia-seed', + 'is_in_taxonomy' => 1, 'processing' => 'en:hydrated', 'text' => 'chia seeds' }, { 'id' => 'en:tomato', + 'is_in_taxonomy' => 1, 'processing' => 'en:rehydrated', 'text' => 'tomatoes' } @@ -178,11 +197,13 @@ my @tests = ( [ { 'id' => 'en:sea-salt', + 'is_in_taxonomy' => 1, 'processing' => 'en:smoked', 'text' => 'sea salt' }, { 'id' => 'en:turkey', + 'is_in_taxonomy' => 1, 'processing' => 'en:smoked', 'text' => 'turkey' } @@ -195,6 +216,7 @@ my @tests = ( [ { 'id' => 'en:garlic', + 'is_in_taxonomy' => 1, 'processing' => 'en:powder', 'text' => 'garlic' } @@ -206,6 +228,7 @@ my @tests = ( [ { 'id' => 'en:egg', + 'is_in_taxonomy' => 1, 'processing' => 'en:pasteurised', 'text' => 'eggs' } @@ -217,6 +240,7 @@ my @tests = ( [ { 'id' => 'en:whey', + 'is_in_taxonomy' => 1, 'processing' => 'en:dried', 'text' => 'whey' } @@ -236,21 +260,25 @@ my @tests = ( [ { 'id' => 'en:tomato', + 'is_in_taxonomy' => 1, 'processing' => 'en:sweetened', 'text' => 'tomate' }, { 'id' => 'en:aubergine', + 'is_in_taxonomy' => 1, 'processing' => 'en:sweetened', 'text' => 'berenjena' }, { 'id' => 'en:courgette', + 'is_in_taxonomy' => 1, 'processing' => 'en:sweetened', 'text' => 'calabacín' }, { 'id' => 'en:ham', + 'is_in_taxonomy' => 1, 'processing' => 'en:sweetened', 'text' => 'jamón' } @@ -262,6 +290,7 @@ my @tests = ( [ { 'id' => 'en:yellow-bell-pepper', + 'is_in_taxonomy' => 1, 'processing' => 'en:dehydrated', 'text' => 'pimientos amarillos' } @@ -273,11 +302,13 @@ my @tests = ( [ { 'id' => 'en:tofu', + 'is_in_taxonomy' => 1, 'processing' => 'en:smoked', 'text' => 'tofu' }, { 'id' => 'en:bacon', + 'is_in_taxonomy' => 1, 'processing' => 'en:smoked', 'text' => 'panceta' } @@ -289,6 +320,7 @@ my @tests = ( [ { 'id' => 'en:yellow-bell-pepper', + 'is_in_taxonomy' => 1, 'processing' => 'en:dehydrated', 'text' => 'pimientos amarillos' } @@ -310,27 +342,32 @@ my @tests = ( [ { 'id' => 'en:ham', + 'is_in_taxonomy' => 1, 'processing' => 'en:diced,en:fried', 'text' => 'jambon' }, { 'id' => 'en:tomato', + 'is_in_taxonomy' => 1, 'processing' => 'en:diced,en:raw', 'text' => 'tomates' }, { 'id' => 'en:tomato', + 'is_in_taxonomy' => 1, 'labels' => 'en:organic', 'processing' => 'en:pre-cooked', 'text' => 'tomates' }, { 'id' => 'en:hazelnut', + 'is_in_taxonomy' => 1, 'processing' => 'en:powder', 'text' => 'noisettes' }, { 'id' => 'en:banana', + 'is_in_taxonomy' => 1, 'processing' => 'en:sieved', 'text' => 'banane' } @@ -342,6 +379,7 @@ my @tests = ( [ { 'id' => 'en:banana', + 'is_in_taxonomy' => 1, 'processing' => 'en:cooked,en:cut', 'text' => 'banane' } @@ -353,6 +391,7 @@ my @tests = ( [ { 'id' => 'en:banana', + 'is_in_taxonomy' => 1, 'processing' => 'en:cooked,en:cut', 'text' => 'banane' } @@ -368,15 +407,18 @@ my @tests = ( [ { 'id' => 'en:pasteurized-creme-fraiche', + 'is_in_taxonomy' => 1, 'text' => "cr\x{e8}me fra\x{ee}che pasteuris\x{e9}e" }, { 'id' => 'en:banana', + 'is_in_taxonomy' => 1, 'processing' => 'en:fresh', 'text' => 'bananes' }, { 'id' => 'en:soft-white-cheese', + 'is_in_taxonomy' => 1, 'text' => 'fromage frais' }, { @@ -384,26 +426,32 @@ my @tests = ( 'ingredients' => [ { 'id' => 'en:milk', + 'is_in_taxonomy' => 1, 'text' => 'dont lait' } ], + 'is_in_taxonomy' => 1, 'text' => "cr\x{e8}me" }, { 'id' => "fr:fraiche", + 'is_in_taxonomy' => 0, 'text' => "fra\x{ee}che" }, { 'id' => 'en:pineapple', + 'is_in_taxonomy' => 1, 'processing' => 'en:fresh', 'text' => 'ananas' }, { 'id' => 'en:cooked-fresh-pasta', + 'is_in_taxonomy' => 1, 'text' => "p\x{e2}tes fra\x{ee}ches cuites" }, { 'id' => 'en:blonde-cane-sugar', + 'is_in_taxonomy' => 1, 'processing' => 'en:raw', 'text' => 'SUCRE BLOND DE CANNE' } @@ -420,21 +468,25 @@ my @tests = ( [ { 'id' => 'en:tomato', + 'is_in_taxonomy' => 1, 'processing' => 'en:partially-rehydrated,en:dried', 'text' => 'tomates' }, { 'id' => 'en:skimmed-milk', + 'is_in_taxonomy' => 1, 'processing' => 'en:partially-dehydrated', 'text' => "lait \x{e9}cr\x{e9}m\x{e9}" }, { 'id' => 'en:chia-seed', + 'is_in_taxonomy' => 1, 'processing' => 'en:hydrated', 'text' => 'graines de chia' }, { 'id' => 'en:white-beans', + 'is_in_taxonomy' => 1, 'processing' => 'en:partially-hydrated', 'text' => 'haricots blancs' } @@ -449,20 +501,24 @@ my @tests = ( [ { 'id' => 'en:sea-salt', + 'is_in_taxonomy' => 1, 'processing' => 'en:smoked', 'text' => 'sel marin' }, { 'id' => 'en:ham', + 'is_in_taxonomy' => 1, 'processing' => 'en:smoked', 'text' => 'jambon' }, { 'id' => 'en:smoke-flavouring', + 'is_in_taxonomy' => 1, 'text' => "ar\x{f4}me de fum\x{e9}e" }, { 'id' => 'en:lardon', + 'is_in_taxonomy' => 1, 'processing' => 'en:beech-smoked', 'text' => 'lardons' } @@ -474,6 +530,7 @@ my @tests = ( [ { 'id' => 'en:chili-pepper', + 'is_in_taxonomy' => 1, 'processing' => 'en:powder', 'text' => 'piment' } @@ -499,6 +556,7 @@ my @tests = ( [ { 'id' => 'en:banana', + 'is_in_taxonomy' => 1, 'processing' => 'en:dried', 'text' => 'banaani' } @@ -512,15 +570,18 @@ my @tests = ( [ { 'id' => 'en:raw-milk', + 'is_in_taxonomy' => 1, 'text' => 'raakamaito' }, { 'id' => 'en:blueberry', + 'is_in_taxonomy' => 1, 'processing' => 'en:powder', 'text' => 'mustikka' }, { 'id' => 'en:vanilla-pod', + 'is_in_taxonomy' => 1, 'processing' => 'en:ground', 'text' => 'vaniljatanko' } @@ -541,6 +602,7 @@ my @tests = ( [ { 'id' => 'en:onion', + 'is_in_taxonomy' => 1, 'processing' => 'en:powder', 'text' => 'ui' } @@ -555,29 +617,35 @@ my @tests = ( [ { 'id' => 'en:shallot', + 'is_in_taxonomy' => 1, 'processing' => 'en:powder', 'text' => 'sjalot' }, { 'id' => 'en:whey-powder', + 'is_in_taxonomy' => 1, 'text' => 'wei-poeder' }, { 'id' => 'en:vanilla-powder', + 'is_in_taxonomy' => 1, 'text' => 'vanillepoeder' }, { 'id' => 'en:shallot', + 'is_in_taxonomy' => 1, 'processing' => 'en:ground', 'text' => 'sjalot' }, { 'id' => 'en:shallot', + 'is_in_taxonomy' => 1, 'processing' => 'en:grated', 'text' => 'sjalot' }, { 'id' => 'en:marigold', + 'is_in_taxonomy' => 1, 'processing' => 'en:peeled', 'text' => 'goudsbloem' } @@ -599,15 +667,18 @@ my @tests = ( [ { 'id' => 'en:bourbon-vanilla-powder', + 'is_in_taxonomy' => 1, 'text' => 'bourbon-vanillepulver' }, { 'id' => 'en:sauerkraut', + 'is_in_taxonomy' => 1, 'processing' => 'en:powder', 'text' => 'Sauerkraut' }, { 'id' => 'en:acerola', + 'is_in_taxonomy' => 1, 'processing' => 'en:powder', 'text' => 'acerola' } @@ -623,11 +694,13 @@ my @tests = ( [ { 'id' => 'en:buttermilk', + 'is_in_taxonomy' => 1, 'processing' => 'en:chopped', 'text' => 'Buttermilch' }, { 'id' => 'en:soured-milk', + 'is_in_taxonomy' => 1, 'processing' => 'en:chopped', 'text' => 'Dickmilch' } @@ -640,6 +713,7 @@ my @tests = ( [ { 'id' => 'en:passionfruit', + 'is_in_taxonomy' => 1, 'processing' => 'en:sliced', 'text' => 'passionsfrucht' } @@ -652,6 +726,7 @@ my @tests = ( [ { 'id' => 'en:shallot', + 'is_in_taxonomy' => 1, 'processing' => 'en:pureed', 'text' => 'Schalotte' } @@ -664,6 +739,7 @@ my @tests = ( [ { 'id' => 'en:shallot', + 'is_in_taxonomy' => 1, 'processing' => 'en:pureed', 'text' => 'Schalotte' } @@ -680,36 +756,43 @@ my @tests = ( [ { 'id' => 'en:shallot', + 'is_in_taxonomy' => 1, 'processing' => 'de:gegart', 'text' => 'Schalotte' }, { 'id' => 'en:hazelnut', + 'is_in_taxonomy' => 1, 'processing' => 'de:gegart', 'text' => "haselnüsse" }, { 'id' => 'en:almond', + 'is_in_taxonomy' => 1, 'processing' => 'de:gegart', 'text' => 'mandeln' }, { 'id' => 'en:passionfruit', + 'is_in_taxonomy' => 1, 'processing' => 'de:gegart', 'text' => 'passionsfrucht' }, { 'id' => 'en:celery', + 'is_in_taxonomy' => 1, 'processing' => 'de:dampfgegart', 'text' => 'sellerie' }, { 'id' => 'en:acerola', + 'is_in_taxonomy' => 1, 'processing' => 'de:dampfgegart', 'text' => 'acerola' }, { 'id' => 'en:spinach', + 'is_in_taxonomy' => 1, 'processing' => 'de:dampfgegart', 'text' => 'spinat' } @@ -725,11 +808,13 @@ my @tests = ( [ { 'id' => 'en:shallot', + 'is_in_taxonomy' => 1, 'processing' => "en:oiled", 'text' => 'Schalotte' }, { 'id' => 'en:hazelnut', + 'is_in_taxonomy' => 1, 'processing' => "en:oiled", 'text' => "haselnüsse" } @@ -746,16 +831,19 @@ my @tests = ( [ { 'id' => 'en:shallot', + 'is_in_taxonomy' => 1, 'processing' => 'en:brined', 'text' => 'Schalotte' }, { 'id' => 'en:hazelnut', + 'is_in_taxonomy' => 1, 'processing' => 'en:brined', 'text' => "haselnüsse" }, { 'id' => 'en:passionfruit', + 'is_in_taxonomy' => 1, 'processing' => 'de:ungepökelt', 'text' => 'passionsfrucht' } @@ -772,26 +860,31 @@ my @tests = ( [ { 'id' => 'en:shallot', + 'is_in_taxonomy' => 1, 'processing' => 'en:puffed', 'text' => 'Schalotte' }, { 'id' => 'en:hazelnut', + 'is_in_taxonomy' => 1, 'processing' => 'en:puffed', 'text' => "haselnüsse" }, { 'id' => 'en:passionfruit', + 'is_in_taxonomy' => 1, 'processing' => 'en:puffed', 'text' => 'passionsfrucht' }, { 'id' => 'en:passionfruit', + 'is_in_taxonomy' => 1, 'processing' => 'en:puffed', 'text' => 'passionsfrucht' }, { 'id' => 'en:celery', + 'is_in_taxonomy' => 1, 'processing' => 'en:puffed', 'text' => 'sellerie' } @@ -808,26 +901,31 @@ my @tests = ( [ { 'id' => 'en:shallot', + 'is_in_taxonomy' => 1, 'processing' => 'de:geschält', 'text' => 'Schalotte' }, { 'id' => 'en:hazelnut', + 'is_in_taxonomy' => 1, 'processing' => 'de:geschält', 'text' => "haselnüsse" }, { 'id' => 'en:almond', + 'is_in_taxonomy' => 1, 'processing' => "de:geschält", 'text' => 'mandeln' }, { 'id' => 'en:passionfruit', + 'is_in_taxonomy' => 1, 'processing' => 'de:ungeschält', 'text' => 'passionsfrucht' }, { 'id' => 'en:celery', + 'is_in_taxonomy' => 1, 'processing' => 'de:ungeschält', 'text' => 'sellerie' } @@ -844,21 +942,25 @@ my @tests = ( [ { 'id' => 'en:shallot', + 'is_in_taxonomy' => 1, 'processing' => 'de:geschwefelt', 'text' => 'Schalotte' }, { 'id' => 'en:hazelnut', + 'is_in_taxonomy' => 1, 'processing' => 'de:geschwefelt', 'text' => "haselnüsse" }, { 'id' => 'en:passionfruit', + 'is_in_taxonomy' => 1, 'processing' => 'de:ungeschwefelt', 'text' => 'passionsfrucht' }, { 'id' => 'en:celery', + 'is_in_taxonomy' => 1, 'processing' => 'de:geschwefelt', 'text' => 'sellerie' } @@ -874,11 +976,13 @@ my @tests = ( [ { 'id' => 'en:shallot', + 'is_in_taxonomy' => 1, 'processing' => 'en:sweetened', 'text' => 'Schalotte' }, { 'id' => 'en:hazelnut', + 'is_in_taxonomy' => 1, 'processing' => 'en:sweetened', 'text' => "haselnüsse" } @@ -895,21 +999,25 @@ my @tests = ( [ { 'id' => 'en:shallot', + 'is_in_taxonomy' => 1, 'processing' => 'en:sugared', 'text' => 'Schalotte' }, { 'id' => 'en:hazelnut', + 'is_in_taxonomy' => 1, 'processing' => 'en:sugared', 'text' => "haselnüsse" }, { 'id' => 'en:almond', + 'is_in_taxonomy' => 1, 'processing' => "de:leicht-gezuckert", 'text' => 'mandeln' }, { 'id' => 'en:passionfruit', + 'is_in_taxonomy' => 1, 'processing' => 'de:ungezuckert', 'text' => 'passionsfrucht' } @@ -925,16 +1033,19 @@ my @tests = ( [ { 'id' => 'en:shallot', + 'is_in_taxonomy' => 1, 'processing' => 'en:halved', 'text' => 'Schalotte' }, { 'id' => 'en:hazelnut', + 'is_in_taxonomy' => 1, 'processing' => 'en:halved', 'text' => "haselnüsse" }, { 'id' => 'en:almond', + 'is_in_taxonomy' => 1, 'processing' => 'en:halved', 'text' => 'mandeln' } @@ -953,54 +1064,66 @@ my @tests = ( [ { 'id' => 'en:shallot', + 'is_in_taxonomy' => 1, 'processing' => 'en:concentrated', 'text' => 'schalotte' }, { 'id' => 'en:hazelnut', + 'is_in_taxonomy' => 1, 'processing' => 'en:concentrated', 'text' => "haselnüsse" }, { 'id' => 'en:almond', + 'is_in_taxonomy' => 1, 'processing' => 'en:concentrated', 'text' => 'mandeln' }, { 'id' => 'en:acerola', + 'is_in_taxonomy' => 1, 'processing' => 'en:concentrated', 'text' => 'acerolakirschen' }, { 'id' => 'de:zweifach-konzentriert', + 'is_in_taxonomy' => 0, 'text' => 'zweifach konzentriert' }, { 'id' => 'de:2-fach-konzentriert', + 'is_in_taxonomy' => 0, 'text' => '2 fach konzentriert' }, { 'id' => 'de:doppelt-konzentriertes', + 'is_in_taxonomy' => 0, 'text' => 'doppelt konzentriertes' }, { 'id' => 'de:zweifach-konzentriertes', + 'is_in_taxonomy' => 0, 'text' => 'zweifach konzentriertes' }, { 'id' => 'de:2-fach-konzentriert', + 'is_in_taxonomy' => 0, 'text' => '2-fach konzentriert' }, { 'id' => 'de:dreifach-konzentriert', + 'is_in_taxonomy' => 0, 'text' => 'dreifach konzentriert' }, { 'id' => 'de:200fach-konzentriertes', + 'is_in_taxonomy' => 0, 'text' => '200fach konzentriertes' }, { 'id' => 'de:eingekochter', + 'is_in_taxonomy' => 0, 'text' => 'eingekochter' } ] @@ -1021,51 +1144,61 @@ my @tests = ( [ { 'id' => 'en:shallot', + 'is_in_taxonomy' => 1, 'processing' => 'de:zerkleinert', 'text' => 'Schalotte' }, { 'id' => 'en:hazelnut', + 'is_in_taxonomy' => 1, 'processing' => 'de:zerkleinert', 'text' => "haselnüsse" }, { 'id' => 'en:almond', + 'is_in_taxonomy' => 1, 'processing' => 'de:zerkleinert', 'text' => 'mandeln' }, { 'id' => 'en:passionfruit', + 'is_in_taxonomy' => 1, 'processing' => 'de:zerkleinert', 'text' => 'passionsfrucht' }, { 'id' => 'en:celery', + 'is_in_taxonomy' => 1, 'processing' => 'de:grob-zerkleinert', 'text' => 'sellerie' }, { 'id' => 'en:acerola', + 'is_in_taxonomy' => 1, 'processing' => 'de:fein-zerkleinert', 'text' => 'acerolakirschen' }, { 'id' => 'en:spinach', + 'is_in_taxonomy' => 1, 'processing' => 'de:fein-zerkleinert', 'text' => 'spinat' }, { 'id' => 'en:onion', + 'is_in_taxonomy' => 1, 'processing' => 'de:zum-teil-fein-zerkleinert', 'text' => 'zwiebel' }, { 'id' => 'en:hazelnut', + 'is_in_taxonomy' => 1, 'processing' => 'de:feinst-zerkleinert', 'text' => "haselnüsse" }, { 'id' => 'en:fig', + 'is_in_taxonomy' => 1, 'processing' => "de:\x{fc}berwiegend-feinst-zerkleinert", 'text' => 'Feigen' } @@ -1083,16 +1216,19 @@ my @tests = ( # change on 17:01 { 'id' => 'en:hazelnut', + 'is_in_taxonomy' => 1, 'processing' => 'en:toasted,en:chopped', 'text' => "haselnüsse" }, { 'id' => 'en:hazelnut', + 'is_in_taxonomy' => 1, 'processing' => 'en:chopped,en:toasted', 'text' => "haselnuss" }, { 'id' => 'en:almond', + 'is_in_taxonomy' => 1, 'processing' => 'en:sliced,en:chopped', 'text' => 'mandeln' } @@ -1109,31 +1245,37 @@ my @tests = ( [ { 'id' => 'en:shallot', + 'is_in_taxonomy' => 1, 'processing' => 'en:ground', 'text' => 'Schalotte' }, { 'id' => 'en:almond', + 'is_in_taxonomy' => 1, 'processing' => 'en:ground', 'text' => 'mandeln' }, { 'id' => 'en:onion', + 'is_in_taxonomy' => 1, 'processing' => 'en:ground', 'text' => 'zwiebel' }, { 'id' => 'en:hazelnut', + 'is_in_taxonomy' => 1, 'processing' => 'de:fein-gemahlen', 'text' => "haselnüsse" }, { 'id' => 'en:spinach', + 'is_in_taxonomy' => 1, 'processing' => 'en:coarsely-ground', 'text' => 'spinat' }, { 'id' => 'en:celery', + 'is_in_taxonomy' => 1, 'processing' => 'de:frischgemahlen', 'text' => 'sellerie' } @@ -1153,86 +1295,103 @@ my @tests = ( [ { 'id' => 'en:shallot', + 'is_in_taxonomy' => 1, 'processing' => 'en:dried', 'text' => 'Schalotte' }, { 'id' => 'en:almond', + 'is_in_taxonomy' => 1, 'processing' => 'en:dried', 'text' => 'mandeln' }, { 'id' => 'en:onion', + 'is_in_taxonomy' => 1, 'processing' => 'en:dried', 'text' => 'zwiebel' }, { 'id' => 'en:hazelnut', + 'is_in_taxonomy' => 1, 'processing' => 'en:dried', 'text' => "haselnüsse" }, { 'id' => 'en:spinach', + 'is_in_taxonomy' => 1, 'processing' => 'en:semi-dried', 'text' => 'spinat' }, { 'id' => 'en:celery', + 'is_in_taxonomy' => 1, 'processing' => 'en:semi-dried', 'text' => 'sellerie' }, { 'id' => 'en:fig', + 'is_in_taxonomy' => 1, 'processing' => 'en:semi-dried', 'text' => 'Feigen' }, { 'id' => 'en:elder', + 'is_in_taxonomy' => 1, 'processing' => 'en:freeze-dried', 'text' => 'Holunder' }, { 'id' => 'en:papaya', + 'is_in_taxonomy' => 1, 'processing' => 'en:freeze-dried', 'text' => 'Papaya' }, { 'id' => 'en:kiwi', + 'is_in_taxonomy' => 1, 'processing' => 'en:freeze-dried', 'text' => 'Kiwi' }, { 'id' => 'en:pineapple', + 'is_in_taxonomy' => 1, 'processing' => 'en:sundried', 'text' => 'Ananas' }, { 'id' => 'en:plum', + 'is_in_taxonomy' => 1, 'processing' => 'en:sundried', 'text' => 'Pflaumen' }, { 'id' => 'en:grapefruit', + 'is_in_taxonomy' => 1, 'processing' => 'en:sundried', 'text' => 'Grapefruit' }, { 'id' => 'en:guava', + 'is_in_taxonomy' => 1, 'processing' => 'en:air-dried', 'text' => 'Guaven' }, { 'id' => 'en:rose-hip', + 'is_in_taxonomy' => 1, 'processing' => 'en:air-dried', 'text' => 'Hagebutten' }, { 'id' => 'en:grape', + 'is_in_taxonomy' => 1, 'processing' => "en:spray-dried", 'text' => 'Traube' }, { 'id' => 'en:tamarind', + 'is_in_taxonomy' => 1, 'processing' => "en:spray-dried", 'text' => 'Tamarinde' } @@ -1245,6 +1404,7 @@ my @tests = ( [ { 'id' => 'en:shallot', + 'is_in_taxonomy' => 1, 'processing' => 'en:sieved', 'text' => 'Schalotte' } @@ -1261,31 +1421,37 @@ my @tests = ( [ { 'id' => "en:hard-cheese", + 'is_in_taxonomy' => 1, 'processing' => 'en:salted', 'text' => "hartk\x{e4}se" }, { 'id' => 'en:hazelnut', + 'is_in_taxonomy' => 1, 'processing' => 'en:salted', 'text' => "haselnüsse" }, { 'id' => 'en:hazelnut', + 'is_in_taxonomy' => 1, 'processing' => 'en:salted', 'text' => "haselnüsse" }, { 'id' => 'en:hazelnut', + 'is_in_taxonomy' => 1, 'processing' => 'en:salted', 'text' => 'haselnuss' }, { 'id' => 'en:shallot', + 'is_in_taxonomy' => 1, 'processing' => 'en:unsalted', 'text' => 'schalotte' }, { 'id' => 'en:almond', + 'is_in_taxonomy' => 1, 'processing' => 'en:unsalted', 'text' => 'mandeln' } @@ -1298,6 +1464,7 @@ my @tests = ( [ { 'id' => 'en:shallot', + 'is_in_taxonomy' => 1, 'processing' => 'en:pitted', 'text' => 'Schalotte' } @@ -1310,6 +1477,7 @@ my @tests = ( [ { 'id' => 'en:shallot', + 'is_in_taxonomy' => 1, 'processing' => 'en:pickled', 'text' => 'Schalotte' } @@ -1322,10 +1490,12 @@ my @tests = ( [ { 'id' => 'en:garden-peas', + 'is_in_taxonomy' => 1, 'text' => 'Markerbsen' }, { 'id' => 'de:deutsche-markenbutter', + 'is_in_taxonomy' => 1, 'text' => 'Deutsche Markenbutter' } ] @@ -1337,6 +1507,7 @@ my @tests = ( [ { 'id' => 'en:hazelnut', + 'is_in_taxonomy' => 1, 'processing' => 'en:toasted,en:chopped', 'text' => "haselnüsse" } @@ -1364,21 +1535,25 @@ my @tests = ( [ { 'id' => "en:hard-cheese", + 'is_in_taxonomy' => 1, 'processing' => 'en:sliced', 'text' => "hartkäse" }, { 'id' => 'en:hazelnut', + 'is_in_taxonomy' => 1, 'processing' => 'en:chopped', 'text' => "haselnüsse" }, { 'id' => 'en:almond', + 'is_in_taxonomy' => 1, 'processing' => 'en:sliced,en:chopped', 'text' => 'mandeln' }, { 'id' => 'en:soured-milk', + 'is_in_taxonomy' => 1, 'processing' => 'en:sliced', 'text' => 'Dickmilch' } @@ -1394,16 +1569,19 @@ my @tests = ( [ { 'id' => 'en:shallot', + 'is_in_taxonomy' => 1, 'processing' => 'en:rehydrated', 'text' => 'Schalotte' }, { 'id' => 'en:onion', + 'is_in_taxonomy' => 1, 'processing' => 'en:rehydrated', 'text' => 'zwiebel' }, { 'id' => 'en:spinach', + 'is_in_taxonomy' => 1, 'processing' => 'en:rehydrated', 'text' => 'spinat' } @@ -1420,21 +1598,25 @@ my @tests = ( [ { 'id' => 'en:shallot', + 'is_in_taxonomy' => 1, 'processing' => 'en:marinated', 'text' => 'Schalotte' }, { 'id' => 'en:onion', + 'is_in_taxonomy' => 1, 'processing' => 'en:marinated', 'text' => 'zwiebel' }, { 'id' => 'en:spinach', + 'is_in_taxonomy' => 1, 'processing' => 'en:marinated', 'text' => 'spinat' }, { 'id' => 'en:celery', + 'is_in_taxonomy' => 1, 'processing' => 'en:marinated', 'text' => 'sellerie' } @@ -1451,31 +1633,37 @@ my @tests = ( [ { 'id' => 'en:shallot', + 'is_in_taxonomy' => 1, 'processing' => 'en:cut', 'text' => 'Schalotte' }, { 'id' => 'en:onion', + 'is_in_taxonomy' => 1, 'processing' => 'de:mittelfein-geschnittenen', 'text' => 'zwiebel' }, { 'id' => 'en:spinach', + 'is_in_taxonomy' => 1, 'processing' => 'de:feingeschnitten', 'text' => 'spinat' }, { 'id' => 'en:celery', + 'is_in_taxonomy' => 1, 'processing' => 'de:feingeschnitten', 'text' => 'sellerie' }, { 'id' => 'en:almond', + 'is_in_taxonomy' => 1, 'processing' => 'de:feingeschnitten', 'text' => 'Mandeln' }, { 'id' => 'en:hazelnut', + 'is_in_taxonomy' => 1, 'processing' => 'de:handgeschnitten', 'text' => "haselnüsse" } @@ -1490,21 +1678,25 @@ my @tests = ( [ { 'id' => 'en:shallot', + 'is_in_taxonomy' => 1, 'processing' => 'en:pureed', 'text' => 'Schalotte' }, { 'id' => 'en:onion', + 'is_in_taxonomy' => 1, 'processing' => 'en:pureed', 'text' => 'zwiebel' }, { 'id' => 'en:spinach', + 'is_in_taxonomy' => 1, 'processing' => 'en:pureed', 'text' => 'spinat' }, { 'id' => 'en:celery', + 'is_in_taxonomy' => 1, 'processing' => 'en:pulp', 'text' => 'sellerie' } @@ -1520,16 +1712,19 @@ my @tests = ( [ { 'id' => 'en:shallot', + 'is_in_taxonomy' => 1, 'processing' => 'en:grated', 'text' => 'Schalotte' }, { 'id' => 'en:onion', + 'is_in_taxonomy' => 1, 'processing' => 'en:grated', 'text' => 'zwiebel' }, { 'id' => 'en:spinach', + 'is_in_taxonomy' => 1, 'processing' => 'en:grated', 'text' => 'spinat' } @@ -1546,26 +1741,31 @@ my @tests = ( [ { 'id' => 'en:shallot', + 'is_in_taxonomy' => 1, 'processing' => 'en:diced', 'text' => 'Schalotte' }, { 'id' => 'en:spinach', + 'is_in_taxonomy' => 1, 'processing' => 'en:diced', 'text' => 'spinat' }, { 'id' => 'en:celery', + 'is_in_taxonomy' => 1, 'processing' => 'en:diced', 'text' => 'sellerie' }, { 'id' => 'en:onion', + 'is_in_taxonomy' => 1, 'processing' => 'en:diced', 'text' => 'zwiebel' }, { 'id' => 'en:almond', + 'is_in_taxonomy' => 1, 'processing' => 'en:diced', 'text' => 'mandeln' } @@ -1584,6 +1784,7 @@ my @tests = ( [ { 'id' => 'en:black-pepper', + 'is_in_taxonomy' => 1, 'processing' => 'en:ground', 'text' => 'papar crni' } @@ -1599,25 +1800,30 @@ my @tests = ( [ { 'id' => 'en:sauce', + 'is_in_taxonomy' => 1, 'processing' => 'en:dehydrated', 'text' => 'umak' }, { 'id' => 'en:sunflower-oil', + 'is_in_taxonomy' => 1, 'processing' => 'en:powder', 'text' => 'suncokretovo ulje' }, { 'id' => 'en:bacon', + 'is_in_taxonomy' => 1, 'processing' => 'en:smoked', 'text' => 'slanina' }, { 'id' => 'en:antioxidant', + 'is_in_taxonomy' => 1, 'text' => 'antioksidans', 'ingredients' => [ { 'id' => "en:rosemary", + 'is_in_taxonomy' => 1, 'processing' => "en:extract", 'text' => "ru\x{17e}marina" } @@ -1631,6 +1837,7 @@ my @tests = ( [ { 'id' => 'en:milk-with-1-0-milk-fat', + 'is_in_taxonomy' => 1, 'processing' => 'en:pasteurised', 'text' => 'mlijeko s 1.0% mliječne masti' } @@ -1651,6 +1858,7 @@ my @tests = ( [ { 'id' => 'en:pineapple', + 'is_in_taxonomy' => 1, 'processing' => 'en:freeze-dried', 'text' => 'ananasy' } @@ -1673,21 +1881,25 @@ my @tests = ( [ { 'id' => 'en:tomato-concentrate', + 'is_in_taxonomy' => 1, 'text' => 'koncentrat pomidorowy', 'ingredients' => [], }, { 'id' => 'en:tomato', + 'is_in_taxonomy' => 1, 'text' => 'pomidory', 'ingredients' => [], }, { 'id' => 'en:tomato', + 'is_in_taxonomy' => 1, 'text' => 'pomidory', 'ingredients' => [], }, { 'id' => 'en:tomato', + 'is_in_taxonomy' => 1, 'text' => 'pomidory', 'ingredients' => [], }, @@ -1703,10 +1915,12 @@ my @tests = ( [ { 'id' => 'en:dried-garlic', + 'is_in_taxonomy' => 1, 'text' => 'czosnek suszony' }, { 'id' => 'en:dried-garlic', + 'is_in_taxonomy' => 1, 'text' => 'suszony czosnek' } ] @@ -1721,21 +1935,25 @@ my @tests = ( [ { 'id' => 'en:dill', + 'is_in_taxonomy' => 1, 'processing' => 'en:dried', 'text' => 'koperek' }, { 'id' => 'en:tomato', + 'is_in_taxonomy' => 1, 'processing' => 'en:dried', 'text' => 'pomidory' }, { 'id' => 'en:mushroom', + 'is_in_taxonomy' => 1, 'processing' => 'en:dried', 'text' => 'grzyby' }, { 'id' => 'en:dill', + 'is_in_taxonomy' => 1, 'processing' => 'en:dried', 'text' => 'koper' }, @@ -1768,66 +1986,80 @@ my @tests = ( [ { 'id' => 'en:flaked-almonds', + 'is_in_taxonomy' => 1, 'text' => "\x{30b9}\x{30e9}\x{30a4}\x{30b9}\x{30a2}\x{30fc}\x{30e2}\x{30f3}\x{30c9}" }, { 'id' => 'en:yeast-extract-powder', + 'is_in_taxonomy' => 1, 'text' => "\x{9175}\x{6bcd}\x{30a8}\x{30ad}\x{30b9}\x{30d1}\x{30a6}\x{30c0}\x{30fc}" }, { 'id' => 'en:creaming-powder', + 'is_in_taxonomy' => 1, 'text' => "\x{30af}\x{30ea}\x{30fc}\x{30df}\x{30f3}\x{30b0}\x{30d1}\x{30a6}\x{30c0}\x{30fc}" }, { 'id' => 'en:kombu', + 'is_in_taxonomy' => 1, 'processing' => 'en:powder', 'text' => "\x{6606}\x{5e03}" }, { 'id' => 'en:soy-sauce', + 'is_in_taxonomy' => 1, 'processing' => 'en:powder', 'text' => "\x{91a4}\x{6cb9}" }, { 'id' => "ja:\x{7c89}\x{672b}\x{9152}", + 'is_in_taxonomy' => 0, 'text' => "\x{7c89}\x{672b}\x{9152}" }, { 'id' => 'en:katsuobushi', + 'is_in_taxonomy' => 1, 'processing' => 'en:powder', 'text' => "\x{304b}\x{3064}\x{304a}\x{7bc0}" }, { 'id' => "en:maca", + 'is_in_taxonomy' => 1, 'processing' => 'en:powder', 'text' => "\x{30de}\x{30ab}" }, { 'id' => 'en:soy-sauce', + 'is_in_taxonomy' => 1, 'processing' => 'en:powder', 'text' => "\x{3057}\x{3087}\x{3046}\x{3086}" }, { 'id' => "ja:\x{767a}\x{9175}\x{9ed2}\x{306b}\x{3093}\x{306b}\x{304f}\x{672b}", + 'is_in_taxonomy' => 0, 'text' => "\x{767a}\x{9175}\x{9ed2}\x{306b}\x{3093}\x{306b}\x{304f}\x{672b}" }, { 'id' => 'en:butter', + 'is_in_taxonomy' => 1, 'processing' => 'en:powder,en:roasted', 'text' => "\x{30d0}\x{30bf}\x{30fc}" }, { 'id' => 'en:malt', + 'is_in_taxonomy' => 1, 'processing' => 'en:roasted', 'text' => "\x{9ea6}\x{82bd}" }, { 'id' => 'en:garlic', + 'is_in_taxonomy' => 1, 'processing' => 'en:powder,en:fried', 'text' => "\x{30ac}\x{30fc}\x{30ea}\x{30c3}\x{30af}" }, { 'id' => 'en:apple-pulp', + 'is_in_taxonomy' => 1, 'text' => "\x{308a}\x{3093}\x{3054}\x{30d1}\x{30eb}\x{30d7}" } ] @@ -1846,100 +2078,120 @@ my @tests = ( [ { 'id' => 'en:rice', + 'is_in_taxonomy' => 1, 'processing' => 'en:fried', 'text' => 'ris' }, { 'id' => 'en:rice', + 'is_in_taxonomy' => 1, 'processing' => 'en:powder', 'text' => 'ris' }, { 'id' => 'en:rice', + 'is_in_taxonomy' => 1, 'processing' => 'en:cooked', 'text' => 'ris' }, { 'id' => 'en:potato', + 'is_in_taxonomy' => 1, 'processing' => 'en:cooked', 'text' => 'kartofler' }, { 'id' => 'en:potato', + 'is_in_taxonomy' => 1, 'processing' => 'en:cooked', 'text' => 'kartofler' }, { 'id' => 'en:potato', + 'is_in_taxonomy' => 1, 'text' => 'kartofler' }, { 'id' => 'en:potato', + 'is_in_taxonomy' => 1, 'processing' => 'en:dried', 'text' => 'kartofler' }, { 'id' => 'en:potato', + 'is_in_taxonomy' => 1, 'processing' => 'en:cut', 'text' => 'kartofler' }, { 'id' => 'en:potato', + 'is_in_taxonomy' => 1, 'processing' => 'en:powder', 'text' => 'kartofler' }, { 'id' => 'en:potato', + 'is_in_taxonomy' => 1, 'processing' => 'en:pureed', 'text' => 'kartoffel' }, { 'id' => 'en:potato', + 'is_in_taxonomy' => 1, 'processing' => 'en:frozen', 'text' => 'kartofler' }, { 'id' => 'en:potato', + 'is_in_taxonomy' => 1, 'processing' => 'en:ground', 'text' => 'kartofler' }, { 'id' => 'en:milk', + 'is_in_taxonomy' => 1, 'processing' => 'en:solids', 'text' => "m\x{e6}lke" }, { 'id' => 'en:potato', + 'is_in_taxonomy' => 1, 'processing' => 'en:extract', 'text' => 'kartoffel' }, { 'id' => 'en:potato', + 'is_in_taxonomy' => 1, 'processing' => 'en:roasted', 'text' => 'kartoffel' }, { 'id' => 'en:potato', + 'is_in_taxonomy' => 1, 'processing' => 'en:unfrozen,en:roasted', 'text' => 'kartofler' }, { 'id' => 'en:pineapple', + 'is_in_taxonomy' => 1, 'processing' => 'en:roasted', 'text' => 'ananas' }, { 'id' => 'en:banana', + 'is_in_taxonomy' => 1, 'processing' => 'en:roasted', 'text' => 'bananer' }, { 'id' => 'en:chives', + 'is_in_taxonomy' => 1, 'processing' => 'en:dehydrated', 'text' => "purl\x{f8}g" }, { 'id' => 'en:banana', + 'is_in_taxonomy' => 1, 'processing' => 'en:rehydrated', 'text' => 'bananer' } @@ -1957,93 +2209,113 @@ my @tests = ( [ { 'id' => 'en:rice', + 'is_in_taxonomy' => 1, 'processing' => 'en:cooked', 'text' => 'riisi' }, { 'id' => 'en:rice', + 'is_in_taxonomy' => 1, 'processing' => 'en:powder', 'text' => 'riisi' }, { 'id' => 'en:cooked-rice', + 'is_in_taxonomy' => 1, 'text' => 'keitetty riisi' }, { 'id' => 'en:potato', + 'is_in_taxonomy' => 1, 'processing' => 'en:cooked', 'text' => 'perunat' }, { 'id' => 'en:potato', + 'is_in_taxonomy' => 1, 'processing' => 'en:cooked', 'text' => 'peruna' }, { 'id' => 'en:potato', + 'is_in_taxonomy' => 1, 'text' => 'perunat' }, { 'id' => 'en:potato', + 'is_in_taxonomy' => 1, 'processing' => 'en:dried', 'text' => 'perunat' }, { 'id' => 'en:potato', + 'is_in_taxonomy' => 1, 'processing' => 'en:cut', 'text' => 'perunat' }, { 'id' => 'en:potato', + 'is_in_taxonomy' => 1, 'processing' => 'en:powder', 'text' => 'peruna' }, { 'id' => 'en:mashed-potato', + 'is_in_taxonomy' => 1, 'text' => 'perunasose' }, { 'id' => 'fi:pakasteperunat', + 'is_in_taxonomy' => 0, 'text' => 'pakasteperunat' }, { 'id' => 'en:potato', + 'is_in_taxonomy' => 1, 'processing' => 'en:ground', 'text' => 'perunat' }, { 'id' => 'fi:maidon-kuiva-aineet', + 'is_in_taxonomy' => 0, 'text' => 'maidon kuiva-aineet' }, { 'id' => 'en:potato', + 'is_in_taxonomy' => 1, 'processing' => 'en:extract', 'text' => 'peruna' }, { 'id' => 'fi:uuniperuna', + 'is_in_taxonomy' => 0, 'text' => 'uuniperuna' }, { 'id' => 'fi:pakastetut-uuniperunat', + 'is_in_taxonomy' => 0, 'text' => 'pakastetut uuniperunat' }, { 'id' => 'en:pineapple', + 'is_in_taxonomy' => 1, 'processing' => 'en:toasted', 'text' => 'ananas' }, { 'id' => 'fi:paahdetut-banaanit', + 'is_in_taxonomy' => 0, 'text' => 'paahdetut banaanit' }, { 'id' => 'en:chives', + 'is_in_taxonomy' => 1, 'processing' => 'en:dried', 'text' => 'ruohosipuli' }, { 'id' => 'en:banana', + 'is_in_taxonomy' => 1, 'processing' => 'en:rehydrated', 'text' => 'banaani' } @@ -2061,93 +2333,113 @@ my @tests = ( [ { 'id' => 'en:rice', + 'is_in_taxonomy' => 1, 'processing' => 'en:cooked', 'text' => 'ris' }, { 'id' => 'en:rice', + 'is_in_taxonomy' => 1, 'processing' => 'en:powder', 'text' => 'ris' }, { 'id' => 'en:rice', + 'is_in_taxonomy' => 1, 'processing' => 'en:cooked', 'text' => 'ris' }, { 'id' => 'en:potato', + 'is_in_taxonomy' => 1, 'processing' => 'en:cooked', 'text' => 'poteter' }, { 'id' => 'en:potato', + 'is_in_taxonomy' => 1, 'processing' => 'en:cooked', 'text' => 'potet' }, { 'id' => 'en:potato', + 'is_in_taxonomy' => 1, 'text' => 'poteter' }, { 'id' => 'en:potato', + 'is_in_taxonomy' => 1, 'processing' => 'en:dried', 'text' => 'poteter' }, { 'id' => 'nb:kuttede-poteter', + 'is_in_taxonomy' => 0, 'text' => 'kuttede poteter' }, { 'id' => 'en:potato', + 'is_in_taxonomy' => 1, 'processing' => 'en:powder', 'text' => 'potet' }, { 'id' => 'en:potato', + 'is_in_taxonomy' => 1, 'processing' => 'en:pureed', 'text' => 'potet' }, { 'id' => 'en:potato', + 'is_in_taxonomy' => 1, 'processing' => 'en:frozen', 'text' => 'poteter' }, { 'id' => 'nb:malte-poteter', + 'is_in_taxonomy' => 0, 'text' => 'malte poteter' }, { 'id' => 'nb:melkefaststoffer', + 'is_in_taxonomy' => 0, 'text' => 'melkefaststoffer' }, { 'id' => 'en:potato', + 'is_in_taxonomy' => 1, 'processing' => 'en:extract', 'text' => 'potet' }, { 'id' => 'nb:bakt-potet', + 'is_in_taxonomy' => 0, 'text' => 'bakt potet' }, { 'id' => 'nb:ufrosne-bakte-poteter', + 'is_in_taxonomy' => 0, 'text' => 'ufrosne bakte poteter' }, { 'id' => 'nb:stekt-ananas', + 'is_in_taxonomy' => 0, 'text' => 'stekt ananas' }, { 'id' => 'en:banana', + 'is_in_taxonomy' => 1, 'processing' => 'en:toasted', 'text' => 'bananer' }, { 'id' => "nb:dehydrert-gressl\x{f8}k", + 'is_in_taxonomy' => 0, 'text' => "dehydrert gressl\x{f8}k" }, { 'id' => 'en:banana', + 'is_in_taxonomy' => 1, 'processing' => 'en:rehydrated', 'text' => 'bananer' } @@ -2165,95 +2457,115 @@ my @tests = ( [ { 'id' => 'en:rice', + 'is_in_taxonomy' => 1, 'processing' => 'en:fried', 'text' => 'ris' }, { 'id' => 'en:rice', + 'is_in_taxonomy' => 1, 'processing' => 'en:powder', 'text' => 'ris' }, { 'id' => 'en:cooked-rice', + 'is_in_taxonomy' => 1, 'text' => 'kokt ris' }, { 'id' => 'en:cooked-potato', + 'is_in_taxonomy' => 1, 'text' => 'kokt potatis' }, { 'id' => 'en:cooked-potato', + 'is_in_taxonomy' => 1, 'text' => 'kokt potatis' }, { 'id' => 'en:potato', + 'is_in_taxonomy' => 1, 'text' => 'potatis' }, { 'id' => 'en:potato', + 'is_in_taxonomy' => 1, 'processing' => 'en:dried', 'text' => 'potatis' }, { 'id' => 'en:potato', + 'is_in_taxonomy' => 1, 'processing' => 'en:cut', 'text' => 'potatis' }, { 'id' => 'en:potato', + 'is_in_taxonomy' => 1, 'processing' => 'en:powder', 'text' => 'potatis' }, { 'id' => 'en:potato', + 'is_in_taxonomy' => 1, 'processing' => 'en:pureed', 'text' => 'potatis' }, { 'id' => 'en:potato', + 'is_in_taxonomy' => 1, 'processing' => 'en:frozen', 'text' => 'potatis' }, { 'id' => 'en:potato', + 'is_in_taxonomy' => 1, 'processing' => 'en:ground', 'text' => 'potatis' }, { 'id' => "sv:mj\x{f6}lkfasta-\x{e4}mnen", + 'is_in_taxonomy' => 0, 'text' => "mj\x{f6}lkfasta \x{e4}mnen" }, { 'id' => 'en:potato', + 'is_in_taxonomy' => 1, 'processing' => 'en:extract', 'text' => 'potatis' }, { 'id' => 'en:potato', + 'is_in_taxonomy' => 1, 'processing' => 'en:roasted', 'text' => 'potatis' }, { 'id' => 'en:potato', + 'is_in_taxonomy' => 1, 'processing' => 'en:unfrozen,en:roasted', 'text' => 'potatis' }, { 'id' => 'en:pineapple', + 'is_in_taxonomy' => 1, 'processing' => 'en:roasted', 'text' => 'ananas' }, { 'id' => 'sv:rostade-bananer', + 'is_in_taxonomy' => 0, 'text' => 'rostade bananer' }, { 'id' => 'en:chives', + 'is_in_taxonomy' => 1, 'processing' => 'en:dried', 'text' => "gr\x{e4}sl\x{f6}k" }, { 'id' => 'sv:rehydrerade-bananer', + 'is_in_taxonomy' => 0, 'text' => 'rehydrerade bananer' } ] @@ -2270,20 +2582,24 @@ my @tests = ( [ { 'id' => 'en:onion', + 'is_in_taxonomy' => 1, 'text' => "\x{628}\x{635}\x{644}" }, { 'id' => 'en:onion', + 'is_in_taxonomy' => 1, 'processing' => 'en:powder', 'text' => "\x{628}\x{635}\x{644}" }, { 'id' => 'en:onion', + 'is_in_taxonomy' => 1, 'processing' => 'en:cooked', 'text' => "\x{628}\x{635}\x{644}" }, { 'id' => 'en:onion', + 'is_in_taxonomy' => 1, 'processing' => 'en:frozen', 'text' => "\x{628}\x{635}\x{644}" } @@ -2301,21 +2617,25 @@ my @tests = ( [ { 'id' => 'en:onion', + 'is_in_taxonomy' => 1, 'processing' => 'en:roasted', 'text' => "\x{43b}\x{443}\x{43a}" }, { 'id' => 'en:potato', + 'is_in_taxonomy' => 1, 'processing' => 'en:frozen', 'text' => "\x{43a}\x{430}\x{440}\x{442}\x{43e}\x{444}\x{438}" }, { 'id' => 'en:strawberry', + 'is_in_taxonomy' => 1, 'processing' => 'en:powder', 'text' => "\x{44f}\x{433}\x{43e}\x{434}\x{438}" }, { 'id' => 'en:garlic', + 'is_in_taxonomy' => 1, 'processing' => 'en:pureed', 'text' => "\x{447}\x{435}\x{441}\x{44a}\x{43d}" } @@ -2332,22 +2652,26 @@ my @tests = ( [ { 'id' => 'en:onion', + 'is_in_taxonomy' => 1, 'processing' => 'en:roasted', 'text' => "\x{3ba}\x{3c1}\x{3b5}\x{3bc}\x{3bc}\x{3cd}\x{3b4}\x{3b9}" }, { 'id' => 'en:potato', + 'is_in_taxonomy' => 1, 'processing' => 'en:frozen', 'text' => "\x{3c0}\x{3b1}\x{3c4}\x{3ac}\x{3c4}\x{3b1}" }, { 'id' => 'en:onion', + 'is_in_taxonomy' => 1, 'processing' => 'en:powder', 'text' => "\x{3ba}\x{3c1}\x{3b5}\x{3bc}\x{3bc}\x{3cd}\x{3b4}\x{3b9}" }, { 'id' => "el:\x{3c0}\x{3bf}\x{3c5}\x{3c1}\x{3ad}-\x{3ba}\x{3c1}\x{3b5}\x{3bc}\x{3bc}\x{3c5}\x{3b4}\x{3b9}\x{3bf}\x{3cd}", + 'is_in_taxonomy' => 0, 'text' => "\x{3c0}\x{3bf}\x{3c5}\x{3c1}\x{3ad} \x{3ba}\x{3c1}\x{3b5}\x{3bc}\x{3bc}\x{3c5}\x{3b4}\x{3b9}\x{3bf}\x{3cd}" } @@ -2362,6 +2686,7 @@ my @tests = ( [ { 'id' => 'en:vegetable-broth', + 'is_in_taxonomy' => 1, 'processing' => 'en:dehydrated', 'text' => 'caldo de vegetales' } @@ -2374,6 +2699,7 @@ my @tests = ( [ { 'id' => 'en:fruit-juice', + 'is_in_taxonomy' => 1, 'processing' => 'en:pure', 'text' => 'jus de fruit' } From 91087b255c377365b46d181cd4cd6872e1a2ae62 Mon Sep 17 00:00:00 2001 From: himanshisrestha <135853264+himanshisrestha@users.noreply.github.com> Date: Fri, 5 Apr 2024 11:48:25 +0530 Subject: [PATCH 5/8] modified expected results in ingredient nesting unit test --- tests/unit/ingredients_nesting.t | 56 ++++++++++++++++++++++++++++++++ 1 file changed, 56 insertions(+) diff --git a/tests/unit/ingredients_nesting.t b/tests/unit/ingredients_nesting.t index f80836ed61dfc..f194a628d49c4 100755 --- a/tests/unit/ingredients_nesting.t +++ b/tests/unit/ingredients_nesting.t @@ -21,10 +21,12 @@ my @tests = ( [ { 'id' => 'en:sugar', + 'is_in_taxonomy' => 1, 'text' => 'sugar' }, { 'id' => 'en:water', + 'is_in_taxonomy' => 1, 'text' => 'water' } ] @@ -38,17 +40,21 @@ my @tests = ( 'ingredients' => [ { 'id' => 'en:cocoa', + 'is_in_taxonomy' => 1, 'text' => 'cocoa' }, { 'id' => 'en:sugar', + 'is_in_taxonomy' => 1, 'text' => 'sugar' } ], + 'is_in_taxonomy' => 1, 'text' => 'chocolate' }, { 'id' => 'en:milk', + 'is_in_taxonomy' => 1, 'text' => 'milk' } ] @@ -66,10 +72,12 @@ my @tests = ( 'ingredients' => [ { 'id' => 'en:wheat', + 'is_in_taxonomy' => 1, 'text' => 'wheat' }, { 'id' => 'en:water', + 'is_in_taxonomy' => 1, 'text' => 'water' }, { @@ -77,16 +85,20 @@ my @tests = ( 'ingredients' => [ { 'id' => 'en:e501', + 'is_in_taxonomy' => 1, 'text' => 'e501' } ], + 'is_in_taxonomy' => 1, 'text' => 'raising agents' }, { 'id' => 'en:salt', + 'is_in_taxonomy' => 1, 'text' => 'salt' } ], + 'is_in_taxonomy' => 1, 'text' => 'dough' }, { @@ -97,24 +109,30 @@ my @tests = ( 'ingredients' => [ { 'id' => 'en:cocoa-butter', + 'is_in_taxonomy' => 1, 'text' => 'cocoa butter' }, { 'id' => 'en:cocoa-paste', + 'is_in_taxonomy' => 1, 'text' => 'cocoa paste' } ], + 'is_in_taxonomy' => 1, 'text' => 'cocoa' }, { 'id' => 'en:sugar', + 'is_in_taxonomy' => 1, 'text' => 'sugar' } ], + 'is_in_taxonomy' => 1, 'text' => 'chocolate' }, { 'id' => 'en:milk', + 'is_in_taxonomy' => 1, 'text' => 'milk' } ] @@ -125,6 +143,7 @@ my @tests = ( [ { 'id' => 'en:salt', + 'is_in_taxonomy' => 1, 'text' => 'sal' }, { @@ -132,9 +151,11 @@ my @tests = ( 'ingredients' => [ { 'id' => 'en:e330', + 'is_in_taxonomy' => 1, 'text' => "\x{e1}cido c\x{ed}trico" } ], + 'is_in_taxonomy' => 1, 'text' => 'acidulante' } ] @@ -145,16 +166,19 @@ my @tests = ( [ { 'id' => "fr:teneur-en-legumes", + 'is_in_taxonomy' => 0, 'percent' => '74', 'text' => "Teneur en l\x{e9}gumes" }, { 'id' => 'en:tomato', + 'is_in_taxonomy' => 1, 'origins' => 'en:spain', 'text' => 'tomate' }, { 'id' => 'en:water', + 'is_in_taxonomy' => 1, 'text' => 'eau' } ] @@ -168,21 +192,25 @@ my @tests = ( [ { 'id' => "fr:teneur-en-legumes", + 'is_in_taxonomy' => 0, 'percent' => '74', 'text' => "Teneur en l\x{e9}gumes" }, { 'id' => 'en:tomato', + 'is_in_taxonomy' => 1, 'origins' => 'en:spain', 'percent' => '60', 'text' => 'tomate' }, { 'id' => 'en:water', + 'is_in_taxonomy' => 1, 'text' => 'eau' }, { 'id' => 'en:salt', + 'is_in_taxonomy' => 1, 'origins' => 'en:france,en:italy', 'text' => 'Sel' } @@ -201,47 +229,56 @@ my @tests = ( 'ingredients' => [ { 'id' => 'en:whole-wheat', + 'is_in_taxonomy' => 1, 'labels' => 'en:organic', 'percent' => '50.5', 'text' => 'BLE complet' }, { 'id' => 'en:cornmeal', + 'is_in_taxonomy' => 1, 'labels' => 'en:organic', 'text' => "semoule de ma\x{ef}s" } ], + 'is_in_taxonomy' => 1, 'percent' => '63.7', 'text' => "C\x{e9}r\x{e9}ales" }, { 'id' => 'en:sugar', + 'is_in_taxonomy' => 1, 'labels' => 'en:organic', 'text' => 'sucre' }, { 'id' => 'en:wheat-syrup', + 'is_in_taxonomy' => 1, 'labels' => 'en:organic', 'text' => 'sirop de BLE' }, { 'id' => 'en:fat-reduced-cocoa-powder', + 'is_in_taxonomy' => 1, 'labels' => 'en:organic', 'percent' => '3.9', 'text' => 'cacao maigre en poudre' }, { 'id' => 'en:cocoa-powder', + 'is_in_taxonomy' => 1, 'labels' => 'en:organic', 'percent' => '1.7', 'text' => 'cacao en poudre' }, { 'id' => 'en:salt', + 'is_in_taxonomy' => 1, 'text' => 'sel' }, { 'id' => 'en:natural-flavouring', + 'is_in_taxonomy' => 1, 'text' => "ar\x{f4}me naturel" } ] @@ -259,36 +296,44 @@ my @tests = ( 'ingredients' => [ { 'id' => 'en:tomato', + 'is_in_taxonomy' => 1, 'text' => 'tomate' }, { 'id' => 'en:bell-pepper', + 'is_in_taxonomy' => 1, 'text' => 'pimiento' }, { 'id' => 'en:cucumber', + 'is_in_taxonomy' => 1, 'text' => 'pepino' }, { 'id' => 'en:garlic', + 'is_in_taxonomy' => 1, 'text' => 'ajo' } ], + 'is_in_taxonomy' => 1, 'percent' => '91', 'text' => 'Hortalizas', 'processing' => 'en:fresh' }, { 'id' => 'en:extra-virgin-olive-oil', + 'is_in_taxonomy' => 1, 'percent' => '3', 'text' => 'aceite de oliva virgen extra' }, { 'id' => 'en:wine-vinegar', + 'is_in_taxonomy' => 1, 'text' => 'vinagre de vino' }, { 'id' => 'en:salt', + 'is_in_taxonomy' => 1, 'text' => 'sal' } ] @@ -299,6 +344,7 @@ my @tests = ( [ { 'id' => 'en:tomato', + 'is_in_taxonomy' => 1, 'labels' => 'en:organic', 'processing' => 'en:cooked,en:sliced,en:cut', 'text' => 'Tomates' @@ -314,18 +360,22 @@ my @tests = ( [ { 'id' => 'en:minerals', + 'is_in_taxonomy' => 1, 'text' => 'minéraux', 'ingredients' => [ { 'id' => 'en:e170i', + 'is_in_taxonomy' => 1, 'text' => 'carbonate de calcium' }, { 'id' => 'en:e504i', + 'is_in_taxonomy' => 1, 'text' => 'carbonate de magnésium' }, { 'id' => 'en:elemental-iron', + 'is_in_taxonomy' => 1, 'text' => 'fer élémentaire' } ], @@ -338,14 +388,17 @@ my @tests = ( [ { 'id' => 'en:minerals', + 'is_in_taxonomy' => 1, 'text' => 'minéraux', 'ingredients' => [ { 'id' => 'en:e504i', + 'is_in_taxonomy' => 1, 'text' => 'carbonate de magnésium' }, { 'id' => 'en:elemental-iron', + 'is_in_taxonomy' => 1, 'text' => 'fer élémentaire' } ], @@ -358,14 +411,17 @@ my @tests = ( [ { 'id' => 'en:minerals', + 'is_in_taxonomy' => 1, 'text' => 'MINERAUX', 'ingredients' => [ { 'id' => 'en:e504i', + 'is_in_taxonomy' => 1, 'text' => 'CARBONATE DE MAGNESIUM' }, { 'id' => 'en:elemental-iron', + 'is_in_taxonomy' => 1, 'text' => 'fer élémentaire' } ], From 9517c46d4ad6b04e3b212db64605ba0b7b34ecaf Mon Sep 17 00:00:00 2001 From: himanshisrestha <135853264+himanshisrestha@users.noreply.github.com> Date: Fri, 19 Apr 2024 02:22:27 +0530 Subject: [PATCH 6/8] added is_in_taxonomy to fix api_v2_product_read tests --- .../api_v2_product_read/get-existing-product.json | 4 ++++ .../api_v2_product_read/get-fields-all-knowledge-panels.json | 4 ++++ .../api_v2_product_read/get-fields-all.json | 4 ++++ .../get-fields-attribute-groups-all-knowledge-panels.json | 4 ++++ .../api_v2_product_read/get-fields-raw.json | 4 ++++ 5 files changed, 20 insertions(+) diff --git a/tests/integration/expected_test_results/api_v2_product_read/get-existing-product.json b/tests/integration/expected_test_results/api_v2_product_read/get-existing-product.json index 299e334bfbb97..a33082d79fdcc 100644 --- a/tests/integration/expected_test_results/api_v2_product_read/get-existing-product.json +++ b/tests/integration/expected_test_results/api_v2_product_read/get-existing-product.json @@ -583,6 +583,7 @@ { "ciqual_food_code" : "13050", "id" : "en:apple", + "is_in_taxonomy": 1, "percent_estimate" : 62.5, "percent_max" : 100, "percent_min" : 25, @@ -593,6 +594,7 @@ { "ciqual_proxy_food_code" : "19051", "id" : "en:milk", + "is_in_taxonomy": 1, "percent_estimate" : 18.75, "percent_max" : 50, "percent_min" : 0, @@ -603,6 +605,7 @@ { "ciqual_food_code" : "22000", "id" : "en:egg", + "is_in_taxonomy": 1, "percent_estimate" : 9.375, "percent_max" : 33.3333333333333, "percent_min" : 0, @@ -614,6 +617,7 @@ "ciqual_food_code" : "16129", "from_palm_oil" : "yes", "id" : "en:palm-oil", + "is_in_taxonomy": 1, "percent_estimate" : 9.375, "percent_max" : 25, "percent_min" : 0, diff --git a/tests/integration/expected_test_results/api_v2_product_read/get-fields-all-knowledge-panels.json b/tests/integration/expected_test_results/api_v2_product_read/get-fields-all-knowledge-panels.json index 91bf421ff2575..d910b2625e706 100644 --- a/tests/integration/expected_test_results/api_v2_product_read/get-fields-all-knowledge-panels.json +++ b/tests/integration/expected_test_results/api_v2_product_read/get-fields-all-knowledge-panels.json @@ -583,6 +583,7 @@ { "ciqual_food_code" : "13050", "id" : "en:apple", + "is_in_taxonomy": 1, "percent_estimate" : 62.5, "percent_max" : 100, "percent_min" : 25, @@ -593,6 +594,7 @@ { "ciqual_proxy_food_code" : "19051", "id" : "en:milk", + "is_in_taxonomy": 1, "percent_estimate" : 18.75, "percent_max" : 50, "percent_min" : 0, @@ -603,6 +605,7 @@ { "ciqual_food_code" : "22000", "id" : "en:egg", + "is_in_taxonomy": 1, "percent_estimate" : 9.375, "percent_max" : 33.3333333333333, "percent_min" : 0, @@ -614,6 +617,7 @@ "ciqual_food_code" : "16129", "from_palm_oil" : "yes", "id" : "en:palm-oil", + "is_in_taxonomy": 1, "percent_estimate" : 9.375, "percent_max" : 25, "percent_min" : 0, diff --git a/tests/integration/expected_test_results/api_v2_product_read/get-fields-all.json b/tests/integration/expected_test_results/api_v2_product_read/get-fields-all.json index 299e334bfbb97..a33082d79fdcc 100644 --- a/tests/integration/expected_test_results/api_v2_product_read/get-fields-all.json +++ b/tests/integration/expected_test_results/api_v2_product_read/get-fields-all.json @@ -583,6 +583,7 @@ { "ciqual_food_code" : "13050", "id" : "en:apple", + "is_in_taxonomy": 1, "percent_estimate" : 62.5, "percent_max" : 100, "percent_min" : 25, @@ -593,6 +594,7 @@ { "ciqual_proxy_food_code" : "19051", "id" : "en:milk", + "is_in_taxonomy": 1, "percent_estimate" : 18.75, "percent_max" : 50, "percent_min" : 0, @@ -603,6 +605,7 @@ { "ciqual_food_code" : "22000", "id" : "en:egg", + "is_in_taxonomy": 1, "percent_estimate" : 9.375, "percent_max" : 33.3333333333333, "percent_min" : 0, @@ -614,6 +617,7 @@ "ciqual_food_code" : "16129", "from_palm_oil" : "yes", "id" : "en:palm-oil", + "is_in_taxonomy": 1, "percent_estimate" : 9.375, "percent_max" : 25, "percent_min" : 0, diff --git a/tests/integration/expected_test_results/api_v2_product_read/get-fields-attribute-groups-all-knowledge-panels.json b/tests/integration/expected_test_results/api_v2_product_read/get-fields-attribute-groups-all-knowledge-panels.json index 7f7a13f763f64..17bb21053cd24 100644 --- a/tests/integration/expected_test_results/api_v2_product_read/get-fields-attribute-groups-all-knowledge-panels.json +++ b/tests/integration/expected_test_results/api_v2_product_read/get-fields-attribute-groups-all-knowledge-panels.json @@ -1231,6 +1231,7 @@ { "ciqual_food_code" : "13050", "id" : "en:apple", + "is_in_taxonomy": 1, "percent_estimate" : 62.5, "percent_max" : 100, "percent_min" : 25, @@ -1241,6 +1242,7 @@ { "ciqual_proxy_food_code" : "19051", "id" : "en:milk", + "is_in_taxonomy": 1, "percent_estimate" : 18.75, "percent_max" : 50, "percent_min" : 0, @@ -1251,6 +1253,7 @@ { "ciqual_food_code" : "22000", "id" : "en:egg", + "is_in_taxonomy": 1, "percent_estimate" : 9.375, "percent_max" : 33.3333333333333, "percent_min" : 0, @@ -1262,6 +1265,7 @@ "ciqual_food_code" : "16129", "from_palm_oil" : "yes", "id" : "en:palm-oil", + "is_in_taxonomy": 1, "percent_estimate" : 9.375, "percent_max" : 25, "percent_min" : 0, diff --git a/tests/integration/expected_test_results/api_v2_product_read/get-fields-raw.json b/tests/integration/expected_test_results/api_v2_product_read/get-fields-raw.json index c1a622542412b..c64752c67f003 100644 --- a/tests/integration/expected_test_results/api_v2_product_read/get-fields-raw.json +++ b/tests/integration/expected_test_results/api_v2_product_read/get-fields-raw.json @@ -578,6 +578,7 @@ { "ciqual_food_code" : "13050", "id" : "en:apple", + "is_in_taxonomy": 1, "percent_estimate" : 62.5, "percent_max" : 100, "percent_min" : 25, @@ -588,6 +589,7 @@ { "ciqual_proxy_food_code" : "19051", "id" : "en:milk", + "is_in_taxonomy": 1, "percent_estimate" : 18.75, "percent_max" : 50, "percent_min" : 0, @@ -598,6 +600,7 @@ { "ciqual_food_code" : "22000", "id" : "en:egg", + "is_in_taxonomy": 1, "percent_estimate" : 9.375, "percent_max" : 33.3333333333333, "percent_min" : 0, @@ -609,6 +612,7 @@ "ciqual_food_code" : "16129", "from_palm_oil" : "yes", "id" : "en:palm-oil", + "is_in_taxonomy": 1, "percent_estimate" : 9.375, "percent_max" : 25, "percent_min" : 0, From a4ca1ff208a048bce74755a5052243a21c20c01e Mon Sep 17 00:00:00 2001 From: himanshisrestha <135853264+himanshisrestha@users.noreply.github.com> Date: Fri, 19 Apr 2024 02:46:52 +0530 Subject: [PATCH 7/8] updated test results to multiple files --- .../api_v2_product_write/get-product-auth-good-password.json | 4 ++++ .../get-product-ingredients-text-without-language.json | 2 ++ .../api_v2_product_write/get-product.json | 4 ++++ .../get-existing-product-gs1-ai-data-str.json | 4 ++++ .../api_v3_product_read/get-existing-product-gs1-caret.json | 4 ++++ .../get-existing-product-gs1-data-uri.json | 4 ++++ .../api_v3_product_read/get-existing-product-gs1-fnc1.json | 4 ++++ .../api_v3_product_read/get-existing-product-gs1-gs.json | 4 ++++ .../api_v3_product_read/get-existing-product.json | 4 ++++ .../api_v3_product_read/get-fields-all-knowledge-panels.json | 4 ++++ .../api_v3_product_read/get-fields-all.json | 4 ++++ .../get-fields-attribute-groups-all-knowledge-panels.json | 4 ++++ .../api_v3_product_read/get-fields-raw.json | 4 ++++ .../patch-ingredients-categories-to-get-nutriscore.json | 2 ++ .../api_v3_product_write/patch-language-fields.json | 3 +++ .../get-edited-protected-product-api-v2-moderator.json | 4 ++++ .../get-edited-protected-product-api-v2.json | 4 ++++ .../get-edited-protected-product-web-form-moderator.json | 4 ++++ .../get-edited-protected-product-web-form.json | 4 ++++ .../get-edited-unprotected-product-api-v2.json | 4 ++++ .../get-edited-unprotected-product-web-form.json | 4 ++++ .../expected_test_results/search_v1/search-no-filter.json | 4 ++++ 22 files changed, 83 insertions(+) diff --git a/tests/integration/expected_test_results/api_v2_product_write/get-product-auth-good-password.json b/tests/integration/expected_test_results/api_v2_product_write/get-product-auth-good-password.json index 502fde12a5bdd..96caab6301412 100644 --- a/tests/integration/expected_test_results/api_v2_product_write/get-product-auth-good-password.json +++ b/tests/integration/expected_test_results/api_v2_product_write/get-product-auth-good-password.json @@ -522,6 +522,7 @@ { "ciqual_proxy_food_code" : "9410", "id" : "en:wheat-flour", + "is_in_taxonomy": 1, "percent_estimate" : 62.5, "percent_max" : 100, "percent_min" : 25, @@ -532,6 +533,7 @@ { "ciqual_food_code" : "18066", "id" : "en:water", + "is_in_taxonomy": 1, "percent_estimate" : 18.75, "percent_max" : 50, "percent_min" : 0, @@ -542,6 +544,7 @@ { "ciqual_food_code" : "11058", "id" : "en:salt", + "is_in_taxonomy": 1, "percent_estimate" : 9.375, "percent_max" : 33.3333333333333, "percent_min" : 0, @@ -552,6 +555,7 @@ { "ciqual_proxy_food_code" : "31016", "id" : "en:sugar", + "is_in_taxonomy": 1, "percent_estimate" : 9.375, "percent_max" : 25, "percent_min" : 0, diff --git a/tests/integration/expected_test_results/api_v2_product_write/get-product-ingredients-text-without-language.json b/tests/integration/expected_test_results/api_v2_product_write/get-product-ingredients-text-without-language.json index ddd3470e62a02..6a146ab7ba7e5 100644 --- a/tests/integration/expected_test_results/api_v2_product_write/get-product-ingredients-text-without-language.json +++ b/tests/integration/expected_test_results/api_v2_product_write/get-product-ingredients-text-without-language.json @@ -358,6 +358,7 @@ { "ciqual_proxy_food_code" : "28205", "id" : "en:pork-meat", + "is_in_taxonomy": 1, "percent_estimate" : 75, "percent_max" : 100, "percent_min" : 50, @@ -368,6 +369,7 @@ { "ciqual_food_code" : "11058", "id" : "en:salt", + "is_in_taxonomy": 1, "percent_estimate" : 25, "percent_max" : 50, "percent_min" : 0, diff --git a/tests/integration/expected_test_results/api_v2_product_write/get-product.json b/tests/integration/expected_test_results/api_v2_product_write/get-product.json index c2419d4856672..f7ba0a4f33389 100644 --- a/tests/integration/expected_test_results/api_v2_product_write/get-product.json +++ b/tests/integration/expected_test_results/api_v2_product_write/get-product.json @@ -522,6 +522,7 @@ { "ciqual_proxy_food_code" : "9410", "id" : "en:wheat-flour", + "is_in_taxonomy": 1, "percent_estimate" : 62.5, "percent_max" : 100, "percent_min" : 25, @@ -532,6 +533,7 @@ { "ciqual_food_code" : "18066", "id" : "en:water", + "is_in_taxonomy": 1, "percent_estimate" : 18.75, "percent_max" : 50, "percent_min" : 0, @@ -542,6 +544,7 @@ { "ciqual_food_code" : "11058", "id" : "en:salt", + "is_in_taxonomy": 1, "percent_estimate" : 9.375, "percent_max" : 33.3333333333333, "percent_min" : 0, @@ -552,6 +555,7 @@ { "ciqual_proxy_food_code" : "31016", "id" : "en:sugar", + "is_in_taxonomy": 1, "percent_estimate" : 9.375, "percent_max" : 25, "percent_min" : 0, diff --git a/tests/integration/expected_test_results/api_v3_product_read/get-existing-product-gs1-ai-data-str.json b/tests/integration/expected_test_results/api_v3_product_read/get-existing-product-gs1-ai-data-str.json index 6c2f48c6ecf8c..d8f9cfdefcc57 100644 --- a/tests/integration/expected_test_results/api_v3_product_read/get-existing-product-gs1-ai-data-str.json +++ b/tests/integration/expected_test_results/api_v3_product_read/get-existing-product-gs1-ai-data-str.json @@ -585,6 +585,7 @@ { "ciqual_food_code" : "13050", "id" : "en:apple", + "is_in_taxonomy": 1, "percent_estimate" : 62.5, "percent_max" : 100, "percent_min" : 25, @@ -595,6 +596,7 @@ { "ciqual_proxy_food_code" : "19051", "id" : "en:milk", + "is_in_taxonomy": 1, "percent_estimate" : 18.75, "percent_max" : 50, "percent_min" : 0, @@ -605,6 +607,7 @@ { "ciqual_food_code" : "22000", "id" : "en:egg", + "is_in_taxonomy": 1, "percent_estimate" : 9.375, "percent_max" : 33.3333333333333, "percent_min" : 0, @@ -616,6 +619,7 @@ "ciqual_food_code" : "16129", "from_palm_oil" : "yes", "id" : "en:palm-oil", + "is_in_taxonomy": 1, "percent_estimate" : 9.375, "percent_max" : 25, "percent_min" : 0, diff --git a/tests/integration/expected_test_results/api_v3_product_read/get-existing-product-gs1-caret.json b/tests/integration/expected_test_results/api_v3_product_read/get-existing-product-gs1-caret.json index 768b44f4e8daf..32f70a9bfc493 100644 --- a/tests/integration/expected_test_results/api_v3_product_read/get-existing-product-gs1-caret.json +++ b/tests/integration/expected_test_results/api_v3_product_read/get-existing-product-gs1-caret.json @@ -585,6 +585,7 @@ { "ciqual_food_code" : "13050", "id" : "en:apple", + "is_in_taxonomy": 1, "percent_estimate" : 62.5, "percent_max" : 100, "percent_min" : 25, @@ -595,6 +596,7 @@ { "ciqual_proxy_food_code" : "19051", "id" : "en:milk", + "is_in_taxonomy": 1, "percent_estimate" : 18.75, "percent_max" : 50, "percent_min" : 0, @@ -605,6 +607,7 @@ { "ciqual_food_code" : "22000", "id" : "en:egg", + "is_in_taxonomy": 1, "percent_estimate" : 9.375, "percent_max" : 33.3333333333333, "percent_min" : 0, @@ -616,6 +619,7 @@ "ciqual_food_code" : "16129", "from_palm_oil" : "yes", "id" : "en:palm-oil", + "is_in_taxonomy": 1, "percent_estimate" : 9.375, "percent_max" : 25, "percent_min" : 0, diff --git a/tests/integration/expected_test_results/api_v3_product_read/get-existing-product-gs1-data-uri.json b/tests/integration/expected_test_results/api_v3_product_read/get-existing-product-gs1-data-uri.json index 768b44f4e8daf..32f70a9bfc493 100644 --- a/tests/integration/expected_test_results/api_v3_product_read/get-existing-product-gs1-data-uri.json +++ b/tests/integration/expected_test_results/api_v3_product_read/get-existing-product-gs1-data-uri.json @@ -585,6 +585,7 @@ { "ciqual_food_code" : "13050", "id" : "en:apple", + "is_in_taxonomy": 1, "percent_estimate" : 62.5, "percent_max" : 100, "percent_min" : 25, @@ -595,6 +596,7 @@ { "ciqual_proxy_food_code" : "19051", "id" : "en:milk", + "is_in_taxonomy": 1, "percent_estimate" : 18.75, "percent_max" : 50, "percent_min" : 0, @@ -605,6 +607,7 @@ { "ciqual_food_code" : "22000", "id" : "en:egg", + "is_in_taxonomy": 1, "percent_estimate" : 9.375, "percent_max" : 33.3333333333333, "percent_min" : 0, @@ -616,6 +619,7 @@ "ciqual_food_code" : "16129", "from_palm_oil" : "yes", "id" : "en:palm-oil", + "is_in_taxonomy": 1, "percent_estimate" : 9.375, "percent_max" : 25, "percent_min" : 0, diff --git a/tests/integration/expected_test_results/api_v3_product_read/get-existing-product-gs1-fnc1.json b/tests/integration/expected_test_results/api_v3_product_read/get-existing-product-gs1-fnc1.json index 6c2f48c6ecf8c..d8f9cfdefcc57 100644 --- a/tests/integration/expected_test_results/api_v3_product_read/get-existing-product-gs1-fnc1.json +++ b/tests/integration/expected_test_results/api_v3_product_read/get-existing-product-gs1-fnc1.json @@ -585,6 +585,7 @@ { "ciqual_food_code" : "13050", "id" : "en:apple", + "is_in_taxonomy": 1, "percent_estimate" : 62.5, "percent_max" : 100, "percent_min" : 25, @@ -595,6 +596,7 @@ { "ciqual_proxy_food_code" : "19051", "id" : "en:milk", + "is_in_taxonomy": 1, "percent_estimate" : 18.75, "percent_max" : 50, "percent_min" : 0, @@ -605,6 +607,7 @@ { "ciqual_food_code" : "22000", "id" : "en:egg", + "is_in_taxonomy": 1, "percent_estimate" : 9.375, "percent_max" : 33.3333333333333, "percent_min" : 0, @@ -616,6 +619,7 @@ "ciqual_food_code" : "16129", "from_palm_oil" : "yes", "id" : "en:palm-oil", + "is_in_taxonomy": 1, "percent_estimate" : 9.375, "percent_max" : 25, "percent_min" : 0, diff --git a/tests/integration/expected_test_results/api_v3_product_read/get-existing-product-gs1-gs.json b/tests/integration/expected_test_results/api_v3_product_read/get-existing-product-gs1-gs.json index 768b44f4e8daf..32f70a9bfc493 100644 --- a/tests/integration/expected_test_results/api_v3_product_read/get-existing-product-gs1-gs.json +++ b/tests/integration/expected_test_results/api_v3_product_read/get-existing-product-gs1-gs.json @@ -585,6 +585,7 @@ { "ciqual_food_code" : "13050", "id" : "en:apple", + "is_in_taxonomy": 1, "percent_estimate" : 62.5, "percent_max" : 100, "percent_min" : 25, @@ -595,6 +596,7 @@ { "ciqual_proxy_food_code" : "19051", "id" : "en:milk", + "is_in_taxonomy": 1, "percent_estimate" : 18.75, "percent_max" : 50, "percent_min" : 0, @@ -605,6 +607,7 @@ { "ciqual_food_code" : "22000", "id" : "en:egg", + "is_in_taxonomy": 1, "percent_estimate" : 9.375, "percent_max" : 33.3333333333333, "percent_min" : 0, @@ -616,6 +619,7 @@ "ciqual_food_code" : "16129", "from_palm_oil" : "yes", "id" : "en:palm-oil", + "is_in_taxonomy": 1, "percent_estimate" : 9.375, "percent_max" : 25, "percent_min" : 0, diff --git a/tests/integration/expected_test_results/api_v3_product_read/get-existing-product.json b/tests/integration/expected_test_results/api_v3_product_read/get-existing-product.json index e7a3d24a7f532..c75d7233da3cb 100644 --- a/tests/integration/expected_test_results/api_v3_product_read/get-existing-product.json +++ b/tests/integration/expected_test_results/api_v3_product_read/get-existing-product.json @@ -585,6 +585,7 @@ { "ciqual_food_code" : "13050", "id" : "en:apple", + "is_in_taxonomy": 1, "percent_estimate" : 62.5, "percent_max" : 100, "percent_min" : 25, @@ -595,6 +596,7 @@ { "ciqual_proxy_food_code" : "19051", "id" : "en:milk", + "is_in_taxonomy": 1, "percent_estimate" : 18.75, "percent_max" : 50, "percent_min" : 0, @@ -605,6 +607,7 @@ { "ciqual_food_code" : "22000", "id" : "en:egg", + "is_in_taxonomy": 1, "percent_estimate" : 9.375, "percent_max" : 33.3333333333333, "percent_min" : 0, @@ -616,6 +619,7 @@ "ciqual_food_code" : "16129", "from_palm_oil" : "yes", "id" : "en:palm-oil", + "is_in_taxonomy": 1, "percent_estimate" : 9.375, "percent_max" : 25, "percent_min" : 0, diff --git a/tests/integration/expected_test_results/api_v3_product_read/get-fields-all-knowledge-panels.json b/tests/integration/expected_test_results/api_v3_product_read/get-fields-all-knowledge-panels.json index 819eaf1dde919..e58c81caa3601 100644 --- a/tests/integration/expected_test_results/api_v3_product_read/get-fields-all-knowledge-panels.json +++ b/tests/integration/expected_test_results/api_v3_product_read/get-fields-all-knowledge-panels.json @@ -585,6 +585,7 @@ { "ciqual_food_code" : "13050", "id" : "en:apple", + "is_in_taxonomy": 1, "percent_estimate" : 62.5, "percent_max" : 100, "percent_min" : 25, @@ -595,6 +596,7 @@ { "ciqual_proxy_food_code" : "19051", "id" : "en:milk", + "is_in_taxonomy": 1, "percent_estimate" : 18.75, "percent_max" : 50, "percent_min" : 0, @@ -605,6 +607,7 @@ { "ciqual_food_code" : "22000", "id" : "en:egg", + "is_in_taxonomy": 1, "percent_estimate" : 9.375, "percent_max" : 33.3333333333333, "percent_min" : 0, @@ -616,6 +619,7 @@ "ciqual_food_code" : "16129", "from_palm_oil" : "yes", "id" : "en:palm-oil", + "is_in_taxonomy": 1, "percent_estimate" : 9.375, "percent_max" : 25, "percent_min" : 0, diff --git a/tests/integration/expected_test_results/api_v3_product_read/get-fields-all.json b/tests/integration/expected_test_results/api_v3_product_read/get-fields-all.json index 2678ee6d36930..8bebadba02cbd 100644 --- a/tests/integration/expected_test_results/api_v3_product_read/get-fields-all.json +++ b/tests/integration/expected_test_results/api_v3_product_read/get-fields-all.json @@ -585,6 +585,7 @@ { "ciqual_food_code" : "13050", "id" : "en:apple", + "is_in_taxonomy": 1, "percent_estimate" : 62.5, "percent_max" : 100, "percent_min" : 25, @@ -595,6 +596,7 @@ { "ciqual_proxy_food_code" : "19051", "id" : "en:milk", + "is_in_taxonomy": 1, "percent_estimate" : 18.75, "percent_max" : 50, "percent_min" : 0, @@ -605,6 +607,7 @@ { "ciqual_food_code" : "22000", "id" : "en:egg", + "is_in_taxonomy": 1, "percent_estimate" : 9.375, "percent_max" : 33.3333333333333, "percent_min" : 0, @@ -616,6 +619,7 @@ "ciqual_food_code" : "16129", "from_palm_oil" : "yes", "id" : "en:palm-oil", + "is_in_taxonomy": 1, "percent_estimate" : 9.375, "percent_max" : 25, "percent_min" : 0, diff --git a/tests/integration/expected_test_results/api_v3_product_read/get-fields-attribute-groups-all-knowledge-panels.json b/tests/integration/expected_test_results/api_v3_product_read/get-fields-attribute-groups-all-knowledge-panels.json index c64fc37593c20..34456fa9bc342 100644 --- a/tests/integration/expected_test_results/api_v3_product_read/get-fields-attribute-groups-all-knowledge-panels.json +++ b/tests/integration/expected_test_results/api_v3_product_read/get-fields-attribute-groups-all-knowledge-panels.json @@ -1233,6 +1233,7 @@ { "ciqual_food_code" : "13050", "id" : "en:apple", + "is_in_taxonomy": 1, "percent_estimate" : 62.5, "percent_max" : 100, "percent_min" : 25, @@ -1243,6 +1244,7 @@ { "ciqual_proxy_food_code" : "19051", "id" : "en:milk", + "is_in_taxonomy": 1, "percent_estimate" : 18.75, "percent_max" : 50, "percent_min" : 0, @@ -1253,6 +1255,7 @@ { "ciqual_food_code" : "22000", "id" : "en:egg", + "is_in_taxonomy": 1, "percent_estimate" : 9.375, "percent_max" : 33.3333333333333, "percent_min" : 0, @@ -1264,6 +1267,7 @@ "ciqual_food_code" : "16129", "from_palm_oil" : "yes", "id" : "en:palm-oil", + "is_in_taxonomy": 1, "percent_estimate" : 9.375, "percent_max" : 25, "percent_min" : 0, diff --git a/tests/integration/expected_test_results/api_v3_product_read/get-fields-raw.json b/tests/integration/expected_test_results/api_v3_product_read/get-fields-raw.json index 9db4e7edbe404..004234a24c333 100644 --- a/tests/integration/expected_test_results/api_v3_product_read/get-fields-raw.json +++ b/tests/integration/expected_test_results/api_v3_product_read/get-fields-raw.json @@ -580,6 +580,7 @@ { "ciqual_food_code" : "13050", "id" : "en:apple", + "is_in_taxonomy": 1, "percent_estimate" : 62.5, "percent_max" : 100, "percent_min" : 25, @@ -590,6 +591,7 @@ { "ciqual_proxy_food_code" : "19051", "id" : "en:milk", + "is_in_taxonomy": 1, "percent_estimate" : 18.75, "percent_max" : 50, "percent_min" : 0, @@ -600,6 +602,7 @@ { "ciqual_food_code" : "22000", "id" : "en:egg", + "is_in_taxonomy": 1, "percent_estimate" : 9.375, "percent_max" : 33.3333333333333, "percent_min" : 0, @@ -611,6 +614,7 @@ "ciqual_food_code" : "16129", "from_palm_oil" : "yes", "id" : "en:palm-oil", + "is_in_taxonomy": 1, "percent_estimate" : 9.375, "percent_max" : 25, "percent_min" : 0, diff --git a/tests/integration/expected_test_results/api_v3_product_write/patch-ingredients-categories-to-get-nutriscore.json b/tests/integration/expected_test_results/api_v3_product_write/patch-ingredients-categories-to-get-nutriscore.json index 6e76d0b5513c5..cdd606a8e9cdd 100644 --- a/tests/integration/expected_test_results/api_v3_product_write/patch-ingredients-categories-to-get-nutriscore.json +++ b/tests/integration/expected_test_results/api_v3_product_write/patch-ingredients-categories-to-get-nutriscore.json @@ -36,6 +36,7 @@ { "ciqual_proxy_food_code" : "31016", "id" : "en:sugar", + "is_in_taxonomy": 1, "percent" : 75, "percent_estimate" : 75, "percent_max" : 75, @@ -49,6 +50,7 @@ { "ciqual_food_code" : "13050", "id" : "en:apple", + "is_in_taxonomy": 1, "percent" : 25, "percent_estimate" : 25, "percent_max" : 25, diff --git a/tests/integration/expected_test_results/api_v3_product_write/patch-language-fields.json b/tests/integration/expected_test_results/api_v3_product_write/patch-language-fields.json index a25c6f7007b43..2217a1009709a 100644 --- a/tests/integration/expected_test_results/api_v3_product_write/patch-language-fields.json +++ b/tests/integration/expected_test_results/api_v3_product_write/patch-language-fields.json @@ -5,6 +5,7 @@ { "ciqual_proxy_food_code" : "19051", "id" : "en:milk", + "is_in_taxonomy": 1, "percent" : 80, "percent_estimate" : 80, "percent_max" : 80, @@ -16,6 +17,7 @@ { "ciqual_proxy_food_code" : "31016", "id" : "en:sugar", + "is_in_taxonomy": 1, "percent_estimate" : 15, "percent_max" : 20, "percent_min" : 10, @@ -26,6 +28,7 @@ { "ciqual_food_code" : "18100", "id" : "en:cocoa-powder", + "is_in_taxonomy": 1, "percent_estimate" : 5, "percent_max" : 10, "percent_min" : 0, diff --git a/tests/integration/expected_test_results/protected_product/get-edited-protected-product-api-v2-moderator.json b/tests/integration/expected_test_results/protected_product/get-edited-protected-product-api-v2-moderator.json index 5123e361761f5..6d8ae96016929 100644 --- a/tests/integration/expected_test_results/protected_product/get-edited-protected-product-api-v2-moderator.json +++ b/tests/integration/expected_test_results/protected_product/get-edited-protected-product-api-v2-moderator.json @@ -431,6 +431,7 @@ { "ciqual_food_code" : "13050", "id" : "en:apple", + "is_in_taxonomy": 1, "percent_estimate" : 62.5, "percent_max" : 100, "percent_min" : 25, @@ -441,6 +442,7 @@ { "ciqual_proxy_food_code" : "19051", "id" : "en:milk", + "is_in_taxonomy": 1, "percent_estimate" : 18.75, "percent_max" : 50, "percent_min" : 0, @@ -451,6 +453,7 @@ { "ciqual_food_code" : "22000", "id" : "en:egg", + "is_in_taxonomy": 1, "percent_estimate" : 9.375, "percent_max" : 33.3333333333333, "percent_min" : 0, @@ -462,6 +465,7 @@ "ciqual_food_code" : "16129", "from_palm_oil" : "yes", "id" : "en:palm-oil", + "is_in_taxonomy": 1, "percent_estimate" : 9.375, "percent_max" : 25, "percent_min" : 0, diff --git a/tests/integration/expected_test_results/protected_product/get-edited-protected-product-api-v2.json b/tests/integration/expected_test_results/protected_product/get-edited-protected-product-api-v2.json index 245da19f22adf..a7da5bea7a7a8 100644 --- a/tests/integration/expected_test_results/protected_product/get-edited-protected-product-api-v2.json +++ b/tests/integration/expected_test_results/protected_product/get-edited-protected-product-api-v2.json @@ -432,6 +432,7 @@ { "ciqual_food_code" : "13050", "id" : "en:apple", + "is_in_taxonomy": 1, "percent_estimate" : 62.5, "percent_max" : 100, "percent_min" : 25, @@ -442,6 +443,7 @@ { "ciqual_proxy_food_code" : "19051", "id" : "en:milk", + "is_in_taxonomy": 1, "percent_estimate" : 18.75, "percent_max" : 50, "percent_min" : 0, @@ -452,6 +454,7 @@ { "ciqual_food_code" : "22000", "id" : "en:egg", + "is_in_taxonomy": 1, "percent_estimate" : 9.375, "percent_max" : 33.3333333333333, "percent_min" : 0, @@ -463,6 +466,7 @@ "ciqual_food_code" : "16129", "from_palm_oil" : "yes", "id" : "en:palm-oil", + "is_in_taxonomy": 1, "percent_estimate" : 9.375, "percent_max" : 25, "percent_min" : 0, diff --git a/tests/integration/expected_test_results/protected_product/get-edited-protected-product-web-form-moderator.json b/tests/integration/expected_test_results/protected_product/get-edited-protected-product-web-form-moderator.json index e1870a1f16874..167c147a6729e 100644 --- a/tests/integration/expected_test_results/protected_product/get-edited-protected-product-web-form-moderator.json +++ b/tests/integration/expected_test_results/protected_product/get-edited-protected-product-web-form-moderator.json @@ -435,6 +435,7 @@ { "ciqual_food_code" : "13050", "id" : "en:apple", + "is_in_taxonomy": 1, "percent_estimate" : 62.5, "percent_max" : 100, "percent_min" : 25, @@ -445,6 +446,7 @@ { "ciqual_proxy_food_code" : "19051", "id" : "en:milk", + "is_in_taxonomy": 1, "percent_estimate" : 18.75, "percent_max" : 50, "percent_min" : 0, @@ -455,6 +457,7 @@ { "ciqual_food_code" : "22000", "id" : "en:egg", + "is_in_taxonomy": 1, "percent_estimate" : 9.375, "percent_max" : 33.3333333333333, "percent_min" : 0, @@ -466,6 +469,7 @@ "ciqual_food_code" : "16129", "from_palm_oil" : "yes", "id" : "en:palm-oil", + "is_in_taxonomy": 1, "percent_estimate" : 9.375, "percent_max" : 25, "percent_min" : 0, diff --git a/tests/integration/expected_test_results/protected_product/get-edited-protected-product-web-form.json b/tests/integration/expected_test_results/protected_product/get-edited-protected-product-web-form.json index 3183f1a49080f..ca32a887e67fb 100644 --- a/tests/integration/expected_test_results/protected_product/get-edited-protected-product-web-form.json +++ b/tests/integration/expected_test_results/protected_product/get-edited-protected-product-web-form.json @@ -436,6 +436,7 @@ { "ciqual_food_code" : "13050", "id" : "en:apple", + "is_in_taxonomy": 1, "percent_estimate" : 62.5, "percent_max" : 100, "percent_min" : 25, @@ -446,6 +447,7 @@ { "ciqual_proxy_food_code" : "19051", "id" : "en:milk", + "is_in_taxonomy": 1, "percent_estimate" : 18.75, "percent_max" : 50, "percent_min" : 0, @@ -456,6 +458,7 @@ { "ciqual_food_code" : "22000", "id" : "en:egg", + "is_in_taxonomy": 1, "percent_estimate" : 9.375, "percent_max" : 33.3333333333333, "percent_min" : 0, @@ -467,6 +470,7 @@ "ciqual_food_code" : "16129", "from_palm_oil" : "yes", "id" : "en:palm-oil", + "is_in_taxonomy": 1, "percent_estimate" : 9.375, "percent_max" : 25, "percent_min" : 0, diff --git a/tests/integration/expected_test_results/protected_product/get-edited-unprotected-product-api-v2.json b/tests/integration/expected_test_results/protected_product/get-edited-unprotected-product-api-v2.json index 629fd6b723473..4fae363c62050 100644 --- a/tests/integration/expected_test_results/protected_product/get-edited-unprotected-product-api-v2.json +++ b/tests/integration/expected_test_results/protected_product/get-edited-unprotected-product-api-v2.json @@ -429,6 +429,7 @@ { "ciqual_food_code" : "13050", "id" : "en:apple", + "is_in_taxonomy": 1, "percent_estimate" : 62.5, "percent_max" : 100, "percent_min" : 25, @@ -439,6 +440,7 @@ { "ciqual_proxy_food_code" : "19051", "id" : "en:milk", + "is_in_taxonomy": 1, "percent_estimate" : 18.75, "percent_max" : 50, "percent_min" : 0, @@ -449,6 +451,7 @@ { "ciqual_food_code" : "22000", "id" : "en:egg", + "is_in_taxonomy": 1, "percent_estimate" : 9.375, "percent_max" : 33.3333333333333, "percent_min" : 0, @@ -460,6 +463,7 @@ "ciqual_food_code" : "16129", "from_palm_oil" : "yes", "id" : "en:palm-oil", + "is_in_taxonomy": 1, "percent_estimate" : 9.375, "percent_max" : 25, "percent_min" : 0, diff --git a/tests/integration/expected_test_results/protected_product/get-edited-unprotected-product-web-form.json b/tests/integration/expected_test_results/protected_product/get-edited-unprotected-product-web-form.json index 6d117be7eb0e3..027161c742e2a 100644 --- a/tests/integration/expected_test_results/protected_product/get-edited-unprotected-product-web-form.json +++ b/tests/integration/expected_test_results/protected_product/get-edited-unprotected-product-web-form.json @@ -433,6 +433,7 @@ { "ciqual_food_code" : "13050", "id" : "en:apple", + "is_in_taxonomy": 1, "percent_estimate" : 62.5, "percent_max" : 100, "percent_min" : 25, @@ -443,6 +444,7 @@ { "ciqual_proxy_food_code" : "19051", "id" : "en:milk", + "is_in_taxonomy": 1, "percent_estimate" : 18.75, "percent_max" : 50, "percent_min" : 0, @@ -453,6 +455,7 @@ { "ciqual_food_code" : "22000", "id" : "en:egg", + "is_in_taxonomy": 1, "percent_estimate" : 9.375, "percent_max" : 33.3333333333333, "percent_min" : 0, @@ -464,6 +467,7 @@ "ciqual_food_code" : "16129", "from_palm_oil" : "yes", "id" : "en:palm-oil", + "is_in_taxonomy": 1, "percent_estimate" : 9.375, "percent_max" : 25, "percent_min" : 0, diff --git a/tests/integration/expected_test_results/search_v1/search-no-filter.json b/tests/integration/expected_test_results/search_v1/search-no-filter.json index 33bc453e31169..a1726d885df64 100644 --- a/tests/integration/expected_test_results/search_v1/search-no-filter.json +++ b/tests/integration/expected_test_results/search_v1/search-no-filter.json @@ -404,6 +404,7 @@ { "ciqual_food_code" : "13050", "id" : "en:apple", + "is_in_taxonomy": 1, "percent_estimate" : 62.5, "percent_max" : 100, "percent_min" : 25, @@ -415,6 +416,7 @@ { "ciqual_proxy_food_code" : "19051", "id" : "en:milk", + "is_in_taxonomy": 1, "percent_estimate" : 18.75, "percent_max" : 50, "percent_min" : 0, @@ -426,6 +428,7 @@ { "ciqual_food_code" : "22000", "id" : "en:egg", + "is_in_taxonomy": 1, "percent_estimate" : 9.375, "percent_max" : 33.3333333333333, "percent_min" : 0, @@ -437,6 +440,7 @@ { "ciqual_food_code" : "16129", "from_palm_oil" : "yes", + "is_in_taxonomy": 1, "id" : "en:palm-oil", "percent_estimate" : 9.375, "percent_max" : 25, From 206243839b09ae50dca1ac10bd267029581c949e Mon Sep 17 00:00:00 2001 From: himanshisrestha <135853264+himanshisrestha@users.noreply.github.com> Date: Fri, 19 Apr 2024 03:57:23 +0530 Subject: [PATCH 8/8] update test results in search --- .../search_v1/search-no-filter.json | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/tests/integration/expected_test_results/search_v1/search-no-filter.json b/tests/integration/expected_test_results/search_v1/search-no-filter.json index a1726d885df64..2d28a6842cd03 100644 --- a/tests/integration/expected_test_results/search_v1/search-no-filter.json +++ b/tests/integration/expected_test_results/search_v1/search-no-filter.json @@ -1268,6 +1268,7 @@ "ingredients" : [ { "id" : "en:fruit", + "is_in_taxonomy": 1, "percent_estimate" : 75, "percent_max" : 100, "percent_min" : 50, @@ -1278,6 +1279,7 @@ }, { "ciqual_proxy_food_code" : "9100", + "is_in_taxonomy": 1, "id" : "en:rice", "percent_estimate" : 25, "percent_max" : 50, @@ -1912,6 +1914,7 @@ { "ciqual_food_code" : "13050", "id" : "en:apple", + "is_in_taxonomy": 1, "percent_estimate" : 66.6666666666667, "percent_max" : 100, "percent_min" : 33.3333333333333, @@ -1923,6 +1926,7 @@ { "ciqual_proxy_food_code" : "19051", "id" : "en:milk", + "is_in_taxonomy": 1, "percent_estimate" : 16.6666666666667, "percent_max" : 50, "percent_min" : 0, @@ -1934,6 +1938,7 @@ { "ciqual_food_code" : "22000", "id" : "en:egg", + "is_in_taxonomy": 1, "percent_estimate" : 16.6666666666667, "percent_max" : 33.3333333333333, "percent_min" : 0, @@ -2711,6 +2716,7 @@ { "ciqual_food_code" : "13050", "id" : "en:apple", + "is_in_taxonomy": 1, "percent_estimate" : 66.6666666666667, "percent_max" : 100, "percent_min" : 33.3333333333333, @@ -2722,6 +2728,7 @@ { "ciqual_food_code" : "18066", "id" : "en:water", + "is_in_taxonomy": 1, "percent_estimate" : 16.6666666666667, "percent_max" : 50, "percent_min" : 0, @@ -2734,6 +2741,7 @@ "ciqual_food_code" : "16129", "from_palm_oil" : "yes", "id" : "en:palm-oil", + "is_in_taxonomy": 1, "percent_estimate" : 16.6666666666667, "percent_max" : 33.3333333333333, "percent_min" : 0, @@ -3672,6 +3680,7 @@ { "ciqual_food_code" : "13050", "id" : "en:apple", + "is_in_taxonomy": 1, "percent_estimate" : 75, "percent_max" : 100, "percent_min" : 50, @@ -3683,6 +3692,7 @@ { "ciqual_food_code" : "18066", "id" : "en:water", + "is_in_taxonomy": 1, "percent_estimate" : 25, "percent_max" : 50, "percent_min" : 0, @@ -4641,6 +4651,7 @@ { "ciqual_food_code" : "13050", "id" : "en:apple", + "is_in_taxonomy": 1, "percent_estimate" : 75, "percent_max" : 100, "percent_min" : 50, @@ -4652,6 +4663,7 @@ { "ciqual_food_code" : "18066", "id" : "en:water", + "is_in_taxonomy": 1, "percent_estimate" : 25, "percent_max" : 50, "percent_min" : 0,