From c501c92bf3b1203b1cf78348d0fc96d2bf243e14 Mon Sep 17 00:00:00 2001 From: Rebecca Law Date: Tue, 29 Jun 2021 13:48:38 +0100 Subject: [PATCH] Convert value from redis to an int. This has been properly tested locally with redis enabled. --- app/notifications/validators.py | 2 +- tests/app/notifications/test_validators.py | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/app/notifications/validators.py b/app/notifications/validators.py index dcbd9443b..03a98b812 100644 --- a/app/notifications/validators.py +++ b/app/notifications/validators.py @@ -74,7 +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 + return int(service_stats) def check_rate_limiting(service, api_key): diff --git a/tests/app/notifications/test_validators.py b/tests/app/notifications/test_validators.py index ba662c23e..6f58b5856 100644 --- a/tests/app/notifications/test_validators.py +++ b/tests/app/notifications/test_validators.py @@ -61,7 +61,7 @@ def test_check_service_message_limit_in_cache_under_message_limit_passes( sample_service, mocker): serialised_service = SerialisedService.from_id(sample_service.id) - mock_get = mocker.patch('app.notifications.validators.redis_store.get', return_value=1) + mock_get = mocker.patch('app.notifications.validators.redis_store.get', return_value="1") mock_set = mocker.patch('app.notifications.validators.redis_store.set') service_stats = check_service_over_daily_message_limit(key_type, serialised_service) assert service_stats == 1 @@ -107,7 +107,7 @@ def test_check_service_over_daily_message_limit_does_nothing_if_redis_disabled(n @pytest.mark.parametrize('key_type', ['team', 'normal']) def test_check_service_message_limit_over_message_limit_fails(key_type, mocker, notify_db_session): service = create_service(message_limit=4) - mocker.patch('app.redis_store.get', return_value=5) + mocker.patch('app.redis_store.get', return_value="5") with pytest.raises(TooManyRequestsError) as e: check_service_over_daily_message_limit(key_type, service)