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

feat: data-quality/apply-remove_insignificant_digits-for-nutriments #11147

Merged
merged 2 commits into from
Jan 2, 2025
Merged

feat: data-quality/apply-remove_insignificant_digits-for-nutriments #11147

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
091ef22
data-quality/apply-remove_insignificant_digits-for-nutriments
benbenben2 Dec 19, 2024
c90039e
upd unit test
benbenben2 Dec 19, 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
4 changes: 3 additions & 1 deletion lib/ProductOpener/Food.pm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@ use ProductOpener::Lang qw/$lc %Lang %Langs lang/;
use ProductOpener::Tags qw/:all/;
use ProductOpener::Images qw/extract_text_from_image/;
use ProductOpener::Nutriscore qw/compute_nutriscore_score_and_grade/;
use ProductOpener::Numbers qw/convert_string_to_number round_to_max_decimal_places/;
use ProductOpener::Numbers qw/:all/;
use ProductOpener::Ingredients
qw/estimate_nutriscore_2021_milk_percent_from_ingredients estimate_nutriscore_2023_red_meat_percent_from_ingredients/;
use ProductOpener::Text qw/remove_tags_and_quote/;
Expand Down Expand Up @@ -349,6 +349,8 @@ sub assign_nid_modifier_value_and_unit ($product_ref, $nid, $modifier, $value, $

$value = convert_string_to_number($value);

$value = remove_insignificant_digits($value);

$product_ref->{nutriments}{$nid . "_unit"} = $unit;
$product_ref->{nutriments}{$nid . "_value"} = $value;
# Convert values passed in international units IU or % of daily value % DV to the default unit for the nutrient
Expand Down
86 changes: 86 additions & 0 deletions tests/unit/food.t
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -276,11 +276,15 @@ $expected_product_ref = {
'nutrition_data_prepared' => 'on',
'nutrition_data_prepared_per' => 'serving',
'product_quantity' => 100,
'product_quantity_unit' => 'g',
'quantity' => '100 g',
'serving_quantity' => 25,
'serving_quantity_unit' => 'g',
'serving_size' => '25 g'
};

is($product_ref, $expected_product_ref) or diag Dumper($product_ref);

# Unknown nutrient

$product_ref = {
Expand Down Expand Up @@ -574,4 +578,86 @@ specific_processes_for_food_product($product_ref);

ok((not has_tag($product_ref, 'additives', 'en:e330')), 'should not have en:330') || diag Dumper $product_ref;

# same logic as in process_product_edit_rules.t:
# the single_param function in Display is overwritten (monkey patch)
# to allow to run the function assign_nid_modifier_value_and_unit
# otherwise the following line prevent tests to run as expected:
# "next if (not defined single_param("nutriment_${enid}${product_type}"));"
my @tests = (
{
id => "rm insignificants digits",
desc => "Should round floats",
form => {
'nutriment_energy-kj' => '0.40000000596046',
'nutriment_energy_unit' => 'kJ',
'nutriment_fat' => '3.99999',
'nutriment_fat_unit' => 'g',
'nutriment_salt' => '1.000001',
'nutriment_salt_unit' => 'g',
},
nutriment_table => "europe",
product_ref => {
'nutriments' => {}
},
expected_product_ref => {
'nutriments' => {
'energy' => '0.4',
'energy_100g' => '0.4',
'energy_unit' => 'kJ',
'energy_value' => '0.4',
'energy-kj' => '0.4',
'energy-kj_100g' => '0.4',
'energy-kj_unit' => 'kJ',
'energy-kj_value' => '0.4',
'fat' => '4',
'fat_100g' => '4',
'fat_unit' => 'g',
'fat_value' => '4',
'salt' => '1',
'salt_100g' => '1',
'salt_unit' => 'g',
'salt_value' => '1'
},
nutrition_data_per => "100g",
nutrition_data_prepared_per => "100g",
},
}
);
my %form = ();
{
# monkey patch single_param
my $display_module = mock 'ProductOpener::Display' => (
override => [
single_param => sub {
my ($name) = @_;
return scalar $form{$name};
}
]
);
# because this is a direct import in Food we have to monkey patch here too
my $products_module = mock 'ProductOpener::Food' => (
override => [
single_param => sub {
my ($name) = @_;
return scalar $form{$name};
}
]
);
foreach my $test_ref (@tests) {
eval {
my $id = $test_ref->{id};
my $desc = $test_ref->{desc};
my %product = %{$test_ref->{product_ref}};
%form = %{$test_ref->{form}};
assign_nutriments_values_from_request_parameters(\%product, $test_ref->{nutriment_table});
compute_nutrition_data_per_100g_and_per_serving(\%product);

is(\%product, $test_ref->{expected_product_ref}, "Result for $id - $desc");
};
if ($@) {
diag("Error running test: $@");
}
}
}

done_testing();
Loading