feat(APIv2): enable sorting test_results by failed_rule_count

RedHatInsights · Aug 27, 2024 · 9e1a670 · 9e1a670
1 parent 07618ee
commit 9e1a670
Show file tree

Hide file tree

Showing 3 changed files with 4,656 additions and 4,572 deletions.
diff --git a/app/models/v2/test_result.rb b/app/models/v2/test_result.rb
@@ -23,7 +23,7 @@ class TestResult < ApplicationRecord
     sortable_by :groups, V2::System.first_group_name(V2::System.arel_table.alias('system'))
     sortable_by :score
     sortable_by :end_time
-    # TODO: sortable_by :failed_rule_count
+    sortable_by :failed_rule_count
 
     searchable_by :score, %i[eq gt lt gte lte]
     searchable_by :supported, %i[eq]

diff --git a/spec/fixtures/files/sortable/test_results_controller.yaml b/spec/fixtures/files/sortable/test_results_controller.yaml
@@ -7,6 +7,14 @@
     :groups:
       - id: 5
         name: 'aba'
+    :failed_rule_count: 2
+    :additional_rule_results:
+      - :result: 'pass'
+        :severity: 'medium'
+      - :result: 'fail'
+        :severity: 'low'
+      - :result: 'fail'
+        :severity: 'high'
     :account: ${account}
     :policy_id: ${policy.id}
 
@@ -18,6 +26,20 @@
     :groups:
       - id: 4
         name: 'bac'
+    :failed_rule_count: 3
+    :additional_rule_results:
+      - :result: 'pass'
+        :severity: 'medium'
+      - :result: 'fail'
+        :severity: 'low'
+      - :result: 'fail'
+        :severity: 'high'
+      - :result: 'pass'
+        :severity: 'medium'
+      - :result: 'pass'
+        :severity: 'low'
+      - :result: 'fail'
+        :severity: 'high'
     :account: ${account}
     :policy_id: ${policy.id}
 
@@ -29,6 +51,20 @@
     :groups:
       - id: 3
         name: 'aab'
+    :failed_rule_count: 1
+    :additional_rule_results:
+      - :result: 'pass'
+        :severity: 'medium'
+      - :result: 'pass'
+        :severity: 'low'
+      - :result: 'pass'
+        :severity: 'high'
+      - :result: 'pass'
+        :severity: 'medium'
+      - :result: 'pass'
+        :severity: 'low'
+      - :result: 'fail'
+        :severity: 'high'
     :account: ${account}
     :policy_id: ${policy.id}
 
@@ -40,6 +76,20 @@
     :groups:
       - id: 1
         name: 'aaa'
+    :failed_rule_count: 1
+    :additional_rule_results:
+      - :result: 'pass'
+        :severity: 'medium'
+      - :result: 'pass'
+        :severity: 'low'
+      - :result: 'pass'
+        :severity: 'high'
+      - :result: 'pass'
+        :severity: 'medium'
+      - :result: 'pass'
+        :severity: 'low'
+      - :result: 'fail'
+        :severity: 'high'
     :account: ${account}
     :policy_id: ${policy.id}
 
@@ -52,6 +102,20 @@
       - id: 2
         name: 'caa'
     :account: ${account}
+    :failed_rule_count: 2
+    :additional_rule_results:
+      - :result: 'fail'
+        :severity: 'medium'
+      - :result: 'pass'
+        :severity: 'low'
+      - :result: 'fail'
+        :severity: 'high'
+      - :result: 'pass'
+        :severity: 'medium'
+      - :result: 'pass'
+        :severity: 'low'
+      - :result: 'pass'
+        :severity: 'high'
     :policy_id: ${policy.id}
 
   - :factory: :v2_test_result
@@ -62,6 +126,20 @@
     :groups:
       - id: 1
         name: 'aaa'
+    :failed_rule_count: 0
+    :additional_rule_results:
+      - :result: 'pass'
+        :severity: 'medium'
+      - :result: 'pass'
+        :severity: 'low'
+      - :result: 'pass'
+        :severity: 'high'
+      - :result: 'pass'
+        :severity: 'medium'
+      - :result: 'pass'
+        :severity: 'low'
+      - :result: 'pass'
+        :severity: 'high'
     :account: ${account}
     :policy_id: ${policy.id}
 
@@ -81,3 +159,6 @@
   - :sort_by:
       - 'groups'
     :result: [[3, 5], 2, 0, 1, 4]
+  - :sort_by:
+      - 'failed_rule_count'
+    :result: [5, [3, 2], [0, 4], 1]