fix ordering in artifact diff query (#7300)

* add more specific ordering to ArtifactDiffQuery

* add changelog

* update changelog, fix existing ordering issue

Author: ajtmccarty

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

@@ -44,7 +44,7 @@ async def query_init(self, db: InfrahubDatabase, **kwargs: Any) -> None:  # noqa
     MATCH (source_artifact)-[r:IS_PART_OF]->(:Root)
     WHERE %(source_branch_filter)s
     RETURN r AS root_rel
-    ORDER BY r.branch_level DESC, r.from DESC
+    ORDER BY r.branch_level DESC, r.from DESC, r.status ASC
     LIMIT 1
 }
 WITH source_artifact, root_rel
@@ -61,7 +61,7 @@ async def query_init(self, db: InfrahubDatabase, **kwargs: Any) -> None:  # noqa
             target_node,
             (rrel1.status = "active" AND rrel2.status = "active") AS target_is_active,
             $source_branch_name IN [rrel1.branch, rrel2.branch] AS target_on_source_branch
-        ORDER BY rrel1.branch_level DESC, rrel1.branch_level DESC, rrel1.from DESC, rrel2.from DESC
+        ORDER BY rrel1.branch_level DESC, rrel2.branch_level DESC, rrel1.from DESC, rrel2.from DESC, rrel1.status ASC, rrel2.status ASC
         LIMIT 1
     }
     // -----------------------
@@ -75,7 +75,7 @@ async def query_init(self, db: InfrahubDatabase, **kwargs: Any) -> None:  # noqa
             definition_node,
             (rrel1.status = "active" AND rrel2.status = "active") AS definition_is_active,
             $source_branch_name IN [rrel1.branch, rrel2.branch] AS definition_on_source_branch
-        ORDER BY rrel1.branch_level DESC, rrel1.branch_level DESC, rrel1.from DESC, rrel2.from DESC
+        ORDER BY rrel1.branch_level DESC, rrel2.branch_level DESC, rrel1.from DESC, rrel2.from DESC, rrel1.status ASC, rrel2.status ASC
         LIMIT 1
     }
     // -----------------------
@@ -89,7 +89,8 @@ async def query_init(self, db: InfrahubDatabase, **kwargs: Any) -> None:  # noqa
             attr_val.value AS checksum,
             (attr_rel.status = "active" AND value_rel.status = "active") AS checksum_is_active,
             $source_branch_name IN [attr_rel.branch, value_rel.branch] AS checksum_on_source_branch
-        ORDER BY value_rel.branch_level DESC, attr_rel.branch_level DESC, value_rel.from DESC, attr_rel.from DESC
+        ORDER BY value_rel.branch_level DESC, attr_rel.branch_level DESC, value_rel.from DESC, attr_rel.from DESC,
+            value_rel.status ASC, attr_rel.status ASC
         LIMIT 1
     }
     // -----------------------
@@ -103,7 +104,8 @@ async def query_init(self, db: InfrahubDatabase, **kwargs: Any) -> None:  # noqa
             attr_val.value AS storage_id,
             (attr_rel.status = "active" AND value_rel.status = "active") AS storage_id_is_active,
             $source_branch_name IN [attr_rel.branch, value_rel.branch] AS storage_id_on_source_branch
-        ORDER BY value_rel.branch_level DESC, attr_rel.branch_level DESC, value_rel.from DESC, attr_rel.from DESC
+        ORDER BY value_rel.branch_level DESC, attr_rel.branch_level DESC, value_rel.from DESC, attr_rel.from DESC,
+            value_rel.status ASC, attr_rel.status ASC
         LIMIT 1
     }
     WITH target_node, target_is_active, target_on_source_branch,
@@ -147,7 +149,8 @@ async def query_init(self, db: InfrahubDatabase, **kwargs: Any) -> None:  # noqa
         RETURN
             target_artifact,
             (trel1.status = "active" AND trel2.status = "active" AND drel1.status = "active" AND drel1.status = "active") AS artifact_is_active
-        ORDER BY trel1.from DESC, trel2.from DESC, drel1.from DESC, drel2.from DESC
+        ORDER BY trel1.from DESC, trel2.from DESC, drel1.from DESC, drel2.from DESC,
+            trel1.status ASC, trel2.status ASC, drel1.status ASC, drel2.status ASC
         LIMIT 1
     }
     WITH CASE
@@ -163,7 +166,7 @@ async def query_init(self, db: InfrahubDatabase, **kwargs: Any) -> None:  # noqa
         AND attr_rel.branch = $target_branch_name
         AND value_rel.branch = $target_branch_name
         RETURN attr_val.value AS checksum, (attr_rel.status = "active" AND value_rel.status = "active") AS checksum_is_active
-        ORDER BY value_rel.from DESC, attr_rel.from DESC
+        ORDER BY value_rel.from DESC, attr_rel.from DESC, value_rel.status ASC, attr_rel.status ASC
         LIMIT 1
     }
     // -----------------------
@@ -175,7 +178,7 @@ async def query_init(self, db: InfrahubDatabase, **kwargs: Any) -> None:  # noqa
         AND attr_rel.branch = $target_branch_name
         AND value_rel.branch = $target_branch_name
         RETURN attr_val.value AS storage_id, (attr_rel.status = "active" AND value_rel.status = "active") AS storage_id_is_active
-        ORDER BY value_rel.from DESC, attr_rel.from DESC
+        ORDER BY value_rel.from DESC, attr_rel.from DESC, value_rel.status ASC, attr_rel.status ASC
         LIMIT 1
     }
     RETURN target_artifact,

changelog/7301.fixed.md

@@ -0,0 +1 @@
+Fix bug in artifact diff cypher query that could improperly exclude artifacts on the default branch