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

Update service_api_client to use new endpoints

Browse Source 
API now has separate endpoints to archive email reply-to addresses and
SMS senders, so we no longer need to use the endpoints for updating.
This commit is contained in:
Katie Smith
2018-04-26 15:09:37 +01:00
parent 965bc76c42
commit 0e370d511e
4 changed files with 32 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
app/main/views/service_settings.py
View File

@@ -440,10 +440,9 @@ def service_edit_email_reply_to(service_id, reply_to_email_id):
@login_required
@user_has_permissions('manage_service')
def service_delete_email_reply_to(service_id, reply_to_email_id):
service_api_client.update_reply_to_email_address(
current_service['id'],
service_api_client.delete_reply_to_email_address(
service_id=current_service['id'],
reply_to_email_id=reply_to_email_id,
active=False,
)
return redirect(url_for('.service_email_reply_to', service_id=service_id))
@@ -723,10 +722,9 @@ def service_edit_sms_sender(service_id, sms_sender_id):
@login_required
@user_has_permissions('manage_service')
def service_delete_sms_sender(service_id, sms_sender_id):
service_api_client.update_sms_sender(
current_service['id'],
service_api_client.delete_sms_sender(
service_id=current_service['id'],
sms_sender_id=sms_sender_id,
active=False,
)
return redirect(url_for('.service_sms_senders', service_id=service_id))

52
app/notify_client/service_api_client.py
View File

@@ -374,25 +374,7 @@ class ServiceAPIClient(NotifyAdminAPIClient):
)
@cache.delete('service-{service_id}')
def update_reply_to_email_address(
self,
service_id,
reply_to_email_id,
email_address=None,
active=None,
is_default=False
):
data = {
"is_default": is_default
}
if email_address is not None:
data.update({
'email_address': email_address
})
if active is not None:
data.update({
'active': active
})
def update_reply_to_email_address(self, service_id, reply_to_email_id, email_address, is_default=False):
return self.post(
"/service/{}/email-reply-to/{}".format(
service_id,
@@ -404,6 +386,13 @@ class ServiceAPIClient(NotifyAdminAPIClient):
}
)
@cache.delete('service-{service_id}')
def delete_reply_to_email_address(self, service_id, reply_to_email_id):
return self.post(
"/service/{}/email-reply-to/{}/archive".format(service_id, reply_to_email_id),
data=None
)
def get_letter_contacts(self, service_id):
return self.get("/service/{}/letter-contact".format(service_id))
@@ -457,21 +446,20 @@ class ServiceAPIClient(NotifyAdminAPIClient):
return self.post("/service/{}/sms-sender".format(service_id), data=data)
@cache.delete('service-{service_id}')
def update_sms_sender(self, service_id, sms_sender_id, sms_sender=None, active=None, is_default=False):
data = {
"is_default": is_default,
}
if sms_sender is not None:
data.update({
"sms_sender": sms_sender,
})
if active is not None:
data.update({
"active": active,
})
def update_sms_sender(self, service_id, sms_sender_id, sms_sender, is_default=False):
return self.post(
"/service/{}/sms-sender/{}".format(service_id, sms_sender_id),
data=data
data={
"sms_sender": sms_sender,
"is_default": is_default
}
)
@cache.delete('service-{service_id}')
def delete_sms_sender(self, service_id, sms_sender_id):
return self.post(
"/service/{}/sms-sender/{}/archive".format(service_id, sms_sender_id),
data=None
)
def get_service_callback_api(self, service_id, callback_api_id):