Update detection_rules to use build_alias_to_advisory_map

Resolve merge conflict

Signed-off-by: ziad hany <ziadhany2016@gmail.com>

Author: ziadhany

vulnerabilities/improvers/__init__.py

@@ -16,10 +16,11 @@
 from vulnerabilities.pipelines import enhance_with_metasploit
 from vulnerabilities.pipelines import flag_ghost_packages
 from vulnerabilities.pipelines import populate_vulnerability_summary_pipeline
-from vulnerabilities.pipelines.v2_improvers import archive_urls, detection_rules
+from vulnerabilities.pipelines.v2_improvers import archive_urls
 from vulnerabilities.pipelines.v2_improvers import collect_ssvc_trees
 from vulnerabilities.pipelines.v2_improvers import compute_advisory_todo as compute_advisory_todo_v2
 from vulnerabilities.pipelines.v2_improvers import compute_package_risk as compute_package_risk_v2
+from vulnerabilities.pipelines.v2_improvers import detection_rules
 from vulnerabilities.pipelines.v2_improvers import enhance_with_exploitdb as exploitdb_v2
 from vulnerabilities.pipelines.v2_improvers import enhance_with_github_poc
 from vulnerabilities.pipelines.v2_improvers import enhance_with_kev as enhance_with_kev_v2

…ilities/migrations/0130_detectionrule.py …ilities/migrations/0138_detectionrule.pyvulnerabilities/migrations/0130_detectionrule.py renamed to vulnerabilities/migrations/0138_detectionrule.py vulnerabilities/migrations/0130_detectionrule.py renamed to vulnerabilities/migrations/0138_detectionrule.py

@@ -1,12 +1,12 @@
-# Generated by Django 5.2.11 on 2026-05-15 11:10
+# Generated by Django 5.2.11 on 2026-06-20 15:51
 
 from django.db import migrations, models
 
 
 class Migration(migrations.Migration):
 
     dependencies = [
-        ("vulnerabilities", "0129_advisorypoc"),
+        ("vulnerabilities", "0137_alter_pipelineschedule_run_interval"),
     ]
 
     operations = [

vulnerabilities/pipelines/v2_improvers/detection_rules.py

@@ -3,11 +3,10 @@
 
 from fetchcode.vcs import fetch_via_vcs
 
-from vulnerabilities.models import AdvisoryAlias
-from vulnerabilities.models import AdvisoryV2
 from vulnerabilities.models import DetectionRule
 from vulnerabilities.models import DetectionRuleTypes
 from vulnerabilities.pipelines import VulnerableCodePipeline
+from vulnerabilities.utils import build_alias_to_advisory_map
 
 
 class DetectionRulesPipeline(VulnerableCodePipeline):
@@ -56,7 +55,7 @@ def collect_detection_rules(self):
                 source_url = json_data.get("source_url")
                 for rule in json_data.get("rules", []):
                     vulns_id = rule.get("vulnerabilities", [])
-                    advisories = get_related_advisories(vulns_id)
+                    advisories = build_alias_to_advisory_map(vulns_id)
 
                     raw_text = rule.get("rule_text")
                     rule_metadata = rule.get("rule_metadata")
@@ -80,26 +79,3 @@ def clean_downloads(self):
     def on_failure(self):
         """Ensure cleanup is always performed on failure."""
         self.clean_downloads()
-
-
-def get_related_advisories(vulnerability_ids, logger=print):
-    """
-    Fetches related advisories for a list of vulnerability IDs.
-    """
-    advisories = set()
-
-    for vulnerability_id in vulnerability_ids:
-        try:
-            alias = AdvisoryAlias.objects.get(alias=vulnerability_id)
-            advs = alias.advisories.all()
-            advisories.update(advs)
-
-        except AdvisoryAlias.DoesNotExist:
-            advs = AdvisoryV2.objects.filter(advisory_id=vulnerability_id).latest_per_avid()
-
-            if advs:
-                advisories.update(advs)
-            else:
-                logger(f"No advisory found for ID/alias: {vulnerability_id}")
-
-    return advisories

vulnerabilities/tests/pipelines/v2_improvers/test_detection_rules.py

@@ -32,8 +32,9 @@ def test_detection_rules_improver(mock_fetch_via_vcs):
 
     adv1 = AdvisoryV2.objects.create(
         advisory_id="VCIO-123-2002",
-        datasource_id="ds",
-        avid="ds/VCIO-123-2002",
+        pipeline_id="detection_rules",
+        datasource_id="rules",
+        avid="rules/VCIO-123-2002",
         unique_content_id="i3giu",
         url="https://test.com",
         date_collected=datetime.now(),