darkhelm/notifications-api
1
0
Fork 0
mirror of https://github.com/GSA/notifications-api.git synced 2026-02-04 18:31:13 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #875 from alphagov/fix-redis-test-bug

Browse Source 
Stop notifications with test api key incrementing the cache
This commit is contained in:
Rebecca Law
2017-03-30 15:18:56 +01:00
committed by GitHub
parent afea1f241c 3838fb583c
commit 09cc3071be
2 changed files with 37 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
app/notifications/process_notifications.py
View File

@@ -57,10 +57,11 @@ def persist_notification(template_id,
) )
if not simulated: if not simulated:
dao_create_notification(notification) dao_create_notification(notification)
if redis_store.get(redis.daily_limit_cache_key(service.id)): if key_type != KEY_TYPE_TEST:
redis_store.incr(redis.daily_limit_cache_key(service.id)) if redis_store.get(redis.daily_limit_cache_key(service.id)):
if redis_store.get_all_from_hash(cache_key_for_service_template_counter(service.id)): redis_store.incr(redis.daily_limit_cache_key(service.id))
redis_store.increment_hash_value(cache_key_for_service_template_counter(service.id), template_id) if redis_store.get_all_from_hash(cache_key_for_service_template_counter(service.id)):
redis_store.increment_hash_value(cache_key_for_service_template_counter(service.id), template_id)
current_app.logger.info( current_app.logger.info(
"{} {} created at {}".format(notification.notification_type, notification.id, notification.created_at) "{} {} created at {}".format(notification.notification_type, notification.id, notification.created_at)
) )

32
tests/app/notifications/test_process_notification.py
View File

@@ -15,6 +15,7 @@ from app.notifications.process_notifications import (create_content_for_notifica
simulated_recipient) simulated_recipient)
from app.utils import cache_key_for_service_template_counter from app.utils import cache_key_for_service_template_counter
from app.v2.errors import BadRequestError from app.v2.errors import BadRequestError
from tests.app.conftest import sample_api_key as create_api_key
def test_create_content_for_notification_passes(sample_email_template): def test_create_content_for_notification_passes(sample_email_template):
@@ -128,6 +129,37 @@ def test_cache_is_not_incremented_on_failure_to_persist_notification(sample_api_
mock_service_template_cache.assert_not_called() mock_service_template_cache.assert_not_called()
def test_persist_notification_does_not_increment_cache_if_test_key(
notify_db, notify_db_session, sample_template, sample_job, mocker
):
api_key = create_api_key(notify_db=notify_db, notify_db_session=notify_db_session, service=sample_template.service,
key_type='test')
mocker.patch('app.notifications.process_notifications.redis_store.get', return_value="cache")
mocker.patch('app.notifications.process_notifications.redis_store.get_all_from_hash', return_value="cache")
daily_limit_cache = mocker.patch('app.notifications.process_notifications.redis_store.incr')
template_usage_cache = mocker.patch('app.notifications.process_notifications.redis_store.increment_hash_value')
assert Notification.query.count() == 0
assert NotificationHistory.query.count() == 0
persist_notification(
sample_template.id,
sample_template.version,
'+447111111111',
sample_template.service,
{},
'sms',
api_key.id,
api_key.key_type,
job_id=sample_job.id,
job_row_number=100,
reference="ref")
assert Notification.query.count() == 1
assert not daily_limit_cache.called
assert not template_usage_cache.called
@freeze_time("2016-01-01 11:09:00.061258") @freeze_time("2016-01-01 11:09:00.061258")
def test_persist_notification_with_optionals(sample_job, sample_api_key, mocker): def test_persist_notification_with_optionals(sample_job, sample_api_key, mocker):
assert Notification.query.count() == 0 assert Notification.query.count() == 0