Fix merge conflict and add migration file

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

Author: ziadhany

vulnerabilities/migrations/0106_detectionrule.py

@@ -0,0 +1,68 @@
+# Generated by Django 4.2.25 on 2025-12-16 12:27
+
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+ dependencies = [
+ ("vulnerabilities", "0105_packagecommitpatch_patch_and_more"),
+ ]
+
+ operations = [
+ migrations.CreateModel(
+ name="DetectionRule",
+ fields=[
+ (
+ "id",
+ models.AutoField(
+ auto_created=True, primary_key=True, serialize=False, verbose_name="ID"
+ ),
+ ),
+ (
+ "rule_type",
+ models.CharField(
+ choices=[
+ ("yara", "Yara"),
+ ("yara-x", "Yara-X"),
+ ("sigma", "Sigma"),
+ ("clamav", "ClamAV"),
+ ("suricata", "Suricata"),
+ ],
+ help_text="The type of the detection rule content (e.g., YARA, Sigma).",
+ max_length=50,
+ ),
+ ),
+ (
+ "source_url",
+ models.URLField(
+ help_text="URL to the original source or reference for this rule.",
+ max_length=1024,
+ ),
+ ),
+ (
+ "rule_metadata",
+ models.JSONField(
+ blank=True,
+ help_text="Additional structured data such as tags, or author information.",
+ null=True,
+ ),
+ ),
+ (
+ "rule_text",
+ models.TextField(help_text="The content of the detection signature."),
+ ),
+ (
+ "advisory",
+ models.ForeignKey(
+ blank=True,
+ null=True,
+ on_delete=django.db.models.deletion.SET_NULL,
+ related_name="detection_rules",
+ to="vulnerabilities.advisoryv2",
+ ),
+ ),
+ ],
+ ),
+ ]

vulnerabilities/tests/pipelines/v2_improvers/test_yara.py

@@ -11,6 +11,7 @@
 from unittest.mock import MagicMock
 
 import pytest
+
 from vulnerabilities.models import DetectionRule
 from vulnerabilities.pipelines.v2_improvers.yara_rules import YaraRulesImproverPipeline
 
@@ -24,10 +25,8 @@ def test_collect_and_store_rules_from_test_repo_dir():
  mock_vcs_response.dest_dir = str(TEST_REPO_DIR)
 
  improver = YaraRulesImproverPipeline()
- improver.vcs_responses = [
- (mock_vcs_response, "https://github.com/mock/repo")
- ]
+ improver.vcs_responses = [(mock_vcs_response, "https://github.com/mock/repo")]
  improver.collect_and_store_rules()
 
  assert DetectionRule.objects.exists()
- assert DetectionRule.objects.count() == 4
+ assert DetectionRule.objects.count() == 4