Skip to content

fix(tests): query-set-extra #3635

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
merged 2 commits into from
Jun 4, 2025
Merged

fix(tests): query-set-extra #3635

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2be4f87
fix query-set-extra tests
tean-lai Jun 2, 2025
f938330
Merge branch 'develop' into tean/query-set-extra
LewisArdern Jun 2, 2025
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
86 changes: 63 additions & 23 deletions python/django/security/audit/query-set-extra.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,34 +14,74 @@
Entry.objects.get({}).filter().update().extra()

# ok:avoid-query-set-extra
findings = Finding.objects.filter(verified=True,
severity__in=('Critical', 'High', 'Medium', 'Low', 'Info')).prefetch_related(
'test__engagement__product',
'test__engagement__product__prod_type',
'test__engagement__risk_acceptance',
'risk_acceptance_set',
'reporter').extra(
findings = (
Finding.objects.filter(
verified=True, severity__in=("Critical", "High", "Medium", "Low", "Info")
)
.prefetch_related(
"test__engagement__product",
"test__engagement__product__prod_type",
"test__engagement__risk_acceptance",
"risk_acceptance_set",
"reporter",
)
.extra(
select={
'ra_count': 'SELECT COUNT(*) FROM dojo_risk_acceptance INNER JOIN '
'dojo_risk_acceptance_accepted_findings ON '
'( dojo_risk_acceptance.id = dojo_risk_acceptance_accepted_findings.risk_acceptance_id ) '
'WHERE dojo_risk_acceptance_accepted_findings.finding_id = dojo_finding.id',
"ra_count": "SELECT COUNT(*) FROM dojo_risk_acceptance INNER JOIN "
"dojo_risk_acceptance_accepted_findings ON "
"( dojo_risk_acceptance.id = dojo_risk_acceptance_accepted_findings.risk_acceptance_id ) "
"WHERE dojo_risk_acceptance_accepted_findings.finding_id = dojo_finding.id",
},
)
)

example = 1

example = input()
# ruleid:avoid-query-set-extra
active_findings = Finding.objects.filter(verified=True, active=True,
severity__in=('Critical', 'High', 'Medium', 'Low', 'Info')).prefetch_related(
'test__engagement__product',
'test__engagement__product__prod_type',
'test__engagement__risk_acceptance',
'risk_acceptance_set',
'reporter').extra(
active_findings = (
Finding.objects.filter(
verified=True,
active=True,
severity__in=("Critical", "High", "Medium", "Low", "Info"),
)
.prefetch_related(
"test__engagement__product",
"test__engagement__product__prod_type",
"test__engagement__risk_acceptance",
"risk_acceptance_set",
"reporter",
)
.extra(
select={
"ra_count": f"SELECT COUNT(*) FROM dojo_risk_acceptance INNER JOIN "
f"dojo_risk_acceptance_accepted_findings ON "
f"( dojo_risk_acceptance.id = dojo_risk_acceptance_accepted_findings.risk_acceptance_id ) "
f"WHERE dojo_risk_acceptance_accepted_findings.finding_id = {example}",
},
)
)

example = 1
# ok:avoid-query-set-extra
active_findings = (
Finding.objects.filter(
verified=True,
active=True,
severity__in=("Critical", "High", "Medium", "Low", "Info"),
)
.prefetch_related(
"test__engagement__product",
"test__engagement__product__prod_type",
"test__engagement__risk_acceptance",
"risk_acceptance_set",
"reporter",
)
.extra(
select={
'ra_count': f'SELECT COUNT(*) FROM dojo_risk_acceptance INNER JOIN '
f'dojo_risk_acceptance_accepted_findings ON '
f'( dojo_risk_acceptance.id = dojo_risk_acceptance_accepted_findings.risk_acceptance_id ) '
f'WHERE dojo_risk_acceptance_accepted_findings.finding_id = {example}',
"ra_count": f"SELECT COUNT(*) FROM dojo_risk_acceptance INNER JOIN "
f"dojo_risk_acceptance_accepted_findings ON "
f"( dojo_risk_acceptance.id = dojo_risk_acceptance_accepted_findings.risk_acceptance_id ) "
f"WHERE dojo_risk_acceptance_accepted_findings.finding_id = {example}",
},
)
)
Loading