Skip to content

prefetching locations when building dedupe candidate scope queryset #14483

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
valentijnscholten merged 4 commits into from
Mar 13, 2026
Merged

prefetching locations when building dedupe candidate scope queryset #14483

Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
0209310
when building dedupe candidate scope queryset, prefetch locations dif…
dogboat Mar 10, 2026
13d466d
add test for build_candidate_scope_queryset when locations are enabled
dogboat Mar 10, 2026
67af02a
Merge branch 'bugfix' into dedupe-location-prefetch-fix
mtesauro Mar 12, 2026
a511f7b
Update unittests/test_deduplication_logic.py
Maffooch Mar 12, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
36 changes: 20 additions & 16 deletions dojo/finding/deduplication.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -292,22 +292,26 @@ def build_candidate_scope_queryset(test, mode="deduplication", service=None):
)
queryset = Finding.objects.filter(scope_q)

# Base prefetches for both modes
prefetch_list = ["endpoints", "vulnerability_id_set", "found_by"]

# Additional prefetches for reimport mode: fetch only non-special endpoint statuses with their
# endpoint joined in, so endpoint_manager can read status_finding_non_special directly without
# any extra DB queries
if mode == "reimport":
prefetch_list.append(
Prefetch(
"status_finding",
queryset=Endpoint_Status.objects.exclude(
Q(false_positive=True) | Q(out_of_scope=True) | Q(risk_accepted=True),
).select_related("endpoint"),
to_attr="status_finding_non_special",
),
)
if settings.V3_FEATURE_LOCATIONS:
prefetch_list = ["locations__location__url", "vulnerability_id_set", "found_by"]
else:
# TODO: Delete this after the move to Locations
# Base prefetches for both modes
prefetch_list = ["endpoints", "vulnerability_id_set", "found_by"]

# Additional prefetches for reimport mode: fetch only non-special endpoint statuses with their
# endpoint joined in, so endpoint_manager can read status_finding_non_special directly without
# any extra DB queries
if mode == "reimport":
prefetch_list.append(
Prefetch(
"status_finding",
queryset=Endpoint_Status.objects.exclude(
Q(false_positive=True) | Q(out_of_scope=True) | Q(risk_accepted=True),
).select_related("endpoint"),
to_attr="status_finding_non_special",
),
)

return (
queryset
Expand Down