From d7c069bb78a1aa02e7a1b7abe0b9fe8e1634f611 Mon Sep 17 00:00:00 2001
From: Alan Peixinho <alan.peixinho@profusion.mobi>
Date: Mon, 18 May 2026 14:40:30 -0300
Subject: [PATCH] fix: Use same sort keys for listings of trees on
 HardwareDetails page.

  There were instances of sorting the lists of trees in the hardware
  page using a different set of keys (due to mistake on the performance
  improvements of #1832).
  This case might have not triggered, because the sorting provided by
  the first 2 keys tree_name/branch, might suffice for basically most of
  the comparisons.
  * All of them are now using the keys (in order of importance):
    1. tree_name
    2. branch,
    3. git_repository_url
    4. git_commit_hash

Signed-off-by: Alan Peixinho <alan.peixinho@profusion.mobi>
---
 .../views/hardwareDetailsSummaryView.py       | 48 ++++++++++---------
 1 file changed, 25 insertions(+), 23 deletions(-)

diff --git a/backend/kernelCI_app/views/hardwareDetailsSummaryView.py b/backend/kernelCI_app/views/hardwareDetailsSummaryView.py
index c1f210639..499236e62 100644
--- a/backend/kernelCI_app/views/hardwareDetailsSummaryView.py
+++ b/backend/kernelCI_app/views/hardwareDetailsSummaryView.py
@@ -330,40 +330,42 @@ def aggregate_common(
             status_count = StatusCount()
             status_count.increment(status, count)
 
-            if (tree_name, git_repository_url, git_repository_branch) not in all_trees:
-                all_trees[(tree_name, git_repository_url, git_repository_branch)] = (
-                    Tree(
-                        index="",  # if we dont mind to sort, we can just use len(all_trees)
-                        tree_name=tree_name,
-                        git_repository_branch=git_repository_branch,
-                        git_repository_url=git_repository_url,
-                        head_git_commit_hash=git_commit_hash,
-                        head_git_commit_name=git_commit_name,
-                        head_git_commit_tag=git_commit_tags,
-                        origin=origin,
-                        selected_commit_status={
-                            "builds": StatusCount(),
-                            "boots": StatusCount(),
-                            "tests": StatusCount(),
-                        },
-                        is_selected=None,
-                    )
+            tree_key = (
+                tree_name,
+                git_repository_url,
+                git_repository_branch,
+                git_commit_hash,
+            )
+            if tree_key not in all_trees:
+                all_trees[tree_key] = Tree(
+                    index="",
+                    tree_name=tree_name,
+                    git_repository_branch=git_repository_branch,
+                    git_repository_url=git_repository_url,
+                    head_git_commit_hash=git_commit_hash,
+                    head_git_commit_name=git_commit_name,
+                    head_git_commit_tag=git_commit_tags,
+                    origin=origin,
+                    selected_commit_status={
+                        "builds": StatusCount(),
+                        "boots": StatusCount(),
+                        "tests": StatusCount(),
+                    },
+                    is_selected=None,
                 )
             row_type = self.get_summary_type(**instance)
-            all_trees[
-                (tree_name, git_repository_url, git_repository_branch)
-            ].selected_commit_status[row_type] += status_count
+            all_trees[tree_key].selected_commit_status[row_type] += status_count
             all_compatibles.update(compatibles or [])
 
         all_compatibles.discard(hardware_id)
 
-        # not sure if it is worth sorting for index (but is also not slowing us down)
         sorted_trees = sorted(
             all_trees.values(),
             key=lambda t: (
                 t.tree_name or "",
                 t.git_repository_branch or "",
-                t.head_git_commit_name or "",
+                t.git_repository_url or "",
+                t.head_git_commit_hash or "",
             ),
         )
         for i, tree in enumerate(sorted_trees):