feat: quantity_units_new_fields (#9608)

* quantity_units_new_fields

* upd tests

* upd test manually rm comparison

* add condition for undefined

* make lint

lib/ProductOpener/Food.pm

@@ -2113,15 +2113,25 @@ sub compute_serving_size_data ($product_ref) {
 	(defined $product_ref->{multiple_nutrition_data}) and delete $product_ref->{multiple_nutrition_data};
 
 	(defined $product_ref->{product_quantity}) and delete $product_ref->{product_quantity};
+	(defined $product_ref->{product_quantity_unit}) and delete $product_ref->{product_quantity_unit};
 	if ((defined $product_ref->{quantity}) and ($product_ref->{quantity} ne "")) {
 		my $product_quantity = normalize_quantity($product_ref->{quantity});
 		if (defined $product_quantity) {
 			$product_ref->{product_quantity} = $product_quantity;
 		}
+		my $product_quantity_unit = extract_standard_unit($product_ref->{quantity});
+		if (defined $product_quantity_unit) {
+			$product_ref->{product_quantity_unit} = $product_quantity_unit;
+		}
 	}
 
 	if ((defined $product_ref->{serving_size}) and ($product_ref->{serving_size} ne "")) {
 		$product_ref->{serving_quantity} = normalize_serving_size($product_ref->{serving_size});
+
+		my $serving_quantity_unit = extract_standard_unit($product_ref->{serving_size});
+		if (defined $serving_quantity_unit) {
+			$product_ref->{serving_quantity_unit} = $serving_quantity_unit;
+		}
 	}
 	else {
 		(defined $product_ref->{serving_quantity}) and delete $product_ref->{serving_quantity};

tests/integration/expected_test_results/api_v2_product_read/get-existing-product.json

@@ -1046,10 +1046,12 @@
       "product_name" : "Some product",
       "product_name_en" : "Some product",
       "product_quantity" : "100",
+      "product_quantity_unit" : "g",
       "quantity" : "100 g",
       "removed_countries_tags" : [],
       "rev" : 1,
       "serving_quantity" : "10",
+      "serving_quantity_unit" : "g",
       "serving_size" : "10 g",
       "states" : "en:to-be-completed, en:nutrition-facts-completed, en:ingredients-completed, en:expiration-date-to-be-completed, en:packaging-code-to-be-completed, en:characteristics-to-be-completed, en:origins-to-be-completed, en:categories-completed, en:brands-to-be-completed, en:packaging-to-be-completed, en:quantity-completed, en:product-name-completed, en:photos-to-be-uploaded",
       "states_hierarchy" : [

tests/integration/expected_test_results/api_v2_product_read/get-fields-all-knowledge-panels.json

@@ -2337,10 +2337,12 @@
       "product_name" : "Some product",
       "product_name_en" : "Some product",
       "product_quantity" : "100",
+      "product_quantity_unit" : "g",
       "quantity" : "100 g",
       "removed_countries_tags" : [],
       "rev" : 1,
       "serving_quantity" : 10,
+      "serving_quantity_unit" : "g",
       "serving_size" : "10 g",
       "states" : "en:to-be-completed, en:nutrition-facts-completed, en:ingredients-completed, en:expiration-date-to-be-completed, en:packaging-code-to-be-completed, en:characteristics-to-be-completed, en:origins-to-be-completed, en:categories-completed, en:brands-to-be-completed, en:packaging-to-be-completed, en:quantity-completed, en:product-name-completed, en:photos-to-be-uploaded",
       "states_hierarchy" : [

tests/integration/expected_test_results/api_v2_product_read/get-fields-all.json

@@ -1046,10 +1046,12 @@
       "product_name" : "Some product",
       "product_name_en" : "Some product",
       "product_quantity" : "100",
+      "product_quantity_unit" : "g",
       "quantity" : "100 g",
       "removed_countries_tags" : [],
       "rev" : 1,
       "serving_quantity" : "10",
+      "serving_quantity_unit" : "g",
       "serving_size" : "10 g",
       "states" : "en:to-be-completed, en:nutrition-facts-completed, en:ingredients-completed, en:expiration-date-to-be-completed, en:packaging-code-to-be-completed, en:characteristics-to-be-completed, en:origins-to-be-completed, en:categories-completed, en:brands-to-be-completed, en:packaging-to-be-completed, en:quantity-completed, en:product-name-completed, en:photos-to-be-uploaded",
       "states_hierarchy" : [

tests/integration/expected_test_results/api_v2_product_read/get-fields-attribute-groups-all-knowledge-panels.json

@@ -2985,10 +2985,12 @@
       "product_name" : "Some product",
       "product_name_en" : "Some product",
       "product_quantity" : "100",
+      "product_quantity_unit" : "g",
       "quantity" : "100 g",
       "removed_countries_tags" : [],
       "rev" : 1,
       "serving_quantity" : 10,
+      "serving_quantity_unit" : "g",
       "serving_size" : "10 g",
       "states" : "en:to-be-completed, en:nutrition-facts-completed, en:ingredients-completed, en:expiration-date-to-be-completed, en:packaging-code-to-be-completed, en:characteristics-to-be-completed, en:origins-to-be-completed, en:categories-completed, en:brands-to-be-completed, en:packaging-to-be-completed, en:quantity-completed, en:product-name-completed, en:photos-to-be-uploaded",
       "states_hierarchy" : [

tests/integration/expected_test_results/api_v2_product_read/get-fields-raw.json

@@ -1041,10 +1041,12 @@
       "product_name" : "Some product",
       "product_name_en" : "Some product",
       "product_quantity" : "100",
+      "product_quantity_unit" : "g",
       "quantity" : "100 g",
       "removed_countries_tags" : [],
       "rev" : 1,
       "serving_quantity" : "10",
+      "serving_quantity_unit" : "g",
       "serving_size" : "10 g",
       "states" : "en:to-be-completed, en:nutrition-facts-completed, en:ingredients-completed, en:expiration-date-to-be-completed, en:packaging-code-to-be-completed, en:characteristics-to-be-completed, en:origins-to-be-completed, en:categories-completed, en:brands-to-be-completed, en:packaging-to-be-completed, en:quantity-completed, en:product-name-completed, en:photos-to-be-uploaded",
       "states_hierarchy" : [

tests/integration/expected_test_results/api_v2_product_write/get-product-auth-good-password.json

@@ -875,10 +875,12 @@
       "product_name" : "Product name",
       "product_name_fr" : "Product name",
       "product_quantity" : "250",
+      "product_quantity_unit" : "g",
       "quantity" : "250 g",
       "removed_countries_tags" : [],
       "rev" : 1,
       "serving_quantity" : "20",
+      "serving_quantity_unit" : "g",
       "serving_size" : "20 g",
       "states" : "en:to-be-completed, en:nutrition-facts-completed, en:ingredients-completed, en:expiration-date-to-be-completed, en:packaging-code-to-be-completed, en:characteristics-to-be-completed, en:origins-to-be-completed, en:categories-completed, en:brands-to-be-completed, en:packaging-to-be-completed, en:quantity-completed, en:product-name-completed, en:photos-to-be-uploaded",
       "states_hierarchy" : [

tests/integration/expected_test_results/api_v2_product_write/get-product-ingredients-text-without-language.json

@@ -723,10 +723,12 @@
       "popularity_key" : 0,
       "product_name_en" : "Some sausages",
       "product_quantity" : "250",
+      "product_quantity_unit" : "g",
       "quantity" : "250 g",
       "removed_countries_tags" : [],
       "rev" : 1,
       "serving_quantity" : "20",
+      "serving_quantity_unit" : "g",
       "serving_size" : "20 g",
       "states" : "en:to-be-completed, en:nutrition-facts-completed, en:ingredients-completed, en:expiration-date-to-be-completed, en:packaging-code-to-be-completed, en:characteristics-to-be-completed, en:origins-to-be-completed, en:categories-completed, en:brands-to-be-completed, en:packaging-to-be-completed, en:quantity-completed, en:product-name-to-be-completed, en:photos-to-be-uploaded",
       "states_hierarchy" : [

tests/integration/expected_test_results/api_v2_product_write/get-product.json

@@ -873,10 +873,12 @@
       "product_name" : "Product name",
       "product_name_fr" : "Product name",
       "product_quantity" : "250",
+      "product_quantity_unit" : "g",
       "quantity" : "250 g",
       "removed_countries_tags" : [],
       "rev" : 1,
       "serving_quantity" : "20",
+      "serving_quantity_unit" : "g",
       "serving_size" : "20 g",
       "states" : "en:to-be-completed, en:nutrition-facts-completed, en:ingredients-completed, en:expiration-date-to-be-completed, en:packaging-code-to-be-completed, en:characteristics-to-be-completed, en:origins-to-be-completed, en:categories-completed, en:brands-to-be-completed, en:packaging-to-be-completed, en:quantity-completed, en:product-name-completed, en:photos-to-be-uploaded",
       "states_hierarchy" : [

tests/integration/expected_test_results/api_v3_product_read/get-existing-product-gs1-ai-data-str.json

@@ -1072,10 +1072,12 @@
       "product_name" : "Some product",
       "product_name_en" : "Some product",
       "product_quantity" : "100",
+      "product_quantity_unit" : "g",
       "quantity" : "100 g",
       "removed_countries_tags" : [],
       "rev" : 1,
       "serving_quantity" : "10",
+      "serving_quantity_unit" : "g",
       "serving_size" : "10 g",
       "states" : "en:to-be-completed, en:nutrition-facts-completed, en:ingredients-completed, en:expiration-date-to-be-completed, en:packaging-code-to-be-completed, en:characteristics-to-be-completed, en:origins-to-be-completed, en:categories-completed, en:brands-to-be-completed, en:packaging-to-be-completed, en:quantity-completed, en:product-name-completed, en:photos-to-be-uploaded",
       "states_hierarchy" : [

tests/integration/expected_test_results/api_v3_product_read/get-existing-product-gs1-caret.json

@@ -1072,10 +1072,12 @@
       "product_name" : "Some product",
       "product_name_en" : "Some product",
       "product_quantity" : "100",
+      "product_quantity_unit" : "g",
       "quantity" : "100 g",
       "removed_countries_tags" : [],
       "rev" : 1,
       "serving_quantity" : "10",
+      "serving_quantity_unit" : "g",
       "serving_size" : "10 g",
       "states" : "en:to-be-completed, en:nutrition-facts-completed, en:ingredients-completed, en:expiration-date-to-be-completed, en:packaging-code-to-be-completed, en:characteristics-to-be-completed, en:origins-to-be-completed, en:categories-completed, en:brands-to-be-completed, en:packaging-to-be-completed, en:quantity-completed, en:product-name-completed, en:photos-to-be-uploaded",
       "states_hierarchy" : [

tests/integration/expected_test_results/api_v3_product_read/get-existing-product-gs1-data-uri.json

@@ -1072,10 +1072,12 @@
       "product_name" : "Some product",
       "product_name_en" : "Some product",
       "product_quantity" : "100",
+      "product_quantity_unit" : "g",
       "quantity" : "100 g",
       "removed_countries_tags" : [],
       "rev" : 1,
       "serving_quantity" : "10",
+      "serving_quantity_unit" : "g",
       "serving_size" : "10 g",
       "states" : "en:to-be-completed, en:nutrition-facts-completed, en:ingredients-completed, en:expiration-date-to-be-completed, en:packaging-code-to-be-completed, en:characteristics-to-be-completed, en:origins-to-be-completed, en:categories-completed, en:brands-to-be-completed, en:packaging-to-be-completed, en:quantity-completed, en:product-name-completed, en:photos-to-be-uploaded",
       "states_hierarchy" : [

tests/integration/expected_test_results/api_v3_product_read/get-existing-product-gs1-fnc1.json

@@ -1072,10 +1072,12 @@
       "product_name" : "Some product",
       "product_name_en" : "Some product",
       "product_quantity" : "100",
+      "product_quantity_unit" : "g",
       "quantity" : "100 g",
       "removed_countries_tags" : [],
       "rev" : 1,
       "serving_quantity" : "10",
+      "serving_quantity_unit" : "g",
       "serving_size" : "10 g",
       "states" : "en:to-be-completed, en:nutrition-facts-completed, en:ingredients-completed, en:expiration-date-to-be-completed, en:packaging-code-to-be-completed, en:characteristics-to-be-completed, en:origins-to-be-completed, en:categories-completed, en:brands-to-be-completed, en:packaging-to-be-completed, en:quantity-completed, en:product-name-completed, en:photos-to-be-uploaded",
       "states_hierarchy" : [

tests/integration/expected_test_results/api_v3_product_read/get-existing-product-gs1-gs.json

@@ -1072,10 +1072,12 @@
       "product_name" : "Some product",
       "product_name_en" : "Some product",
       "product_quantity" : "100",
+      "product_quantity_unit" : "g",
       "quantity" : "100 g",
       "removed_countries_tags" : [],
       "rev" : 1,
       "serving_quantity" : "10",
+      "serving_quantity_unit" : "g",
       "serving_size" : "10 g",
       "states" : "en:to-be-completed, en:nutrition-facts-completed, en:ingredients-completed, en:expiration-date-to-be-completed, en:packaging-code-to-be-completed, en:characteristics-to-be-completed, en:origins-to-be-completed, en:categories-completed, en:brands-to-be-completed, en:packaging-to-be-completed, en:quantity-completed, en:product-name-completed, en:photos-to-be-uploaded",
       "states_hierarchy" : [

tests/integration/expected_test_results/api_v3_product_read/get-existing-product.json

@@ -1072,10 +1072,12 @@
       "product_name" : "Some product",
       "product_name_en" : "Some product",
       "product_quantity" : "100",
+      "product_quantity_unit" : "g",
       "quantity" : "100 g",
       "removed_countries_tags" : [],
       "rev" : 1,
       "serving_quantity" : "10",
+      "serving_quantity_unit" : "g",
       "serving_size" : "10 g",
       "states" : "en:to-be-completed, en:nutrition-facts-completed, en:ingredients-completed, en:expiration-date-to-be-completed, en:packaging-code-to-be-completed, en:characteristics-to-be-completed, en:origins-to-be-completed, en:categories-completed, en:brands-to-be-completed, en:packaging-to-be-completed, en:quantity-completed, en:product-name-completed, en:photos-to-be-uploaded",
       "states_hierarchy" : [

tests/integration/expected_test_results/api_v3_product_read/get-fields-all-knowledge-panels.json

@@ -2363,10 +2363,12 @@
       "product_name" : "Some product",
       "product_name_en" : "Some product",
       "product_quantity" : "100",
+      "product_quantity_unit" : "g",
       "quantity" : "100 g",
       "removed_countries_tags" : [],
       "rev" : 1,
       "serving_quantity" : 10,
+      "serving_quantity_unit" : "g",
       "serving_size" : "10 g",
       "states" : "en:to-be-completed, en:nutrition-facts-completed, en:ingredients-completed, en:expiration-date-to-be-completed, en:packaging-code-to-be-completed, en:characteristics-to-be-completed, en:origins-to-be-completed, en:categories-completed, en:brands-to-be-completed, en:packaging-to-be-completed, en:quantity-completed, en:product-name-completed, en:photos-to-be-uploaded",
       "states_hierarchy" : [

tests/integration/expected_test_results/api_v3_product_read/get-fields-all.json

@@ -1072,10 +1072,12 @@
       "product_name" : "Some product",
       "product_name_en" : "Some product",
       "product_quantity" : "100",
+      "product_quantity_unit" : "g",
       "quantity" : "100 g",
       "removed_countries_tags" : [],
       "rev" : 1,
       "serving_quantity" : "10",
+      "serving_quantity_unit" : "g",
       "serving_size" : "10 g",
       "states" : "en:to-be-completed, en:nutrition-facts-completed, en:ingredients-completed, en:expiration-date-to-be-completed, en:packaging-code-to-be-completed, en:characteristics-to-be-completed, en:origins-to-be-completed, en:categories-completed, en:brands-to-be-completed, en:packaging-to-be-completed, en:quantity-completed, en:product-name-completed, en:photos-to-be-uploaded",
       "states_hierarchy" : [

tests/integration/expected_test_results/api_v3_product_read/get-fields-attribute-groups-all-knowledge-panels.json

@@ -3011,10 +3011,12 @@
       "product_name" : "Some product",
       "product_name_en" : "Some product",
       "product_quantity" : "100",
+      "product_quantity_unit" : "g",
       "quantity" : "100 g",
       "removed_countries_tags" : [],
       "rev" : 1,
       "serving_quantity" : 10,
+      "serving_quantity_unit" : "g",
       "serving_size" : "10 g",
       "states" : "en:to-be-completed, en:nutrition-facts-completed, en:ingredients-completed, en:expiration-date-to-be-completed, en:packaging-code-to-be-completed, en:characteristics-to-be-completed, en:origins-to-be-completed, en:categories-completed, en:brands-to-be-completed, en:packaging-to-be-completed, en:quantity-completed, en:product-name-completed, en:photos-to-be-uploaded",
       "states_hierarchy" : [

tests/integration/expected_test_results/api_v3_product_read/get-fields-raw.json

@@ -1043,10 +1043,12 @@
       "product_name" : "Some product",
       "product_name_en" : "Some product",
       "product_quantity" : "100",
+      "product_quantity_unit" : "g",
       "quantity" : "100 g",
       "removed_countries_tags" : [],
       "rev" : 1,
       "serving_quantity" : "10",
+      "serving_quantity_unit" : "g",
       "serving_size" : "10 g",
       "states" : "en:to-be-completed, en:nutrition-facts-completed, en:ingredients-completed, en:expiration-date-to-be-completed, en:packaging-code-to-be-completed, en:characteristics-to-be-completed, en:origins-to-be-completed, en:categories-completed, en:brands-to-be-completed, en:packaging-to-be-completed, en:quantity-completed, en:product-name-completed, en:photos-to-be-uploaded",
       "states_hierarchy" : [

tests/integration/expected_test_results/convert_and_import_excel_file/packagings-mousquetaires/products/3250390017165.json

@@ -556,6 +556,7 @@
    "product_name_fr" : "Pate feuilletee deroulee",
    "product_name_fr_imported" : "Pate feuilletee deroulee",
    "product_quantity" : 230,
+   "product_quantity_unit" : "g",
    "quantity" : "230 g",
    "quantity_imported" : "230 g",
    "removed_countries_tags" : [],

tests/integration/expected_test_results/convert_and_import_excel_file/packagings-mousquetaires/products/3250390020745.json

@@ -546,6 +546,7 @@
    "product_name_fr" : "Steak hache pur boeuf surgele 15% mg x10",
    "product_name_fr_imported" : "Steak hache pur boeuf surgele 15% mg x10",
    "product_quantity" : 1000,
+   "product_quantity_unit" : "g",
    "quantity" : "1 kg",
    "quantity_imported" : "1 kg",
    "removed_countries_tags" : [],

tests/integration/expected_test_results/protected_product/get-edited-protected-product-api-v2-moderator.json

@@ -856,10 +856,12 @@
       "product_name_en" : "Changed product name",
       "product_name_fr" : "New French product name",
       "product_quantity" : "250",
+      "product_quantity_unit" : "g",
       "quantity" : "250 g",
       "removed_countries_tags" : [],
       "rev" : 2,
       "serving_quantity" : "20",
+      "serving_quantity_unit" : "g",
       "serving_size" : "20 g",
       "states" : "en:to-be-completed, en:nutrition-facts-completed, en:ingredients-completed, en:expiration-date-to-be-completed, en:packaging-code-to-be-completed, en:characteristics-to-be-completed, en:origins-to-be-completed, en:categories-completed, en:brands-completed, en:packaging-to-be-completed, en:quantity-completed, en:product-name-completed, en:photos-to-be-uploaded",
       "states_hierarchy" : [

tests/integration/expected_test_results/protected_product/get-edited-protected-product-api-v2.json

@@ -852,10 +852,12 @@
       "product_name_en" : "A protected product",
       "product_name_fr" : "New French product name",
       "product_quantity" : "90",
+      "product_quantity_unit" : "g",
       "quantity" : "90g",
       "removed_countries_tags" : [],
       "rev" : 3,
       "serving_quantity" : "20",
+      "serving_quantity_unit" : "g",
       "serving_size" : "20 g",
       "states" : "en:to-be-completed, en:nutrition-facts-completed, en:ingredients-completed, en:expiration-date-to-be-completed, en:packaging-code-to-be-completed, en:characteristics-to-be-completed, en:origins-to-be-completed, en:categories-completed, en:brands-completed, en:packaging-to-be-completed, en:quantity-completed, en:product-name-completed, en:photos-to-be-uploaded",
       "states_hierarchy" : [

tests/integration/expected_test_results/protected_product/get-edited-protected-product-web-form-moderator.json

@@ -860,10 +860,12 @@
       "product_name_en" : "Changed product name",
       "product_name_fr" : "New French product name",
       "product_quantity" : "250",
+      "product_quantity_unit" : "g",
       "quantity" : "250 g",
       "removed_countries_tags" : [],
       "rev" : 2,
       "serving_quantity" : "20",
+      "serving_quantity_unit" : "g",
       "serving_size" : "20 g",
       "states" : "en:to-be-completed, en:nutrition-facts-completed, en:ingredients-completed, en:expiration-date-to-be-completed, en:packaging-code-to-be-completed, en:characteristics-to-be-completed, en:origins-to-be-completed, en:categories-completed, en:brands-completed, en:packaging-to-be-completed, en:quantity-completed, en:product-name-completed, en:photos-to-be-uploaded",
       "states_hierarchy" : [

tests/integration/expected_test_results/protected_product/get-edited-protected-product-web-form.json

@@ -856,10 +856,12 @@
       "product_name_en" : "A protected product",
       "product_name_fr" : "New French product name",
       "product_quantity" : "90",
+      "product_quantity_unit" : "g",
       "quantity" : "90g",
       "removed_countries_tags" : [],
       "rev" : 3,
       "serving_quantity" : "20",
+      "serving_quantity_unit" : "g",
       "serving_size" : "20 g",
       "states" : "en:to-be-completed, en:nutrition-facts-completed, en:ingredients-completed, en:expiration-date-to-be-completed, en:packaging-code-to-be-completed, en:characteristics-to-be-completed, en:origins-to-be-completed, en:categories-completed, en:brands-completed, en:packaging-to-be-completed, en:quantity-completed, en:product-name-completed, en:photos-to-be-uploaded",
       "states_hierarchy" : [

tests/integration/expected_test_results/protected_product/get-edited-unprotected-product-api-v2.json

@@ -854,10 +854,12 @@
       "product_name_en" : "Changed product name",
       "product_name_fr" : "New French product name",
       "product_quantity" : "250",
+      "product_quantity_unit" : "g",
       "quantity" : "250 g",
       "removed_countries_tags" : [],
       "rev" : 2,
       "serving_quantity" : "20",
+      "serving_quantity_unit" : "g",
       "serving_size" : "20 g",
       "states" : "en:to-be-completed, en:nutrition-facts-completed, en:ingredients-completed, en:expiration-date-to-be-completed, en:packaging-code-to-be-completed, en:characteristics-to-be-completed, en:origins-to-be-completed, en:categories-completed, en:brands-completed, en:packaging-to-be-completed, en:quantity-completed, en:product-name-completed, en:photos-to-be-uploaded",
       "states_hierarchy" : [