Update the test fixture to use the new alias field

Signed-off-by: Keshav Priyadarshi <[email protected]>

Author: keshav-space

vulnerabilities/migrations/0089_migrate_advisory_aliases.py renamed to vulnerabilities/migrations/0090_migrate_advisory_aliases.py

@@ -32,7 +32,7 @@ def bulk_update(model, items, fields, logger):
 class Migration(migrations.Migration):
 
     dependencies = [
-        ("vulnerabilities", "0088_fix_alpine_purl_type"),
+        ("vulnerabilities", "0089_alter_advisory_unique_content_id"),
     ]
 
     def populate_new_advisory_aliases_field(apps, schema_editor):

vulnerabilities/tests/pipelines/test_base_pipeline.py

@@ -20,6 +20,7 @@
 from vulnerabilities.importer import Reference
 from vulnerabilities.pipelines import VulnerableCodeBaseImporterPipeline
 from vulnerabilities.pipelines import VulnerableCodePipeline
+from vulnerabilities.pipes.advisory import get_or_create_aliases
 from vulnerabilities.tests.pipelines import TestLogger
 
 advisory_data1 = AdvisoryData(
@@ -38,15 +39,16 @@
 
 
 def get_advisory1(created_by="test_pipeline"):
-    return models.Advisory.objects.create(
-        aliases=advisory_data1.aliases,
+    adv = models.Advisory.objects.create(
         summary=advisory_data1.summary,
         affected_packages=[pkg.to_dict() for pkg in advisory_data1.affected_packages],
         references=[ref.to_dict() for ref in advisory_data1.references],
         url=advisory_data1.url,
         created_by=created_by,
         date_collected=timezone.now(),
     )
+    adv.aliases.add(*get_or_create_aliases(advisory_data1.aliases))
+    return adv
 
 
 class TestVulnerableCodePipeline(TestCase):
@@ -101,7 +103,7 @@ def test_collect_and_store_advisories(self, mock_advisories_count, mock_collect_
         self.assertEqual(1, models.Advisory.objects.count())
 
         collected_advisory = models.Advisory.objects.first()
-        result_aliases = collected_advisory.aliases
+        result_aliases = [item.alias for item in collected_advisory.aliases.all()]
         expected_aliases = advisory_data1.aliases
 
         self.assertEqual(expected_aliases, result_aliases)
@@ -122,4 +124,5 @@ def test_import_new_advisories(self):
         self.assertEqual(1, imported_vulnerability.aliases.count())
 
         expected_alias = imported_vulnerability.aliases.first()
-        self.assertEqual(advisory1.aliases[0], expected_alias.alias)
+        result_alias = advisory1.aliases.first()
+        self.assertEqual(result_alias.alias, expected_alias.alias)

vulnerabilities/tests/pipelines/test_nginx_importer_pipeline.py

@@ -30,7 +30,6 @@
 
 ADVISORY_FIELDS_TO_TEST = (
     "unique_content_id",
-    "aliases",
     "summary",
     "affected_packages",
     "references",

vulnerabilities/tests/pipes/test_advisory.py

@@ -16,10 +16,10 @@
 from vulnerabilities.importer import AdvisoryData
 from vulnerabilities.importer import AffectedPackage
 from vulnerabilities.importer import Reference
+from vulnerabilities.pipes.advisory import get_or_create_aliases
 from vulnerabilities.pipes.advisory import import_advisory
 
 advisory_data1 = AdvisoryData(
-    aliases=["CVE-2020-13371337"],
     summary="vulnerability description here",
     affected_packages=[
         AffectedPackage(
@@ -34,15 +34,16 @@
 
 
 def get_advisory1(created_by="test_pipeline"):
-    return models.Advisory.objects.create(
-        aliases=advisory_data1.aliases,
+    advisory = models.Advisory.objects.create(
         summary=advisory_data1.summary,
         affected_packages=[pkg.to_dict() for pkg in advisory_data1.affected_packages],
         references=[ref.to_dict() for ref in advisory_data1.references],
         url=advisory_data1.url,
         created_by=created_by,
         date_collected=timezone.now(),
     )
+    advisory.aliases.add(*get_or_create_aliases(advisory_data1.aliases))
+    return advisory
 
 
 def get_all_vulnerability_relationships_objects():

vulnerabilities/tests/test_add_cvsssv31.py

@@ -1,24 +1,29 @@
-import unittest
-from unittest.mock import Mock
-from unittest.mock import patch
+#
+# Copyright (c) nexB Inc. and others. All rights reserved.
+# VulnerableCode is a trademark of nexB Inc.
+# SPDX-License-Identifier: Apache-2.0
+# See http://www.apache.org/licenses/LICENSE-2.0 for the license text.
+# See https://github.com/aboutcode-org/vulnerablecode for support or download.
+# See https://aboutcode.org for more information about nexB OSS projects.
+#
+
 
 from django.test import TestCase
 
 from vulnerabilities.models import Advisory
-from vulnerabilities.models import Alias
 from vulnerabilities.models import Vulnerability
 from vulnerabilities.models import VulnerabilitySeverity
 from vulnerabilities.pipelines.add_cvss31_to_CVEs import CVEAdvisoryMappingPipeline
+from vulnerabilities.pipes.advisory import get_or_create_aliases
 from vulnerabilities.severity_systems import CVSSV3
 from vulnerabilities.severity_systems import CVSSV31
 
 
 class TestCVEAdvisoryMappingPipeline(TestCase):
     def setUp(self):
         self.pipeline = CVEAdvisoryMappingPipeline()
-        Advisory.objects.create(
+        advisory = Advisory.objects.create(
             created_by="nvd_importer",
-            aliases=["CVE-2024-1234"],
             references=[
                 {
                     "severities": [
@@ -35,6 +40,7 @@ def setUp(self):
             ],
             date_collected="2024-09-27T19:38:00Z",
         )
+        advisory.aliases.add(*get_or_create_aliases(["CVE-2024-1234"]))
         vuln = Vulnerability.objects.create(vulnerability_id="CVE-2024-1234")
         sev = VulnerabilitySeverity.objects.create(
             scoring_system=CVSSV3.identifier,