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

Merge pull request #3639 from alphagov/use-new-redis-key

Browse Source 
Step 2 of renaming cache keys for templates
This commit is contained in:
David McDonald
2020-10-02 13:58:00 +01:00
committed by GitHub
parent 3182fc7668 a538329d0e
commit 0e32df4514
4 changed files with 16 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/notify_client/broadcast_message_api_client.py
View File

@@ -27,7 +27,7 @@ class BroadcastMessageAPIClient(NotifyAdminAPIClient):
def get_broadcast_messages(self, service_id): def get_broadcast_messages(self, service_id):
return self.get(f'/service/{service_id}/broadcast-message')['broadcast_messages'] return self.get(f'/service/{service_id}/broadcast-message')['broadcast_messages']
@cache.set('broadcast-message-{broadcast_message_id}') @cache.set('service-{service_id}-broadcast-message-{broadcast_message_id}')
def get_broadcast_message(self, *, service_id, broadcast_message_id): def get_broadcast_message(self, *, service_id, broadcast_message_id):
return self.get(f'/service/{service_id}/broadcast-message/{broadcast_message_id}') return self.get(f'/service/{service_id}/broadcast-message/{broadcast_message_id}')

4
app/notify_client/service_api_client.py
View File

@@ -258,7 +258,7 @@ class ServiceAPIClient(NotifyAdminAPIClient):
_attach_current_user({'postage': postage}) _attach_current_user({'postage': postage})
) )
@cache.set('template-{template_id}-version-{version}') @cache.set('service-{service_id}-template-{template_id}-version-{version}')
def get_service_template(self, service_id, template_id, version=None): def get_service_template(self, service_id, template_id, version=None):
""" """
Retrieve a service template. Retrieve a service template.
@@ -270,7 +270,7 @@ class ServiceAPIClient(NotifyAdminAPIClient):
endpoint = '{base}/version/{version}'.format(base=endpoint, version=version) endpoint = '{base}/version/{version}'.format(base=endpoint, version=version)
return self.get(endpoint) return self.get(endpoint)
@cache.set('template-{template_id}-versions') @cache.set('service-{service_id}-template-{template_id}-versions')
def get_service_template_versions(self, service_id, template_id): def get_service_template_versions(self, service_id, template_id):
""" """
Retrieve a list of versions for a template Retrieve a list of versions for a template

2
tests/app/notify_client/test_broadcast_message_client.py
View File

@@ -50,7 +50,7 @@ def test_get_broadcast_message(mocker):
'/service/12345/broadcast-message/67890', '/service/12345/broadcast-message/67890',
) )
mock_redis_set.assert_called_once_with( mock_redis_set.assert_called_once_with(
'broadcast-message-67890', 'service-12345-broadcast-message-67890',
'{"abc": "def"}', '{"abc": "def"}',
ex=604_800, ex=604_800,
) )

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

@@ -200,7 +200,7 @@ def test_client_returns_count_of_service_templates(
service_api_client.get_service_template, service_api_client.get_service_template,
[SERVICE_ONE_ID, FAKE_TEMPLATE_ID], [SERVICE_ONE_ID, FAKE_TEMPLATE_ID],
[ [
call('template-{}-version-None'.format(FAKE_TEMPLATE_ID)) call('service-{}-template-{}-version-None'.format(SERVICE_ONE_ID, FAKE_TEMPLATE_ID))
], ],
b'{"data_from": "cache"}', b'{"data_from": "cache"}',
[], [],
@@ -211,7 +211,7 @@ def test_client_returns_count_of_service_templates(
service_api_client.get_service_template, service_api_client.get_service_template,
[SERVICE_ONE_ID, FAKE_TEMPLATE_ID], [SERVICE_ONE_ID, FAKE_TEMPLATE_ID],
[ [
call('template-{}-version-None'.format(FAKE_TEMPLATE_ID)) call('service-{}-template-{}-version-None'.format(SERVICE_ONE_ID, FAKE_TEMPLATE_ID)),
], ],
None, None,
[ [
@@ -219,10 +219,10 @@ def test_client_returns_count_of_service_templates(
], ],
[ [
call( call(
'template-{}-version-None'.format(FAKE_TEMPLATE_ID), 'service-{}-template-{}-version-None'.format(SERVICE_ONE_ID, FAKE_TEMPLATE_ID),
'{"data_from": "api"}', '{"data_from": "api"}',
ex=604800, ex=604800,
) ),
], ],
{'data_from': 'api'}, {'data_from': 'api'},
), ),
@@ -230,7 +230,7 @@ def test_client_returns_count_of_service_templates(
service_api_client.get_service_template, service_api_client.get_service_template,
[SERVICE_ONE_ID, FAKE_TEMPLATE_ID, 1], [SERVICE_ONE_ID, FAKE_TEMPLATE_ID, 1],
[ [
call('template-{}-version-1'.format(FAKE_TEMPLATE_ID)) call('service-{}-template-{}-version-1'.format(SERVICE_ONE_ID, FAKE_TEMPLATE_ID))
], ],
b'{"data_from": "cache"}', b'{"data_from": "cache"}',
[], [],
@@ -241,7 +241,7 @@ def test_client_returns_count_of_service_templates(
service_api_client.get_service_template, service_api_client.get_service_template,
[SERVICE_ONE_ID, FAKE_TEMPLATE_ID, 1], [SERVICE_ONE_ID, FAKE_TEMPLATE_ID, 1],
[ [
call('template-{}-version-1'.format(FAKE_TEMPLATE_ID)) call('service-{}-template-{}-version-1'.format(SERVICE_ONE_ID, FAKE_TEMPLATE_ID)),
], ],
None, None,
[ [
@@ -249,10 +249,10 @@ def test_client_returns_count_of_service_templates(
], ],
[ [
call( call(
'template-{}-version-1'.format(FAKE_TEMPLATE_ID), 'service-{}-template-{}-version-1'.format(SERVICE_ONE_ID, FAKE_TEMPLATE_ID),
'{"data_from": "api"}', '{"data_from": "api"}',
ex=604800, ex=604800,
) ),
], ],
{'data_from': 'api'}, {'data_from': 'api'},
), ),
@@ -290,7 +290,7 @@ def test_client_returns_count_of_service_templates(
service_api_client.get_service_template_versions, service_api_client.get_service_template_versions,
[SERVICE_ONE_ID, FAKE_TEMPLATE_ID], [SERVICE_ONE_ID, FAKE_TEMPLATE_ID],
[ [
call('template-{}-versions'.format(FAKE_TEMPLATE_ID)) call('service-{}-template-{}-versions'.format(SERVICE_ONE_ID, FAKE_TEMPLATE_ID))
], ],
b'{"data_from": "cache"}', b'{"data_from": "cache"}',
[], [],
@@ -301,7 +301,7 @@ def test_client_returns_count_of_service_templates(
service_api_client.get_service_template_versions, service_api_client.get_service_template_versions,
[SERVICE_ONE_ID, FAKE_TEMPLATE_ID], [SERVICE_ONE_ID, FAKE_TEMPLATE_ID],
[ [
call('template-{}-versions'.format(FAKE_TEMPLATE_ID)) call('service-{}-template-{}-versions'.format(SERVICE_ONE_ID, FAKE_TEMPLATE_ID)),
], ],
None, None,
[ [
@@ -309,10 +309,10 @@ def test_client_returns_count_of_service_templates(
], ],
[ [
call( call(
'template-{}-versions'.format(FAKE_TEMPLATE_ID), 'service-{}-template-{}-versions'.format(SERVICE_ONE_ID, FAKE_TEMPLATE_ID),
'{"data_from": "api"}', '{"data_from": "api"}',
ex=604800, ex=604800,
) ),
], ],
{'data_from': 'api'}, {'data_from': 'api'},
), ),