Add ImportProblem model to store conflicts

Signed-off-by: Shivam Sandbhor <shivam.sandbhor@gmail.com>

Author: sbs2001

vulnerabilities/migrations/0001_initial.py

@@ -1,4 +1,4 @@
-# Generated by Django 3.0.3 on 2020-04-10 15:49
+# Generated by Django 3.0.7 on 2020-07-10 05:48
 
 import django.contrib.postgres.fields.jsonb
 from django.db import migrations, models
@@ -26,10 +26,17 @@ class Migration(migrations.Migration):
                 ('name', models.CharField(help_text='Name of the importer', max_length=100, unique=True)),
                 ('license', models.CharField(blank=True, help_text='License of the vulnerability data', max_length=100)),
                 ('last_run', models.DateTimeField(help_text='UTC Timestamp of the last run', null=True)),
-                ('data_source', models.CharField(help_text='Class name of the data source implementation importable from vulnerabilities.importers', max_length=100)),
+                ('data_source', models.CharField(help_text='Name of the data source implementation importable from vulnerabilities.importers', max_length=100)),
                 ('data_source_cfg', django.contrib.postgres.fields.jsonb.JSONField(default=dict, help_text='Implementation-specific configuration for the data source')),
             ],
         ),
+        migrations.CreateModel(
+            name='ImportProblem',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('conflicting_model', django.contrib.postgres.fields.jsonb.JSONField()),
+            ],
+        ),
         migrations.CreateModel(
             name='Package',
             fields=[
@@ -38,13 +45,9 @@ class Migration(migrations.Migration):
                 ('namespace', models.CharField(blank=True, help_text='Package name prefix, such as Maven groupid, Docker image owner, GitHub user or organization, etc.', max_length=255, null=True)),
                 ('name', models.CharField(blank=True, help_text='Name of the package.', max_length=100, null=True)),
                 ('version', models.CharField(blank=True, help_text='Version of the package.', max_length=100, null=True)),
-                ('qualifiers', django.contrib.postgres.fields.jsonb.JSONField(default=dict, null=True, help_text='Extra qualifying data for a package such as the name of an OS, architecture, distro, etc.')),
                 ('subpath', models.CharField(blank=True, help_text='Extra subpath within a package, relative to the package root.', max_length=200, null=True)),
+                ('qualifiers', django.contrib.postgres.fields.jsonb.JSONField(default=dict, help_text='Extra qualifying data for a package such as the name of an OS, architecture, distro, etc.', null=True)),
             ],
-            options={
-                  'unique_together': {('name', 'namespace', 'type', 'version', 'qualifiers', 'subpath')},
-                  'abstract': False,
-            },
         ),
         migrations.CreateModel(
             name='Vulnerability',
@@ -94,6 +97,10 @@ class Migration(migrations.Migration):
                 'unique_together': {('vulnerability', 'source', 'reference_id', 'url')},
             },
         ),
+        migrations.AlterUniqueTogether(
+            name='package',
+            unique_together={('name', 'namespace', 'type', 'version', 'qualifiers', 'subpath')},
+        ),
         migrations.AlterUniqueTogether(
             name='impactedpackage',
             unique_together={('vulnerability', 'package')},

vulnerabilities/models.py

@@ -39,8 +39,10 @@ class Vulnerability(models.Model):
     A software vulnerability with minimal information. Identifiers other than CVE ID are stored as
     VulnerabilityReference.
     """
-    cve_id = models.CharField(max_length=50, help_text='CVE ID', unique=True, null=True)
-    summary = models.TextField(help_text='Summary of the vulnerability', blank=True)
+    cve_id = models.CharField(
+        max_length=50, help_text='CVE ID', unique=True, null=True)
+    summary = models.TextField(
+        help_text='Summary of the vulnerability', blank=True)
     cvss = models.FloatField(max_length=100, help_text='CVSS Score', null=True)
 
     def __str__(self):
@@ -75,10 +77,12 @@ class Package(PackageURLMixin):
     """
     A software package with links to relevant vulnerabilities.
     """
-    vulnerabilities = models.ManyToManyField(to='Vulnerability', through='ImpactedPackage')
+    vulnerabilities = models.ManyToManyField(
+        to='Vulnerability', through='ImpactedPackage')
 
     class Meta:
-        unique_together = ('name', 'namespace', 'type', 'version', 'qualifiers', 'subpath')
+        unique_together = ('name', 'namespace', 'type',
+                           'version', 'qualifiers', 'subpath')
     # Remove the `qualifers` and `set_package_url` overrides after
     # https://github.com/package-url/packageurl-python/pull/35 gets merged
     qualifiers = pgfields.JSONField(
@@ -103,7 +107,8 @@ def set_package_url(self, package_url):
             model_field = self._meta.get_field(field_name)
 
             if value and len(value) > model_field.max_length:
-                raise ValidationError(_('Value too long for field "{}".'.format(field_name)))
+                raise ValidationError(
+                    _('Value too long for field "{}".'.format(field_name)))
 
             setattr(self, field_name, value or None)
 
@@ -135,15 +140,17 @@ class Importer(models.Model):
     Metadata and pointer to the implementation for a source of vulnerability data (aka security
     advisories)
     """
-    name = models.CharField(max_length=100, unique=True, help_text='Name of the importer')
+    name = models.CharField(max_length=100, unique=True,
+                            help_text='Name of the importer')
 
     license = models.CharField(
         max_length=100,
         blank=True,
         help_text='License of the vulnerability data',
     )
 
-    last_run = models.DateTimeField(null=True, help_text='UTC Timestamp of the last run')
+    last_run = models.DateTimeField(
+        null=True, help_text='UTC Timestamp of the last run')
 
     data_source = models.CharField(
         max_length=100,
@@ -176,3 +183,8 @@ def make_data_source(self, batch_size: int, cutoff_date: datetime = None) -> Dat
 
     def __str__(self):
         return self.name
+
+
+class ImportProblem(models.Model):
+
+    conflicting_model = pgfields.JSONField()