🎉 Add fix_available information to engagement views (#13070)

Author: manuel-sommer

dojo/engagement/views.py

@@ -608,6 +608,9 @@ def prefetch_for_view_tests(tests):
         count_findings_test_active_verified=Coalesce(
             count_subquery(base_findings.filter(active=True, verified=True)), Value(0),
         ),
+        count_findings_test_active_fix_available=Coalesce(
+            count_subquery(base_findings.filter(active=True, fix_available=True)), Value(0),
+        ),
         count_findings_test_mitigated=Coalesce(count_subquery(base_findings.filter(is_mitigated=True)), Value(0)),
         count_findings_test_dups=Coalesce(count_subquery(base_findings.filter(duplicate=True)), Value(0)),
         total_reimport_count=Coalesce(

dojo/product/views.py

@@ -859,6 +859,9 @@ def prefetch_for_view_engagements(engagements, recent_test_day_count):
     finding_open_verified_subquery = build_count_subquery(
         Finding.objects.filter(test__engagement=OuterRef("pk"), active=True, verified=True), group_field="test__engagement_id",
     )
+    finding_open_fix_available_subquery = build_count_subquery(
+        Finding.objects.filter(test__engagement=OuterRef("pk"), active=True, fix_available=True), group_field="test__engagement_id",
+    )
     finding_close_subquery = build_count_subquery(
         Finding.objects.filter(test__engagement=OuterRef("pk"), is_mitigated=True), group_field="test__engagement_id",
     )
@@ -874,6 +877,7 @@ def prefetch_for_view_engagements(engagements, recent_test_day_count):
         count_findings_all=Coalesce(finding_subquery, Value(0)),
         count_findings_open=Coalesce(finding_open_subquery, Value(0)),
         count_findings_open_verified=Coalesce(finding_open_verified_subquery, Value(0)),
+        count_findings_fix_available=Coalesce(finding_open_fix_available_subquery, Value(0)),
         count_findings_close=Coalesce(finding_close_subquery, Value(0)),
         count_findings_duplicate=Coalesce(finding_duplicate_subquery, Value(0)),
         count_findings_accepted=Coalesce(finding_accepted_subquery, Value(0)),

dojo/templates/dojo/snippets/engagement_list.html

@@ -48,7 +48,7 @@ <h4> {% if status == "open" %}Active{% elif status == "paused" %}Paused {% else
                     <th class="text-center">JIRA</th>
                     {% endif %}
                     <th class="text-center">Tests</th>
-                    <th class="text-center">Active (Verified)</th>
+                    <th class="text-center">Active (Verified / Fixable)</th>
                     <th class="text-center">Mitigated</th>
                     <th class="text-center">Accepted</th>
                     <th class="text-center">All</th>
@@ -244,7 +244,7 @@ <h4> {% if status == "open" %}Active{% elif status == "paused" %}Paused {% else
                       {% endif %}
                       </div>
                     </td>
-                    <td class="text-center" data-order="{{ eng.count_findings_open }}">{{ eng.count_findings_open }}&nbsp;({{ eng.count_findings_open_verified}})</td>
+                    <td class="text-center" data-order="{{ eng.count_findings_open }}">{{ eng.count_findings_open }}&nbsp;({{ eng.count_findings_open_verified}}/{{ eng.count_findings_fix_available}})</td>
                     <td class="text-center">{{ eng.count_findings_close }}</td>
                     <td class="text-center">{{ eng.count_findings_accepted }}</td>
                     <td class="text-center">{{ eng.count_findings_all }}</td>

dojo/templates/dojo/view_eng.html

@@ -248,7 +248,7 @@ <h4>
                                         <th>Date</th>
                                         <th>Lead</th>
                                         <th>Total Findings</th>
-                                        <th>Active (Verified)</th>
+                                        <th>Active (Verified / Fixable)</th>
                                         <th>Mitigated</th>
                                         <th>Duplicates</th>
                                         <th>Notes</th>
@@ -336,7 +336,8 @@ <h4>
                                             <td><a href="{% url 'view_test' test.id %}">{{ test.count_findings_test_all }}</a></td>
                                             <td>
                                                 <a href="{% url 'view_test' test.id %}?active=true">{{ test.count_findings_test_active }}</a>&nbsp;
-                                                (<a href="{% url 'view_test' test.id %}?active=true&verified=true">{{ test.count_findings_test_active_verified }}</a>)
+                                                (<a href="{% url 'view_test' test.id %}?active=true&verified=true">{{ test.count_findings_test_active_verified }}</a>
+                                                / <a href="{% url 'view_test' test.id %}?active=true&fix_available=true">{{ test.count_findings_test_active_fix_available }}</a>)
                                             </td>
                                             <td><a href="{% url 'view_test' test.id %}?is_mitigated=1">{{ test.count_findings_test_mitigated }}</a></td>
                                             <td><a href="{% url 'view_test' test.id %}?duplicate=1">{{ test.count_findings_test_dups }}</a></td>