darkhelm/notifications-api
1
0
Fork 0
mirror of https://github.com/GSA/notifications-api.git synced 2025-12-15 17:52:26 -05:00
Code Issues Packages Projects Releases Wiki Activity

Fix bug in check_service_over_daily_limit

Browse Source 
I forgot to return service_stats if the cache exists. And fixed the tests to check service_stats value.
This commit is contained in:
Rebecca Law
2021-06-29 12:59:20 +01:00
parent 310e1cb4e2
commit ed788cb0bd
2 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
app/notifications/validators.py
View File

@@ -74,6 +74,7 @@ def check_service_over_daily_message_limit(key_type, service):
service.id, int(service_stats), service.message_limit)
)
raise TooManyRequestsError(service.message_limit)
return service_stats
def check_rate_limiting(service, api_key):

13
tests/app/notifications/test_validators.py
View File

@@ -63,7 +63,8 @@ def test_check_service_message_limit_in_cache_under_message_limit_passes(
serialised_service = SerialisedService.from_id(sample_service.id)
mock_get = mocker.patch('app.notifications.validators.redis_store.get', return_value=1)
mock_set = mocker.patch('app.notifications.validators.redis_store.set')
check_service_over_daily_message_limit(key_type, serialised_service)
service_stats = check_service_over_daily_message_limit(key_type, serialised_service)
assert service_stats == 1
mock_get.assert_called_once_with(f'{serialised_service.id}-{datetime.utcnow().strftime("%Y-%m-%d")}-count')
mock_set.assert_not_called()
@@ -72,7 +73,8 @@ def test_check_service_over_daily_message_limit_should_not_interact_with_cache_f
mocker.patch('app.notifications.validators.redis_store')
mock_get = mocker.patch('app.notifications.validators.redis_store.get', side_effect=[None])
serialised_service = SerialisedService.from_id(sample_service.id)
check_service_over_daily_message_limit('test', serialised_service)
service_stats = check_service_over_daily_message_limit('test', serialised_service)
assert service_stats == 0
mock_get.assert_not_called()
@@ -86,18 +88,19 @@ def test_check_service_over_daily_message_limit_should_set_cache_value_as_zero_i
serialised_service = SerialisedService.from_id(sample_service.id)
with freeze_time("2016-01-01 12:00:00.000000"):
mocker.patch('app.notifications.validators.redis_store.set')
check_service_over_daily_message_limit(key_type, serialised_service)
service_stats = check_service_over_daily_message_limit(key_type, serialised_service)
app.notifications.validators.redis_store.set.assert_called_with(
str(sample_service.id) + "-2016-01-01-count", 0, ex=86400
)
assert service_stats == 0
def test_check_service_over_daily_message_limit_does_nothing_if_redis_disabled(notify_api, sample_service, mocker):
serialised_service = SerialisedService.from_id(sample_service.id)
with set_config(notify_api, 'REDIS_ENABLED', False):
mock_cache_key = mocker.patch('notifications_utils.clients.redis.daily_limit_cache_key')
check_service_over_daily_message_limit('normal', serialised_service)
service_stats = check_service_over_daily_message_limit('normal', serialised_service)
assert service_stats == 0
assert mock_cache_key.method_calls == []