Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 3 additions & 1 deletion .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,9 @@ jobs:
with:
python-version: 3.9
- name: install Poetry
uses: snok/install-poetry@v1.3.3
uses: snok/install-poetry@v1.4.1
with:
version: 1.8.5
- name: cache Poetry virtualenv
uses: actions/cache@v4
id: cache
Expand Down
1 change: 1 addition & 0 deletions api/db/models/bills.py
Original file line number Diff line number Diff line change
Expand Up @@ -96,6 +96,7 @@ class BillIdentifier(BillRelatedBase, Base):
__tablename__ = "opencivicdata_billidentifier"

identifier = Column(String)
bill_id = Column(String, ForeignKey(Bill.id))


class BillAction(BillRelatedBase, Base):
Expand Down
15 changes: 8 additions & 7 deletions api/schemas.py
Original file line number Diff line number Diff line change
Expand Up @@ -146,6 +146,13 @@ class Config:
orm_mode = True


class BillIdentifier(BaseModel):
identifier: str = Field(..., example="ocd-bill-mn-2025_2026-sf827")

class Config:
orm_mode = True


class CompactJurisdiction(BaseModel):
id: str = Field(..., example="ocd-jurisdiction/country:us/state:nc/government")
name: str = Field(..., example="North Carolina")
Expand All @@ -170,6 +177,7 @@ class CompactBill(BaseModel):
session: str
identifier: str
title: str
other_identifiers: Optional[List[BillIdentifier]]

class Config:
orm_mode = True
Expand Down Expand Up @@ -238,13 +246,6 @@ class Config:
orm_mode = True


class BillIdentifier(BaseModel):
identifier: str = Field(..., example="HB 74")

class Config:
orm_mode = True


class BillSponsorship(BaseModel):
id: UUID = Field(..., example="f0049138-1ad8-4506-a2a4-f4dd1251bbba")
name: str = Field(..., example="JONES")
Expand Down
Loading