Merge pull request #4051 from bcgov/fix/prashanth-sort-order-fse-4024

LCFS - Update the sort order used in the FSE schedule and download

Author: prv-proton

backend/lcfs/tests/final_supply_equipment/test_final_supply_equipment_repo.py

@@ -517,6 +517,30 @@ async def test_get_fse_reporting_list_paginated(repo, fake_db):
     assert data[0]["charging_equipment_id"] == 1
     assert data[0]["status"] == "Submitted"
 
+    executed_query = fake_db.execute.call_args[0][0]
+    compiled_sql = str(executed_query.compile(compile_kwargs={"literal_binds": True}))
+    assert "site_name ASC NULLS LAST" in compiled_sql
+    assert "registration_number DESC NULLS LAST" in compiled_sql
+
+
+@pytest.mark.anyio
+async def test_get_fse_for_bulk_update_template_uses_site_then_registration_sort(
+    repo, fake_db
+):
+    fake_result = MagicMock()
+    fake_result.fetchall.return_value = []
+    fake_db.execute.return_value = fake_result
+
+    await repo.get_fse_for_bulk_update_template(
+        organization_id=1, compliance_report_group_uuid="group-123"
+    )
+
+    executed_query = fake_db.execute.call_args[0][0]
+    compiled_sql = str(executed_query.compile(compile_kwargs={"literal_binds": True}))
+
+    assert "site_name ASC NULLS LAST" in compiled_sql
+    assert "registration_number DESC NULLS LAST" in compiled_sql
+
 
 @pytest.mark.anyio
 async def test_create_fse_reporting_batch(repo, fake_db):

backend/lcfs/web/api/final_supply_equipment/repo.py

@@ -64,6 +64,19 @@ class FinalSupplyEquipmentRepository:
     def __init__(self, db: AsyncSession = Depends(get_async_db_session)):
         self.db = db
 
+    def _apply_site_registration_sort(self, stmt, site_field, registration_field, tie_breaker_field):
+        """
+        Apply the shared default FSE ordering:
+        1. Site name ascending (nulls last)
+        2. Registration number descending (nulls last)
+        3. Stable tie-breaker for deterministic pagination
+        """
+        return stmt.order_by(
+            asc(site_field).nullslast(),
+            desc(registration_field).nullslast(),
+            asc(tie_breaker_field),
+        )
+
     def _combine_reporting_queries(self, union_queries: list[Any]):
         """
         Combine reporting queries while removing exact duplicate rows.
@@ -1165,9 +1178,11 @@ async def get_fse_reporting_list_paginated(
                 else:
                     final_query = final_query.order_by(asc(field))
         else:
-            final_query = final_query.order_by(
-                asc(vt.c.site_name),
-                asc(vt.c.registration_number),
+            final_query = self._apply_site_registration_sort(
+                final_query,
+                vt.c.site_name,
+                vt.c.registration_number,
+                vt.c.charging_equipment_id,
             )
 
         # Count total
@@ -1475,10 +1490,12 @@ async def get_fse_for_bulk_update_template(
                 all_rows_subquery.c.compliance_report_group_uuid,
             )
             .where(all_rows_subquery.c.row_num == 1)
-            .order_by(
-                asc(all_rows_subquery.c.site_name),
-                asc(all_rows_subquery.c.registration_number),
-            )
+        )
+        stmt = self._apply_site_registration_sort(
+            stmt,
+            all_rows_subquery.c.site_name,
+            all_rows_subquery.c.registration_number,
+            all_rows_subquery.c.charging_equipment_id,
         )
 
         result = await self.db.execute(stmt)

backend/lcfs/web/api/user/services.py

@@ -177,11 +177,6 @@ async def get_all_users(self, pagination: PaginationRequestSchema) -> UsersSchem
     async def get_seeded_test_users(
         self, seed_env: str | None = None
     ) -> list[UserBaseSchema]:
-        if not self._is_nonprod_env():
-            raise HTTPException(
-                status_code=status.HTTP_403_FORBIDDEN,
-                detail="Seeded test users endpoint is only available in local/test environments.",
-            )
         resolved_env = (seed_env or "").lower().strip()
         if resolved_env not in {"local", "test"}:
             resolved_env = "test" if settings.environment.lower() == "test" else "local"

frontend/src/components/BCDataGrid/BCGridBase.jsx

@@ -40,7 +40,7 @@ export const BCGridBase = forwardRef(
       autoSizeStrategy,
       autoHeight,
       containerStyle,
-      enableCellTextSelection=true,
+      enableCellTextSelection,
       getRowId,
       overlayNoRowsTemplate,
       queryData,