From 5ed9c2ad2b3c06ef8990687da99b652605fa089a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?St=C3=A9phane=20Gigandet?= <stephane@openfoodfacts.org>
Date: Thu, 7 Mar 2024 17:54:48 +0100
Subject: [PATCH 1/2] fix: generate and build nutrient_levels.txt

---
 .github/workflows/pull_request.yml | 2 ++
 lib/ProductOpener/Food.pm          | 4 +++-
 lib/ProductOpener/Tags.pm          | 2 +-
 scripts/build_lang.pl              | 3 ++-
 4 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/pull_request.yml b/.github/workflows/pull_request.yml
index 9f315a8ae68d4..73ab4a6f76075 100644
--- a/.github/workflows/pull_request.yml
+++ b/.github/workflows/pull_request.yml
@@ -106,6 +106,8 @@ jobs:
       uses: ishworkh/docker-image-artifact-download@v1
       with:
         image: "openfoodfacts-server/backend:dev"
+    - name: build taxonomies (should use cache)
+      run: make build_taxonomies            
     - name: tests
       run: |
         make codecov_prepare
diff --git a/lib/ProductOpener/Food.pm b/lib/ProductOpener/Food.pm
index 95f4861e91fb0..c5d16647d0752 100644
--- a/lib/ProductOpener/Food.pm
+++ b/lib/ProductOpener/Food.pm
@@ -2470,7 +2470,9 @@ sub create_nutrients_level_taxonomy() {
 		}
 	}
 
-	open(my $OUT, ">:encoding(UTF-8)", "$data_root/taxonomies/nutrient_levels.txt");
+	print STDERR "generate $data_root/taxonomies/nutrient_levels.txt \n";
+
+	open(my $OUT, ">:encoding(UTF-8)", "$data_root/taxonomies/nutrient_levels.txt") or die("Can't write $data_root/taxonomies/nutrient_levels.txt: $!");
 	print $OUT <<TXT
 # nutrient levels taxonomy generated automatically by Food.pm from nutrients taxonomy + language translations (.po files)
 
diff --git a/lib/ProductOpener/Tags.pm b/lib/ProductOpener/Tags.pm
index 74e05ea209359..eafe52c849415 100644
--- a/lib/ProductOpener/Tags.pm
+++ b/lib/ProductOpener/Tags.pm
@@ -2467,7 +2467,7 @@ sub retrieve_tags_taxonomy ($tagtype) {
 	if (!-e "$data_root/taxonomies/$file.result.sto") {
 		print("Building $file on the fly\n");
 		# Nutrients levels taxonomy is generated from the nutrients taxonomy + language translations in Food.pm
-		# nutrients_levels.txt is not checked in the taxonomy directory and will be generated by build_lang.pl
+		# nutrient_levels.txt is not checked in the taxonomy directory and will be generated by build_lang.pl
 		# To avoid circular dependencies, we don't build it on the fly when Tags.pm is loaded.
 		if (($tagtype eq "nutrient_levels") and (!-e "$data_root/taxonomies/$file.txt")) {
 			print("Skipping nutrient_levels.txt as it is has not been generated by build_lang.pl yet\n");
diff --git a/scripts/build_lang.pl b/scripts/build_lang.pl
index 2925d2120c7bb..db6e91b1165f0 100755
--- a/scripts/build_lang.pl
+++ b/scripts/build_lang.pl
@@ -55,8 +55,9 @@
 
 # Nutrients level taxonomy file is built using languages
 create_nutrients_level_taxonomy();
+
 # and generate corresponding taxonomy
-build_tags_taxonomy('nutrients_levels', 1);
+build_tags_taxonomy('nutrient_levels', 1);
 
 exit(0);
 

From bac3b793897ba9a7ffc7bcffca2abf3aeac1516e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?St=C3=A9phane=20Gigandet?= <stephane@openfoodfacts.org>
Date: Thu, 7 Mar 2024 18:25:29 +0100
Subject: [PATCH 2/2] lint

---
 lib/ProductOpener/Food.pm | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/lib/ProductOpener/Food.pm b/lib/ProductOpener/Food.pm
index c5d16647d0752..e14d4420814cc 100644
--- a/lib/ProductOpener/Food.pm
+++ b/lib/ProductOpener/Food.pm
@@ -2472,7 +2472,8 @@ sub create_nutrients_level_taxonomy() {
 
 	print STDERR "generate $data_root/taxonomies/nutrient_levels.txt \n";
 
-	open(my $OUT, ">:encoding(UTF-8)", "$data_root/taxonomies/nutrient_levels.txt") or die("Can't write $data_root/taxonomies/nutrient_levels.txt: $!");
+	open(my $OUT, ">:encoding(UTF-8)", "$data_root/taxonomies/nutrient_levels.txt")
+		or die("Can't write $data_root/taxonomies/nutrient_levels.txt: $!");
 	print $OUT <<TXT
 # nutrient levels taxonomy generated automatically by Food.pm from nutrients taxonomy + language translations (.po files)