Fix tests

Signed-off-by: Tushar Goel <tushar.goel.dav@gmail.com>

Author: TG1999

vulnerabilities/improvers/__init__.py

@@ -27,6 +27,9 @@
     enhance_with_metasploit as enhance_with_metasploit_v2,
 )
 from vulnerabilities.pipelines.v2_improvers import flag_ghost_packages as flag_ghost_packages_v2
+from vulnerabilities.pipelines.v2_improvers import (
+    group_advisories_for_packages as group_advisories_for_packages_v2,
+)
 from vulnerabilities.pipelines.v2_improvers import mark_unfurl_version_range
 from vulnerabilities.pipelines.v2_improvers import reference_collect_commits
 from vulnerabilities.pipelines.v2_improvers import relate_severities
@@ -71,5 +74,6 @@
         compute_package_risk.ComputePackageRiskPipeline,
         compute_package_version_rank.ComputeVersionRankPipeline,
         populate_vulnerability_summary_pipeline.PopulateVulnerabilitySummariesPipeline,
+        group_advisories_for_packages_v2.GroupAdvisoriesForPackages,
     ]
 )

vulnerabilities/models.py

@@ -3624,7 +3624,7 @@ def with_is_vulnerable(self):
                 ImpactedPackage.objects.filter(
                     affecting_packages__pk=OuterRef("pk"),
                     advisory__is_latest=True,
-                    advisory___all_impacts_unfurled=True,
+                    advisory___all_impacts_unfurled_at__isnull=False,
                 )
             )
         )

vulnerabilities/pipelines/v2_improvers/mark_unfurl_version_range.py

@@ -9,13 +9,13 @@
 
 from collections import defaultdict
 from datetime import timedelta
-from django.utils import timezone
 
 from django.db import transaction
 from django.db.models import Exists
 from django.db.models import Min
 from django.db.models import OuterRef
 from django.db.models import Q
+from django.utils import timezone
 
 from vulnerabilities.models import AdvisoryV2
 from vulnerabilities.models import ImpactedPackage

vulnerabilities/pipes/export.py

@@ -26,7 +26,7 @@ def package_prefetched_qs(checkpoint):
             Prefetch(
                 "affected_in_impacts",
                 queryset=ImpactedPackage.objects.filter(
-                    advisory__is_latest=True, advisory___all_impacts_unfurled=True
+                    advisory__is_latest=True, advisory___all_impacts_unfurled_at__isnull=False
                 )
                 .only("advisory_id")
                 .prefetch_related(
@@ -39,7 +39,7 @@ def package_prefetched_qs(checkpoint):
             Prefetch(
                 "fixed_in_impacts",
                 queryset=ImpactedPackage.objects.filter(
-                    advisory__is_latest=True, advisory___all_impacts_unfurled=True
+                    advisory__is_latest=True, advisory___all_impacts_unfurled_at__isnull=False
                 )
                 .only("advisory_id")
                 .prefetch_related(

vulnerabilities/tests/pipelines/exporters/test_federate_vulnerabilities.py

@@ -11,11 +11,11 @@
 import tempfile
 from datetime import datetime
 from datetime import timedelta
-from datetime import timezone
 from pathlib import Path
 from unittest.mock import patch
 
 from django.test import TestCase
+from django.utils import timezone
 from git import Repo
 from packageurl import PackageURL
 from univers.version_range import VersionRange

vulnerabilities/tests/pipelines/v2_improvers/test_compute_advisory_todo_v2.py

@@ -7,12 +7,11 @@
 # See https://aboutcode.org for more information about nexB OSS projects.
 #
 
-import json
 from collections.abc import Mapping
 from datetime import datetime
-from datetime import timezone
 
 from django.test import TestCase
+from django.utils import timezone
 from packageurl import PackageURL
 from univers.version_range import VersionRange
 

vulnerabilities/tests/pipelines/v2_improvers/test_compute_package_risk_v2.py

@@ -7,10 +7,10 @@
 # See https://aboutcode.org for more information about nexB OSS projects.
 #
 from datetime import datetime
-from datetime import timezone
 from decimal import Decimal
 
 import pytest
+from django.utils import timezone
 
 from vulnerabilities.models import AdvisorySeverity
 from vulnerabilities.models import AdvisoryV2

vulnerabilities/tests/pipelines/v2_improvers/test_mark_all_impacts_unfurled.py

@@ -51,7 +51,7 @@ def test_marks_only_fully_successful_advisories(
             date_collected="2025-07-01T00:00:00Z",
             precedence=1,
             is_latest=True,
-            _all_impacts_unfurled_successfully=False,
+            _all_impacts_unfurled_successfully_at=None,
         )
 
         ImpactedPackage.objects.create(
@@ -71,7 +71,7 @@ def test_marks_only_fully_successful_advisories(
             date_collected="2025-07-01T00:00:00Z",
             precedence=1,
             is_latest=True,
-            _all_impacts_unfurled_successfully=False,
+            _all_impacts_unfurled_successfully_at=None,
         )
 
         ImpactedPackage.objects.create(
@@ -112,7 +112,7 @@ def test_marks_only_fully_attempted_advisories(
             date_collected="2025-07-01T00:00:00Z",
             precedence=1,
             is_latest=True,
-            _all_impacts_unfurled_successfully=False,
+            _all_impacts_unfurled_successfully_at=None,
         )
 
         ImpactedPackage.objects.create(
@@ -138,7 +138,7 @@ def test_marks_only_fully_attempted_advisories(
             date_collected="2025-07-01T00:00:00Z",
             precedence=1,
             is_latest=True,
-            _all_impacts_unfurled_successfully=False,
+            _all_impacts_unfurled_successfully_at=None,
         )
 
         ImpactedPackage.objects.create(
@@ -171,7 +171,7 @@ def test_attempted_advisories_are_chunked_in_batches_of_100(
 
         advisories = []
 
-        for i in range(2500):
+        for i in range(250):
             adv = AdvisoryV2.objects.create(
                 datasource_id="ghsa",
                 advisory_id=str(i),
@@ -182,7 +182,7 @@ def test_attempted_advisories_are_chunked_in_batches_of_100(
                 date_collected="2025-07-01T00:00:00Z",
                 precedence=1,
                 is_latest=True,
-                _all_impacts_unfurled_successfully=False,
+                _all_impacts_unfurled_successfully_at=None,
             )
 
             advisories.append(adv)
@@ -205,9 +205,9 @@ def test_attempted_advisories_are_chunked_in_batches_of_100(
         second_call_ids = mock_complete_advisories_import.call_args_list[1][1]["advisory_ids"]
         third_call_ids = mock_complete_advisories_import.call_args_list[2][1]["advisory_ids"]
 
-        assert len(first_call_ids) == 1000
-        assert len(second_call_ids) == 1000
-        assert len(third_call_ids) == 500
+        assert len(first_call_ids) == 100
+        assert len(second_call_ids) == 100
+        assert len(third_call_ids) == 50
 
 
 @pytest.mark.django_db
@@ -228,7 +228,7 @@ def test_returns_only_advisories_with_all_successful_impacts(self):
             date_collected="2025-07-01T00:00:00Z",
             precedence=1,
             is_latest=True,
-            _all_impacts_unfurled_successfully=False,
+            _all_impacts_unfurled_successfully_at=None,
         )
 
         ImpactedPackage.objects.create(
@@ -252,7 +252,7 @@ def test_returns_only_advisories_with_all_successful_impacts(self):
             date_collected="2025-07-01T00:00:00Z",
             precedence=1,
             is_latest=True,
-            _all_impacts_unfurled_successfully=False,
+            _all_impacts_unfurled_successfully_at=None,
         )
 
         ImpactedPackage.objects.create(
@@ -284,7 +284,7 @@ def test_returns_only_advisories_with_all_successful_impacts(self):
             date_collected="2025-07-01T00:00:00Z",
             precedence=1,
             is_latest=True,
-            _all_impacts_unfurled_successfully=False,
+            _all_impacts_unfurled_successfully_at=None,
         )
 
         ImpactedPackage.objects.create(
@@ -308,7 +308,7 @@ def test_returns_only_advisories_with_all_successful_impacts(self):
             date_collected="2025-07-01T00:00:00Z",
             precedence=1,
             is_latest=True,
-            _all_impacts_unfurled_successfully=False,
+            _all_impacts_unfurled_successfully_at=None,
         )
 
         ImpactedPackage.objects.create(
@@ -354,7 +354,7 @@ def test_returns_only_advisories_with_all_impacts_attempted(self):
             date_collected="2025-07-01T00:00:00Z",
             precedence=1,
             is_latest=True,
-            _all_impacts_unfurled_successfully=False,
+            _all_impacts_unfurled_successfully_at=None,
         )
 
         ImpactedPackage.objects.create(
@@ -383,7 +383,7 @@ def test_returns_only_advisories_with_all_impacts_attempted(self):
             date_collected="2025-07-01T00:00:00Z",
             precedence=1,
             is_latest=True,
-            _all_impacts_unfurled_successfully=False,
+            _all_impacts_unfurled_successfully_at=None,
         )
 
         ImpactedPackage.objects.create(
@@ -411,7 +411,7 @@ def test_returns_only_advisories_with_all_impacts_attempted(self):
             date_collected="2025-07-01T00:00:00Z",
             precedence=1,
             is_latest=True,
-            _all_impacts_unfurled_successfully=False,
+            _all_impacts_unfurled_successfully_at=None,
         )
 
         ImpactedPackage.objects.create(
@@ -439,7 +439,7 @@ def test_returns_only_advisories_with_all_impacts_attempted(self):
             date_collected="2025-07-01T00:00:00Z",
             precedence=1,
             is_latest=True,
-            _all_impacts_unfurled_successfully=False,
+            _all_impacts_unfurled_successfully_at=None,
         )
 
         ImpactedPackage.objects.create(

vulnerabilities/tests/test_api_v3.py

@@ -7,9 +7,8 @@
 # See https://aboutcode.org for more information about nexB OSS projects.
 #
 
-from datetime import timezone
-
 from django.urls import reverse
+from django.utils import timezone
 from packageurl import PackageURL
 from rest_framework import status
 from rest_framework.test import APIClient
@@ -70,7 +69,7 @@ def test_packages_post_without_details(self):
     def test_packages_post_with_details(self):
         url = reverse("package-v3-list")
 
-        with self.assertNumQueries(12):
+        with self.assertNumQueries(13):
             response = self.client.post(
                 url,
                 data={