Merge pull request #857 from frankrousseau/master

Various fixes

zou/app/__init__.py

@@ -96,7 +96,7 @@ def id_parameter_format_error(error):
 
 @app.errorhandler(WrongParameterException)
 def wrong_parameter(error):
-    return jsonify(error=True, message=str(error)), 400
+    return jsonify(error=True, message=str(error), data=error.dict), 400
 
 
 @app.errorhandler(ExpiredSignatureError)

zou/app/blueprints/chats/resources.py

@@ -10,7 +10,7 @@
     persons_service,
     user_service,
 )
-from zou.app.services.exception import ArgumentsException
+from zou.app.services.exception import WrongParameterException
 
 
 class ChatResource(Resource):
@@ -116,7 +116,7 @@ def post(self, entity_id):
 
         chat = chats_service.get_chat(entity_id)
         if person["id"] not in chat["participants"]:
-            raise ArgumentsException("You are not a participant of this chat")
+            raise WrongParameterException("You are not a participant of this chat")
 
         return (
             chats_service.create_chat_message(

zou/app/blueprints/crud/base.py

@@ -12,7 +12,7 @@
 from zou.app.mixin import ArgsMixin
 from zou.app.utils import events, fields, permissions, query
 from zou.app.services.exception import (
-    ArgumentsException,
+    WrongParameterException,
     WrongParameterException,
 )
 
@@ -237,7 +237,7 @@ def post(self):
         try:
             data = request.json
             if data is None:
-                raise ArgumentsException(
+                raise WrongParameterException(
                     "Data are empty. Please verify that you sent JSON data and"
                     " that you set the right headers."
                 )
@@ -258,7 +258,7 @@ def post(self):
             current_app.logger.error(str(exception), exc_info=1)
             return {"message": str(exception)}, 400
 
-        except ArgumentsException as exception:
+        except WrongParameterException as exception:
             current_app.logger.error(str(exception), exc_info=1)
             return (
                 exception.dict
@@ -406,7 +406,7 @@ def put(self, instance_id):
         try:
             data = self.get_arguments()
             if data is None:
-                raise ArgumentsException(
+                raise WrongParameterException(
                     "Data are empty. Please verify that you sent JSON data and"
                     " that you set the right headers."
                 )
@@ -429,7 +429,7 @@ def put(self, instance_id):
             current_app.logger.error(str(exception), exc_info=1)
             return {"message": str(exception)}, 400
 
-        except ArgumentsException as exception:
+        except WrongParameterException as exception:
             current_app.logger.error(str(exception), exc_info=1)
             return (
                 exception.dict

zou/app/blueprints/crud/day_off.py

@@ -5,7 +5,7 @@
 
 from zou.app.services import user_service, time_spents_service
 
-from zou.app.services.exception import ArgumentsException
+from zou.app.services.exception import WrongParameterException
 
 from zou.app.utils import permissions
 
@@ -21,7 +21,7 @@ def check_creation_integrity(self, data):
         if time_spents_service.get_day_offs_between(
             data["date"], data["end_date"], data["person_id"]
         ):
-            raise ArgumentsException("Day off already exists for this period")
+            raise WrongParameterException("Day off already exists for this period")
         return data
 
     def post_creation(self, instance):
@@ -67,5 +67,5 @@ def pre_update(self, instance_dict, data):
             data.get("person_id", instance_dict["person_id"]),
             exclude_id=instance_dict["id"],
         ):
-            raise ArgumentsException("Day off already exists for this period")
+            raise WrongParameterException("Day off already exists for this period")
         return data

zou/app/blueprints/crud/entity.py

@@ -28,7 +28,7 @@
 )
 from zou.app.utils import date_helpers, events, permissions
 
-from zou.app.services.exception import ArgumentsException
+from zou.app.services.exception import WrongParameterException
 
 from werkzeug.exceptions import NotFound
 
@@ -88,7 +88,7 @@ def check_creation_integrity(self, data):
         if "status" in data:
             types = [entity_status for entity_status, _ in ENTITY_STATUSES]
             if data["status"] not in types:
-                raise ArgumentsException("Invalid status")
+                raise WrongParameterException("Invalid status")
         return True
 
     def all_entries(self, query=None, relations=False):
@@ -255,5 +255,5 @@ def update_data(self, data, instance_id):
         if "status" in data:
             types = [entity_status for entity_status, _ in ENTITY_STATUSES]
             if data["status"] not in types:
-                raise ArgumentsException("Invalid status")
+                raise WrongParameterException("Invalid status")
         return data

zou/app/blueprints/crud/metadata_descriptor.py

@@ -4,16 +4,28 @@
 )
 
 from zou.app.blueprints.crud.base import BaseModelResource, BaseModelsResource
+from zou.app.utils import permissions
+from zou.app.models.project import Project
 
 from zou.app.services.exception import (
-    ArgumentsException,
+    WrongParameterException,
 )
 
 
 class MetadataDescriptorsResource(BaseModelsResource):
     def __init__(self):
         BaseModelsResource.__init__(self, MetadataDescriptor)
 
+    def check_read_permissions(self):
+        return not permissions.has_vendor_permissions()
+
+    def add_project_permission_filter(self, query):
+        if not permissions.has_admin_permissions():
+            query = query.join(Project).filter(
+                user_service.build_related_projects_filter()
+            )
+        return query
+
     def all_entries(self, query=None, relations=True):
         if query is None:
             query = self.model.query
@@ -30,11 +42,12 @@ def check_creation_integrity(self, data):
         if "data_type" in data:
             types = [type_name for type_name, _ in METADATA_DESCRIPTOR_TYPES]
             if data["data_type"] not in types:
-                raise ArgumentsException("Invalid data_type")
+                raise WrongParameterException("Invalid data_type")
         return True
 
 
 class MetadataDescriptorResource(BaseModelResource):
+
     def __init__(self):
         BaseModelResource.__init__(self, MetadataDescriptor)
 
@@ -47,5 +60,5 @@ def update_data(self, data, instance_id):
         if "data_type" in data:
             types = [type_name for type_name, _ in METADATA_DESCRIPTOR_TYPES]
             if data["data_type"] not in types:
-                raise ArgumentsException("Invalid data_type")
+                raise WrongParameterException("Invalid data_type")
         return data

zou/app/blueprints/crud/person.py

@@ -20,7 +20,7 @@
 from zou.app.mixin import ArgsMixin
 
 from zou.app.services.exception import (
-    ArgumentsException,
+    WrongParameterException,
     PersonInProtectedAccounts,
 )
 
@@ -61,11 +61,9 @@ def check_create_permissions(self, data):
             and data.get("active", True)
             and persons_service.is_user_limit_reached()
         ):
-            raise ArgumentsException(
+            raise WrongParameterException(
                 "User limit reached.",
                 {
-                    "error": True,
-                    "message": "User limit reached.",
                     "limit": config.USER_LIMIT,
                 },
             )
@@ -75,18 +73,18 @@ def check_creation_integrity(self, data):
         if "role" in data and data["role"] not in [
             role for role, _ in ROLE_TYPES
         ]:
-            raise ArgumentsException("Invalid role")
+            raise WrongParameterException("Invalid role")
         if "contract_type" in data and data["contract_type"] not in [
             contract_type for contract_type, _ in CONTRACT_TYPES
         ]:
-            raise ArgumentsException("Invalid contract_type")
+            raise WrongParameterException("Invalid contract_type")
         if "two_factor_authentication" in data and data[
             "two_factor_authentication"
         ] not in [
             two_factor_authentication
             for two_factor_authentication, _ in TWO_FACTOR_AUTHENTICATION_TYPES
         ]:
-            raise ArgumentsException("Invalid two_factor_authentication")
+            raise WrongParameterException("Invalid two_factor_authentication")
 
         if "expiration_date" in data and data["expiration_date"] is not None:
             try:
@@ -96,11 +94,11 @@ def check_creation_integrity(self, data):
                     ).date()
                     < datetime.date.today()
                 ):
-                    raise ArgumentsException(
+                    raise WrongParameterException(
                         "Expiration date can't be in the past."
                     )
             except:
-                raise ArgumentsException("Expiration date is not valid.")
+                raise WrongParameterException("Expiration date is not valid.")
         return data
 
     def update_data(self, data):
@@ -156,18 +154,18 @@ def update_data(self, data, instance_id):
         if "role" in data and data["role"] not in [
             role for role, _ in ROLE_TYPES
         ]:
-            raise ArgumentsException("Invalid role")
+            raise WrongParameterException("Invalid role")
         if "contract_type" in data and data["contract_type"] not in [
             contract_type for contract_type, _ in CONTRACT_TYPES
         ]:
-            raise ArgumentsException("Invalid contract_type")
+            raise WrongParameterException("Invalid contract_type")
         if "two_factor_authentication" in data and data[
             "two_factor_authentication"
         ] not in [
             two_factor_authentication
             for two_factor_authentication, _ in TWO_FACTOR_AUTHENTICATION_TYPES
         ]:
-            raise ArgumentsException("Invalid two_factor_authentication")
+            raise WrongParameterException("Invalid two_factor_authentication")
 
         if "expiration_date" in data and data["expiration_date"] is not None:
             try:
@@ -177,11 +175,11 @@ def update_data(self, data, instance_id):
                     ).date()
                     < datetime.date.today()
                 ):
-                    raise ArgumentsException(
+                    raise WrongParameterException(
                         "Expiration date can't be in the past."
                     )
             except:
-                raise ArgumentsException("Expiration date is not valid.")
+                raise WrongParameterException("Expiration date is not valid.")
         return data
 
     def check_delete_permissions(self, instance_dict):
@@ -204,7 +202,7 @@ def pre_update(self, instance_dict, data):
             and not data.get("is_bot", False)
             and persons_service.is_user_limit_reached()
         ):
-            raise ArgumentsException("User limit reached.")
+            raise WrongParameterException("User limit reached.")
         if instance_dict["email"] in config.PROTECTED_ACCOUNTS:
             message = None
             if data.get("active") is False:

zou/app/blueprints/crud/preview_background_file.py

@@ -1,5 +1,5 @@
 from zou.app.models.preview_background_file import PreviewBackgroundFile
-from zou.app.services.exception import ArgumentsException
+from zou.app.services.exception import WrongParameterException
 from zou.app.services import files_service, deletion_service
 
 from zou.app.blueprints.crud.base import BaseModelResource, BaseModelsResource
@@ -17,7 +17,7 @@ def update_data(self, data):
         name = data.get("name", None)
         preview_background_file = PreviewBackgroundFile.get_by(name=name)
         if preview_background_file is not None:
-            raise ArgumentsException(
+            raise WrongParameterException(
                 "A preview background file with similar name already exists"
             )
         return data
@@ -44,7 +44,7 @@ def update_data(self, data, instance_id):
             if preview_background_file is not None and instance_id != str(
                 preview_background_file.id
             ):
-                raise ArgumentsException(
+                raise WrongParameterException(
                     "A preview background file with similar name already exists"
                 )
         return data

zou/app/blueprints/crud/project.py

@@ -18,7 +18,7 @@
 
 from zou.app.blueprints.crud.base import BaseModelResource, BaseModelsResource
 
-from zou.app.services.exception import ArgumentsException
+from zou.app.services.exception import WrongParameterException
 
 
 class ProjectsResource(BaseModelsResource):
@@ -44,7 +44,7 @@ def check_creation_integrity(self, data):
             if data["production_style"] not in [
                 type_name for type_name, _ in PROJECT_STYLES
             ]:
-                raise ArgumentsException("Invalid production_style")
+                raise WrongParameterException("Invalid production_style")
         return True
 
     def update_data(self, data):
@@ -71,7 +71,7 @@ def update_data(self, data):
                 or data["preview_background_file_id"]
                 not in data["preview_background_files_ids"]
             ):
-                raise ArgumentsException("Invalid preview_background_file_id")
+                raise WrongParameterException("Invalid preview_background_file_id")
         return data
 
     def post_creation(self, project):
@@ -131,7 +131,7 @@ def pre_update(self, project_dict, data):
                 data["preview_background_file_id"]
                 not in preview_background_files_ids
             ):
-                raise ArgumentsException("Invalid preview_background_file_id")
+                raise WrongParameterException("Invalid preview_background_file_id")
 
         return data
 
@@ -167,7 +167,7 @@ def update_data(self, data, instance_id):
             if data["production_style"] not in [
                 type_name for type_name, _ in PROJECT_STYLES
             ]:
-                raise ArgumentsException("Invalid production_style")
+                raise WrongParameterException("Invalid production_style")
         return data
 
     @jwt_required()

zou/app/blueprints/crud/schedule_item.py

@@ -3,7 +3,7 @@
 from zou.app.blueprints.crud.base import BaseModelResource, BaseModelsResource
 
 from zou.app.services import user_service
-from zou.app.services.exception import ArgumentsException
+from zou.app.services.exception import WrongParameterException
 
 
 class ScheduleItemsResource(BaseModelsResource):
@@ -17,7 +17,7 @@ def check_creation_integrity(self, data):
             object_id=data.get("object_id", None),
         )
         if schedule_item is not None:
-            raise ArgumentsException("A similar schedule item already exists")
+            raise WrongParameterException("A similar schedule item already exists")
         return schedule_item
 
 

zou/app/blueprints/crud/task_type.py

@@ -1,5 +1,5 @@
 from zou.app.models.task_type import TaskType
-from zou.app.services.exception import ArgumentsException
+from zou.app.services.exception import WrongParameterException
 from zou.app.services import tasks_service
 
 from zou.app.blueprints.crud.base import BaseModelResource, BaseModelsResource
@@ -17,7 +17,7 @@ def update_data(self, data):
         name = data.get("name", None)
         task_type = TaskType.get_by(name=name)
         if task_type is not None:
-            raise ArgumentsException(
+            raise WrongParameterException(
                 "A task type with similar name already exists"
             )
         return data
@@ -40,7 +40,7 @@ def update_data(self, data, instance_id):
         if name is not None:
             task_type = TaskType.get_by(name=name)
             if task_type is not None and instance_id != str(task_type.id):
-                raise ArgumentsException(
+                raise WrongParameterException(
                     "A task type with similar name already exists"
                 )
         return data