Merge branch 'master' into client-callbacks

Conflicts:
	app/notifications/rest.py
	tests/app/celery/test_tasks.py

app/dao/invited_user_dao.py

@@ -10,11 +10,11 @@ def save_invited_user(invited_user):
 
 
 def get_invited_user(service_id, invited_user_id):
-    return InvitedUser.query.filter_by(service_id=service_id, id=invited_user_id).first()
+    return InvitedUser.query.filter_by(service_id=service_id, id=invited_user_id).one()
 
 
 def get_invited_user_by_id(invited_user_id):
-    return InvitedUser.query.filter_by(id=invited_user_id).first()
+    return InvitedUser.query.filter_by(id=invited_user_id).one()
 
 
 def get_invited_users_for_service(service_id):

app/dao/jobs_dao.py

@@ -3,7 +3,7 @@ from app.models import Job
 
 
 def dao_get_job_by_service_id_and_job_id(service_id, job_id):
-    return Job.query.filter_by(service_id=service_id, id=job_id).first()
+    return Job.query.filter_by(service_id=service_id, id=job_id).one()
 
 
 def dao_get_jobs_by_service_id(service_id):
@@ -11,7 +11,7 @@ def dao_get_jobs_by_service_id(service_id):
 
 
 def dao_get_job_by_id(job_id):
-    return Job.query.filter_by(id=job_id).first()
+    return Job.query.filter_by(id=job_id).one()
 
 
 def dao_create_job(job):

app/dao/notifications_dao.py

@@ -21,7 +21,12 @@ def dao_get_notification_statistics_for_service_and_day(service_id, day):
 def dao_create_notification(notification, notification_type):
     try:
         if notification.job_id:
-            update_job_sent_count(notification)
+            db.session.query(Job).filter_by(
+                id=notification.job_id
+            ).update({
+                Job.notifications_sent: Job.notifications_sent + 1,
+                Job.updated_at: datetime.utcnow()
+            })
 
         if update_notification_stats(notification, notification_type) == 0:
             stats = NotificationStatistics(
@@ -54,16 +59,6 @@ def update_notification_stats(notification, notification_type):
     ).update(update)
 
 
-def update_job_sent_count(notification):
-    db.session.query(Job).filter_by(
-        id=notification.job_id
-    ).update({
-        Job.notifications_sent: Job.notifications_sent + 1,
-        Job.updated_at: datetime.utcnow()
-    })
-    db.session.commit()
-
-
 def dao_update_notification(notification):
     notification.updated_at = datetime.utcnow()
     db.session.add(notification)
@@ -74,8 +69,7 @@ def update_notification_status_by_id(notification_id, status):
     count = db.session.query(Notification).filter_by(
         id=notification_id
     ).update({
-        Notification.status: status,
-        Notification.updated_at: datetime.utcnow()
+        Notification.status: status
     })
     db.session.commit()
     return count
@@ -85,8 +79,7 @@ def update_notification_status_by_reference(reference, status):
     count = db.session.query(Notification).filter_by(
         reference=reference
     ).update({
-        Notification.status: status,
-        Notification.updated_at: datetime.utcnow()
+        Notification.status: status
     })
     db.session.commit()
     return count
@@ -96,8 +89,7 @@ def update_notification_reference_by_id(id, reference):
     count = db.session.query(Notification).filter_by(
         id=id
     ).update({
-        Notification.reference: reference,
-        Notification.updated_at: datetime.utcnow()
+        Notification.reference: reference
     })
     db.session.commit()
     return count

app/dao/services_dao.py

@@ -8,7 +8,7 @@ def dao_fetch_all_services():
 
 
 def dao_fetch_service_by_id(service_id):
-    return Service.query.filter_by(id=service_id).first()
+    return Service.query.filter_by(id=service_id).one()
 
 
 def dao_fetch_all_services_by_user(user_id):
@@ -16,7 +16,7 @@ def dao_fetch_all_services_by_user(user_id):
 
 
 def dao_fetch_service_by_id_and_user(service_id, user_id):
-    return Service.query.filter(Service.users.any(id=user_id)).filter_by(id=service_id).first()
+    return Service.query.filter(Service.users.any(id=user_id)).filter_by(id=service_id).one()
 
 
 def dao_create_service(service, user):

app/dao/templates_dao.py

@@ -14,11 +14,11 @@ def dao_update_template(template):
 
 
 def dao_get_template_by_id_and_service_id(template_id, service_id):
-    return Template.query.filter_by(id=template_id, service_id=service_id).first()
+    return Template.query.filter_by(id=template_id, service_id=service_id).one()
 
 
 def dao_get_template_by_id(template_id):
-    return Template.query.filter_by(id=template_id).first()
+    return Template.query.filter_by(id=template_id).one()
 
 
 def dao_get_all_templates_for_service(service_id):

app/dao/users_dao.py

@@ -69,12 +69,12 @@ def delete_model_user(user):
 
 def get_model_users(user_id=None):
     if user_id:
-        return User.query.filter_by(id=user_id).first()
+        return User.query.filter_by(id=user_id).one()
     return User.query.filter_by().all()
 
 
 def get_user_by_email(email):
-    return User.query.filter_by(email_address=email).first()
+    return User.query.filter_by(email_address=email).one()
 
 
 def increment_failed_login_count(user):