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

zou/app/blueprints/tasks/resources.py

@@ -2,7 +2,7 @@ import datetime
 
 
 from flask import abort, request
-from flask_restful import Resource
+from flask_restful import Resource, inputs
 from flask_jwt_extended import jwt_required
 
 from zou.app.services.exception import (
@@ -28,7 +28,7 @@ from zou.app.services import (
     user_service,
     concepts_service,
 )
-from zou.app.utils import events, query, permissions
+from zou.app.utils import events, query, permissions, date_helpers
 from zou.app.mixin import ArgsMixin
 
 
@@ -69,13 +69,8 @@ class AddPreviewResource(Resource, ArgsMixin):
         """
         args = self.get_args([("revision", 0, False, int)])
 
-        task = tasks_service.get_task(task_id)
-        user_service.check_project_access(task["project_id"])
-        user_service.check_entity_access(task["entity_id"])
+        user_service.check_task_access(task_id)
 
-        tasks_service.clear_comment_cache(comment_id)
-        comment = tasks_service.get_comment(comment_id)
-        tasks_service.get_task_status(comment["task_status_id"])
         person = persons_service.get_current_user()
         preview_file = tasks_service.add_preview_file_to_comment(
             comment_id, person["id"], task_id, args["revision"]
@@ -122,9 +117,7 @@ class AddExtraPreviewResource(Resource):
             201:
                 description: Preview added to given comment
         """
-        task = tasks_service.get_task(task_id)
-        user_service.check_project_access(task["project_id"])
-        user_service.check_entity_access(task["entity_id"])
+        user_service.check_task_access(task_id)
         tasks_service.get_comment(comment_id)
 
         person = persons_service.get_current_user()
@@ -194,9 +187,7 @@ class TaskPreviewsResource(Resource):
             200:
                 description: Previews linked to given task
         """
-        task = tasks_service.get_task(task_id)
-        user_service.check_project_access(task["project_id"])
-        user_service.check_entity_access(task["entity_id"])
+        user_service.check_task_access(task_id)
         return files_service.get_preview_files_for_task(task_id)
 
 
@@ -223,9 +214,7 @@ class TaskCommentsResource(Resource):
             200:
                 description: Comments linked to given task
         """
-        task = tasks_service.get_task(task_id)
-        user_service.check_project_access(task["project_id"])
-        user_service.check_entity_access(task["entity_id"])
+        user_service.check_task_access(task_id)
         is_client = permissions.has_client_permissions()
         is_manager = permissions.has_manager_permissions()
         is_supervisor = permissions.has_supervisor_permissions()
@@ -756,7 +745,7 @@ class ToReviewResource(Resource, ArgsMixin):
         try:
             task = tasks_service.get_task(task_id)
             user_service.check_project_access(task["project_id"])
-            user_service.check_entity_access(task["project_id"])
+            user_service.check_entity_access(task["entity_id"])
 
             if person_id is not None:
                 person = persons_service.get_person(person_id)
@@ -766,7 +755,7 @@ class ToReviewResource(Resource, ArgsMixin):
             preview_path = self.get_preview_path(task, name, revision)
 
             task = tasks_service.task_to_review(
-                task["id"], person, comment, preview_path, change_status
+                task_id, person, comment, preview_path, change_status
             )
         except PersonNotFoundException:
             return {"error": True, "message": "Cannot find given person."}, 400
@@ -793,7 +782,11 @@ class ToReviewResource(Resource, ArgsMixin):
                 ("comment", ""),
                 ("name", "main"),
                 {"name": "revision", "default": 1, "type": int},
-                {"name": "change_status", "default": True, "type": bool},
+                {
+                    "name": "change_status",
+                    "default": True,
+                    "type": inputs.boolean,
+                },
             ]
         )
 
@@ -844,7 +837,7 @@ class ClearAssignationResource(Resource, ArgsMixin):
         tasks = []
         for task_id in task_ids:
             try:
-                user_service.check_task_departement_access_for_unassign(
+                user_service.check_task_department_access_for_unassign(
                     task_id, person_id
                 )
                 tasks_service.clear_assignation(task_id, person_id=person_id)
@@ -909,7 +902,6 @@ class TasksAssignResource(Resource, ArgsMixin):
             200:
                 description: Given tasks lists assigned to given person
         """
-        user_service.check_person_is_not_bot(person_id)
         args = self.get_args(
             [
                 {
@@ -925,11 +917,14 @@ class TasksAssignResource(Resource, ArgsMixin):
         current_user = persons_service.get_current_user()
         for task_id in args["task_ids"]:
             try:
-                user_service.check_task_departement_access(task_id, person_id)
-                task = self.assign_task(task_id, person_id, current_user["id"])
-                notifications_service.create_assignation_notification(
+                user_service.check_person_is_not_bot(person_id)
+                user_service.check_task_department_access(task_id, person_id)
+                task = tasks_service.assign_task(
                     task_id, person_id, current_user["id"]
                 )
+                notifications_service.create_assignation_notification(
+                    task_id, person_id
+                )
                 tasks.append(task)
             except TaskNotFoundException:
                 pass
@@ -942,9 +937,6 @@ class TasksAssignResource(Resource, ArgsMixin):
 
         return tasks
 
-    def assign_task(self, task_id, person_id, assigner_id):
-        return tasks_service.assign_task(task_id, person_id, assigner_id)
-
 
 class TaskAssignResource(Resource, ArgsMixin):
     """
@@ -993,11 +985,13 @@ class TaskAssignResource(Resource, ArgsMixin):
             ]
         )
         person_id = args["person_id"]
+        current_user = persons_service.get_current_user()
         try:
             user_service.check_person_is_not_bot(person_id)
-            task = tasks_service.get_task(task_id)
-            user_service.check_task_departement_access(task_id, person_id)
-            self.assign_task(task_id, person_id)
+            user_service.check_task_department_access(task_id, person_id)
+            task = tasks_service.assign_task(
+                task_id, person_id, current_user["id"]
+            )
             notifications_service.create_assignation_notification(
                 task_id, person_id
             )
@@ -1007,9 +1001,6 @@ class TaskAssignResource(Resource, ArgsMixin):
 
         return task
 
-    def assign_task(self, task_id, person_id):
-        return tasks_service.assign_task(task_id, person_id)
-
 
 class TaskFullResource(Resource):
     """
@@ -1134,7 +1125,7 @@ class SetTimeSpentResource(Resource, ArgsMixin):
             time_spent = tasks_service.create_or_update_time_spent(
                 task_id,
                 person_id,
-                datetime.datetime.strptime(date, "%Y-%m-%d"),
+                date_helpers.get_date_from_string(date),
                 args["duration"],
             )
             return time_spent, 201
@@ -1275,9 +1266,7 @@ class GetTimeSpentResource(Resource):
             404:
                 description: Wrong date format
         """
-        task = tasks_service.get_task(task_id)
-        user_service.check_project_access(task["project_id"])
-        user_service.check_entity_access(task["entity_id"])
+        user_service.check_task_access(task_id)
         return tasks_service.get_time_spents(task_id)
 
 
@@ -1313,9 +1302,7 @@ class GetTimeSpentDateResource(Resource):
                 description: Wrong date format
         """
         try:
-            task = tasks_service.get_task(task_id)
-            user_service.check_project_access(task["project_id"])
-            user_service.check_entity_access(task["entity_id"])
+            user_service.check_task_access(task_id)
             return tasks_service.get_time_spents(task_id, date)
         except WrongDateFormatException:
             abort(404)
@@ -1465,7 +1452,6 @@ class ProjectTasksResource(Resource, ArgsMixin):
     """
 
     @jwt_required()
-    @permissions.require_admin
     def get(self, project_id):
         """
         Retrieve all tasks related to given project.
@@ -1480,13 +1466,34 @@ class ProjectTasksResource(Resource, ArgsMixin):
             type: string
             format: UUID
             x-example: a24a6ea4-ce75-4665-a070-57453082c25
+          - in: query
+            name: page
+            required: False
+            type: integer
+            x-example: 1
+          - in: query
+            name: task_type_id
+            required: False
+            type: string
+            format: UUID
+            x-example: a24a6ea4-ce75-4665-a070-57453082c25
+          - in: query
+            name: episode_id
+            required: False
+            type: string
+            format: UUID
+            x-example: a24a6ea4-ce75-4665-a070-57453082c25
         responses:
             200:
                 description: All tasks related to given project
         """
         projects_service.get_project(project_id)
         page = self.get_page()
-        return tasks_service.get_tasks_for_project(project_id, page)
+        task_type_id = self.get_task_type_id()
+        episode_id = self.get_episode_id()
+        return tasks_service.get_tasks_for_project(
+            project_id, page, task_type_id=task_type_id, episode_id=episode_id
+        )
 
 
 class ProjectCommentsResource(Resource, ArgsMixin):
@@ -1496,7 +1503,6 @@ class ProjectCommentsResource(Resource, ArgsMixin):
     """
 
     @jwt_required()
-    @permissions.require_admin
     def get(self, project_id):
         """
         Retrieve all comments to tasks related to given project.
@@ -1511,13 +1517,25 @@ class ProjectCommentsResource(Resource, ArgsMixin):
             type: string
             format: UUID
             x-example: a24a6ea4-ce75-4665-a070-57453082c25
+          - in: query
+            name: limit
+            type: integer
+            default: 100
+            x-example: 100
         responses:
             200:
                 description: All comments to tasks related to given project
         """
         projects_service.get_project(project_id)
+        user_service.check_project_access(project_id)
+        if (
+            permissions.has_vendor_permissions()
+            or permissions.has_client_permissions()
+        ):
+            raise permissions.PermissionDenied
         page = self.get_page()
-        return tasks_service.get_comments_for_project(project_id, page)
+        limit = self.get_limit()
+        return tasks_service.get_comments_for_project(project_id, page, limit)
 
 
 class ProjectPreviewFilesResource(Resource, ArgsMixin):
@@ -1576,16 +1594,10 @@ class SetTaskMainPreviewResource(Resource):
         preview_file = preview_files_service.get_last_preview_file_for_task(
             task_id
         )
-        entity = entities_service.get_entity(task["entity_id"])
         if preview_file is not None:
-            entities_service.update_entity_preview(
+            entity = entities_service.update_entity_preview(
                 task["entity_id"], preview_file["id"]
             )
-            assets_service.clear_asset_cache(entity["id"])
-            shots_service.clear_shot_cache(entity["id"])
-            edits_service.clear_edit_cache(entity["id"])
-            shots_service.clear_episode_cache(entity["id"])
-            shots_service.clear_sequence_cache(entity["id"])
         return entity
 
 
@@ -1739,3 +1751,22 @@ class OpenTasksResource(Resource, ArgsMixin):
             page=args["page"],
             limit=args["limit"],
         )
+
+
+class OpenTasksStatsResource(Resource, ArgsMixin):
+
+    @jwt_required()
+    def get(self):
+        """
+        Return task amount, task done amount, total estimation, total duration
+        by status by task type by project for open projects. It aggregates the
+        result at the project level.
+        ---
+        tags:
+        - Tasks
+        responses:
+            200:
+                description: A dict organized by project that contains
+                            the results for each task type and status pairs.
+        """
+        return tasks_service.get_open_tasks_stats()

zou/app/blueprints/user/__init__.py

@@ -11,6 +11,8 @@ from zou.app.blueprints.user.resources import (
     ContextResource,
     DateTimeSpentsResource,
     DayOffResource,
+    ChatsResource,
+    JoinChatResource,
     OpenProjectsResource,
     ProjectEpisodesResource,
     ProjectSequencesResource,
@@ -31,6 +33,7 @@ from zou.app.blueprints.user.resources import (
     FilterGroupResource,
     FilterGroupsResource,
     DesktopLoginLogsResource,
+    MarkAllNotificationsAsReadResource,
     NotificationsResource,
     NotificationResource,
     HasTaskSubscribedResource,
@@ -85,6 +88,8 @@ routes = [
     ("/data/user/notifications", NotificationsResource),
     ("/data/user/notifications/<notification_id>", NotificationResource),
     ("/data/user/tasks/<task_id>/subscribed", HasTaskSubscribedResource),
+    ("/data/user/chats", ChatsResource),
+    ("/actions/user/chats/<entity_id>/join", JoinChatResource),
     ("/actions/user/tasks/<task_id>/subscribe", TaskSubscribeResource),
     ("/actions/user/tasks/<task_id>/unsubscribe", TaskUnsubscribeResource),
     ("/actions/user/clear-avatar", ClearAvatarResource),
@@ -104,6 +109,10 @@ routes = [
         "/actions/user/sequences/<sequence_id>/task-types/<task_type_id>/unsubscribe",
         SequenceUnsubscribeResource,
     ),
+    (
+        "/actions/user/notifications/mark-all-as-read",
+        MarkAllNotificationsAsReadResource,
+    ),
 ]
 
 blueprint = Blueprint("user", "user")

zou/app/blueprints/user/resources.py

@@ -1,20 +1,18 @@
-import datetime
-
-from flask import abort
-from flask_restful import Resource
+from flask import abort, request
+from flask_restful import Resource, inputs
 
 from zou.app.mixin import ArgsMixin
-
 from zou.app.services import (
     assets_service,
+    chats_service,
+    entities_service,
     persons_service,
     projects_service,
     shots_service,
     time_spents_service,
     user_service,
 )
-
-
+from zou.app.utils import date_helpers
 from zou.app.services.exception import WrongDateFormatException
 
 
@@ -544,6 +542,9 @@ class FiltersResource(Resource, ArgsMixin):
                 arguments["query"],
                 arguments["project_id"],
                 arguments["entity_type"],
+                arguments["is_shared"],
+                arguments["search_filter_group_id"],
+                department_id=arguments["department_id"],
             ),
             201,
         )
@@ -556,6 +557,9 @@ class FiltersResource(Resource, ArgsMixin):
                 ("list_type", "todo", True),
                 ("project_id", None, False),
                 ("entity_type", None, False),
+                ("is_shared", False, False, inputs.boolean),
+                ("search_filter_group_id", None, False),
+                ("department_id", None, False),
             ]
         )
 
@@ -587,6 +591,9 @@ class FilterResource(Resource, ArgsMixin):
                 ("name", None, False),
                 ("search_query", None, False),
                 ("search_filter_group_id", None, False),
+                ("is_shared", None, False, inputs.boolean),
+                ("project_id", None, None),
+                ("department_id", None, None),
             ]
         )
         data = self.clear_empty_fields(
@@ -659,19 +666,27 @@ class FilterGroupsResource(Resource, ArgsMixin):
             name: entity_type
             required: False
             type: string
+          - in: formData
+            name: is_shared
+            required: False
+            type: boolean
           - in: formData
             name: project_id
             required: True
             type: string
             format: UUID
             example: a24a6ea4-ce75-4665-a070-57453082c25
+          - in: formData
+            name: department_id
+            required: False
+            format: UUID
+            example: a24a6ea4-ce75-4665-a070-57453082c25
         responses:
             201:
                 description: Filter groups for the current user and only for
                              open projects created.
         """
         arguments = self.get_arguments()
-
         return (
             user_service.create_filter_group(
                 arguments["list_type"],
@@ -679,6 +694,8 @@ class FilterGroupsResource(Resource, ArgsMixin):
                 arguments["color"],
                 arguments["project_id"],
                 arguments["entity_type"],
+                arguments["is_shared"],
+                arguments["department_id"],
             ),
             201,
         )
@@ -690,7 +707,9 @@ class FilterGroupsResource(Resource, ArgsMixin):
                 ("color", "", True),
                 ("list_type", "todo", True),
                 ("project_id", None, False),
+                ("is_shared", False, False, inputs.boolean),
                 ("entity_type", None, False),
+                ("department_id", None, False),
             ]
         )
 
@@ -727,6 +746,28 @@ class FilterGroupResource(Resource, ArgsMixin):
             type: string
             format: UUID
             x-example: a24a6ea4-ce75-4665-a070-57453082c25
+          - in: formData
+            name: name
+            type: string
+            x-example: Name of the filter group
+          - in: formData
+            name: color
+            type: string
+            x-example: Color of the filter group
+          - in: formData
+            name: is_shared
+            type: boolean
+            x-example: True
+          - in: formData
+            name: project_id
+            type: string
+            format: UUID
+            x-example: a24a6ea4-ce75-4665-a070-57453082c25
+          - in: formData
+            name: department_id
+            type: string
+            format: UUID
+            x-example: a24a6ea4-ce75-4665-a070-57453082c25
         responses:
             200:
                 description: Given filter group with updated data
@@ -735,8 +776,12 @@ class FilterGroupResource(Resource, ArgsMixin):
             [
                 ("name", None, False),
                 ("color", None, False),
+                ("is_shared", None, False, inputs.boolean),
+                ("project_id", None, None),
+                ("department_id", None, None),
             ]
         )
+
         data = self.clear_empty_fields(data)
         user_filter = user_service.update_filter_group(filter_group_id, data)
         return user_filter, 200
@@ -799,7 +844,9 @@ class DesktopLoginLogsResource(Resource, ArgsMixin):
             201:
                 description: Desktop login log created
         """
-        arguments = self.get_args(["date", datetime.datetime.utcnow()])
+        arguments = self.get_args(
+            ["date", date_helpers.get_utc_now_datetime()]
+        )
         current_user = persons_service.get_current_user()
         desktop_login_log = persons_service.create_desktop_login_logs(
             current_user["id"], arguments["date"]
@@ -836,13 +883,22 @@ class NotificationsResource(Resource, ArgsMixin):
             task_status_id,
             notification_type,
         ) = self.get_arguments()
+
+        read = None
+        if request.args.get("read", None) is not None:
+            read = self.get_bool_parameter("read")
+        watching = None
+        if request.args.get("watching", None) is not None:
+            watching = self.get_bool_parameter("watching")
+        print("watching", watching)
         notifications = user_service.get_last_notifications(
             before=before,
             task_type_id=task_type_id,
             task_status_id=task_status_id,
             notification_type=notification_type,
+            read=read,
+            watching=watching,
         )
-        user_service.mark_notifications_as_read()
         return notifications
 
     def get_arguments(self):
@@ -855,7 +911,7 @@ class NotificationsResource(Resource, ArgsMixin):
         )
 
 
-class NotificationResource(Resource):
+class NotificationResource(Resource, ArgsMixin):
     """
     Return notification matching given id, only if it's a notification that
     belongs to current user.
@@ -882,6 +938,42 @@ class NotificationResource(Resource):
         """
         return user_service.get_notification(notification_id)
 
+    def put(self, notification_id):
+        """
+        Change notification read status.
+        ---
+        tags:
+        - User
+        parameters:
+          - in: path
+            name: notification_id
+            required: True
+            type: string
+            format: UUID
+            x-example: a24a6ea4-ce75-4665-a070-57453082c25
+        responses:
+            200:
+                description: Notification
+        """
+        data = self.get_args([("read", None, False, inputs.boolean)])
+        return user_service.update_notification(notification_id, data["read"])
+
+
+class MarkAllNotificationsAsReadResource(Resource):
+
+    def post(self):
+        """
+        Mark all notifications as read for the current user.
+        ---
+        tags:
+        - User
+        responses:
+            200:
+                description: All notifications marked as read
+        """
+        user_service.mark_notifications_as_read()
+        return {"success": True}
+
 
 class HasTaskSubscribedResource(Resource):
     """
@@ -893,7 +985,7 @@ class HasTaskSubscribedResource(Resource):
         Return true if current user has subscribed to given task.
         ---
         tags:
-        - User
+          - User
         parameters:
           - in: path
             name: task_id
@@ -1259,3 +1351,69 @@ class ClearAvatarResource(Resource):
         user = persons_service.get_current_user()
         persons_service.clear_avatar(user["id"])
         return "", 204
+
+
+class ChatsResource(Resource):
+
+    def get(self):
+        """
+        Return chats where user is participant.
+        ---
+        tags:
+            - User
+        responses:
+            200:
+                description: Chats where user is participant
+        """
+        user = persons_service.get_current_user()
+        return chats_service.get_chats_for_person(user["id"])
+
+
+class JoinChatResource(Resource):
+
+    def post(self, entity_id):
+        """
+        Join chat for given entity (be listed as participant).
+        ---
+        tags:
+          - User
+        parameters:
+          - in: path
+            name: entity_id
+            required: True
+            type: string
+            format: UUID
+            x-example: a24a6ea4-ce75-4665-a070-57453082c25
+        responses:
+            201:
+                description: Chat joined
+        """
+        entity = entities_service.get_entity(entity_id)
+        user_service.check_project_access(entity["project_id"])
+        user_service.check_entity_access(entity["id"])
+        person = persons_service.get_current_user()
+        return chats_service.join_chat(entity_id, person["id"])
+
+    def delete(self, entity_id):
+        """
+        Leave chat for given entity (be removed from participants).
+        ---
+        tags:
+         - User
+        parameters:
+          - in: path
+            name: entity_id
+            required: True
+            type: string
+            format: UUID
+            x-example: a24a6ea4-ce75-4665-a070-57453082c25
+        responses:
+            204:
+                description: empty response
+        """
+        entity = entities_service.get_entity(entity_id)
+        user_service.check_project_access(entity["project_id"])
+        user_service.check_entity_access(entity["id"])
+        person = persons_service.get_current_user()
+        chats_service.leave_chat(entity_id, person["id"])
+        return "", 204