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

Jump to bottom

chore: Intake revisited #10466

Merged
merged 49 commits into from
Jul 15, 2024
Merged

chore: Intake revisited #10466

merged 49 commits into from
Jul 15, 2024

Conversation

aleene
Copy link
Contributor

@aleene aleene commented Jun 19, 2024

What

The new intake descriptions are revisited

@aleene
New category
ea1d365 
Might need some cleanup to have a better matching
@aleene
typo
b34e5ed
@aleene
strange parent
8882390
@aleene
repaired parents
b6065cd
@aleene
new milk parent
b9b32ed 
Needed to split liquid and powdered milk
@aleene aleene marked this pull request as draft June 19, 2024 14:43
@aleene aleene self-assigned this Jun 19, 2024
@github-actions github-actions bot added 🧬 Taxonomies https://wiki.openfoodfacts.org/Global_taxonomies categories labels Jun 19, 2024
stephanegigandet
stephanegigandet approved these changes Jun 20, 2024
View reviewed changes
Copy link
Contributor

@stephanegigandet stephanegigandet left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks!

Those are still the Intake UK categories right? For modified FR categories, we should use a new property intake24_fr_category_code, so that we still have matching for Intake UK.

@aleene
Copy link
Contributor Author

aleene commented Jun 20, 2024

Will do that

@aleene
Copy link
Contributor Author

aleene commented Jun 20, 2024

I will add the french variants to each entry to make things clear

@aleene
Copy link
Contributor Author

aleene commented Jun 22, 2024

@stephanegigandet can you look at the failing test? It does not say what failed.

@stephanegigandet
Copy link
Contributor

@stephanegigandet can you look at the failing test? It does not say what failed.

@aleene I fixed the tests, it was just a comma missing that prevented the expected JSON to be parsed

@github-actions github-actions bot added the 💥 Merge Conflicts 💥 Merge Conflicts label Jul 2, 2024
@github-actions github-actions bot removed the 💥 Merge Conflicts 💥 Merge Conflicts label Jul 5, 2024
@github-actions github-actions bot added the 💥 Merge Conflicts 💥 Merge Conflicts label Jul 5, 2024
@sonarcloud SonarCloud
Copy link

sonarcloud bot commented Jul 15, 2024

Quality Gate Passed Quality Gate passed

Issues
0 New issues
0 Accepted issues

Measures
0 Security Hotspots
0.0% Coverage on New Code
0.0% Duplication on New Code

See analysis details on SonarCloud

@stephanegigandet
Copy link
Contributor

@aleene tests fixed, can we merge?

@aleene aleene marked this pull request as ready for review July 15, 2024 13:12
@aleene aleene requested a review from a team as a code owner July 15, 2024 13:12
@aleene aleene merged commit 8aa5c8b into main Jul 15, 2024
12 checks passed
@aleene aleene deleted the aleene-intake-revisited branch July 15, 2024 13:12
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@stephanegigandet stephanegigandet stephanegigandet approved these changes

Assignees

@aleene aleene

Labels
categories 💥 Merge Conflicts 💥 Merge Conflicts 🧬 Taxonomies https://wiki.openfoodfacts.org/Global_taxonomies 🧪 tests
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
2 participants
@aleene @stephanegigandet