From ff1416ee178329da9d90a6b2e36da37c9473ce8b Mon Sep 17 00:00:00 2001
From: Aditya kumar singh <143548997+Adityakk9031@users.noreply.github.com>
Date: Thu, 25 Dec 2025 23:41:14 +0530
Subject: [PATCH 1/2] Fix incorrect exception handling in insert_advisory_v2

Signed-off-by: Aditya kumar singh <143548997+Adityakk9031@users.noreply.github.com>
---
 vulnerabilities/pipes/advisory.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/vulnerabilities/pipes/advisory.py b/vulnerabilities/pipes/advisory.py
index b5405ecbf..1b304b10a 100644
--- a/vulnerabilities/pipes/advisory.py
+++ b/vulnerabilities/pipes/advisory.py
@@ -331,7 +331,7 @@ def insert_advisory_v2(
             if values:
                 getattr(advisory_obj, field_name).add(*values)
 
-    except Advisory.MultipleObjectsReturned:
+    except AdvisoryV2.MultipleObjectsReturned:
         logger.error(
             f"Multiple Advisories returned: unique_content_id: {content_id}, url: {advisory.url}, advisory: {advisory!r}"
         )

From 97b2b3977169923bf6794e57d4125da59ffd3769 Mon Sep 17 00:00:00 2001
From: Aditya kumar singh <143548997+Adityakk9031@users.noreply.github.com>
Date: Tue, 6 Jan 2026 21:24:50 +0530
Subject: [PATCH 2/2] Update test_advisory.py

Signed-off-by: Aditya kumar singh <143548997+Adityakk9031@users.noreply.github.com>
---
 vulnerabilities/tests/pipes/test_advisory.py | 88 ++++++++++++++++++++
 1 file changed, 88 insertions(+)

diff --git a/vulnerabilities/tests/pipes/test_advisory.py b/vulnerabilities/tests/pipes/test_advisory.py
index 8710b2ea4..23accca11 100644
--- a/vulnerabilities/tests/pipes/test_advisory.py
+++ b/vulnerabilities/tests/pipes/test_advisory.py
@@ -257,3 +257,91 @@ def test_get_or_create_advisory_commit(advisory_commit):
         assert isinstance(commit, PackageCommitPatch)
         assert commit.commit_hash in [c.commit_hash for c in advisory_commit]
         assert commit.vcs_url in [c.vcs_url for c in advisory_commit]
+
+
+@pytest.mark.django_db
+def test_insert_advisory_v2_handles_multiple_objects_returned():
+    """
+    Test that insert_advisory_v2 correctly handles AdvisoryV2.MultipleObjectsReturned
+    exception when duplicate advisory records exist.
+    
+    This test verifies the fix for issue #2081 where the exception handler was
+    incorrectly catching Advisory.MultipleObjectsReturned instead of
+    AdvisoryV2.MultipleObjectsReturned.
+    """
+    from unittest.mock import MagicMock
+    from django.db import connection
+    from vulnerabilities.models import AdvisoryV2
+    from vulnerabilities.pipes.advisory import insert_advisory_v2
+    from vulnerabilities.utils import compute_content_id
+
+    # Create advisory data
+    advisory_data = AdvisoryData(
+        summary="Test advisory for exception handling",
+        affected_packages=[
+            AffectedPackage(
+                package=PackageURL(type="pypi", name="test-package"),
+                affected_version_range=VersionRange.from_string("vers:pypi/>=1.0.0|<=2.0.0"),
+            )
+        ],
+        references=[Reference(url="https://example.com/advisory/test")],
+        date_published=timezone.now(),
+        url="https://test-advisory.example.com/duplicated",
+        advisory_id="TEST-2024-001",
+    )
+
+    content_id = compute_content_id(advisory_data=advisory_data)
+    
+    # Create the first advisory normally
+    advisory1 = AdvisoryV2.objects.create(
+        unique_content_id=content_id,
+        url=advisory_data.url,
+        datasource_id="test_pipeline",
+        advisory_id=advisory_data.advisory_id,
+        avid=f"test_pipeline/{advisory_data.advisory_id}",
+        summary=advisory_data.summary,
+        date_collected=timezone.now(),
+    )
+    
+    # Force create a duplicate by bypassing the unique constraint at the model level
+    # This simulates a database inconsistency that could trigger MultipleObjectsReturned
+    with connection.cursor() as cursor:
+        # Temporarily disable the unique constraint to create a duplicate
+        cursor.execute(
+            """
+            INSERT INTO vulnerabilities_advisoryv2 
+            (unique_content_id, url, datasource_id, advisory_id, avid, summary, date_collected, status)
+            VALUES (%s, %s, %s, %s, %s, %s, %s, %s)
+            """,
+            [
+                content_id,
+                advisory_data.url,
+                "test_pipeline",
+                advisory_data.advisory_id,
+                f"test_pipeline/{advisory_data.advisory_id}",
+                advisory_data.summary,
+                timezone.now(),
+                1,  # AdvisoryStatusType.PUBLISHED
+            ]
+        )
+    
+    # Verify we have duplicates
+    assert AdvisoryV2.objects.filter(unique_content_id=content_id, url=advisory_data.url).count() == 2
+    
+    # Create a mock logger to verify error logging
+    mock_logger = MagicMock()
+    
+    # Now calling insert_advisory_v2 should raise AdvisoryV2.MultipleObjectsReturned
+    with pytest.raises(AdvisoryV2.MultipleObjectsReturned):
+        insert_advisory_v2(
+            advisory=advisory_data,
+            pipeline_id="test_pipeline",
+            logger=mock_logger,
+        )
+    
+    # Verify that the error was logged
+    mock_logger.error.assert_called_once()
+    error_message = mock_logger.error.call_args[0][0]
+    assert "Multiple Advisories returned" in error_message
+    assert content_id in error_message
+    assert advisory_data.url in error_message