Merge pull request #3677 from bcgov/release-v1.2.2

Release v1.2.2

Author: AlexZorkin

backend/lcfs/db/seeders/staging/test_compliance_report_summary_seeder.py

@@ -329,39 +329,59 @@ async def seed_test_compliance_report_summaries(session):
             "total_non_compliance_penalty_payable": 0.0,
         },
         # New LCFS1-10 summaries (lightweight values matching status)
-        # 101 Draft 2024 (unlocked)
+        # 101 Draft 2024 (unlocked) - retains fuel (line 6) and defers obligation (line 8)
         {
             "summary_id": 101,
             "compliance_report_id": 101,
             "is_locked": False,
-            "line_1_fossil_derived_base_fuel_gasoline": 100.0,
-            "line_2_eligible_renewable_fuel_supplied_gasoline": 20.0,
-            "line_3_total_tracked_fuel_supplied_gasoline": 120.0,
-            "line_4_eligible_renewable_fuel_required_gasoline": 5.0,
-            "line_5_net_notionally_transferred_gasoline": 20.0,
-            "line_6_renewable_fuel_retained_gasoline": 0.0,
+            "line_1_fossil_derived_base_fuel_gasoline": 50000000.0,
+            "line_1_fossil_derived_base_fuel_diesel": 25000000.0,
+            "line_2_eligible_renewable_fuel_supplied_gasoline": 10000000.0,
+            "line_2_eligible_renewable_fuel_supplied_diesel": 5000000.0,
+            "line_3_total_tracked_fuel_supplied_gasoline": 60000000.0,
+            "line_3_total_tracked_fuel_supplied_diesel": 30000000.0,
+            "line_4_eligible_renewable_fuel_required_gasoline": 2500000.0,
+            "line_4_eligible_renewable_fuel_required_diesel": 1250000.0,
+            "line_5_net_notionally_transferred_gasoline": 1000000.0,
+            "line_5_net_notionally_transferred_diesel": 0.0,
+            "line_6_renewable_fuel_retained_gasoline": 250000.0,
+            "line_6_renewable_fuel_retained_diesel": 125000.0,
             "line_7_previously_retained_gasoline": 0.0,
-            "line_8_obligation_deferred_gasoline": 0.0,
+            "line_7_previously_retained_diesel": 0.0,
+            "line_8_obligation_deferred_gasoline": 150000.0,
+            "line_8_obligation_deferred_diesel": 75000.0,
             "line_9_obligation_added_gasoline": 0.0,
-            "line_10_net_renewable_fuel_supplied_gasoline": 40.0,
-            "line_20_surplus_deficit_units": 40.0,
+            "line_9_obligation_added_diesel": 0.0,
+            "line_10_net_renewable_fuel_supplied_gasoline": 10600000.0,
+            "line_10_net_renewable_fuel_supplied_diesel": 4800000.0,
+            "line_20_surplus_deficit_units": 15400000.0,
         },
-        # 102 Submitted 2024 (reserved)
+        # 102 Submitted 2024 (reserved) - adds previously deferred obligation (line 9)
         {
             "summary_id": 102,
             "compliance_report_id": 102,
             "is_locked": False,
-            "line_1_fossil_derived_base_fuel_gasoline": 80.0,
-            "line_2_eligible_renewable_fuel_supplied_gasoline": 16.0,
-            "line_3_total_tracked_fuel_supplied_gasoline": 96.0,
-            "line_4_eligible_renewable_fuel_required_gasoline": 4.0,
-            "line_5_net_notionally_transferred_gasoline": -15.0,
+            "line_1_fossil_derived_base_fuel_gasoline": 40000000.0,
+            "line_1_fossil_derived_base_fuel_diesel": 20000000.0,
+            "line_2_eligible_renewable_fuel_supplied_gasoline": 8000000.0,
+            "line_2_eligible_renewable_fuel_supplied_diesel": 4000000.0,
+            "line_3_total_tracked_fuel_supplied_gasoline": 48000000.0,
+            "line_3_total_tracked_fuel_supplied_diesel": 24000000.0,
+            "line_4_eligible_renewable_fuel_required_gasoline": 2000000.0,
+            "line_4_eligible_renewable_fuel_required_diesel": 1000000.0,
+            "line_5_net_notionally_transferred_gasoline": -750000.0,
+            "line_5_net_notionally_transferred_diesel": 0.0,
             "line_6_renewable_fuel_retained_gasoline": 0.0,
+            "line_6_renewable_fuel_retained_diesel": 0.0,
             "line_7_previously_retained_gasoline": 0.0,
+            "line_7_previously_retained_diesel": 0.0,
             "line_8_obligation_deferred_gasoline": 0.0,
-            "line_9_obligation_added_gasoline": 0.0,
-            "line_10_net_renewable_fuel_supplied_gasoline": 1.0,
-            "line_20_surplus_deficit_units": 1.0,
+            "line_8_obligation_deferred_diesel": 0.0,
+            "line_9_obligation_added_gasoline": 150000.0,
+            "line_9_obligation_added_diesel": 75000.0,
+            "line_10_net_renewable_fuel_supplied_gasoline": 7100000.0,
+            "line_10_net_renewable_fuel_supplied_diesel": 3925000.0,
+            "line_20_surplus_deficit_units": 11025000.0,
         },
         # 103 Recommended 2024 (locked)
         # CR 103 locked recommended: fuel 12 + notional 10, retention 2, deferral 1 => line10/20 = 21
@@ -372,41 +392,61 @@ async def seed_test_compliance_report_summaries(session):
         # 105 Analyst Adjustment 2025 (locked)
         # CR 105 locked analyst adj: fuel 10 + notional 8, retention 1, deferral 0.5 => line10/20 = 17.5
         {"summary_id": 105, "compliance_report_id": 105, "is_locked": True, "line_1_fossil_derived_base_fuel_gasoline": 40.0, "line_2_eligible_renewable_fuel_supplied_gasoline": 10.0, "line_3_total_tracked_fuel_supplied_gasoline": 50.0, "line_4_eligible_renewable_fuel_required_gasoline": 2.0, "line_5_net_notionally_transferred_gasoline": 8.0, "line_6_renewable_fuel_retained_gasoline": 1.0, "line_7_previously_retained_gasoline": 0.0, "line_8_obligation_deferred_gasoline": 0.5, "line_9_obligation_added_gasoline": 0.0, "line_10_net_renewable_fuel_supplied_gasoline": 17.5, "line_20_surplus_deficit_units": 17.5},
-        # 106 Supplier Supplemental 2025 (draft)
+        # 106 Supplier Supplemental 2025 (draft) - uses previous retention (line 7)
         {
             "summary_id": 106,
             "compliance_report_id": 106,
             "is_locked": False,
-            "line_1_fossil_derived_base_fuel_gasoline": 90.0,
-            "line_2_eligible_renewable_fuel_supplied_gasoline": 18.0,
-            "line_3_total_tracked_fuel_supplied_gasoline": 108.0,
-            "line_4_eligible_renewable_fuel_required_gasoline": 4.5,
-            "line_5_net_notionally_transferred_gasoline": -18.0,
+            "line_1_fossil_derived_base_fuel_gasoline": 45000000.0,
+            "line_2_eligible_renewable_fuel_supplied_gasoline": 9000000.0,
+            "line_3_total_tracked_fuel_supplied_gasoline": 54000000.0,
+            "line_4_eligible_renewable_fuel_required_gasoline": 2250000.0,
+            "line_5_net_notionally_transferred_gasoline": -900000.0,
             "line_6_renewable_fuel_retained_gasoline": 0.0,
-            "line_7_previously_retained_gasoline": 15.0,
+            "line_7_previously_retained_gasoline": 750000.0,
             "line_8_obligation_deferred_gasoline": 0.0,
-            "line_9_obligation_added_gasoline": 5.0,
-            "line_10_net_renewable_fuel_supplied_gasoline": 10.0,
-            "line_20_surplus_deficit_units": 10.0,
+            "line_9_obligation_added_gasoline": 0.0,
+            "line_10_net_renewable_fuel_supplied_gasoline": 8850000.0,
+            "line_20_surplus_deficit_units": 8850000.0,
         },
-        # 107 Gov Supplemental 2025 (draft)
+        # 107 Gov Supplemental 2025 (draft) - uses previous retention (line 7) and retains more (line 6)
         {
             "summary_id": 107,
             "compliance_report_id": 107,
             "is_locked": False,
-            "line_1_fossil_derived_base_fuel_gasoline": 40.0,
-            "line_2_eligible_renewable_fuel_supplied_gasoline": 8.0,
-            "line_3_total_tracked_fuel_supplied_gasoline": 48.0,
-            "line_4_eligible_renewable_fuel_required_gasoline": 2.0,
-            "line_5_net_notionally_transferred_gasoline": 7.0,
-            "line_6_renewable_fuel_retained_gasoline": 0.0,
-            "line_7_previously_retained_gasoline": 0.0,
+            "line_1_fossil_derived_base_fuel_gasoline": 20000000.0,
+            "line_1_fossil_derived_base_fuel_diesel": 15000000.0,
+            "line_1_fossil_derived_base_fuel_jet_fuel": 10000000.0,
+            "line_2_eligible_renewable_fuel_supplied_gasoline": 4000000.0,
+            "line_2_eligible_renewable_fuel_supplied_diesel": 3000000.0,
+            "line_2_eligible_renewable_fuel_supplied_jet_fuel": 2000000.0,
+            "line_3_total_tracked_fuel_supplied_gasoline": 24000000.0,
+            "line_3_total_tracked_fuel_supplied_diesel": 18000000.0,
+            "line_3_total_tracked_fuel_supplied_jet_fuel": 12000000.0,
+            "line_4_eligible_renewable_fuel_required_gasoline": 1000000.0,
+            "line_4_eligible_renewable_fuel_required_diesel": 750000.0,
+            "line_4_eligible_renewable_fuel_required_jet_fuel": 0.0,
+            "line_5_net_notionally_transferred_gasoline": 350000.0,
+            "line_5_net_notionally_transferred_diesel": 0.0,
+            "line_5_net_notionally_transferred_jet_fuel": 0.0,
+            "line_6_renewable_fuel_retained_gasoline": 100000.0,
+            "line_6_renewable_fuel_retained_diesel": 50000.0,
+            "line_6_renewable_fuel_retained_jet_fuel": 25000.0,
+            "line_7_previously_retained_gasoline": 200000.0,
+            "line_7_previously_retained_diesel": 100000.0,
+            "line_7_previously_retained_jet_fuel": 0.0,
             "line_8_obligation_deferred_gasoline": 0.0,
+            "line_8_obligation_deferred_diesel": 0.0,
+            "line_8_obligation_deferred_jet_fuel": 0.0,
             "line_9_obligation_added_gasoline": 0.0,
-            "line_10_net_renewable_fuel_supplied_gasoline": 15.0,
-            "line_20_surplus_deficit_units": 15.0,
+            "line_9_obligation_added_diesel": 0.0,
+            "line_9_obligation_added_jet_fuel": 0.0,
+            "line_10_net_renewable_fuel_supplied_gasoline": 4450000.0,
+            "line_10_net_renewable_fuel_supplied_diesel": 3050000.0,
+            "line_10_net_renewable_fuel_supplied_jet_fuel": 1975000.0,
+            "line_20_surplus_deficit_units": 9475000.0,
         },
-        # 108 Early issuance quarterly draft 2025
+        # 108 Early issuance quarterly draft 2025 - defers obligation (line 8)
         {
             "summary_id": 108,
             "compliance_report_id": 108,
@@ -415,17 +455,27 @@ async def seed_test_compliance_report_summaries(session):
             "early_issuance_credits_q2": 20,
             "early_issuance_credits_q3": 0,
             "early_issuance_credits_q4": 0,
-            "line_1_fossil_derived_base_fuel_gasoline": 30.0,
-            "line_2_eligible_renewable_fuel_supplied_gasoline": 6.0,
-            "line_3_total_tracked_fuel_supplied_gasoline": 36.0,
-            "line_4_eligible_renewable_fuel_required_gasoline": 1.5,
-            "line_5_net_notionally_transferred_gasoline": -5.0,
+            "line_1_fossil_derived_base_fuel_gasoline": 15000000.0,
+            "line_1_fossil_derived_base_fuel_diesel": 12500000.0,
+            "line_2_eligible_renewable_fuel_supplied_gasoline": 3000000.0,
+            "line_2_eligible_renewable_fuel_supplied_diesel": 2500000.0,
+            "line_3_total_tracked_fuel_supplied_gasoline": 18000000.0,
+            "line_3_total_tracked_fuel_supplied_diesel": 15000000.0,
+            "line_4_eligible_renewable_fuel_required_gasoline": 750000.0,
+            "line_4_eligible_renewable_fuel_required_diesel": 625000.0,
+            "line_5_net_notionally_transferred_gasoline": -250000.0,
+            "line_5_net_notionally_transferred_diesel": 0.0,
             "line_6_renewable_fuel_retained_gasoline": 0.0,
+            "line_6_renewable_fuel_retained_diesel": 0.0,
             "line_7_previously_retained_gasoline": 0.0,
-            "line_8_obligation_deferred_gasoline": 0.0,
+            "line_7_previously_retained_diesel": 0.0,
+            "line_8_obligation_deferred_gasoline": 100000.0,
+            "line_8_obligation_deferred_diesel": 50000.0,
             "line_9_obligation_added_gasoline": 0.0,
-            "line_10_net_renewable_fuel_supplied_gasoline": 1.0,
-            "line_20_surplus_deficit_units": 1.0,
+            "line_9_obligation_added_diesel": 0.0,
+            "line_10_net_renewable_fuel_supplied_gasoline": 2650000.0,
+            "line_10_net_renewable_fuel_supplied_diesel": 2450000.0,
+            "line_20_surplus_deficit_units": 5100000.0,
         },
         # 109 Assessed 2023 baseline
         # CR 109 locked assessed baseline: fuel 13 + notional 14 => line10/20 27

backend/lcfs/tests/charging_equipment/test_charging_equipment_repo.py

@@ -2,8 +2,10 @@
 from unittest.mock import AsyncMock, MagicMock, patch
 from sqlalchemy.exc import DatabaseError
 
+from lcfs.db.base import ActionTypeEnum
 from lcfs.db.models.compliance.ChargingEquipment import ChargingEquipment
 from lcfs.db.models.compliance.ChargingEquipmentStatus import ChargingEquipmentStatus
+from lcfs.db.models.compliance.ChargingSite import ChargingSite
 from lcfs.db.models.compliance.ComplianceReportChargingEquipment import (
     ComplianceReportChargingEquipment,
 )
@@ -602,3 +604,143 @@ async def test_auto_submit_draft_updated_fse_for_report_missing_status(repo, moc
     assert mock_db.execute.call_count == 1
     # flush should not be called since no updates were made
     mock_db.flush.assert_not_called()
+
+
+class TestChargingEquipmentRepositoryDeletedFiltering:
+    """Test class for verifying deleted equipment and sites are filtered out"""
+
+    @pytest.mark.anyio
+    async def test_get_charging_equipment_list_excludes_deleted_equipment(
+        self, valid_charging_equipment
+    ):
+        """Test that get_charging_equipment_list excludes equipment with action_type=DELETE"""
+        mock_db = AsyncMock()
+        mock_db.add = MagicMock()
+        mock_db.flush = AsyncMock()
+        mock_db.refresh = AsyncMock()
+
+        repo = ChargingEquipmentRepository(mock_db)
+
+        # Setup pagination
+        pagination = PaginationRequestSchema(page=1, size=10, sort_orders=[])
+
+        # Mock the count and items query results
+        mock_count_result = MagicMock()
+        mock_count_result.scalar.return_value = 1
+
+        mock_items_result = MagicMock()
+        mock_items_result.scalars.return_value.all.return_value = [valid_charging_equipment]
+
+        mock_db.execute.side_effect = [mock_count_result, mock_items_result]
+
+        # Call the repository method
+        items, total_count = await repo.get_charging_equipment_list(1, pagination)
+
+        # Verify results
+        assert len(items) == 1
+        assert total_count == 1
+        assert mock_db.execute.call_count == 2
+
+    @pytest.mark.anyio
+    async def test_get_charging_equipment_list_excludes_equipment_from_deleted_sites(
+        self, valid_charging_equipment
+    ):
+        """Test that get_charging_equipment_list excludes equipment from deleted charging sites"""
+        mock_db = AsyncMock()
+        mock_db.add = MagicMock()
+        mock_db.flush = AsyncMock()
+        mock_db.refresh = AsyncMock()
+
+        repo = ChargingEquipmentRepository(mock_db)
+
+        # Setup pagination
+        pagination = PaginationRequestSchema(page=1, size=10, sort_orders=[])
+
+        # Mock the count and items query results - no results since site is deleted
+        mock_count_result = MagicMock()
+        mock_count_result.scalar.return_value = 0
+
+        mock_items_result = MagicMock()
+        mock_items_result.scalars.return_value.all.return_value = []
+
+        mock_db.execute.side_effect = [mock_count_result, mock_items_result]
+
+        # Call the repository method
+        items, total_count = await repo.get_charging_equipment_list(1, pagination)
+
+        # Verify that no equipment is returned (site was deleted)
+        assert len(items) == 0
+        assert total_count == 0
+
+    @pytest.mark.anyio
+    async def test_get_all_equipment_by_organization_id_excludes_deleted(
+        self, valid_charging_equipment
+    ):
+        """Test that get_all_equipment_by_organization_id excludes deleted equipment"""
+        mock_db = AsyncMock()
+        mock_db.add = MagicMock()
+        mock_db.flush = AsyncMock()
+        mock_db.refresh = AsyncMock()
+
+        repo = ChargingEquipmentRepository(mock_db)
+
+        # Mock the query result
+        mock_result = MagicMock()
+        mock_result.scalars.return_value.all.return_value = [valid_charging_equipment]
+        mock_db.execute.return_value = mock_result
+
+        # Call the repository method
+        result = await repo.get_all_equipment_by_organization_id(1)
+
+        # Verify results
+        assert len(result) == 1
+        mock_db.execute.assert_called_once()
+
+    @pytest.mark.anyio
+    async def test_get_charging_sites_by_organization_excludes_deleted(self):
+        """Test that get_charging_sites_by_organization excludes deleted sites"""
+        mock_db = AsyncMock()
+        mock_db.add = MagicMock()
+        mock_db.flush = AsyncMock()
+        mock_db.refresh = AsyncMock()
+
+        repo = ChargingEquipmentRepository(mock_db)
+
+        # Create mock site
+        mock_site = MagicMock(spec=ChargingSite)
+        mock_site.action_type = ActionTypeEnum.CREATE
+        mock_sites = [mock_site]
+
+        # Mock the query result
+        mock_result = MagicMock()
+        mock_result.scalars.return_value.all.return_value = mock_sites
+        mock_db.execute.return_value = mock_result
+
+        # Call the repository method
+        result = await repo.get_charging_sites_by_organization(1)
+
+        # Verify results
+        assert len(result) == 1
+        mock_db.execute.assert_called_once()
+
+    @pytest.mark.anyio
+    async def test_get_charging_sites_by_organization_returns_empty_when_all_deleted(self):
+        """Test that get_charging_sites_by_organization returns empty list when all sites are deleted"""
+        mock_db = AsyncMock()
+        mock_db.add = MagicMock()
+        mock_db.flush = AsyncMock()
+        mock_db.refresh = AsyncMock()
+
+        repo = ChargingEquipmentRepository(mock_db)
+
+        # Mock the query result - empty because all sites are deleted
+        mock_result = MagicMock()
+        mock_result.scalars.return_value.all.return_value = []
+        mock_db.execute.return_value = mock_result
+
+        # Call the repository method
+        result = await repo.get_charging_sites_by_organization(1)
+
+        # Verify results
+        assert len(result) == 0
+        mock_db.execute.assert_called_once()