add more ordering

Author: ajtmccarty

backend/infrahub/core/diff/query/artifact.py

@@ -201,4 +201,5 @@ async def query_init(self, db: InfrahubDatabase, **kwargs: Any) -> None:  # noqa
             "target_checksum",
             "target_storage_id",
         ]
+        self.order_by = ["source_artifact.uuid", "target_node.uuid", "definition_node.uuid"]
         self.add_to_query(query=query)

backend/infrahub/core/diff/query/field_summary.py

@@ -62,6 +62,7 @@ async def query_init(self, db: InfrahubDatabase, **kwargs: Any) -> None:  # noqa
         }
         """
         self.add_to_query(query=query)
+        self.order_by = ["kind"]
         self.return_labels = ["kind", "attr_names", "rel_names"]
 
     async def get_field_summaries(self) -> list[NodeDiffFieldSummary]:

backend/infrahub/core/query/ipam.py

@@ -688,6 +688,7 @@ async def query_init(self, db: InfrahubDatabase, **kwargs) -> None:  # noqa: ARG
             "ip_address_attribute_kind": ADDRESS_ATTRIBUTE_LABEL,
         }
         self.add_to_query(get_new_children_query)
+        self.order_by = ["ip_node.uuid"]
         self.return_labels = ["ip_node", "current_parent", "current_children", "new_parent", "new_children"]
 
     def _get_uuid_from_query(self, node_name: str) -> str | None:

backend/infrahub/core/query/relationship.py

@@ -1036,6 +1036,7 @@ async def query_init(self, db: InfrahubDatabase, **kwargs) -> None:  # noqa: ARG
         """ % {"branch_filter": branch_filter, "path": path}
 
         self.add_to_query(query)
+        self.order_by = ["peer_node.uuid"]
         self.return_labels = ["peer_node.uuid", "COUNT(peer_node.uuid) as nbr_peers"]
 
     async def get_count_per_peer(self) -> dict[str, int]:

backend/tests/conftest.py

@@ -22,6 +22,7 @@
 
 from infrahub import config
 from infrahub.config import load_and_exit
+from infrahub.constants.database import Neo4jRuntime
 from infrahub.core import registry
 from infrahub.core.branch import Branch
 from infrahub.core.constants import BranchSupportType, InfrahubKind, RelationshipCardinality, RelationshipDirection
@@ -169,6 +170,22 @@ async def do_default_branch(db: InfrahubDatabase) -> Branch:
     return branch
 
 
+@pytest.fixture
+def query_limit_of_one() -> Generator[None, None, None]:
+    original_query_size_limit = config.SETTINGS.database.query_size_limit
+    config.SETTINGS.database.query_size_limit = 1
+    yield
+    config.SETTINGS.database.query_size_limit = original_query_size_limit
+
+
+@pytest.fixture
+def neo4j_runtime_parallel(db: InfrahubDatabase) -> Generator[None, None, None]:
+    original_neo4j_runtime = db.default_neo4j_runtime
+    db.default_neo4j_runtime = Neo4jRuntime.PARALLEL
+    yield
+    db.default_neo4j_runtime = original_neo4j_runtime
+
+
 @pytest.fixture
 async def default_ipnamespace(db: InfrahubDatabase, register_core_models_schema) -> Node | None:
     if not registry._default_ipnamespace:

backend/tests/unit/core/test_manager_node.py

@@ -3,8 +3,6 @@
 import pytest
 from infrahub_sdk.uuidt import UUIDT
 
-from infrahub import config
-from infrahub.constants.database import Neo4jRuntime
 from infrahub.core.branch import Branch
 from infrahub.core.initialization import create_branch
 from infrahub.core.manager import NodeManager, identify_node_class
@@ -286,6 +284,8 @@ async def test_get_many_with_pagination(
     criticality_low: Node,
     criticality_medium: Node,
     criticality_high: Node,
+    query_limit_of_one: None,
+    neo4j_runtime_parallel: None,
 ):
     new_node_ids: list[str] = []
     for index in range(10):
@@ -294,22 +294,12 @@ async def test_get_many_with_pagination(
         await bulk_node.save(db=db)
         new_node_ids.append(bulk_node.id)
 
-    original_query_size_limit = config.SETTINGS.database.query_size_limit
-    config.SETTINGS.database.query_size_limit = 1
-    original_neo4j_runtime = db.default_neo4j_runtime
-    db.default_neo4j_runtime = Neo4jRuntime.PARALLEL
-
-    try:
-        target_ids = [criticality_low.id, criticality_medium.id, criticality_high.id, *new_node_ids]
-        nodes = await NodeManager.get_many(db=db, ids=target_ids)
-    finally:
-        config.SETTINGS.database.query_size_limit = original_query_size_limit
-        db.default_neo4j_runtime = original_neo4j_runtime
-
-    expected_ids = set(target_ids)
-    assert set(nodes) == expected_ids
-    assert len(nodes) == len(expected_ids)
-    assert all(isinstance(nodes[node_id], Node) for node_id in expected_ids)
+    target_ids = [criticality_low.id, criticality_medium.id, criticality_high.id, *new_node_ids]
+    nodes = await NodeManager.get_many(db=db, ids=target_ids)
+
+    assert set(nodes) == set(target_ids)
+    assert len(nodes) == len(target_ids)
+    assert all(isinstance(nodes[node_id], Node) for node_id in target_ids)
 
 
 async def test_get_many_prefetch(