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

Remove redundant deletion decorators

Browse Source 
These are superseded by the "_delete_template_cache_for_service"
call in each of these methods.
This commit is contained in:
Ben Thorner
2022-02-22 10:55:30 +00:00
parent 81d9c73543
commit 3f2b760efb
2 changed files with 0 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
app/notify_client/service_api_client.py
View File

@@ -193,7 +193,6 @@ class ServiceAPIClient(NotifyAdminAPIClient):
return self.post(endpoint, data) return self.post(endpoint, data)
@cache.delete('service-{service_id}-templates') @cache.delete('service-{service_id}-templates')
@cache.delete('service-{service_id}-template-{id_}-versions')
def update_service_template( def update_service_template(
self, id_, name, type_, content, service_id, subject=None, process_type=None self, id_, name, type_, content, service_id, subject=None, process_type=None
): ):
@@ -221,7 +220,6 @@ class ServiceAPIClient(NotifyAdminAPIClient):
return self.post(endpoint, data) return self.post(endpoint, data)
@cache.delete('service-{service_id}-templates') @cache.delete('service-{service_id}-templates')
@cache.delete('service-{service_id}-template-{id_}-versions')
def redact_service_template(self, service_id, id_): def redact_service_template(self, service_id, id_):
ret = self.post( ret = self.post(
"/service/{}/template/{}".format(service_id, id_), "/service/{}/template/{}".format(service_id, id_),
@@ -233,7 +231,6 @@ class ServiceAPIClient(NotifyAdminAPIClient):
return ret return ret
@cache.delete('service-{service_id}-templates') @cache.delete('service-{service_id}-templates')
@cache.delete('service-{service_id}-template-{template_id}-versions')
def update_service_template_sender(self, service_id, template_id, reply_to): def update_service_template_sender(self, service_id, template_id, reply_to):
data = { data = {
'reply_to': reply_to, 'reply_to': reply_to,
@@ -247,7 +244,6 @@ class ServiceAPIClient(NotifyAdminAPIClient):
return ret return ret
@cache.delete('service-{service_id}-templates') @cache.delete('service-{service_id}-templates')
@cache.delete('service-{service_id}-template-{template_id}-versions')
def update_service_template_postage(self, service_id, template_id, postage): def update_service_template_postage(self, service_id, template_id, postage):
ret = self.post( ret = self.post(
"/service/{0}/template/{1}".format(service_id, template_id), "/service/{0}/template/{1}".format(service_id, template_id),
@@ -306,7 +302,6 @@ class ServiceAPIClient(NotifyAdminAPIClient):
]) ])
@cache.delete('service-{service_id}-templates') @cache.delete('service-{service_id}-templates')
@cache.delete('service-{service_id}-template-{template_id}-versions')
def delete_service_template(self, service_id, template_id): def delete_service_template(self, service_id, template_id):
""" """
Set a service template's archived flag to True Set a service template's archived flag to True

5
tests/app/notify_client/test_service_api_client.py
View File

@@ -433,23 +433,18 @@ def test_deletes_service_cache(
'service-{}-templates'.format(SERVICE_ONE_ID), 'service-{}-templates'.format(SERVICE_ONE_ID),
]), ]),
('update_service_template', [FAKE_TEMPLATE_ID, 'foo', 'sms', 'bar', SERVICE_ONE_ID], [ ('update_service_template', [FAKE_TEMPLATE_ID, 'foo', 'sms', 'bar', SERVICE_ONE_ID], [
'service-{}-template-{}-versions'.format(SERVICE_ONE_ID, FAKE_TEMPLATE_ID),
'service-{}-templates'.format(SERVICE_ONE_ID), 'service-{}-templates'.format(SERVICE_ONE_ID),
]), ]),
('redact_service_template', [SERVICE_ONE_ID, FAKE_TEMPLATE_ID], [ ('redact_service_template', [SERVICE_ONE_ID, FAKE_TEMPLATE_ID], [
'service-{}-template-{}-versions'.format(SERVICE_ONE_ID, FAKE_TEMPLATE_ID),
'service-{}-templates'.format(SERVICE_ONE_ID), 'service-{}-templates'.format(SERVICE_ONE_ID),
]), ]),
('update_service_template_sender', [SERVICE_ONE_ID, FAKE_TEMPLATE_ID, 'foo'], [ ('update_service_template_sender', [SERVICE_ONE_ID, FAKE_TEMPLATE_ID, 'foo'], [
'service-{}-template-{}-versions'.format(SERVICE_ONE_ID, FAKE_TEMPLATE_ID),
'service-{}-templates'.format(SERVICE_ONE_ID), 'service-{}-templates'.format(SERVICE_ONE_ID),
]), ]),
('update_service_template_postage', [SERVICE_ONE_ID, FAKE_TEMPLATE_ID, 'first'], [ ('update_service_template_postage', [SERVICE_ONE_ID, FAKE_TEMPLATE_ID, 'first'], [
'service-{}-template-{}-versions'.format(SERVICE_ONE_ID, FAKE_TEMPLATE_ID),
'service-{}-templates'.format(SERVICE_ONE_ID), 'service-{}-templates'.format(SERVICE_ONE_ID),
]), ]),
('delete_service_template', [SERVICE_ONE_ID, FAKE_TEMPLATE_ID], [ ('delete_service_template', [SERVICE_ONE_ID, FAKE_TEMPLATE_ID], [
'service-{}-template-{}-versions'.format(SERVICE_ONE_ID, FAKE_TEMPLATE_ID),
'service-{}-templates'.format(SERVICE_ONE_ID), 'service-{}-templates'.format(SERVICE_ONE_ID),
]), ]),
('archive_service', [SERVICE_ONE_ID, []], [ ('archive_service', [SERVICE_ONE_ID, []], [