Merge branch 'master' into invitation

Conflicts:
	scripts/run_celery.sh

app/dao/__init__.py

@@ -1,6 +1,4 @@
 from sqlalchemy.exc import SQLAlchemyError
-from werkzeug.datastructures import MultiDict
-from sqlalchemy.orm.relationships import RelationshipProperty
 from app import db
 
 
@@ -14,41 +12,19 @@ class DAOClass(object):
     class Meta:
         model = None
 
-    def create_instance(self, inst):
+    def create_instance(self, inst, _commit=True):
         db.session.add(inst)
-        db.session.commit()
+        if _commit:
+            db.session.commit()
 
-    def update_instance(self, inst, update_dict):
+    def update_instance(self, inst, update_dict, _commit=True):
         # Make sure the id is not included in the update_dict
         update_dict.pop('id')
         self.Meta.model.query.filter_by(id=inst.id).update(update_dict)
-        db.session.commit()
+        if _commit:
+            db.session.commit()
 
-    def get_query(self, filter_by_dict={}):
-        if isinstance(filter_by_dict, dict):
-            filter_by_dict = MultiDict(filter_by_dict)
-        query = self.Meta.model.query
-        for k in filter_by_dict.keys():
-            query = self._build_query(query, k, filter_by_dict.getlist(k))
-        return query
-
-    def delete_instance(self, inst):
+    def delete_instance(self, inst, _commit=True):
         db.session.delete(inst)
-        db.session.commit()
-
-    def _build_query(self, query, key, values):
-        # TODO Lots to do here to work with all types of filters.
-        field = getattr(self.Meta.model, key, None)
-        filters = getattr(self.Meta, 'filter', [key])
-        if field and key in filters:
-            if isinstance(field.property, RelationshipProperty):
-                if len(values) == 1:
-                    query = query.filter_by(**{key: field.property.mapper.class_.query.get(values[0])})
-                elif len(values) > 1:
-                    query = query.filter(field.in_(field.property.mapper.class_.query.any(values[0])))
-            else:
-                if len(values) == 1:
-                    query = query.filter_by(**{key: values[0]})
-                elif len(values) > 1:
-                    query = query.filter(field.in_(values))
-        return query
+        if _commit:
+            db.session.commit()

app/dao/permissions_dao.py

@@ -1,5 +1,15 @@
 from app.dao import DAOClass
-from app.models import Permission
+from app.models import (Permission, Service, User)
+from werkzeug.datastructures import MultiDict
+
+
+# Service Permissions
+manage_service = 'manage_service'
+send_messages = 'send_messages'
+manage_api_keys = 'manage_api_keys'
+manage_templates = 'manage_templates'
+# Default permissions for a service
+default_service_permissions = [manage_service, send_messages, manage_api_keys, manage_templates]
 
 
 class PermissionDAO(DAOClass):
@@ -7,5 +17,30 @@ class PermissionDAO(DAOClass):
     class Meta:
         model = Permission
 
+    def get_query(self, filter_by_dict={}):
+        if isinstance(filter_by_dict, dict):
+            filter_by_dict = MultiDict(filter_by_dict)
+        query = self.Meta.model.query
+        if 'id' in filter_by_dict:
+            query = query.filter(Permission.id.in_(filter_by_dict.getlist('id')))
+        if 'service' in filter_by_dict:
+            service_ids = filter_by_dict.getlist('service')
+            if len(service_ids) == 1:
+                query.filter_by(service=Service.query.get(service_ids[0]))
+            # TODO the join method for multiple services
+        if 'user' in filter_by_dict:
+            user_ids = filter_by_dict.getlist('service')
+            if len(user_ids) == 1:
+                query = query.filter_by(user=User.query.get(user_ids[0]))
+            # TODO the join method for multiple users
+        if 'permission' in filter_by_dict:
+            query = query.filter(Permission.permission.in_(filter_by_dict.getlist('permission')))
+        return query
+
+    def add_default_service_permissions_for_user(self, user, service):
+        for name in default_service_permissions:
+            permission = Permission(permission=name, user=user, service=service)
+            self.create_instance(permission, _commit=False)
+
 
 permission_dao = PermissionDAO()

app/dao/services_dao.py

@@ -20,9 +20,17 @@ def dao_fetch_service_by_id_and_user(service_id, user_id):
 
 
 def dao_create_service(service, user):
-    service.users.append(user)
-    db.session.add(service)
-    db.session.commit()
+    try:
+        from app.dao.permissions_dao import permission_dao
+        service.users.append(user)
+        permission_dao.add_default_service_permissions_for_user(user, service)
+        db.session.add(service)
+    except Exception as e:
+        # Proper clean up
+        db.session.rollback()
+        raise e
+    else:
+        db.session.commit()
 
 
 def dao_update_service(service):

app/models.py

@@ -264,6 +264,12 @@ class InvitedUser(db.Model):
         default=datetime.datetime.now)
     status = db.Column(
         db.Enum(*INVITED_USER_STATUS_TYPES, name='invited_users_status_types'), nullable=False, default='pending')
+    permissions = db.Column(db.String, nullable=False)
+
+    # would like to have used properties for this but haven't found a way to make them
+    # play nice with marshmallow yet
+    def get_permissions(self):
+        return self.permissions.split(',')
 
 
 class Permission(db.Model):

app/schemas.py

@@ -3,6 +3,7 @@ from flask import current_app
 from flask_marshmallow.fields import fields
 from . import ma
 from . import models
+from app.dao.permissions_dao import permission_dao
 from marshmallow import (post_load, ValidationError, validates, validates_schema)
 
 mobile_regex = re.compile("^\\+44[\\d]{10}$")
@@ -58,6 +59,18 @@ class BaseSchema(ma.ModelSchema):
 
 
 class UserSchema(BaseSchema):
+
+    permissions = fields.Method("user_permissions", dump_only=True)
+
+    def user_permissions(self, usr):
+        retval = {}
+        for x in permission_dao.get_query({'user': usr.id}):
+            service_id = str(x.service_id)
+            if service_id not in retval:
+                retval[service_id] = []
+            retval[service_id].append(x.permission)
+        return retval
+
     class Meta:
         model = models.User
         exclude = (
@@ -153,6 +166,7 @@ class NotificationStatusSchema(BaseSchema):
 
 
 class InvitedUserSchema(BaseSchema):
+
     class Meta:
         model = models.InvitedUser