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

Merge pull request #3671 from alphagov/template-folder-cache

Browse Source 
Clear new template folder cache
This commit is contained in:
David McDonald
2020-10-06 09:55:33 +01:00
committed by GitHub
parent 229d5eb716 8ec9fe96a9
commit 4113fabdcb
4 changed files with 8 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/main/views/platform_admin.py
+2 -2
View File
@@ -415,8 +415,8 @@ def clear_cache():
]), ]),
('template', [ ('template', [
'service-????????-????-????-????-????????????-templates', 'service-????????-????-????-????-????????????-templates',
'template-????????-????-????-????-????????????-version-*', 'service-????????-????-????-????-????????????-template-????????-????-????-????-????????????-version-*',
'template-????????-????-????-????-????????????-versions', 'service-????????-????-????-????-????????????-template-????????-????-????-????-????????????-versions',
]), ]),
('email_branding', [ ('email_branding', [
'email_branding', 'email_branding',
app/notify_client/template_folder_api_client.py
+1 -4
View File
@@ -49,10 +49,7 @@ class TemplateFolderAPIClient(NotifyAdminAPIClient):
}) })
if template_ids: if template_ids:
redis_client.delete(*map( redis_client.delete(*(f'service-{service_id}-template-{id}-version-None' for id in template_ids))
'template-{}-version-None'.format,
template_ids,
))
@cache.delete('service-{service_id}-template-folders') @cache.delete('service-{service_id}-template-folders')
def update_template_folder(self, service_id, template_folder_id, name, users_with_permission=None): def update_template_folder(self, service_id, template_folder_id, name, users_with_permission=None):
tests/app/main/views/test_platform_admin.py
+2 -2
View File
@@ -690,8 +690,8 @@ def test_clear_cache_shows_form(client_request, platform_admin_user, mocker):
@pytest.mark.parametrize('model_type, expected_calls, expected_confirmation', ( @pytest.mark.parametrize('model_type, expected_calls, expected_confirmation', (
('template', [ ('template', [
call('service-????????-????-????-????-????????????-templates'), call('service-????????-????-????-????-????????????-templates'),
call('template-????????-????-????-????-????????????-version-*'), call('service-????????-????-????-????-????????????-template-????????-????-????-????-????????????-version-*'),
call('template-????????-????-????-????-????????????-versions'), call('service-????????-????-????-????-????????????-template-????????-????-????-????-????????????-versions'),
], 'Removed 3 template objects from redis'), ], 'Removed 3 template objects from redis'),
('service', [ ('service', [
call('has_jobs-????????-????-????-????-????????????'), call('has_jobs-????????-????-????-????-????????????'),
tests/app/notify_client/test_template_folder_client.py
+3 -3
View File
@@ -74,9 +74,9 @@ def test_move_templates_and_folders(mocker):
) )
assert mock_redis_delete.call_args_list == [ assert mock_redis_delete.call_args_list == [
call( call(
'template-a-version-None', f'service-{some_service_id}-template-a-version-None',
'template-b-version-None', f'service-{some_service_id}-template-b-version-None',
'template-c-version-None', f'service-{some_service_id}-template-c-version-None',
), ),
call('service-{}-templates'.format(some_service_id)), call('service-{}-templates'.format(some_service_id)),
call('service-{}-template-folders'.format(some_service_id)), call('service-{}-template-folders'.format(some_service_id)),