Address review comments

Signed-off-by: Tushar Goel <tushar.goel.dav@gmail.com>

Author: TG1999

vulnerabilities/api.py

@@ -247,7 +247,7 @@ def bulk_search(self, request):
                 data={"Error": "A non-empty 'purls' list of PURLs is required."},
             )
 
-        query = Package.objects.filter(package__in=purls)
+        query = Package.objects.filter(package_url__in=purls)
 
         if not purl_only:
             return Response(
@@ -264,8 +264,8 @@ def all(self, request):
         """
         Return the Package URLs of all packages known to be vulnerable.
         """
-        vulnerable_packages = Package.objects.vulnerable().only(*PackageURL._fields).distinct()
-        vulnerable_purls = [str(package.purl) for package in vulnerable_packages]
+        vulnerable_packages = Package.objects.vulnerable().only("package_url").distinct()
+        vulnerable_purls = [str(package.package_url) for package in vulnerable_packages]
         return Response(vulnerable_purls)
 
 

…ities/migrations/0034_package_package.py …s/migrations/0034_package_package_url.pyvulnerabilities/migrations/0034_package_package.py renamed to vulnerabilities/migrations/0034_package_package_url.py vulnerabilities/migrations/0034_package_package.py renamed to vulnerabilities/migrations/0034_package_package_url.py

@@ -1,4 +1,4 @@
-# Generated by Django 4.0.7 on 2022-11-25 12:57
+# Generated by Django 4.0.7 on 2022-11-25 17:28
 
 from django.db import migrations, models
 
@@ -12,7 +12,7 @@ class Migration(migrations.Migration):
     operations = [
         migrations.AddField(
             model_name='package',
-            name='package',
-            field=models.CharField(blank=True, help_text='The Package URL for this package.', max_length=255),
+            name='package_url',
+            field=models.CharField(blank=True, db_index=True, help_text='The Package URL for this package.', max_length=255),
         ),
     ]

…es/migrations/0035_auto_20221125_1257.py …ions/0035_add_package_url_to_packages.pyvulnerabilities/migrations/0035_auto_20221125_1257.py renamed to vulnerabilities/migrations/0035_add_package_url_to_packages.py vulnerabilities/migrations/0035_auto_20221125_1257.py renamed to vulnerabilities/migrations/0035_add_package_url_to_packages.py

@@ -1,12 +1,11 @@
-# Generated by Django 4.0.7 on 2022-11-25 12:57
-
 from django.db import migrations
 from packageurl import PackageURL
 
 class Migration(migrations.Migration):
 
-    def save_package(apps, schema_editor):
+    def save_purls(apps, schema_editor):
         Package = apps.get_model("vulnerabilities", "Package")
+        updatables = []
         for package in Package.objects.all():
             purl = PackageURL(
                 type=package.type,
@@ -16,13 +15,20 @@ def save_package(apps, schema_editor):
                 qualifiers=package.qualifiers,
                 subpath=package.subpath,
             )
-            package.package = str(purl)
-            package.save()
+            package.package_url = str(purl)
+            updatables.append(package)
+        
+        updated = Package.objects.bulk_update(
+            objs = updatables,
+            fields=["package_url"], 
+            batch_size=500,
+        )
+        print(f"Migrated {updated} packages with package_url")            
 
     dependencies = [
-        ('vulnerabilities', '0034_package_package'),
+        ('vulnerabilities', '0034_package_package_url'),
     ]
 
     operations = [
-        migrations.RunPython(save_package, reverse_code=migrations.RunPython.noop),
-    ]
+        migrations.RunPython(save_purls, reverse_code=migrations.RunPython.noop),
+    ]

vulnerabilities/migrations/0036_alter_package_package_url.py

@@ -0,0 +1,18 @@
+# Generated by Django 4.0.7 on 2022-11-25 17:34
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('vulnerabilities', '0035_add_package_url_to_packages'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='package',
+            name='package_url',
+            field=models.CharField(db_index=True, help_text='The Package URL for this package.', max_length=255),
+        ),
+    ]

vulnerabilities/models.py

@@ -531,17 +531,25 @@ class Package(PackageURLMixin):
         to="Vulnerability", through="PackageRelatedVulnerability"
     )
 
-    package = models.CharField(
+    package_url = models.CharField(
         max_length=255,
-        blank=True,
         null=False,
         help_text="The Package URL for this package.",
+        db_index=True,
     )
 
     objects = PackageQuerySet.as_manager()
 
     def save(self, *args, **kwargs):
-        self.package = self.purl
+        purl_object = PackageURL(
+            type=self.type,
+            namespace=self.namespace,
+            name=self.name,
+            version=self.version,
+            qualifiers=self.qualifiers,
+            subpath=self.subpath,
+        )
+        self.package_url = str(purl_object)
         super().save(*args, **kwargs)
 
     @property