fix: avoid crash if ingredients services called without ingredients_lc #11055
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
github-actions
bot
added
🥗🔍 Ingredients analysis
alexgarel
reviewed
Nov 26, 2024
lib/ProductOpener/Ingredients.pm
Outdated
| @@ -1604,7 +1604,7 @@ Array of specific ingredients. | |||
|
|
|||
| sub parse_origins_from_text ($product_ref, $text) { | |||
|
|
|||
| my $ingredients_lc = $product_ref->{ingredients_lc} || $product_ref->{lc}; | |||
| my $ingredients_lc = $product_ref->{ingredients_lc} || $product_ref->{lc} || $product_ref->{lang}; | |||
There was a problem hiding this comment.
This is where, if we add an Object approach, we could have a method for that on product. (would also work to define a sub get_product_lang)
There was a problem hiding this comment.
I'm refactoring it
alexgarel
reviewed
Nov 26, 2024
lib/ProductOpener/Ingredients.pm
Outdated
| @@ -1766,15 +1766,24 @@ sub parse_ingredients_text_service ($product_ref, $updated_product_fields_ref) { | |||
| # and indicate that the service is creating the "ingredients" structure | |||
| $updated_product_fields_ref->{ingredients} = 1; | |||
|
|
|||
| return if ((not defined $product_ref->{ingredients_text}) or ($product_ref->{ingredients_text} eq "")); | |||
| # $product_ref->{ingredients_lc} is defined in extract_ingredients_from_text() | |||
| my $ingredients_lc = $product_ref->{ingredients_lc} || $product_ref->{lc} || $product_ref->{lang}; | |||
There was a problem hiding this comment.
can we document this ingredients_lc property (I wasn't aware of it).
There was a problem hiding this comment.
It is in the OpenAPI spec:
ingredients_lc:
type: string
description: |
Language that was used to parse the ingredient list. If `ingredients_text` is available
for the product main language (`lang`), `ingredients_lc=lang`, otherwise we look at
`ingredients_text` fields for other languages and set `ingredients_lc` to the first
non-empty `ingredient_text`.
alexgarel
approved these changes
Nov 26, 2024
There was a problem hiding this comment.
Didn't you add a test for this scenario ?
github-actions
bot
added
API
|
|
@alexgarel Thank you for the feedback. I refactored some things, and then that led to refactoring more things:
|
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
fixes #11047
In the future, it would be a good thing to enable the services to add error messages that could be returned to the caller, when there is missing data for instance.