Step 1 of renaming cache keys for templates

We want to change cache keys for templates and broadcasts to include
their service ID. So cache keys should change from
`template-{template_id}-versions` to
`service-{service_id}-template-{template_id}-versions`.

The first step of this which needs to be deployed as a change first is
to delete both keys when updating service templates (even if they key is
not yet set). This means that when we release code in the next PR to
start setting the new key, we won't run into a case where either the old
or the new key can remain set with stale data.
This commit is contained in:
David McDonald
2020-09-21 14:04:10 +01:00
parent 7040c7bdd0
commit e3baa9ba35
4 changed files with 32 additions and 2 deletions

View File

@@ -192,6 +192,8 @@ class ServiceAPIClient(NotifyAdminAPIClient):
@cache.delete('service-{service_id}-templates')
@cache.delete('template-{id_}-version-None')
@cache.delete('template-{id_}-versions')
@cache.delete('service-{service_id}-template-{id_}-version-None')
@cache.delete('service-{service_id}-template-{id_}-versions')
def update_service_template(
self, id_, name, type_, content, service_id, subject=None, process_type=None
):
@@ -220,6 +222,8 @@ class ServiceAPIClient(NotifyAdminAPIClient):
@cache.delete('service-{service_id}-templates')
@cache.delete('template-{id_}-version-None')
@cache.delete('template-{id_}-versions')
@cache.delete('service-{service_id}-template-{id_}-version-None')
@cache.delete('service-{service_id}-template-{id_}-versions')
def redact_service_template(self, service_id, id_):
return self.post(
"/service/{}/template/{}".format(service_id, id_),
@@ -231,6 +235,8 @@ class ServiceAPIClient(NotifyAdminAPIClient):
@cache.delete('service-{service_id}-templates')
@cache.delete('template-{template_id}-version-None')
@cache.delete('template-{template_id}-versions')
@cache.delete('service-{service_id}-template-{template_id}-version-None')
@cache.delete('service-{service_id}-template-{template_id}-versions')
def update_service_template_sender(self, service_id, template_id, reply_to):
data = {
'reply_to': reply_to,
@@ -244,6 +250,8 @@ class ServiceAPIClient(NotifyAdminAPIClient):
@cache.delete('service-{service_id}-templates')
@cache.delete('template-{template_id}-version-None')
@cache.delete('template-{template_id}-versions')
@cache.delete('service-{service_id}-template-{template_id}-version-None')
@cache.delete('service-{service_id}-template-{template_id}-versions')
def update_service_template_postage(self, service_id, template_id, postage):
return self.post(
"/service/{0}/template/{1}".format(service_id, template_id),
@@ -302,6 +310,8 @@ class ServiceAPIClient(NotifyAdminAPIClient):
@cache.delete('service-{service_id}-templates')
@cache.delete('template-{template_id}-version-None')
@cache.delete('template-{template_id}-versions')
@cache.delete('service-{service_id}-template-{template_id}-version-None')
@cache.delete('service-{service_id}-template-{template_id}-versions')
def delete_service_template(self, service_id, template_id):
"""
Set a service template's archived flag to True