Merge pull request #2462 from bcgov/chore/cd-waste-update-classification

Chore/cd waste update classification
bcgov · Nov 22, 2024 · 1272ccb · 1272ccb
2 parents 9440212 + 5fb9679
commit 1272ccb
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git 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"),

diff --git 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/...g/tests/service/test_report_activity_save_service/test_save_report_emission_categories.py b/...g/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")