Skip to content

Commit

Permalink
Make updates to infra and backend for testing
Browse files Browse the repository at this point in the history
  • Loading branch information
aloftus23 committed Nov 13, 2024
1 parent be8b5e2 commit f306df2
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 9 deletions.
16 changes: 8 additions & 8 deletions backend/src/xfd_django/xfd_api/views.py
Original file line number Diff line number Diff line change
Expand Up @@ -352,25 +352,25 @@ async def read_users_me(current_user: User = Depends(get_current_active_user)):


@api_router.get(
"/users/{regionId}",
"/users/{region_id}",
response_model=List[UserSchema],
# dependencies=[Depends(get_current_active_user)],
tags=["User"],
)
async def call_get_users(regionId):
async def call_get_users(region_id):
"""
Call get_users()
Args:
regionId: Region IDs to filter users by.
region_id: Region IDs to filter users by.
Raises:
HTTPException: If the user is not authorized or no users are found.
Returns:
List[User]: A list of users matching the filter criteria.
"""
return get_users(regionId)
return get_users(region_id)


# ========================================
Expand Down Expand Up @@ -417,7 +417,7 @@ async def call_create_saved_search(
request = {
"name": name,
"searchTerm": search_term,
"regionId": region_id,
"region_id": region_id,
"createdById": current_user,
}

Expand Down Expand Up @@ -756,7 +756,7 @@ async def get_organizations_by_state(


@api_router.get(
"/organizations/regionId/{region_id}",
"/organizations/region_id/{region_id}",
dependencies=[Depends(get_current_active_user)],
response_model=List[OrganizationSchema.GetOrganizationSchema],
tags=["Organizations"],
Expand Down Expand Up @@ -906,11 +906,11 @@ async def update_granular_scan(
)
async def list_organizations_v2(
state: Optional[List[str]] = Query(None),
regionId: Optional[List[str]] = Query(None),
region_id: Optional[List[str]] = Query(None),
current_user: User = Depends(get_current_active_user),
):
"""Retrieve a list of all organizations (version 2)."""
return organization.list_organizations_v2(state, regionId, current_user)
return organization.list_organizations_v2(state, region_id, current_user)


# ========================================
Expand Down
2 changes: 1 addition & 1 deletion infrastructure/integration.tfvars
Original file line number Diff line number Diff line change
Expand Up @@ -102,4 +102,4 @@ ssm_redshift_host = "/crossfeed/integration/REDSHIFT_HOST"
ssm_redshift_database = "/crossfeed/integration/REDSHIFT_DATABASE"
ssm_redshift_user = "/crossfeed/integration/REDSHIFT_USER"
ssm_redshift_password = "/crossfeed/integration/REDSHIFT_PASSWORD"
create_elasticache_cluster = false
create_elasticache_cluster = true

0 comments on commit f306df2

Please sign in to comment.