Add EP amendment and part votes, hidden from general lists by default
They come from the same responses as final votes. A sitting has over a hundred, so they are flagged part_vote and only appear on request: the vote lists have an option for them, feeds, counts and search chunks leave them out. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
This commit is contained in:
1 parent
bf19e503f9
commit
b06f17e587
20 files changed
+176
-47
No files matched your search
@@ -6,7 +6,7 @@ from datetime import date
|
||||
|
||||
from psycopg import Connection
|
||||
|
||||
from politrack.queries.common import VISIBLE, SourceFilter
|
||||
from politrack.queries.common import NOT_PART_VOTE, VISIBLE, SourceFilter
|
||||
|
||||
|
||||
def list_claims(
|
||||
@@ -62,6 +62,7 @@ def list_claims(
|
||||
WHERE e.claim_id = c.id AND {source_sql}
|
||||
) ev
|
||||
WHERE ev.evidence IS NOT NULL AND {VISIBLE}
|
||||
AND (%(claim_id)s::bigint IS NOT NULL OR {NOT_PART_VOTE})
|
||||
AND (%(person)s::text IS NULL OR p.slug = %(person)s OR cpp.slug = %(person)s)
|
||||
AND (%(party)s::text IS NULL OR o.slug = %(party)s
|
||||
OR c.counterpart_org_id = (SELECT id FROM organization WHERE slug = %(party)s))
|
||||
@@ -97,7 +98,7 @@ def timeline_histogram(conn: Connection, *, sources: SourceFilter, person: str |
|
||||
LEFT JOIN organization o ON o.id = c.organization_id
|
||||
JOIN claim_evidence e ON e.claim_id = c.id JOIN document d ON d.id = e.document_id
|
||||
JOIN source s ON s.id = d.source_id
|
||||
WHERE {VISIBLE} AND {source_sql} AND COALESCE(c.occurred_at, c.valid_from::timestamptz) IS NOT NULL
|
||||
WHERE {VISIBLE} AND {NOT_PART_VOTE} AND {source_sql} AND COALESCE(c.occurred_at, c.valid_from::timestamptz) IS NOT NULL
|
||||
AND (%(person)s::text IS NULL OR p.slug = %(person)s OR cpp.slug = %(person)s)
|
||||
AND (%(party)s::text IS NULL OR o.slug = %(party)s)
|
||||
AND c.claim_type <> 'role'
|
||||
@@ -149,7 +150,7 @@ def calendar(conn: Connection, *, sources: SourceFilter, start: date, end: date,
|
||||
LEFT JOIN organization o ON o.id = c.organization_id
|
||||
JOIN claim_evidence e ON e.claim_id = c.id JOIN document d ON d.id = e.document_id
|
||||
JOIN source s ON s.id = d.source_id
|
||||
WHERE {VISIBLE} AND {source_sql} AND c.occurred_at::date BETWEEN %(start)s AND %(end)s
|
||||
WHERE {VISIBLE} AND {NOT_PART_VOTE} AND {source_sql} AND c.occurred_at::date BETWEEN %(start)s AND %(end)s
|
||||
AND (%(person)s::text IS NULL OR p.slug = %(person)s OR cpp.slug = %(person)s)
|
||||
AND (%(party)s::text IS NULL OR o.slug = %(party)s)
|
||||
GROUP BY 1, 2 ORDER BY 1
|
||||
|
||||
@@ -13,6 +13,8 @@ from typing import Any
|
||||
|
||||
VISIBLE = ("c.merged_into IS NULL AND (c.review_status = 'published' OR "
|
||||
"(%(include_pending)s AND c.review_status = 'pending'))")
|
||||
# Votes on amendments and parts of a text only appear where someone asks for them: they would bury everything else.
|
||||
NOT_PART_VOTE = "NOT COALESCE((c.data->>'part_vote')::boolean, FALSE)"
|
||||
|
||||
|
||||
@dataclass
|
||||
|
||||
@@ -72,7 +72,7 @@ def get_person(conn: Connection, slug: str) -> dict | None:
|
||||
r["claim_type"]: r["count"]
|
||||
for r in conn.execute(
|
||||
"SELECT claim_type, count(*) AS count FROM claim WHERE person_id = %s AND merged_into IS NULL "
|
||||
"AND review_status = 'published' GROUP BY claim_type",
|
||||
"AND review_status = 'published' AND NOT COALESCE((data->>'part_vote')::boolean, FALSE) GROUP BY claim_type",
|
||||
(person["id"],),
|
||||
)
|
||||
}
|
||||
|
||||
@@ -17,9 +17,9 @@ SPOKE = """
|
||||
"""
|
||||
|
||||
|
||||
def person_votes(conn: Connection, slug: str, *, topics: list[str] | None = None, limit: int = 100,
|
||||
offset: int = 0) -> list[dict]:
|
||||
"""Votes concerning a person.
|
||||
def person_votes(conn: Connection, slug: str, *, topics: list[str] | None = None, include_parts: bool = False,
|
||||
limit: int = 100, offset: int = 0) -> list[dict]:
|
||||
"""Votes concerning a person (include_parts: also votes on amendments and parts of a text).
|
||||
|
||||
* individual=true: roll-call votes with the person's own vote; dissent=true when it differs from the
|
||||
majority of their faction (vote_position.party_id = their faction that day).
|
||||
@@ -41,7 +41,8 @@ def person_votes(conn: Connection, slug: str, *, topics: list[str] | None = None
|
||||
JOIN organization ch ON ch.id = ve.chamber_id
|
||||
LEFT JOIN organization fo ON fo.id = vp.party_id
|
||||
LEFT JOIN vote_position fp ON fp.vote_event_id = ve.id AND fp.organization_id = vp.party_id
|
||||
WHERE (%(topics)s::text[] IS NULL OR EXISTS (
|
||||
WHERE (%(include_parts)s OR NOT ve.part_vote)
|
||||
AND (%(topics)s::text[] IS NULL OR EXISTS (
|
||||
SELECT 1 FROM topic_assignment ta JOIN topic t ON t.id = ta.topic_id
|
||||
WHERE ta.claim_id = vp.claim_id AND t.slug = ANY(%(topics)s)))
|
||||
UNION ALL
|
||||
@@ -63,13 +64,13 @@ def person_votes(conn: Connection, slug: str, *, topics: list[str] | None = None
|
||||
ORDER BY voted_on DESC NULLS LAST
|
||||
LIMIT %(limit)s OFFSET %(offset)s
|
||||
""",
|
||||
{"slug": slug, "topics": topics, "limit": limit, "offset": offset},
|
||||
{"slug": slug, "topics": topics, "include_parts": include_parts, "limit": limit, "offset": offset},
|
||||
).fetchall()
|
||||
|
||||
|
||||
def list_votes(conn: Connection, *, party: str | None = None, topics: list[str] | None = None,
|
||||
roll_call: bool | None = None, since: date | None = None, until: date | None = None,
|
||||
limit: int = 50, offset: int = 0) -> list[dict]:
|
||||
include_parts: bool = False, limit: int = 50, offset: int = 0) -> list[dict]:
|
||||
return conn.execute(
|
||||
"""
|
||||
SELECT ve.id, ve.item_title, ve.item_ref, ve.stage, ve.voted_on, ve.result, ve.url, ve.protocol_url,
|
||||
@@ -83,7 +84,8 @@ def list_votes(conn: Connection, *, party: str | None = None, topics: list[str]
|
||||
JOIN organization ch ON ch.id = ve.chamber_id
|
||||
LEFT JOIN vote_position vp ON vp.vote_event_id = ve.id AND vp.organization_id IS NOT NULL
|
||||
LEFT JOIN organization o ON o.id = vp.organization_id
|
||||
WHERE (%(party)s::text IS NULL OR EXISTS (
|
||||
WHERE (%(include_parts)s OR NOT ve.part_vote)
|
||||
AND (%(party)s::text IS NULL OR EXISTS (
|
||||
SELECT 1 FROM vote_position v2 JOIN organization o2 ON o2.id = v2.organization_id
|
||||
WHERE v2.vote_event_id = ve.id AND o2.slug = %(party)s))
|
||||
AND (%(topics)s::text[] IS NULL OR EXISTS (
|
||||
@@ -97,7 +99,7 @@ def list_votes(conn: Connection, *, party: str | None = None, topics: list[str]
|
||||
LIMIT %(limit)s OFFSET %(offset)s
|
||||
""",
|
||||
{"party": party, "topics": topics, "roll_call": roll_call, "since": since, "until": until,
|
||||
"limit": limit, "offset": offset},
|
||||
"include_parts": include_parts, "limit": limit, "offset": offset},
|
||||
).fetchall()
|
||||
|
||||
|
||||
|
||||
Reference in new issue
Block a user