Skip to content

Filter STATUS_MOVED patches from draft CF pages #1

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

Draft
Copilot wants to merge 3 commits into
base: main
Choose a base branch
from
Draft

Filter STATUS_MOVED patches from draft CF pages #1

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
bf662f3
Initial plan
Copilot Dec 23, 2025
97d73c9
Filter STATUS_MOVED patches from draft CF pages
Copilot Dec 23, 2025
af53832
Refactor status summary query to reduce code duplication
Copilot Dec 23, 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
20 changes: 14 additions & 6 deletions pgcommitfest/commitfest/views.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -407,6 +407,9 @@ def patchlist(request, cf, personalized=False):
whereclauses.append("poc.status=ANY(%(openstatuses)s)")
else:
whereclauses.append("poc.commitfest_id=%(cid)s")
# Exclude "Moved to other CF" patches from draft commitfests
if cf.draft:
whereclauses.append("poc.status != %(status_moved)s")

if personalized:
# For now we can just order by these names in descending order, because
Expand Down Expand Up @@ -541,6 +544,7 @@ def patchlist(request, cf, personalized=False):
params = {
"openstatuses": PatchOnCommitFest.OPEN_STATUSES,
"cid": cf.id,
"status_moved": PatchOnCommitFest.STATUS_MOVED,
}
params.update(whereparams)

Expand Down Expand Up @@ -616,12 +620,16 @@ def commitfest(request, cfid):
return patch_list.redirect

# Generate patch status summary.
curs.execute(
"SELECT ps.status, ps.statusstring, count(*) FROM commitfest_patchoncommitfest poc INNER JOIN commitfest_patchstatus ps ON ps.status=poc.status WHERE commitfest_id=%(id)s GROUP BY ps.status ORDER BY ps.sortkey",
{
"id": cf.id,
},
)
status_query = "SELECT ps.status, ps.statusstring, count(*) FROM commitfest_patchoncommitfest poc INNER JOIN commitfest_patchstatus ps ON ps.status=poc.status WHERE commitfest_id=%(id)s"
status_params = {"id": cf.id}

if cf.draft:
# Exclude "Moved to other CF" status from draft commitfests
status_query += " AND poc.status != %(status_moved)s"
status_params["status_moved"] = PatchOnCommitFest.STATUS_MOVED

status_query += " GROUP BY ps.status ORDER BY ps.sortkey"
curs.execute(status_query, status_params)
statussummary = curs.fetchall()
statussummary.append([-1, "Total", sum((r[2] for r in statussummary))])

Expand Down