add search

carbonplan_offsets_db/routers/charts.py

@@ -4,7 +4,7 @@
 import numpy as np
 import pandas as pd
 from fastapi import APIRouter, Depends, Query, Request
-from sqlmodel import Session, and_, case, func
+from sqlmodel import Session, and_, case, func, or_
 
 from ..database import get_session
 from ..logging import get_logger
@@ -296,6 +296,11 @@ def get_projects_by_registration_date(
     issued_max: int | None = Query(None, description='Maximum number of issued credits'),
     retired_min: int | None = Query(None, description='Minimum number of retired credits'),
     retired_max: int | None = Query(None, description='Maximum number of retired credits'),
+    search: str
+    | None = Query(
+        None,
+        description='Case insensitive search string. Currently searches on `project_id` and `name` fields only.',
+    ),
     session: Session = Depends(get_session),
 ):
     """Get aggregated project registration data"""
@@ -334,6 +339,13 @@ def get_projects_by_registration_date(
             query=query, model=Project, attribute=attribute, values=values, operation=operation
         )
 
+    # Handle 'search' filter separately due to its unique logic
+    if search:
+        search_pattern = f'%{search}%'
+        query = query.filter(
+            or_(Project.project_id.ilike(search_pattern), Project.name.ilike(search_pattern))
+        )
+
     return get_binned_data(binning_attribute='registered_at', query=query, freq=freq)
 
 
@@ -354,6 +366,11 @@ def get_credits_by_transaction_date(
     transaction_date_to: datetime.date
     | datetime.datetime
     | None = Query(default=None, description='Format: YYYY-MM-DD'),
+    search: str
+    | None = Query(
+        None,
+        description='Case insensitive search string. Currently searches on `project_id` and `name` fields only.',
+    ),
     session: Session = Depends(get_session),
 ):
     """Get aggregated credit transaction data"""
@@ -404,4 +421,11 @@ def get_credits_by_transaction_date(
             query=query, model=model, attribute=attribute, values=values, operation=operation
         )
 
+    # Handle 'search' filter separately due to its unique logic
+    if search:
+        search_pattern = f'%{search}%'
+        query = query.filter(
+            or_(Project.project_id.ilike(search_pattern), Project.name.ilike(search_pattern))
+        )
+
     return credits_by_transaction_date(query=query, freq=freq)

carbonplan_offsets_db/routers/credits.py

@@ -1,8 +1,7 @@
 import datetime
 
 from fastapi import APIRouter, Depends, Query, Request
-from sqlalchemy import or_
-from sqlmodel import Session
+from sqlmodel import Session, or_
 
 from ..database import get_session
 from ..logging import get_logger