Skip to content

Commit

Permalink
Merge pull request #206 from Chia-Network/wwills2/organizations-proxy
Browse files Browse the repository at this point in the history
add CADT organizations proxy
  • Loading branch information
TheLastCicada authored Oct 18, 2024
2 parents 0a8cc7d + 6970991 commit 9774a02
Show file tree
Hide file tree
Showing 3 changed files with 33 additions and 4 deletions.
10 changes: 7 additions & 3 deletions app/api/v1/activities.py
Original file line number Diff line number Diff line change
Expand Up @@ -20,10 +20,11 @@
async def get_activity(
search: Optional[str] = None,
search_by: Optional[schemas.ActivitySearchBy] = None,
minHeight: Optional[int] = None,
min_height: Optional[int] = None,
mode: Optional[GatewayMode] = None,
page: int = 1,
limit: int = 10,
org_uid: Optional[str] = None,
sort: str = "desc",
db: Session = Depends(deps.get_db_session),
) -> schemas.ActivitiesResponse:
Expand Down Expand Up @@ -54,8 +55,11 @@ async def get_activity(
case _:
raise ErrorCode().bad_request_error(message="search_by is invalid")

if minHeight is not None:
activity_filters["and"].append(models.Activity.height >= minHeight)
if min_height is not None:
activity_filters["and"].append(models.Activity.height >= min_height)

if org_uid is not None:
cw_filters["orgUid"] = org_uid

climate_data = crud.ClimateWareHouseCrud(
url=settings.CADT_API_SERVER_HOST,
Expand Down
7 changes: 6 additions & 1 deletion app/api/v1/core.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

from fastapi import APIRouter

from app.api.v1 import activities, cron, keys, tokens, transactions
from app.api.v1 import activities, cron, keys, tokens, transactions, organizations

router = APIRouter(
prefix="/v1",
Expand Down Expand Up @@ -41,3 +41,8 @@ async def get_info() -> Dict[str, str]:
prefix="/keys",
tags=["keys"],
)
router.include_router(
organizations.router,
prefix="/organizations",
tags=["organizations"],
)
20 changes: 20 additions & 0 deletions app/api/v1/organizations.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
from typing import Any

from fastapi import APIRouter
from fastapi.params import Depends

from app import crud
from app.config import ExecutionMode, settings
from app.utils import disallow

router = APIRouter()

# pass through resource to expose organization data from cadt
@router.get("/", response_model=Any)
@disallow([ExecutionMode.REGISTRY, ExecutionMode.CLIENT])
async def get_organizations() -> Any:
all_organizations = crud.ClimateWareHouseCrud(
url=settings.CADT_API_SERVER_HOST,
api_key=settings.CADT_API_KEY,
).get_climate_organizations()
return all_organizations

0 comments on commit 9774a02

Please sign in to comment.