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/cd waste update classification #2462

Open
wants to merge 2 commits into
base: develop
Choose a base branch
from
Open

Chore/cd waste update classification #2462

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7f5501a
chore: C/D waste - wood fuel classification update
dleard Nov 12, 2024
05c11ae
test: update tests
dleard Nov 12, 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
2 changes: 1 addition & 1 deletion bc_obps/reporting/migrations/0008_prod_data.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -376,7 +376,7 @@ def init_fuel_type_data(apps, schema_monitor):
FuelType(name="Bituminous Coal", unit="tonnes", classification="Non-biomass"),
FuelType(name="Butane", unit="kilolitres", classification="Non-biomass"),
FuelType(name="C/D Waste - Plastic", unit="tonnes", classification="Exempted Non-biomass"),
FuelType(name="C/D Waste - Wood", unit="tonnes", classification="Woody Biomass"),
FuelType(name="C/D Waste - Wood", unit="tonnes", classification="Other Exempted Biomass"),
FuelType(name="Carpet fibre", unit="tonnes", classification="Exempted Non-biomass"),
FuelType(name="Coal Coke", unit="tonnes", classification="Non-biomass"),
FuelType(name="Comubstible Tall Oil", unit="kilolitres", classification="Woody Biomass"),
Expand Down
4 changes: 2 additions & 2 deletions bc_obps/reporting/tests/models/test_fuel_type.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,8 +82,8 @@ def test_fuel_type_initial_data(self):
exempted_non_biomass_count = FuelType.objects.filter(classification='Exempted Non-biomass').count()
non_biomass_count = FuelType.objects.filter(classification='Non-biomass').count()
non_exempted_biomass_count = FuelType.objects.filter(classification='Non-exempted Biomass').count()
self.assertEqual(woody_biomass_count, 9)
self.assertEqual(exempted_biomass_count, 8)
self.assertEqual(woody_biomass_count, 8)
self.assertEqual(exempted_biomass_count, 9)
self.assertEqual(exempted_non_biomass_count, 13)
self.assertEqual(non_biomass_count, 33)
self.assertEqual(non_exempted_biomass_count, 1)
Expand Down
4 changes: 2 additions & 2 deletions ...g/tests/service/test_report_activity_save_service/test_save_report_emission_categories.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ def test_apply_emission_categories(self):
json_data={"test_report_unit": True},
report_unit=None,
# Woody Biomass Fuel
fuel_type=FuelType.objects.get(pk=8),
fuel_type=FuelType.objects.get(pk=11),
)
make_recipe("reporting.tests.utils.gas_type", chemical_formula="GGIRCA")

Expand Down Expand Up @@ -87,7 +87,7 @@ def test_update_emission_categories(self):
json_data={"test_report_unit": True},
report_unit=None,
# Woody Biomass Fuel
fuel_type=FuelType.objects.get(pk=8),
fuel_type=FuelType.objects.get(pk=11),
)
make_recipe("reporting.tests.utils.gas_type", chemical_formula="GGIRCA")

Expand Down