Skip to content

Commit d759ea4

Browse files
committed
Fix avid errors
Signed-off-by: Tushar Goel <tushar.goel.dav@gmail.com>
1 parent 5e98ecd commit d759ea4

3 files changed

Lines changed: 56 additions & 10 deletions

File tree

‎vulnerabilities/api_v3.py‎

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -227,7 +227,7 @@ def get_affected_by_vulnerabilities(self, package):
227227
result = []
228228

229229
for adv in advisories:
230-
fixed = impact_map.get(adv["avid"]) or []
230+
fixed = impact_map.get(adv["advisory_uid"]) or []
231231
resource_url = None
232232

233233
if request := self.context.get("request", None):
@@ -292,7 +292,6 @@ def get_affected_by_vulnerabilities(self, package):
292292

293293
result.append(
294294
{
295-
"avid": advisory.avid,
296295
"advisory_id": advisory.advisory_id.split("/")[-1],
297296
"advisory_uid": advisory.avid,
298297
"aliases": [alias.alias for alias in advisory.aliases.all()],
@@ -338,15 +337,15 @@ def get_fixing_vulnerabilities(self, package):
338337
{
339338
"advisory_id": advisory["advisory_id"],
340339
"resource_url": resource_url,
341-
"avid": advisory["avid"],
340+
"advisory_uid": advisory["advisory_uid"],
342341
}
343342
)
344343
if results:
345344
return results
346345

347346
advisories_qs = AdvisoryV2.objects.latest_fixed_by_advisories_for_purl(package.package_url)
348347

349-
if not package.type in TYPES_WITH_MULTIPLE_IMPORTERS:
348+
if package.type not in TYPES_WITH_MULTIPLE_IMPORTERS:
350349
advisories_ids = advisories_qs.only("id")
351350

352351
advisories_ids = list(advisories_ids[:101])
@@ -356,14 +355,14 @@ def get_fixing_vulnerabilities(self, package):
356355
results = []
357356

358357
for advisory in advisories_qs:
358+
resource_url = None
359359
if request := self.context.get("request", None):
360360
resource_url = request.build_absolute_uri(location=advisory.get_absolute_url())
361361
results.append(
362362
{
363363
"advisory_id": advisory.advisory_id.split("/")[-1],
364364
"advisory_uid": advisory.avid,
365365
"resource_url": resource_url,
366-
"avid": advisory.avid,
367366
}
368367
)
369368
return results
@@ -395,7 +394,6 @@ def return_fixing_advisories_data(self, advisories):
395394
"advisory_id": advisory.identifier,
396395
"advisory_uid": advisory.advisory.avid,
397396
"resource_url": resource_url,
398-
"avid": advisory.advisory.avid,
399397
}
400398
)
401399

Lines changed: 48 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,48 @@
1+
# Generated by Django 5.2.11 on 2026-05-26 08:07
2+
3+
from django.db import migrations, models
4+
5+
6+
class Migration(migrations.Migration):
7+
8+
dependencies = [
9+
("vulnerabilities", "0132_migrate_advisoryv2_datasource_ids"),
10+
]
11+
12+
operations = [
13+
migrations.AlterField(
14+
model_name="advisoryv2",
15+
name="advisory_id",
16+
field=models.CharField(
17+
db_index=True,
18+
help_text="An advisory is a unique vulnerability identifier in some database, such as PYSEC-2020-2233",
19+
max_length=200,
20+
),
21+
),
22+
migrations.AlterField(
23+
model_name="advisoryv2",
24+
name="avid",
25+
field=models.CharField(
26+
help_text="Unique ID for the datasource used for this advisory .e.g.: pysec_importer_v2/PYSEC-2020-2233",
27+
max_length=250,
28+
),
29+
),
30+
migrations.AlterField(
31+
model_name="advisoryv2",
32+
name="datasource_id",
33+
field=models.CharField(
34+
db_index=True,
35+
help_text="Unique ID for the datasource used for this advisory .e.g.: nginx",
36+
max_length=50,
37+
),
38+
),
39+
migrations.AlterField(
40+
model_name="advisoryv2",
41+
name="pipeline_id",
42+
field=models.CharField(
43+
db_index=True,
44+
help_text="Unique ID for the pipeline used for this advisory .e.g.: nginx_importer_v2",
45+
max_length=50,
46+
),
47+
),
48+
]

‎vulnerabilities/models.py‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3055,15 +3055,15 @@ class AdvisoryV2(models.Model):
30553055

30563056
# This is similar to a type or a namespace
30573057
datasource_id = models.CharField(
3058-
max_length=200,
3058+
max_length=50,
30593059
blank=False,
30603060
null=False,
30613061
db_index=True,
30623062
help_text="Unique ID for the datasource used for this advisory ." "e.g.: nginx",
30633063
)
30643064

30653065
pipeline_id = models.CharField(
3066-
max_length=200,
3066+
max_length=50,
30673067
blank=False,
30683068
null=False,
30693069
db_index=True,
@@ -3072,7 +3072,7 @@ class AdvisoryV2(models.Model):
30723072

30733073
# This is similar to a name
30743074
advisory_id = models.CharField(
3075-
max_length=500,
3075+
max_length=200,
30763076
blank=False,
30773077
null=False,
30783078
unique=False,
@@ -3082,7 +3082,7 @@ class AdvisoryV2(models.Model):
30823082
)
30833083

30843084
avid = models.CharField(
3085-
max_length=500,
3085+
max_length=250,
30863086
blank=False,
30873087
null=False,
30883088
help_text="Unique ID for the datasource used for this advisory ."

0 commit comments

Comments
 (0)