Skip to content

Commit 8ef2092

Browse files
committed
Refine search
Signed-off-by: Tushar Goel <tushar.goel.dav@gmail.com>
1 parent 8923705 commit 8ef2092

3 files changed

Lines changed: 45 additions & 1 deletion

File tree

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
# Generated by Django 5.2.11 on 2026-06-03 08:00
2+
3+
from django.db import migrations, models
4+
5+
6+
class Migration(migrations.Migration):
7+
8+
dependencies = [
9+
("vulnerabilities", "0134_advisoryv2__all_impacts_unfurled_and_more"),
10+
]
11+
12+
operations = [
13+
migrations.RemoveIndex(
14+
model_name="advisoryv2",
15+
name="advisory_latest_by_avid_idx",
16+
),
17+
migrations.AddIndex(
18+
model_name="advisoryv2",
19+
index=models.Index(
20+
fields=["_all_impacts_unfurled", "id"], name="advisory_unfurled_idx"
21+
),
22+
),
23+
]

‎vulnerabilities/models.py‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3274,6 +3274,12 @@ class Meta:
32743274
name="advisory_latest_by_avid_idx",
32753275
)
32763276
]
3277+
indexes = [
3278+
models.Index(
3279+
fields=["_all_impacts_unfurled", "id"],
3280+
name="advisory_unfurled_idx",
3281+
),
3282+
]
32773283

32783284
def save(self, *args, **kwargs):
32793285
self.full_clean()

‎vulnerabilities/views.py‎

Lines changed: 16 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -214,7 +214,22 @@ def get_queryset(self, query=None):
214214

215215
query = query or self.request.GET.get("search") or ""
216216

217-
return self.model.objects.search(query).prefetch_related().with_is_vulnerable()
217+
qs = self.model.objects.search(query)
218+
219+
affecting_exists = ImpactedPackageAffecting.objects.filter(
220+
packagev2_id=OuterRef("pk"),
221+
impactedpackage__advisory___all_impacts_unfurled=True,
222+
)
223+
224+
fixed_by_exists = ImpactedPackageFixedBy.objects.filter(
225+
packagev2_id=OuterRef("pk"),
226+
impactedpackage__advisory___all_impacts_unfurled=True,
227+
)
228+
229+
return qs.objects.annotate(
230+
is_vulnerable=Exists(affecting_exists),
231+
is_fixing=Exists(fixed_by_exists),
232+
).filter(Q(is_vulnerable=True) | Q(is_fixing=True))
218233

219234

220235
class AffectedByAdvisoriesListView(VulnerableCodeListView):

0 commit comments

Comments
 (0)