Remove unused functions for getting template statistics

tests/app/dao/notification_dao/test_notification_dao.py

@@ -16,7 +16,6 @@ from app.dao.notifications_dao import (
     dao_get_last_template_usage,
     dao_get_notifications_by_to_field,
     dao_get_scheduled_notifications,
-    dao_get_template_usage,
     dao_timeout_notifications,
     dao_update_notification,
     dao_update_notifications_by_reference,
@@ -70,7 +69,6 @@ from tests.app.db import (
 
 def test_should_have_decorated_notifications_dao_functions():
     assert dao_get_last_template_usage.__wrapped__.__name__ == 'dao_get_last_template_usage'  # noqa
-    assert dao_get_template_usage.__wrapped__.__name__ == 'dao_get_template_usage'  # noqa
     assert dao_create_notification.__wrapped__.__name__ == 'dao_create_notification'  # noqa
     assert update_notification_status_by_id.__wrapped__.__name__ == 'update_notification_status_by_id'  # noqa
     assert dao_update_notification.__wrapped__.__name__ == 'dao_update_notification'  # noqa

tests/app/dao/notification_dao/test_notification_dao_template_usage.py

@@ -1,23 +1,7 @@
-import uuid
-from datetime import datetime, timedelta, date
-
+from datetime import datetime, timedelta
 import pytest
-from freezegun import freeze_time
-
-from app.dao.notifications_dao import (
-    dao_get_last_template_usage,
-    dao_get_template_usage
-)
-from app.models import (
-    KEY_TYPE_NORMAL,
-    KEY_TYPE_TEST,
-    KEY_TYPE_TEAM
-)
-from tests.app.db import (
-    create_notification,
-    create_service,
-    create_template
-)
+from app.dao.notifications_dao import dao_get_last_template_usage
+from tests.app.db import create_notification, create_template
 
 
 def test_last_template_usage_should_get_right_data(sample_notification):
@@ -70,117 +54,3 @@ def test_last_template_usage_should_be_able_to_get_no_template_usage_history_if_
         sample_template):
     results = dao_get_last_template_usage(sample_template.id, 'sms', sample_template.service_id)
     assert not results
-
-
-@freeze_time('2018-01-01')
-def test_should_by_able_to_get_template_count(sample_template, sample_email_template):
-    create_notification(sample_template)
-    create_notification(sample_template)
-    create_notification(sample_template)
-    create_notification(sample_email_template)
-    create_notification(sample_email_template)
-
-    results = dao_get_template_usage(sample_template.service_id, date.today())
-    assert results[0].name == sample_email_template.name
-    assert results[0].template_type == sample_email_template.template_type
-    assert results[0].count == 2
-
-    assert results[1].name == sample_template.name
-    assert results[1].template_type == sample_template.template_type
-    assert results[1].count == 3
-
-
-@freeze_time('2018-01-01')
-def test_template_usage_should_ignore_test_keys(
-    sample_team_api_key,
-    sample_test_api_key,
-    sample_api_key,
-    sample_template
-):
-
-    create_notification(sample_template, api_key=sample_api_key, key_type=KEY_TYPE_NORMAL)
-    create_notification(sample_template, api_key=sample_team_api_key, key_type=KEY_TYPE_TEAM)
-    create_notification(sample_template, api_key=sample_test_api_key, key_type=KEY_TYPE_TEST)
-    create_notification(sample_template)
-
-    results = dao_get_template_usage(sample_template.service_id, date.today())
-    assert results[0].name == sample_template.name
-    assert results[0].template_type == sample_template.template_type
-    assert results[0].count == 3
-
-
-def test_template_usage_should_filter_by_service(notify_db_session):
-    service_1 = create_service(service_name='test1')
-    service_2 = create_service(service_name='test2')
-    service_3 = create_service(service_name='test3')
-
-    template_1 = create_template(service_1)
-    template_2 = create_template(service_2)  # noqa
-    template_3a = create_template(service_3, template_name='a')
-    template_3b = create_template(service_3, template_name='b')  # noqa
-
-    # two for service_1, one for service_3
-    create_notification(template_1)
-    create_notification(template_1)
-
-    create_notification(template_3a)
-
-    res1 = dao_get_template_usage(service_1.id, date.today())
-    res2 = dao_get_template_usage(service_2.id, date.today())
-    res3 = dao_get_template_usage(service_3.id, date.today())
-
-    assert len(res1) == 1
-    assert res1[0].count == 2
-
-    assert len(res2) == 1
-    assert res2[0].count == 0
-
-    assert len(res3) == 2
-    assert res3[0].count == 1
-    assert res3[1].count == 0
-
-
-def test_template_usage_should_by_able_to_get_zero_count_from_notifications_history_if_no_rows(sample_service):
-    results = dao_get_template_usage(sample_service.id, date.today())
-    assert len(results) == 0
-
-
-def test_template_usage_should_by_able_to_get_zero_count_from_notifications_history_if_no_service():
-    results = dao_get_template_usage(str(uuid.uuid4()), date.today())
-    assert len(results) == 0
-
-
-def test_template_usage_should_by_able_to_get_template_count_for_specific_day(sample_template):
-    # too early
-    create_notification(sample_template, created_at=datetime(2017, 6, 7, 22, 59, 0))
-    # just right
-    create_notification(sample_template, created_at=datetime(2017, 6, 7, 23, 0, 0))
-    create_notification(sample_template, created_at=datetime(2017, 6, 7, 23, 0, 0))
-    create_notification(sample_template, created_at=datetime(2017, 6, 8, 22, 59, 0))
-    create_notification(sample_template, created_at=datetime(2017, 6, 8, 22, 59, 0))
-    create_notification(sample_template, created_at=datetime(2017, 6, 8, 22, 59, 0))
-    # too late
-    create_notification(sample_template, created_at=datetime(2017, 6, 8, 23, 0, 0))
-
-    results = dao_get_template_usage(sample_template.service_id, day=date(2017, 6, 8))
-
-    assert len(results) == 1
-    assert results[0].count == 5
-
-
-def test_template_usage_should_by_able_to_get_template_count_for_specific_timezone_boundary(sample_template):
-    # too early
-    create_notification(sample_template, created_at=datetime(2018, 3, 24, 23, 59, 0))
-    # just right
-    create_notification(sample_template, created_at=datetime(2018, 3, 25, 0, 0, 0))
-    create_notification(sample_template, created_at=datetime(2018, 3, 25, 0, 0, 0))
-    create_notification(sample_template, created_at=datetime(2018, 3, 25, 22, 59, 0))
-    create_notification(sample_template, created_at=datetime(2018, 3, 25, 22, 59, 0))
-    create_notification(sample_template, created_at=datetime(2018, 3, 25, 22, 59, 0))
-    # too late
-    create_notification(sample_template, created_at=datetime(2018, 3, 25, 23, 0, 0))
-
-    results = dao_get_template_usage(sample_template.service_id, day=date(2018, 3, 25))
-
-    assert len(results) == 1
-    assert results[0].count == 5

tests/app/dao/test_templates_dao.py

@@ -11,7 +11,6 @@ from app.dao.templates_dao import (
     dao_get_all_templates_for_service,
     dao_update_template,
     dao_get_template_versions,
-    dao_get_multiple_template_details,
     dao_redact_template, dao_update_template_reply_to
 )
 from app.models import (
@@ -511,21 +510,6 @@ def test_get_template_versions_is_empty_for_hidden_templates(notify_db, notify_d
     assert len(versions) == 0
 
 
-def test_get_multiple_template_details_returns_templates_for_list_of_ids(sample_service):
-    t1 = create_template(sample_service)
-    t2 = create_template(sample_service)
-    create_template(sample_service)  # t3
-
-    res = dao_get_multiple_template_details([t1.id, t2.id])
-
-    assert {x.id for x in res} == {t1.id, t2.id}
-    # make sure correct properties are on each row
-    assert res[0].id
-    assert res[0].template_type
-    assert res[0].name
-    assert not res[0].is_precompiled_letter
-
-
 @pytest.mark.parametrize("template_type,postage", [('letter', 'third'), ('sms', 'second')])
 def test_template_postage_constraint_on_create(sample_service, sample_user, template_type, postage):
     data = {