Skip to content

Commit f0e6703

Browse files
committed
make precedence unique
Signed-off-by: tdruez <tdruez@aboutcode.org>
1 parent cdbae75 commit f0e6703

1 file changed

Lines changed: 7 additions & 3 deletions

File tree

vulnerabilities/triage/models.py

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,11 @@ class TriageRuleset(DataspacedModel):
6060
)
6161

6262
class Meta:
63-
unique_together = (("dataspace", "name"), ("dataspace", "uuid"))
63+
unique_together = (
64+
("dataspace", "name"),
65+
("dataspace", "precedence"),
66+
("dataspace", "uuid"),
67+
)
6468
ordering = ("-precedence", "name")
6569

6670
def __str__(self):
@@ -91,7 +95,7 @@ def primary_actions(self):
9195
ruleset__enabled=True,
9296
ruleset__product_triage_rulesets__product=OuterRef("product"),
9397
)
94-
.order_by("-ruleset__precedence", "ruleset__name")
98+
.order_by("-ruleset__precedence")
9599
.values("ruleset_id")[:1]
96100
)
97101
return self.filter(
@@ -118,7 +122,7 @@ class ProductTriageRuleset(DataspacedModel):
118122

119123
class Meta:
120124
unique_together = [("product", "ruleset"), ("dataspace", "uuid")]
121-
ordering = ["-ruleset__precedence", "ruleset__name"]
125+
ordering = ["-ruleset__precedence"]
122126

123127
def __str__(self):
124128
return f"{self.product} / {self.ruleset}"

0 commit comments

Comments
 (0)