Repository navigation
Fix missing per-100g nutrition values in OFF imports - #2577
Open
JuleLeanne wants to merge 1 commit into
Open
JuleLeanne wants to merge 1 commit into
JuleLeanne wants to merge 1 commit into
Conversation
Derive missing nutrition values from per-serving data only when a reliable serving mass of at least 5 g is available. Preserve supplied values and existing validation, and cover conversion and import handling with tests. Refs wger-project#1506
There was a problem hiding this comment.
Copilot was unable to review this pull request because the user who requested the review has insufficient remaining quota. Try requesting a review at a lower effort level.
An organization owner can choose the repository organization as the billing source for reviews requested by members with a paid Copilot license. Learn about Copilot code review billing.
This branch has not been deployed
This file contains hidden or 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
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.
Proposed Changes
Open Food Facts products with per-serving nutrition but missing required
per-100g values are currently skipped. Calculate the missing values when a
reliable serving mass is available. For example, 4 g of protein per 20 g serving
becomes 20 g per 100 g.
the existing nutrition sanity checks.
servings are not treated as grams.
boundary, and continued importing after an invalid product is skipped.
The maintainer requested a minimum serving size. The selected 5 g threshold
matches Open Food Facts' own aggregation guard.
Related Issue(s)
Refs #1506. Implements the per-serving fallback discussed in the issue.
Testing
DJANGO_SETTINGS_MODULE=settings.ci python3 manage.py test wger.nutrition --noinput:427 tests run, 415 passed and 12 PostgreSQL-only search tests skipped under
SQLite. Tested with Python 3.12.3.
ruff checkandruff format --check: passed.git diff --check: passed.unchanged and zero database queries during the converter diagnostic.
Please check that the PR fulfills these requirements
ruff formatandruff check).AI assistance: Codex assisted with the implementation and tests.