add /bpa/organizations/autoregister route with tests

Author: amandazhuyilan

routers/bpa_register.py

@@ -1,9 +1,13 @@
+import httpx
 import logging
+
 from datetime import datetime, timezone
+from typing import List
 
 from fastapi import APIRouter, BackgroundTasks, Depends, HTTPException
 from httpx import HTTPStatusError
 from sqlmodel import Session
+from starlette import status
 from starlette.responses import JSONResponse
 
 from auth.ses import EmailService
@@ -13,9 +17,10 @@
 from db.setup import get_db_session
 from routers.errors import RegistrationRoute
 from schemas.biocommons import Auth0UserData, BiocommonsRegisterData
-from schemas.bpa import BPARegistrationRequest
+from schemas.bpa import BPARegistrationRequest, OrgOut
 from schemas.responses import RegistrationErrorResponse, RegistrationResponse
 from schemas.service import Resource, Service
+from services.ckan_client import CKANClient, get_ckan_client
 
 logger = logging.getLogger(__name__)
 
@@ -142,3 +147,36 @@ def _create_bpa_user_record(auth0_user_data: Auth0UserData, session: Session) ->
     session.add(bpa_membership)
     session.commit()
     return db_user
+
+@router.get(
+    "/organizations/autoregister",
+    response_model=List[OrgOut],
+    summary="List CKAN organizations eligible for auto-registration",
+)
+def list_autoregister_organizations(
+    ckan: CKANClient = Depends(get_ckan_client),
+) -> List[OrgOut]:
+    """
+    Returns the minimal set of CKAN organizations eligible for auto-registration,
+    suitable for populating the portal dropdown.
+    """
+    try:
+        return ckan.get_autoregister_organizations()
+    except httpx.HTTPError as e:
+        # Network / HTTP errors talking to CKAN
+        raise HTTPException(
+            status_code=status.HTTP_502_BAD_GATEWAY,
+            detail=f"Upstream CKAN error: {str(e)}",
+        )
+    except ValueError as e:
+        # CKAN Action API returned success=false
+        raise HTTPException(
+            status_code=status.HTTP_502_BAD_GATEWAY,
+            detail=str(e),
+        )
+    except Exception:
+        # Unknown error
+        raise HTTPException(
+            status_code=status.HTTP_500_INTERNAL_SERVER_ERROR,
+            detail="Unexpected server error.",
+        )

tests/test_bpa_register.py

@@ -10,13 +10,15 @@
     PlatformMembership,
     PlatformMembershipHistory,
 )
+from main import app
 from schemas import Service
 from schemas.biocommons import BiocommonsRegisterData
 from tests.datagen import (
     Auth0UserDataFactory,
     BPARegistrationDataFactory,
     random_auth0_id,
 )
+from services.ckan_client import get_ckan_client
 
 
 @pytest.fixture
@@ -272,3 +274,50 @@ def test_all_organizations_selected(
     assert len(bpa_service.resources) == len(mock_settings.organizations)
 
     email_service_cls.return_value.send.assert_called_once()
+
+
+class _DummyCKAN:
+    def __init__(self, return_value=None, raise_exc=None):
+        self.return_value = [] if return_value is None else return_value
+        self.raise_exc = raise_exc
+        self.called = False
+
+    def get_autoregister_organizations(self):
+        self.called = True
+        if self.raise_exc:
+            raise self.raise_exc
+        return self.return_value
+
+
+def test_get_bpa_orgs_success(test_client):
+    """Test successful retrieval of BPA organizations."""
+    mock_organizations = [
+        {"id": "org1", "name": "Org One", "title": "Org One"},
+        {"id": "org2", "name": "Org Two", "title": "Org Two"},
+        {"id": "org3", "name": "Org Three", "title": "Org Three"},
+    ]
+    dummy = _DummyCKAN(return_value=mock_organizations)
+
+    # Override the FastAPI dependency used by the route
+    app.dependency_overrides[get_ckan_client] = lambda: dummy
+    try:
+        response = test_client.get("/bpa/organizations/autoregister")
+    finally:
+        app.dependency_overrides.pop(get_ckan_client, None)
+
+    assert response.status_code == 200
+    assert response.json() == mock_organizations
+    assert dummy.called is True
+
+
+def test_get_bpa_orgs_failure(test_client):
+    """If the underlying client raises, expect a 502 from the error handler."""
+    dummy = _DummyCKAN(raise_exc=ValueError("boom"))
+
+    app.dependency_overrides[get_ckan_client] = lambda: dummy
+    try:
+        response = test_client.get("/bpa/organizations/autoregister")
+    finally:
+        app.dependency_overrides.pop(get_ckan_client, None)
+
+    assert response.status_code == 502