decouple notification from the rules

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

Author: tdruez

policy/admin.py

@@ -167,7 +167,7 @@ def download_license_dump_view(self, request):
 @admin.register(PolicyRule, site=dejacode_site)
 class PolicyRuleAdmin(DataspacedAdmin):
     form = PolicyRuleForm
-    list_display = ("name", "rule_type", "threshold", "is_active", "event_name", "get_dataspace")
+    list_display = ("name", "rule_type", "threshold", "is_active", "get_dataspace")
     list_filter = DataspacedAdmin.list_filter + ("rule_type", "is_active")
     readonly_fields = DataspacedAdmin.readonly_fields + ("parameters_schema_hint",)
     activity_log = False
@@ -183,11 +183,9 @@ class PolicyRuleAdmin(DataspacedAdmin):
     long_description = linebreaksbr(
         "A Policy Rule defines a type of automated check to run against your products. "
         "When the number of detected issues exceeds the configured threshold, a "
-        "ProductPolicyViolation is recorded and an optional notification event is fired.\n"
-        "Set the rule type to match a registered evaluation handler, configure the "
-        "threshold (0 means any violation triggers the rule), and select a notification "
-        "event to dispatch alerts across all registered channels when violations are "
-        "detected or resolved."
+        "ProductPolicyViolation is recorded.\n"
+        "Set the rule type to match a registered evaluation handler and configure the "
+        "threshold (0 means any violation triggers the rule). "
     )
 
     def parameters_schema_hint(self, obj):

policy/engine.py

@@ -8,7 +8,6 @@
 
 from django.utils import timezone
 
-from policy.events import fire_event
 from policy.models import PolicyRule
 from policy.rules import RULE_REGISTRY
 from product_portfolio.models import ProductPolicyViolation
@@ -17,13 +16,12 @@
 def evaluate_rule(policy_rule, product):
     """
     Evaluate a single PolicyRule against a product, create or update the
-    ProductPolicyViolation record, and fire the notification event on new violations
-    or resolutions.
+    ProductPolicyViolation record.
     Returns the ProductPolicyViolation instance, or None if no violation exists.
     """
     rule_handler = RULE_REGISTRY.get(policy_rule.rule_type)
     if not rule_handler:
-        return None
+        return
 
     violation_count = rule_handler.count_violations(policy_rule, product)
 
@@ -37,17 +35,13 @@ def evaluate_rule(policy_rule, product):
         if not created:
             violation.violation_count = violation_count
             violation.save()
-        if created and policy_rule.event_name:
-            fire_violation_event(policy_rule, product, violation_count)
         return violation
     else:
-        resolved_count = ProductPolicyViolation.objects.filter(**lookup).update(
+        ProductPolicyViolation.objects.filter(**lookup).update(
             resolved=True,
             resolved_date=timezone.now(),
         )
-        if resolved_count and policy_rule.event_name:
-            fire_resolution_event(policy_rule, product)
-        return None
+        return
 
 
 def evaluate_rules(product):
@@ -62,28 +56,3 @@ def evaluate_rules(product):
             violations.append(violation)
 
     return violations
-
-
-def fire_violation_event(policy_rule, product, violation_count):
-    fire_event(
-        policy_rule.event_name,
-        dataspace=policy_rule.dataspace,
-        payload={
-            "rule": policy_rule.name,
-            "rule_type": policy_rule.rule_type,
-            "violation_count": violation_count,
-            "product": str(product),
-        },
-    )
-
-
-def fire_resolution_event(policy_rule, product):
-    fire_event(
-        policy_rule.event_name,
-        dataspace=policy_rule.dataspace,
-        payload={
-            "rule": policy_rule.name,
-            "status": "resolved",
-            "product": str(product),
-        },
-    )

policy/events.py

@@ -8,11 +8,9 @@
 
 from django import forms
 from django.contrib.contenttypes.models import ContentType
-from django.db.models import BLANK_CHOICE_DASH
 
 from dje.forms import ColorCodeFormMixin
 from dje.forms import DataspacedAdminForm
-from policy.events import POLICY_EVENTS
 from policy.models import PolicyRule
 from policy.rules import RULE_REGISTRY
 
@@ -108,18 +106,9 @@ def __init__(self, *args, **kwargs):
         self.fields["rule_type"].widget = forms.Select(
             choices=[(key, handler.label) for key, handler in RULE_REGISTRY.items()]
         )
-        self.fields["event_name"].widget = forms.Select(
-            choices=BLANK_CHOICE_DASH + list(POLICY_EVENTS.items())
-        )
 
     def clean_rule_type(self):
         value = self.cleaned_data["rule_type"]
         if value not in RULE_REGISTRY:
             raise forms.ValidationError(f"Unknown rule type: {value}")
         return value
-
-    def clean_event_name(self):
-        value = self.cleaned_data.get("event_name")
-        if value and value not in POLICY_EVENTS:
-            raise forms.ValidationError(f"Unknown event: {value}")
-        return value

policy/forms.py

@@ -1,4 +1,4 @@
-# Generated by Django 6.0.6 on 2026-07-07 04:49
+# Generated by Django 6.0.6 on 2026-07-08 08:39
 
 import django.db.models.deletion
 import dje.models
@@ -23,7 +23,6 @@ class Migration(migrations.Migration):
                 ('rule_type', models.CharField(help_text='The type of evaluation performed by this rule.', max_length=50)),
                 ('threshold', models.PositiveIntegerField(default=0, help_text='Minimum number of violations required to trigger this rule (0 means any).')),
                 ('is_active', models.BooleanField(default=True, help_text='Only active rules are evaluated.')),
-                ('event_name', models.CharField(blank=True, help_text='Notification event to fire when violations are detected.', max_length=100)),
                 ('parameters', models.JSONField(blank=True, default=dict, help_text='Optional rule-specific parameters as a JSON object. Supported keys depend on the chosen rule type.')),
                 ('dataspace', models.ForeignKey(editable=False, help_text='A Dataspace is an independent, exclusive set of DejaCode data, which can be either nexB master reference data or installation-specific data.', on_delete=django.db.models.deletion.PROTECT, to='dje.dataspace')),
             ],

policy/migrations/0003_policyrule.py

@@ -268,11 +268,6 @@ class PolicyRule(DataspacedModel):
         default=True,
         help_text=_("Only active rules are evaluated."),
     )
-    event_name = models.CharField(
-        max_length=100,
-        blank=True,
-        help_text=_("Notification event to fire when violations are detected."),
-    )
     parameters = models.JSONField(
         blank=True,
         default=dict,

policy/models.py

@@ -1,4 +1,4 @@
-# Generated by Django 6.0.6 on 2026-07-07 04:49
+# Generated by Django 6.0.6 on 2026-07-08 08:39
 
 import django.db.models.deletion
 import dje.models