version_rank added in api

Signed-off-by: NucleonGodX <[email protected]>

Author: NucleonGodX

vulnerabilities/api_v2.py

@@ -284,7 +284,9 @@ def get_queryset(self):
             queryset = queryset.filter(
                 fixing_vulnerabilities__vulnerability_id=fixing_vulnerability
             )
-        return queryset.with_is_vulnerable().order_by("type", "namespace", "name", "-version")
+        return queryset.with_is_vulnerable().order_by(
+            "type", "namespace", "name", "-version_rank", "version"
+        )
 
     def list(self, request, *args, **kwargs):
         queryset = self.get_queryset()
@@ -427,8 +429,8 @@ def bulk_search(self, request):
 
             query = (
                 Package.objects.filter(plain_package_url__in=plain_purls)
-                .order_by("type", "namespace", "name", "-version")
-                .distinct("type", "namespace", "name", "version")
+                .order_by("type", "namespace", "name", "-version_rank", "version")
+                .distinct("type", "namespace", "name", "version_rank", "version")
                 .with_is_vulnerable()
             )
 
@@ -498,8 +500,8 @@ def all(self, request):
         vulnerable_purls = (
             Package.objects.vulnerable()
             .only("package_url")
-            .order_by("type", "namespace", "name", "-version")
-            .distinct("type", "namespace", "name", "version")
+            .order_by("type", "namespace", "name", "-version_rank", "version")
+            .distinct("type", "namespace", "name", "version_rank", "version")
             .values_list("package_url", flat=True)
         )
         return Response(vulnerable_purls)

vulnerabilities/views.py

@@ -41,7 +41,7 @@
 class PackageSearch(ListView):
     model = models.Package
     template_name = "packages.html"
-    ordering = ["type", "namespace", "name", "-version_rank"]
+    ordering = ["type", "namespace", "name", "-version_rank", "version"]
     paginate_by = PAGE_SIZE
 
     def get_context_data(self, **kwargs):
@@ -62,7 +62,7 @@ def get_queryset(self, query=None):
             self.model.objects.search(query)
             .with_vulnerability_counts()
             .prefetch_related()
-            .order_by("type", "namespace", "name", "-version_rank")
+            .order_by("type", "namespace", "name", "-version_rank", "version")
         )