Merge pull request #3906 from bcgov/hotfix-v1.2.5.1

Hotfix v1.2.5.1

Author: AlexZorkin

backend/lcfs/db/models/compliance/ChargingSite.py

@@ -195,14 +195,14 @@ def generate_site_code(mapper, connection, target):
 
 def latest_charging_site_version_subquery():
     """
-    Helper subquery that returns the latest version number for each charging site ID.
-    Used to ensure queries only work with the most recent version of a site.
+    Helper subquery that returns the latest version number for each charging site group UUID.
+    Used to ensure queries only work with the most recent version of a site record group.
     """
     return (
         select(
-            ChargingSite.charging_site_id.label("charging_site_id"),
+            ChargingSite.group_uuid.label("group_uuid"),
             func.max(ChargingSite.version).label("latest_version"),
         )
-        .group_by(ChargingSite.charging_site_id)
+        .group_by(ChargingSite.group_uuid)
         .subquery()
     )

backend/lcfs/tests/charging_equipment/test_charging_equipment_repo.py

@@ -11,10 +11,7 @@
 )
 from lcfs.web.api.base import PaginationRequestSchema, SortOrder
 from lcfs.web.api.charging_equipment.repo import ChargingEquipmentRepository
-from lcfs.web.api.charging_equipment.schema import (
-    ChargingEquipmentFilterSchema,
-    ChargingEquipmentStatusEnum,
-)
+from lcfs.web.api.charging_equipment.schema import ChargingEquipmentStatusEnum
 
 
 @pytest.fixture
@@ -90,9 +87,8 @@ async def test_get_charging_equipment_list_success(
     repo, mock_db, valid_charging_equipment
 ):
     """Test getting paginated list of charging equipment."""
-    # Setup pagination and filters
+    # Setup pagination
     pagination = PaginationRequestSchema(page=1, size=10, sort_orders=[])
-    filters = ChargingEquipmentFilterSchema(status=[ChargingEquipmentStatusEnum.DRAFT])
 
     # Mock the database query results
     mock_items_result = MagicMock()
@@ -104,7 +100,7 @@ async def test_get_charging_equipment_list_success(
     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, filters)
+    items, total_count = await repo.get_charging_equipment_list(1, pagination)
 
     # Verify the results
     assert len(items) == 1
@@ -314,13 +310,12 @@ async def test_update_charging_equipment_creates_new_version_for_validated(
             1, {"manufacturer": "ChargeCo", "model": "Rev2"}
         )
 
-    assert result is valid_charging_equipment
+    assert result is not None
     assert result.version == original_version + 1
     assert result.manufacturer == "ChargeCo"
     assert result.model == "Rev2"
     assert result.group_uuid == "group-123"
-    assert result.intended_uses == list(valid_charging_equipment.intended_uses)
-    mock_db.add.assert_not_called()
+    mock_db.add.assert_called_once()
     mock_db.flush.assert_called_once()
     assert mock_db.refresh.call_count == 2
 

backend/lcfs/tests/charging_equipment/test_charging_equipment_services.py

@@ -84,7 +84,7 @@ async def test_get_charging_equipment_list_supplier_success(
 
     # Verify repo was called with correct organization_id
     mock_repo.get_charging_equipment_list.assert_called_once_with(
-        mock_user.organization_id, pagination, None, False
+        mock_user.organization_id, pagination, False
     )
 
 
@@ -109,7 +109,7 @@ async def test_get_charging_equipment_list_government_with_org_filter(
 
     # Verify repo was called with filtered organization_id and exclude_draft=True for government users
     mock_repo.get_charging_equipment_list.assert_called_once_with(
-        2, pagination, filters, True
+        2, pagination, True
     )
 
 
@@ -131,7 +131,7 @@ async def test_get_charging_equipment_list_government_no_org_filter_success(
 
     # Government users without an org filter should query all organizations (organization_id None) and exclude_draft=True
     mock_repo.get_charging_equipment_list.assert_called_once_with(
-        None, pagination, None, True
+        None, pagination, True
     )
 
 

backend/lcfs/tests/charging_site/test_charging_site_services.py

@@ -393,12 +393,25 @@ async def test_update_charging_site_validated_creates_new_version(
         mock_existing_site.organization_id = 1
         mock_existing_site.charging_site_id = 1
         mock_existing_site.version = 1
+        mock_existing_site.allocating_organization_id = None
+        mock_existing_site.allocating_organization_name = None
+        mock_existing_site.site_code = "SITE001"
+        mock_existing_site.street_address = "123 Main St"
+        mock_existing_site.city = "Vancouver"
+        mock_existing_site.postal_code = "V6B 1A1"
+        mock_existing_site.latitude = 49.2827
+        mock_existing_site.longitude = -123.1207
+        mock_existing_site.notes = "Test notes"
+        mock_existing_site.status_id = 1
+        mock_existing_site.group_uuid = "test-uuid"
+        mock_existing_site.documents = []
         mock_repo.get_charging_site_by_id.return_value = mock_existing_site
         mock_repo.charging_site_name_exists.return_value = False
 
         updated_status = MagicMock(spec=ChargingSiteStatus)
         updated_status.charging_site_status_id = 2
         updated_status.status = "Updated"
+        updated_status._sa_instance_state = MagicMock()
         mock_repo.get_charging_site_status_by_name.return_value = updated_status
 
         mock_org = MagicMock()
@@ -429,7 +442,7 @@ async def test_update_charging_site_validated_creates_new_version(
         mock_updated_site.create_user = "testuser"
         mock_updated_site.update_user = "testuser"
 
-        mock_repo.update_charging_site.return_value = mock_updated_site
+        mock_repo.create_charging_site.return_value = mock_updated_site
 
         update_data = ChargingSiteCreateSchema(
             charging_site_id=1,
@@ -446,9 +459,9 @@ async def test_update_charging_site_validated_creates_new_version(
         result = await charging_site_service.update_charging_site(update_data)
 
         assert isinstance(result, ChargingSiteSchema)
-        assert mock_existing_site.version == 2
+        assert result.version == 2
         mock_repo.get_charging_site_status_by_name.assert_called_once_with("Updated")
-        mock_repo.update_charging_site.assert_called_once_with(mock_existing_site)
+        mock_repo.create_charging_site.assert_called_once()
 
     @pytest.mark.anyio
     async def test_update_charging_site_duplicate_name(