Deploy: Consolidated gold tables, fixed nginx docs routing

api/routes/bills_neon.py

@@ -94,6 +94,9 @@ async def fetch_bills_from_parquet(
     q: Optional[str] = None,
     session: Optional[str] = None,
     topic: Optional[str] = None,
+    chamber: Optional[str] = None,
+    bill_type: Optional[str] = None,
+    status: Optional[str] = None,
     limit: int = 50,
     offset: int = 0
 ) -> Dict[str, Any]:
@@ -143,6 +146,50 @@ async def fetch_bills_from_parquet(
             where_clauses.append("session = ?")
             params.append(session)
         
+        # Chamber filter (based on bill number prefix)
+        if chamber:
+            if chamber.lower() == 'house':
+                where_clauses.append("(bill_number LIKE 'HB%' OR bill_number LIKE 'HR%' OR bill_number LIKE 'HJR%' OR bill_number LIKE 'HCR%' OR bill_number LIKE 'HJM%' OR bill_number LIKE 'H %')")
+            elif chamber.lower() == 'senate':
+                where_clauses.append("(bill_number LIKE 'SB%' OR bill_number LIKE 'SR%' OR bill_number LIKE 'SJR%' OR bill_number LIKE 'SCR%' OR bill_number LIKE 'SJM%' OR bill_number LIKE 'S %')")
+            elif chamber.lower() == 'joint':
+                where_clauses.append("(bill_number LIKE '%JR%' OR bill_number LIKE '%JM%')")
+        
+        # Bill type filter (based on bill number pattern)
+        if bill_type:
+            if bill_type == 'bill':
+                where_clauses.append("(bill_number LIKE 'HB%' OR bill_number LIKE 'SB%' OR bill_number LIKE 'AB%')")
+            elif bill_type == 'resolution':
+                where_clauses.append("(bill_number LIKE 'HR%' OR bill_number LIKE 'SR%' OR bill_number LIKE 'AR%')")
+            elif bill_type == 'joint_resolution':
+                where_clauses.append("(bill_number LIKE 'HJR%' OR bill_number LIKE 'SJR%' OR bill_number LIKE 'AJR%')")
+            elif bill_type == 'concurrent_resolution':
+                where_clauses.append("(bill_number LIKE 'HCR%' OR bill_number LIKE 'SCR%')")
+            elif bill_type == 'memorial':
+                where_clauses.append("(bill_number LIKE 'HJM%' OR bill_number LIKE 'SJM%')")
+        
+        # Status filter (based on latest_action_description)
+        if status:
+            status_keywords = {
+                'enacted': 'Enacted',
+                'passed': 'passed|Passed',
+                'adopted': 'Adopted|adopted',
+                'failed': 'Failed|failed',
+                'introduced': 'Introduced|introduced',
+                'referred': 'referred|Referred',
+                'reported': 'reported|Reported'
+            }
+            keyword = status_keywords.get(status.lower(), status)
+            
+            if '|' in keyword:
+                keyword_parts = keyword.split('|')
+                keyword_clauses = ["LOWER(latest_action_description) LIKE LOWER(?)"] * len(keyword_parts)
+                where_clauses.append(f"({' OR '.join(keyword_clauses)})")
+                params.extend([f'%{kw}%' for kw in keyword_parts])
+            else:
+                where_clauses.append("LOWER(latest_action_description) LIKE LOWER(?)")
+                params.append(f'%{keyword}%')
+        
         where_clause = " AND ".join(where_clauses)
         
         # Count total
@@ -197,6 +244,9 @@ async def fetch_bills_from_parquet(
             "state": state,
             "query": q,
             "topic": topic,
+            "chamber": chamber,
+            "bill_type": bill_type,
+            "status": status,
             "session": session,
             "bills": bills,
             "total": total,
@@ -411,6 +461,9 @@ async def get_bills(
     q: Optional[str] = Query(None, description="Search query (bill number or title)"),
     session: Optional[str] = Query(None, description="Legislative session"),
     topic: Optional[str] = Query(None, description="Policy topic (e.g., fluoride, dental, medicaid)"),
+    chamber: Optional[str] = Query(None, description="Legislative chamber (house, senate, joint)"),
+    bill_type: Optional[str] = Query(None, description="Bill type (bill, resolution, joint_resolution, concurrent_resolution, memorial)"),
+    status: Optional[str] = Query(None, description="Bill status (enacted, passed, adopted, failed, introduced, referred, reported)"),
     limit: int = Query(50, ge=1, le=500),
     offset: int = Query(0, ge=0)
 ):
@@ -421,6 +474,9 @@ async def get_bills(
     - `/api/bills?state=AL&q=dental` - Search Alabama bills for "dental"
     - `/api/bills?state=AL&session=2024rs` - Get all 2024 regular session bills
     - `/api/bills?state=AL&topic=fluoride` - Get fluoride-related Alabama bills
+    - `/api/bills?state=AL&chamber=house` - Get House bills only
+    - `/api/bills?state=AL&bill_type=bill` - Get only bills (not resolutions)
+    - `/api/bills?state=AL&status=enacted` - Get enacted bills only
     - `/api/bills?state=AL&limit=50` - Browse recent Alabama bills
     """
     try:
@@ -429,6 +485,9 @@ async def get_bills(
             q=q,
             session=session,
             topic=topic,
+            chamber=chamber,
+            bill_type=bill_type,
+            status=status,
             limit=limit,
             offset=offset
         )

frontend/src/pages/PolicyMap.tsx

@@ -55,6 +55,11 @@ export default function PolicyMap() {
   const [sortOrder, setSortOrder] = useState<'asc' | 'desc'>('desc')
   const [expandedBill, setExpandedBill] = useState<string | null>(null)
   
+  // New filter states
+  const [selectedChamber, setSelectedChamber] = useState<string>('')
+  const [selectedBillType, setSelectedBillType] = useState<string>('')
+  const [selectedStatus, setSelectedStatus] = useState<string>('')
+  
   // Read topic from URL, or default to empty (showing topic selector)
   const topicFromUrl = searchParams.get('topic') || ''
   const [selectedTopic, setSelectedTopic] = useState(topicFromUrl)
@@ -114,7 +119,7 @@ export default function PolicyMap() {
     bills: Bill[]
     pagination: { limit: number; offset: number; has_more: boolean }
   }>({
-    queryKey: ['bills', selectedState, selectedSession, searchQuery, selectedTopic, page],
+    queryKey: ['bills', selectedState, selectedSession, searchQuery, selectedTopic, selectedChamber, selectedBillType, selectedStatus, page],
     queryFn: async () => {
       const params = new URLSearchParams({
         state: selectedState,
@@ -124,6 +129,9 @@ export default function PolicyMap() {
       if (selectedSession) params.append('session', selectedSession)
       if (searchQuery) params.append('q', searchQuery)
       if (selectedTopic) params.append('topic', selectedTopic)
+      if (selectedChamber) params.append('chamber', selectedChamber)
+      if (selectedBillType) params.append('bill_type', selectedBillType)
+      if (selectedStatus) params.append('status', selectedStatus)
 
       const response = await api.get(`/bills?${params}`)
       return response.data
@@ -469,6 +477,78 @@ export default function PolicyMap() {
                     </select>
                   </div>
                 )}
+                
+                {/* Chamber Filter - list view only */}
+                {viewMode === 'list' && (
+                  <div className="flex-1 min-w-[150px]">
+                    <label className="block text-sm font-medium text-gray-700 mb-1">
+                      Chamber
+                    </label>
+                    <select
+                      className="block w-full rounded-md border-gray-300 shadow-sm focus:border-blue-500 focus:ring-blue-500 text-sm text-gray-900 py-2"
+                      value={selectedChamber}
+                      onChange={(e) => {
+                        setSelectedChamber(e.target.value)
+                        setPage(1)
+                      }}
+                    >
+                      <option value="">All Chambers</option>
+                      <option value="house">House</option>
+                      <option value="senate">Senate</option>
+                      <option value="joint">Joint</option>
+                    </select>
+                  </div>
+                )}
+                
+                {/* Bill Type Filter - list view only */}
+                {viewMode === 'list' && (
+                  <div className="flex-1 min-w-[150px]">
+                    <label className="block text-sm font-medium text-gray-700 mb-1">
+                      Bill Type
+                    </label>
+                    <select
+                      className="block w-full rounded-md border-gray-300 shadow-sm focus:border-blue-500 focus:ring-blue-500 text-sm text-gray-900 py-2"
+                      value={selectedBillType}
+                      onChange={(e) => {
+                        setSelectedBillType(e.target.value)
+                        setPage(1)
+                      }}
+                    >
+                      <option value="">All Types</option>
+                      <option value="bill">Bill (HB/SB)</option>
+                      <option value="resolution">Resolution (HR/SR)</option>
+                      <option value="joint_resolution">Joint Resolution (HJR/SJR)</option>
+                      <option value="concurrent_resolution">Concurrent Resolution (HCR/SCR)</option>
+                      <option value="memorial">Memorial (HJM/SJM)</option>
+                    </select>
+                  </div>
+                )}
+                
+                {/* Status Filter - list view only */}
+                {viewMode === 'list' && (
+                  <div className="flex-1 min-w-[150px]">
+                    <label className="block text-sm font-medium text-gray-700 mb-1">
+                      Status
+                    </label>
+                    <select
+                      className="block w-full rounded-md border-gray-300 shadow-sm focus:border-blue-500 focus:ring-blue-500 text-sm text-gray-900 py-2"
+                      value={selectedStatus}
+                      onChange={(e) => {
+                        setSelectedStatus(e.target.value)
+                        setPage(1)
+                      }}
+                    >
+                      <option value="">All Statuses</option>
+                      <option value="enacted">Enacted</option>
+                      <option value="passed">Passed</option>
+                      <option value="adopted">Adopted</option>
+                      <option value="failed">Failed</option>
+                      <option value="introduced">Introduced</option>
+                      <option value="referred">Referred to Committee</option>
+                      <option value="reported">Reported from Committee</option>
+                    </select>
+                  </div>
+                )}
 
                 {/* Search */}
                 <div className="flex-1 min-w-[250px]">
@@ -489,17 +569,20 @@ export default function PolicyMap() {
                 </div>
 
                 {/* Clear button */}
-                {(searchQuery || selectedSession) && (
+                {(searchQuery || selectedSession || selectedChamber || selectedBillType || selectedStatus) && (
                   <button
                     type="button"
                     onClick={() => {
                       setSearchQuery('')
                       setSelectedSession('')
+                      setSelectedChamber('')
+                      setSelectedBillType('')
+                      setSelectedStatus('')
                       setPage(1)
                     }}
                     className="px-4 py-2 bg-gray-200 text-gray-700 rounded-md hover:bg-gray-300 transition-colors text-sm font-medium"
                   >
-                    Clear
+                    Clear Filters
                   </button>
                 )}