Merge pull request #4013 from bcgov/feat/hamed-charging-site-status-override-3793

Feat: Charging Site status override - 3793

Author: hamed-valiollahi

backend/lcfs/tests/charging_site/test_charging_site_services.py

@@ -11,6 +11,7 @@
     ChargingSiteCreateSchema,
     ChargingSiteSchema,
     ChargingSitesSchema,
+    ChargingSiteManualStatusUpdateSchema,
     ChargingEquipmentStatusSchema,
     ChargingSiteStatusSchema,
 )
@@ -383,6 +384,162 @@ async def test_update_charging_site_success(self, charging_site_service, mock_re
             "Updated Site", 1, exclude_site_id=mock_existing_site.charging_site_id
         )
 
+    @pytest.mark.anyio
+    async def test_update_charging_site_status_manual_government_submitted_to_validated(
+        self, charging_site_service, mock_repo, mock_request
+    ):
+        """Test IDIR Analyst can set status from Submitted to Validated."""
+        mock_request.user.organization = MagicMock()
+        mock_request.user.organization.organization_id = 1
+
+        mock_site = MagicMock(spec=ChargingSite)
+        mock_site.charging_site_id = 1
+        mock_site.organization_id = 1
+        mock_site.status = MagicMock()
+        mock_site.status.status = "Submitted"
+
+        mock_validated_status = MagicMock(spec=ChargingSiteStatus)
+        mock_validated_status.charging_site_status_id = 2
+        mock_validated_status.status = "Validated"
+
+        # Second call returns a site that must validate as ChargingSiteSchema
+        mock_org = MagicMock()
+        mock_org.organization_id = 1
+        mock_org.name = "Test Org"
+        mock_allocating_org = MagicMock()
+        mock_allocating_org.organization_id = 2
+        mock_allocating_org.name = "Allocating Org"
+        mock_updated_site = MagicMock(spec=ChargingSite)
+        mock_updated_site.charging_site_id = 1
+        mock_updated_site.group_uuid = "site-uuid-1"
+        mock_updated_site.organization_id = 1
+        mock_updated_site.organization = mock_org
+        mock_updated_site.allocating_organization_id = 2
+        mock_updated_site.allocating_organization = mock_allocating_org
+        mock_updated_site.allocating_organization_name = "Allocating Org"
+        mock_updated_site.status_id = 2
+        mock_updated_site.status = mock_validated_status
+        mock_updated_site.version = 1
+        mock_updated_site.site_code = "SITE001"
+        mock_updated_site.site_name = "Test Site"
+        mock_updated_site.street_address = "123 Main St"
+        mock_updated_site.city = "Vancouver"
+        mock_updated_site.postal_code = "V6B 1A1"
+        mock_updated_site.latitude = 49.2827
+        mock_updated_site.longitude = -123.1207
+        mock_updated_site.documents = []
+        mock_updated_site.notes = "Test notes"
+        mock_updated_site.create_date = None
+        mock_updated_site.update_date = None
+        mock_updated_site.create_user = "testuser"
+        mock_updated_site.update_user = "testuser"
+
+        mock_repo.get_charging_site_by_id.return_value = mock_site
+        mock_repo.get_charging_site_status_by_name.return_value = mock_validated_status
+        mock_repo.update_charging_site_status.return_value = None
+        mock_repo.get_charging_site_by_id.side_effect = [mock_site, mock_updated_site]
+
+        with patch(
+            "lcfs.web.api.charging_site.services.user_has_roles"
+        ) as mock_has_roles:
+            # Government and Analyst return True so IDIR Analyst path is taken
+            mock_has_roles.side_effect = lambda user, roles: (
+                RoleEnum.GOVERNMENT in roles or RoleEnum.ANALYST in roles
+            )
+
+            body = ChargingSiteManualStatusUpdateSchema(new_status="Validated")
+            result = await charging_site_service.update_charging_site_status_manual(
+                1, body
+            )
+
+            assert result.status.status == "Validated"
+            mock_repo.update_charging_site_status.assert_called_once_with(1, 2)
+
+    @pytest.mark.anyio
+    async def test_update_charging_site_status_manual_unauthorized(
+        self, charging_site_service, mock_repo, mock_request
+    ):
+        """Test user without Government or BCeID roles gets 403."""
+        with patch(
+            "lcfs.web.api.charging_site.services.user_has_roles"
+        ) as mock_has_roles:
+            mock_has_roles.return_value = False
+
+            body = ChargingSiteManualStatusUpdateSchema(new_status="Validated")
+            with pytest.raises(HTTPException) as exc_info:
+                await charging_site_service.update_charging_site_status_manual(
+                    1, body
+                )
+
+            assert exc_info.value.status_code == 403
+            mock_repo.get_charging_site_by_id.assert_not_called()
+
+    @pytest.mark.anyio
+    async def test_update_charging_site_status_manual_government_not_analyst_forbidden(
+        self, charging_site_service, mock_repo, mock_request
+    ):
+        """Test Government user without Analyst role cannot set status to Validated (403)."""
+        mock_request.user.organization = MagicMock()
+        mock_request.user.organization.organization_id = 1
+
+        mock_site = MagicMock(spec=ChargingSite)
+        mock_site.charging_site_id = 1
+        mock_site.organization_id = 1
+        mock_site.status = MagicMock()
+        mock_site.status.status = "Submitted"
+
+        mock_repo.get_charging_site_by_id.return_value = mock_site
+
+        with patch(
+            "lcfs.web.api.charging_site.services.user_has_roles"
+        ) as mock_has_roles:
+            # Government True, Analyst False (and not compliance/signing)
+            mock_has_roles.side_effect = lambda user, roles: (
+                RoleEnum.GOVERNMENT in roles and RoleEnum.ANALYST not in roles
+            )
+
+            body = ChargingSiteManualStatusUpdateSchema(new_status="Validated")
+            with pytest.raises(HTTPException) as exc_info:
+                await charging_site_service.update_charging_site_status_manual(
+                    1, body
+                )
+
+            assert exc_info.value.status_code == 403
+            assert "Only IDIR Analyst" in str(exc_info.value.detail)
+            mock_repo.update_charging_site_status.assert_not_called()
+
+    @pytest.mark.anyio
+    async def test_update_charging_site_status_manual_invalid_transition_government(
+        self, charging_site_service, mock_repo, mock_request
+    ):
+        """Test IDIR Analyst cannot set status to Validated when current is not Submitted."""
+        mock_request.user.organization = MagicMock()
+        mock_request.user.organization.organization_id = 1
+
+        mock_site = MagicMock(spec=ChargingSite)
+        mock_site.charging_site_id = 1
+        mock_site.organization_id = 1
+        mock_site.status = MagicMock()
+        mock_site.status.status = "Draft"
+
+        mock_repo.get_charging_site_by_id.return_value = mock_site
+
+        with patch(
+            "lcfs.web.api.charging_site.services.user_has_roles"
+        ) as mock_has_roles:
+            mock_has_roles.side_effect = lambda user, roles: (
+                RoleEnum.GOVERNMENT in roles or RoleEnum.ANALYST in roles
+            )
+
+            body = ChargingSiteManualStatusUpdateSchema(new_status="Validated")
+            with pytest.raises(HTTPException) as exc_info:
+                await charging_site_service.update_charging_site_status_manual(
+                    1, body
+                )
+
+            assert exc_info.value.status_code == 400
+            mock_repo.update_charging_site_status.assert_not_called()
+
     @pytest.mark.anyio
     async def test_update_charging_site_validated_creates_new_version(
         self, charging_site_service, mock_repo

backend/lcfs/tests/charging_site/test_charging_site_views.py

@@ -12,6 +12,7 @@
     ChargingSiteSchema,
     ChargingSiteStatusSchema,
     ChargingSitesSchema,
+    ChargingSiteManualStatusUpdateSchema,
     DeleteChargingSiteResponseSchema,
     ChargingEquipmentStatusSchema,
     ChargingEquipmentPaginatedSchema,
@@ -744,3 +745,88 @@ async def test_search_allocation_organizations_service_error(
         response = await client.get(url, params={"query": "test"})
 
         assert response.status_code == 500
+
+
+# --- Manual charging site status (PATCH /charging-sites/{site_id}/status) ---
+
+
+@pytest.mark.anyio
+async def test_update_charging_site_status_success_government(
+    client: AsyncClient, fastapi_app: FastAPI, set_mock_user, valid_charging_site_schema
+):
+    """Test IDIR Analyst can set charging site status to Validated (Submitted -> Validated)."""
+    with patch(
+        "lcfs.web.api.charging_site.services.ChargingSiteService.update_charging_site_status_manual"
+    ) as mock_update, patch(
+        "lcfs.web.api.charging_site.validation.ChargingSiteValidation.validate_organization_access"
+    ) as mock_validate:
+        mock_validate.return_value = None
+        updated = valid_charging_site_schema.model_copy()
+        updated.status = ChargingSiteStatusSchema(
+            charging_site_status_id=2, status="Validated"
+        )
+        mock_update.return_value = updated
+
+        set_mock_user(fastapi_app, [RoleEnum.GOVERNMENT, RoleEnum.ANALYST])
+        url = fastapi_app.url_path_for("update_charging_site_status", site_id=1)
+        response = await client.patch(url, json={"new_status": "Validated"})
+
+        assert response.status_code == 200
+        assert response.json()["status"]["status"] == "Validated"
+        mock_update.assert_called_once()
+        assert mock_update.call_args[0][0] == 1
+        assert mock_update.call_args[0][1].new_status == "Validated"
+
+
+@pytest.mark.anyio
+async def test_update_charging_site_status_success_bceid(
+    client: AsyncClient, fastapi_app: FastAPI, set_mock_user, valid_charging_site_schema
+):
+    """Test BCeID Compliance Reporting user can set charging site status to Submitted (Draft/Updated -> Submitted)."""
+    with patch(
+        "lcfs.web.api.charging_site.services.ChargingSiteService.update_charging_site_status_manual"
+    ) as mock_update, patch(
+        "lcfs.web.api.charging_site.validation.ChargingSiteValidation.validate_organization_access"
+    ) as mock_validate:
+        mock_validate.return_value = None
+        updated = valid_charging_site_schema.model_copy()
+        updated.status = ChargingSiteStatusSchema(
+            charging_site_status_id=3, status="Submitted"
+        )
+        mock_update.return_value = updated
+
+        user_details = {"organization_id": 3}
+        set_mock_user(fastapi_app, [RoleEnum.COMPLIANCE_REPORTING], user_details)
+        url = fastapi_app.url_path_for("update_charging_site_status", site_id=1)
+        response = await client.patch(url, json={"new_status": "Submitted"})
+
+        assert response.status_code == 200
+        assert response.json()["status"]["status"] == "Submitted"
+        mock_update.assert_called_once()
+        assert mock_update.call_args[0][0] == 1
+        assert mock_update.call_args[0][1].new_status == "Submitted"
+
+
+@pytest.mark.anyio
+async def test_update_charging_site_status_unauthorized(
+    client: AsyncClient, fastapi_app: FastAPI, set_mock_user
+):
+    """Test Supplier without Compliance Reporting/Signing Authority cannot update charging site status."""
+    user_details = {"organization_id": 3}
+    set_mock_user(fastapi_app, [RoleEnum.SUPPLIER], user_details)
+    url = fastapi_app.url_path_for("update_charging_site_status", site_id=1)
+    response = await client.patch(url, json={"new_status": "Validated"})
+
+    assert response.status_code == 403
+
+
+@pytest.mark.anyio
+async def test_update_charging_site_status_validation_error(
+    client: AsyncClient, fastapi_app: FastAPI, set_mock_user
+):
+    """Test PATCH with invalid body returns 422."""
+    set_mock_user(fastapi_app, [RoleEnum.GOVERNMENT])
+    url = fastapi_app.url_path_for("update_charging_site_status", site_id=1)
+    response = await client.patch(url, json={})
+
+    assert response.status_code == 422

backend/lcfs/web/api/charging_site/schema.py

@@ -178,13 +178,18 @@ class BulkEquipmentStatusUpdateSchema(BaseSchema):
     new_status: str
 
 
-class ChargingSiteStatusEnum:
+class ChargingSiteStatusEnum(str, Enum):
+
     DRAFT = "Draft"
     SUBMITTED = "Submitted"
     VALIDATED = "Validated"
     UPDATED = "Updated"
 
 
+class ChargingSiteManualStatusUpdateSchema(BaseSchema):
+    new_status: ChargingSiteStatusEnum
+
+
 class EquipmentStatusEnum:
     DRAFT = "Draft"
     SUBMITTED = "Submitted"