fix: new misc facets for packagings with weights (#7826)

* fix: new misc facets for packagings with weights * lint
openfoodfacts · Dec 12, 2022 · ba763b6 · ba763b6
1 parent 7b39820
commit ba763b6
Show file tree

Hide file tree

Showing 7 changed files with 193 additions and 120 deletions.
diff --git a/lib/ProductOpener/Packaging.pm b/lib/ProductOpener/Packaging.pm
@@ -685,6 +685,14 @@ sub set_packaging_misc_tags ($product_ref) {
 	remove_tag($product_ref, "misc", "en:packagings-empty");
 	remove_tag($product_ref, "misc", "en:packagings-not-empty");
 	remove_tag($product_ref, "misc", "en:packagings-not-empty-but-not-complete");
+	remove_tag($product_ref, "misc", "en:packagings-with-weights");
+	remove_tag($product_ref, "misc", "en:packagings-complete-with-weights");
+	remove_tag($product_ref, "misc", "en:packagings-not-complete-with-weights");
+	remove_tag($product_ref, "misc", "en:packagings-with-some-weights");
+
+	# Number of packaging components
+	my $number_of_packaging_components
+		= (defined $product_ref->{packagings} ? scalar @{$product_ref->{packagings}} : 0);
 
 	if ($product_ref->{packagings_complete}) {
 		add_tag($product_ref, "misc", "en:packagings-complete");
@@ -693,7 +701,7 @@ sub set_packaging_misc_tags ($product_ref) {
 	else {
 		add_tag($product_ref, "misc", "en:packagings-not-complete");
 
-		if (scalar @{$product_ref->{packagings}} == 0) {
+		if ($number_of_packaging_components == 0) {
 			add_tag($product_ref, "misc", "en:packagings-empty");
 		}
 		else {
@@ -702,6 +710,28 @@ sub set_packaging_misc_tags ($product_ref) {
 		}
 	}
 
+	# Check if we have weights for all components
+	if ($number_of_packaging_components > 0) {
+		my $components_with_weights = 0;
+		foreach my $packaging_ref (@{$product_ref->{packagings}}) {
+			if ((defined $packaging_ref->{weight_specified}) or (defined $packaging_ref->{weight_measured})) {
+				$components_with_weights++;
+			}
+		}
+		if ($components_with_weights == $number_of_packaging_components) {
+			add_tag($product_ref, "misc", "en:packagings-with-weights");
+			if ($product_ref->{packagings_complete}) {
+				add_tag($product_ref, "misc", "en:packagings-complete-with-weights");
+			}
+			else {
+				add_tag($product_ref, "misc", "en:packagings-not-complete-with-weights");
+			}
+		}
+		elsif ($components_with_weights > 0) {
+			add_tag($product_ref, "misc", "en:packagings-with-some-weights");
+		}
+	}
+
 	return;
 }
 

diff --git a/tests/integration/api_v3_product_write.t b/tests/integration/api_v3_product_write.t
@@ -138,7 +138,7 @@ my $tests_ref = [
 		method => 'PATCH',
 		path => '/api/v3/product/1234567890008',
 		body => '{
-			"fields": "updated",
+			"fields": "updated,misc_tags",
 			"tags_lc": "en",
 			"product": {
 				"packagings_add": [
@@ -389,6 +389,7 @@ my $tests_ref = [
 		path => '/api/v3/product/1234567890013',
 		body => '{
 			"tags_lc": "en",
+			"fields": "updated,misc_tags",
 			"product": {
 				"packagings": [
 					{

diff --git a/...tion/expected_test_results/api_v3_product_write/patch-packagings-quantity-and-weight.json b/...tion/expected_test_results/api_v3_product_write/patch-packagings-quantity-and-weight.json
@@ -2,6 +2,27 @@
    "code" : "1234567890008",
    "errors" : [],
    "product" : {
+      "misc_tags" : [
+         "en:nutriscore-not-computed",
+         "en:nutriscore-missing-category",
+         "en:nutrition-not-enough-data-to-compute-nutrition-score",
+         "en:nutriscore-missing-nutrition-data",
+         "en:nutriscore-missing-nutrition-data-energy",
+         "en:nutriscore-missing-nutrition-data-fat",
+         "en:nutriscore-missing-nutrition-data-saturated-fat",
+         "en:nutriscore-missing-nutrition-data-sugars",
+         "en:nutriscore-missing-nutrition-data-sodium",
+         "en:nutriscore-missing-nutrition-data-proteins",
+         "en:nutrition-no-fiber",
+         "en:packagings-not-complete",
+         "en:packagings-not-empty-but-not-complete",
+         "en:packagings-not-empty",
+         "en:packagings-with-weights",
+         "en:packagings-not-complete-with-weights",
+         "en:ecoscore-extended-data-not-computed",
+         "en:ecoscore-not-computed",
+         "en:main-countries-new-product"
+      ],
       "packagings" : [
          {
             "material" : {

diff --git a/...egration/expected_test_results/api_v3_product_write/patch-weight-as-number-or-string.json b/...egration/expected_test_results/api_v3_product_write/patch-weight-as-number-or-string.json
@@ -2,6 +2,27 @@
    "code" : "1234567890013",
    "errors" : [],
    "product" : {
+      "misc_tags" : [
+         "en:nutriscore-not-computed",
+         "en:nutriscore-missing-category",
+         "en:nutrition-not-enough-data-to-compute-nutrition-score",
+         "en:nutriscore-missing-nutrition-data",
+         "en:nutriscore-missing-nutrition-data-energy",
+         "en:nutriscore-missing-nutrition-data-fat",
+         "en:nutriscore-missing-nutrition-data-saturated-fat",
+         "en:nutriscore-missing-nutrition-data-sugars",
+         "en:nutriscore-missing-nutrition-data-sodium",
+         "en:nutriscore-missing-nutrition-data-proteins",
+         "en:nutrition-no-fiber",
+         "en:packagings-not-complete",
+         "en:packagings-not-empty-but-not-complete",
+         "en:packagings-not-empty",
+         "en:packagings-with-weights",
+         "en:packagings-not-complete-with-weights",
+         "en:ecoscore-extended-data-not-computed",
+         "en:ecoscore-not-computed",
+         "en:main-countries-new-product"
+      ],
       "packagings" : [
          {
             "number_of_units" : 1,