From 8ec9fe96a919f8546dab450603cda90c5428f806 Mon Sep 17 00:00:00 2001 From: Leo Hemsted Date: Mon, 5 Oct 2020 16:57:18 +0100 Subject: [PATCH] Delete new format template cache when moving folders --- app/notify_client/template_folder_api_client.py | 5 +---- tests/app/notify_client/test_template_folder_client.py | 6 +++--- 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/app/notify_client/template_folder_api_client.py b/app/notify_client/template_folder_api_client.py index 4755cfca2..005e82898 100644 --- a/app/notify_client/template_folder_api_client.py +++ b/app/notify_client/template_folder_api_client.py @@ -49,10 +49,7 @@ class TemplateFolderAPIClient(NotifyAdminAPIClient): }) if template_ids: - redis_client.delete(*map( - 'template-{}-version-None'.format, - template_ids, - )) + redis_client.delete(*(f'service-{service_id}-template-{id}-version-None' for id in template_ids)) @cache.delete('service-{service_id}-template-folders') def update_template_folder(self, service_id, template_folder_id, name, users_with_permission=None): diff --git a/tests/app/notify_client/test_template_folder_client.py b/tests/app/notify_client/test_template_folder_client.py index f1b8726e1..275bb8a4e 100644 --- a/tests/app/notify_client/test_template_folder_client.py +++ b/tests/app/notify_client/test_template_folder_client.py @@ -74,9 +74,9 @@ def test_move_templates_and_folders(mocker): ) assert mock_redis_delete.call_args_list == [ call( - 'template-a-version-None', - 'template-b-version-None', - 'template-c-version-None', + f'service-{some_service_id}-template-a-version-None', + f'service-{some_service_id}-template-b-version-None', + f'service-{some_service_id}-template-c-version-None', ), call('service-{}-templates'.format(some_service_id)), call('service-{}-template-folders'.format(some_service_id)),