From e9607f227d93fb21f77a7afc63df027e2d2c3a51 Mon Sep 17 00:00:00 2001 From: Rebecca Law Date: Fri, 29 Mar 2019 15:38:48 +0000 Subject: [PATCH] Remove query that's no longer needed. --- app/dao/notifications_dao.py | 13 -- .../notification_dao/test_notification_dao.py | 112 ------------------ 2 files changed, 125 deletions(-) diff --git a/app/dao/notifications_dao.py b/app/dao/notifications_dao.py index 4b9b6c7e9..5522940e9 100644 --- a/app/dao/notifications_dao.py +++ b/app/dao/notifications_dao.py @@ -453,19 +453,6 @@ def dao_timeout_notifications(timeout_period_in_seconds): return technical_failure_notifications, temporary_failure_notifications -def get_total_sent_notifications_in_date_range(start_date, end_date, notification_type): - result = db.session.query( - func.count(NotificationHistory.id).label('count') - ).filter( - NotificationHistory.key_type != KEY_TYPE_TEST, - NotificationHistory.created_at >= start_date, - NotificationHistory.created_at <= end_date, - NotificationHistory.notification_type == notification_type - ).scalar() - - return result or 0 - - def is_delivery_slow_for_provider( created_at, provider, diff --git a/tests/app/dao/notification_dao/test_notification_dao.py b/tests/app/dao/notification_dao/test_notification_dao.py index 91df8ec72..e831c5d3e 100644 --- a/tests/app/dao/notification_dao/test_notification_dao.py +++ b/tests/app/dao/notification_dao/test_notification_dao.py @@ -25,7 +25,6 @@ from app.dao.notifications_dao import ( get_notification_with_personalisation, get_notifications_for_job, get_notifications_for_service, - get_total_sent_notifications_in_date_range, is_delivery_slow_for_provider, set_scheduled_notification_to_processed, update_notification_status_by_id, @@ -58,7 +57,6 @@ from tests.app.conftest import ( sample_template as create_sample_template, sample_service, sample_job, - sample_notification_history as create_notification_history, ) from tests.app.db import ( create_job, @@ -1106,116 +1104,6 @@ def test_should_exclude_test_key_notifications_by_default( assert len(all_notifications) == 1 -@pytest.mark.parametrize('notification_type', ['sms', 'email']) -def test_get_total_sent_notifications_in_date_range_returns_only_in_date_range( - notify_db, - notify_db_session, - sample_template, - notification_type -): - notification_history = partial( - create_notification_history, - notify_db, - notify_db_session, - sample_template, - notification_type=notification_type, - status='delivered' - ) - - start_date = datetime(2000, 3, 30, 0, 0, 0, 0) - with freeze_time(start_date): - notification_history(created_at=start_date + timedelta(hours=3)) - notification_history(created_at=start_date + timedelta(hours=5, minutes=10)) - notification_history(created_at=start_date + timedelta(hours=11, minutes=59)) - - end_date = datetime(2000, 3, 31, 0, 0, 0, 0) - notification_history(created_at=end_date + timedelta(seconds=1)) - notification_history(created_at=end_date + timedelta(minutes=10)) - - total_count = get_total_sent_notifications_in_date_range(start_date, end_date, notification_type) - assert total_count == 3 - - -@pytest.mark.parametrize('notification_type', ['sms', 'email']) -def test_get_total_sent_notifications_in_date_range_excludes_test_key_notifications( - notify_db, - notify_db_session, - sample_template, - notification_type -): - notification_history = partial( - create_notification_history, - notify_db, - notify_db_session, - sample_template, - notification_type=notification_type, - status='delivered' - ) - - start_date = datetime(2000, 3, 30, 0, 0, 0, 0) - end_date = datetime(2000, 3, 31, 0, 0, 0, 0) - with freeze_time(start_date): - notification_history(key_type=KEY_TYPE_TEAM) - notification_history(key_type=KEY_TYPE_TEAM) - notification_history(key_type=KEY_TYPE_NORMAL) - notification_history(key_type=KEY_TYPE_TEST) - - total_count = get_total_sent_notifications_in_date_range(start_date, end_date, notification_type) - assert total_count == 3 - - -def test_get_total_sent_notifications_for_sms_excludes_email_counts( - notify_db, - notify_db_session, - sample_template -): - notification_history = partial( - create_notification_history, - notify_db, - notify_db_session, - sample_template, - status='delivered' - ) - - start_date = datetime(2000, 3, 30, 0, 0, 0, 0) - end_date = datetime(2000, 3, 31, 0, 0, 0, 0) - with freeze_time(start_date): - notification_history(notification_type='email') - notification_history(notification_type='email') - notification_history(notification_type='sms') - notification_history(notification_type='sms') - notification_history(notification_type='sms') - - total_count = get_total_sent_notifications_in_date_range(start_date, end_date, 'sms') - assert total_count == 3 - - -def test_get_total_sent_notifications_for_email_excludes_sms_counts( - notify_db, - notify_db_session, - sample_template -): - notification_history = partial( - create_notification_history, - notify_db, - notify_db_session, - sample_template, - status='delivered' - ) - - start_date = datetime(2000, 3, 30, 0, 0, 0, 0) - end_date = datetime(2000, 3, 31, 0, 0, 0, 0) - with freeze_time(start_date): - notification_history(notification_type='email') - notification_history(notification_type='email') - notification_history(notification_type='sms') - notification_history(notification_type='sms') - notification_history(notification_type='sms') - - total_count = get_total_sent_notifications_in_date_range(start_date, end_date, 'email') - assert total_count == 2 - - @pytest.mark.parametrize( "normal_sending,slow_sending,normal_delivered,slow_delivered,threshold,expected_result", [