GH-5: Order schemes by id

acteng · Nov 3, 2023 · a9280ca · a9280ca
1 parent c11821d
commit a9280ca
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 7 deletions.
diff --git a/schemes/schemes/services.py b/schemes/schemes/services.py
@@ -61,7 +61,8 @@ def get_by_authority(self, authority_id: int) -> list[Scheme]:
             result = connection.execute(
                 text(
                     "SELECT capital_scheme_id, scheme_name, bid_submitting_authority_id FROM capital_scheme "
-                    "WHERE bid_submitting_authority_id=:bid_submitting_authority_id"
+                    "WHERE bid_submitting_authority_id=:bid_submitting_authority_id "
+                    "ORDER BY capital_scheme_id"
                 ),
                 {"bid_submitting_authority_id": authority_id},
             )
@@ -73,7 +74,10 @@ def get_by_authority(self, authority_id: int) -> list[Scheme]:
     def get_all(self) -> list[Scheme]:
         with self._engine.connect() as connection:
             result = connection.execute(
-                text("SELECT capital_scheme_id, scheme_name, bid_submitting_authority_id FROM capital_scheme")
+                text(
+                    "SELECT capital_scheme_id, scheme_name, bid_submitting_authority_id FROM capital_scheme "
+                    "ORDER BY capital_scheme_id"
+                )
             )
             return [
                 Scheme(id=row.capital_scheme_id, name=row.scheme_name, authority_id=row.bid_submitting_authority_id)

diff --git a/tests/integration/fakes.py b/tests/integration/fakes.py
@@ -61,7 +61,7 @@ def get_by_authority(self, authority_id: int) -> list[Scheme]:
         def by_authority(scheme: Scheme) -> TypeGuard[Scheme]:
             return scheme.authority_id == authority_id
 
-        return list(filter(by_authority, self._schemes.values()))
+        return sorted(list(filter(by_authority, self._schemes.values())), key=lambda scheme: scheme.id)
 
     def get_all(self) -> list[Scheme]:
-        return list(self._schemes.values())
+        return sorted(list(self._schemes.values()), key=lambda scheme: scheme.id)
diff --git a/tests/integration/test_schemes.py b/tests/integration/test_schemes.py
@@ -68,8 +68,8 @@ def test_schemes_shows_authority(client: FlaskClient) -> None:
 
 def test_schemes_shows_schemes(schemes: SchemeRepository, client: FlaskClient) -> None:
     schemes.add(
-        Scheme(id=1, name="Wirral Package", authority_id=1),
         Scheme(id=2, name="School Streets", authority_id=1),
+        Scheme(id=1, name="Wirral Package", authority_id=1),
         Scheme(id=3, name="Hospital Fields Road", authority_id=2),
     )
 

diff --git a/tests/unit/schemes/test_services.py b/tests/unit/schemes/test_services.py
@@ -54,8 +54,8 @@ def test_add_schemes(schemes: DatabaseSchemeRepository) -> None:
 
 def test_get_all_schemes_by_authority(schemes: DatabaseSchemeRepository) -> None:
     schemes.add(
-        Scheme(id=1, name="Wirral Package", authority_id=1),
         Scheme(id=2, name="School Streets", authority_id=1),
+        Scheme(id=1, name="Wirral Package", authority_id=1),
         Scheme(id=3, name="Hospital Fields Road", authority_id=2),
     )
 
@@ -69,8 +69,8 @@ def test_get_all_schemes_by_authority(schemes: DatabaseSchemeRepository) -> None
 
 def test_get_all_schemes(schemes: DatabaseSchemeRepository) -> None:
     schemes.add(
-        Scheme(id=1, name="Wirral Package", authority_id=1),
         Scheme(id=2, name="School Streets", authority_id=1),
+        Scheme(id=1, name="Wirral Package", authority_id=1),
     )
 
     schemes_list = schemes.get_all()