Skip to content

Commit cc2d2b8

Browse files
committed
Ensure all models have an ordering
Signed-off-by: Philippe Ombredanne <[email protected]>
1 parent b8c1eea commit cc2d2b8

File tree

5 files changed

+4390
-4365
lines changed

5 files changed

+4390
-4365
lines changed
Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
# Generated by Django 4.0.7 on 2022-09-08 14:51
2+
3+
from django.db import migrations
4+
5+
6+
class Migration(migrations.Migration):
7+
8+
dependencies = [
9+
('vulnerabilities', '0026_alter_package_purl'),
10+
]
11+
12+
operations = [
13+
migrations.AlterModelOptions(
14+
name='advisory',
15+
options={'ordering': ['aliases', 'date_published', 'unique_content_id']},
16+
),
17+
migrations.AlterModelOptions(
18+
name='package',
19+
options={'ordering': ['purl']},
20+
),
21+
migrations.AlterModelOptions(
22+
name='packagerelatedvulnerability',
23+
options={'ordering': ['package', 'vulnerability'], 'verbose_name_plural': 'PackageRelatedVulnerabilities'},
24+
),
25+
migrations.AlterModelOptions(
26+
name='vulnerability',
27+
options={'ordering': ['vulnerability_id'], 'verbose_name_plural': 'Vulnerabilities'},
28+
),
29+
migrations.AlterModelOptions(
30+
name='vulnerabilityrelatedreference',
31+
options={'ordering': ['vulnerability', 'reference']},
32+
),
33+
migrations.AlterModelOptions(
34+
name='vulnerabilityseverity',
35+
options={'ordering': ['reference', 'scoring_system', 'value']},
36+
),
37+
]

vulnerabilities/models.py

Lines changed: 12 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,7 @@ class Vulnerability(models.Model):
6060

6161
class Meta:
6262
verbose_name_plural = "Vulnerabilities"
63+
ordering = ["vulnerability_id"]
6364

6465
def __str__(self):
6566
return self.vulnerability_id
@@ -118,10 +119,7 @@ class VulnerabilityReference(models.Model):
118119
)
119120

120121
class Meta:
121-
unique_together = (
122-
"url",
123-
"reference_id",
124-
)
122+
unique_together = ["url", "reference_id"]
125123
ordering = ["reference_id", "url"]
126124

127125
def __str__(self):
@@ -145,7 +143,8 @@ class VulnerabilityRelatedReference(models.Model):
145143
)
146144

147145
class Meta:
148-
unique_together = ("vulnerability", "reference")
146+
unique_together = ["vulnerability", "reference"]
147+
ordering = ["vulnerability", "reference"]
149148

150149

151150
class Package(PackageURLMixin):
@@ -174,14 +173,8 @@ def purl(self):
174173
return self.package_url
175174

176175
class Meta:
177-
unique_together = (
178-
"type",
179-
"namespace",
180-
"name",
181-
"version",
182-
"qualifiers",
183-
"subpath",
184-
)
176+
unique_together = ["type", "namespace", "name", "version", "qualifiers", "subpath"]
177+
ordering = ["purl"]
185178

186179
def __str__(self):
187180
return self.package_url
@@ -261,9 +254,10 @@ class PackageRelatedVulnerability(models.Model):
261254
)
262255

263256
class Meta:
264-
unique_together = ("package", "vulnerability")
257+
unique_together = ["package", "vulnerability"]
265258
verbose_name_plural = "PackageRelatedVulnerabilities"
266259
indexes = [models.Index(fields=["fix"])]
260+
ordering = ["package", "vulnerability"]
267261

268262
def __str__(self):
269263
return f"{self.package.package_url} {self.vulnerability.vulnerability_id}"
@@ -324,11 +318,8 @@ class VulnerabilitySeverity(models.Model):
324318
value = models.CharField(max_length=50, help_text="Example: 9.0, Important, High")
325319

326320
class Meta:
327-
unique_together = (
328-
"reference",
329-
"scoring_system",
330-
"value",
331-
)
321+
unique_together = ["reference", "scoring_system", "value"]
322+
ordering = ["reference", "scoring_system", "value"]
332323

333324

334325
class Alias(models.Model):
@@ -414,11 +405,8 @@ class Advisory(models.Model):
414405
)
415406

416407
class Meta:
417-
unique_together = (
418-
"aliases",
419-
"unique_content_id",
420-
"date_published",
421-
)
408+
unique_together = ["aliases", "unique_content_id", "date_published"]
409+
ordering = ["aliases", "date_published", "unique_content_id"]
422410

423411
def save(self, *args, **kwargs):
424412
checksum = hashlib.md5()

0 commit comments

Comments
 (0)