darkhelm/notifications-admin
1
0
Fork 0
mirror of https://github.com/GSA/notifications-admin.git synced 2026-07-24 09:58:43 -04:00
Code Issues Packages Projects Releases Wiki Activity

rename get_invited_user funcs

Browse Source 
make it clear they're expecting a service/org id
This commit is contained in:
Leo Hemsted
2021-03-05 17:04:35 +00:00
parent ee5875668a
commit c89be0079a
5 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/models/user.py
View File

@@ -473,7 +473,7 @@ class InvitedUser(JSONModel):
@classmethod
def by_id_and_service_id(cls, service_id, invited_user_id):
return cls(
invite_api_client.get_invited_user(service_id, invited_user_id)
invite_api_client.get_invited_user_for_service(service_id, invited_user_id)
)
def accept_invite(self):
@@ -601,7 +601,7 @@ class InvitedOrgUser(JSONModel):
@classmethod
def by_id_and_org_id(cls, org_id, invited_user_id):
return cls(
org_invite_api_client.get_invited_user(org_id, invited_user_id)
org_invite_api_client.get_invited_user_for_org(org_id, invited_user_id)
)
def serialize(self, permissions_as_string=False):

2
app/notify_client/invite_api_client.py
View File

@@ -37,7 +37,7 @@ class InviteApiClient(NotifyAdminAPIClient):
'/service/{}/invite'.format(service_id)
)['data']
def get_invited_user(self, service_id, invited_user_id):
def get_invited_user_for_service(self, service_id, invited_user_id):
return self.get(
f'/service/{service_id}/invite/{invited_user_id}'
)['data']

2
app/notify_client/org_invite_api_client.py
View File

@@ -23,7 +23,7 @@ class OrgInviteApiClient(NotifyAdminAPIClient):
resp = self.get(endpoint)
return resp['data']
def get_invited_user(self, org_id, invited_org_user_id):
def get_invited_user_for_org(self, org_id, invited_org_user_id):
return self.get(
f'/organisation/{org_id}/invite/{invited_org_user_id}'
)['data']

2
tests/app/main/views/organisations/test_organisations.py
View File

@@ -676,7 +676,7 @@ def test_cancel_invited_org_user_cancels_user_invitations(
mocker,
):
mock_cancel = mocker.patch('app.org_invite_api_client.cancel_invited_user')
mocker.patch('app.org_invite_api_client.get_invited_user', return_value=sample_org_invite)
mocker.patch('app.org_invite_api_client.get_invited_user_for_org', return_value=sample_org_invite)
page = client_request.get(
'main.cancel_invited_org_user',

2
tests/app/main/views/test_manage_users.py
View File

@@ -1242,7 +1242,7 @@ def test_cancel_invited_user_cancels_user_invitations(
mocker,
):
mock_cancel = mocker.patch('app.invite_api_client.cancel_invited_user')
mocker.patch('app.invite_api_client.get_invited_user', return_value=sample_invite)
mocker.patch('app.invite_api_client.get_invited_user_for_service', return_value=sample_invite)
page = client_request.get(
'main.cancel_invited_user',