Address review comments

Signed-off-by: Tushar Goel <tushar.goel.dav@gmail.com>
aboutcode-org · Nov 15, 2023 · 9d29cbd · 9d29cbd
1 parent 3881944
commit 9d29cbd
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 13 deletions.
diff --git a/...1_advisory_status_vulnerability_status.py → ...2_advisory_status_vulnerability_status.py b/...1_advisory_status_vulnerability_status.py → ...2_advisory_status_vulnerability_status.py
@@ -6,7 +6,7 @@
 class Migration(migrations.Migration):
 
     dependencies = [
-        ("vulnerabilities", "0040_remove_advisory_date_improved_advisory_date_imported"),
+        ("vulnerabilities", "0041_remove_vulns_with_empty_aliases"),
     ]
 
     operations = [

diff --git a/vulnerabilities/models.py b/vulnerabilities/models.py
@@ -152,9 +152,9 @@ def with_package_counts(self):
 class VulnerabilityStatusType(models.IntegerChoices):
     """List of vulnerability statuses."""
 
-    PUBLISHED = 1, "published"
-    DISPUTED = 2, "disputed"
-    INVALID = 3, "invalid"
+    PUBLISHED = 1, "Published"
+    DISPUTED = 2, "Disputed"
+    INVALID = 3, "Invalid"
 
 
 class Vulnerability(models.Model):
@@ -238,6 +238,14 @@ def get_aliases(self):
 
     alias = get_aliases
 
+    @property
+    def get_status_label(self):
+        label_by_status = {
+            choice[0] : choice[1] 
+            for choice in VulnerabilityStatusType.choices
+        }
+        return label_by_status.get(self.status) or VulnerabilityStatusType.PUBLISHED.label
+
     def get_absolute_url(self):
         """
         Return this Vulnerability details absolute URL.

diff --git a/vulnerabilities/views.py b/vulnerabilities/views.py
@@ -115,21 +115,13 @@ class VulnerabilityDetails(DetailView):
     def get_queryset(self):
         return super().get_queryset().prefetch_related("references", "aliases", "weaknesses")
 
-    def get_status(self, status):
-        status_by_keys = {
-            VulnerabilityStatusType.PUBLISHED: "Published",
-            VulnerabilityStatusType.INVALID: "Invalid",
-            VulnerabilityStatusType.DISPUTED: "Disputed",
-        }
-        return status_by_keys[status]
-
     def get_context_data(self, **kwargs):
         context = super().get_context_data(**kwargs)
         weaknesses = self.object.weaknesses.all()
         weaknesses_present_in_db = [
             weakness_object for weakness_object in weaknesses if weakness_object.weakness
         ]
-        status = self.get_status(self.object.status)
+        status = self.object.get_status_label
         context.update(
             {
                 "vulnerability": self.object,