zou 0.19.15__py3-none-any.whl → 0.20.11__py3-none-any.whl

zou/app/blueprints/crud/person.py

@@ -13,14 +13,14 @@ from zou.app.services import (
     index_service,
     persons_service,
 )
-from zou.app.utils import permissions, auth
+from zou.app.utils import permissions, auth, date_helpers
 
 from zou.app.blueprints.crud.base import BaseModelsResource, BaseModelResource
 
 from zou.app.mixin import ArgsMixin
 
 from zou.app.services.exception import (
-    ArgumentsException,
+    WrongParameterException,
     PersonInProtectedAccounts,
 )
 
@@ -52,7 +52,7 @@ class PersonsResource(BaseModelsResource):
                 for person in query.all()
             ]
 
-    def check_read_permissions(self):
+    def check_read_permissions(self, options=None):
         return True
 
     def check_create_permissions(self, data):
@@ -61,11 +61,9 @@ class PersonsResource(BaseModelsResource):
             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,32 +73,34 @@ class PersonsResource(BaseModelsResource):
         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:
                 if (
-                    datetime.datetime.strptime(
-                        data["expiration_date"], "%Y-%m-%d"
+                    date_helpers.get_date_from_string(
+                        data["expiration_date"]
                     ).date()
                     < datetime.date.today()
                 ):
-                    raise ArgumentsException(
+                    raise WrongParameterException(
                         "Expiration date can't be in the past."
                     )
+            except WrongParameterException:
+                raise
             except:
-                raise ArgumentsException("Expiration date is not valid.")
+                raise WrongParameterException("Expiration date is not valid.")
         return data
 
     def update_data(self, data):
@@ -151,22 +151,23 @@ class PersonResource(BaseModelResource, ArgsMixin):
             data.pop("is_generated_from_ldap", None)
             data.pop("ldap_uid", None)
             data.pop("last_presence", None)
+            data.pop("studio_id", None)
 
         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:
@@ -176,11 +177,13 @@ class PersonResource(BaseModelResource, ArgsMixin):
                     ).date()
                     < datetime.date.today()
                 ):
-                    raise ArgumentsException(
+                    raise WrongParameterException(
                         "Expiration date can't be in the past."
                     )
+            except WrongParameterException:
+                raise
             except:
-                raise ArgumentsException("Expiration date is not valid.")
+                raise WrongParameterException("Expiration date is not valid.")
         return data
 
     def check_delete_permissions(self, instance_dict):
@@ -203,14 +206,19 @@ class PersonResource(BaseModelResource, ArgsMixin):
             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 (
-            data.get("active") is False
-            and instance_dict["email"] in config.PROTECTED_ACCOUNTS
+            instance_dict["email"] in config.PROTECTED_ACCOUNTS
+            and instance_dict["id"] != persons_service.get_current_user()["id"]
         ):
-            raise PersonInProtectedAccounts(
-                "Can't set this person as inactive it's a protected account."
-            )
+            message = None
+            if data.get("active") is False:
+                message = "Can't set this person as inactive it's a protected account."
+            elif data.get("role") is not None:
+                message = "Can't change the role of this person it's a protected account."
+
+            if message is not None:
+                raise PersonInProtectedAccounts(message)
         return data
 
     def post_update(self, instance_dict, data):

zou/app/blueprints/crud/playlist.py

@@ -9,7 +9,7 @@ class PlaylistsResource(BaseModelsResource):
     def __init__(self):
         BaseModelsResource.__init__(self, Playlist)
 
-    def check_read_permissions(self):
+    def check_read_permissions(self, options=None):
         return True
 
     def check_create_permissions(self, playlist):

zou/app/blueprints/crud/preview_background_file.py

@@ -1,6 +1,6 @@
 from zou.app.models.preview_background_file import PreviewBackgroundFile
-from zou.app.services.exception import ArgumentsException
-from zou.app.services import files_service
+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
 
@@ -9,7 +9,7 @@ class PreviewBackgroundFilesResource(BaseModelsResource):
     def __init__(self):
         BaseModelsResource.__init__(self, PreviewBackgroundFile)
 
-    def check_read_permissions(self):
+    def check_read_permissions(self, options=None):
         return True
 
     def update_data(self, data):
@@ -17,7 +17,7 @@ class PreviewBackgroundFilesResource(BaseModelsResource):
         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 @@ class PreviewBackgroundFileResource(BaseModelResource):
             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
@@ -58,7 +58,6 @@ class PreviewBackgroundFileResource(BaseModelResource):
         return instance_dict
 
     def post_delete(self, instance_dict):
-        # stop removing files for now
-        # deletion_service.clear_preview_background_files(instance_dict["id"])
+        deletion_service.clear_preview_background_files(instance_dict["id"])
         files_service.clear_preview_background_file_cache(instance_dict["id"])
         return instance_dict

zou/app/blueprints/crud/preview_file.py

@@ -37,7 +37,7 @@ class PreviewFilesResource(BaseModelsResource):
 
         return query
 
-    def check_read_permissions(self):
+    def check_read_permissions(self, options=None):
         return True
 
 

zou/app/blueprints/crud/project.py

@@ -18,7 +18,7 @@ from zou.app.utils import events, permissions, fields
 
 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):
@@ -31,7 +31,7 @@ class ProjectsResource(BaseModelsResource):
         else:
             return query.filter(user_service.build_related_projects_filter())
 
-    def check_read_permissions(self):
+    def check_read_permissions(self, options=None):
         return True
 
     def check_creation_integrity(self, data):
@@ -44,7 +44,7 @@ class ProjectsResource(BaseModelsResource):
             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,9 @@ class ProjectsResource(BaseModelsResource):
                 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 +133,9 @@ class ProjectResource(BaseModelResource, ArgsMixin):
                 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 +171,7 @@ class ProjectResource(BaseModelResource, ArgsMixin):
             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()
@@ -203,6 +207,8 @@ class ProjectTaskTypeLinksResource(Resource, ArgsMixin):
             ]
         )
 
+        user_service.check_manager_project_access(args["project_id"])
+
         task_type_link = projects_service.create_project_task_type_link(
             args["project_id"],
             args["task_type_id"],
@@ -230,6 +236,8 @@ class ProjectTaskStatusLinksResource(Resource, ArgsMixin):
             ]
         )
 
+        user_service.check_manager_project_access(args["project_id"])
+
         task_status_link = projects_service.create_project_task_status_link(
             args["project_id"],
             args["task_status_id"],

zou/app/blueprints/crud/project_status.py

@@ -6,7 +6,7 @@ class ProjectStatussResource(BaseModelsResource):
     def __init__(self):
         BaseModelsResource.__init__(self, ProjectStatus)
 
-    def check_read_permissions(self):
+    def check_read_permissions(self, options=None):
         return True
 
 

zou/app/blueprints/crud/schedule_item.py

@@ -3,7 +3,7 @@ from zou.app.models.schedule_item import ScheduleItem
 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,9 @@ class ScheduleItemsResource(BaseModelsResource):
             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/software.py

@@ -12,7 +12,7 @@ class SoftwaresResource(BaseModelsResource):
     def __init__(self):
         BaseModelsResource.__init__(self, Software)
 
-    def check_read_permissions(self):
+    def check_read_permissions(self, options=None):
         return True
 
 

zou/app/blueprints/crud/status_automation.py

@@ -13,7 +13,7 @@ class StatusAutomationsResource(BaseModelsResource):
     def __init__(self):
         BaseModelsResource.__init__(self, StatusAutomation)
 
-    def check_read_permissions(self):
+    def check_read_permissions(self, options=None):
         user_service.block_access_to_vendor()
         return True
 

zou/app/blueprints/crud/studio.py

@@ -0,0 +1,33 @@
+from zou.app.models.studio import Studio
+
+from zou.app.blueprints.crud.base import BaseModelsResource, BaseModelResource
+
+from zou.app.services import tasks_service
+
+
+class StudiosResource(BaseModelsResource):
+    def __init__(self):
+        BaseModelsResource.__init__(self, Studio)
+
+    def check_read_permissions(self, options=None):
+        return True
+
+    def post_creation(self, instance):
+        tasks_service.clear_studio_cache(str(instance.id))
+        return instance.serialize()
+
+
+class StudioResource(BaseModelResource):
+    def __init__(self):
+        BaseModelResource.__init__(self, Studio)
+
+    def check_read_permissions(self, instance):
+        return True
+
+    def post_update(self, instance_dict, data):
+        tasks_service.clear_studio_cache(instance_dict["id"])
+        return instance_dict
+
+    def post_delete(self, instance_dict):
+        tasks_service.clear_studio_cache(instance_dict["id"])
+        return instance_dict

zou/app/blueprints/crud/task.py

@@ -1,8 +1,11 @@
 from flask import request, current_app
 from flask_jwt_extended import jwt_required
 
+from sqlalchemy.orm import aliased
 from sqlalchemy.exc import IntegrityError
+
 from zou.app.mixin import ArgsMixin
+from zou.app.models.entity import Entity
 from zou.app.models.person import Person
 from zou.app.models.project import Project
 from zou.app.models.task import Task
@@ -21,11 +24,11 @@ from zou.app.services.exception import WrongTaskTypeForEntityException
 from zou.app.blueprints.crud.base import BaseModelsResource, BaseModelResource
 
 
-class TasksResource(BaseModelsResource):
+class TasksResource(BaseModelsResource, ArgsMixin):
     def __init__(self):
         BaseModelsResource.__init__(self, Task)
 
-    def check_read_permissions(self):
+    def check_read_permissions(self, options=None):
         return True
 
     def add_project_permission_filter(self, query):
@@ -37,6 +40,43 @@ class TasksResource(BaseModelsResource):
             )
         return query
 
+    def build_filters(self, options):
+        (
+            many_join_filter,
+            in_filter,
+            name_filter,
+            criterions,
+        ) = super().build_filters(options)
+        if "project_id" in criterions:
+            del criterions["project_id"]
+        if "episode_id" in criterions:
+            del criterions["episode_id"]
+        return (
+            many_join_filter,
+            in_filter,
+            name_filter,
+            criterions,
+        )
+
+    def apply_filters(self, query, options):
+        query = super().apply_filters(query, options)
+
+        project_id = options.get("project_id", None)
+        episode_id = options.get("episode_id", None)
+        if episode_id is not None:
+            Sequence = aliased(Entity)
+            query = (
+                query.join(Entity, Task.entity_id == Entity.id)
+                .join(Sequence, Entity.parent_id == Sequence.id)
+                .filter(Sequence.parent_id == episode_id)
+            )
+        elif project_id is not None:
+            query = query.join(Entity, Task.entity_id == Entity.id).filter(
+                Entity.project_id == project_id
+            )
+
+        return query
+
     def post(self):
         """
         Create a task with data given in the request body. JSON format is
@@ -74,8 +114,12 @@ class TasksResource(BaseModelsResource):
             if assignees is not None:
                 instance.assignees = persons
             instance.save()
+            self.emit_create_event(instance.serialize())
 
-            return tasks_service.get_task_with_relations(str(instance.id)), 201
+            return (
+                tasks_service.get_task(str(instance.id), relations=True),
+                201,
+            )
 
         except TypeError as exception:
             current_app.logger.error(str(exception), exc_info=1)

zou/app/blueprints/crud/task_status.py

@@ -7,7 +7,7 @@ class TaskStatusesResource(BaseModelsResource):
     def __init__(self):
         BaseModelsResource.__init__(self, TaskStatus)
 
-    def check_read_permissions(self):
+    def check_read_permissions(self, options=None):
         return True
 
     def post_creation(self, instance):

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
@@ -9,7 +9,7 @@ class TaskTypesResource(BaseModelsResource):
     def __init__(self):
         BaseModelsResource.__init__(self, TaskType)
 
-    def check_read_permissions(self):
+    def check_read_permissions(self, options=None):
         return True
 
     def update_data(self, data):
@@ -17,7 +17,7 @@ class TaskTypesResource(BaseModelsResource):
         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 @@ class TaskTypeResource(BaseModelResource):
         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

zou/app/blueprints/crud/working_file.py

@@ -8,7 +8,7 @@ from zou.app.blueprints.crud.base import BaseModelsResource, BaseModelResource
 from zou.app.models.entity import Entity
 from zou.app.models.project import Project
 from zou.app.models.working_file import WorkingFile
-from zou.app.services import user_service, tasks_service, files_service
+from zou.app.services import user_service, files_service
 from zou.app.utils import permissions
 
 
@@ -16,7 +16,7 @@ class WorkingFilesResource(BaseModelsResource):
     def __init__(self):
         BaseModelsResource.__init__(self, WorkingFile)
 
-    def check_read_permissions(self):
+    def check_read_permissions(self, options=None):
         """
         Overriding so that people without admin credentials can still access
         this resource.
@@ -46,16 +46,12 @@ class WorkingFileResource(BaseModelResource):
 
     def check_read_permissions(self, instance):
         working_file = files_service.get_working_file(instance["id"])
-        task = tasks_service.get_task(working_file["task_id"])
-        user_service.check_project_access(task["project_id"])
-        user_service.check_entity_access(task["entity_id"])
+        user_service.check_task_access(working_file["task_id"])
         return True
 
     def check_update_permissions(self, instance, data):
         working_file = files_service.get_working_file(instance["id"])
-        task = tasks_service.get_task(working_file["task_id"])
-        user_service.check_project_access(task["project_id"])
-        user_service.check_entity_access(task["entity_id"])
+        user_service.check_task_access(working_file["task_id"])
         return True
 
     @jwt_required()

zou/app/blueprints/events/resources.py

@@ -2,7 +2,7 @@ from flask_restful import Resource
 from flask_jwt_extended import jwt_required
 
 from zou.app.mixin import ArgsMixin
-from zou.app.utils import fields, permissions
+from zou.app.utils import fields, permissions, date_helpers
 
 from zou.app.services import events_service
 from zou.app.services.exception import WrongParameterException
@@ -32,7 +32,7 @@ class EventsResource(Resource, ArgsMixin):
             type: boolean
             default: False
           - in: query
-            name: page_size
+            name: limit
             type: integer
             default: 100
             x-example: 100
@@ -50,17 +50,19 @@ class EventsResource(Resource, ArgsMixin):
                 ("after", None, False),
                 ("before", None, False),
                 ("only_files", False, False),
-                ("page_size", 100, False),
+                ("limit", 100, False),
                 ("project_id", None, False),
+                ("name", None, False),
             ],
         )
 
         permissions.check_manager_permissions()
         before = self.parse_date_parameter(args["before"])
         after = self.parse_date_parameter(args["after"])
-        page_size = args["page_size"]
+        limit = args["limit"]
         only_files = args["only_files"] == "true"
         project_id = args.get("project_id", None)
+        name = args["name"]
         if project_id is not None and not fields.is_valid_id(project_id):
             raise WrongParameterException(
                 "The project_id parameter is not a valid id"
@@ -69,9 +71,10 @@ class EventsResource(Resource, ArgsMixin):
             return events_service.get_last_events(
                 after=after,
                 before=before,
-                page_size=page_size,
+                limit=limit,
                 only_files=only_files,
                 project_id=project_id,
+                name=name,
             )
 
 
@@ -90,20 +93,18 @@ class LoginLogsResource(Resource, ArgsMixin):
             format: date
             x-example: "2022-07-12T00:00:00"
           - in: query
-            name: page_size
+            name: limit
             type: integer
             x-example: 100
         responses:
             200:
                 description: All login logs
         """
-        args = self.get_args(["before", ("page_size", 100)])
+        args = self.get_args(["before", ("limit", 100)])
 
         permissions.check_manager_permissions()
         before = None
         if args["before"] is not None:
-            before = fields.get_date_object(
-                args["before"], "%Y-%m-%dT%H:%M:%S"
-            )
-        page_size = args["page_size"]
-        return events_service.get_last_login_logs(before, page_size)
+            before = date_helpers.get_datetime_from_string(args["before"])
+        limit = args["limit"]
+        return events_service.get_last_login_logs(before, limit)

zou/app/blueprints/export/csv/assets.py

@@ -65,7 +65,7 @@ class AssetsCsvExport(Resource):
     def build_headers(self, metadata_infos, validation_columns):
         headers = ["Project", "Type", "Name", "Description", "Time Spent"]
 
-        metadata_headers = [name for (name, _) in metadata_infos]
+        metadata_headers = [name for (name, _, _) in metadata_infos]
 
         validation_assignations_columns = []
         for validation_column in validation_columns:
@@ -97,10 +97,15 @@ class AssetsCsvExport(Resource):
                     for person_id in task["assignees"]
                 ]
             )
-
-        for _, field_name in metadata_infos:
-            result_metadata = result.get("data", {}) or {}
-            row.append(result_metadata.get(field_name, ""))
+        result_data = result.get("data", {}) or {}
+        for _, field_name, data_type in metadata_infos:
+            result_metadata = result_data.get(field_name, "")
+            if data_type == "boolean":
+                row.append(
+                    "true" if result_metadata.lower() == "true" else "false"
+                )
+            else:
+                row.append(result_metadata)
 
         for column in validation_columns:
             if column in task_map:
@@ -153,7 +158,11 @@ class AssetsCsvExport(Resource):
         ]
 
         columns = [
-            (descriptor["name"], descriptor["field_name"])
+            (
+                descriptor["name"],
+                descriptor["field_name"],
+                descriptor["data_type"],
+            )
             for descriptor in descriptors
         ]