Provider stats only updated if the provider successfully sends the message.

tests/app/dao/test_notification_dao.py

@@ -25,7 +25,7 @@ from app.dao.notifications_dao import (
     delete_notifications_created_more_than_a_week_ago,
     dao_get_notification_statistics_for_service_and_day,
     update_notification_status_by_id,
-    update_notification_reference_by_id,
+    update_notification_after_sent_to_provider,
     update_notification_status_by_reference,
     dao_get_template_statistics_for_service,
     get_notifications_for_service
@@ -36,10 +36,13 @@ from notifications_utils.template import get_sms_fragment_count
 from tests.app.conftest import (sample_notification)
 
 
-def test_should_by_able_to_update_reference_by_id(sample_notification):
+def test_should_by_able_to_update_reference_by_notification_id(sample_notification, mmg_provider):
     assert not Notification.query.get(sample_notification.id).reference
-    count = update_notification_reference_by_id(sample_notification.id, 'reference')
-    assert count == 1
+    update_notification_after_sent_to_provider(
+        sample_notification.id,
+        'sms',
+        mmg_provider.identifier,
+        reference='reference')
     assert Notification.query.get(sample_notification.id).reference == 'reference'
 
 
@@ -53,7 +56,11 @@ def test_should_by_able_to_update_status_by_reference(sample_email_template, ses
         ses_provider.identifier)
 
     assert Notification.query.get(notification.id).status == "sending"
-    update_notification_reference_by_id(notification.id, 'reference')
+    update_notification_after_sent_to_provider(
+        notification.id,
+        'email',
+        ses_provider.identifier,
+        reference="reference")
     update_notification_status_by_reference('reference', 'delivered', 'delivered')
     assert Notification.query.get(notification.id).status == 'delivered'
     _assert_notification_stats(notification.service_id, emails_delivered=1, emails_requested=1, emails_failed=0)
@@ -140,7 +147,11 @@ def test_should_not_update_status_one_notification_status_is_delivered(sample_em
         ses_provider.identifier)
 
     assert Notification.query.get(notification.id).status == "sending"
-    update_notification_reference_by_id(notification.id, 'reference')
+    update_notification_after_sent_to_provider(
+        notification.id,
+        'email',
+        ses_provider.identifier,
+        reference='reference')
     update_notification_status_by_reference('reference', 'delivered', 'delivered')
     assert Notification.query.get(notification.id).status == 'delivered'
 
@@ -163,7 +174,11 @@ def test_should_be_able_to_record_statistics_failure_for_email(sample_email_temp
     notification = Notification(**data)
     dao_create_notification(notification, sample_email_template.template_type, ses_provider.identifier)
 
-    update_notification_reference_by_id(notification.id, 'reference')
+    update_notification_after_sent_to_provider(
+        notification.id,
+        'email',
+        ses_provider.identifier,
+        reference='reference')
     count = update_notification_status_by_reference('reference', 'failed', 'failure')
     assert count == 1
     assert Notification.query.get(notification.id).status == 'failed'

tests/app/dao/test_notifications_dao_provider_statistics.py

@@ -1,6 +1,6 @@
 from datetime import (date, timedelta)
 from app.models import ProviderStatistics
-
+from app.dao.notifications_dao import update_notification_after_sent_to_provider
 from app.dao.provider_statistics_dao import (
     get_provider_statistics, get_fragment_count)
 from tests.app.conftest import sample_notification as create_sample_notification
@@ -10,10 +10,11 @@ def test_should_update_provider_statistics_sms(notify_db,
                                                notify_db_session,
                                                sample_template,
                                                mmg_provider):
-    create_sample_notification(
+    n1 = create_sample_notification(
         notify_db,
         notify_db_session,
         template=sample_template)
+    update_notification_after_sent_to_provider(n1.id, 'sms', mmg_provider.identifier)
     provider_stats = get_provider_statistics(
         sample_template.service,
         providers=[mmg_provider.identifier]).one()
@@ -24,10 +25,11 @@ def test_should_update_provider_statistics_email(notify_db,
                                                  notify_db_session,
                                                  sample_email_template,
                                                  ses_provider):
-    create_sample_notification(
+    n1 = create_sample_notification(
         notify_db,
         notify_db_session,
         template=sample_email_template)
+    update_notification_after_sent_to_provider(n1.id, 'email', ses_provider.identifier, reference="reference")
     provider_stats = get_provider_statistics(
         sample_email_template.service,
         providers=[ses_provider.identifier]).one()
@@ -38,21 +40,27 @@ def test_should_update_provider_statistics_sms_multi(notify_db,
                                                      notify_db_session,
                                                      sample_template,
                                                      mmg_provider):
-    create_sample_notification(
+    n1 = create_sample_notification(
         notify_db,
         notify_db_session,
         template=sample_template,
+        provider_name=mmg_provider.identifier,
         content_char_count=160)
-    create_sample_notification(
+    update_notification_after_sent_to_provider(n1.id, 'sms', mmg_provider.identifier)
+    n2 = create_sample_notification(
         notify_db,
         notify_db_session,
         template=sample_template,
+        provider_name=mmg_provider.identifier,
         content_char_count=161)
-    create_sample_notification(
+    update_notification_after_sent_to_provider(n2.id, 'sms', mmg_provider.identifier)
+    n3 = create_sample_notification(
         notify_db,
         notify_db_session,
         template=sample_template,
+        provider_name=mmg_provider.identifier,
         content_char_count=307)
+    update_notification_after_sent_to_provider(n3.id, 'sms', mmg_provider.identifier)
     provider_stats = get_provider_statistics(
         sample_template.service,
         providers=[mmg_provider.identifier]).one()
@@ -63,18 +71,24 @@ def test_should_update_provider_statistics_email_multi(notify_db,
                                                        notify_db_session,
                                                        sample_email_template,
                                                        ses_provider):
-    create_sample_notification(
+    n1 = create_sample_notification(
         notify_db,
         notify_db_session,
-        template=sample_email_template)
-    create_sample_notification(
+        template=sample_email_template,
+        provider_name=ses_provider.identifier)
+    update_notification_after_sent_to_provider(n1.id, 'email', ses_provider.identifier, reference="reference")
+    n2 = create_sample_notification(
         notify_db,
         notify_db_session,
-        template=sample_email_template)
-    create_sample_notification(
+        template=sample_email_template,
+        provider_name=ses_provider.identifier)
+    update_notification_after_sent_to_provider(n2.id, 'email', ses_provider.identifier, reference="reference")
+    n3 = create_sample_notification(
         notify_db,
         notify_db_session,
-        template=sample_email_template)
+        template=sample_email_template,
+        provider_name=ses_provider.identifier)
+    update_notification_after_sent_to_provider(n3.id, 'email', ses_provider.identifier, reference="reference")
     provider_stats = get_provider_statistics(
         sample_email_template.service,
         providers=[ses_provider.identifier]).one()