Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

feat: export ecoscore fields #6467

Merged
merged 4 commits into from
Mar 9, 2022
Merged

feat: export ecoscore fields #6467

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
799ea34
feat: export ecoscore fields
stephanegigandet Mar 8, 2022
450cc73
built taxonomies
stephanegigandet Mar 8, 2022
f79cc90
Merge branch 'build-taxonomies' into ecoscore
stephanegigandet Mar 8, 2022
9384e90
small fix + tests update
stephanegigandet Mar 9, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions lib/ProductOpener/Config_off.pm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -656,8 +656,6 @@ $options{categories_exempted_from_nutrient_levels} = [qw(
brand_owner
ecoscore_score
ecoscore_grade
ecoscore_data.agribalyse.code
ecoscore_data.adjustments.packaging.value
);

# List of fields that can be imported on the producers platform
Expand Down Expand Up @@ -714,10 +712,13 @@ $options{import_export_fields_groups} = [
$options{off_export_fields_groups} = [
[ "off",
[
"food_groups",
"nova_groups",
"nutriscore_grade",
"nutriscore_score",
"ecoscore_grade",
"ecoscore_score",
"ecoscore_data.missing_key_data",
"ecoscore_data.agribalyse.code",
"ecoscore_data.adjustments.origins_of_ingredients.value",
"ecoscore_data.adjustments.packaging.value",
Expand Down
4 changes: 3 additions & 1 deletion lib/ProductOpener/Export.pm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -579,9 +579,11 @@ sub export_csv($) {
elsif (($field =~ /_tags$/) and (defined $product_ref->{$field})) {
$value = join(",", @{$product_ref->{$field}});
}
elsif (defined $taxonomy_fields{$field}) {
elsif ((defined $taxonomy_fields{$field}) and (defined $product_ref->{$field . "_hierarchy"})) {
# we do not know the language of the current value of $product_ref->{$field}
# so regenerate it in the main language of the product
# Note: some fields like nova_groups and food_groups do not have a _hierarchy subfield,
# but they are not entered directly, but computed from other fields, so we can take their values as is.
$value = list_taxonomy_tags_in_language($product_ref->{lc}, $field, $product_ref->{$field . "_hierarchy"});
}
# Allow returning fields that are not at the root of the product structure
Expand Down
5 changes: 5 additions & 0 deletions t/expected_test_results/export_more_fields/25000044984.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,8 +62,13 @@
"off:ecoscore_data.adjustments.production_system.value" : "",
"off:ecoscore_data.adjustments.threatened_species.value" : "",
"off:ecoscore_data.agribalyse.code" : "",
"off:ecoscore_data.missing_key_data" : "",
"off:ecoscore_grade" : "not-applicable",
"off:ecoscore_score" : "",
"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",
"off:nutriscore_grade" : "e",
"off:nutriscore_score" : "15",
"origin_fr" : "",
Expand Down
5 changes: 5 additions & 0 deletions t/expected_test_results/export_more_fields/26281742.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,8 +62,13 @@
"off:ecoscore_data.adjustments.production_system.value" : "0",
"off:ecoscore_data.adjustments.threatened_species.value" : "",
"off:ecoscore_data.agribalyse.code" : "",
"off:ecoscore_data.missing_key_data" : "",
"off:ecoscore_grade" : "unknown",
"off:ecoscore_score" : "",
"off:food_groups" : "en:sweets",
"off:food_groups_tags" : "en:sugary-snacks,en:sweets",
"off:nova_groups" : "",
"off:nova_groups_tags" : "",
"off:nutriscore_grade" : "",
"off:nutriscore_score" : "",
"origin_fr" : "",
Expand Down
5 changes: 5 additions & 0 deletions t/expected_test_results/export_more_fields/27096765.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,8 +62,13 @@
"off:ecoscore_data.adjustments.production_system.value" : "10",
"off:ecoscore_data.adjustments.threatened_species.value" : "",
"off:ecoscore_data.agribalyse.code" : "23585",
"off:ecoscore_data.missing_key_data" : "",
"off:ecoscore_grade" : "d",
"off:ecoscore_score" : "30",
"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",
"off:nutriscore_grade" : "e",
"off:nutriscore_score" : "28",
"origin_fr" : "",
Expand Down
5 changes: 5 additions & 0 deletions t/expected_test_results/export_more_fields/29161690.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,8 +62,13 @@
"off:ecoscore_data.adjustments.production_system.value" : "0",
"off:ecoscore_data.adjustments.threatened_species.value" : "",
"off:ecoscore_data.agribalyse.code" : "",
"off:ecoscore_data.missing_key_data" : "1",
"off:ecoscore_grade" : "unknown",
"off:ecoscore_score" : "",
"off:food_groups" : "",
"off:food_groups_tags" : "",
"off:nova_groups" : "",
"off:nova_groups_tags" : "",
"off:nutriscore_grade" : "",
"off:nutriscore_score" : "",
"origin_fr" : "",
Expand Down
5 changes: 5 additions & 0 deletions t/expected_test_results/export_more_fields/3173990027337.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,8 +62,13 @@
"off:ecoscore_data.adjustments.production_system.value" : "0",
"off:ecoscore_data.adjustments.threatened_species.value" : "",
"off:ecoscore_data.agribalyse.code" : "",
"off:ecoscore_data.missing_key_data" : "1",
"off:ecoscore_grade" : "unknown",
"off:ecoscore_score" : "",
"off:food_groups" : "",
"off:food_groups_tags" : "",
"off:nova_groups" : "",
"off:nova_groups_tags" : "",
"off:nutriscore_grade" : "",
"off:nutriscore_score" : "",
"origin_fr" : "",
Expand Down
5 changes: 5 additions & 0 deletions t/expected_test_results/export_more_fields/3250392332105.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,8 +62,13 @@
"off:ecoscore_data.adjustments.production_system.value" : "0",
"off:ecoscore_data.adjustments.threatened_species.value" : "",
"off:ecoscore_data.agribalyse.code" : "",
"off:ecoscore_data.missing_key_data" : "1",
"off:ecoscore_grade" : "unknown",
"off:ecoscore_score" : "",
"off:food_groups" : "",
"off:food_groups_tags" : "",
"off:nova_groups" : "",
"off:nova_groups_tags" : "",
"off:nutriscore_grade" : "",
"off:nutriscore_score" : "",
"origin_fr" : "",
Expand Down
5 changes: 5 additions & 0 deletions t/expected_test_results/export_more_fields/3256220513173.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,8 +62,13 @@
"off:ecoscore_data.adjustments.production_system.value" : "0",
"off:ecoscore_data.adjustments.threatened_species.value" : "",
"off:ecoscore_data.agribalyse.code" : "",
"off:ecoscore_data.missing_key_data" : "",
"off:ecoscore_grade" : "unknown",
"off:ecoscore_score" : "",
"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",
"off:nutriscore_grade" : "e",
"off:nutriscore_score" : "20",
"origin_fr" : "",
Expand Down
5 changes: 5 additions & 0 deletions t/expected_test_results/export_more_fields/3259330020135.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,8 +62,13 @@
"off:ecoscore_data.adjustments.production_system.value" : "0",
"off:ecoscore_data.adjustments.threatened_species.value" : "",
"off:ecoscore_data.agribalyse.code" : "20904",
"off:ecoscore_data.missing_key_data" : "1",
"off:ecoscore_grade" : "b",
"off:ecoscore_score" : "77",
"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",
"off:nutriscore_grade" : "",
"off:nutriscore_score" : "",
"origin_fr" : "",
Expand Down
5 changes: 5 additions & 0 deletions t/expected_test_results/export_more_fields/3270160503070.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,8 +62,13 @@
"off:ecoscore_data.adjustments.production_system.value" : "0",
"off:ecoscore_data.adjustments.threatened_species.value" : "",
"off:ecoscore_data.agribalyse.code" : "",
"off:ecoscore_data.missing_key_data" : "",
"off:ecoscore_grade" : "unknown",
"off:ecoscore_score" : "",
"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",
"off:nutriscore_grade" : "a",
"off:nutriscore_score" : "-5",
"origin_fr" : "France, Bénélux",
Expand Down
5 changes: 5 additions & 0 deletions t/expected_test_results/export_more_fields/3451790834080.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,8 +62,13 @@
"off:ecoscore_data.adjustments.production_system.value" : "0",
"off:ecoscore_data.adjustments.threatened_species.value" : "",
"off:ecoscore_data.agribalyse.code" : "19041",
"off:ecoscore_data.missing_key_data" : "",
"off:ecoscore_grade" : "b",
"off:ecoscore_score" : "61",
"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",
"off:nutriscore_grade" : "b",
"off:nutriscore_score" : "1",
"origin_fr" : "",
Expand Down
5 changes: 5 additions & 0 deletions t/expected_test_results/export_more_fields/3564703999971.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,8 +62,13 @@
"off:ecoscore_data.adjustments.production_system.value" : "0",
"off:ecoscore_data.adjustments.threatened_species.value" : "",
"off:ecoscore_data.agribalyse.code" : "",
"off:ecoscore_data.missing_key_data" : "1",
"off:ecoscore_grade" : "unknown",
"off:ecoscore_score" : "",
"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",
"off:nutriscore_grade" : "d",
"off:nutriscore_score" : "12",
"origin_fr" : "",
Expand Down
5 changes: 5 additions & 0 deletions t/expected_test_results/export_more_fields/3661344653573.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,8 +62,13 @@
"off:ecoscore_data.adjustments.production_system.value" : "15",
"off:ecoscore_data.adjustments.threatened_species.value" : "",
"off:ecoscore_data.agribalyse.code" : "",
"off:ecoscore_data.missing_key_data" : "1",
"off:ecoscore_grade" : "unknown",
"off:ecoscore_score" : "",
"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",
"off:nutriscore_grade" : "c",
"off:nutriscore_score" : "6",
"origin_fr" : "",
Expand Down
5 changes: 5 additions & 0 deletions t/expected_test_results/export_more_fields/3760178254021.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,8 +62,13 @@
"off:ecoscore_data.adjustments.production_system.value" : "0",
"off:ecoscore_data.adjustments.threatened_species.value" : "",
"off:ecoscore_data.agribalyse.code" : "",
"off:ecoscore_data.missing_key_data" : "1",
"off:ecoscore_grade" : "unknown",
"off:ecoscore_score" : "",
"off:food_groups" : "",
"off:food_groups_tags" : "",
"off:nova_groups" : "",
"off:nova_groups_tags" : "",
"off:nutriscore_grade" : "",
"off:nutriscore_score" : "",
"origin_fr" : "",
Expand Down
5 changes: 5 additions & 0 deletions t/expected_test_results/export_more_fields/3770013801303.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,8 +62,13 @@
"off:ecoscore_data.adjustments.production_system.value" : "",
"off:ecoscore_data.adjustments.threatened_species.value" : "",
"off:ecoscore_data.agribalyse.code" : "",
"off:ecoscore_data.missing_key_data" : "",
"off:ecoscore_grade" : "not-applicable",
"off:ecoscore_score" : "",
"off:food_groups" : "en:sweetened-beverages",
"off:food_groups_tags" : "en:beverages,en:sweetened-beverages",
"off:nova_groups" : "",
"off:nova_groups_tags" : "",
"off:nutriscore_grade" : "",
"off:nutriscore_score" : "",
"origin_fr" : "",
Expand Down
5 changes: 5 additions & 0 deletions t/expected_test_results/export_more_fields/5050083706622.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,8 +62,13 @@
"off:ecoscore_data.adjustments.production_system.value" : "0",
"off:ecoscore_data.adjustments.threatened_species.value" : "-10",
"off:ecoscore_data.agribalyse.code" : "32135",
"off:ecoscore_data.missing_key_data" : "",
"off:ecoscore_grade" : "c",
"off:ecoscore_score" : "44",
"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",
"off:nutriscore_grade" : "d",
"off:nutriscore_score" : "18",
"origin_fr" : "",
Expand Down
5 changes: 5 additions & 0 deletions t/expected_test_results/export_more_fields/5410803950689.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,8 +62,13 @@
"off:ecoscore_data.adjustments.production_system.value" : "0",
"off:ecoscore_data.adjustments.threatened_species.value" : "",
"off:ecoscore_data.agribalyse.code" : "",
"off:ecoscore_data.missing_key_data" : "",
"off:ecoscore_grade" : "unknown",
"off:ecoscore_score" : "",
"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" : "",
"off:nutriscore_grade" : "e",
"off:nutriscore_score" : "21",
"origin_fr" : "",
Expand Down
5 changes: 5 additions & 0 deletions t/expected_test_results/export_more_fields/5601009974337.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,8 +62,13 @@
"off:ecoscore_data.adjustments.production_system.value" : "0",
"off:ecoscore_data.adjustments.threatened_species.value" : "",
"off:ecoscore_data.agribalyse.code" : "",
"off:ecoscore_data.missing_key_data" : "",
"off:ecoscore_grade" : "unknown",
"off:ecoscore_score" : "",
"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",
"off:nutriscore_grade" : "b",
"off:nutriscore_score" : "1",
"origin_fr" : "",
Expand Down
5 changes: 5 additions & 0 deletions t/expected_test_results/export_more_fields/71464240608.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,8 +62,13 @@
"off:ecoscore_data.adjustments.production_system.value" : "0",
"off:ecoscore_data.adjustments.threatened_species.value" : "",
"off:ecoscore_data.agribalyse.code" : "",
"off:ecoscore_data.missing_key_data" : "1",
"off:ecoscore_grade" : "unknown",
"off:ecoscore_score" : "",
"off:food_groups" : "",
"off:food_groups_tags" : "",
"off:nova_groups" : "4",
"off:nova_groups_tags" : "en:4-ultra-processed-food-and-drink-products",
"off:nutriscore_grade" : "e",
"off:nutriscore_score" : "18",
"origin_fr" : "",
Expand Down
5 changes: 5 additions & 0 deletions t/expected_test_results/export_more_fields/77000001.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,8 +62,13 @@
"off:ecoscore_data.adjustments.production_system.value" : "0",
"off:ecoscore_data.adjustments.threatened_species.value" : "",
"off:ecoscore_data.agribalyse.code" : "31032",
"off:ecoscore_data.missing_key_data" : "1",
"off:ecoscore_grade" : "d",
"off:ecoscore_score" : "20",
"off:food_groups" : "en:sweets",
"off:food_groups_tags" : "en:sugary-snacks,en:sweets",
"off:nova_groups" : "",
"off:nova_groups_tags" : "",
"off:nutriscore_grade" : "",
"off:nutriscore_score" : "",
"origin_fr" : "",
Expand Down
5 changes: 5 additions & 0 deletions t/expected_test_results/export_more_fields/7804659650035.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,8 +62,13 @@
"off:ecoscore_data.adjustments.production_system.value" : "0",
"off:ecoscore_data.adjustments.threatened_species.value" : "",
"off:ecoscore_data.agribalyse.code" : "11054",
"off:ecoscore_data.missing_key_data" : "1",
"off:ecoscore_grade" : "d",
"off:ecoscore_score" : "29",
"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" : "",
"off:nutriscore_grade" : "d",
"off:nutriscore_score" : "11",
"origin_fr" : "",
Expand Down
5 changes: 5 additions & 0 deletions t/expected_test_results/export_more_fields/80650904.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,8 +62,13 @@
"off:ecoscore_data.adjustments.production_system.value" : "0",
"off:ecoscore_data.adjustments.threatened_species.value" : "",
"off:ecoscore_data.agribalyse.code" : "",
"off:ecoscore_data.missing_key_data" : "1",
"off:ecoscore_grade" : "unknown",
"off:ecoscore_score" : "",
"off:food_groups" : "",
"off:food_groups_tags" : "",
"off:nova_groups" : "",
"off:nova_groups_tags" : "",
"off:nutriscore_grade" : "",
"off:nutriscore_score" : "",
"origin_fr" : "",
Expand Down
5 changes: 5 additions & 0 deletions t/expected_test_results/export_more_fields/8712423020221.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,8 +62,13 @@
"off:ecoscore_data.adjustments.production_system.value" : "0",
"off:ecoscore_data.adjustments.threatened_species.value" : "",
"off:ecoscore_data.agribalyse.code" : "",
"off:ecoscore_data.missing_key_data" : "1",
"off:ecoscore_grade" : "unknown",
"off:ecoscore_score" : "",
"off:food_groups" : "",
"off:food_groups_tags" : "",
"off:nova_groups" : "",
"off:nova_groups_tags" : "",
"off:nutriscore_grade" : "",
"off:nutriscore_score" : "",
"origin_fr" : "",
Expand Down
5 changes: 5 additions & 0 deletions t/expected_test_results/export_more_fields/8722700472575.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,8 +62,13 @@
"off:ecoscore_data.adjustments.production_system.value" : "0",
"off:ecoscore_data.adjustments.threatened_species.value" : "",
"off:ecoscore_data.agribalyse.code" : "11187",
"off:ecoscore_data.missing_key_data" : "",
"off:ecoscore_grade" : "d",
"off:ecoscore_score" : "34",
"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",
"off:nutriscore_grade" : "d",
"off:nutriscore_score" : "13",
"origin_fr" : "",
Expand Down
5 changes: 5 additions & 0 deletions t/expected_test_results/export_more_fields/9002355004345.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,8 +62,13 @@
"off:ecoscore_data.adjustments.production_system.value" : "0",
"off:ecoscore_data.adjustments.threatened_species.value" : "",
"off:ecoscore_data.agribalyse.code" : "31024",
"off:ecoscore_data.missing_key_data" : "",
"off:ecoscore_grade" : "c",
"off:ecoscore_score" : "43",
"off:food_groups" : "en:sweets",
"off:food_groups_tags" : "en:sugary-snacks,en:sweets",
"off:nova_groups" : "",
"off:nova_groups_tags" : "",
"off:nutriscore_grade" : "c",
"off:nutriscore_score" : "7",
"origin_fr" : "",
Expand Down
Binary file modified taxonomies/ingredients.result.sto
View file
Open in desktop
Binary file not shown.
Loading