Merge branch 'master' into async-job-stats

Conflicts:
	app/notifications/notifications_ses_callback.py

app/dao/service_permissions_dao.py

@@ -0,0 +1,21 @@
+from app import db
+from app.dao.dao_utils import transactional
+from app.models import ServicePermission, SERVICE_PERMISSION_TYPES
+
+
+def dao_fetch_service_permissions(service_id):
+    return ServicePermission.query.filter(
+        ServicePermission.service_id == service_id).all()
+
+
+@transactional
+def dao_create_service_permission(service_id, permission):
+    service_permission = ServicePermission(service_id=service_id, permission=permission)
+
+    db.session.add(service_permission)
+
+
+def dao_remove_service_permission(service_id, permission):
+    return ServicePermission.query.filter(
+        ServicePermission.service_id == service_id,
+        ServicePermission.permission == permission).delete()

app/dao/services_dao.py

@@ -388,3 +388,12 @@ def dao_suspend_service(service_id):
 def dao_resume_service(service_id):
     service = Service.query.get(service_id)
     service.active = True
+
+
+def dao_fetch_active_users_for_service(service_id):
+    query = User.query.filter(
+        User.user_to_service.any(id=service_id),
+        User.state == 'active'
+    )
+
+    return query.all()