Simplify query

Author: JelteF

pgcommitfest/commitfest/views.py

@@ -620,22 +620,12 @@ def commitfest(request, cfid):
         return patch_list.redirect
 
     # Generate patch status summary.
-    if cf.draft:
-        # Exclude "Moved to other CF" status from draft commitfests
-        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 AND poc.status != %(status_moved)s GROUP BY ps.status ORDER BY ps.sortkey",
-            {
-                "id": cf.id,
-                "status_moved": PatchOnCommitFest.STATUS_MOVED,
-            },
-        )
-    else:
-        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,
-            },
-        )
+    # Exclude "Moved to other CF" status from draft commitfests
+    status_filter = "AND poc.status != %(status_moved)s" if cf.draft else ""
+    curs.execute(
+        f"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_filter} GROUP BY ps.status ORDER BY ps.sortkey",
+        {"id": cf.id, "status_moved": PatchOnCommitFest.STATUS_MOVED},
+    )
     statussummary = curs.fetchall()
     statussummary.append([-1, "Total", sum((r[2] for r in statussummary))])