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: Add is_in_taxonomy boolean flag in ingredient parsing result #9968

Merged
merged 10 commits into from
Apr 19, 2024
Merged

feat: Add is_in_taxonomy boolean flag in ingredient parsing result #9968

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
fe758b9
Add is_in_taxonomy boolean flag in ingredient parsing result
himanshisrestha Mar 21, 2024
134dc05
Merge branch 'main' into fix-isInTaxonomy
himanshisrestha Mar 23, 2024
f28f900
fix isInTaxonomy update test results
himanshisrestha Mar 23, 2024
ad02904
Merge branch 'main' into fix-isInTaxonomy
himanshisrestha Apr 4, 2024
5dcfcdf
lint added
himanshisrestha Apr 4, 2024
6f4e502
expected results updated for ingredients processing unit test
himanshisrestha Apr 5, 2024
91087b2
modified expected results in ingredient nesting unit test
himanshisrestha Apr 5, 2024
9517c46
added is_in_taxonomy to fix api_v2_product_read tests
himanshisrestha Apr 18, 2024
a4ca1ff
updated test results to multiple files
himanshisrestha Apr 18, 2024
2062438
update test results in search
himanshisrestha Apr 18, 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
6 changes: 5 additions & 1 deletion lib/ProductOpener/Ingredients.pm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -202,7 +202,8 @@ my %may_contain_regexps = (
"Dit product kan sporen van|bevat mogelijk sporen van|Kan sporen bevatten van|Kan sporen van|bevat mogelijk|sporen van|Geproduceerd in ruimtes waar",
nb =>
"kan inneholde spor av|kan forekomme spor av|kan inneholde spor|kan forekomme spor|kan inneholde|kan forekomme",
pl => "może zawierać śladowe ilości|produkt może zawierać|może zawierać|możliwa obecność|może zawierać alergeny|możliwa obecność|w produkcie możliwa obecność|wyprodukowano w zakładzie przetwarzającym",
pl =>
"może zawierać śladowe ilości|produkt może zawierać|może zawierać|możliwa obecność|może zawierać alergeny|możliwa obecność|w produkcie możliwa obecność|wyprodukowano w zakładzie przetwarzającym",
pt => "pode conter vestígios de|pode conter",
ro => "poate con[țţt]ine urme de|poate con[țţt]ine|poate con[țţt]in|produsul poate conţine urme de",
rs => "može sadržati tragove",
Expand Down Expand Up @@ -2807,6 +2808,9 @@ sub parse_ingredients_text_service ($product_ref, $updated_product_fields_ref) {
text => $ingredient
);

my $is_in_taxonomy = exists_taxonomy_tag("ingredients", $ingredient_id) ? 1 : 0;
$ingredient{is_in_taxonomy} = $is_in_taxonomy;

if (defined $percent_or_quantity_value) {
my ($percent, $quantity, $quantity_g)
= get_percent_or_quantity_and_normalized_quantity($percent_or_quantity_value,
Expand Down
4 changes: 4 additions & 0 deletions tests/integration/expected_test_results/api_v2_product_read/get-existing-product.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -583,6 +583,7 @@
{
"ciqual_food_code" : "13050",
"id" : "en:apple",
"is_in_taxonomy": 1,
"percent_estimate" : 62.5,
"percent_max" : 100,
"percent_min" : 25,
Expand All @@ -593,6 +594,7 @@
{
"ciqual_proxy_food_code" : "19051",
"id" : "en:milk",
"is_in_taxonomy": 1,
"percent_estimate" : 18.75,
"percent_max" : 50,
"percent_min" : 0,
Expand All @@ -603,6 +605,7 @@
{
"ciqual_food_code" : "22000",
"id" : "en:egg",
"is_in_taxonomy": 1,
"percent_estimate" : 9.375,
"percent_max" : 33.3333333333333,
"percent_min" : 0,
Expand All @@ -614,6 +617,7 @@
"ciqual_food_code" : "16129",
"from_palm_oil" : "yes",
"id" : "en:palm-oil",
"is_in_taxonomy": 1,
"percent_estimate" : 9.375,
"percent_max" : 25,
"percent_min" : 0,
Expand Down
4 changes: 4 additions & 0 deletions ...ntegration/expected_test_results/api_v2_product_read/get-fields-all-knowledge-panels.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -583,6 +583,7 @@
{
"ciqual_food_code" : "13050",
"id" : "en:apple",
"is_in_taxonomy": 1,
"percent_estimate" : 62.5,
"percent_max" : 100,
"percent_min" : 25,
Expand All @@ -593,6 +594,7 @@
{
"ciqual_proxy_food_code" : "19051",
"id" : "en:milk",
"is_in_taxonomy": 1,
"percent_estimate" : 18.75,
"percent_max" : 50,
"percent_min" : 0,
Expand All @@ -603,6 +605,7 @@
{
"ciqual_food_code" : "22000",
"id" : "en:egg",
"is_in_taxonomy": 1,
"percent_estimate" : 9.375,
"percent_max" : 33.3333333333333,
"percent_min" : 0,
Expand All @@ -614,6 +617,7 @@
"ciqual_food_code" : "16129",
"from_palm_oil" : "yes",
"id" : "en:palm-oil",
"is_in_taxonomy": 1,
"percent_estimate" : 9.375,
"percent_max" : 25,
"percent_min" : 0,
Expand Down
4 changes: 4 additions & 0 deletions tests/integration/expected_test_results/api_v2_product_read/get-fields-all.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -583,6 +583,7 @@
{
"ciqual_food_code" : "13050",
"id" : "en:apple",
"is_in_taxonomy": 1,
"percent_estimate" : 62.5,
"percent_max" : 100,
"percent_min" : 25,
Expand All @@ -593,6 +594,7 @@
{
"ciqual_proxy_food_code" : "19051",
"id" : "en:milk",
"is_in_taxonomy": 1,
"percent_estimate" : 18.75,
"percent_max" : 50,
"percent_min" : 0,
Expand All @@ -603,6 +605,7 @@
{
"ciqual_food_code" : "22000",
"id" : "en:egg",
"is_in_taxonomy": 1,
"percent_estimate" : 9.375,
"percent_max" : 33.3333333333333,
"percent_min" : 0,
Expand All @@ -614,6 +617,7 @@
"ciqual_food_code" : "16129",
"from_palm_oil" : "yes",
"id" : "en:palm-oil",
"is_in_taxonomy": 1,
"percent_estimate" : 9.375,
"percent_max" : 25,
"percent_min" : 0,
Expand Down
4 changes: 4 additions & 0 deletions ...ed_test_results/api_v2_product_read/get-fields-attribute-groups-all-knowledge-panels.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1231,6 +1231,7 @@
{
"ciqual_food_code" : "13050",
"id" : "en:apple",
"is_in_taxonomy": 1,
"percent_estimate" : 62.5,
"percent_max" : 100,
"percent_min" : 25,
Expand All @@ -1241,6 +1242,7 @@
{
"ciqual_proxy_food_code" : "19051",
"id" : "en:milk",
"is_in_taxonomy": 1,
"percent_estimate" : 18.75,
"percent_max" : 50,
"percent_min" : 0,
Expand All @@ -1251,6 +1253,7 @@
{
"ciqual_food_code" : "22000",
"id" : "en:egg",
"is_in_taxonomy": 1,
"percent_estimate" : 9.375,
"percent_max" : 33.3333333333333,
"percent_min" : 0,
Expand All @@ -1262,6 +1265,7 @@
"ciqual_food_code" : "16129",
"from_palm_oil" : "yes",
"id" : "en:palm-oil",
"is_in_taxonomy": 1,
"percent_estimate" : 9.375,
"percent_max" : 25,
"percent_min" : 0,
Expand Down
4 changes: 4 additions & 0 deletions tests/integration/expected_test_results/api_v2_product_read/get-fields-raw.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -578,6 +578,7 @@
{
"ciqual_food_code" : "13050",
"id" : "en:apple",
"is_in_taxonomy": 1,
"percent_estimate" : 62.5,
"percent_max" : 100,
"percent_min" : 25,
Expand All @@ -588,6 +589,7 @@
{
"ciqual_proxy_food_code" : "19051",
"id" : "en:milk",
"is_in_taxonomy": 1,
"percent_estimate" : 18.75,
"percent_max" : 50,
"percent_min" : 0,
Expand All @@ -598,6 +600,7 @@
{
"ciqual_food_code" : "22000",
"id" : "en:egg",
"is_in_taxonomy": 1,
"percent_estimate" : 9.375,
"percent_max" : 33.3333333333333,
"percent_min" : 0,
Expand All @@ -609,6 +612,7 @@
"ciqual_food_code" : "16129",
"from_palm_oil" : "yes",
"id" : "en:palm-oil",
"is_in_taxonomy": 1,
"percent_estimate" : 9.375,
"percent_max" : 25,
"percent_min" : 0,
Expand Down
4 changes: 4 additions & 0 deletions ...ntegration/expected_test_results/api_v2_product_write/get-product-auth-good-password.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -522,6 +522,7 @@
{
"ciqual_proxy_food_code" : "9410",
"id" : "en:wheat-flour",
"is_in_taxonomy": 1,
"percent_estimate" : 62.5,
"percent_max" : 100,
"percent_min" : 25,
Expand All @@ -532,6 +533,7 @@
{
"ciqual_food_code" : "18066",
"id" : "en:water",
"is_in_taxonomy": 1,
"percent_estimate" : 18.75,
"percent_max" : 50,
"percent_min" : 0,
Expand All @@ -542,6 +544,7 @@
{
"ciqual_food_code" : "11058",
"id" : "en:salt",
"is_in_taxonomy": 1,
"percent_estimate" : 9.375,
"percent_max" : 33.3333333333333,
"percent_min" : 0,
Expand All @@ -552,6 +555,7 @@
{
"ciqual_proxy_food_code" : "31016",
"id" : "en:sugar",
"is_in_taxonomy": 1,
"percent_estimate" : 9.375,
"percent_max" : 25,
"percent_min" : 0,
Expand Down
2 changes: 2 additions & 0 deletions ...cted_test_results/api_v2_product_write/get-product-ingredients-text-without-language.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -358,6 +358,7 @@
{
"ciqual_proxy_food_code" : "28205",
"id" : "en:pork-meat",
"is_in_taxonomy": 1,
"percent_estimate" : 75,
"percent_max" : 100,
"percent_min" : 50,
Expand All @@ -368,6 +369,7 @@
{
"ciqual_food_code" : "11058",
"id" : "en:salt",
"is_in_taxonomy": 1,
"percent_estimate" : 25,
"percent_max" : 50,
"percent_min" : 0,
Expand Down
4 changes: 4 additions & 0 deletions tests/integration/expected_test_results/api_v2_product_write/get-product.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -522,6 +522,7 @@
{
"ciqual_proxy_food_code" : "9410",
"id" : "en:wheat-flour",
"is_in_taxonomy": 1,
"percent_estimate" : 62.5,
"percent_max" : 100,
"percent_min" : 25,
Expand All @@ -532,6 +533,7 @@
{
"ciqual_food_code" : "18066",
"id" : "en:water",
"is_in_taxonomy": 1,
"percent_estimate" : 18.75,
"percent_max" : 50,
"percent_min" : 0,
Expand All @@ -542,6 +544,7 @@
{
"ciqual_food_code" : "11058",
"id" : "en:salt",
"is_in_taxonomy": 1,
"percent_estimate" : 9.375,
"percent_max" : 33.3333333333333,
"percent_min" : 0,
Expand All @@ -552,6 +555,7 @@
{
"ciqual_proxy_food_code" : "31016",
"id" : "en:sugar",
"is_in_taxonomy": 1,
"percent_estimate" : 9.375,
"percent_max" : 25,
"percent_min" : 0,
Expand Down
4 changes: 4 additions & 0 deletions ...ation/expected_test_results/api_v3_product_read/get-existing-product-gs1-ai-data-str.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -585,6 +585,7 @@
{
"ciqual_food_code" : "13050",
"id" : "en:apple",
"is_in_taxonomy": 1,
"percent_estimate" : 62.5,
"percent_max" : 100,
"percent_min" : 25,
Expand All @@ -595,6 +596,7 @@
{
"ciqual_proxy_food_code" : "19051",
"id" : "en:milk",
"is_in_taxonomy": 1,
"percent_estimate" : 18.75,
"percent_max" : 50,
"percent_min" : 0,
Expand All @@ -605,6 +607,7 @@
{
"ciqual_food_code" : "22000",
"id" : "en:egg",
"is_in_taxonomy": 1,
"percent_estimate" : 9.375,
"percent_max" : 33.3333333333333,
"percent_min" : 0,
Expand All @@ -616,6 +619,7 @@
"ciqual_food_code" : "16129",
"from_palm_oil" : "yes",
"id" : "en:palm-oil",
"is_in_taxonomy": 1,
"percent_estimate" : 9.375,
"percent_max" : 25,
"percent_min" : 0,
Expand Down
4 changes: 4 additions & 0 deletions ...integration/expected_test_results/api_v3_product_read/get-existing-product-gs1-caret.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -585,6 +585,7 @@
{
"ciqual_food_code" : "13050",
"id" : "en:apple",
"is_in_taxonomy": 1,
"percent_estimate" : 62.5,
"percent_max" : 100,
"percent_min" : 25,
Expand All @@ -595,6 +596,7 @@
{
"ciqual_proxy_food_code" : "19051",
"id" : "en:milk",
"is_in_taxonomy": 1,
"percent_estimate" : 18.75,
"percent_max" : 50,
"percent_min" : 0,
Expand All @@ -605,6 +607,7 @@
{
"ciqual_food_code" : "22000",
"id" : "en:egg",
"is_in_taxonomy": 1,
"percent_estimate" : 9.375,
"percent_max" : 33.3333333333333,
"percent_min" : 0,
Expand All @@ -616,6 +619,7 @@
"ciqual_food_code" : "16129",
"from_palm_oil" : "yes",
"id" : "en:palm-oil",
"is_in_taxonomy": 1,
"percent_estimate" : 9.375,
"percent_max" : 25,
"percent_min" : 0,
Expand Down
4 changes: 4 additions & 0 deletions ...egration/expected_test_results/api_v3_product_read/get-existing-product-gs1-data-uri.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -585,6 +585,7 @@
{
"ciqual_food_code" : "13050",
"id" : "en:apple",
"is_in_taxonomy": 1,
"percent_estimate" : 62.5,
"percent_max" : 100,
"percent_min" : 25,
Expand All @@ -595,6 +596,7 @@
{
"ciqual_proxy_food_code" : "19051",
"id" : "en:milk",
"is_in_taxonomy": 1,
"percent_estimate" : 18.75,
"percent_max" : 50,
"percent_min" : 0,
Expand All @@ -605,6 +607,7 @@
{
"ciqual_food_code" : "22000",
"id" : "en:egg",
"is_in_taxonomy": 1,
"percent_estimate" : 9.375,
"percent_max" : 33.3333333333333,
"percent_min" : 0,
Expand All @@ -616,6 +619,7 @@
"ciqual_food_code" : "16129",
"from_palm_oil" : "yes",
"id" : "en:palm-oil",
"is_in_taxonomy": 1,
"percent_estimate" : 9.375,
"percent_max" : 25,
"percent_min" : 0,
Expand Down
4 changes: 4 additions & 0 deletions .../integration/expected_test_results/api_v3_product_read/get-existing-product-gs1-fnc1.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -585,6 +585,7 @@
{
"ciqual_food_code" : "13050",
"id" : "en:apple",
"is_in_taxonomy": 1,
"percent_estimate" : 62.5,
"percent_max" : 100,
"percent_min" : 25,
Expand All @@ -595,6 +596,7 @@
{
"ciqual_proxy_food_code" : "19051",
"id" : "en:milk",
"is_in_taxonomy": 1,
"percent_estimate" : 18.75,
"percent_max" : 50,
"percent_min" : 0,
Expand All @@ -605,6 +607,7 @@
{
"ciqual_food_code" : "22000",
"id" : "en:egg",
"is_in_taxonomy": 1,
"percent_estimate" : 9.375,
"percent_max" : 33.3333333333333,
"percent_min" : 0,
Expand All @@ -616,6 +619,7 @@
"ciqual_food_code" : "16129",
"from_palm_oil" : "yes",
"id" : "en:palm-oil",
"is_in_taxonomy": 1,
"percent_estimate" : 9.375,
"percent_max" : 25,
"percent_min" : 0,
Expand Down
Loading
Loading