refinements

Signed-off-by: tdruez <tdruez@aboutcode.org>

Author: tdruez

product_portfolio/views.py

@@ -1344,7 +1344,7 @@ def attach_triage_data(self, product, page_obj):
                 product=product,
                 vulnerability_id__in=vulnerability_ids,
             )
-            .primary_actions()
+            .highest_precedence()
             .select_related("ruleset", "request")
         )
         for record in triage_records:

vulnerabilities/triage/admin.py

@@ -126,9 +126,7 @@ def get_enabled_rules(self, obj):
     def get_changes_details(self, form):
         model_field_names = {field.name for field in TriageRuleset._meta.get_fields()}
         form.__dict__["changed_data"] = [
-            field_name
-            for field_name in form.changed_data
-            if field_name in model_field_names
+            field_name for field_name in form.changed_data if field_name in model_field_names
         ]
         return super().get_changes_details(form)
 

vulnerabilities/triage/models.py

@@ -6,7 +6,6 @@
 # See https://aboutcode.org for more information about AboutCode FOSS projects.
 #
 
-from django.apps import apps
 from django.db import models
 from django.db.models import OuterRef
 from django.db.models import Subquery
@@ -57,14 +56,9 @@ def __str__(self):
 
     def apply_to_analysis(self, analysis):
         """Copy non-blank preset fields onto the analysis instance (does not save)."""
-        if self.state:
-            analysis.state = self.state
-        if self.justification:
-            analysis.justification = self.justification
-        if self.responses:
-            analysis.responses = self.responses
-        if self.detail:
-            analysis.detail = self.detail
+        for field_name in ("state", "justification", "responses", "detail"):
+            if value := getattr(self, field_name):
+                setattr(analysis, field_name, value)
         if self.is_reachable is not None:
             analysis.is_reachable = self.is_reachable
 
@@ -84,7 +78,6 @@ class TriageRuleset(DataspacedModel):
         help_text=_("Action recommended when this ruleset's conditions are met."),
     )
     precedence = models.PositiveIntegerField(
-        default=100,
         help_text=_(
             "When multiple rulesets are assigned to a product and produce different"
             " actions, the one with the highest precedence takes effect."
@@ -139,15 +132,7 @@ def __str__(self):
 
 
 class TriageRecordQuerySet(ProductSecuredQuerySet):
-    def product_secured(self, user=None, perms="view_product"):
-        """Filter by product object permission through the direct product FK."""
-        if not user:
-            return self.none()
-        Product = apps.get_model("product_portfolio", "Product")
-        product_qs = Product.objects.get_queryset(user, perms)
-        return self.filter(product__in=product_qs)
-
-    def primary_actions(self):
+    def highest_precedence(self):
         """
         Return one record per (vulnerability, product): the highest-precedence active ruleset
         that is explicitly assigned to the product via ProductTriageRuleset.