Skip to content

Commit a4ccd37

Browse files
authored
Merge pull request #765 from TG1999/search_from_alias
Search from alias in UI
2 parents 5b56e9e + 2fad684 commit a4ccd37

File tree

2 files changed

+14
-2
lines changed

2 files changed

+14
-2
lines changed

vulnerabilities/tests/test_view.py

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
from django.test import Client
22
from django.test import TestCase
33

4+
from vulnerabilities.models import Alias
45
from vulnerabilities.models import Vulnerability
56

67

@@ -26,6 +27,8 @@ class VulnerabilitySearchTestCase(TestCase):
2627
def setUp(self):
2728
vulnerability = Vulnerability(summary="test")
2829
vulnerability.save()
30+
alias = Alias(alias="TEST-2022", vulnerability=vulnerability)
31+
alias.save()
2932
self.id = vulnerability.id
3033
self.client = Client()
3134

@@ -36,9 +39,16 @@ def test_vulnerabilties(self):
3639
response = self.client.get(f"/vulnerabilities/{self.id}")
3740
self.assertEqual(response.status_code, 200)
3841

39-
def test_vulnerabilties(self):
42+
def test_vulnerabilties_search(self):
4043
"""
4144
Test Vulnerability Search View
4245
"""
4346
response = self.client.get(f"/vulnerabilities/search")
4447
self.assertEqual(response.status_code, 200)
48+
49+
def test_alias(self):
50+
"""
51+
Test Vulnerability Search View
52+
"""
53+
response = self.client.get(f"/vulnerabilities/search?vuln_id=TEST-2022")
54+
self.assertEqual(response.status_code, 200)

vulnerabilities/views.py

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,9 @@ def get(self, request):
110110
def request_to_vulnerabilities(request):
111111
vuln_id = request.GET["vuln_id"]
112112
return list(
113-
models.Vulnerability.objects.filter(vulnerability_id=vuln_id).annotate(
113+
models.Vulnerability.objects.filter(
114+
Q(vulnerability_id=vuln_id) | Q(aliases__alias__icontains=vuln_id)
115+
).annotate(
114116
vulnerable_package_count=Count(
115117
"packages", filter=Q(packagerelatedvulnerability__fix=False)
116118
),

0 commit comments

Comments
 (0)