Merge branch 'master' into becca-invite-users

app/notify_client/models.py

@@ -1,6 +1,6 @@
 from itertools import chain
 from flask_login import UserMixin, AnonymousUserMixin
-from flask import session
+from flask import request, session
 
 
 roles = {
@@ -13,6 +13,10 @@ roles = {
 all_permissions = set(chain.from_iterable(roles.values())) | {'view_activity'}
 
 
+def _get_service_id_from_view_args():
+    return request.view_args.get('service_id', None)
+
+
 class User(UserMixin):
     def __init__(self, fields, max_failed_login_count=3):
         self._id = fields.get('id')
@@ -27,7 +31,7 @@ class User(UserMixin):
         self.max_failed_login_count = max_failed_login_count
         self.platform_admin = fields.get('platform_admin')
         self.current_session_id = fields.get('current_session_id')
-        self.organisations = fields.get('organisations', [])
+        self._organisations = fields.get('organisations', [])
 
     def get_id(self):
         return self.id
@@ -118,9 +122,8 @@ class User(UserMixin):
         if admin_override and not permissions:
             return False
 
-        from flask import request
         # Service id is always set on the request for service specific views.
-        service_id = request.view_args.get('service_id', None)
+        service_id = _get_service_id_from_view_args()
         if service_id in self._permissions:
             if any_:
                 return any([x in self._permissions[service_id] for x in permissions])

app/notify_client/service_api_client.py

@@ -226,6 +226,16 @@ class ServiceAPIClient(NotifyAdminAPIClient):
             service_id=service_id)
         return self.get(endpoint, *params)
 
+    def count_service_templates(self, service_id, template_type=None):
+        return len([
+            template for template in
+            self.get_service_templates(service_id)['data']
+            if (
+                not template_type
+                or template['template_type'] == template_type
+            )
+        ])
+
     def delete_service_template(self, service_id, template_id):
         """
         Set a service template's archived flag to True

app/notify_client/user_api_client.py

@@ -131,6 +131,12 @@ class UserApiClient(NotifyAdminAPIClient):
         resp = self.get(endpoint)
         return [User(data) for data in resp['data']]
 
+    def get_count_of_users_with_permission(self, service_id, permission):
+        return len([
+            user for user in self.get_users_for_service(service_id)
+            if user.has_permissions(permission, any_=True)
+        ])
+
     def get_users_for_organisation(self, org_id):
         endpoint = '/organisations/{}/users'.format(org_id)
         resp = self.get(endpoint)