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

Remove unused client method

Browse Source 
The app is now always getting an organisation by its `id` (or domain),
and never by `service_id`.

This means that the client method and associated mocking can be removed.

I think this must come from a time when the service response didn’t
include `organisation_id`, but now it always does.
This commit is contained in:
Chris Hill-Scott
2020-03-27 14:50:02 +00:00
parent cc5701e870
commit 51a5a4b559
2 changed files with 0 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
app/notify_client/organisations_api_client.py
View File

@@ -62,9 +62,6 @@ class OrganisationsClient(NotifyAdminAPIClient):
def update_organisation_name(self, org_id, name): def update_organisation_name(self, org_id, name):
return self.update_organisation(org_id, name=name) return self.update_organisation(org_id, name=name)
def get_service_organisation(self, service_id):
return self.get(url="/service/{}/organisation".format(service_id))
@cache.delete('service-{service_id}') @cache.delete('service-{service_id}')
@cache.delete('live-service-and-organisation-counts') @cache.delete('live-service-and-organisation-counts')
def update_service_organisation(self, service_id, org_id): def update_service_organisation(self, service_id, org_id):

16
tests/conftest.py
View File

@@ -3138,22 +3138,6 @@ def mock_get_no_organisation_by_domain(mocker):
) )
@pytest.fixture(scope='function')
def mock_get_service_organisation(
mocker,
agreement_signed=None,
organisation_type=None,
):
def _get_service_organisation(service_id):
return organisation_json(
'7aa5d4e9-4385-4488-a489-07812ba13383',
agreement_signed=None,
organisation_type=None,
)
return mocker.patch('app.organisations_client.get_service_organisation', side_effect=_get_service_organisation)
@pytest.fixture(scope='function') @pytest.fixture(scope='function')
def mock_update_service_organisation(mocker): def mock_update_service_organisation(mocker):
def _update_service_organisation(service_id, organisation_id): def _update_service_organisation(service_id, organisation_id):