Skip to content

Stop incrementing overall message limit for services #4479

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
May 23, 2025
Merged

Stop incrementing overall message limit for services #4479

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions app/notifications/process_notifications.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -170,14 +170,13 @@ def increment_daily_limit_caches(service, notification, key_type):
if key_type == KEY_TYPE_TEST or not current_app.config["REDIS_ENABLED"]:
return

increment_daily_limit_cache(service.id)
increment_daily_limit_cache(service.id, notification.notification_type)

if notification.notification_type == SMS_TYPE and str(notification.phone_prefix) != UK_PREFIX:
increment_daily_limit_cache(service.id, INTERNATIONAL_SMS_TYPE)


def increment_daily_limit_cache(service_id, notification_type=None):
def increment_daily_limit_cache(service_id, notification_type):
cache_key = redis.daily_limit_cache_key(service_id, notification_type=notification_type)
if redis_store.get(cache_key) is None:
# if cache does not exist set the cache to 1 with an expiry of 24 hours,
Expand Down
6 changes: 0 additions & 6 deletions tests/app/notifications/test_process_notification.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -286,7 +286,6 @@ def test_persist_notification_increments_cache_for_trial_or_live_service(
)

assert mock_incr.call_args_list == [
mocker.call(f"{service.id}-2016-01-01-count"),
mocker.call(f"{service.id}-sms-2016-01-01-count"),
]

Expand Down Expand Up @@ -321,7 +320,6 @@ def test_persist_notification_sets_daily_limit_cache_if_one_does_not_exist(
)

assert mock_set.call_args_list == [
mocker.call(f"{service.id}-2016-01-01-count", 1, ex=86400),
mocker.call(f"{service.id}-sms-2016-01-01-count", 1, ex=86400),
]

Expand Down Expand Up @@ -353,7 +351,6 @@ def test_persist_notification_increments_cache_for_international_sms(notify_api,
)

assert mock_incr.call_args_list == [
mocker.call(f"{service.id}-2016-01-01-count"),
mocker.call(f"{service.id}-sms-2016-01-01-count"),
mocker.call(f"{service.id}-international_sms-2016-01-01-count"),
]
Expand Down Expand Up @@ -388,7 +385,6 @@ def test_persist_notification_doesnt_increment_cache_for_international_sms_when_
)

assert mock_incr.call_args_list == [
mocker.call(f"{service.id}-2016-01-01-count"),
mocker.call(f"{service.id}-sms-2016-01-01-count"),
]

Expand All @@ -415,7 +411,6 @@ def test_persist_notification_doesnt_increment_cache_for_international_sms_with_
)

assert mock_incr.call_args_list == [
mocker.call(f"{service.id}-2016-01-01-count"),
mocker.call(f"{service.id}-email-2016-01-01-count"),
]

Expand Down Expand Up @@ -449,7 +444,6 @@ def test_persist_notification_increments_cache_for_international_sms_if_the_cach
)

assert mock_set.call_args_list == [
mocker.call(f"{service.id}-2016-01-01-count", 1, ex=86400),
mocker.call(f"{service.id}-sms-2016-01-01-count", 1, ex=86400),
mocker.call(f"{service.id}-international_sms-2016-01-01-count", 1, ex=86400),
]
Expand Down