Skip to content

Commit 9d29cbd

Browse files
committed
Address review comments
Signed-off-by: Tushar Goel <tushar.goel.dav@gmail.com>
1 parent 3881944 commit 9d29cbd

File tree

3 files changed

+13
-13
lines changed

3 files changed

+13
-13
lines changed

vulnerabilities/migrations/0041_advisory_status_vulnerability_status.py renamed to vulnerabilities/migrations/0042_advisory_status_vulnerability_status.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
class Migration(migrations.Migration):
77

88
dependencies = [
9-
("vulnerabilities", "0040_remove_advisory_date_improved_advisory_date_imported"),
9+
("vulnerabilities", "0041_remove_vulns_with_empty_aliases"),
1010
]
1111

1212
operations = [

vulnerabilities/models.py

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -152,9 +152,9 @@ def with_package_counts(self):
152152
class VulnerabilityStatusType(models.IntegerChoices):
153153
"""List of vulnerability statuses."""
154154

155-
PUBLISHED = 1, "published"
156-
DISPUTED = 2, "disputed"
157-
INVALID = 3, "invalid"
155+
PUBLISHED = 1, "Published"
156+
DISPUTED = 2, "Disputed"
157+
INVALID = 3, "Invalid"
158158

159159

160160
class Vulnerability(models.Model):
@@ -238,6 +238,14 @@ def get_aliases(self):
238238

239239
alias = get_aliases
240240

241+
@property
242+
def get_status_label(self):
243+
label_by_status = {
244+
choice[0] : choice[1]
245+
for choice in VulnerabilityStatusType.choices
246+
}
247+
return label_by_status.get(self.status) or VulnerabilityStatusType.PUBLISHED.label
248+
241249
def get_absolute_url(self):
242250
"""
243251
Return this Vulnerability details absolute URL.

vulnerabilities/views.py

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -115,21 +115,13 @@ class VulnerabilityDetails(DetailView):
115115
def get_queryset(self):
116116
return super().get_queryset().prefetch_related("references", "aliases", "weaknesses")
117117

118-
def get_status(self, status):
119-
status_by_keys = {
120-
VulnerabilityStatusType.PUBLISHED: "Published",
121-
VulnerabilityStatusType.INVALID: "Invalid",
122-
VulnerabilityStatusType.DISPUTED: "Disputed",
123-
}
124-
return status_by_keys[status]
125-
126118
def get_context_data(self, **kwargs):
127119
context = super().get_context_data(**kwargs)
128120
weaknesses = self.object.weaknesses.all()
129121
weaknesses_present_in_db = [
130122
weakness_object for weakness_object in weaknesses if weakness_object.weakness
131123
]
132-
status = self.get_status(self.object.status)
124+
status = self.object.get_status_label
133125
context.update(
134126
{
135127
"vulnerability": self.object,

0 commit comments

Comments
 (0)