Add subquery for test_count for engagements getting

Author: DenysMoskalenko

dojo/engagement/views.py

@@ -153,7 +153,6 @@ def engagement_calendar(request):
 
 
 def get_filtered_engagements(request, view):
-
     if view not in {"all", "active"}:
         msg = f"View {view} is not allowed"
         raise ValidationError(msg)
@@ -163,37 +162,29 @@ def get_filtered_engagements(request, view):
     if view == "active":
         engagements = engagements.filter(active=True)
 
-    engagements = engagements.select_related("product", "product__prod_type") \
+    engagements = (
+        engagements
+        .select_related("product", "product__prod_type")
         .prefetch_related("lead", "tags", "product__tags")
+    )
 
     if System_Settings.objects.get().enable_jira:
         engagements = engagements.prefetch_related(
             "jira_project__jira_instance",
             "product__jira_project_set__jira_instance",
         )
 
+    test_count_subquery = build_count_subquery(
+        Test.objects.filter(engagement=OuterRef("pk")), group_field="engagement_id",
+    )
+    engagements = engagements.annotate(test_count=Coalesce(test_count_subquery, Value(0)))
+
     filter_string_matching = get_system_setting("filter_string_matching", False)
     filter_class = EngagementDirectFilterWithoutObjectLookups if filter_string_matching else EngagementDirectFilter
     return filter_class(request.GET, queryset=engagements)
 
 
-def get_test_counts(engagements):
-    # Get the test counts per engagement. As a separate query, this is much
-    # faster than annotating the above `engagements` query.
-    return {
-        test["engagement"]: test["test_count"]
-        for test in Test.objects.filter(
-            engagement__in=engagements,
-        ).values(
-            "engagement",
-        ).annotate(
-            test_count=Count("engagement"),
-        )
-    }
-
-
 def engagements(request, view):
-
     if not view:
         view = "active"
 
@@ -211,7 +202,6 @@ def engagements(request, view):
     return render(
         request, "dojo/engagement.html", {
             "engagements": engs,
-            "engagement_test_counts": get_test_counts(filtered_engagements.qs),
             "filter_form": filtered_engagements.form,
             "product_name_words": product_name_words,
             "engagement_name_words": engagement_name_words,
@@ -1589,14 +1579,18 @@ def get_engagements(request):
         query = get_list_index(path_items, 1)
 
     request.GET = QueryDict(query)
-    engagements = get_filtered_engagements(request, view).qs
-    test_counts = get_test_counts(engagements)
-
-    return engagements, test_counts
+    return get_filtered_engagements(request, view).qs
 
 
 def get_excludes():
-    return ["is_ci_cd", "jira_issue", "jira_project", "objects", "unaccepted_open_findings"]
+    return [
+        "is_ci_cd",
+        "jira_issue",
+        "jira_project",
+        "objects",
+        "unaccepted_open_findings",
+        "test_count",  # already exported separately as “tests”
+    ]
 
 
 def get_foreign_keys():
@@ -1606,7 +1600,7 @@ def get_foreign_keys():
 
 def csv_export(request):
     logger.debug("starting csv export")
-    engagements, test_counts = get_engagements(request)
+    engagements = get_engagements(request)
 
     response = HttpResponse(content_type="text/csv")
     response["Content-Disposition"] = "attachment; filename=engagements.csv"
@@ -1633,7 +1627,7 @@ def csv_export(request):
                     if value and isinstance(value, str):
                         value = value.replace("\n", " NEWLINE ").replace("\r", "")
                     fields.append(value)
-            fields.append(test_counts.get(engagement.id, 0))
+            fields.append(getattr(engagement, "test_count", 0))
 
             writer.writerow(fields)
     logger.debug("done with csv export")
@@ -1642,7 +1636,7 @@ def csv_export(request):
 
 def excel_export(request):
     logger.debug("starting excel export")
-    engagements, test_counts = get_engagements(request)
+    engagements = get_engagements(request)
 
     workbook = Workbook()
     workbook.iso_dates = True
@@ -1674,7 +1668,7 @@ def excel_export(request):
                         value = value.replace(tzinfo=None)
                     worksheet.cell(row=row_num, column=col_num, value=value)
                     col_num += 1
-            worksheet.cell(row=row_num, column=col_num, value=test_counts.get(engagement.id, 0))
+            worksheet.cell(row=row_num, column=col_num, value=getattr(engagement, "test_count", 0))
         row_num += 1
 
     with NamedTemporaryFile() as tmp:

dojo/templates/dojo/engagement.html

@@ -2,7 +2,6 @@
 {% load navigation_tags %}
 {% load display_tags %}
 {% load authorization_tags %}
-{% load dict_key %}
 
 {% block content %}
     {{ block.super }}
@@ -173,9 +172,7 @@ <h3 class="has-filters">
                                 <td>{{ e.lead.first_name }} {{ e.lead.last_name }}</td>
                                 <td>
                                     <a class="eng_link" href="{%url 'view_engagement' e.id %}#tests">
-                                        {% with test_count=engagement_test_counts|dict_key:e.pk|default_if_none:0 %}
-                                            {{ test_count }}
-                                        {% endwith %}
+                                        {{ e.test_count|default:0 }}
                                     </a>
                                 </td>
                                 {% if system_settings.enable_jira %}