From 176fe9eed7247fe155769b242e0bcdb860343ffb Mon Sep 17 00:00:00 2001
From: benbenben2 <110821832+benbenben2@users.noreply.github.com>
Date: Tue, 7 Jan 2025 13:06:02 +0100
Subject: [PATCH] fix: remove warning in Display.pm related to Environmental
 Scoring (#11172)

**Fixed the following**
Use of uninitialized value in uc at
/opt/product-opener/lib/ProductOpener/Display.pm line 8006.
Argument "" isn't numeric in sprintf at
/opt/product-opener/lib/ProductOpener/Display.pm line 467.

---------

Co-authored-by: Pierre Slamich <pierre@openfoodfacts.org>
Co-authored-by: Alex Garel <alex@openfoodfacts.org>
---
 lib/ProductOpener/Display.pm                  | 31 ++++++++++++++-----
 .../beverage-with-80-percent-milk.json        |  2 +-
 .../nutriscore/breakfast-cereals.json         |  2 +-
 .../cocoa-and-chocolate-powders.json          |  2 +-
 .../nutriscore/colza-oil.json                 |  2 +-
 .../nutriscore/cookies.json                   |  2 +-
 .../dairy-drink-with-80-percent-milk.json     |  2 +-
 ...-drink-with-less-than-80-percent-milk.json |  2 +-
 .../nutriscore/dairy-drinks-without-milk.json |  2 +-
 .../nutriscore/en-avocado-oil.json            |  2 +-
 .../nutriscore/en-beers-category.json         |  2 +-
 ...n-beverage-preparation-flavored-syrup.json |  2 +-
 .../nutriscore/en-cherry-tomatoes.json        |  2 +-
 .../nutriscore/en-milk.json                   |  2 +-
 .../en-olive-oil-no-ingredients.json          |  2 +-
 ...en-olive-oil-unrecognized-ingredients.json |  2 +-
 .../nutriscore/en-olive-oil.json              |  2 +-
 ...orange-juice-category-and-ingredients.json |  2 +-
 .../nutriscore/en-orange-juice-category.json  |  2 +-
 .../nutriscore/en-potatoes-category.json      |  2 +-
 ...ategory-ingredients-with-lots-of-meat.json |  2 +-
 ...ous-category-ingredients-with-no-meat.json |  2 +-
 ...ory-ingredients-with-very-little-meat.json |  2 +-
 ...eat-ambiguous-category-no-ingredients.json |  2 +-
 .../en-red-meat-category-no-ingredients.json  |  2 +-
 ...n-soy-beans-processed-and-unprocessed.json |  2 +-
 .../nutriscore/en-sweeteners-erythritol.json  |  2 +-
 .../nutriscore/en-sweeteners.json             |  2 +-
 .../nutriscore/en-tofu.json                   |  2 +-
 .../nutriscore/en-vegetable-crisps.json       |  2 +-
 .../flavored-spring-with-nutrition.json       |  2 +-
 .../nutriscore/fr-canned-green-beans.json     |  2 +-
 .../nutriscore/fr-canned-pineapple.json       |  2 +-
 .../nutriscore/fr-coconut-milk.json           |  2 +-
 .../nutriscore/fr-gaspacho.json               |  2 +-
 .../nutriscore/fr-green-beans-beverage.json   |  2 +-
 .../nutriscore/fr-ice-tea-with-sweetener.json |  2 +-
 .../fr-mixed-oils-with-olive-oil.json         |  2 +-
 .../nutriscore/fr-orange-nectar-0-fat.json    |  2 +-
 .../fr-plant-beverages-soy-milk.json          |  2 +-
 .../nutriscore/fr-rapeseed-oil.json           |  2 +-
 .../nutriscore/milk.json                      |  2 +-
 .../nutriscore/mushrooms.json                 |  2 +-
 .../nutriscore/olive-oil.json                 |  2 +-
 .../sunflower-oil-no-sugar-no-sat-fat.json    |  2 +-
 .../nutriscore/sunflower-oil-no-sugar.json    |  2 +-
 .../nutriscore/sunflower-oil.json             |  2 +-
 .../nutriscore/walnut-oil.json                |  2 +-
 48 files changed, 71 insertions(+), 54 deletions(-)

diff --git a/lib/ProductOpener/Display.pm b/lib/ProductOpener/Display.pm
index 9dbe3af667433..146eabab55709 100644
--- a/lib/ProductOpener/Display.pm
+++ b/lib/ProductOpener/Display.pm
@@ -421,8 +421,15 @@ sub process_template ($template_filename, $template_data_ref, $result_content_re
 	};
 
 	$template_data_ref->{round} = sub ($var) {
-		return sprintf("%.0f", $var);
+		# Check if $var is defined and is numeric
+		if (defined $var && $var =~ /^-?\d+(\.\d+)?$/) {
+			return sprintf("%.0f", $var);
+		}
+		else {
+			return;
+		}
 	};
+
 	$template_data_ref->{sprintf} = sub ($var1, $var2) {
 		return sprintf($var1, $var2);
 	};
@@ -5455,7 +5462,11 @@ sub search_and_display_products ($request_ref, $query_ref, $sort_by, $limit, $pa
 			$cursor = execute_query(
 				sub {
 					return get_products_collection(get_products_collection_request_parameters($request_ref))
-						->query($query_ref)->fields($fields_ref)->sort($sort_ref)->limit($limit)->skip($skip);
+						->query($query_ref)
+						->fields($fields_ref)
+						->sort($sort_ref)
+						->limit($limit)
+						->skip($skip);
 				}
 			);
 			$log->debug("MongoDB query ok", {error => $@}) if $log->is_debug();
@@ -6920,7 +6931,8 @@ sub search_and_graph_products ($request_ref, $query_ref, $graph_ref) {
 		$cursor = execute_query(
 			sub {
 				return get_products_collection(get_products_collection_request_parameters($request_ref))
-					->query($query_ref)->fields($fields_ref);
+					->query($query_ref)
+					->fields($fields_ref);
 			}
 		);
 	};
@@ -7230,7 +7242,8 @@ sub search_products_for_map ($request_ref, $query_ref) {
 		$cursor = execute_query(
 			sub {
 				return get_products_collection(get_products_collection_request_parameters($request_ref))
-					->query($query_ref)->fields(
+					->query($query_ref)
+					->fields(
 					{
 						code => 1,
 						lc => 1,
@@ -7953,8 +7966,11 @@ JS
 
 		localize_environmental_score($request_ref->{cc}, $product_ref);
 
-		$template_data_ref->{environmental_score_grade} = uc($product_ref->{environmental_score_data}{"grade"});
-		$template_data_ref->{environmental_score_grade_lc} = $product_ref->{environmental_score_data}{"grade"};
+		if (defined $product_ref->{environmental_score_data}{"grade"}) {
+			$template_data_ref->{environmental_score_grade} = uc($product_ref->{environmental_score_data}{"grade"});
+			$template_data_ref->{environmental_score_lc} = $product_ref->{environmental_score_data}{"grade"};
+		}
+
 		$template_data_ref->{environmental_score_score} = $product_ref->{environmental_score_data}{"score"};
 		$template_data_ref->{environmental_score_data} = $product_ref->{environmental_score_data};
 		$template_data_ref->{environmental_score_calculation_details}
@@ -11586,7 +11602,8 @@ sub search_and_analyze_recipes ($request_ref, $query_ref) {
 		$cursor = execute_query(
 			sub {
 				return get_products_collection(get_products_collection_request_parameters($request_ref))
-					->query($query_ref)->fields($fields_ref);
+					->query($query_ref)
+					->fields($fields_ref);
 			}
 		);
 	};
diff --git a/tests/unit/expected_test_results/nutriscore/beverage-with-80-percent-milk.json b/tests/unit/expected_test_results/nutriscore/beverage-with-80-percent-milk.json
index b604503c7d4a1..f8d60373e2843 100644
--- a/tests/unit/expected_test_results/nutriscore/beverage-with-80-percent-milk.json
+++ b/tests/unit/expected_test_results/nutriscore/beverage-with-80-percent-milk.json
@@ -164,7 +164,7 @@
       "salt" : 0,
       "salt_100g" : "0",
       "salt_unit" : "g",
-      "salt_value" : 0,
+      "salt_value" : "0",
       "saturated-fat_100g" : "5",
       "sodium_100g" : 0,
       "sodium_value" : "0",
diff --git a/tests/unit/expected_test_results/nutriscore/breakfast-cereals.json b/tests/unit/expected_test_results/nutriscore/breakfast-cereals.json
index e039b01731f4e..b40c03d2c5eb1 100644
--- a/tests/unit/expected_test_results/nutriscore/breakfast-cereals.json
+++ b/tests/unit/expected_test_results/nutriscore/breakfast-cereals.json
@@ -78,7 +78,7 @@
       "salt" : 0.5525,
       "salt_100g" : 0.5525,
       "salt_unit" : "g",
-      "salt_value" : 0.5525,
+      "salt_value" : "0.5525",
       "saturated-fat_100g" : 1.03,
       "sodium_100g" : 0.221,
       "sodium_value" : 0.221,
diff --git a/tests/unit/expected_test_results/nutriscore/cocoa-and-chocolate-powders.json b/tests/unit/expected_test_results/nutriscore/cocoa-and-chocolate-powders.json
index 6980686b2ec4d..e7ea8fab7d812 100644
--- a/tests/unit/expected_test_results/nutriscore/cocoa-and-chocolate-powders.json
+++ b/tests/unit/expected_test_results/nutriscore/cocoa-and-chocolate-powders.json
@@ -68,7 +68,7 @@
       "salt_prepared" : 0.1125,
       "salt_prepared_100g" : 0.1125,
       "salt_prepared_unit" : "g",
-      "salt_prepared_value" : 0.1125,
+      "salt_prepared_value" : "0.1125",
       "saturated-fat_prepared_100g" : 1.1,
       "sodium_prepared_100g" : 0.045,
       "sodium_prepared_value" : 0.045,
diff --git a/tests/unit/expected_test_results/nutriscore/colza-oil.json b/tests/unit/expected_test_results/nutriscore/colza-oil.json
index f87ab63c65f40..00e3f11e1f4c7 100644
--- a/tests/unit/expected_test_results/nutriscore/colza-oil.json
+++ b/tests/unit/expected_test_results/nutriscore/colza-oil.json
@@ -91,7 +91,7 @@
       "salt" : 0,
       "salt_100g" : "0",
       "salt_unit" : "g",
-      "salt_value" : 0,
+      "salt_value" : "0",
       "saturated-fat_100g" : "7",
       "sodium_100g" : 0,
       "sodium_value" : "0",
diff --git a/tests/unit/expected_test_results/nutriscore/cookies.json b/tests/unit/expected_test_results/nutriscore/cookies.json
index 05d3b66b4c8d8..1fad82d607f7a 100644
--- a/tests/unit/expected_test_results/nutriscore/cookies.json
+++ b/tests/unit/expected_test_results/nutriscore/cookies.json
@@ -73,7 +73,7 @@
       "salt" : 0,
       "salt_100g" : "0",
       "salt_unit" : "g",
-      "salt_value" : 0,
+      "salt_value" : "0",
       "saturated-fat_100g" : "15",
       "sodium_100g" : 0,
       "sodium_value" : "0",
diff --git a/tests/unit/expected_test_results/nutriscore/dairy-drink-with-80-percent-milk.json b/tests/unit/expected_test_results/nutriscore/dairy-drink-with-80-percent-milk.json
index 72484ed650c71..5de3e5dc5f510 100644
--- a/tests/unit/expected_test_results/nutriscore/dairy-drink-with-80-percent-milk.json
+++ b/tests/unit/expected_test_results/nutriscore/dairy-drink-with-80-percent-milk.json
@@ -172,7 +172,7 @@
       "salt" : 0,
       "salt_100g" : "0",
       "salt_unit" : "g",
-      "salt_value" : 0,
+      "salt_value" : "0",
       "saturated-fat_100g" : "5",
       "sodium_100g" : 0,
       "sodium_value" : "0",
diff --git a/tests/unit/expected_test_results/nutriscore/dairy-drink-with-less-than-80-percent-milk.json b/tests/unit/expected_test_results/nutriscore/dairy-drink-with-less-than-80-percent-milk.json
index f560f27330f86..1367341849829 100644
--- a/tests/unit/expected_test_results/nutriscore/dairy-drink-with-less-than-80-percent-milk.json
+++ b/tests/unit/expected_test_results/nutriscore/dairy-drink-with-less-than-80-percent-milk.json
@@ -168,7 +168,7 @@
       "salt" : 0,
       "salt_100g" : "0",
       "salt_unit" : "g",
-      "salt_value" : 0,
+      "salt_value" : "0",
       "saturated-fat_100g" : "5",
       "sodium_100g" : 0,
       "sodium_value" : "0",
diff --git a/tests/unit/expected_test_results/nutriscore/dairy-drinks-without-milk.json b/tests/unit/expected_test_results/nutriscore/dairy-drinks-without-milk.json
index 54210bc5dfe26..7bfee1db46f03 100644
--- a/tests/unit/expected_test_results/nutriscore/dairy-drinks-without-milk.json
+++ b/tests/unit/expected_test_results/nutriscore/dairy-drinks-without-milk.json
@@ -157,7 +157,7 @@
       "salt" : 0,
       "salt_100g" : "0",
       "salt_unit" : "g",
-      "salt_value" : 0,
+      "salt_value" : "0",
       "saturated-fat_100g" : "5",
       "sodium_100g" : 0,
       "sodium_value" : "0",
diff --git a/tests/unit/expected_test_results/nutriscore/en-avocado-oil.json b/tests/unit/expected_test_results/nutriscore/en-avocado-oil.json
index 67a703d9b025c..0a2e130e29e59 100644
--- a/tests/unit/expected_test_results/nutriscore/en-avocado-oil.json
+++ b/tests/unit/expected_test_results/nutriscore/en-avocado-oil.json
@@ -159,7 +159,7 @@
       "sodium" : 0,
       "sodium_100g" : 0,
       "sodium_unit" : "g",
-      "sodium_value" : 0,
+      "sodium_value" : "0",
       "sugars_100g" : "0"
    },
    "nutriments_estimated" : {
diff --git a/tests/unit/expected_test_results/nutriscore/en-beers-category.json b/tests/unit/expected_test_results/nutriscore/en-beers-category.json
index 91d34e8dc71b9..9354c29bc59e3 100644
--- a/tests/unit/expected_test_results/nutriscore/en-beers-category.json
+++ b/tests/unit/expected_test_results/nutriscore/en-beers-category.json
@@ -57,7 +57,7 @@
       "salt" : 0.5,
       "salt_100g" : 0.5,
       "salt_unit" : "g",
-      "salt_value" : 0.5,
+      "salt_value" : "0.5",
       "saturated-fat_100g" : 0,
       "sodium_100g" : 0.2,
       "sodium_value" : 0.2,
diff --git a/tests/unit/expected_test_results/nutriscore/en-beverage-preparation-flavored-syrup.json b/tests/unit/expected_test_results/nutriscore/en-beverage-preparation-flavored-syrup.json
index f2ad4c2f64dd1..99c67ea58a2b7 100644
--- a/tests/unit/expected_test_results/nutriscore/en-beverage-preparation-flavored-syrup.json
+++ b/tests/unit/expected_test_results/nutriscore/en-beverage-preparation-flavored-syrup.json
@@ -203,7 +203,7 @@
       "salt_prepared" : 0.025,
       "salt_prepared_100g" : 0.025,
       "salt_prepared_unit" : "g",
-      "salt_prepared_value" : 0.025,
+      "salt_prepared_value" : "0.025",
       "saturated-fat_prepared_100g" : 0,
       "sodium_prepared_100g" : 0.01,
       "sodium_prepared_value" : 0.01,
diff --git a/tests/unit/expected_test_results/nutriscore/en-cherry-tomatoes.json b/tests/unit/expected_test_results/nutriscore/en-cherry-tomatoes.json
index dc3cd0ef14dec..0a13e3d08542a 100644
--- a/tests/unit/expected_test_results/nutriscore/en-cherry-tomatoes.json
+++ b/tests/unit/expected_test_results/nutriscore/en-cherry-tomatoes.json
@@ -154,7 +154,7 @@
       "sodium" : 0,
       "sodium_100g" : 0,
       "sodium_unit" : "g",
-      "sodium_value" : 0,
+      "sodium_value" : "0",
       "sugars_100g" : 2.48
    },
    "nutriments_estimated" : {
diff --git a/tests/unit/expected_test_results/nutriscore/en-milk.json b/tests/unit/expected_test_results/nutriscore/en-milk.json
index 9f18546e46c36..a8d5c94137df7 100644
--- a/tests/unit/expected_test_results/nutriscore/en-milk.json
+++ b/tests/unit/expected_test_results/nutriscore/en-milk.json
@@ -73,7 +73,7 @@
       "sodium" : 0.04,
       "sodium_100g" : 0.04,
       "sodium_unit" : "g",
-      "sodium_value" : 0.04,
+      "sodium_value" : "0.04",
       "sugars_100g" : 4.8
    },
    "nutriscore" : {
diff --git a/tests/unit/expected_test_results/nutriscore/en-olive-oil-no-ingredients.json b/tests/unit/expected_test_results/nutriscore/en-olive-oil-no-ingredients.json
index 64b8498660ab2..6fabc0bf4f015 100644
--- a/tests/unit/expected_test_results/nutriscore/en-olive-oil-no-ingredients.json
+++ b/tests/unit/expected_test_results/nutriscore/en-olive-oil-no-ingredients.json
@@ -97,7 +97,7 @@
       "sodium" : 0,
       "sodium_100g" : 0,
       "sodium_unit" : "g",
-      "sodium_value" : 0,
+      "sodium_value" : "0",
       "sugars_100g" : "0"
    },
    "nutriscore" : {
diff --git a/tests/unit/expected_test_results/nutriscore/en-olive-oil-unrecognized-ingredients.json b/tests/unit/expected_test_results/nutriscore/en-olive-oil-unrecognized-ingredients.json
index 2499e7647534f..66ec66c0eee18 100644
--- a/tests/unit/expected_test_results/nutriscore/en-olive-oil-unrecognized-ingredients.json
+++ b/tests/unit/expected_test_results/nutriscore/en-olive-oil-unrecognized-ingredients.json
@@ -153,7 +153,7 @@
       "sodium" : 0,
       "sodium_100g" : 0,
       "sodium_unit" : "g",
-      "sodium_value" : 0,
+      "sodium_value" : "0",
       "sugars_100g" : "0"
    },
    "nutriscore" : {
diff --git a/tests/unit/expected_test_results/nutriscore/en-olive-oil.json b/tests/unit/expected_test_results/nutriscore/en-olive-oil.json
index cec57db1c39e5..0d5e9b75ec7e6 100644
--- a/tests/unit/expected_test_results/nutriscore/en-olive-oil.json
+++ b/tests/unit/expected_test_results/nutriscore/en-olive-oil.json
@@ -162,7 +162,7 @@
       "sodium" : 0,
       "sodium_100g" : 0,
       "sodium_unit" : "g",
-      "sodium_value" : 0,
+      "sodium_value" : "0",
       "sugars_100g" : "0"
    },
    "nutriments_estimated" : {
diff --git a/tests/unit/expected_test_results/nutriscore/en-orange-juice-category-and-ingredients.json b/tests/unit/expected_test_results/nutriscore/en-orange-juice-category-and-ingredients.json
index b4eeb69ff1a7b..323ceb944b47d 100644
--- a/tests/unit/expected_test_results/nutriscore/en-orange-juice-category-and-ingredients.json
+++ b/tests/unit/expected_test_results/nutriscore/en-orange-juice-category-and-ingredients.json
@@ -211,7 +211,7 @@
       "salt" : 0.5,
       "salt_100g" : 0.5,
       "salt_unit" : "g",
-      "salt_value" : 0.5,
+      "salt_value" : "0.5",
       "saturated-fat_100g" : "0",
       "sodium_100g" : 0.2,
       "sodium_value" : 0.2,
diff --git a/tests/unit/expected_test_results/nutriscore/en-orange-juice-category.json b/tests/unit/expected_test_results/nutriscore/en-orange-juice-category.json
index ad94ea3f3bd9b..dbfbc3a4279cc 100644
--- a/tests/unit/expected_test_results/nutriscore/en-orange-juice-category.json
+++ b/tests/unit/expected_test_results/nutriscore/en-orange-juice-category.json
@@ -84,7 +84,7 @@
       "salt" : 0.5,
       "salt_100g" : 0.5,
       "salt_unit" : "g",
-      "salt_value" : 0.5,
+      "salt_value" : "0.5",
       "saturated-fat_100g" : "0",
       "sodium_100g" : 0.2,
       "sodium_value" : 0.2,
diff --git a/tests/unit/expected_test_results/nutriscore/en-potatoes-category.json b/tests/unit/expected_test_results/nutriscore/en-potatoes-category.json
index 1459968acc798..9e3676e868cd6 100644
--- a/tests/unit/expected_test_results/nutriscore/en-potatoes-category.json
+++ b/tests/unit/expected_test_results/nutriscore/en-potatoes-category.json
@@ -80,7 +80,7 @@
       "salt" : 0.5,
       "salt_100g" : 0.5,
       "salt_unit" : "g",
-      "salt_value" : 0.5,
+      "salt_value" : "0.5",
       "saturated-fat_100g" : "0",
       "sodium_100g" : 0.2,
       "sodium_value" : 0.2,
diff --git a/tests/unit/expected_test_results/nutriscore/en-red-meat-ambiguous-category-ingredients-with-lots-of-meat.json b/tests/unit/expected_test_results/nutriscore/en-red-meat-ambiguous-category-ingredients-with-lots-of-meat.json
index cd4b7497f31c9..5614b91362cf7 100644
--- a/tests/unit/expected_test_results/nutriscore/en-red-meat-ambiguous-category-ingredients-with-lots-of-meat.json
+++ b/tests/unit/expected_test_results/nutriscore/en-red-meat-ambiguous-category-ingredients-with-lots-of-meat.json
@@ -220,7 +220,7 @@
       "salt" : 0,
       "salt_100g" : "0",
       "salt_unit" : "g",
-      "salt_value" : 0,
+      "salt_value" : "0",
       "saturated-fat_100g" : "10",
       "sodium_100g" : 0,
       "sodium_value" : "0",
diff --git a/tests/unit/expected_test_results/nutriscore/en-red-meat-ambiguous-category-ingredients-with-no-meat.json b/tests/unit/expected_test_results/nutriscore/en-red-meat-ambiguous-category-ingredients-with-no-meat.json
index 72b878f23cf0c..143cef326ed8a 100644
--- a/tests/unit/expected_test_results/nutriscore/en-red-meat-ambiguous-category-ingredients-with-no-meat.json
+++ b/tests/unit/expected_test_results/nutriscore/en-red-meat-ambiguous-category-ingredients-with-no-meat.json
@@ -206,7 +206,7 @@
       "salt" : 0,
       "salt_100g" : "0",
       "salt_unit" : "g",
-      "salt_value" : 0,
+      "salt_value" : "0",
       "saturated-fat_100g" : "10",
       "sodium_100g" : 0,
       "sodium_value" : "0",
diff --git a/tests/unit/expected_test_results/nutriscore/en-red-meat-ambiguous-category-ingredients-with-very-little-meat.json b/tests/unit/expected_test_results/nutriscore/en-red-meat-ambiguous-category-ingredients-with-very-little-meat.json
index 527fb43c3548f..18944339b8195 100644
--- a/tests/unit/expected_test_results/nutriscore/en-red-meat-ambiguous-category-ingredients-with-very-little-meat.json
+++ b/tests/unit/expected_test_results/nutriscore/en-red-meat-ambiguous-category-ingredients-with-very-little-meat.json
@@ -256,7 +256,7 @@
       "salt" : 0,
       "salt_100g" : "0",
       "salt_unit" : "g",
-      "salt_value" : 0,
+      "salt_value" : "0",
       "saturated-fat_100g" : "10",
       "sodium_100g" : 0,
       "sodium_value" : "0",
diff --git a/tests/unit/expected_test_results/nutriscore/en-red-meat-ambiguous-category-no-ingredients.json b/tests/unit/expected_test_results/nutriscore/en-red-meat-ambiguous-category-no-ingredients.json
index 36316de2dc4b3..fd29059a053c0 100644
--- a/tests/unit/expected_test_results/nutriscore/en-red-meat-ambiguous-category-no-ingredients.json
+++ b/tests/unit/expected_test_results/nutriscore/en-red-meat-ambiguous-category-no-ingredients.json
@@ -69,7 +69,7 @@
       "salt" : 0,
       "salt_100g" : "0",
       "salt_unit" : "g",
-      "salt_value" : 0,
+      "salt_value" : "0",
       "saturated-fat_100g" : "10",
       "sodium_100g" : 0,
       "sodium_value" : "0",
diff --git a/tests/unit/expected_test_results/nutriscore/en-red-meat-category-no-ingredients.json b/tests/unit/expected_test_results/nutriscore/en-red-meat-category-no-ingredients.json
index d8b6592734e67..2fafd59660119 100644
--- a/tests/unit/expected_test_results/nutriscore/en-red-meat-category-no-ingredients.json
+++ b/tests/unit/expected_test_results/nutriscore/en-red-meat-category-no-ingredients.json
@@ -78,7 +78,7 @@
       "salt" : 0,
       "salt_100g" : "0",
       "salt_unit" : "g",
-      "salt_value" : 0,
+      "salt_value" : "0",
       "saturated-fat_100g" : "10",
       "sodium_100g" : 0,
       "sodium_value" : "0",
diff --git a/tests/unit/expected_test_results/nutriscore/en-soy-beans-processed-and-unprocessed.json b/tests/unit/expected_test_results/nutriscore/en-soy-beans-processed-and-unprocessed.json
index 15e1205bb51fe..b342860366f47 100644
--- a/tests/unit/expected_test_results/nutriscore/en-soy-beans-processed-and-unprocessed.json
+++ b/tests/unit/expected_test_results/nutriscore/en-soy-beans-processed-and-unprocessed.json
@@ -210,7 +210,7 @@
       "salt" : 0.025,
       "salt_100g" : 0.025,
       "salt_unit" : "g",
-      "salt_value" : 0.025,
+      "salt_value" : "0.025",
       "saturated-fat_100g" : "0",
       "sodium_100g" : 0.01,
       "sodium_value" : 0.01,
diff --git a/tests/unit/expected_test_results/nutriscore/en-sweeteners-erythritol.json b/tests/unit/expected_test_results/nutriscore/en-sweeteners-erythritol.json
index 45c3840712f2f..92ffcf8a9ecd5 100644
--- a/tests/unit/expected_test_results/nutriscore/en-sweeteners-erythritol.json
+++ b/tests/unit/expected_test_results/nutriscore/en-sweeteners-erythritol.json
@@ -217,7 +217,7 @@
       "salt" : 0.025,
       "salt_100g" : 0.025,
       "salt_unit" : "g",
-      "salt_value" : 0.025,
+      "salt_value" : "0.025",
       "saturated-fat_100g" : "0",
       "sodium_100g" : 0.01,
       "sodium_value" : 0.01,
diff --git a/tests/unit/expected_test_results/nutriscore/en-sweeteners.json b/tests/unit/expected_test_results/nutriscore/en-sweeteners.json
index cae63df70dcae..093319b56e054 100644
--- a/tests/unit/expected_test_results/nutriscore/en-sweeteners.json
+++ b/tests/unit/expected_test_results/nutriscore/en-sweeteners.json
@@ -229,7 +229,7 @@
       "salt" : 0.025,
       "salt_100g" : 0.025,
       "salt_unit" : "g",
-      "salt_value" : 0.025,
+      "salt_value" : "0.025",
       "saturated-fat_100g" : "0",
       "sodium_100g" : 0.01,
       "sodium_value" : 0.01,
diff --git a/tests/unit/expected_test_results/nutriscore/en-tofu.json b/tests/unit/expected_test_results/nutriscore/en-tofu.json
index cb49030156816..3b805e7b13f13 100644
--- a/tests/unit/expected_test_results/nutriscore/en-tofu.json
+++ b/tests/unit/expected_test_results/nutriscore/en-tofu.json
@@ -199,7 +199,7 @@
       "salt" : 0.025,
       "salt_100g" : 0.025,
       "salt_unit" : "g",
-      "salt_value" : 0.025,
+      "salt_value" : "0.025",
       "saturated-fat_100g" : "0",
       "sodium_100g" : 0.01,
       "sodium_value" : 0.01,
diff --git a/tests/unit/expected_test_results/nutriscore/en-vegetable-crisps.json b/tests/unit/expected_test_results/nutriscore/en-vegetable-crisps.json
index a61df3f51b2f3..53e2e13ccdf4c 100644
--- a/tests/unit/expected_test_results/nutriscore/en-vegetable-crisps.json
+++ b/tests/unit/expected_test_results/nutriscore/en-vegetable-crisps.json
@@ -171,7 +171,7 @@
       "salt" : 0.025,
       "salt_100g" : 0.025,
       "salt_unit" : "g",
-      "salt_value" : 0.025,
+      "salt_value" : "0.025",
       "saturated-fat_100g" : "0",
       "sodium_100g" : 0.01,
       "sodium_value" : 0.01,
diff --git a/tests/unit/expected_test_results/nutriscore/flavored-spring-with-nutrition.json b/tests/unit/expected_test_results/nutriscore/flavored-spring-with-nutrition.json
index 310439df9d797..fa29975e51504 100644
--- a/tests/unit/expected_test_results/nutriscore/flavored-spring-with-nutrition.json
+++ b/tests/unit/expected_test_results/nutriscore/flavored-spring-with-nutrition.json
@@ -75,7 +75,7 @@
       "salt" : 0,
       "salt_100g" : "0",
       "salt_unit" : "g",
-      "salt_value" : 0,
+      "salt_value" : "0",
       "saturated-fat_100g" : "0",
       "sodium_100g" : 0,
       "sodium_value" : "0",
diff --git a/tests/unit/expected_test_results/nutriscore/fr-canned-green-beans.json b/tests/unit/expected_test_results/nutriscore/fr-canned-green-beans.json
index 8ddce145cd1b7..3dc644dfa0dc2 100644
--- a/tests/unit/expected_test_results/nutriscore/fr-canned-green-beans.json
+++ b/tests/unit/expected_test_results/nutriscore/fr-canned-green-beans.json
@@ -210,7 +210,7 @@
       "sodium" : 0.48,
       "sodium_100g" : 0.48,
       "sodium_unit" : "g",
-      "sodium_value" : 0.48,
+      "sodium_value" : "0.48",
       "sugars_100g" : 3.6
    },
    "nutriments_estimated" : {
diff --git a/tests/unit/expected_test_results/nutriscore/fr-canned-pineapple.json b/tests/unit/expected_test_results/nutriscore/fr-canned-pineapple.json
index f8def772e4e1c..c13db51a137c2 100644
--- a/tests/unit/expected_test_results/nutriscore/fr-canned-pineapple.json
+++ b/tests/unit/expected_test_results/nutriscore/fr-canned-pineapple.json
@@ -206,7 +206,7 @@
       "sodium" : 0.48,
       "sodium_100g" : 0.48,
       "sodium_unit" : "g",
-      "sodium_value" : 0.48,
+      "sodium_value" : "0.48",
       "sugars_100g" : 3.6
    },
    "nutriscore" : {
diff --git a/tests/unit/expected_test_results/nutriscore/fr-coconut-milk.json b/tests/unit/expected_test_results/nutriscore/fr-coconut-milk.json
index e98164593333a..b6f03287c1c40 100644
--- a/tests/unit/expected_test_results/nutriscore/fr-coconut-milk.json
+++ b/tests/unit/expected_test_results/nutriscore/fr-coconut-milk.json
@@ -158,7 +158,7 @@
       "sodium" : 0.012,
       "sodium_100g" : 0.012,
       "sodium_unit" : "g",
-      "sodium_value" : 0.012,
+      "sodium_value" : "0.012",
       "sugars_100g" : 0.5
    },
    "nutriments_estimated" : {
diff --git a/tests/unit/expected_test_results/nutriscore/fr-gaspacho.json b/tests/unit/expected_test_results/nutriscore/fr-gaspacho.json
index eeaa248e56a27..32c6771b8d25b 100644
--- a/tests/unit/expected_test_results/nutriscore/fr-gaspacho.json
+++ b/tests/unit/expected_test_results/nutriscore/fr-gaspacho.json
@@ -351,7 +351,7 @@
       "salt" : 0.5,
       "salt_100g" : 0.5,
       "salt_unit" : "g",
-      "salt_value" : 0.5,
+      "salt_value" : "0.5",
       "saturated-fat_100g" : 0.2,
       "sodium_100g" : 0.2,
       "sodium_value" : 0.2,
diff --git a/tests/unit/expected_test_results/nutriscore/fr-green-beans-beverage.json b/tests/unit/expected_test_results/nutriscore/fr-green-beans-beverage.json
index 2fa07c58f2eb0..373ad555b540b 100644
--- a/tests/unit/expected_test_results/nutriscore/fr-green-beans-beverage.json
+++ b/tests/unit/expected_test_results/nutriscore/fr-green-beans-beverage.json
@@ -184,7 +184,7 @@
       "sodium" : 0.32,
       "sodium_100g" : 0.32,
       "sodium_unit" : "g",
-      "sodium_value" : 0.32,
+      "sodium_value" : "0.32",
       "sugars_100g" : 3.6
    },
    "nutriments_estimated" : {
diff --git a/tests/unit/expected_test_results/nutriscore/fr-ice-tea-with-sweetener.json b/tests/unit/expected_test_results/nutriscore/fr-ice-tea-with-sweetener.json
index 626ec21a14025..c72842a7282cc 100644
--- a/tests/unit/expected_test_results/nutriscore/fr-ice-tea-with-sweetener.json
+++ b/tests/unit/expected_test_results/nutriscore/fr-ice-tea-with-sweetener.json
@@ -436,7 +436,7 @@
       "salt" : 0.025,
       "salt_100g" : 0.025,
       "salt_unit" : "g",
-      "salt_value" : 0.025,
+      "salt_value" : "0.025",
       "saturated-fat_100g" : "0",
       "sodium_100g" : 0.01,
       "sodium_value" : 0.01,
diff --git a/tests/unit/expected_test_results/nutriscore/fr-mixed-oils-with-olive-oil.json b/tests/unit/expected_test_results/nutriscore/fr-mixed-oils-with-olive-oil.json
index d8e62d93452ee..1ff326d8607e2 100644
--- a/tests/unit/expected_test_results/nutriscore/fr-mixed-oils-with-olive-oil.json
+++ b/tests/unit/expected_test_results/nutriscore/fr-mixed-oils-with-olive-oil.json
@@ -247,7 +247,7 @@
       "sodium" : 0,
       "sodium_100g" : 0,
       "sodium_unit" : "g",
-      "sodium_value" : 0,
+      "sodium_value" : "0",
       "sugars_100g" : "0"
    },
    "nutriments_estimated" : {
diff --git a/tests/unit/expected_test_results/nutriscore/fr-orange-nectar-0-fat.json b/tests/unit/expected_test_results/nutriscore/fr-orange-nectar-0-fat.json
index 3bfdcc57a3d1c..0f78c8d52a3be 100644
--- a/tests/unit/expected_test_results/nutriscore/fr-orange-nectar-0-fat.json
+++ b/tests/unit/expected_test_results/nutriscore/fr-orange-nectar-0-fat.json
@@ -208,7 +208,7 @@
       "salt" : 0.5,
       "salt_100g" : 0.5,
       "salt_unit" : "g",
-      "salt_value" : 0.5,
+      "salt_value" : "0.5",
       "sodium_100g" : 0.2,
       "sodium_value" : 0.2,
       "sugars_100g" : "12"
diff --git a/tests/unit/expected_test_results/nutriscore/fr-plant-beverages-soy-milk.json b/tests/unit/expected_test_results/nutriscore/fr-plant-beverages-soy-milk.json
index c7b5c2e0e1da1..7a9de121296ba 100644
--- a/tests/unit/expected_test_results/nutriscore/fr-plant-beverages-soy-milk.json
+++ b/tests/unit/expected_test_results/nutriscore/fr-plant-beverages-soy-milk.json
@@ -185,7 +185,7 @@
       "sodium" : 0.012,
       "sodium_100g" : 0.012,
       "sodium_unit" : "g",
-      "sodium_value" : 0.012,
+      "sodium_value" : "0.012",
       "sugars_100g" : 0.5
    },
    "nutriments_estimated" : {
diff --git a/tests/unit/expected_test_results/nutriscore/fr-rapeseed-oil.json b/tests/unit/expected_test_results/nutriscore/fr-rapeseed-oil.json
index fa558bd82c387..8b820401314d6 100644
--- a/tests/unit/expected_test_results/nutriscore/fr-rapeseed-oil.json
+++ b/tests/unit/expected_test_results/nutriscore/fr-rapeseed-oil.json
@@ -159,7 +159,7 @@
       "sodium" : 0,
       "sodium_100g" : 0,
       "sodium_unit" : "g",
-      "sodium_value" : 0,
+      "sodium_value" : "0",
       "sugars_100g" : "0"
    },
    "nutriments_estimated" : {
diff --git a/tests/unit/expected_test_results/nutriscore/milk.json b/tests/unit/expected_test_results/nutriscore/milk.json
index ae90ac576c787..b6b8a25b3a580 100644
--- a/tests/unit/expected_test_results/nutriscore/milk.json
+++ b/tests/unit/expected_test_results/nutriscore/milk.json
@@ -144,7 +144,7 @@
       "salt" : 0,
       "salt_100g" : "0",
       "salt_unit" : "g",
-      "salt_value" : 0,
+      "salt_value" : "0",
       "saturated-fat_100g" : "5",
       "sodium_100g" : 0,
       "sodium_value" : "0",
diff --git a/tests/unit/expected_test_results/nutriscore/mushrooms.json b/tests/unit/expected_test_results/nutriscore/mushrooms.json
index 7198a53fba6a8..6e665ab5d346d 100644
--- a/tests/unit/expected_test_results/nutriscore/mushrooms.json
+++ b/tests/unit/expected_test_results/nutriscore/mushrooms.json
@@ -164,7 +164,7 @@
       "salt" : 1,
       "salt_100g" : "1",
       "salt_unit" : "g",
-      "salt_value" : 1,
+      "salt_value" : "1",
       "saturated-fat_100g" : 1.2,
       "sodium_100g" : 0.4,
       "sodium_value" : 0.4,
diff --git a/tests/unit/expected_test_results/nutriscore/olive-oil.json b/tests/unit/expected_test_results/nutriscore/olive-oil.json
index 8054980e93691..a7754a7f2b00e 100644
--- a/tests/unit/expected_test_results/nutriscore/olive-oil.json
+++ b/tests/unit/expected_test_results/nutriscore/olive-oil.json
@@ -94,7 +94,7 @@
       "salt" : 0,
       "salt_100g" : "0",
       "salt_unit" : "g",
-      "salt_value" : 0,
+      "salt_value" : "0",
       "saturated-fat_100g" : "14",
       "sodium_100g" : 0,
       "sodium_value" : "0",
diff --git a/tests/unit/expected_test_results/nutriscore/sunflower-oil-no-sugar-no-sat-fat.json b/tests/unit/expected_test_results/nutriscore/sunflower-oil-no-sugar-no-sat-fat.json
index 95b1a69c48473..7791e8f4a70cb 100644
--- a/tests/unit/expected_test_results/nutriscore/sunflower-oil-no-sugar-no-sat-fat.json
+++ b/tests/unit/expected_test_results/nutriscore/sunflower-oil-no-sugar-no-sat-fat.json
@@ -87,7 +87,7 @@
       "salt" : 0,
       "salt_100g" : "0",
       "salt_unit" : "g",
-      "salt_value" : 0,
+      "salt_value" : "0",
       "sodium_100g" : 0,
       "sodium_value" : "0"
    },
diff --git a/tests/unit/expected_test_results/nutriscore/sunflower-oil-no-sugar.json b/tests/unit/expected_test_results/nutriscore/sunflower-oil-no-sugar.json
index b5f90eadff3bf..27aeaa97979b3 100644
--- a/tests/unit/expected_test_results/nutriscore/sunflower-oil-no-sugar.json
+++ b/tests/unit/expected_test_results/nutriscore/sunflower-oil-no-sugar.json
@@ -91,7 +91,7 @@
       "salt" : 0,
       "salt_100g" : "0",
       "salt_unit" : "g",
-      "salt_value" : 0,
+      "salt_value" : "0",
       "saturated-fat_100g" : "10",
       "sodium_100g" : 0,
       "sodium_value" : "0"
diff --git a/tests/unit/expected_test_results/nutriscore/sunflower-oil.json b/tests/unit/expected_test_results/nutriscore/sunflower-oil.json
index 0bcaa46d28b19..6d33a580cc55a 100644
--- a/tests/unit/expected_test_results/nutriscore/sunflower-oil.json
+++ b/tests/unit/expected_test_results/nutriscore/sunflower-oil.json
@@ -92,7 +92,7 @@
       "salt" : 0,
       "salt_100g" : "0",
       "salt_unit" : "g",
-      "salt_value" : 0,
+      "salt_value" : "0",
       "saturated-fat_100g" : "10",
       "sodium_100g" : 0,
       "sodium_value" : "0",
diff --git a/tests/unit/expected_test_results/nutriscore/walnut-oil.json b/tests/unit/expected_test_results/nutriscore/walnut-oil.json
index 7ee8247d47d06..e444023b35e98 100644
--- a/tests/unit/expected_test_results/nutriscore/walnut-oil.json
+++ b/tests/unit/expected_test_results/nutriscore/walnut-oil.json
@@ -94,7 +94,7 @@
       "salt" : 0,
       "salt_100g" : "0",
       "salt_unit" : "g",
-      "salt_value" : 0,
+      "salt_value" : "0",
       "saturated-fat_100g" : "10",
       "sodium_100g" : 0,
       "sodium_value" : "0",