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
@@ -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