retry

app/celery/tasks.py

@@ -30,11 +30,9 @@ from app.models import (
     SMS_TYPE,
 )
 from app.notifications.process_notifications import persist_notification
-from app.notifications.validators import check_service_over_daily_message_limit
 from app.serialised_models import SerialisedService, SerialisedTemplate
 from app.service.utils import service_allowed_to_send_to
 from app.utils import DATETIME_FORMAT
-from app.v2.errors import TooManyRequestsError
 
 
 @notify_celery.task(name="process-job")
@@ -59,9 +57,6 @@ def process_job(job_id, sender_id=None):
             "Job {} has been cancelled, service {} is inactive".format(job_id, service.id))
         return
 
-    if __sending_limits_for_job_exceeded(service, job, job_id):
-        return
-
     recipient_csv, template, sender_id = get_recipient_csv_and_template_and_sender_id(job)
 
     current_app.logger.info("Starting job {} processing {} notifications".format(job_id, job.notification_count))
@@ -134,24 +129,6 @@ def process_row(row, template, job, service, sender_id=None):
     return notification_id
 
 
-def __sending_limits_for_job_exceeded(service, job, job_id):
-    try:
-        total_sent = check_service_over_daily_message_limit(KEY_TYPE_NORMAL, service)
-        if total_sent + job.notification_count > service.message_limit:
-            raise TooManyRequestsError(service.message_limit)
-        else:
-            return False
-    except TooManyRequestsError:
-        job.job_status = 'sending limits exceeded'
-        job.processing_finished = datetime.utcnow()
-        dao_update_job(job)
-        current_app.logger.info(
-            "Job {} size {} error. Sending limits {} exceeded".format(
-                job_id, job.notification_count, service.message_limit)
-        )
-        return True
-
-
 @notify_celery.task(bind=True, name="save-sms", max_retries=5, default_retry_delay=300)
 def save_sms(self,
              service_id,

app/notifications/process_notifications.py

@@ -138,21 +138,7 @@ def persist_notification(
         dao_create_notification(notification)
         if key_type != KEY_TYPE_TEST and current_app.config['REDIS_ENABLED']:
             current_app.logger.info('Redis enabled, querying cache key for service id: {}'.format(service.id))
-            cache_key = redis.daily_limit_cache_key(service.id)
             total_key = redis.daily_total_cache_key()
-            current_app.logger.info('Redis daily limit cache key: {}'.format(cache_key))
-            if redis_store.get(cache_key) is None:
-                current_app.logger.info('Redis daily limit cache key does not exist')
-                # if cache does not exist set the cache to 1 with an expiry of 24 hours,
-                # The cache should be set by the time we create the notification
-                # but in case it is this will make sure the expiry is set to 24 hours,
-                # where if we let the incr method create the cache it will be set a ttl.
-                redis_store.set(cache_key, 1, ex=86400)
-                current_app.logger.info('Set redis daily limit cache key to 1')
-            else:
-                current_app.logger.info('Redis daily limit cache key does exist')
-                redis_store.incr(cache_key)
-                current_app.logger.info('Redis daily limit cache key has been incremented')
             if redis_store.get(total_key) is None:
                 current_app.logger.info('Redis daily total cache key does not exist')
                 redis_store.set(total_key, 1, ex=86400)

app/notifications/validators.py

@@ -2,7 +2,6 @@ from flask import current_app
 from gds_metrics.metrics import Histogram
 from notifications_utils import SMS_CHAR_COUNT_LIMIT
 from notifications_utils.clients.redis import (
-    daily_limit_cache_key,
     daily_total_cache_key,
     rate_limit_cache_key,
 )
@@ -30,12 +29,7 @@ from app.notifications.process_notifications import (
 from app.serialised_models import SerialisedTemplate
 from app.service.utils import service_allowed_to_send_to
 from app.utils import get_public_notify_type_text
-from app.v2.errors import (
-    BadRequestError,
-    RateLimitError,
-    TooManyRequestsError,
-    TotalRequestsError,
-)
+from app.v2.errors import BadRequestError, RateLimitError, TotalRequestsError
 
 REDIS_EXCEEDED_RATE_LIMIT_DURATION_SECONDS = Histogram(
     'redis_exceeded_rate_limit_duration_seconds',
@@ -54,26 +48,6 @@ def check_service_over_api_rate_limit(service, api_key):
                 raise RateLimitError(rate_limit, interval, api_key.key_type)
 
 
-def check_service_over_daily_message_limit(key_type, service):
-    if key_type == KEY_TYPE_TEST or not current_app.config['REDIS_ENABLED']:
-        return 0
-
-    cache_key = daily_limit_cache_key(service.id)
-    service_stats = redis_store.get(cache_key)
-    if service_stats is None:
-        # first message of the day, set the cache to 0 and the expiry to 24 hours
-        service_stats = 0
-        redis_store.set(cache_key, service_stats, ex=86400)
-        return service_stats
-    if int(service_stats) >= service.message_limit:
-        current_app.logger.info(
-            "service {} has been rate limited for daily use sent {} limit {}".format(
-                service.id, int(service_stats), service.message_limit)
-        )
-        raise TooManyRequestsError(service.message_limit)
-    return int(service_stats)
-
-
 def check_application_over_daily_message_total(key_type, service):
     if key_type == KEY_TYPE_TEST or not current_app.config['REDIS_ENABLED']:
         return 0
@@ -98,7 +72,6 @@ def check_application_over_daily_message_total(key_type, service):
 def check_rate_limiting(service, api_key):
     check_service_over_api_rate_limit(service, api_key)
     check_application_over_daily_message_total(api_key.key_type, service)
-    check_service_over_daily_message_limit(api_key.key_type, service)
 
 
 def check_template_is_for_notification_type(notification_type, template_type):

app/service/send_notification.py

@@ -12,7 +12,6 @@ from app.notifications.process_notifications import (
     send_notification_to_queue,
 )
 from app.notifications.validators import (
-    check_service_over_daily_message_limit,
     validate_and_format_recipient,
     validate_template,
 )
@@ -45,8 +44,6 @@ def send_one_off_notification(service_id, post_data):
 
     validate_template(template.id, personalisation, service, template.template_type)
 
-    check_service_over_daily_message_limit(KEY_TYPE_NORMAL, service)
-
     validate_and_format_recipient(
         send_to=post_data['to'],
         key_type=KEY_TYPE_NORMAL,