Skip to content

Commit 11aceee

Browse files
committed
feat: include todo count in fixing and affected-by endpoint
Signed-off-by: Keshav Priyadarshi <git@keshav.space>
1 parent 5cb5632 commit 11aceee

1 file changed

Lines changed: 13 additions & 3 deletions

File tree

‎vulnerabilities/api_v3.py‎

Lines changed: 13 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -383,6 +383,7 @@ class Meta:
383383
"risk_score",
384384
"related_ssvc_trees",
385385
"fixed_by_packages",
386+
"todo_count",
386387
]
387388

388389

@@ -469,7 +470,16 @@ def get_queryset(self):
469470
if not purl:
470471
return AdvisoryV2.objects.none()
471472

472-
return AdvisoryV2.objects.filter(**{self.relation: purl}).latest_per_avid()
473+
return (
474+
AdvisoryV2.objects.filter(**{self.relation: purl})
475+
.latest_per_avid()
476+
.annotate(
477+
todo_count=Count(
478+
"advisory_todos",
479+
filter=Q(advisory_todos__is_todo_stale=False),
480+
)
481+
)
482+
)
473483

474484

475485
class FixingAdvisoriesViewSet(PackageAdvisoriesViewSet):
@@ -637,7 +647,7 @@ def get_affected_advisories_bulk(packages, max_advisories, base_url, reachabilit
637647
max_exploitability=Max(
638648
"members__advisory__exploitability",
639649
),
640-
todo_count=Count(
650+
primary_adv_todo_count=Count(
641651
"primary_advisory__advisory_todos",
642652
filter=Q(primary_advisory__advisory_todos__is_todo_stale=False),
643653
),
@@ -786,7 +796,7 @@ def get_affected_advisories_bulk(packages, max_advisories, base_url, reachabilit
786796
),
787797
"ssvc_trees": adv.ssvc_trees,
788798
"resource_url": resource_url,
789-
"todo_count": adv.todo_count,
799+
"todo_count": adv.primary_adv_todo_count,
790800
}
791801
)
792802

0 commit comments

Comments
 (0)