Reduce db queries in package search view

Signed-off-by: Shivam Sandbhor <shivam.sandbhor@gmail.com>

Author: sbs2001

vulnerabilities/templates/package_update.html

@@ -40,7 +40,7 @@ <h1 class="title">
         <div class="tags mx-3">
             {% for vulnerability in impacted_vuln %}
                 <span class="tag is-danger is-medium">
-                  <a href="{% url 'vulnerability_view' vulnerability.pk %}" class="has-text-white">{{vulnerability}}</a>
+                  <a href="{% url 'vulnerability_view' vulnerability.pk %}" class="has-text-white">{{vulnerability.vulnerability_id}}</a>
                   {% if enable_curation %}
                     <form method="POST" action="{% url 'impacted_package_delete' object.pk vulnerability.pk %}"">
                       {% csrf_token %}<button class="delete is-small" type="submit"></button>
@@ -74,7 +74,7 @@ <h1 class="title">
                <div class="tags mx-3">
             {% for vulnerability in resolved_vuln %}
             <span class="tag is-primary is-medium">
-              <a href="{% url 'vulnerability_view' vulnerability.pk %}" class="has-text-white">{{vulnerability}}</a>
+              <a href="{% url 'vulnerability_view' vulnerability.pk %}" class="has-text-white">{{vulnerability.vulnerability_id}}</a>
 
             {% if enable_curation %}
             <form method="POST" action="{% url 'resolved_package_delete' object.pk vulnerability.pk %}">

vulnerabilities/templates/packages.html

@@ -41,9 +41,9 @@ <h1 class="title">
       </tr>
       {% for package in packages %}
       <tr>
-        <td><a href="{% url 'package_view' package.pk %}">{{package}}</a></td>
-        <td>{{package.vulnerable_to.all|length}}</td>
-        <td>{{package.resolved_to.all|length}}</td>
+        <td><a href="{% url 'package_view' package.pk %}">{{package.package_url}}</a></td>
+        <td>{{package.vulnerability_count}}</td>
+        <td>{{package.patched_vulnerability_count}}</td>
       </tr>
       {% endfor %}
     </table>

vulnerabilities/views.py

@@ -47,7 +47,7 @@ def get(self, request):
 
         if request.GET:
             packages = self.request_to_queryset(request)
-            result_size = packages.count()
+            result_size = len(packages)
             page_no = int(request.GET.get("page", 1))
             packages = Paginator(packages, 50).get_page(page_no)
             context["packages"] = packages
@@ -69,9 +69,14 @@ def request_to_queryset(request):
         if len(request.GET["name"]):
             package_name = request.GET["name"]
 
-        return models.Package.objects.all().filter(
-            name__icontains=package_name,
-            type__icontains=package_type,
+        return list(
+            models.Package.objects.all()
+            .filter(name__icontains=package_name, type__icontains=package_type)
+            .annotate(
+                vulnerability_count=Count("vulnerabilities"),
+                patched_vulnerability_count=Count("resolved_vulnerabilities"),
+            )
+            .prefetch_related()
         )
 
 
@@ -118,9 +123,11 @@ def get_context_data(self, **kwargs):
         return context
 
     def _package_vulnerabilities(self, package_pk):
-
-        resolved_vuln = [i for i in self.get_object().resolved_to]
-        unresolved_vuln = [i for i in self.get_object().vulnerable_to]
+        # This can be further optimised by caching get_object result first time it
+        # is called
+        package = self.get_object()
+        resolved_vuln = [i for i in package.resolved_to.values("vulnerability_id", "pk")]
+        unresolved_vuln = [i for i in package.vulnerable_to.values("vulnerability_id", "pk")]
 
         return resolved_vuln, unresolved_vuln