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

fix: dq_nutrition_rm_salt_under_01g #9464

Merged
merged 2 commits into from
Dec 5, 2023
Merged

fix: dq_nutrition_rm_salt_under_01g #9464

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
68951a6
dq_nutrition_rm_salt_under_01g
benbenben2 Dec 1, 2023
79be7bb
upd tests
benbenben2 Dec 2, 2023
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
4 changes: 1 addition & 3 deletions lib/ProductOpener/DataQualityFood.pm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1260,6 +1260,7 @@ sub check_nutrition_data ($product_ref) {
}

# Too small salt value? (e.g. g entered in mg)
# warning for salt < 0.1 was removed because it was leading to too much false positives (see #9346)
if ((defined $product_ref->{nutriments}{"salt_100g"}) and ($product_ref->{nutriments}{"salt_100g"} > 0)) {

if ($product_ref->{nutriments}{"salt_100g"} < 0.001) {
Expand All @@ -1268,9 +1269,6 @@ sub check_nutrition_data ($product_ref) {
elsif ($product_ref->{nutriments}{"salt_100g"} < 0.01) {
push @{$product_ref->{data_quality_warnings_tags}}, "en:nutrition-value-under-0-01-g-salt";
}
elsif ($product_ref->{nutriments}{"salt_100g"} < 0.1) {
push @{$product_ref->{data_quality_warnings_tags}}, "en:nutrition-value-under-0-1-g-salt";
}
}

# some categories have expected nutriscore grade - push data quality error if calculated nutriscore grade differs from expected nutriscore grade or if it is not calculated
Expand Down
4 changes: 0 additions & 4 deletions taxonomies/data_quality.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2732,10 +2732,6 @@ en:Nutrition value under 0,001 g - Salt
en:Nutrition value under 0,01 g - Salt
#description:en:

<en:Nutrition warnings
en:Nutrition value under 0,1 g salt
#description:en:

<en:Nutrition warnings
en:Nutrition value very high for category - Carbohydrates
description:en:Compared to the category average, the Carbohydrates value is abnormally high.
Expand Down
2 changes: 0 additions & 2 deletions ...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 @@ -99,12 +99,10 @@
"en:food-groups-1-known",
"en:food-groups-2-known",
"en:food-groups-3-unknown",
"en:nutrition-value-under-0-1-g-salt",
"en:ecoscore-origins-of-ingredients-origins-are-100-percent-unknown",
"en:ecoscore-packaging-packaging-data-missing"
],
"data_quality_warnings_tags" : [
"en:nutrition-value-under-0-1-g-salt",
"en:ecoscore-origins-of-ingredients-origins-are-100-percent-unknown",
"en:ecoscore-packaging-packaging-data-missing"
],
Expand Down
2 changes: 0 additions & 2 deletions tests/integration/expected_test_results/api_v2_product_write/get-product.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,12 +99,10 @@
"en:food-groups-1-known",
"en:food-groups-2-known",
"en:food-groups-3-unknown",
"en:nutrition-value-under-0-1-g-salt",
"en:ecoscore-origins-of-ingredients-origins-are-100-percent-unknown",
"en:ecoscore-packaging-packaging-data-missing"
],
"data_quality_warnings_tags" : [
"en:nutrition-value-under-0-1-g-salt",
"en:ecoscore-origins-of-ingredients-origins-are-100-percent-unknown",
"en:ecoscore-packaging-packaging-data-missing"
],
Expand Down
53 changes: 53 additions & 0 deletions tests/unit/dataqualityfood.t
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -848,6 +848,59 @@ check_quality_and_test_product_has_quality_tag(
'sum of fructose plus glucose plus maltose plus lactose plus sucrose cannot be greater than sugars', 0
);

# salt_100g is very small warning (may be in mg)
## lower than 0.001
$product_ref = {
nutriments => {
salt_100g => 0.0009, # lower than 0.001
}
};
ProductOpener::DataQuality::check_quality($product_ref);
check_quality_and_test_product_has_quality_tag(
$product_ref,
'en:nutrition-value-under-0-001-g-salt',
'value for salt is lower than 0.001g', 1
);
check_quality_and_test_product_has_quality_tag(
$product_ref,
'en:nutrition-value-under-0-01-g-salt',
'value for salt is lower than 0.001g, should not trigger warning for 0.01', 0
);
## lower than 0.01
$product_ref = {
nutriments => {
salt_100g => 0.009, # lower than 0.01
}
};
ProductOpener::DataQuality::check_quality($product_ref);
check_quality_and_test_product_has_quality_tag(
$product_ref,
'en:nutrition-value-under-0-001-g-salt',
'value for salt is above 0.001g', 0
);
check_quality_and_test_product_has_quality_tag(
$product_ref,
'en:nutrition-value-under-0-01-g-salt',
'value for salt is lower than 0.001g, and above 0.01', 1
);
## above 0.01
$product_ref = {
nutriments => {
salt_100g => 0.02, # above 0.01
}
};
ProductOpener::DataQuality::check_quality($product_ref);
check_quality_and_test_product_has_quality_tag(
$product_ref,
'en:nutrition-value-under-0-001-g-salt',
'value for salt is above 0.001g', 0
);
check_quality_and_test_product_has_quality_tag(
$product_ref,
'en:nutrition-value-under-0-01-g-salt',
'value for salt is above 0.001g', 0
);

# testing of ProductOpener::DataQualityFood::check_quantity subroutine
$product_ref = {quantity => "300g"};
ProductOpener::DataQuality::check_quality($product_ref);
Expand Down
Loading