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: data quality downgrade some errors to warnings #10263

Merged
merged 4 commits into from
May 15, 2024
Merged

fix: data quality downgrade some errors to warnings #10263

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
58b9509
data quality: downgrade some errors to warnings
benbenben2 May 10, 2024
31e28eb
make lint
benbenben2 May 10, 2024
e3a11a1
Merge branch 'main' into dq_downgrade_errors_to_warnings
stephanegigandet May 14, 2024
cd0e601
Merge branch 'main' into dq_downgrade_errors_to_warnings
benbenben2 May 14, 2024
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: 21 additions & 5 deletions lib/ProductOpener/DataQualityFood.pm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1104,17 +1104,33 @@ sub check_nutrition_data ($product_ref) {
$nid2 =~ s/_/-/g;

if (($nid !~ /energy/) and ($nid !~ /footprint/) and ($product_ref->{nutriments}{$nid} > 105)) {

push @{$product_ref->{data_quality_errors_tags}}, "en:nutrition-value-over-105-$nid2";
# product opener / ingredients analysis issue (See issue #10064)
if ($nid =~ /estimate/) {
push @{$product_ref->{data_quality_warnings_tags}}, "en:nutrition-value-over-105-$nid2";
}
else {
push @{$product_ref->{data_quality_errors_tags}}, "en:nutrition-value-over-105-$nid2";
}
}

if (($nid !~ /energy/) and ($nid !~ /footprint/) and ($product_ref->{nutriments}{$nid} > 1000)) {

push @{$product_ref->{data_quality_errors_tags}}, "en:nutrition-value-over-1000-$nid2";
# product opener / ingredients analysis issue (See issue #10064)
if ($nid =~ /estimate/) {
push @{$product_ref->{data_quality_warnings_tags}}, "en:nutrition-value-over-1000-$nid2";
}
else {
push @{$product_ref->{data_quality_errors_tags}}, "en:nutrition-value-over-1000-$nid2";
}
}

if (($product_ref->{nutriments}{$nid} < 0) and (index($nid, "nutrition-score") == -1)) {
push @{$product_ref->{data_quality_errors_tags}}, "en:nutrition-value-negative-$nid2";
# product opener / ingredients analysis issue (See issue #10064)
if ($nid =~ /estimate/) {
push @{$product_ref->{data_quality_warnings_tags}}, "en:nutrition-value-negative-$nid2";
}
else {
push @{$product_ref->{data_quality_errors_tags}}, "en:nutrition-value-negative-$nid2";
}
}
}

Expand Down
32 changes: 26 additions & 6 deletions tests/unit/dataqualityfood.t
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,19 +12,20 @@ use ProductOpener::DataQualityFood qw/:all/;
use ProductOpener::Tags qw/has_tag/;
use ProductOpener::Ingredients qw/extract_ingredients_from_text/;

sub check_quality_and_test_product_has_quality_tag($$$$) {
sub check_quality_and_test_product_has_quality_tag($$$$;$) {
my $product_ref = shift;
my $tag = shift;
my $tag_name = shift;
my $reason = shift;
my $yesno = shift;
my $tag_level = shift // 'data_quality';
ProductOpener::DataQuality::check_quality($product_ref);
if ($yesno) {
ok(has_tag($product_ref, 'data_quality', $tag), $reason)
or diag Dumper {tag => $tag, yesno => $yesno, product => $product_ref};
ok(has_tag($product_ref, $tag_level, $tag_name), $reason)
or diag Dumper {tag => $tag_name, yesno => $yesno, product => $product_ref};
}
else {
ok(!has_tag($product_ref, 'data_quality', $tag), $reason)
or diag Dumper {tag => $tag, yesno => $yesno, product => $product_ref};
ok(!has_tag($product_ref, $tag_level, $tag_name), $reason)
or diag Dumper {tag => $tag_name, yesno => $yesno, product => $product_ref};
}

return;
Expand Down Expand Up @@ -543,6 +544,25 @@ check_quality_and_test_product_has_quality_tag(
'nutriment should have positive value (except nutrition-score)', 0
);

# en:nutrition-value-negative-$nid warning only should be raised - for nutriments containing "estimate"
$product_ref = {
nutriments => {
"fruits-vegetables-nuts-estimate-from-ingredients_100g" => -0.0000194786420834592,
}
};
check_quality_and_test_product_has_quality_tag(
$product_ref,
'en:nutrition-value-negative-fruits-vegetables-nuts-estimate-from-ingredients',
'negative nutriments containg "estimate" should not raise error',
0, 'data_quality_errors'
);
check_quality_and_test_product_has_quality_tag(
$product_ref,
'en:nutrition-value-negative-fruits-vegetables-nuts-estimate-from-ingredients',
'negative nutriments containg "estimate" should raise warning only',
1, 'data_quality_warnings'
);

# serving size should contains digits
$product_ref = {serving_size => "serving_size"};
ProductOpener::DataQuality::check_quality($product_ref);
Expand Down
Loading