rework get_fragment_count to not use ProviderStatistics

use NotficationHistory instead. Unfortunately this means the SQL gets a bit gnarly, as we have to repeat notifications_utils' `get_sms_fragment_count` functionality inside a SELECT 😱
2026-09-11 10:28:55 -04:00 · 2016-08-03 16:29:30 +01:00
parent bac27d688b
commit 1617f058e2
4 changed files with 118 additions and 100 deletions
@@ -0,0 +1,141 @@
+from datetime import datetime
+import uuid
+
+from app.models import NotificationHistory, KEY_TYPE_NORMAL, NOTIFICATION_STATUS_TYPES
+from app.dao.notifications_dao import update_provider_stats
+from app.dao.provider_statistics_dao import (
+    get_provider_statistics, get_fragment_count)
+from tests.app.conftest import sample_notification as create_sample_notification
+
+
+def test_should_update_provider_statistics_sms(notify_db,
+                                               notify_db_session,
+                                               sample_template,
+                                               mmg_provider):
+    n1 = create_sample_notification(
+        notify_db,
+        notify_db_session,
+        template=sample_template)
+    update_provider_stats(n1.id, 'sms', mmg_provider.identifier)
+    provider_stats = get_provider_statistics(
+        sample_template.service,
+        providers=[mmg_provider.identifier]).one()
+    assert provider_stats.unit_count == 1
+
+
+def test_should_update_provider_statistics_email(notify_db,
+                                                 notify_db_session,
+                                                 sample_email_template,
+                                                 ses_provider):
+    n1 = create_sample_notification(
+        notify_db,
+        notify_db_session,
+        template=sample_email_template)
+    update_provider_stats(n1.id, 'email', ses_provider.identifier)
+    provider_stats = get_provider_statistics(
+        sample_email_template.service,
+        providers=[ses_provider.identifier]).one()
+    assert provider_stats.unit_count == 1
+
+
+def test_should_update_provider_statistics_sms_multi(notify_db,
+                                                     notify_db_session,
+                                                     sample_template,
+                                                     mmg_provider):
+    n1 = create_sample_notification(
+        notify_db,
+        notify_db_session,
+        template=sample_template,
+        content_char_count=160)
+    update_provider_stats(n1.id, 'sms', mmg_provider.identifier)
+    n2 = create_sample_notification(
+        notify_db,
+        notify_db_session,
+        template=sample_template,
+        content_char_count=161)
+    update_provider_stats(n2.id, 'sms', mmg_provider.identifier)
+    n3 = create_sample_notification(
+        notify_db,
+        notify_db_session,
+        template=sample_template,
+        content_char_count=307)
+    update_provider_stats(n3.id, 'sms', mmg_provider.identifier)
+    provider_stats = get_provider_statistics(
+        sample_template.service,
+        providers=[mmg_provider.identifier]).one()
+    assert provider_stats.unit_count == 6
+
+
+def test_should_update_provider_statistics_email_multi(notify_db,
+                                                       notify_db_session,
+                                                       sample_email_template,
+                                                       ses_provider):
+    n1 = create_sample_notification(
+        notify_db,
+        notify_db_session,
+        template=sample_email_template)
+    update_provider_stats(n1.id, 'email', ses_provider.identifier)
+    n2 = create_sample_notification(
+        notify_db,
+        notify_db_session,
+        template=sample_email_template)
+    update_provider_stats(n2.id, 'email', ses_provider.identifier)
+    n3 = create_sample_notification(
+        notify_db,
+        notify_db_session,
+        template=sample_email_template)
+    update_provider_stats(n3.id, 'email', ses_provider.identifier)
+    provider_stats = get_provider_statistics(
+        sample_email_template.service,
+        providers=[ses_provider.identifier]).one()
+    assert provider_stats.unit_count == 3
+
+
+def test_get_fragment_count_with_no_data(sample_template):
+    assert get_fragment_count(sample_template.service_id)['sms_count'] == 0
+    assert get_fragment_count(sample_template.service_id)['email_count'] == 0
+
+
+def test_get_fragment_count_separates_sms_and_email(notify_db, sample_template, sample_email_template):
+    noti_hist(notify_db, sample_template)
+    noti_hist(notify_db, sample_template)
+    noti_hist(notify_db, sample_email_template)
+    assert get_fragment_count(sample_template.service_id) == {
+        'sms_count': 2,
+        'email_count': 1
+    }
+
+
+def test_get_fragment_count_filters_on_status(notify_db, sample_template):
+    for status in NOTIFICATION_STATUS_TYPES:
+        noti_hist(notify_db, sample_template, status=status)
+    # sending, delivered, failed, technical-failure, temporary-failure, permanent-failure
+    assert get_fragment_count(sample_template.service_id)['sms_count'] == 6
+
+
+def test_get_fragment_count_sums_char_count_for_sms(notify_db, sample_template):
+    noti_hist(notify_db, sample_template, content_char_count=1)  # 1
+    noti_hist(notify_db, sample_template, content_char_count=159)  # 1
+    noti_hist(notify_db, sample_template, content_char_count=310)  # 2
+    assert get_fragment_count(sample_template.service_id)['sms_count'] == 4
+
+
+def noti_hist(notify_db, template, status='delivered', content_char_count=None):
+    if not content_char_count and template.template_type == 'sms':
+        content_char_count = 1
+
+    notification_history = NotificationHistory(
+        id=uuid.uuid4(),
+        service=template.service,
+        template=template,
+        template_version=template.version,
+        status=status,
+        created_at=datetime.utcnow(),
+        content_char_count=content_char_count,
+        notification_type=template.template_type,
+        key_type=KEY_TYPE_NORMAL
+    )
+    notify_db.session.add(notification_history)
+    notify_db.session.commit()
+
+    return notification_history