Skip to content

Commit 3644b8b

Browse files
committed
Fix risk score pipeline
Signed-off-by: Tushar Goel <tushar.goel.dav@gmail.com>
1 parent 124f010 commit 3644b8b

2 files changed

Lines changed: 14 additions & 8 deletions

File tree

vulnerabilities/models.py

Lines changed: 13 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2930,6 +2930,12 @@ def latest_for_avid(self, avid: str):
29302930

29312931
def latest_per_avid(self):
29322932
return self.filter(is_latest=True)
2933+
2934+
def latest_for_avid_completely_imported_advisories(self, avid):
2935+
return self.get(avid=avid, is_latest=True, _all_impacts_unfurled=True)
2936+
2937+
def latest_completely_imported_advisories_per_avid(self):
2938+
return self.filter(is_latest=True, _all_impacts_unfurled=True)
29332939

29342940
def latest_for_avids(self, avids):
29352941
return self.filter(avid__in=avids).latest_per_avid()
@@ -2941,7 +2947,7 @@ def latest_affecting_advisories_for_purl(self, purl):
29412947
advisory___all_impacts_unfurled=True,
29422948
).values_list("advisory_id", flat=True)
29432949

2944-
return self.filter(id__in=Subquery(adv_ids)).latest_per_avid()
2950+
return self.filter(id__in=Subquery(adv_ids))
29452951

29462952
def latest_affecting_advisories_for_purls(self, purls):
29472953
adv_ids = ImpactedPackage.objects.filter(
@@ -2952,7 +2958,7 @@ def latest_affecting_advisories_for_purls(self, purls):
29522958
"advisory_id",
29532959
flat=True,
29542960
)
2955-
return self.filter(id__in=Subquery(adv_ids)).latest_per_avid()
2961+
return self.filter(id__in=Subquery(adv_ids))
29562962

29572963
def latest_affecting_advisories_for_packages(self, packages):
29582964
adv_ids = ImpactedPackage.objects.filter(
@@ -2963,7 +2969,7 @@ def latest_affecting_advisories_for_packages(self, packages):
29632969
"advisory_id",
29642970
flat=True,
29652971
)
2966-
return self.filter(id__in=Subquery(adv_ids)).latest_per_avid()
2972+
return self.filter(id__in=Subquery(adv_ids))
29672973

29682974
def latest_fixed_by_advisories_for_purl(self, purl):
29692975
adv_ids = ImpactedPackage.objects.filter(
@@ -2974,7 +2980,7 @@ def latest_fixed_by_advisories_for_purl(self, purl):
29742980
"advisory_id",
29752981
flat=True,
29762982
)
2977-
return self.filter(id__in=Subquery(adv_ids)).latest_per_avid()
2983+
return self.filter(id__in=Subquery(adv_ids))
29782984

29792985
def latest_fixed_by_advisories_for_purls(self, purls):
29802986
adv_ids = ImpactedPackage.objects.filter(
@@ -2986,7 +2992,7 @@ def latest_fixed_by_advisories_for_purls(self, purls):
29862992
flat=True,
29872993
)
29882994

2989-
return self.filter(id__in=Subquery(adv_ids)).latest_per_avid()
2995+
return self.filter(id__in=Subquery(adv_ids))
29902996

29912997
def latest_advisories_for_purls(self, purls):
29922998
adv_ids = (
@@ -3012,7 +3018,7 @@ def latest_advisories_for_purls(self, purls):
30123018
)
30133019

30143020
qs = self.filter(id__in=Subquery(adv_ids))
3015-
return qs.latest_per_avid()
3021+
return qs
30163022

30173023
def latest_advisories_for_purl(self, purl):
30183024
adv_ids = (
@@ -3038,7 +3044,7 @@ def latest_advisories_for_purl(self, purl):
30383044
)
30393045

30403046
qs = self.filter(id__in=Subquery(adv_ids))
3041-
return qs.latest_per_avid()
3047+
return qs
30423048

30433049
def todo_excluded(self):
30443050
"""Exclude advisory ineligible for ToDo computation."""

vulnerabilities/pipelines/v2_improvers/compute_package_risk.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,7 @@ def compute_and_store_vulnerability_risk_score(self):
132132

133133
def compute_and_store_package_risk_score(self):
134134

135-
latest_advisories = AdvisoryV2.objects.latest_per_avid()
135+
latest_advisories = AdvisoryV2.objects.latest_completely_imported_advisories_per_avid()
136136

137137
qs = (
138138
PackageV2.objects.filter(

0 commit comments

Comments
 (0)