move signal in ad,in and view

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

Author: tdruez

product_portfolio/admin.py

@@ -72,6 +72,7 @@
 from product_portfolio.models import ProductRelationStatus
 from product_portfolio.models import ProductStatus
 from reporting.filters import ReportingQueryListFilter
+from vulnerabilities.triage.engine import reevaluate_product_rulesets
 from vulnerabilities.triage.models import ProductTriageRuleset
 
 
@@ -247,6 +248,7 @@ def save_model(self, request, obj, form, change):
                     relationship.uuid = uuid.uuid4()
                     relationship.product = obj
                     relationship.save()
+            reevaluate_product_rulesets(obj)
 
     def get_obj_perms_user_select_form(self, request):
         """

product_portfolio/views.py

@@ -150,6 +150,7 @@
 from vulnerabilities.models import Vulnerability
 from vulnerabilities.models import VulnerabilityAnalysis
 from vulnerabilities.models import get_risk_level
+from vulnerabilities.triage.engine import reevaluate_product_rulesets
 from vulnerabilities.triage.models import AnalysisPreset
 from vulnerabilities.triage.models import ProductTriageRuleset
 from vulnerabilities.triage.models import TriageAction
@@ -2249,20 +2250,19 @@ def manage_triage_rulesets_view(request, dataspace, name, version=""):
                 product=product, ruleset__enabled=True
             ).select_related("ruleset")
         }
-        for ruleset in available_rulesets:
-            ruleset_uuid = str(ruleset.uuid)
-            if ruleset_uuid in submitted_uuids and ruleset_uuid not in current_assignments:
-                # The evaluate_on_assign signal evaluates the ruleset against the product;
-                # wrapping in atomic() rolls the assignment back if that evaluation fails.
-                with transaction.atomic():
+        with transaction.atomic():
+            for ruleset in available_rulesets:
+                ruleset_uuid = str(ruleset.uuid)
+                if ruleset_uuid in submitted_uuids and ruleset_uuid not in current_assignments:
                     ProductTriageRuleset.objects.create(
                         product=product,
                         ruleset=ruleset,
                         dataspace=product.dataspace,
                     )
-        for ruleset_uuid, assignment in current_assignments.items():
-            if ruleset_uuid not in submitted_uuids:
-                assignment.delete()
+            for ruleset_uuid, assignment in current_assignments.items():
+                if ruleset_uuid not in submitted_uuids:
+                    assignment.delete()
+            reevaluate_product_rulesets(product)
         return JsonResponse({"success": True})
 
     assigned_ruleset_ids = set(product.product_triage_rulesets.values_list("ruleset_id", flat=True))

vulnerabilities/triage/signals.py

@@ -11,20 +11,10 @@
 from django.dispatch import receiver
 
 from vulnerabilities.triage.engine import delete_preset_analyses_for_product
-from vulnerabilities.triage.engine import evaluate_ruleset
 from vulnerabilities.triage.engine import reevaluate_product_rulesets
 from vulnerabilities.triage.models import TriageRecord
 
 
-@receiver(post_save, sender="vulnerabilities_triage.ProductTriageRuleset")
-def evaluate_on_assign(sender, instance, created, **kwargs):
-    """Evaluate the ruleset against the product as soon as it is assigned."""
-    if not created or not instance.ruleset.enabled:
-        return
-
-    evaluate_ruleset(ruleset=instance.ruleset, product=instance.product)
-
-
 @receiver(post_delete, sender="vulnerabilities_triage.ProductTriageRuleset")
 def delete_triage_records_on_unassign(sender, instance, **kwargs):
     """Delete triage records and associated preset analyses when a ruleset is de-assigned."""