Merge pull request #638 from alphagov/remove-contested-writes

Remove contested writes

app/celery/provider_tasks.py

@@ -13,7 +13,6 @@ from app import notify_celery, statsd_client, clients, create_uuid
 from app.clients.email import EmailClientException
 from app.clients.sms import SmsClientException
 from app.dao.notifications_dao import (
-    update_provider_stats,
     get_notification_by_id,
     dao_update_notification,
     update_notification_status_by_id
@@ -78,13 +77,6 @@ def send_sms_to_provider(self, service_id, notification_id):
                 )
                 notification.billable_units = get_sms_fragment_count(template.replaced_content_count)
 
-                update_provider_stats(
-                    notification_id,
-                    SMS_TYPE,
-                    provider.get_name(),
-                    billable_units=notification.billable_units
-                )
-
             notification.sent_at = datetime.utcnow()
             notification.sent_by = provider.get_name()
             notification.status = 'sending'
@@ -101,7 +93,7 @@ def send_sms_to_provider(self, service_id, notification_id):
                     "RETRY FAILED: task send_sms_to_provider failed for notification {}".format(notification.id),
                     e
                 )
-                update_notification_status_by_id(notification.id, 'technical-failure', 'failure')
+                update_notification_status_by_id(notification.id, 'technical-failure')
 
         current_app.logger.info(
             "SMS {} sent to provider at {}".format(notification_id, notification.sent_at)
@@ -163,12 +155,6 @@ def send_email_to_provider(self, service_id, notification_id):
                     reply_to_address=service.reply_to_email_address,
                 )
 
-                update_provider_stats(
-                    notification_id,
-                    EMAIL_TYPE,
-                    provider.get_name(),
-                    billable_units=1
-                )
             notification.reference = reference
             notification.sent_at = datetime.utcnow()
             notification.sent_by = provider.get_name(),
@@ -186,7 +172,7 @@ def send_email_to_provider(self, service_id, notification_id):
                     "RETRY FAILED: task send_email_to_provider failed for notification {}".format(notification.id),
                     e
                 )
-                update_notification_status_by_id(notification.id, 'technical-failure', 'failure')
+                update_notification_status_by_id(notification.id, 'technical-failure')
 
         current_app.logger.info(
             "Email {} sent to provider at {}".format(notification_id, notification.sent_at)

app/celery/scheduled_tasks.py

@@ -91,10 +91,10 @@ def timeout_notifications():
                 seconds=current_app.config.get('SENDING_NOTIFICATIONS_TIMEOUT_PERIOD')
             ):
                 # TODO: think about making this a bulk update rather than one at a time.
-                updated = update_notification_status_by_id(noti.id, 'temporary-failure', STATISTICS_FAILURE)
+                updated = update_notification_status_by_id(noti.id, 'temporary-failure')
                 if updated:
-                    current_app.logger.info(("Timeout period reached for notification ({})"
-                                             ", status has been updated.").format(noti.id))
+                    current_app.logger.info(
+                        "Timeout period reached for notification ({}), status has been updated.".format(noti.id))
         except Exception as e:
             current_app.logger.exception(e)
             current_app.logger.error((

app/celery/tasks.py

@@ -2,7 +2,6 @@ import itertools
 from datetime import (datetime)
 
 from flask import current_app
-from monotonic import monotonic
 from notifications_utils.recipients import (
     RecipientCSV,
     allowed_to_send_to
@@ -13,7 +12,6 @@ from sqlalchemy.exc import SQLAlchemyError
 from app import (
     create_uuid,
     DATETIME_FORMAT,
-    DATE_FORMAT,
     notify_celery,
     encryption
 )
@@ -23,11 +21,8 @@ from app.dao.jobs_dao import (
     dao_update_job,
     dao_get_job_by_id
 )
-from app.dao.notifications_dao import (
-    dao_create_notification,
-    dao_get_notification_statistics_for_service_and_day
-)
-from app.dao.services_dao import dao_fetch_service_by_id
+from app.dao.notifications_dao import (dao_create_notification)
+from app.dao.services_dao import dao_fetch_service_by_id, dao_fetch_todays_stats_for_service
 from app.dao.templates_dao import dao_get_template_by_id
 from app.models import (
     Notification,
@@ -46,14 +41,7 @@ def process_job(job_id):
 
     service = job.service
 
-    stats = dao_get_notification_statistics_for_service_and_day(
-        service_id=service.id,
-        day=job.created_at.strftime(DATE_FORMAT)
-    )
-
-    total_sent = 0
-    if stats:
-        total_sent = stats.emails_requested + stats.sms_requested
+    total_sent = sum(row.count for row in dao_fetch_todays_stats_for_service(service.id))
 
     if total_sent + job.notification_count > service.message_limit:
         job.status = 'sending limits exceeded'
@@ -212,7 +200,7 @@ def _save_notification(created_at, notification, notification_id, service_id, no
         api_key_id=api_key_id,
         key_type=key_type
     )
-    dao_create_notification(notification_db_object, notification_type)
+    dao_create_notification(notification_db_object)
 
 
 def service_allowed_to_send_to(recipient, service):