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

Make _attach_current_user a pure function

Browse Source 
Mutating dictionaries is gross and doesn’t work as you’d expect. Better
to have the function return a new dictionary instead.

Means we can be explicit that `created_by` is one of the allowed params
when updating a service.
This commit is contained in:
Chris Hill-Scott
2016-08-11 14:20:43 +01:00
parent 0cfe10639a
commit da1fa2e61c
8 changed files with 23 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
app/notify_client/service_api_client.py
View File

@@ -30,7 +30,7 @@ class ServiceAPIClient(NotificationsAPIClient):
"restricted": restricted,
"email_from": email_from
}
_attach_current_user(data)
data = _attach_current_user(data)
return self.post("/service", data)['data']['id']
def delete_service(self, service_id):
@@ -81,7 +81,8 @@ class ServiceAPIClient(NotificationsAPIClient):
"""
Update a service.
"""
disallowed_attributes = set(kwargs.keys()) - {
data = _attach_current_user(kwargs)
disallowed_attributes = set(data.keys()) - {
'name',
'users',
'message_limit',
@@ -89,14 +90,14 @@ class ServiceAPIClient(NotificationsAPIClient):
'restricted',
'email_from',
'reply_to_email_address',
'sms_sender'
'sms_sender',
'created_by'
}
if disallowed_attributes:
raise TypeError('Not allowed to update service attributes: {}'.format(
", ".join(disallowed_attributes)
))
_attach_current_user(kwargs)
endpoint = "/service/{0}".format(service_id)
return self.post(endpoint, data)
@@ -127,7 +128,7 @@ class ServiceAPIClient(NotificationsAPIClient):
data.update({
'subject': subject
})
_attach_current_user(data)
data = _attach_current_user(data)
endpoint = "/service/{0}/template".format(service_id)
return self.post(endpoint, data)
@@ -146,7 +147,7 @@ class ServiceAPIClient(NotificationsAPIClient):
data.update({
'subject': subject
})
_attach_current_user(data)
data = _attach_current_user(data)
endpoint = "/service/{0}/template/{1}".format(service_id, id_)
return self.post(endpoint, data)
@@ -187,7 +188,7 @@ class ServiceAPIClient(NotificationsAPIClient):
data = {
'archived': True
}
_attach_current_user(data)
data = _attach_current_user(data)
return self.post(endpoint, data=data)
def find_all_service_email_from(self, user_id=None):