Merge pull request #133 from alphagov/aggregate-data

Aggregate data

tests/app/dao/test_notification_dao.py

@@ -1,4 +1,4 @@
-from app.models import Notification
+from app.models import Notification, Job
 from datetime import datetime
 from app.dao.notifications_dao import (
     dao_create_notification,
@@ -7,14 +7,70 @@ from app.dao.notifications_dao import (
     get_notification_for_job,
     get_notifications_for_job
 )
+from tests.app.conftest import sample_job
 
 
-def test_save_notification(sample_template, sample_job):
+def test_save_notification_and_increment_job(sample_template, sample_job):
+
+    assert Notification.query.count() == 0
+    data = {
+        'to': '+44709123456',
+        'job_id': sample_job.id,
+        'service': sample_template.service,
+        'template': sample_template,
+        'created_at': datetime.utcnow()
+    }
+
+    notification = Notification(**data)
+    dao_create_notification(notification)
+
+    assert Notification.query.count() == 1
+    notification_from_db = Notification.query.all()[0]
+    assert notification_from_db.id
+    assert data['to'] == notification_from_db.to
+    assert data['job_id'] == notification_from_db.job_id
+    assert data['service'] == notification_from_db.service
+    assert data['template'] == notification_from_db.template
+    assert data['created_at'] == notification_from_db.created_at
+    assert 'sent' == notification_from_db.status
+    assert Job.query.get(sample_job.id).notifications_sent == 1
+
+
+def test_save_notification_and_increment_correct_job(notify_db, notify_db_session, sample_template):
+
+    job_1 = sample_job(notify_db, notify_db_session, sample_template.service)
+    job_2 = sample_job(notify_db, notify_db_session, sample_template.service)
+
+    assert Notification.query.count() == 0
+    data = {
+        'to': '+44709123456',
+        'job_id': job_1.id,
+        'service': sample_template.service,
+        'template': sample_template,
+        'created_at': datetime.utcnow()
+    }
+
+    notification = Notification(**data)
+    dao_create_notification(notification)
+
+    assert Notification.query.count() == 1
+    notification_from_db = Notification.query.all()[0]
+    assert notification_from_db.id
+    assert data['to'] == notification_from_db.to
+    assert data['job_id'] == notification_from_db.job_id
+    assert data['service'] == notification_from_db.service
+    assert data['template'] == notification_from_db.template
+    assert data['created_at'] == notification_from_db.created_at
+    assert 'sent' == notification_from_db.status
+    assert Job.query.get(job_1.id).notifications_sent == 1
+    assert Job.query.get(job_2.id).notifications_sent == 0
+
+
+def test_save_notification_with_no_job(sample_template):
 
     assert Notification.query.count() == 0
     data = {
         'to': '+44709123456',
-        'job': sample_job,
         'service': sample_template.service,
         'template': sample_template,
         'created_at': datetime.utcnow()
@@ -27,7 +83,6 @@ def test_save_notification(sample_template, sample_job):
     notification_from_db = Notification.query.all()[0]
     assert notification_from_db.id
     assert data['to'] == notification_from_db.to
-    assert data['job'] == notification_from_db.job
     assert data['service'] == notification_from_db.service
     assert data['template'] == notification_from_db.template
     assert data['created_at'] == notification_from_db.created_at