|
10 | 10 | from collections import defaultdict |
11 | 11 | from urllib.parse import urlencode |
12 | 12 |
|
13 | | -from django.contrib.postgres.aggregates import JSONBAgg |
| 13 | +from django.contrib.postgres.aggregates import ArrayAgg, JSONBAgg |
14 | 14 | from django.db.models import Exists |
15 | 15 | from django.db.models import F |
16 | 16 | from django.db.models import Max |
@@ -721,32 +721,26 @@ def get_impacts_bulk(packages): |
721 | 721 | impacted_package__advisory__is_latest=True, |
722 | 722 | impacted_package__advisory___all_impacts_unfurled=True, |
723 | 723 | ) |
724 | | - .select_related("impacted_package__advisory") |
725 | | - .prefetch_related( |
726 | | - Prefetch( |
727 | | - "impacted_package__fixed_by_packages", |
728 | | - queryset=PackageV2.objects.only("package_url"), |
729 | | - ) |
730 | | - ) |
731 | | - .only( |
| 724 | + .values( |
732 | 725 | "package_id", |
733 | | - "impacted_package_id", |
734 | | - "impacted_package__advisory_id", |
735 | 726 | "impacted_package__advisory__avid", |
736 | 727 | ) |
| 728 | + .annotate( |
| 729 | + fixed_by_packages=ArrayAgg( |
| 730 | + "impacted_package__fixed_by_packages__package_url", |
| 731 | + distinct=True, |
| 732 | + ) |
| 733 | + ) |
737 | 734 | ) |
738 | 735 |
|
739 | 736 | impact_map = defaultdict(dict) |
740 | | - fixed_cache = {} |
741 | 737 |
|
742 | 738 | for impact in impacts: |
743 | | - ip = impact.impacted_package |
744 | | - avid = ip.advisory.avid |
745 | | - |
746 | | - if ip.id not in fixed_cache: |
747 | | - fixed_cache[ip.id] = list({pkg.purl for pkg in ip.fixed_by_packages.all()}) |
748 | | - |
749 | | - impact_map[impact.package_id][avid] = fixed_cache[ip.id] |
| 739 | + impact_map[ |
| 740 | + impact["package_id"] |
| 741 | + ][ |
| 742 | + impact["impacted_package__advisory__avid"] |
| 743 | + ] = impact["fixed_by_packages"] or [] |
750 | 744 |
|
751 | 745 | return impact_map |
752 | 746 |
|
|
0 commit comments