mirror of
https://github.com/GSA/notifications-admin.git
synced 2026-02-25 04:40:58 -05:00
5b658d924c
This stops adding the current user to the data sent to the API when removing a user from an organisation. API only needs to know the organisation_id and the id of the user we want to remove from the organisation, so we don't need to pass through the id of the current user too. The other change made is to clear the user cache of the user who has been removed from the org. We don't need to clear any of the organisation caches, since these values don't contain lists of users for the orgs.
91 lines
2.8 KiB
Python
91 lines
2.8 KiB
Python
from itertools import chain
|
|
|
|
from notifications_python_client.errors import HTTPError
|
|
|
|
from app.extensions import redis_client
|
|
from app.notify_client import NotifyAdminAPIClient, cache
|
|
|
|
|
|
class OrganisationsClient(NotifyAdminAPIClient):
|
|
|
|
@cache.set('organisations')
|
|
def get_organisations(self):
|
|
return self.get(url='/organisations')
|
|
|
|
@cache.set('domains')
|
|
def get_domains(self):
|
|
return list(chain.from_iterable(
|
|
organisation['domains']
|
|
for organisation in self.get_organisations()
|
|
))
|
|
|
|
def get_organisation(self, org_id):
|
|
return self.get(url='/organisations/{}'.format(org_id))
|
|
|
|
@cache.set('organisation-{org_id}-name')
|
|
def get_organisation_name(self, org_id):
|
|
return self.get_organisation(org_id)['name']
|
|
|
|
def get_organisation_by_domain(self, domain):
|
|
try:
|
|
return self.get(
|
|
url='/organisations/by-domain?domain={}'.format(domain),
|
|
)
|
|
except HTTPError as error:
|
|
if error.status_code == 404:
|
|
return None
|
|
raise error
|
|
|
|
@cache.delete('organisations')
|
|
def create_organisation(self, name, crown, organisation_type, agreement_signed):
|
|
return self.post(
|
|
url="/organisations",
|
|
data={
|
|
"name": name,
|
|
"crown": crown,
|
|
"organisation_type": organisation_type,
|
|
"agreement_signed": agreement_signed,
|
|
}
|
|
)
|
|
|
|
@cache.delete('domains')
|
|
@cache.delete('organisations')
|
|
def update_organisation(self, org_id, cached_service_ids=None, **kwargs):
|
|
api_response = self.post(url="/organisations/{}".format(org_id), data=kwargs)
|
|
|
|
if cached_service_ids:
|
|
redis_client.delete(*map('service-{}'.format, cached_service_ids))
|
|
|
|
if 'name' in kwargs:
|
|
redis_client.delete(f'organisation-{org_id}-name')
|
|
|
|
return api_response
|
|
|
|
@cache.delete('service-{service_id}')
|
|
@cache.delete('live-service-and-organisation-counts')
|
|
@cache.delete('organisations')
|
|
def update_service_organisation(self, service_id, org_id):
|
|
data = {
|
|
'service_id': service_id
|
|
}
|
|
return self.post(
|
|
url="/organisations/{}/service".format(org_id),
|
|
data=data
|
|
)
|
|
|
|
def get_organisation_services(self, org_id):
|
|
return self.get(url="/organisations/{}/services".format(org_id))
|
|
|
|
@cache.delete('user-{user_id}')
|
|
def remove_user_from_organisation(self, org_id, user_id):
|
|
return self.delete(f'/organisations/{org_id}/users/{user_id}')
|
|
|
|
def get_services_and_usage(self, org_id, year):
|
|
return self.get(
|
|
url=f"/organisations/{org_id}/services-with-usage",
|
|
params={"year": str(year)}
|
|
)
|
|
|
|
|
|
organisations_client = OrganisationsClient()
|