From 7f5501a2aad70b66e8bc44fff60ba1499e43b37e Mon Sep 17 00:00:00 2001 From: Dylan Leard Date: Tue, 12 Nov 2024 14:36:42 -0800 Subject: [PATCH 1/2] chore: C/D waste - wood fuel classification update --- bc_obps/reporting/migrations/0008_prod_data.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bc_obps/reporting/migrations/0008_prod_data.py b/bc_obps/reporting/migrations/0008_prod_data.py index 840ea773d9..5475a1cdfb 100644 --- a/bc_obps/reporting/migrations/0008_prod_data.py +++ b/bc_obps/reporting/migrations/0008_prod_data.py @@ -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"), From 05c11aeba1be70d9cc2b6228ac5b74eb457ce547 Mon Sep 17 00:00:00 2001 From: Dylan Leard Date: Tue, 12 Nov 2024 14:41:59 -0800 Subject: [PATCH 2/2] test: update tests --- bc_obps/reporting/tests/models/test_fuel_type.py | 4 ++-- .../test_save_report_emission_categories.py | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/bc_obps/reporting/tests/models/test_fuel_type.py b/bc_obps/reporting/tests/models/test_fuel_type.py index 0a057ba671..0bbc73fa54 100644 --- a/bc_obps/reporting/tests/models/test_fuel_type.py +++ b/bc_obps/reporting/tests/models/test_fuel_type.py @@ -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) diff --git a/bc_obps/reporting/tests/service/test_report_activity_save_service/test_save_report_emission_categories.py b/bc_obps/reporting/tests/service/test_report_activity_save_service/test_save_report_emission_categories.py index a9c7a469ac..88f02e6ead 100644 --- a/bc_obps/reporting/tests/service/test_report_activity_save_service/test_save_report_emission_categories.py +++ b/bc_obps/reporting/tests/service/test_report_activity_save_service/test_save_report_emission_categories.py @@ -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") @@ -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")