Merge branch 'master' into noti-stats-cleanup

tests/app/dao/test_notification_dao.py

@@ -23,7 +23,7 @@ from app.models import (
 from app.dao.notifications_dao import (
     dao_create_notification,
     dao_update_notification,
-    get_notification,
+    get_notification_with_personalisation,
     get_notification_for_job,
     get_notifications_for_job,
     delete_notifications_created_more_than_a_week_ago,
@@ -34,14 +34,18 @@ from app.dao.notifications_dao import (
     dao_get_template_statistics_for_service,
     get_notifications_for_service,
     dao_get_potential_notification_statistics_for_day,
-    dao_get_template_statistics_for_template, get_notification_by_id)
+    dao_get_template_statistics_for_template,
+    get_notification_by_id,
+    dao_get_template_usage
+)
 
 from notifications_utils.template import get_sms_fragment_count
 
-from tests.app.conftest import (sample_notification)
+from tests.app.conftest import (sample_notification, sample_template, sample_email_template, sample_service)
 
 
 def test_should_have_decorated_notifications_dao_functions():
+    assert dao_get_template_usage.__wrapped__.__name__ == 'dao_get_template_usage'  # noqa
     assert dao_get_notification_statistics_for_service_and_day.__wrapped__.__name__ == 'dao_get_notification_statistics_for_service_and_day'  # noqa
     assert dao_get_potential_notification_statistics_for_day.__wrapped__.__name__ == 'dao_get_potential_notification_statistics_for_day'  # noqa
     assert dao_get_template_statistics_for_service.__wrapped__.__name__ == 'dao_get_template_statistics_for_service'  # noqa
@@ -53,12 +57,143 @@ def test_should_have_decorated_notifications_dao_functions():
     assert update_notification_status_by_reference.__wrapped__.__name__ == 'update_notification_status_by_reference'  # noqa
     assert get_notification_for_job.__wrapped__.__name__ == 'get_notification_for_job'  # noqa
     assert get_notifications_for_job.__wrapped__.__name__ == 'get_notifications_for_job'  # noqa
-    assert get_notification.__wrapped__.__name__ == 'get_notification'  # noqa
+    assert get_notification_with_personalisation.__wrapped__.__name__ == 'get_notification_with_personalisation'  # noqa
     assert get_notifications_for_service.__wrapped__.__name__ == 'get_notifications_for_service'  # noqa
     assert get_notification_by_id.__wrapped__.__name__ == 'get_notification_by_id'  # noqa
     assert delete_notifications_created_more_than_a_week_ago.__wrapped__.__name__ == 'delete_notifications_created_more_than_a_week_ago'  # noqa
 
 
+def test_should_by_able_to_get_template_count_from_notifications_history(notify_db, notify_db_session, sample_service):
+    sms = sample_template(notify_db, notify_db_session)
+    email = sample_email_template(notify_db, notify_db_session)
+    sample_notification(notify_db, notify_db_session, service=sample_service, template=sms)
+    sample_notification(notify_db, notify_db_session, service=sample_service, template=sms)
+    sample_notification(notify_db, notify_db_session, service=sample_service, template=sms)
+    sample_notification(notify_db, notify_db_session, service=sample_service, template=email)
+    sample_notification(notify_db, notify_db_session, service=sample_service, template=email)
+
+    results = dao_get_template_usage(sample_service.id)
+    assert results[0].name == 'Email Template Name'
+    assert results[0].template_type == 'email'
+    assert results[0].count == 2
+
+    assert results[1].name == 'Template Name'
+    assert results[1].template_type == 'sms'
+    assert results[1].count == 3
+
+
+def test_should_by_able_to_get_template_count_from_notifications_history_for_service(
+        notify_db,
+        notify_db_session):
+    service_1 = sample_service(notify_db, notify_db_session, service_name="test1", email_from="test1")
+    service_2 = sample_service(notify_db, notify_db_session, service_name="test2", email_from="test2")
+    service_3 = sample_service(notify_db, notify_db_session, service_name="test3", email_from="test3")
+
+    sms = sample_template(notify_db, notify_db_session)
+
+    sample_notification(notify_db, notify_db_session, service=service_1, template=sms)
+    sample_notification(notify_db, notify_db_session, service=service_1, template=sms)
+    sample_notification(notify_db, notify_db_session, service=service_2, template=sms)
+
+    assert dao_get_template_usage(service_1.id)[0].count == 2
+    assert dao_get_template_usage(service_2.id)[0].count == 1
+    assert len(dao_get_template_usage(service_3.id)) == 0
+
+
+def test_should_by_able_to_get_zero_count_from_notifications_history_if_no_rows(sample_service):
+    results = dao_get_template_usage(sample_service.id)
+    assert len(results) == 0
+
+
+def test_should_by_able_to_get_zero_count_from_notifications_history_if_no_service():
+    results = dao_get_template_usage(str(uuid.uuid4()))
+    assert len(results) == 0
+
+
+def test_should_by_able_to_get_template_count_from_notifications_history_across_days(
+        notify_db,
+        notify_db_session,
+        sample_service):
+    sms = sample_template(notify_db, notify_db_session)
+    email = sample_email_template(notify_db, notify_db_session)
+
+    today = datetime.now()
+    yesterday = datetime.now() - timedelta(days=1)
+    one_month_ago = datetime.now() - timedelta(days=30)
+
+    sample_notification(notify_db, notify_db_session, created_at=today, service=sample_service, template=email)
+    sample_notification(notify_db, notify_db_session, created_at=today, service=sample_service, template=email)
+    sample_notification(notify_db, notify_db_session, created_at=today, service=sample_service, template=sms)
+
+    sample_notification(notify_db, notify_db_session, created_at=yesterday, service=sample_service, template=email)
+    sample_notification(notify_db, notify_db_session, created_at=yesterday, service=sample_service, template=email)
+    sample_notification(notify_db, notify_db_session, created_at=yesterday, service=sample_service, template=email)
+    sample_notification(notify_db, notify_db_session, created_at=yesterday, service=sample_service, template=sms)
+
+    sample_notification(notify_db, notify_db_session, created_at=one_month_ago, service=sample_service, template=sms)
+    sample_notification(notify_db, notify_db_session, created_at=one_month_ago, service=sample_service, template=sms)
+    sample_notification(notify_db, notify_db_session, created_at=one_month_ago, service=sample_service, template=sms)
+
+    results = dao_get_template_usage(sample_service.id)
+
+    assert len(results) == 2
+
+    assert [(row.name, row.template_type, row.count) for row in results] == [
+        ('Email Template Name', 'email', 5),
+        ('Template Name', 'sms', 5)
+    ]
+
+
+def test_should_by_able_to_get_template_count_from_notifications_history_with_day_limit(
+        notify_db,
+        notify_db_session,
+        sample_service):
+    sms = sample_template(notify_db, notify_db_session)
+
+    email = sample_email_template(notify_db, notify_db_session)
+
+    today = datetime.now()
+    yesterday = datetime.now() - timedelta(days=1)
+    one_month_ago = datetime.now() - timedelta(days=30)
+
+    sample_notification(notify_db, notify_db_session, created_at=today, service=sample_service, template=email)
+    sample_notification(notify_db, notify_db_session, created_at=today, service=sample_service, template=email)
+    sample_notification(notify_db, notify_db_session, created_at=today, service=sample_service, template=sms)
+
+    sample_notification(notify_db, notify_db_session, created_at=yesterday, service=sample_service, template=email)
+    sample_notification(notify_db, notify_db_session, created_at=yesterday, service=sample_service, template=email)
+    sample_notification(notify_db, notify_db_session, created_at=yesterday, service=sample_service, template=email)
+    sample_notification(notify_db, notify_db_session, created_at=yesterday, service=sample_service, template=sms)
+
+    sample_notification(notify_db, notify_db_session, created_at=one_month_ago, service=sample_service, template=sms)
+    sample_notification(notify_db, notify_db_session, created_at=one_month_ago, service=sample_service, template=sms)
+    sample_notification(notify_db, notify_db_session, created_at=one_month_ago, service=sample_service, template=sms)
+
+    results_day_one = dao_get_template_usage(sample_service.id, limit_days=0)
+    assert len(results_day_one) == 2
+
+    results_day_two = dao_get_template_usage(sample_service.id, limit_days=1)
+    assert len(results_day_two) == 2
+
+    results_day_30 = dao_get_template_usage(sample_service.id, limit_days=31)
+    assert len(results_day_30) == 2
+
+    assert [(row.name, row.template_type, row.count) for row in results_day_one] == [
+        ('Email Template Name', 'email', 2),
+        ('Template Name', 'sms', 1)
+    ]
+
+    assert [(row.name, row.template_type, row.count) for row in results_day_two] == [
+        ('Email Template Name', 'email', 5),
+        ('Template Name', 'sms', 2),
+    ]
+
+    assert [(row.name, row.template_type, row.count) for row in results_day_30] == [
+        ('Email Template Name', 'email', 5),
+        ('Template Name', 'sms', 5),
+    ]
+
+
 def test_should_by_able_to_update_status_by_reference(sample_email_template, ses_provider):
     data = _notification_json(sample_email_template, status='sending')
 
@@ -572,9 +707,11 @@ def test_save_notification_with_no_job(sample_template, mmg_provider):
 
 
 def test_get_notification(sample_notification):
-    notification_from_db = get_notification(
+    notification_from_db = get_notification_with_personalisation(
         sample_notification.service.id,
-        sample_notification.id)
+        sample_notification.id,
+        key_type=None
+    )
     assert sample_notification == notification_from_db
 
 

tests/app/dao/test_services_dao.py

@@ -29,6 +29,7 @@ from app.models import (
     VerifyCode,
     ApiKey,
     Template,
+    TemplateHistory,
     Job,
     Notification,
     NotificationHistory,
@@ -331,7 +332,7 @@ def test_delete_service_and_associated_objects(notify_db,
     assert ApiKey.query.count() == 0
     assert ApiKey.get_history_model().query.count() == 0
     assert Template.query.count() == 0
-    assert Template.get_history_model().query.count() == 0
+    assert TemplateHistory.query.count() == 0
     assert Job.query.count() == 0
     assert Notification.query.count() == 0
     assert Permission.query.count() == 0

tests/app/dao/test_templates_dao.py

@@ -6,7 +6,7 @@ from app.dao.templates_dao import (
     dao_update_template,
     dao_get_template_versions)
 from tests.app.conftest import sample_template as create_sample_template
-from app.models import Template
+from app.models import Template, TemplateHistory
 import pytest
 
 
@@ -185,7 +185,7 @@ def test_get_template_by_id_and_service_returns_none_if_no_template(sample_servi
 
 def test_create_template_creates_a_history_record_with_current_data(sample_service, sample_user):
     assert Template.query.count() == 0
-    assert Template.get_history_model().query.count() == 0
+    assert TemplateHistory.query.count() == 0
     data = {
         'name': 'Sample Template',
         'template_type': "email",
@@ -200,7 +200,7 @@ def test_create_template_creates_a_history_record_with_current_data(sample_servi
     assert Template.query.count() == 1
 
     template_from_db = Template.query.first()
-    template_history = Template.get_history_model().query.first()
+    template_history = TemplateHistory.query.first()
 
     assert template_from_db.id == template_history.id
     assert template_from_db.name == template_history.name
@@ -212,7 +212,7 @@ def test_create_template_creates_a_history_record_with_current_data(sample_servi
 
 def test_update_template_creates_a_history_record_with_current_data(sample_service, sample_user):
     assert Template.query.count() == 0
-    assert Template.get_history_model().query.count() == 0
+    assert TemplateHistory.query.count() == 0
     data = {
         'name': 'Sample Template',
         'template_type': "email",
@@ -228,20 +228,20 @@ def test_update_template_creates_a_history_record_with_current_data(sample_servi
     assert created.name == 'Sample Template'
     assert Template.query.count() == 1
     assert Template.query.first().version == 1
-    assert Template.get_history_model().query.count() == 1
+    assert TemplateHistory.query.count() == 1
 
     created.name = 'new name'
     dao_update_template(created)
 
     assert Template.query.count() == 1
-    assert Template.get_history_model().query.count() == 2
+    assert TemplateHistory.query.count() == 2
 
     template_from_db = Template.query.first()
 
     assert template_from_db.version == 2
 
-    assert Template.get_history_model().query.filter_by(name='Sample Template').one().version == 1
-    assert Template.get_history_model().query.filter_by(name='new name').one().version == 2
+    assert TemplateHistory.query.filter_by(name='Sample Template').one().version == 1
+    assert TemplateHistory.query.filter_by(name='new name').one().version == 2
 
 
 def test_get_template_history_version(sample_user, sample_service, sample_template):
@@ -261,12 +261,16 @@ def test_get_template_versions(sample_template):
     sample_template.content = 'new version'
     dao_update_template(sample_template)
     versions = dao_get_template_versions(service_id=sample_template.service_id, template_id=sample_template.id)
-    assert versions.__len__() == 2
-    for x in versions:
-        if x.version == 2:
-            assert x.content == 'new version'
-        else:
-            assert x.content == original_content
+    assert len(versions) == 2
+    versions = sorted(versions, key=lambda x: x.version)
+    assert versions[0].content == original_content
+    assert versions[1].content == 'new version'
+
+    assert versions[0].created_at == versions[1].created_at
+
+    assert versions[0].updated_at is None
+    assert versions[1].updated_at is not None
+
     from app.schemas import template_history_schema
     v = template_history_schema.load(versions, many=True)
-    assert v.__len__() == 2
+    assert len(v) == 2