Skip to content

Commit 3e9d8c0

Browse files
committed
feat: store todo isssue details in JSONField
Signed-off-by: Keshav Priyadarshi <git@keshav.space>
1 parent 7c8b646 commit 3e9d8c0

3 files changed

Lines changed: 34 additions & 19 deletions

File tree

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
# Generated by Django 5.2.11 on 2026-05-27 08:41
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="advisorytodov2",
15+
name="issue_detail",
16+
field=models.JSONField(
17+
blank=True, default=dict, help_text="Additional details about the issue."
18+
),
19+
),
20+
]

‎vulnerabilities/models.py‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2572,8 +2572,9 @@ class AdvisoryToDoV2(models.Model):
25722572
help_text="Select the issue that needs to be addressed from the available options.",
25732573
)
25742574

2575-
issue_detail = models.TextField(
2575+
issue_detail = models.JSONField(
25762576
blank=True,
2577+
default=dict,
25772578
help_text="Additional details about the issue.",
25782579
)
25792580

@@ -3168,6 +3169,8 @@ class AdvisoryV2(models.Model):
31683169
choices=AdvisoryStatusType.choices, default=AdvisoryStatusType.PUBLISHED
31693170
)
31703171

3172+
# Note: Fields and relations below are not part of original upstream advisory.
3173+
31713174
exploitability = models.DecimalField(
31723175
null=True,
31733176
blank=True,

‎vulnerabilities/tests/pipelines/v2_improvers/test_compute_advisory_todo_v2.py‎

Lines changed: 10 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -254,8 +254,8 @@ def test_advisory_todo_conflicting_fixed_affected(self):
254254
self.assertEqual(1, AdvisoryToDoV2.objects.count())
255255
self.assertEqual("CONFLICTING_AFFECTED_AND_FIXED_BY_PACKAGES", todo.issue_type)
256256
self.assertIn(
257-
'"conflict_checksum": "87d9e2627a8461fc5c068335d822af4aa0a40a8f265a92895c51d275d97ab0d6",',
258-
todo.issue_detail,
257+
"87d9e2627a8461fc5c068335d822af4aa0a40a8f265a92895c51d275d97ab0d6",
258+
todo.issue_detail["conflict_checksum"],
259259
)
260260
self.assertEqual(2, todo.advisories.count())
261261
self.assertEqual(todo, adv.advisory_todos.first())
@@ -287,7 +287,7 @@ def test_todo_conflict_details_partial_curation(self):
287287
expected_partial_curation_advisory = {
288288
"advisory_id": "PLACEHOLDER_PARTIAL_CURATION_AVID",
289289
"aliases": ["CVE-000-000"],
290-
"summary": "('test5/test_id_5', 'test6/test_id_6'): Test summary",
290+
"summary": "[test5/test_id_5, test6/test_id_6]: Test summary",
291291
"affected_packages": [
292292
{
293293
"package": {
@@ -377,12 +377,10 @@ def test_todo_conflict_details_partial_curation(self):
377377
pipeline.execute()
378378

379379
todo = AdvisoryToDoV2.objects.first()
380-
issue_details = json.loads(todo.issue_detail)
380+
issue_details = todo.issue_detail
381381
result_partial_curation = issue_details["partial_curation_advisory"]
382382
self.assertEqual(1, AdvisoryToDoV2.objects.count())
383383
self.assertEqual("CONFLICTING_FIXED_BY_PACKAGES", todo.issue_type)
384-
print(result_partial_curation)
385-
# breakpoint()
386384
self.assertDictEqual(expected_partial_curation_advisory, result_partial_curation)
387385

388386
def test_todo_conflict_details_partial_curation_unpaired_purl_and_conflicting_affected_and_fixed(
@@ -391,7 +389,7 @@ def test_todo_conflict_details_partial_curation_unpaired_purl_and_conflicting_af
391389
expected_partial_curation_advisory = {
392390
"advisory_id": "PLACEHOLDER_PARTIAL_CURATION_AVID",
393391
"aliases": ["CVE-000-000"],
394-
"summary": "('test1/test_id', 'test5/test_id_5'): Test summary",
392+
"summary": "[test1/test_id, test5/test_id_5]: Test summary",
395393
"affected_packages": [
396394
{
397395
"package": {
@@ -439,19 +437,17 @@ def test_todo_conflict_details_partial_curation_unpaired_purl_and_conflicting_af
439437
pipeline.execute()
440438

441439
todo = AdvisoryToDoV2.objects.first()
442-
issue_details = json.loads(todo.issue_detail)
440+
issue_details = todo.issue_detail
443441
result_partial_curation = issue_details["partial_curation_advisory"]
444442
self.assertEqual(1, AdvisoryToDoV2.objects.count())
445443
self.assertEqual("CONFLICTING_AFFECTED_AND_FIXED_BY_PACKAGES", todo.issue_type)
446-
print(result_partial_curation)
447-
# breakpoint()
448444
self.assertDictEqual(expected_partial_curation_advisory, result_partial_curation)
449445

450446
def test_todo_conflict_details_partial_curation_unpaired_purl_and_conflicting_fixed(self):
451447
expected_partial_curation_advisory = {
452448
"advisory_id": "PLACEHOLDER_PARTIAL_CURATION_AVID",
453449
"aliases": ["CVE-000-000"],
454-
"summary": "('test1/test_id', 'test7/test_id_5'): Test summary",
450+
"summary": "[test1/test_id, test7/test_id_5]: Test summary",
455451
"affected_packages": [
456452
{
457453
"package": {
@@ -513,19 +509,17 @@ def test_todo_conflict_details_partial_curation_unpaired_purl_and_conflicting_fi
513509
pipeline.execute()
514510

515511
todo = AdvisoryToDoV2.objects.first()
516-
issue_details = json.loads(todo.issue_detail)
512+
issue_details = todo.issue_detail
517513
result_partial_curation = issue_details["partial_curation_advisory"]
518514
self.assertEqual(1, AdvisoryToDoV2.objects.count())
519515
self.assertEqual("CONFLICTING_FIXED_BY_PACKAGES", todo.issue_type)
520-
print(result_partial_curation)
521-
# breakpoint()
522516
self.assertDictEqual(expected_partial_curation_advisory, result_partial_curation)
523517

524518
def test_todo_conflict_details_partial_curation_unpaired_purl_and_conflicting_affected(self):
525519
expected_partial_curation_advisory = {
526520
"advisory_id": "PLACEHOLDER_PARTIAL_CURATION_AVID",
527521
"aliases": ["CVE-000-000"],
528-
"summary": "('test1/test_id', 'test8/test_id_5'): Test summary",
522+
"summary": "[test1/test_id, test8/test_id_5]: Test summary",
529523
"affected_packages": [
530524
{
531525
"package": {
@@ -587,10 +581,8 @@ def test_todo_conflict_details_partial_curation_unpaired_purl_and_conflicting_af
587581
pipeline.execute()
588582

589583
todo = AdvisoryToDoV2.objects.first()
590-
issue_details = json.loads(todo.issue_detail)
584+
issue_details = todo.issue_detail
591585
result_partial_curation = issue_details["partial_curation_advisory"]
592586
self.assertEqual(1, AdvisoryToDoV2.objects.count())
593587
self.assertEqual("CONFLICTING_AFFECTED_PACKAGES", todo.issue_type)
594-
print(result_partial_curation)
595-
# breakpoint()
596588
self.assertDictEqual(expected_partial_curation_advisory, result_partial_curation)

0 commit comments

Comments
 (0)