Skip to content

Commit

Permalink
lint
Browse files Browse the repository at this point in the history
  • Loading branch information
ochiu committed Dec 5, 2024
1 parent b1dd59a commit fe394a5
Show file tree
Hide file tree
Showing 2 changed files with 22 additions and 16 deletions.
6 changes: 4 additions & 2 deletions auth-api/src/auth_api/models/org.py
Original file line number Diff line number Diff line change
Expand Up @@ -172,7 +172,8 @@ def search_org(cls, search: OrgSearch, environment: str):
if search.name:
query = query.filter(Org.name.ilike(f"%{search.name}%"))
if search.member_search_text:
member_exists_subquery = text("""
member_exists_subquery = text(
"""
EXISTS (
SELECT 1
FROM memberships
Expand All @@ -182,7 +183,8 @@ def search_org(cls, search: OrgSearch, environment: str):
AND users.status = 1
AND CONCAT(users.last_name, ' ', users.first_name, ' ', users.username) ILIKE :member_search_text
)
""").params(member_search_text=f"%{search.member_search_text}%")
"""
).params(member_search_text=f"%{search.member_search_text}%")

query = query.filter(member_exists_subquery)

Expand Down
32 changes: 18 additions & 14 deletions auth-api/tests/unit/api/test_org.py
Original file line number Diff line number Diff line change
Expand Up @@ -2942,37 +2942,41 @@ def test_search_org_members(client, jwt, session, keycloak_mock): # pylint:disa
client.post("/api/v1/orgs", data=json.dumps(TestOrgInfo.org1), headers=headers, content_type="application/json")

headers = factory_auth_header(jwt=jwt, claims=TestJwtClaims.staff_view_accounts_role)
rv = client.get(f'/api/v1/orgs?status=ACTIVE&includeMembers=true&members={user_info['preferred_username']}',
headers=headers,
content_type="application/json")
rv = client.get(
f"/api/v1/orgs?status=ACTIVE&includeMembers=true&members={user_info['preferred_username']}",
headers=headers,
content_type="application/json",
)
assert rv.status_code == HTTPStatus.OK
dictionary = json.loads(rv.data)
assert dictionary["orgs"]
assert len(dictionary["orgs"][0]["members"]) == 1
member = dictionary["orgs"][0]["members"][0]
assert member["membershipTypeCode"] == "ADMIN"
assert member['user']
user = member['user']
assert user['username'] == user_info['preferred_username']
assert member["user"]
user = member["user"]
assert user["username"] == user_info["preferred_username"]

rv = client.get(
f'/api/v1/orgs?status=ACTIVE&includeMembers=true&members={user_info['lastname']} {user_info['firstname']}',
f"/api/v1/orgs?status=ACTIVE&includeMembers=true&members={user_info['lastname']} {user_info['firstname']}",
headers=headers,
content_type="application/json")
content_type="application/json",
)

dictionary = json.loads(rv.data)
assert dictionary["orgs"]
assert len(dictionary["orgs"][0]["members"]) == 1
member = dictionary["orgs"][0]["members"][0]
assert member["membershipTypeCode"] == "ADMIN"
assert member['user']
user = member['user']
assert user['firstname'] == user_info['firstname']
assert user['lastname'] == user_info['lastname']
assert member["user"]
user = member["user"]
assert user["firstname"] == user_info["firstname"]
assert user["lastname"] == user_info["lastname"]

rv = client.get(
f'/api/v1/orgs?status=ACTIVE&includeMembers=true&members=NOTHING',
f"/api/v1/orgs?status=ACTIVE&includeMembers=true&members=NOTHING",
headers=headers,
content_type="application/json")
content_type="application/json",
)
dictionary = json.loads(rv.data)
assert not dictionary["orgs"]

0 comments on commit fe394a5

Please sign in to comment.