Updated service DAO and API end points

app/dao/services_dao.py

@@ -138,7 +138,7 @@ def dao_create_service(service, user, service_id=None, service_permissions=[SMS_
 
     for permission in service_permissions:
         service_permission = ServicePermission(service_id=service.id, permission=permission)
-        db.session.add(service_permission)
+        service.permissions.append(service_permission)
 
     db.session.add(service)
 
@@ -149,6 +149,16 @@ def dao_update_service(service):
     db.session.add(service)
 
 
+@transactional
+@version_class(Service)
+def dao_remove_service_permission(service, permission):
+    for p in service.permissions:
+        if p.permission == permission:
+            service.permissions.remove(p)
+
+    db.session.add(service)
+
+
 def dao_add_user_to_service(service, user, permissions=None):
     permissions = permissions or []
     try:

app/schemas.py

@@ -25,6 +25,7 @@ from notifications_utils.recipients import (
 
 from app import ma
 from app import models
+from app.models import ServicePermission
 from app.dao.permissions_dao import permission_dao
 from app.utils import get_template_instance
 
@@ -178,18 +179,34 @@ class ServiceSchema(BaseSchema):
     organisation = field_for(models.Service, 'organisation')
     branding = field_for(models.Service, 'branding')
     dvla_organisation = field_for(models.Service, 'dvla_organisation')
+    permissions = fields.Method("service_permissions")
+    
+    def service_permissions(self, service):
+        permissions = []
+
+        from app.dao.service_permissions_dao import dao_fetch_service_permissions
+        perms = dao_fetch_service_permissions(service.id)
+        for p in perms:
+            permission = {
+                "service_id": service.id,
+                "permission": p.permission
+            }
+            permissions.append(permission)
+        return permissions
 
     class Meta:
         model = models.Service
-        exclude = ('updated_at',
-                   'created_at',
-                   'api_keys',
-                   'templates',
-                   'jobs',
-                   'old_id',
-                   'template_statistics',
-                   'service_provider_stats',
-                   'service_notification_stats')
+        exclude = (
+            'updated_at',
+            'created_at',
+            'api_keys',
+            'templates',
+            'jobs',
+            'old_id',
+            'template_statistics',
+            'service_provider_stats',
+            'service_notification_stats',
+        )
         strict = True
 
     @validates('sms_sender')
@@ -197,6 +214,27 @@ class ServiceSchema(BaseSchema):
         if value and not re.match(r'^[a-zA-Z0-9\s]+$', value):
             raise ValidationError('Only alphanumeric characters allowed')
 
+    @validates('permissions')
+    def validate_permissions(self, value):
+        for v in [val.permission for val in value]:
+            if v not in models.SERVICE_PERMISSION_TYPES:
+                raise ValidationError("Invalid Service Permission: '{}'".format(v))
+
+    @pre_load()
+    def format_permissions_for_data_model(self, in_data):
+        if isinstance(in_data, dict) and 'permissions' in in_data:
+            permissions = []
+            for p in in_data.get('permissions'):
+                permission = models.ServicePermission(service_id=in_data["id"], permission=p)
+                permissions.append(permission)
+            in_data['permissions'] = permissions
+
+    @post_dump
+    def format_permissions_as_string_array(self, in_data):
+        if isinstance(in_data, dict) and 'permissions' in in_data:
+            in_data['permissions'] = [p.get('permission') for p in in_data.get('permissions')]
+        return in_data
+
 
 class DetailedServiceSchema(BaseSchema):
     statistics = fields.Dict()

app/service/rest.py

@@ -95,12 +95,11 @@ def get_services():
 def get_service_by_id(service_id):
     if request.args.get('detailed') == 'True':
         data = get_detailed_service(service_id, today_only=request.args.get('today_only') == 'True')
-        return jsonify(data=data)
     else:
         fetched = dao_fetch_service_by_id(service_id)
 
         data = service_schema.dump(fetched).data
-        return jsonify(data=data)
+    return jsonify(data=data)
 
 
 @service_blueprint.route('', methods=['POST'])