Merge pull request #2014 from alphagov/redis-spike-CHS

Use Redis to cache API calls in admin app

tests/app/main/views/test_service_settings.py

@@ -2123,7 +2123,7 @@ def test_updates_sms_prefixing(
         )
     )
     mock_update_service.assert_called_once_with(
-        service_id=SERVICE_ONE_ID,
+        SERVICE_ONE_ID,
         prefix_sms=expected_api_argument,
     )
 

tests/app/notify_client/test_service_api_client.py

@@ -1,7 +1,9 @@
+from unittest.mock import call
+
 import pytest
 from tests.conftest import SERVICE_ONE_ID, fake_uuid
 
-from app import service_api_client
+from app import service_api_client, user_api_client
 from app.notify_client.service_api_client import ServiceAPIClient
 
 
@@ -33,7 +35,7 @@ def test_client_posts_archived_true_when_deleting_template(mocker):
 )
 def test_client_gets_service(mocker, function, params):
     client = ServiceAPIClient()
-    mock_get = mocker.patch.object(client, 'get')
+    mock_get = mocker.patch.object(client, 'get', return_value={})
 
     function(client, 'foo')
     mock_get.assert_called_once_with('/service/foo', params=params)
@@ -52,7 +54,7 @@ def test_client_creates_service_with_correct_data(
     fake_uuid,
 ):
     client = ServiceAPIClient()
-    mock_post = mocker.patch.object(client, 'post')
+    mock_post = mocker.patch.object(client, 'post', return_value={'data': {'id': None}})
     mocker.patch('app.notify_client.current_user', id='123')
 
     client.create_service(
@@ -133,3 +135,109 @@ def test_client_returns_count_of_service_templates(
     assert service_api_client.count_service_templates(
         SERVICE_ONE_ID, **extra_args
     ) == expected_count
+
+
+@pytest.mark.parametrize(
+    (
+        'expected_cache_get_calls,'
+        'cache_value,'
+        'expected_api_calls,'
+        'expected_cache_set_calls,'
+        'expected_return_value,'
+    ),
+    [
+        (
+            [
+                call('service-{}'.format(SERVICE_ONE_ID))
+            ],
+            b'{"data_from": "cache"}',
+            [],
+            [],
+            {'data_from': 'cache'},
+        ),
+        (
+            [
+                call('service-{}'.format(SERVICE_ONE_ID))
+            ],
+            None,
+            [
+                call('/service/{}'.format(SERVICE_ONE_ID), params={})
+            ],
+            [
+                call(
+                    'service-{}'.format(SERVICE_ONE_ID),
+                    '{"data_from": "api"}',
+                    ex=86400
+                )
+            ],
+            {'data_from': 'api'},
+        ),
+    ]
+)
+def test_returns_value_from_cache(
+    mocker,
+    expected_cache_get_calls,
+    cache_value,
+    expected_return_value,
+    expected_api_calls,
+    expected_cache_set_calls,
+):
+
+    mock_redis_get = mocker.patch(
+        'app.notify_client.RedisClient.get',
+        return_value=cache_value,
+    )
+    mock_api_get = mocker.patch(
+        'app.notify_client.NotifyAdminAPIClient.get',
+        return_value={'data_from': 'api'},
+    )
+    mock_redis_set = mocker.patch(
+        'app.notify_client.RedisClient.set',
+    )
+
+    assert service_api_client.get_service(SERVICE_ONE_ID) == expected_return_value
+
+    assert mock_redis_get.call_args_list == expected_cache_get_calls
+    assert mock_api_get.call_args_list == expected_api_calls
+    assert mock_redis_set.call_args_list == expected_cache_set_calls
+
+
+@pytest.mark.parametrize('client, method, extra_args, extra_kwargs', [
+    (service_api_client, 'update_service', [SERVICE_ONE_ID], {'name': 'foo'}),
+    (service_api_client, 'update_service_with_properties', [SERVICE_ONE_ID], {'properties': {}}),
+    (service_api_client, 'archive_service', [SERVICE_ONE_ID], {}),
+    (service_api_client, 'suspend_service', [SERVICE_ONE_ID], {}),
+    (service_api_client, 'resume_service', [SERVICE_ONE_ID], {}),
+    (service_api_client, 'remove_user_from_service', [SERVICE_ONE_ID, ''], {}),
+    (service_api_client, 'update_whitelist', [SERVICE_ONE_ID, {}], {}),
+    (service_api_client, 'create_service_inbound_api', [SERVICE_ONE_ID] + [''] * 3, {}),
+    (service_api_client, 'update_service_inbound_api', [SERVICE_ONE_ID] + [''] * 4, {}),
+    (service_api_client, 'add_reply_to_email_address', [SERVICE_ONE_ID, ''], {}),
+    (service_api_client, 'update_reply_to_email_address', [SERVICE_ONE_ID] + [''] * 2, {}),
+    (service_api_client, 'add_letter_contact', [SERVICE_ONE_ID, ''], {}),
+    (service_api_client, 'update_letter_contact', [SERVICE_ONE_ID] + [''] * 2, {}),
+    (service_api_client, 'add_sms_sender', [SERVICE_ONE_ID, ''], {}),
+    (service_api_client, 'update_sms_sender', [SERVICE_ONE_ID] + [''] * 2, {}),
+    (service_api_client, 'update_service_callback_api', [SERVICE_ONE_ID] + [''] * 4, {}),
+    (service_api_client, 'create_service_callback_api', [SERVICE_ONE_ID] + [''] * 3, {}),
+    (user_api_client, 'add_user_to_service', [SERVICE_ONE_ID, fake_uuid(), []], {}),
+])
+def test_deletes_service_cache(
+    app_,
+    mock_get_user,
+    mocker,
+    client,
+    method,
+    extra_args,
+    extra_kwargs,
+):
+    mocker.patch('app.notify_client.current_user', id='1')
+    mock_redis_delete = mocker.patch('app.notify_client.RedisClient.delete')
+    mock_request = mocker.patch('notifications_python_client.base.BaseAPIClient.request')
+
+    getattr(client, method)(*extra_args, **extra_kwargs)
+
+    assert mock_redis_delete.call_args_list == [
+        call('service-{}'.format(SERVICE_ONE_ID))
+    ]
+    assert len(mock_request.call_args_list) == 1