Skip to content

Commit a0f33fb

Browse files
committed
version_rank added in api
Signed-off-by: NucleonGodX <[email protected]>
1 parent c52d92a commit a0f33fb

File tree

2 files changed

+9
-7
lines changed

2 files changed

+9
-7
lines changed

vulnerabilities/api_v2.py

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -284,7 +284,9 @@ def get_queryset(self):
284284
queryset = queryset.filter(
285285
fixing_vulnerabilities__vulnerability_id=fixing_vulnerability
286286
)
287-
return queryset.with_is_vulnerable().order_by("type", "namespace", "name", "-version")
287+
return queryset.with_is_vulnerable().order_by(
288+
"type", "namespace", "name", "-version_rank", "version"
289+
)
288290

289291
def list(self, request, *args, **kwargs):
290292
queryset = self.get_queryset()
@@ -427,8 +429,8 @@ def bulk_search(self, request):
427429

428430
query = (
429431
Package.objects.filter(plain_package_url__in=plain_purls)
430-
.order_by("type", "namespace", "name", "-version")
431-
.distinct("type", "namespace", "name", "version")
432+
.order_by("type", "namespace", "name", "-version_rank", "version")
433+
.distinct("type", "namespace", "name", "version_rank", "version")
432434
.with_is_vulnerable()
433435
)
434436

@@ -498,8 +500,8 @@ def all(self, request):
498500
vulnerable_purls = (
499501
Package.objects.vulnerable()
500502
.only("package_url")
501-
.order_by("type", "namespace", "name", "-version")
502-
.distinct("type", "namespace", "name", "version")
503+
.order_by("type", "namespace", "name", "-version_rank", "version")
504+
.distinct("type", "namespace", "name", "version_rank", "version")
503505
.values_list("package_url", flat=True)
504506
)
505507
return Response(vulnerable_purls)

vulnerabilities/views.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@
4141
class PackageSearch(ListView):
4242
model = models.Package
4343
template_name = "packages.html"
44-
ordering = ["type", "namespace", "name", "-version_rank"]
44+
ordering = ["type", "namespace", "name", "-version_rank", "version"]
4545
paginate_by = PAGE_SIZE
4646

4747
def get_context_data(self, **kwargs):
@@ -62,7 +62,7 @@ def get_queryset(self, query=None):
6262
self.model.objects.search(query)
6363
.with_vulnerability_counts()
6464
.prefetch_related()
65-
.order_by("type", "namespace", "name", "-version_rank")
65+
.order_by("type", "namespace", "name", "-version_rank", "version")
6666
)
6767

6868

0 commit comments

Comments
 (0)