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

fix: better packaging misc facet #7842

Merged
merged 5 commits into from
Dec 19, 2022
Merged

fix: better packaging misc facet #7842

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
6eccba1
fix: better misc packaging facets
stephanegigandet Dec 12, 2022
9639705
typo
stephanegigandet Dec 12, 2022
9dfa752
update tests
stephanegigandet Dec 15, 2022
a96468c
Merge branch 'main' into packaging-misc
stephanegigandet Dec 16, 2022
bc52fee
update tests
stephanegigandet Dec 16, 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
26 changes: 16 additions & 10 deletions lib/ProductOpener/Packaging.pm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -686,9 +686,10 @@ sub set_packaging_misc_tags ($product_ref) {
remove_tag($product_ref, "misc", "en:packagings-not-empty");
remove_tag($product_ref, "misc", "en:packagings-not-empty-but-not-complete");
remove_tag($product_ref, "misc", "en:packagings-with-weights");
remove_tag($product_ref, "misc", "en:packagings-complete-with-weights");
remove_tag($product_ref, "misc", "en:packagings-not-complete-with-weights");
remove_tag($product_ref, "misc", "en:packagings-with-some-weights");
remove_tag($product_ref, "misc", "en:packagings-with-all-weights");
remove_tag($product_ref, "misc", "en:packagings-with-all-weights-complete");
remove_tag($product_ref, "misc", "en:packagings-with-all-weights-not-complete");
remove_tag($product_ref, "misc", "en:packagings-with-some-but-not-all-weights");

# Number of packaging components
my $number_of_packaging_components
Expand Down Expand Up @@ -718,18 +719,23 @@ sub set_packaging_misc_tags ($product_ref) {
$components_with_weights++;
}
}
if ($components_with_weights == $number_of_packaging_components) {
if ($components_with_weights > 0) {

add_tag($product_ref, "misc", "en:packagings-with-weights");
if ($product_ref->{packagings_complete}) {
add_tag($product_ref, "misc", "en:packagings-complete-with-weights");

if ($components_with_weights == $number_of_packaging_components) {
add_tag($product_ref, "misc", "en:packagings-with-all-weights");
if ($product_ref->{packagings_complete}) {
add_tag($product_ref, "misc", "en:packagings-with-all-weights-complete");
}
else {
add_tag($product_ref, "misc", "en:packagings-with-all-weights-not-complete");
}
}
else {
add_tag($product_ref, "misc", "en:packagings-not-complete-with-weights");
add_tag($product_ref, "misc", "en:packagings-with-some-but-not-all-weights");
}
}
elsif ($components_with_weights > 0) {
add_tag($product_ref, "misc", "en:packagings-with-some-weights");
}
}

return;
Expand Down
2 changes: 1 addition & 1 deletion ...ntegration/expected_test_results/api_v2_product_write/get-product-auth-good-password.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,7 @@
"origins_of_ingredients" : {
"aggregated_origins" : [
{
"epi_score" : 0,
"epi_score" : "0",
"origin" : "en:unknown",
"percent" : 100,
"transportation_score" : null
Expand Down
2 changes: 1 addition & 1 deletion tests/integration/expected_test_results/api_v3_product_read/get-existing-product.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@
"origins_of_ingredients" : {
"aggregated_origins" : [
{
"epi_score" : 0,
"epi_score" : "0",
"origin" : "en:unknown",
"percent" : 100,
"transportation_score" : null
Expand Down
2 changes: 1 addition & 1 deletion ...ed_test_results/api_v3_product_read/get-fields-attribute-groups-all-knowledge-panels.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -398,7 +398,7 @@
"origins_of_ingredients" : {
"aggregated_origins" : [
{
"epi_score" : 0,
"epi_score" : "0",
"origin" : "en:unknown",
"percent" : 100,
"transportation_score" : null
Expand Down
3 changes: 2 additions & 1 deletion ...tion/expected_test_results/api_v3_product_write/patch-packagings-quantity-and-weight.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,8 @@
"en:packagings-not-empty-but-not-complete",
"en:packagings-not-empty",
"en:packagings-with-weights",
"en:packagings-not-complete-with-weights",
"en:packagings-with-all-weights",
"en:packagings-with-all-weights-not-complete",
"en:ecoscore-extended-data-not-computed",
"en:ecoscore-not-computed",
"en:main-countries-new-product"
Expand Down
3 changes: 2 additions & 1 deletion ...egration/expected_test_results/api_v3_product_write/patch-weight-as-number-or-string.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,8 @@
"en:packagings-not-empty-but-not-complete",
"en:packagings-not-empty",
"en:packagings-with-weights",
"en:packagings-not-complete-with-weights",
"en:packagings-with-all-weights",
"en:packagings-with-all-weights-not-complete",
"en:ecoscore-extended-data-not-computed",
"en:ecoscore-not-computed",
"en:main-countries-new-product"
Expand Down
104 changes: 52 additions & 52 deletions tests/integration/expected_test_results/search_v1/search-no-filter.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"count" : 5,
"page" : "1",
"page" : 1,
"page_count" : 5,
"page_size" : 24,
"products" : [
Expand Down Expand Up @@ -61,7 +61,7 @@
"2xxxxxxxxxxx"
],
"complete" : 0,
"completeness" : "0.5",
"completeness" : 0.5,
"correctors_tags" : [],
"created_t" : "--ignore--",
"creator" : "tests",
Expand Down Expand Up @@ -320,21 +320,21 @@
},
{
"ecoscore_material_score" : 76,
"ecoscore_shape_ratio" : "0.2",
"ecoscore_shape_ratio" : 0.2,
"material" : "en:steel",
"number_of_units" : 1,
"shape" : "en:lid"
},
{
"ecoscore_material_score" : 0,
"ecoscore_shape_ratio" : "0.1",
"ecoscore_shape_ratio" : 0.1,
"material" : "en:plastic",
"non_recyclable_and_non_biodegradable" : "maybe",
"number_of_units" : 1,
"shape" : "en:film"
}
],
"score" : "66.2",
"score" : 66.2,
"value" : -3
},
"production_system" : {
Expand Down Expand Up @@ -369,23 +369,23 @@
"entry_dates_tags" : "--ignore--",
"food_groups_tags" : [],
"forest_footprint_data" : {
"footprint_per_kg" : "0.0074375",
"footprint_per_kg" : 0.0074375,
"grade" : "a",
"ingredients" : [
{
"conditions_tags" : [],
"footprint_per_kg" : "0.0074375",
"footprint_per_kg" : 0.0074375,
"matching_tag_id" : "en:egg",
"percent" : "9.375",
"percent_estimate" : "9.375",
"percent" : 9.375,
"percent_estimate" : 9.375,
"processing_factor" : 1,
"tag_id" : "en:egg",
"tag_type" : "ingredients",
"type" : {
"deforestation_risk" : "0.68",
"deforestation_risk" : 0.68,
"name" : "Oeufs Importés",
"soy_feed_factor" : "0.035",
"soy_yield" : "0.3"
"soy_feed_factor" : 0.035,
"soy_yield" : 0.3
}
}
]
Expand All @@ -399,7 +399,7 @@
"ingredients" : [
{
"id" : "en:apple",
"percent_estimate" : "62.5",
"percent_estimate" : 62.5,
"percent_max" : 100,
"percent_min" : 25,
"rank" : 1,
Expand All @@ -409,7 +409,7 @@
},
{
"id" : "en:milk",
"percent_estimate" : "18.75",
"percent_estimate" : 18.75,
"percent_max" : 50,
"percent_min" : 0,
"rank" : 2,
Expand All @@ -419,8 +419,8 @@
},
{
"id" : "en:egg",
"percent_estimate" : "9.375",
"percent_max" : "33.3333333333333",
"percent_estimate" : 9.375,
"percent_max" : 33.3333333333333,
"percent_min" : 0,
"rank" : 3,
"text" : "eggs",
Expand All @@ -430,7 +430,7 @@
{
"from_palm_oil" : "yes",
"id" : "en:palm-oil",
"percent_estimate" : "9.375",
"percent_estimate" : 9.375,
"percent_max" : 25,
"percent_min" : 0,
"rank" : 4,
Expand Down Expand Up @@ -710,7 +710,7 @@
"2xxxxxxxxxxx"
],
"complete" : 0,
"completeness" : "0.5",
"completeness" : 0.5,
"correctors_tags" : [],
"created_t" : "--ignore--",
"creator" : "tests",
Expand Down Expand Up @@ -1251,7 +1251,7 @@
"2xxxxxxxxxxx"
],
"complete" : 0,
"completeness" : "0.5",
"completeness" : 0.5,
"correctors_tags" : [],
"created_t" : "--ignore--",
"creator" : "tests",
Expand Down Expand Up @@ -1533,23 +1533,23 @@
"entry_dates_tags" : "--ignore--",
"food_groups_tags" : [],
"forest_footprint_data" : {
"footprint_per_kg" : "0.0132222222222222",
"footprint_per_kg" : 0.0132222222222222,
"grade" : "a",
"ingredients" : [
{
"conditions_tags" : [],
"footprint_per_kg" : "0.0132222222222222",
"footprint_per_kg" : 0.0132222222222222,
"matching_tag_id" : "en:egg",
"percent" : "16.6666666666667",
"percent_estimate" : "16.6666666666667",
"percent" : 16.6666666666667,
"percent_estimate" : 16.6666666666667,
"processing_factor" : 1,
"tag_id" : "en:egg",
"tag_type" : "ingredients",
"type" : {
"deforestation_risk" : "0.68",
"deforestation_risk" : 0.68,
"name" : "Oeufs Importés",
"soy_feed_factor" : "0.035",
"soy_yield" : "0.3"
"soy_feed_factor" : 0.035,
"soy_yield" : 0.3
}
}
]
Expand All @@ -1563,17 +1563,17 @@
"ingredients" : [
{
"id" : "en:apple",
"percent_estimate" : "66.6666666666667",
"percent_estimate" : 66.6666666666667,
"percent_max" : 100,
"percent_min" : "33.3333333333333",
"percent_min" : 33.3333333333333,
"rank" : 1,
"text" : "apple",
"vegan" : "yes",
"vegetarian" : "yes"
},
{
"id" : "en:milk",
"percent_estimate" : "16.6666666666667",
"percent_estimate" : 16.6666666666667,
"percent_max" : 50,
"percent_min" : 0,
"rank" : 2,
Expand All @@ -1583,8 +1583,8 @@
},
{
"id" : "en:egg",
"percent_estimate" : "16.6666666666667",
"percent_max" : "33.3333333333333",
"percent_estimate" : 16.6666666666667,
"percent_max" : 33.3333333333333,
"percent_min" : 0,
"rank" : 3,
"text" : "eggs",
Expand Down Expand Up @@ -1696,8 +1696,8 @@
"nutrient_levels" : {},
"nutrient_levels_tags" : [],
"nutriments" : {
"fruits-vegetables-nuts-estimate-from-ingredients_100g" : "33.3333333333333",
"fruits-vegetables-nuts-estimate-from-ingredients_serving" : "33.3333333333333",
"fruits-vegetables-nuts-estimate-from-ingredients_100g" : 33.3333333333333,
"fruits-vegetables-nuts-estimate-from-ingredients_serving" : 33.3333333333333,
"nova-group" : 1,
"nova-group_100g" : 1,
"nova-group_serving" : 1
Expand Down Expand Up @@ -1827,7 +1827,7 @@
"2xxxxxxxxxxx"
],
"complete" : 0,
"completeness" : "0.5",
"completeness" : 0.5,
"correctors_tags" : [],
"created_t" : "--ignore--",
"creator" : "tests",
Expand Down Expand Up @@ -2121,24 +2121,24 @@
"ingredients" : [
{
"id" : "es:apple",
"percent_estimate" : "66.6666666666667",
"percent_estimate" : 66.6666666666667,
"percent_max" : 100,
"percent_min" : "33.3333333333333",
"percent_min" : 33.3333333333333,
"rank" : 1,
"text" : "apple"
},
{
"id" : "es:water",
"percent_estimate" : "16.6666666666667",
"percent_estimate" : 16.6666666666667,
"percent_max" : 50,
"percent_min" : 0,
"rank" : 2,
"text" : "water"
},
{
"id" : "es:palm-oil",
"percent_estimate" : "16.6666666666667",
"percent_max" : "33.3333333333333",
"percent_estimate" : 16.6666666666667,
"percent_max" : 33.3333333333333,
"percent_min" : 0,
"rank" : 3,
"text" : "palm oil"
Expand Down Expand Up @@ -2396,7 +2396,7 @@
"2xxxxxxxxxxx"
],
"complete" : 0,
"completeness" : "0.5",
"completeness" : 0.5,
"correctors_tags" : [],
"created_t" : "--ignore--",
"creator" : "tests",
Expand Down Expand Up @@ -2660,22 +2660,22 @@
},
"agribalyse" : {
"agribalyse_proxy_food_code" : "32135",
"co2_agriculture" : "2.2396004",
"co2_agriculture" : 2.2396004,
"co2_consumption" : 0,
"co2_distribution" : "0.019530673",
"co2_packaging" : "0.28159592",
"co2_processing" : "0.77051126",
"co2_total" : "3.564111983",
"co2_transportation" : "0.25287373",
"co2_distribution" : 0.019530673,
"co2_packaging" : 0.28159592,
"co2_processing" : 0.77051126,
"co2_total" : 3.564111983,
"co2_transportation" : 0.25287373,
"code" : "32135",
"dqr" : "4.03",
"ef_agriculture" : "0.50064279",
"ef_agriculture" : 0.50064279,
"ef_consumption" : 0,
"ef_distribution" : "0.0048315303",
"ef_packaging" : "0.023715692",
"ef_processing" : "0.078716079",
"ef_total" : "0.6323498093",
"ef_transportation" : "0.024443718",
"ef_distribution" : 0.0048315303,
"ef_packaging" : 0.023715692,
"ef_processing" : 0.078716079,
"ef_total" : 0.6323498093,
"ef_transportation" : 0.024443718,
"is_beverage" : 0,
"name_en" : "Breakfast cereals, mix of puffed or extruded cereals, fortified with vitamins and chemical elements",
"name_fr" : "Multi-céréales soufflées ou extrudées, enrichies en vitamines et minéraux",
Expand Down
Loading