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

feat: make all glass bottles recyclable by default #7945

Merged
merged 6 commits into from
Jan 6, 2023
Merged

feat: make all glass bottles recyclable by default #7945

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
eb31bc6
feat: make all glass bottles recyclable by default
diivi Jan 4, 2023
9324a38
check if material is a type of glass
diivi Jan 5, 2023
b81f7a3
formatting
diivi Jan 5, 2023
58a94b0
update tests
diivi Jan 5, 2023
b12f2da
update integration tests
diivi Jan 5, 2023
1eb48b3
fix: remove compared_to_category from tests
diivi Jan 6, 2023
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
9 changes: 9 additions & 0 deletions lib/ProductOpener/Packaging.pm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -505,6 +505,15 @@ sub apply_rules_to_augment_packaging_component_data ($product_ref, $packaging_re
$packaging_ref->{"shape"} = "en:coffee-capsule";
}

# If the shape is bottle and the material is glass, mark recycling as recycle
if ( (defined $packaging_ref->{"shape"})
and ($packaging_ref->{"shape"} eq "en:bottle")
and (defined $packaging_ref->{"material"})
and ($packaging_ref->{"material"} eq "en:glass"))
diivi marked this conversation as resolved.
Show resolved Hide resolved
diivi marked this conversation as resolved.
Show resolved Hide resolved
{
$packaging_ref->{"recycling"} = "en:recycle";
}
diivi marked this conversation as resolved.
Show resolved Hide resolved

# If we have a shape without a material, check if there is a default material for the shape
# e.g. "en:Bubble wrap" has the property packaging_materials:en: en:plastic
if ((defined $packaging_ref->{"shape"}) and (not defined $packaging_ref->{"material"})) {
Expand Down
3 changes: 2 additions & 1 deletion tests/unit/expected_test_results/packaging/packaging_text_en_glass_bottle.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,8 @@
"packagings" : [
{
"material" : "en:glass",
"shape" : "en:bottle"
"shape" : "en:bottle",
"recycling" : "en:recycle"
}
]
}