Fix part of the failing tests #98

Signed-off-by: tdruez <[email protected]>

component_catalog/models.py

@@ -1675,6 +1675,7 @@ def only_rendering_fields(self):
             *PACKAGE_URL_FIELDS,
             "filename",
             "license_expression",
+            "risk_score",
             "dataspace__name",
             "dataspace__show_usage_policy_in_user_views",
         )

dje/copier.py

@@ -66,6 +66,7 @@
     "project_uuid",
     "default_assignee",
     "affected_by_vulnerabilities",
+    "risk_score",
 ]
 
 

dje/tests/testfiles/test_dataset_cc_only.json

@@ -44,6 +44,7 @@
     "last_modified_date": "2011-08-24T09:20:01Z",
     "reference_notes": "",
     "usage_policy": null,
+    "risk_score": null,
     "declared_license_expression": "",
     "other_license_expression": "",
     "holder": "",
@@ -114,6 +115,7 @@
     "last_modified_date": "2011-08-24T09:20:01Z",
     "reference_notes": "",
     "usage_policy": null,
+    "risk_score": null,
     "declared_license_expression": "",
     "other_license_expression": "",
     "holder": "",
@@ -280,6 +282,7 @@
     "version": "",
     "qualifiers": "",
     "subpath": "",
+    "risk_score": null,
     "declared_license_expression": "",
     "other_license_expression": "",
     "holder": "",

dje/tests/testfiles/test_dataset_pp_only.json

@@ -16,6 +16,7 @@
     "version": "",
     "qualifiers": "",
     "subpath": "",
+    "risk_score": null,
     "declared_license_expression": "",
     "other_license_expression": "",
     "holder": "",

product_portfolio/tests/test_views.py

@@ -300,10 +300,10 @@ def test_product_portfolio_detail_view_tab_vulnerability_view_filters(self):
         self.client.login(username="nexb_user", password="secret")
         url = self.product1.get_url("tab_vulnerabilities")
         response = self.client.get(url)
-        self.assertContains(response, "?vulnerabilities-max_score=#vulnerabilities")
-        self.assertContains(response, "?vulnerabilities-sort=max_score#vulnerabilities")
-        response = self.client.get(url + "?vulnerabilities-sort=max_score#vulnerabilities")
-        self.assertContains(response, "?vulnerabilities-sort=-max_score#vulnerabilities")
+        self.assertContains(response, "?vulnerabilities-risk_score=#vulnerabilities")
+        self.assertContains(response, "?vulnerabilities-sort=risk_score#vulnerabilities")
+        response = self.client.get(url + "?vulnerabilities-sort=risk_score#vulnerabilities")
+        self.assertContains(response, "?vulnerabilities-sort=-risk_score#vulnerabilities")
 
     @mock.patch("dejacode_toolkit.vulnerablecode.VulnerableCode.is_configured")
     def test_product_portfolio_detail_view_tab_vulnerability_label(self, mock_is_configured):

reporting/tests/test_models.py

@@ -2016,6 +2016,7 @@ def test_get_model_data_for_component_column_template(self):
             {"group": "Direct Fields", "value": "reference_notes", "label": "reference_notes"},
             {"group": "Direct Fields", "label": "release_date", "value": "release_date"},
             {"group": "Direct Fields", "label": "request_count", "value": "request_count"},
+            {"group": "Direct Fields", "label": "risk_score", "value": "risk_score"},
             {
                 "group": "Direct Fields",
                 "label": "sublicense_allowed",

vulnerabilities/models.py

@@ -103,6 +103,7 @@ class Vulnerability(HistoryDateFieldsMixin, DataspacedModel):
     )
     exploitability = models.DecimalField(
         null=True,
+        blank=True,
         max_digits=4,
         decimal_places=2,
         help_text=_(
@@ -114,6 +115,7 @@ class Vulnerability(HistoryDateFieldsMixin, DataspacedModel):
     )
     weighted_severity = models.DecimalField(
         null=True,
+        blank=True,
         max_digits=4,
         decimal_places=2,
         help_text=_(
@@ -123,6 +125,7 @@ class Vulnerability(HistoryDateFieldsMixin, DataspacedModel):
     )
     risk_score = models.DecimalField(
         null=True,
+        blank=True,
         max_digits=4,
         decimal_places=2,
         help_text=_(
@@ -363,6 +366,7 @@ class AffectedByVulnerabilityMixin(models.Model):
     # Based on vulnerablecode.vulnerabilities.models.Package
     risk_score = models.DecimalField(
         null=True,
+        blank=True,
         max_digits=4,
         decimal_places=2,
         help_text=_(

vulnerabilities/tests/test_models.py

@@ -162,21 +162,8 @@ def test_vulnerability_model_create_from_data(self):
         self.assertEqual(vulnerability_data["aliases"], vulnerability1.aliases)
         self.assertEqual(vulnerability_data["references"], vulnerability1.references)
         self.assertEqual(vulnerability_data["resource_url"], vulnerability1.resource_url)
-        self.assertEqual(7.5, vulnerability1.min_score)
-        self.assertEqual(7.5, vulnerability1.max_score)
         self.assertQuerySetEqual(vulnerability1.affected_packages.all(), [package1])
 
-    def test_vulnerability_model_create_from_data_computed_scores(self):
-        response_file = self.data / "vulnerabilities" / "idna_3.6_response.json"
-        json_data = json.loads(response_file.read_text())
-        affected_by_vulnerabilities = json_data["results"][0]["affected_by_vulnerabilities"]
-        vulnerability1 = Vulnerability.create_from_data(
-            dataspace=self.dataspace,
-            data=affected_by_vulnerabilities[0],
-        )
-        self.assertEqual(2.1, vulnerability1.min_score)
-        self.assertEqual(7.5, vulnerability1.max_score)
-
     def test_vulnerability_model_queryset_count_methods(self):
         package1 = make_package(self.dataspace)
         package2 = make_package(self.dataspace)