Skip to content

Commit 286482f

Browse files
committed
rename model to TriageRecord
Signed-off-by: tdruez <tdruez@aboutcode.org>
1 parent 52cdc58 commit 286482f

5 files changed

Lines changed: 31 additions & 12 deletions

File tree

vulnerabilities/triage/admin.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@
1313
from dje.admin import DataspacedAdmin
1414
from dje.admin import dejacode_site
1515
from vulnerabilities.triage.forms import TriageRulesetForm
16-
from vulnerabilities.triage.models import ProductPackageTriage
1716
from vulnerabilities.triage.models import TriageAction
17+
from vulnerabilities.triage.models import TriageRecord
1818
from vulnerabilities.triage.models import TriageRuleset
1919
from vulnerabilities.triage.rules import RULE_REGISTRY
2020

@@ -103,8 +103,8 @@ def get_fieldsets(self, request, obj=None):
103103
return base_fieldsets + rule_fieldsets
104104

105105

106-
@admin.register(ProductPackageTriage, site=dejacode_site)
107-
class ProductPackageTriageAdmin(DataspacedAdmin):
106+
@admin.register(TriageRecord, site=dejacode_site)
107+
class TriageRecordAdmin(DataspacedAdmin):
108108
short_description = (
109109
"A Package Triage record stores the recommended action for a specific package"
110110
" usage within a product, as determined by the evaluation engine."

vulnerabilities/triage/engine.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
# See https://aboutcode.org for more information about AboutCode FOSS projects.
77
#
88

9-
from vulnerabilities.triage.models import ProductPackageTriage
9+
from vulnerabilities.triage.models import TriageRecord
1010
from vulnerabilities.triage.rules import RULE_REGISTRY
1111

1212

@@ -39,11 +39,11 @@ def collect_matches(ruleset, product):
3939

4040
def sync_triage_records(ruleset, product, matched_rules_per_package_id):
4141
"""
42-
Create or update one ProductPackageTriage record per matching package, then
42+
Create or update one TriageRecord record per matching package, then
4343
delete records for packages that no longer match any rule in the ruleset.
4444
"""
4545
for product_package_id, matched_rules in matched_rules_per_package_id.items():
46-
ProductPackageTriage.objects.update_or_create(
46+
TriageRecord.objects.update_or_create(
4747
product_package_id=product_package_id,
4848
ruleset=ruleset,
4949
defaults={
@@ -53,7 +53,7 @@ def sync_triage_records(ruleset, product, matched_rules_per_package_id):
5353
},
5454
)
5555

56-
ProductPackageTriage.objects.filter(
56+
TriageRecord.objects.filter(
5757
ruleset=ruleset,
5858
product_package__product=product,
5959
).exclude(product_package_id__in=matched_rules_per_package_id.keys()).delete()

vulnerabilities/triage/management/commands/evaluate_triage.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212

1313
from dje.models import Dataspace
1414
from vulnerabilities.triage.engine import evaluate_ruleset
15-
from vulnerabilities.triage.models import ProductPackageTriage
15+
from vulnerabilities.triage.models import TriageRecord
1616
from vulnerabilities.triage.models import TriageRuleset
1717

1818
"""
@@ -56,7 +56,7 @@ def handle(self, *args, **options):
5656
for ruleset in rulesets:
5757
evaluate_ruleset(ruleset=ruleset, product=product)
5858

59-
total = ProductPackageTriage.objects.filter(dataspace=dataspace).count()
59+
total = TriageRecord.objects.filter(dataspace=dataspace).count()
6060
self.stdout.write(
6161
self.style.SUCCESS(
6262
f"Done: {total} package triage record(s) active in dataspace '{dataspace_name}'."
Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
# Generated by Django 6.0.6 on 2026-08-07 05:37
2+
3+
from django.db import migrations
4+
5+
6+
class Migration(migrations.Migration):
7+
8+
dependencies = [
9+
('dje', '0016_dataspaceconfiguration_policy_rules_config'),
10+
('product_portfolio', '0019_productaffectedbyvulnerability_detected_date'),
11+
('vulnerabilities_triage', '0005_productpackagetriage_delete_triagedecision'),
12+
]
13+
14+
operations = [
15+
migrations.RenameModel(
16+
old_name='ProductPackageTriage',
17+
new_name='TriageRecord',
18+
),
19+
]

vulnerabilities/triage/models.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ def __str__(self):
6565
return self.name
6666

6767

68-
class ProductPackageTriageQuerySet(ProductSecuredQuerySet):
68+
class TriageRecordQuerySet(ProductSecuredQuerySet):
6969
def product_secured(self, user=None, perms="view_product"):
7070
"""
7171
Filter by product object permission through the product_package relation.
@@ -93,7 +93,7 @@ def primary_actions(self):
9393
)
9494

9595

96-
class ProductPackageTriage(DataspacedModel):
96+
class TriageRecord(DataspacedModel):
9797
"""Stores the triage recommendation for a specific package usage within a product."""
9898

9999
product_package = models.ForeignKey(
@@ -125,7 +125,7 @@ class ProductPackageTriage(DataspacedModel):
125125
help_text=_("Date and time of the last evaluation."),
126126
)
127127

128-
objects = DataspacedManager.from_queryset(ProductPackageTriageQuerySet)()
128+
objects = DataspacedManager.from_queryset(TriageRecordQuerySet)()
129129

130130
class Meta:
131131
unique_together = [("product_package", "ruleset"), ("dataspace", "uuid")]

0 commit comments

Comments
 (0)